diff options
| -rw-r--r-- | patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch | 52 | ||||
| -rw-r--r-- | patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch | 23 | ||||
| l--------- | patches/dbus-1.4.8/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/dbus-1.4.8/series | 2 | ||||
| -rw-r--r-- | rules/dbus.make | 6 |
5 files changed, 2 insertions, 82 deletions
diff --git a/patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch deleted file mode 100644 index 29e3a8735..000000000 --- a/patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0ceaf99bf18517bf76eb0cd4400a569daa0224ec Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Mon, 5 Jul 2010 17:04:38 +0200 -Subject: [PATCH 3/3] make dbus-1.pc relocatable - -Don't use expanded paths in dbus-1.pc.in - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- -# 20100825 wsa: according to mol not necessary for mainline. - - configure.ac | 3 +++ - dbus-1.pc.in | 6 +++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -Index: dbus-1.4.1/configure.ac -=================================================================== ---- dbus-1.4.1.orig/configure.ac -+++ dbus-1.4.1/configure.ac -@@ -1510,10 +1510,13 @@ AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_D - #### Directory to install dbus-daemon - if test -z "$with_dbus_daemondir" ; then - DBUS_DAEMONDIR=$EXPANDED_BINDIR -+ RELATIVE_DBUS_DAEMONDIR=$bindir - else - DBUS_DAEMONDIR=$with_dbus_daemondir -+ RELATIVE_DBUS_DAEMONDIR=$with_dbus_daemondir - fi - AC_SUBST(DBUS_DAEMONDIR) -+AC_SUBST(RELATIVE_DBUS_DAEMONDIR) - AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon]) - - #### Directory to install the other binaries -Index: dbus-1.4.1/dbus-1.pc.in -=================================================================== ---- dbus-1.4.1.orig/dbus-1.pc.in -+++ dbus-1.4.1/dbus-1.pc.in -@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ - system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@ --sysconfdir=@EXPANDED_SYSCONFDIR@ --session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services -+sysconfdir=@sysconfdir@ -+session_bus_services_dir=@datadir@/dbus-1/services - system_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/system-services - interfaces_dir=@EXPANDED_DATADIR@/dbus-1/interfaces --daemondir=@DBUS_DAEMONDIR@ -+daemondir=@RELATIVE_DBUS_DAEMONDIR@ - - Name: dbus - Description: Free desktop message bus diff --git a/patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch b/patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch deleted file mode 100644 index c8a54068c..000000000 --- a/patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch +++ /dev/null @@ -1,23 +0,0 @@ -sd-daemon.c: In function 'sd_notify': -sd-daemon.c:356: error: 'SOCK_CLOEXEC' undeclared (first use in this function) - ---- - dbus/sd-daemon.c | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: dbus-1.4.1/dbus/sd-daemon.c -=================================================================== ---- dbus-1.4.1.orig/dbus/sd-daemon.c -+++ dbus-1.4.1/dbus/sd-daemon.c -@@ -43,6 +43,11 @@ - - #include "sd-daemon.h" - -+/* only available on linux >= 2.6.27 */ -+#ifndef SOCK_CLOEXEC -+#define SOCK_CLOEXEC 0 -+#endif -+ - int sd_listen_fds(int unset_environment) { - - #if defined(DISABLE_SYSTEMD) || !defined(__linux__) diff --git a/patches/dbus-1.4.8/autogen.sh b/patches/dbus-1.4.8/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/dbus-1.4.8/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/dbus-1.4.8/series b/patches/dbus-1.4.8/series deleted file mode 100644 index cd419445f..000000000 --- a/patches/dbus-1.4.8/series +++ /dev/null @@ -1,2 +0,0 @@ -0003-make-dbus-1.pc-relocatable.patch -0004-use-SOCK_CLOEXEC-only-if-available.patch diff --git a/rules/dbus.make b/rules/dbus.make index 5b32f8f61..173be7943 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus # # Paths and names # -DBUS_VERSION := 1.4.8 -DBUS_MD5 := e30253e15f0f4e6c5ee9e6f0eba5046c +DBUS_VERSION := 1.4.10 +DBUS_MD5 := 402a2f8102bedbe236e2891b2b0f31c2 DBUS := dbus-$(DBUS_VERSION) DBUS_SUFFIX := tar.gz DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) @@ -122,8 +122,6 @@ $(STATEDIR)/dbus.targetinstall: @$(call install_alternative, dbus, 0, 0, 0755, \ /etc/rc.once.d/dbus) - @$(call install_link, dbus, /etc/machine-id, \ - /var/lib/dbus/machine-id) # # # # create system.d and event.d directories, which are used by the configuration and startup files |