diff options
| author | taca <taca> | 2008-09-24 11:37:31 +0000 |
|---|---|---|
| committer | taca <taca> | 2008-09-24 11:37:31 +0000 |
| commit | 8e069c566147bfec906697f04abfe9cd81edb09f (patch) | |
| tree | 764039895c547327e1b2b7590b88543d8f3e1a1f /sysutils/dbus/patches/patch-aa | |
| parent | dc61d2b205622dfcff378c5615f65ffdb539a863 (diff) | |
| download | pkgsrc-8e069c566147bfec906697f04abfe9cd81edb09f.tar.gz | |
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.
Diffstat (limited to 'sysutils/dbus/patches/patch-aa')
| -rw-r--r-- | sysutils/dbus/patches/patch-aa | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa index 9a3c7ea0648..a4fd25d03be 100644 --- a/sysutils/dbus/patches/patch-aa +++ b/sysutils/dbus/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2008/06/13 11:28:35 drochner Exp $ +$NetBSD: patch-aa,v 1.8 2008/09/24 11:37:31 taca Exp $ ---- bus/Makefile.in.orig 2008-02-26 13:36:18.000000000 -0500 +--- bus/Makefile.in.orig 2008-08-07 04:43:39.000000000 +0900 +++ bus/Makefile.in -@@ -411,7 +411,7 @@ target_os = @target_os@ +@@ -412,7 +412,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2008/06/13 11:28:35 drochner Exp $ INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION -@@ -1291,9 +1291,6 @@ install-data-hook: +@@ -1291,16 +1291,13 @@ install-data-hook: chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ fi $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) @@ -21,3 +21,11 @@ $NetBSD: patch-aa,v 1.7 2008/06/13 11:28:35 drochner Exp $ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1 + $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir) + if test `id -u` -eq 0; then \ + chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ +- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ ++ chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ + else \ + echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \ + echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \ |