Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sysutils/dbus/DEINSTALL Normal file
View File

@@ -0,0 +1,20 @@
# $NetBSD: DEINSTALL,v 1.2 2011/10/29 15:17:17 dholland Exp $
# DEINSTALL is used rather than @pkgdir because the automatic directory
# deletion mechanism makes dbus services remove these directories first,
# and thus "Directory disappeared" messages will likely appear under @pkgdir
case ${STAGE} in
POST-DEINSTALL)
CYCLE="@PREFIX@/share/dbus-1/system-services \
@PREFIX@/share/dbus-1/services \
@PREFIX@/libexec/dbus-1"
for dbuspath in ${CYCLE}; do
if [ -d ${dbuspath} ]; then
if [ -n `${LS} -A ${dbuspath}` ]; then
${RMDIR} ${dbuspath}
fi
fi
done
;;
esac

12
sysutils/dbus/DESCR Normal file
View File

@@ -0,0 +1,12 @@
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in terms
of complexity.
D-BUS supports broadcast messages, asynchronous messages (thus decreasing
latency), authentication, and more. It is designed to be low-overhead;
messages are sent using a binary protocol, not using XML. D-BUS also
supports a method call mapping for its messages, but it is not required;
this makes using the system quite simple.
This package provides the D-BUS core library and daemon, as well as
some utilities that complement it.

9
sysutils/dbus/INSTALL Normal file
View File

@@ -0,0 +1,9 @@
# $NetBSD: INSTALL,v 1.1 2008/09/24 11:37:31 taca Exp $
DBUS_UUIDGEN="@PREFIX@/bin/dbus-uuidgen"
case ${STAGE} in
POST-INSTALL)
${DBUS_UUIDGEN} --ensure
;;
esac

17
sysutils/dbus/MESSAGE Normal file
View File

@@ -0,0 +1,17 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2006/12/17 15:39:33 jmmv Exp $
You should enable the dbus system-wide daemon for correct operation. You
can do this by using one of the three start-up scripts installed by the
package. Use:
* ${PREFIX}/share/examples/rc.d/dbus:
if you are using NetBSD's and pkgsrc's rc.subr start-up framework.
* ${PREFIX}/share/examples/rc.d/messagebus.redhat:
if you are using a Red-Hat based system (such as Fedora Core).
* ${PREFIX}/share/examples/rc.d/rc.messagebus.slackware:
if you are using a Slackware-like system.
===========================================================================

125
sysutils/dbus/Makefile Normal file
View File

