https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/packages/dbus | 27 +++++++++++++++++++-------- lfs/dbus | 14 ++++++-------- src/patches/dbus-1.0.3-compile-fix-1.patch | 11 ----------- 3 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 src/patches/dbus-1.0.3-compile-fix-1.patch
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus index b252653..ea03334 100644 --- a/config/rootfiles/packages/dbus +++ b/config/rootfiles/packages/dbus @@ -11,7 +11,10 @@ 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,6 +31,7 @@ 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 @@ -39,15 +43,22 @@ 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.14.6 #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 var/lib/dbus -#var/run/dbus diff --git a/lfs/dbus b/lfs/dbus index 3a43106..1b7fd90 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.0.3 +VER = 1.10.8
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,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ce328423db5743fe9006d39113b5324d +$(DL_FILE)_MD5 = e912e930f249454752512aa7ac864d43 install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -75,12 +75,10 @@ $(subst %,%_MD5,$(objects)) :
$(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 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - @rm -rf $(DIR_SRC)/dbus* + @rm -rf $(DIR_APP) @$(POSTBUILD) 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 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); -
-
Marcel Lorenz