pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/39517 (gimp dosen't work)
The following reply was made to PR pkg/39517; it has been noted by GNATS.
From: Takahiro Kambe <taca%back-street.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/39517 (gimp dosen't work)
Date: Mon, 22 Sep 2008 23:09:40 +0900 (JST)
In message <20080913014114.21C8763B11D%narn.NetBSD.org@localhost>
on Sat, 13 Sep 2008 01:41:14 +0000 (UTC),
reed%NetBSD.org@localhost wrote:
> Reopened.
> The dbus bug page is https://bugs.freedesktop.org/show_bug.cgi?id=13194
> which sounds like they won't fix.
> And says "your distribution" is responsible.
I've read dbus's source code and it assume heavyly existence of
machine-id file. If it dosen't exist, dbus library abort itself.
So,
> So we need to run dbus-uuidgen automatically when installing?
Yes.
> Or get evince, gimp and others to handle problem cleaner?
It isn't the a job of application using dbus library.
I made patch for sysutils/dbus.
* 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.
Now I start gimp successfully without dumping core and running
dbus-damon.
Index: INSTALL
===================================================================
RCS file: INSTALL
diff -N INSTALL
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ INSTALL 22 Sep 2008 13:58:11 -0000
@@ -0,0 +1,9 @@
+# $NetBSD$
+
+DBUS_UUIDGEN="@PREFIX@/bin/dbus-uuidgen"
+
+case ${STAGE} in
+POST-INSTALL)
+ ${DBUS_UUIDGEN} --ensure
+ ;;
+esac
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/Makefile,v
retrieving revision 1.31
diff -u -d -u -p -r1.31 Makefile
--- Makefile 15 Aug 2008 12:15:17 -0000 1.31
+++ Makefile 22 Sep 2008 13:58:11 -0000
@@ -2,6 +2,7 @@
#
DISTNAME= dbus-1.2.3
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -24,6 +25,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEFS+= VARBASE
+OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
+
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/distinfo,v
retrieving revision 1.25
diff -u -d -u -p -r1.25 distinfo
--- distinfo 16 Aug 2008 16:38:01 -0000 1.25
+++ distinfo 22 Sep 2008 13:58:11 -0000
@@ -3,8 +3,10 @@ $NetBSD: distinfo,v 1.25 2008/08/16 16:3
SHA1 (dbus-1.2.3.tar.gz) = ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81
RMD160 (dbus-1.2.3.tar.gz) = d1a207b2a4c744f27c9c01388e80cebdb61f43f0
Size (dbus-1.2.3.tar.gz) = 1564475 bytes
-SHA1 (patch-aa) = e527a1a1f937781ce4204a325e3ff7f31fd6afa8
+SHA1 (patch-aa) = e81529adf01e9e6153fc401c903bd4136d592192
SHA1 (patch-ab) = 139feeab7d469140384a30f49d70da80fa4c03bc
SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
+SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
+SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286
Index: files/dbus.sh
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/files/dbus.sh,v
retrieving revision 1.7
diff -u -d -u -p -r1.7 dbus.sh
--- files/dbus.sh 15 Dec 2006 19:06:00 -0000 1.7
+++ files/dbus.sh 22 Sep 2008 13:58:11 -0000
@@ -16,12 +16,12 @@ pidfile="@VARBASE@/run/dbus/pid"
start_precmd=dbus_prestart
dbus_prestart() {
- for f in "@VARBASE@/lib/dbus" "@VARBASE@/run/dbus"; do
- if @TEST@ ! -d $f; then
- @MKDIR@ $f
- @CHMOD@ 0755 $f
- @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $f
- fi
+ dir="@VARBASE@/run/dbus"
+ if @TEST@ ! -d $dir; then
+ @MKDIR@ $dir
+ @CHMOD@ 0755 $dir
+ @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
+ fi
done
@PREFIX@/bin/dbus-uuidgen --ensure
}
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/patches/patch-aa,v
retrieving revision 1.7
diff -u -d -u -p -r1.7 patch-aa
--- patches/patch-aa 13 Jun 2008 11:28:35 -0000 1.7
+++ patches/patch-aa 22 Sep 2008 13:58:11 -0000
@@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.7 2008/06/13 11:28:35 drochner 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
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
$(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"; \
Index: patches/patch-ak
===================================================================
RCS file: patches/patch-ak
diff -N patches/patch-ak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ak 22 Sep 2008 13:58:11 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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"\"
+
Index: patches/patch-al
===================================================================
RCS file: patches/patch-al
diff -N patches/patch-al
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-al 22 Sep 2008 13:58:11 -0000
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- 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
+
Home |
Main Index |
Thread Index |
Old Index