@@ -0,0 +1,125 @@
# $NetBSD: Makefile,v 1.61 2013/06/13 13:00:34 wiz Exp $
DISTNAME= dbus-1.6.12
CATEGORIES= sysutils
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.freedesktop.org/Software/dbus
COMMENT= Message bus system
LICENSE= gnu-gpl-v2
CONFLICTS+= dbus-glib<0.71
CONFLICTS+= py*-dbus<0.71
GNU_CONFIGURE= YES
USE_TOOLS+= gmake msgfmt pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= dbus-1.pc.in
BUILD_DEFS+= VARBASE
OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
SPECIAL_PERMS+= libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4511
.include "../../mk/bsd.prefs.mk"
# Disable man2html detection forcibly
CONFIGURE_ENV+= ac_cv_path_MAN2HTML=
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
#CONFIGURE_ARGS+= --enable-embedded-tests
#CFLAGS.NetBSD+= -D_NETBSD_SOURCE
CONFIGURE_ARGS_GROUPS= enable disable with without
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-session-socket-dir=/tmp
.endif
CONFIGURE_ARGS.Linux= abstract-sockets dnotify selinux
CONFIGURE_ARGS.docs= doxygen-docs xml-docs
CONFIGURE_ARGS.without+= init-scripts
CONFIGURE_ARGS.disable= ansi gcov
CONFIGURE_ARGS.disable+= console-owner-file
CONFIGURE_ARGS.disable+= ${CONFIGURE_ARGS.docs}
CONFIGURE_ARGS.enable= checks static
###
### XXX the spawn test hangs, and some of these tests may be bogus
###
#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
#PKG_OPTIONS.dbus+= debug
#TEST_TARGET= check
#.endif
CONFIGURE_ARGS.with= dbus-user=${DBUS_USER}
CONFIGURE_ARGS.with+= test-socket-dir=${WRKDIR:Q}
CONFIGURE_ARGS.with+= xml=expat
PTHREAD_AUTO_VARS= yes
.if ${OPSYS} == "Linux"
PLIST.linux= yes
.else
CONFIGURE_ARGS.disable+=\
${CONFIGURE_ARGS.Linux}
.endif
PLIST_VARS+= linux
CONFIGURE_ARGS+=\
${CONFIGURE_ARGS_GROUPS:@.g.@ \
${CONFIGURE_ARGS.${.g.}:@.a.@ \
--${.g.}-${.a.} \
@} \
@:M*}
MAKE_DIRS= ${PKG_SYSCONFDIR}/dbus-1/event.d
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/session.d
EGDIR= ${PREFIX}/share/examples/dbus
CONF_FILES= ${EGDIR}/session.conf ${PKG_SYSCONFDIR}/dbus-1/session.conf
CONF_FILES+= ${EGDIR}/system.conf ${PKG_SYSCONFDIR}/dbus-1/system.conf
RCD_SCRIPTS= dbus
PKG_GROUPS_VARS+= DBUS_GROUP
PKG_USERS_VARS+= DBUS_USER
PKG_GROUPS= ${DBUS_GROUP}
PKG_USERS= ${DBUS_USER}:${DBUS_GROUP}
PKG_GECOS.${DBUS_USER}= System message bus
PKG_HOME.${DBUS_USER}= ${VARBASE}/run/dbus
FILES_SUBST+= DBUS_USER=${DBUS_USER}
FILES_SUBST+= DBUS_GROUP=${DBUS_GROUP}
BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
# Package tries to use these if gcc accepts them, but that doesn't
# mean that we universally can *run* the executables
BUILDLINK_TRANSFORM+= rm:-fPIE
BUILDLINK_TRANSFORM+= rm:-pie
.if ${OPSYS} == "OpenBSD"
BUILDLINK_TRANSFORM+= rm:-lrt
.endif
.include "options.mk"
.if ${OPSYS} == "Linux"
post-install:
${INSTALL_DATA} ${WRKSRC}/bus/rc.messagebus \
${DESTDIR}${PREFIX}/share/examples/rc.d/rc.messagebus.slackware
${INSTALL_DATA} ${WRKSRC}/bus/messagebus \
${DESTDIR}${PREFIX}/share/examples/rc.d/messagebus.redhat
.endif
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

46
sysutils/dbus/PLIST Normal file
View File

