summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2011-02-01 11:10:25 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-02-08 14:24:11 +0100
commit88013259211e91e8ea7bc557000f1a46bfe8136b (patch)
treeaf360d9f47ca7ddf60bc0a3decec911de88e2f4f /patches
parent3295046e1772369c5cbe0ba7efbbee5753be31d5 (diff)
downloadptxdist-88013259211e91e8ea7bc557000f1a46bfe8136b.tar.gz
ptxdist-88013259211e91e8ea7bc557000f1a46bfe8136b.tar.xz
dbus: version bump 1.4.0 -> 1.4.1
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch (renamed from patches/dbus-1.4.0/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch)12
-rw-r--r--patches/dbus-1.4.1/0003-make-dbus-1.pc-relocatable.patch (renamed from patches/dbus-1.4.0/0003-make-dbus-1.pc-relocatable.patch)14
-rw-r--r--patches/dbus-1.4.1/0004-use-SOCK_CLOEXEC-only-if-available.patch (renamed from patches/dbus-1.4.0/0004-use-SOCK_CLOEXEC-only-if-available.patch)6
l---------patches/dbus-1.4.1/autogen.sh (renamed from patches/dbus-1.4.0/autogen.sh)0
-rw-r--r--patches/dbus-1.4.1/series (renamed from patches/dbus-1.4.0/series)0
5 files changed, 16 insertions, 16 deletions
diff --git a/patches/dbus-1.4.0/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch b/patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
index b56a0ce55..c48550d5c 100644
--- a/patches/dbus-1.4.0/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
+++ b/patches/dbus-1.4.1/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
@@ -16,10 +16,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
tools/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: dbus-1.3.2/dbus/Makefile.am
+Index: dbus-1.4.1/dbus/Makefile.am
===================================================================
---- dbus-1.3.2.orig/dbus/Makefile.am
-+++ dbus-1.3.2/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
@@ -29,10 +29,10 @@ Index: dbus-1.3.2/dbus/Makefile.am
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
-Index: dbus-1.3.2/tools/Makefile.am
+Index: dbus-1.4.1/tools/Makefile.am
===================================================================
---- dbus-1.3.2.orig/tools/Makefile.am
-+++ dbus-1.3.2/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
diff --git a/patches/dbus-1.4.0/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.4.1/0003-make-dbus-1.pc-relocatable.patch
index d26b2ad03..886624198 100644
--- a/patches/dbus-1.4.0/0003-make-dbus-1.pc-relocatable.patch
+++ b/patches/dbus-1.4.1/0003-make-dbus-1.pc-relocatable.patch
@@ -13,11 +13,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
dbus-1.pc.in | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
-Index: dbus-1.4.0/configure.in
+Index: dbus-1.4.1/configure.in
===================================================================
---- dbus-1.4.0.orig/configure.in
-+++ dbus-1.4.0/configure.in
-@@ -1466,10 +1466,13 @@ AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_D
+--- 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
@@ -31,10 +31,10 @@ Index: dbus-1.4.0/configure.in
AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon])
#### Directory to install the other binaries
-Index: dbus-1.4.0/dbus-1.pc.in
+Index: dbus-1.4.1/dbus-1.pc.in
===================================================================
---- dbus-1.4.0.orig/dbus-1.pc.in
-+++ dbus-1.4.0/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@
diff --git a/patches/dbus-1.4.0/0004-use-SOCK_CLOEXEC-only-if-available.patch b/patches/dbus-1.4.1/0004-use-SOCK_CLOEXEC-only-if-available.patch
index 80a5af89a..c8a54068c 100644
--- a/patches/dbus-1.4.0/0004-use-SOCK_CLOEXEC-only-if-available.patch
+++ b/patches/dbus-1.4.1/0004-use-SOCK_CLOEXEC-only-if-available.patch
@@ -5,10 +5,10 @@ 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.3.2/dbus/sd-daemon.c
+Index: dbus-1.4.1/dbus/sd-daemon.c
===================================================================
---- dbus-1.3.2.orig/dbus/sd-daemon.c
-+++ dbus-1.3.2/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"
diff --git a/patches/dbus-1.4.0/autogen.sh b/patches/dbus-1.4.1/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/dbus-1.4.0/autogen.sh
+++ b/patches/dbus-1.4.1/autogen.sh
diff --git a/patches/dbus-1.4.0/series b/patches/dbus-1.4.1/series
index ef803ac61..ef803ac61 100644
--- a/patches/dbus-1.4.0/series
+++ b/patches/dbus-1.4.1/series