Wed Sep 24 11:37:31 2008 UTC ()
Some maintainous to dbus pacakge, approved by agc@.

* Change "${VARBASE}/lib/dbus" to "${VARBASE}/db/dbus".
* Create "${VARBASE}/db/dbus" with OWN_DIRS_PERMS at install time.
* Generate "${VARBASE}/db/dbus/machine-id" file at install time.
* Install dbus-daemon-launch-helper with mode 04550 instead of 04750.

It solves start gimp successfully without running dbus-daemon as before.

Bump PKGREVISION.


(taca)
diff -r0 -r1.1 pkgsrc/sysutils/dbus/INSTALL
diff -r1.31 -r1.32 pkgsrc/sysutils/dbus/Makefile
diff -r1.25 -r1.26 pkgsrc/sysutils/dbus/distinfo
diff -r1.7 -r1.8 pkgsrc/sysutils/dbus/files/dbus.sh
diff -r1.7 -r1.8 pkgsrc/sysutils/dbus/patches/patch-aa
diff -r0 -r1.1 pkgsrc/sysutils/dbus/patches/patch-ak
diff -r0 -r1.1 pkgsrc/sysutils/dbus/patches/patch-al
File Added: pkgsrc/sysutils/dbus/INSTALL
# $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
cvs diff -r1.31 -r1.32 pkgsrc/sysutils/dbus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/Makefile 2008/08/15 12:15:17 1.31
+++ pkgsrc/sysutils/dbus/Makefile 2008/09/24 11:37:31 1.32
@@ -1,39 +1,42 @@ @@ -1,39 +1,42 @@
1# $NetBSD: Makefile,v 1.31 2008/08/15 12:15:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2008/09/24 11:37:31 taca Exp $
2# 2#
3 3
4DISTNAME= dbus-1.2.3 4DISTNAME= dbus-1.2.3
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ 7MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.freedesktop.org/Software/dbus 10HOMEPAGE= http://www.freedesktop.org/Software/dbus
10COMMENT= Message bus system 11COMMENT= Message bus system
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14CONFLICTS+= dbus-glib<0.71 15CONFLICTS+= dbus-glib<0.71
15CONFLICTS+= py*-dbus<0.71 16CONFLICTS+= py*-dbus<0.71
16 17
17GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
18USE_TOOLS+= gmake msgfmt pkg-config 19USE_TOOLS+= gmake msgfmt pkg-config
19USE_LIBTOOL= YES 20USE_LIBTOOL= YES
20 21
21PKGCONFIG_OVERRIDE= dbus-1.pc.in 22PKGCONFIG_OVERRIDE= dbus-1.pc.in
22 23
23PKG_DESTDIR_SUPPORT= user-destdir 24PKG_DESTDIR_SUPPORT= user-destdir
24 25
25BUILD_DEFS+= VARBASE 26BUILD_DEFS+= VARBASE
26 27
 28OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
 29