@@ -0,0 +1,46 @@
@comment $NetBSD: PLIST,v 1.15 2012/08/01 17:52:21 drochner Exp $
bin/dbus-cleanup-sockets
bin/dbus-daemon
bin/dbus-launch
bin/dbus-monitor
bin/dbus-send
bin/dbus-uuidgen
include/dbus-1.0/dbus/dbus-address.h
include/dbus-1.0/dbus/dbus-bus.h
include/dbus-1.0/dbus/dbus-connection.h
include/dbus-1.0/dbus/dbus-errors.h
include/dbus-1.0/dbus/dbus-macros.h
include/dbus-1.0/dbus/dbus-memory.h
include/dbus-1.0/dbus/dbus-message.h
include/dbus-1.0/dbus/dbus-misc.h
include/dbus-1.0/dbus/dbus-pending-call.h
include/dbus-1.0/dbus/dbus-protocol.h
include/dbus-1.0/dbus/dbus-server.h
include/dbus-1.0/dbus/dbus-shared.h
include/dbus-1.0/dbus/dbus-signature.h
include/dbus-1.0/dbus/dbus-syntax.h
include/dbus-1.0/dbus/dbus-threads.h
include/dbus-1.0/dbus/dbus-types.h
include/dbus-1.0/dbus/dbus.h
lib/dbus-1.0/include/dbus/dbus-arch-deps.h
lib/libdbus-1.la
lib/pkgconfig/dbus-1.pc
libexec/dbus-daemon-launch-helper
man/man1/dbus-cleanup-sockets.1
man/man1/dbus-daemon.1
man/man1/dbus-launch.1
man/man1/dbus-monitor.1
man/man1/dbus-send.1
man/man1/dbus-uuidgen.1
share/doc/dbus/dbus-faq.html
share/doc/dbus/dbus-specification.html
share/doc/dbus/dbus-test-plan.html
share/doc/dbus/dbus-tutorial.html
share/doc/dbus/diagram.png
share/doc/dbus/diagram.svg
share/doc/dbus/system-activation.txt
share/examples/dbus/session.conf
share/examples/dbus/system.conf
share/examples/rc.d/dbus
${PLIST.linux}share/examples/rc.d/messagebus.redhat
${PLIST.linux}share/examples/rc.d/rc.messagebus.slackware

14
sysutils/dbus/buildlink3.mk Normal file
View File

@@ -0,0 +1,14 @@
# $NetBSD: buildlink3.mk,v 1.14 2009/06/14 22:58:09 joerg Exp $
BUILDLINK_TREE+= dbus
.if !defined(DBUS_BUILDLINK3_MK)
DBUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.dbus+= dbus>=0.91
BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus
.include "../../textproc/expat/buildlink3.mk"
.endif # DBUS_BUILDLINK3_MK
BUILDLINK_TREE+= -dbus

11
sysutils/dbus/distinfo Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: distinfo,v 1.44 2013/06/13 13:00:34 wiz Exp $
SHA1 (dbus-1.6.12.tar.gz) = 96f7ae2edb8711fe4fb42718d03fdb00a90416d5
RMD160 (dbus-1.6.12.tar.gz) = 2ffda0a66ac457ee77c498a95b85d04a147906d6
Size (dbus-1.6.12.tar.gz) = 1933805 bytes
SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4
SHA1 (patch-ab) = 77eb92f31e849789448ae80990caf9f573aa87a7
SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab
SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276
SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
SHA1 (patch-ba) = ceb8e0c424c57410f8c3775087e4cae1b44da4c5

29
sysutils/dbus/files/dbus.sh Normal file
View File

@@ -0,0 +1,29 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: dbus.sh,v 1.9 2008/10/11 19:58:24 markd Exp $
#
# PROVIDE: dbus
# REQUIRE: DAEMON
# KEYWORD: shutdown
. /etc/rc.subr
name="dbus"
rcvar=$name
command="@PREFIX@/bin/dbus-daemon"
command_args="--system"
pidfile="@VARBASE@/run/dbus/pid"
start_precmd=dbus_prestart
dbus_prestart() {
dir="@VARBASE@/run/dbus"
if @TEST@ ! -d $dir; then
@MKDIR@ $dir
@CHMOD@ 0755 $dir
@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
fi
@PREFIX@/bin/dbus-uuidgen --ensure
}
load_rc_config $name
run_rc_command "$1"

4
sysutils/dbus/hacks.mk Normal file
View File

@@ -0,0 +1,4 @@
# $NetBSD: hacks.mk,v 1.3 2008/02/05 22:03:57 tnn Exp $
# gcc 2.95 does not understand -Wfloat-equal
BUILDLINK_TRANSFORM+= rm:-Wfloat-equal

37
sysutils/dbus/options.mk Normal file
View File

@@ -0,0 +1,37 @@
# $NetBSD: options.mk,v 1.7 2012/09/02 13:02:13 shattered Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dbus
PKG_SUPPORTED_OPTIONS+= debug x11
PKG_SUGGESTED_OPTIONS= x11
.if (${OPSYS} == "NetBSD" || \
${OPSYS} == "FreeBSD" || \
${OPSYS} == "OpenBSD" || \
${OPSYS} == "Darwin" || \
${OPSYS} == "DragonFly")
PKG_SUPPORTED_OPTIONS+= kqueue
PKG_SUGGESTED_OPTIONS+= kqueue
.endif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS.enable+= asserts verbose-mode
.else
CONFIGURE_ARGS.disable+= asserts verbose-mode
.endif
.if !empty(PKG_OPTIONS:Mkqueue)
CONFIGURE_ARGS.enable+= kqueue
.else
CONFIGURE_ARGS.disable+= kqueue
.endif
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS.with+= x
. include "../../x11/libX11/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt= build
. include "../../x11/libXt/buildlink3.mk"
.else
CONFIGURE_ARGS.without= x
.endif

42
sysutils/dbus/patches/patch-aa Normal file
View File

@@ -0,0 +1,42 @@
$NetBSD: patch-aa,v 1.11 2012/08/01 17:52:22 drochner Exp $
--- bus/Makefile.in.orig 2012-07-26 16:39:09.000000000 +0000
+++ bus/Makefile.in
@@ -500,7 +500,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-configdir = $(sysconfdir)/dbus-1
+etcconfigdir = $(sysconfdir)/dbus-1
+configdir = $(datadir)/examples/@PACKAGE@
dbus_daemon_execdir = $(DBUS_DAEMONDIR)
DBUS_BUS_LIBS = \
$(XML_LIBS) \
@@ -519,7 +520,7 @@ DBUS_LAUNCHER_LIBS = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(XML_CFLAGS) \
- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \
-DDBUS_COMPILATION \
-DDBUS_STATIC_BUILD \
$(NULL)
@@ -1510,9 +1511,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
# Install dbus.socket as default implementation of a D-Bus stack.
@@ -1529,7 +1527,7 @@ install-data-hook:
@DBUS_UNIX_TRUE@install-exec-hook:
@DBUS_UNIX_TRUE@ if test `id -u` -eq 0; then \
@DBUS_UNIX_TRUE@ chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
-@DBUS_UNIX_TRUE@ chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
+@DBUS_UNIX_TRUE@ chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
@DBUS_UNIX_TRUE@ else \
@DBUS_UNIX_TRUE@ echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
@DBUS_UNIX_TRUE@ echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \

150
sysutils/dbus/patches/patch-ab Normal file
View File

