dbus: Update to 1.11.12

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index 4a3b5723228c77c234b5dae8e52c62a7434da1ba..d70af5a9fd04d9742df64190feaf2dd2c88aa794 100644 (file)
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -7,6 +7,7 @@ etc/avahi/services
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/smb.service
 etc/avahi/services/ssh.service
+#etc/dbus-1/system.d
 etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/init.d/avahi
 usr/bin/avahi-browse

diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index b25265321d8a55427fa0140a47b50c11f57ba795..21967684152d73186006cf17326da0fd55705e81 100644 (file)
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -1,17 +1,15 @@
-etc/rc.d/init.d/messagebus
-etc/rc.d/rc3.d/S15messagebus
-etc/rc.d/rc0.d/K85messagebus
-etc/rc.d/rc6.d/K85messagebus
 #etc/dbus-1
 etc/dbus-1/session.conf
-etc/dbus-1/session.d
 etc/dbus-1/system.conf
-etc/dbus-1/system.d
+etc/rc.d/init.d/messagebus
 usr/bin/dbus-cleanup-sockets
 usr/bin/dbus-daemon
 usr/bin/dbus-launch
 usr/bin/dbus-monitor
+usr/bin/dbus-run-session
 usr/bin/dbus-send
+usr/bin/dbus-test-tool
+usr/bin/dbus-update-activation-environment
 usr/bin/dbus-uuidgen
 #usr/include/dbus-1.0
 #usr/include/dbus-1.0/dbus
@@ -28,9 +26,13 @@ usr/bin/dbus-uuidgen
 #usr/include/dbus-1.0/dbus/dbus-server.h
 #usr/include/dbus-1.0/dbus/dbus-shared.h
 #usr/include/dbus-1.0/dbus/dbus-signature.h
+#usr/include/dbus-1.0/dbus/dbus-syntax.h
 #usr/include/dbus-1.0/dbus/dbus-threads.h
 #usr/include/dbus-1.0/dbus/dbus-types.h
 #usr/include/dbus-1.0/dbus/dbus.h
+#usr/lib/cmake/DBus1
+#usr/lib/cmake/DBus1/DBus1Config.cmake
+#usr/lib/cmake/DBus1/DBus1ConfigVersion.cmake
 #usr/lib/dbus-1.0
 #usr/lib/dbus-1.0/include
 #usr/lib/dbus-1.0/include/dbus
@@ -39,15 +41,25 @@ usr/bin/dbus-uuidgen
 #usr/lib/libdbus-1.la
 usr/lib/libdbus-1.so
 usr/lib/libdbus-1.so.3
-usr/lib/libdbus-1.so.3.2.0
+usr/lib/libdbus-1.so.3.16.4
 #usr/lib/pkgconfig/dbus-1.pc
+usr/libexec/dbus-daemon-launch-helper
 #usr/share/dbus-1
 usr/share/dbus-1/services
-#usr/share/man/man1/dbus-cleanup-sockets.1
-#usr/share/man/man1/dbus-daemon.1
-#usr/share/man/man1/dbus-launch.1
-#usr/share/man/man1/dbus-monitor.1
-#usr/share/man/man1/dbus-send.1
-#usr/share/man/man1/dbus-uuidgen.1
+usr/share/dbus-1/session.conf
+usr/share/dbus-1/session.d
+usr/share/dbus-1/system-services
+usr/share/dbus-1/system.conf
+usr/share/dbus-1/system.d
+#usr/share/doc/dbus
+#usr/share/doc/dbus/diagram.png
+#usr/share/doc/dbus/diagram.svg
+#usr/share/doc/dbus/examples
+#usr/share/doc/dbus/examples/GetAllMatchRules.py
+#usr/share/doc/dbus/examples/example-session-disable-stats.conf
+#usr/share/doc/dbus/examples/example-system-enable-stats.conf
+#usr/share/doc/dbus/system-activation.txt
+#usr/share/xml/dbus-1
+#usr/share/xml/dbus-1/busconfig.dtd
+#usr/share/xml/dbus-1/introspect.dtd
 var/lib/dbus
-#var/run/dbus

diff --git a/lfs/dbus b/lfs/dbus
index fdbad474be59848a0b9f24b43cba612faad5f91b..a1e68f2d195e515e71fce6a1532aeec4ebc1b834 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.3
+VER        = 1.11.12
 
 THISAPP    = dbus-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dbus
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ce328423db5743fe9006d39113b5324d
+$(DL_FILE)_MD5 = 76cdf92ca208652ee487b1e9dfda1093
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -77,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_SRC)/dbus*
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dbus-1.0.3-compile-fix-1.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                                     --localstatedir=/var
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/src/paks/dbus/install.sh b/src/paks/dbus/install.sh
index 8b5c749bef335afb8cce1ba976ed753d9405c706..bf4e5a6d5869a9208dc80f39e1ab75ab325e31a1 100644 (file)
--- a/src/paks/dbus/install.sh
+++ b/src/paks/dbus/install.sh
@@ -24,4 +24,10 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 useradd messagebus
-start_service ${NAME}
+
+# Create start links
+ln -svf  ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus
+ln -svf  ../init.d/messagebus /etc/rc.d/rc0.d/K85messagebus
+ln -svf  ../init.d/messagebus /etc/rc.d/rc6.d/K85messagebus
+
+start_service messagebus

diff --git a/src/paks/dbus/uninstall.sh b/src/paks/dbus/uninstall.sh
index f5b8042aed4512c366cad4e79a80d219368c36f7..49fc30e300fa9cdd87e476f148de80a6c06e4024 100644 (file)
--- a/src/paks/dbus/uninstall.sh
+++ b/src/paks/dbus/uninstall.sh
@@ -23,4 +23,8 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+
+# Remove start files
+rm -rf /etc/rc.d/rc*.d/*messagebus
+
 remove_files

diff --git a/src/patches/dbus-1.0.3-compile-fix-1.patch b/src/patches/dbus-1.0.3-compile-fix-1.patch
deleted file mode 100644 (file)
index 86fd2b3..0000000
--- a/src/patches/dbus-1.0.3-compile-fix-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c   2009-01-01 03:50:33.000000000 +0200
-+++ dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c   2009-01-01 04:09:24.000000000 +0200
-@@ -992,7 +992,7 @@ 
-   _dbus_verbose ("read credentials byte\n");
- 
-   {
--#ifdef SO_PEERCRED
-+#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED)
-     struct ucred cr;   
-     int cr_len = sizeof (cr);
-