27.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
28 31
29CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 32CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 33CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
31 34
32#CFLAGS.NetBSD+= -D_NETBSD_SOURCE 35#CFLAGS.NetBSD+= -D_NETBSD_SOURCE
33 36
34CONFIGURE_ARGS_GROUPS= enable disable with without 37CONFIGURE_ARGS_GROUPS= enable disable with without
35 38
36CONFIGURE_ARGS.Linux= abstract-sockets dnotify selinux 39CONFIGURE_ARGS.Linux= abstract-sockets dnotify selinux
37CONFIGURE_ARGS.docs= doxygen-docs xml-docs 40CONFIGURE_ARGS.docs= doxygen-docs xml-docs
38 41
39CONFIGURE_ARGS.disable= ansi gcov 42CONFIGURE_ARGS.disable= ansi gcov
cvs diff -r1.25 -r1.26 pkgsrc/sysutils/dbus/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/distinfo 2008/08/16 16:38:01 1.25
+++ pkgsrc/sysutils/dbus/distinfo 2008/09/24 11:37:31 1.26
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.25 2008/08/16 16:38:01 drochner Exp $ 1$NetBSD: distinfo,v 1.26 2008/09/24 11:37:31 taca Exp $
2 2
3SHA1 (dbus-1.2.3.tar.gz) = ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 3SHA1 (dbus-1.2.3.tar.gz) = ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81
4RMD160 (dbus-1.2.3.tar.gz) = d1a207b2a4c744f27c9c01388e80cebdb61f43f0 4RMD160 (dbus-1.2.3.tar.gz) = d1a207b2a4c744f27c9c01388e80cebdb61f43f0
5Size (dbus-1.2.3.tar.gz) = 1564475 bytes 5Size (dbus-1.2.3.tar.gz) = 1564475 bytes
6SHA1 (patch-aa) = e527a1a1f937781ce4204a325e3ff7f31fd6afa8 6SHA1 (patch-aa) = e81529adf01e9e6153fc401c903bd4136d592192
7SHA1 (patch-ab) = 139feeab7d469140384a30f49d70da80fa4c03bc 7SHA1 (patch-ab) = 139feeab7d469140384a30f49d70da80fa4c03bc
8SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3 8SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
9SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654 9SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
10SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8 10SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
 11SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
 12SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/dbus/files/dbus.sh (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/files/dbus.sh 2006/12/15 19:06:00 1.7
+++ pkgsrc/sysutils/dbus/files/dbus.sh 2008/09/24 11:37:31 1.8
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: dbus.sh,v 1.7 2006/12/15 19:06:00 drochner Exp $ 3# $NetBSD: dbus.sh,v 1.8 2008/09/24 11:37:31 taca Exp $
4# 4#
5# PROVIDE: dbus 5# PROVIDE: dbus
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="dbus" 11name="dbus"
12rcvar=$name 12rcvar=$name
13command="@PREFIX@/bin/dbus-daemon" 13command="@PREFIX@/bin/dbus-daemon"
14command_args="--system" 14command_args="--system"
15pidfile="@VARBASE@/run/dbus/pid" 15pidfile="@VARBASE@/run/dbus/pid"
16start_precmd=dbus_prestart 16start_precmd=dbus_prestart
17 17
18dbus_prestart() { 18dbus_prestart() {
19 for f in "@VARBASE@/lib/dbus" "@VARBASE@/run/dbus"; do 19 dir="@VARBASE@/run/dbus"
20 if @TEST@ ! -d $f; then 20 if @TEST@ ! -d $dir; then
21 @MKDIR@ $f 21 @MKDIR@ $dir
22 @CHMOD@ 0755 $f 22 @CHMOD@ 0755 $dir
23 @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $f 23 @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
24 fi 24 fi
25 done 25 done
26 @PREFIX@/bin/dbus-uuidgen --ensure 26 @PREFIX@/bin/dbus-uuidgen --ensure
27} 27}
28 28
29load_rc_config $name 29load_rc_config $name
30run_rc_command "$1" 30run_rc_command "$1"
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/dbus/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/patches/Attic/patch-aa 2008/06/13 11:28:35 1.7
+++ pkgsrc/sysutils/dbus/patches/Attic/patch-aa 2008/09/24 11:37:31 1.8
@@ -1,23 +1,31 @@ @@ -1,23 +1,31 @@
1$NetBSD: patch-aa,v 1.7 2008/06/13 11:28:35 drochner Exp $ 1$NetBSD: patch-aa,v 1.8 2008/09/24 11:37:31 taca Exp $
2 2
3--- bus/Makefile.in.orig 2008-02-26 13:36:18.000000000 -0500 3--- bus/Makefile.in.orig 2008-08-07 04:43:39.000000000 +0900
4+++ bus/Makefile.in 4+++ bus/Makefile.in
5@@ -411,7 +411,7 @@ target_os = @target_os@ 5@@ -412,7 +412,7 @@ target_os = @target_os@
6 target_vendor = @target_vendor@ 6 target_vendor = @target_vendor@
7 top_builddir = @top_builddir@ 7 top_builddir = @top_builddir@
8 top_srcdir = @top_srcdir@ 8 top_srcdir = @top_srcdir@
9-configdir = $(sysconfdir)/dbus-1 9-configdir = $(sysconfdir)/dbus-1
10+configdir = $(datadir)/examples/@PACKAGE@ 10+configdir = $(datadir)/examples/@PACKAGE@
11 INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ 11 INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
12 -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ 12 -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
13 -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION 13 -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
14@@ -1291,9 +1291,6 @@ install-data-hook: 14@@ -1291,16 +1291,13 @@ install-data-hook:
15 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ 15 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
16 fi 16 fi
17 $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) 17 $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
18- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus 18- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
19- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d 19- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
20- $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d 20- $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
21 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services 21 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
22 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services 22 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
23 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1 23 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
 24 $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
 25 if test `id -u` -eq 0; then \
 26 chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
 27- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
 28+ chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
 29 else \
 30 echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
 31 echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
File Added: pkgsrc/sysutils/dbus/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2008/09/24 11:37:31 taca Exp $

--- dbus/Makefile.in.orig	2008-08-07 04:43:39.000000000 +0900
+++ dbus/Makefile.in
@@ -310,7 +310,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 configdir = $(sysconfdir)/dbus-1
 INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_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"\"
File Added: pkgsrc/sysutils/dbus/patches/Attic/patch-al
$NetBSD: patch-al,v 1.1 2008/09/24 11:37:31 taca Exp $

--- tools/Makefile.in.orig	2008-08-07 04:43:39.000000000 +0900
+++ tools/Makefile.in
@@ -301,7 +301,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 configdir = $(sysconfdir)/dbus-1
-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\"
 dbus_send_SOURCES = \
 	dbus-print-message.c			\
 	dbus-print-message.h			\
@@ -337,8 +337,8 @@ CLEANFILES = \
 	run-with-tmp-session-bus.conf
 
 
-#create the /var/lib/data directory for dbus-uuidgen
-localstatelibdir = $(localstatedir)/lib/dbus
+#create the /var/db/dbus directory for dbus-uuidgen
+localstatelibdir = $(localstatedir)/db/dbus
 localstatelib_DATA = 
 all: all-am