@@ -0,0 +1,150 @@
$NetBSD: patch-ab,v 1.21 2013/05/26 18:06:04 wiz Exp $
_dbus_poll: Set the timeout value argument to poll to -1 whenever
it is less than -1 to avoid kde4 session start hang
--- dbus/dbus-sysdeps-unix.c.orig 2013-04-22 14:10:32.000000000 +0000
+++ dbus/dbus-sysdeps-unix.c
@@ -22,6 +22,8 @@
*
*/
+#define _NETBSD_SOURCE
+
#include <config.h>
#include "dbus-internals.h"
@@ -75,6 +77,10 @@
#include <alloca.h>
#endif
+#ifdef __NetBSD__
+#include <sys/un.h>
+#endif
+
#ifdef HAVE_ADT
#include <bsm/adt.h>
#endif
@@ -125,6 +131,32 @@
#endif /* Solaris */
+#ifdef LOCAL_PEEREID
+static dbus_bool_t
+dbus_nb_getpeereid(int fd, pid_t *pid, uid_t *uid, gid_t *gid)
+{
+ struct unpcbid cred;
+ socklen_t len = sizeof(cred);
+
+ _dbus_verbose ("dbus_nb_getpeereid: enter, fd=%d\n");
+ if (getsockopt (fd, 0, LOCAL_PEEREID, &cred, &len) < 0)
+ {
+ _dbus_verbose ("dbus_nb_getpeereid: getsockopt LOCAL_PEEREID failed: %s\n", strerror(errno));
+ return FALSE;
+ }
+ if (pid)
+ *pid = cred.unp_pid;
+ if (uid)
+ *uid = cred.unp_euid;
+ if (gid)
+ *gid = cred.unp_egid;
+
+ _dbus_verbose ("dbus_nb_getpeereid: returning TRUE, pid=%d uid=%d gid=%d\n",
+ cred.unp_pid, cred.unp_euid, cred.unp_egid);
+ return TRUE;
+}
+#endif
+
static dbus_bool_t
_dbus_open_socket (int *fd_p,
int domain,
@@ -972,7 +1004,7 @@ _dbus_set_local_creds (int fd, dbus_bool
{
dbus_bool_t retval = TRUE;
-#if defined(HAVE_CMSGCRED)
+#if defined(HAVE_CMSGCRED) || defined(LOCAL_PEEREID)
/* NOOP just to make sure only one codepath is used
* and to prefer CMSGCRED
*/
@@ -1677,6 +1709,11 @@ _dbus_read_credentials_socket (int
char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
} cmsg;
+#elif defined(LOCAL_PEEREID)
+ pid_t sockpid;
+ uid_t sockuid;
+ gid_t sockgid;
+
#elif defined(LOCAL_CREDS)
struct {
struct cmsghdr hdr;
@@ -1712,10 +1749,15 @@ _dbus_read_credentials_socket (int
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && !defined(LOCAL_PEEREID)
_DBUS_ZERO(cmsg);
+#ifdef HAVE_CMSGCRED
msg.msg_control = (caddr_t) &cmsg;
msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+#else /* defined(LOCAL_CREDS) */
+ msg.msg_control = &cmsg;
+ msg.msg_controllen = sizeof (cmsg);
+#endif
#endif
again:
@@ -1752,9 +1794,13 @@ _dbus_read_credentials_socket (int
return FALSE;
}
-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && !defined(LOCAL_PEEREID)
+#ifdef HAVE_CMSGCRED
if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
|| cmsg.hdr.cmsg_type != SCM_CREDS)
+#else /* defined(LOCAL_CREDS) */
+ if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
+#endif
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Message from recvmsg() was not SCM_CREDS");
@@ -1790,6 +1836,16 @@ _dbus_read_credentials_socket (int
cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
pid_read = cred->cmcred_pid;
uid_read = cred->cmcred_euid;
+#elif defined(LOCAL_PEEREID)
+ if (dbus_nb_getpeereid(client_fd, &sockpid, &sockuid, &sockgid) == TRUE)
+ {
+ pid_read = sockpid;
+ uid_read = sockuid;
+ }
+ else
+ {
+ _dbus_verbose ("Failed to dbus_nb_getpeereid() credentials: %s\n", _dbus_strerror (errno));
+ }
#elif defined(LOCAL_CREDS)
pid_read = DBUS_PID_UNSET;
uid_read = cmsg.cred.sc_uid;
@@ -1851,7 +1907,7 @@ _dbus_read_credentials_socket (int
}
if (ucred != NULL)
ucred_free (ucred);
-#else /* !SO_PEERCRED && !HAVE_CMSGCRED && !HAVE_GETPEEREID && !HAVE_GETPEERUCRED */
+#else /* !SO_PEERCRED && !HAVE_CMSGCRED && !HAVE_GETPEEREID && !HAVE_GETPEERUCRED && !LOCAL_PEEREID */
_dbus_verbose ("Socket credentials not supported on this OS\n");
#endif
}
@@ -2528,6 +2584,10 @@ _dbus_poll (DBusPollFD *fds,
_DBUS_STRUCT_OFFSET (DBusPollFD, revents) ==
_DBUS_STRUCT_OFFSET (struct pollfd, revents))
{
+ if (timeout_milliseconds < -1) {
+ _dbus_warn("_dbus_poll: timeout = %d (fixed)\n", timeout_milliseconds);
+ timeout_milliseconds = -1;
+ }
return poll ((struct pollfd*) fds,
n_fds,
timeout_milliseconds);

13
sysutils/dbus/patches/patch-ak Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ak,v 1.2 2012/08/01 17:52:22 drochner Exp $
--- dbus/Makefile.in.orig 2012-07-26 16:44:07.000000000 +0000
+++ dbus/Makefile.in
@@ -591,7 +591,7 @@ AM_CPPFLAGS = \
$(SYSTEMD_CFLAGS) \
$(VALGRIND_CFLAGS) \
-DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \
$(NULL)

25
sysutils/dbus/patches/patch-al Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-al,v 1.2 2012/08/01 17:52:22 drochner Exp $
--- tools/Makefile.in.orig 2012-07-26 16:45:13.000000000 +0000
+++ tools/Makefile.in
@@ -358,7 +358,7 @@ AM_CPPFLAGS = \
$(DBUS_STATIC_BUILD_CPPFLAGS) \
$(DBUS_X_CFLAGS) \
-DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
$(NULL)
@@ -756,9 +756,9 @@ uninstall-am: uninstall-binPROGRAMS
uninstall-binPROGRAMS
-# create the /var/lib/dbus directory for dbus-uuidgen
+# create the /var/db/dbus directory for dbus-uuidgen
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
+ $(MKDIR_P) $(DESTDIR)$(localstatedir)/db/dbus
installcheck-local:
test -d $(DESTDIR)$(localstatedir)/lib/dbus

13
sysutils/dbus/patches/patch-am Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-am,v 1.1 2008/11/15 03:59:10 chuck Exp $
--- tools/dbus-launch-x11.c.orig 2008-11-14 22:45:04.000000000 -0500
+++ tools/dbus-launch-x11.c 2008-11-14 22:45:44.000000000 -0500
@@ -143,7 +143,7 @@
*/
for (p = display; *p; ++p)
{
- if (*p == ':')
+ if (*p == ':' || *p == '/')
*p = '_';
}

31
sysutils/dbus/patches/patch-ba Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-ba,v 1.2 2012/08/01 17:52:22 drochner Exp $
--- tools/dbus-monitor.c.orig 2012-07-26 17:37:48.000000000 +0000
+++ tools/dbus-monitor.c
@@ -107,7 +107,7 @@ monitor_filter_func (DBusConnection
#ifdef __APPLE__
#define PROFILE_TIMED_FORMAT "%s\t%lu\t%d"
#else
-#define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
+#define PROFILE_TIMED_FORMAT "%s\t%llu\t%lu"
#endif
#define TRAP_NULL_STRING(str) ((str) ? (str) : "<none>")
@@ -127,7 +127,7 @@ static void
profile_print_with_attrs (const char *type, DBusMessage *message,
struct timeval *t, ProfileAttributeFlags attrs)
{
- printf (PROFILE_TIMED_FORMAT, type, t->tv_sec, t->tv_usec);
+ printf (PROFILE_TIMED_FORMAT, type, (unsigned long long)(t->tv_sec), (unsigned long)(t->tv_usec));
if (attrs & PROFILE_ATTRIBUTE_FLAG_SERIAL)
printf ("\t%u", dbus_message_get_serial (message));
@@ -197,7 +197,7 @@ print_message_profile (DBusMessage *mess
PROFILE_ATTRIBUTE_FLAG_MEMBER);
break;
default:
- printf (PROFILE_TIMED_FORMAT "\n", "tun", t.tv_sec, t.tv_usec);
+ printf (PROFILE_TIMED_FORMAT "\n", "tun", (unsigned long long)(t.tv_sec), (unsigned long)(t.tv_usec));
break;
}
}