Author: ranger Date: Wed Sep 10 23:06:31 2008 New Revision: 1249 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1249&repname=user%3a+ranger> Log: fixored
Modified: trunk/experimental/common/main/finkinfo/libs/dbus.info trunk/experimental/common/main/finkinfo/libs/dbus.patch Modified: trunk/experimental/common/main/finkinfo/libs/dbus.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.info&rev=1249&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/libs/dbus.info (original) +++ trunk/experimental/common/main/finkinfo/libs/dbus.info Wed Sep 10 23:06:31 2008 @@ -32,7 +32,7 @@ Source3ExtractDir: %n-%v PatchFile: %n.patch -PatchFile-MD5: 8644311da150d31672651d655d6809c1 +PatchFile-MD5: 9c0d96ab1ffd2b5bfd9113b3ec6f192b PatchScript: /usr/bin/sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | /usr/bin/patch -p1 @@ -104,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/ @@ -163,6 +162,18 @@ 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 "" +read -t 10 FOO || : +exit 0 +<< + PostInstScript: << if [ "$1" = "configure" ]; then if [ -x "%p/bin/daemonic" ]; then @@ -192,7 +203,11 @@ </service> << +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/ -DescPackaging: << - self-test fails under --build-as-nobody -<< Modified: trunk/experimental/common/main/finkinfo/libs/dbus.patch URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.patch&rev=1249&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/libs/dbus.patch (original) +++ trunk/experimental/common/main/finkinfo/libs/dbus.patch Wed Sep 10 23:06:31 2008 @@ -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,14 +36,16 @@ .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 @@ -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"` @@ -76,25 +104,3 @@ +fi + +exit 0 ---- dbus/dbus/dbus-sysdeps-unix.c.orig 2008-08-06 13:00:29.000000000 -0400 -+++ dbus/dbus/dbus-sysdeps-unix.c 2008-08-10 15:04:32.000000000 -0400 -@@ -1493,7 +1497,7 @@ fill_user_info (DBusUserInfo *info - /* retrieve maximum needed size for buf */ - buflen = sysconf (_SC_GETPW_R_SIZE_MAX); - -- if (buflen <= 0) -+ if ((long) buflen <= 0) - buflen = 1024; - - result = -1; ---- dbus/dbus/dbus-sysdeps-util-unix.c.orig 2008-08-10 15:04:41.000000000 -0400 -+++ dbus/dbus/dbus-sysdeps-util-unix.c 2008-08-10 15:05:16.000000000 -0400 -@@ -836,7 +836,7 @@ fill_group_info (DBusGroupInfo *info, - /* retrieve maximum needed size for buf */ - buflen = sysconf (_SC_GETGR_R_SIZE_MAX); - -- if (buflen <= 0) -+ if ((long) buflen <= 0) - buflen = 1024; - - result = -1; ------------------------------------------------------------------------- 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