Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25097
Modified Files:
dbus.info dbus.patch
Log Message:
more fixups of dbus
Index: dbus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/dbus.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dbus.info 9 Sep 2008 19:32:57 -0000 1.23
+++ dbus.info 11 Sep 2008 01:36:27 -0000 1.24
@@ -1,6 +1,6 @@
Package: dbus
Version: 1.2.3
-Revision: 5
+Revision: 6
Description: Message bus system for applications
License: OSI-Approved
# dual license: Academic Free License, GPL2
@@ -8,6 +8,7 @@
BuildDepends: <<
expat1,
+ fink (>= 0.24.12-1),
gettext-tools,
glib2-dev (>= 2.12.0-1),
libgettext3-dev,
@@ -30,7 +31,10 @@
Source3-MD5: d3b716a7e798faa1c6a867675f00306a
Source3ExtractDir: %n-%v
-PatchScript: /usr/bin/sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch |
/usr/bin/patch -p1
+PatchFile: %n.patch
+PatchFile-MD5: 9c0d96ab1ffd2b5bfd9113b3ec6f192b
+
+PatchScript: /usr/bin/sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} |
/usr/bin/patch -p1
SetCFLAGS: -Os -g
ConfigureParams: <<
@@ -100,7 +104,6 @@
perl -pi -e 's,%b/tmproot,,' %i/lib/*.la
install -d -m 755 "%i/var/lib/dbus" "%i/var/run/dbus" "%i/share/dbus"
"%i/share/dbus-1" "%i/etc/dbus-1"
- chown -R messagebus:messagebus "%i/var/lib/dbus" "%i/var/run/dbus"
"%i/share/dbus" "%i/share/dbus-1" "%i/etc/dbus-1"
# the rest
install -c -m 755 start-*-bus.sh %i/bin/
@@ -159,6 +162,21 @@
DocFiles: COPYING
<<
+PreInstScript: <<
+echo "*** WARNING ***"
+echo ""
+echo "D-Bus starts a system and session bus on your system by default,"
+echo "or a lot of stuff would break. If you don't want it to do that,"
+echo "touch the file '%p/etc/dbus-1/disable-dbus'. Be warned that many"
+echo "Gnome (and other) packages will fail without D-Bus."
+echo ""
+echo "If you want to disable the system bus, you can run:"
+echo " %p/bin/daemonic disable %N"
+echo ""
+read -t 10 FOO || :
+exit 0
+<<
+
PostInstScript: <<
if [ "$1" = "configure" ]; then
if [ -x "%p/bin/daemonic" ]; then
@@ -166,7 +184,8 @@
%p/bin/daemonic enable %N >/dev/null 2>&1 || :
fi
fi
- %p/bin/start-system-bus.sh >/tmp/dbus-postinst.log 2>&1 || :
+ chown -R messagebus:messagebus "%p/var/lib/dbus" "%p/var/run/dbus"
"%p/share/dbus" "%p/share/dbus-1" "%p/etc/dbus-1"
+ %p/bin/start-system-bus.sh >/tmp/dbus-postinst.log 2>&1 || :
<<
PostRmScript: <<
if [ "$1" = "remove" ]; then
@@ -187,7 +206,11 @@
</service>
<<
-Homepage: http://dbus.freedesktop.org/
-DescPackaging: <<
- self-test fails under --build-as-nobody
+DescDetail: <<
+By default, D-Bus will enable the session bus whenever you create a
+fink-enabled shell (ie, use %p/bin/init.sh). You can disable this
+by touching the file %p/etc/dbus-1/disable-dbus -- the D-Bus
+startup scripts will then do nothing.
<<
+
+Homepage: http://dbus.freedesktop.org/
Index: dbus.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/dbus.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dbus.patch 9 Sep 2008 19:32:57 -0000 1.7
+++ dbus.patch 11 Sep 2008 01:36:27 -0000 1.8
@@ -1,6 +1,30 @@
+diff -Nurd dbus-1.2.3/dbus/dbus-sysdeps-unix.c
dbus-1.2.3-new/dbus/dbus-sysdeps-unix.c
+--- dbus-1.2.3/dbus/dbus-sysdeps-unix.c 2008-08-06 13:00:29.000000000
-0400
++++ dbus-1.2.3-new/dbus/dbus-sysdeps-unix.c 2008-09-10 16:04:09.000000000
-0400
+@@ -1493,7 +1493,7 @@
+ /* retrieve maximum needed size for buf */
+ buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
+
+- if (buflen <= 0)
++ if ((long) buflen <= 0)
+ buflen = 1024;
+
+ result = -1;
+diff -Nurd dbus-1.2.3/dbus/dbus-sysdeps-util-unix.c
dbus-1.2.3-new/dbus/dbus-sysdeps-util-unix.c
+--- dbus-1.2.3/dbus/dbus-sysdeps-util-unix.c 2008-08-06 13:00:29.000000000
-0400
++++ dbus-1.2.3-new/dbus/dbus-sysdeps-util-unix.c 2008-09-10
16:04:09.000000000 -0400
+@@ -836,7 +836,7 @@
+ /* retrieve maximum needed size for buf */
+ buflen = sysconf (_SC_GETGR_R_SIZE_MAX);
+
+- if (buflen <= 0)
++ if ((long) buflen <= 0)
+ buflen = 1024;
+
+ result = -1;
diff -Nurd dbus-1.2.3/dbus-glib-0.76/tools/Makefile.in
dbus-1.2.3-new/dbus-glib-0.76/tools/Makefile.in
--- dbus-1.2.3/dbus-glib-0.76/tools/Makefile.in 2008-06-05
14:55:41.000000000 -0400
-+++ dbus-1.2.3-new/dbus-glib-0.76/tools/Makefile.in 2008-09-09
12:36:03.000000000 -0400
++++ dbus-1.2.3-new/dbus-glib-0.76/tools/Makefile.in 2008-09-10
16:04:09.000000000 -0400
@@ -484,7 +484,7 @@
@[EMAIL PROTECTED]: $(INTROSPECT_XML_PATH)
@USE_INTROSPECT_XML_TRUE@ cp $(INTROSPECT_XML_PATH)
dbus-bus-introspect.xml
@@ -12,15 +36,17 @@
.NOEXPORT:
diff -Nurd dbus-1.2.3/start-session-bus.sh dbus-1.2.3-new/start-session-bus.sh
--- dbus-1.2.3/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.3-new/start-session-bus.sh 2008-09-09 12:38:29.000000000
-0400
-@@ -0,0 +1,43 @@
++++ dbus-1.2.3-new/start-session-bus.sh 2008-09-10 16:10:02.000000000
-0400
+@@ -0,0 +1,45 @@
+#!/bin/sh
+
-+
-+
+DO_SH=0
+DO_CSH=0
+
++if [ -f "@FINKPREFIX@/etc/dbus-1/disable-dbus" ]; then
++ exit 0
++fi
++
+for arg in "$@"; do
+ case "$arg" in
+ --sh-syntax) DO_SH=1 ;;
@@ -59,11 +85,13 @@
+exit 0
diff -Nurd dbus-1.2.3/start-system-bus.sh dbus-1.2.3-new/start-system-bus.sh
--- dbus-1.2.3/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.3-new/start-system-bus.sh 2008-09-09 12:38:42.000000000 -0400
-@@ -0,0 +1,15 @@
++++ dbus-1.2.3-new/start-system-bus.sh 2008-09-10 16:10:06.000000000 -0400
+@@ -0,0 +1,17 @@
+#!/bin/sh
+
-+
++if [ -f "@FINKPREFIX@/etc/dbus-1/disable-dbus" ]; then
++ exit 0
++fi
+
+if [ -f "@FINKPREFIX@/var/run/dbus/pid" ]; then
+ PID=`cat "@FINKPREFIX@/var/run/dbus/pid"`
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
