From ef496af0feaf44117dd4645b51bae212032a90e4 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 22 Feb 2011 15:30:01 +0100 Subject: dbus: version bump 1.4.1 -> 1.4.6 Signed-off-by: Michael Olbrich --- ...2-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch | 43 ------------------ .../0003-make-dbus-1.pc-relocatable.patch | 52 ---------------------- .../0004-use-SOCK_CLOEXEC-only-if-available.patch | 23 ---------- patches/dbus-1.4.1/autogen.sh | 1 - patches/dbus-1.4.1/series | 3 -- ...2-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch | 43 ++++++++++++++++++ .../0003-make-dbus-1.pc-relocatable.patch | 52 ++++++++++++++++++++++ .../0004-use-SOCK_CLOEXEC-only-if-available.patch | 23 ++++++++++ patches/dbus-1.4.6/autogen.sh | 1 + patches/dbus-1.4.6/series | 3 ++ 10 files changed, 122 insertions(+), 122 deletions(-) delete mode 100644 patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch delete mode 100644 patches/dbus-1.4.1/0003-make-dbus-1.pc-relocatable.patch delete mode 100644 patches/dbus-1.4.1/0004-use-SOCK_CLOEXEC-only-if-available.patch delete mode 120000 patches/dbus-1.4.1/autogen.sh delete mode 100644 patches/dbus-1.4.1/series create mode 100644 patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch create mode 100644 patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch create mode 100644 patches/dbus-1.4.6/0004-use-SOCK_CLOEXEC-only-if-available.patch create mode 120000 patches/dbus-1.4.6/autogen.sh create mode 100644 patches/dbus-1.4.6/series (limited to 'patches') diff --git a/patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch b/patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch deleted file mode 100644 index c48550d5c..000000000 --- a/patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0abe80a736147a55fbae630aaf3b7bd70493b74a Mon Sep 17 00:00:00 2001 -From: Michael Olbrich -Date: Sun, 31 May 2009 09:38:33 +0200 -Subject: [PATCH 2/3] dbus: change DBUS_MACHINE_UUID_FILE path - -Change the path for DBUS_MACHINE_UUID_FILE from /var/lib/dbus/machine-id -to /var/run/dbus/machine-id. This is necessary because /var/lib may be a -readonly filesystem. -This is a special situation in our BSPs. This patch is not intended for -upstream. - -Signed-off-by: Michael Olbrich -Signed-off-by: Marc Kleine-Budde ---- - dbus/Makefile.am | 2 +- - tools/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: dbus-1.4.1/dbus/Makefile.am -=================================================================== ---- dbus-1.4.1.orig/dbus/Makefile.am -+++ dbus-1.4.1/dbus/Makefile.am -@@ -2,7 +2,7 @@ - configdir=$(sysconfdir)/dbus-1 - - INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION \ -- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ -+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" - -Index: dbus-1.4.1/tools/Makefile.am -=================================================================== ---- dbus-1.4.1.orig/tools/Makefile.am -+++ dbus-1.4.1/tools/Makefile.am -@@ -1,6 +1,6 @@ - configdir=$(sysconfdir)/dbus-1 - --INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" -+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" - - extra_bin_programs= - if DBUS_UNIX diff --git a/patches/dbus-1.4.1/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.4.1/0003-make-dbus-1.pc-relocatable.patch deleted file mode 100644 index 886624198..000000000 --- a/patches/dbus-1.4.1/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 -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 ---- -# 20100825 wsa: according to mol not necessary for mainline. - - configure.in | 3 +++ - dbus-1.pc.in | 6 +++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -Index: dbus-1.4.1/configure.in -=================================================================== ---- dbus-1.4.1.orig/configure.in -+++ dbus-1.4.1/configure.in -@@ -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.1/0004-use-SOCK_CLOEXEC-only-if-available.patch b/patches/dbus-1.4.1/0004-use-SOCK_CLOEXEC-only-if-available.patch deleted file mode 100644 index c8a54068c..000000000 --- a/patches/dbus-1.4.1/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.1/autogen.sh b/patches/dbus-1.4.1/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/dbus-1.4.1/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/dbus-1.4.1/series b/patches/dbus-1.4.1/series deleted file mode 100644 index ef803ac61..000000000 --- a/patches/dbus-1.4.1/series +++ /dev/null @@ -1,3 +0,0 @@ -0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch -0003-make-dbus-1.pc-relocatable.patch -0004-use-SOCK_CLOEXEC-only-if-available.patch diff --git a/patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch b/patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch new file mode 100644 index 000000000..c48550d5c --- /dev/null +++ b/patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch @@ -0,0 +1,43 @@ +From 0abe80a736147a55fbae630aaf3b7bd70493b74a Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Sun, 31 May 2009 09:38:33 +0200 +Subject: [PATCH 2/3] dbus: change DBUS_MACHINE_UUID_FILE path + +Change the path for DBUS_MACHINE_UUID_FILE from /var/lib/dbus/machine-id +to /var/run/dbus/machine-id. This is necessary because /var/lib may be a +readonly filesystem. +This is a special situation in our BSPs. This patch is not intended for +upstream. + +Signed-off-by: Michael Olbrich +Signed-off-by: Marc Kleine-Budde +--- + dbus/Makefile.am | 2 +- + tools/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: dbus-1.4.1/dbus/Makefile.am +=================================================================== +--- dbus-1.4.1.orig/dbus/Makefile.am ++++ dbus-1.4.1/dbus/Makefile.am +@@ -2,7 +2,7 @@ + configdir=$(sysconfdir)/dbus-1 + + INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION \ +- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ ++ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" + +Index: dbus-1.4.1/tools/Makefile.am +=================================================================== +--- dbus-1.4.1.orig/tools/Makefile.am ++++ dbus-1.4.1/tools/Makefile.am +@@ -1,6 +1,6 @@ + configdir=$(sysconfdir)/dbus-1 + +-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" ++INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" + + extra_bin_programs= + if DBUS_UNIX diff --git a/patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch new file mode 100644 index 000000000..886624198 --- /dev/null +++ b/patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch @@ -0,0 +1,52 @@ +From 0ceaf99bf18517bf76eb0cd4400a569daa0224ec Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +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 +--- +# 20100825 wsa: according to mol not necessary for mainline. + + configure.in | 3 +++ + dbus-1.pc.in | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +Index: dbus-1.4.1/configure.in +=================================================================== +--- dbus-1.4.1.orig/configure.in ++++ dbus-1.4.1/configure.in +@@ -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.6/0004-use-SOCK_CLOEXEC-only-if-available.patch b/patches/dbus-1.4.6/0004-use-SOCK_CLOEXEC-only-if-available.patch new file mode 100644 index 000000000..c8a54068c --- /dev/null +++ b/patches/dbus-1.4.6/0004-use-SOCK_CLOEXEC-only-if-available.patch @@ -0,0 +1,23 @@ +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.6/autogen.sh b/patches/dbus-1.4.6/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/dbus-1.4.6/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/dbus-1.4.6/series b/patches/dbus-1.4.6/series new file mode 100644 index 000000000..ef803ac61 --- /dev/null +++ b/patches/dbus-1.4.6/series @@ -0,0 +1,3 @@ +0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch +0003-make-dbus-1.pc-relocatable.patch +0004-use-SOCK_CLOEXEC-only-if-available.patch -- cgit v1.2.3