summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/dbus-1.4.8/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch (renamed from patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch)0
-rw-r--r--patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch (renamed from patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch)8
-rw-r--r--patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch (renamed from patches/dbus-1.4.6/0004-use-SOCK_CLOEXEC-only-if-available.patch)0
l---------patches/dbus-1.4.8/autogen.sh (renamed from patches/dbus-1.4.6/autogen.sh)0
-rw-r--r--patches/dbus-1.4.8/series (renamed from patches/dbus-1.4.6/series)0
-rw-r--r--rules/dbus.make2
6 files changed, 5 insertions, 5 deletions
diff --git a/patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch b/patches/dbus-1.4.8/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
index c48550d5c..c48550d5c 100644
--- a/patches/dbus-1.4.6/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
+++ b/patches/dbus-1.4.8/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
diff --git a/patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch
index 886624198..29e3a8735 100644
--- a/patches/dbus-1.4.6/0003-make-dbus-1.pc-relocatable.patch
+++ b/patches/dbus-1.4.8/0003-make-dbus-1.pc-relocatable.patch
@@ -9,14 +9,14 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
# 20100825 wsa: according to mol not necessary for mainline.
- configure.in | 3 +++
+ configure.ac | 3 +++
dbus-1.pc.in | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
-Index: dbus-1.4.1/configure.in
+Index: dbus-1.4.1/configure.ac
===================================================================
---- dbus-1.4.1.orig/configure.in
-+++ dbus-1.4.1/configure.in
+--- 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
diff --git a/patches/dbus-1.4.6/0004-use-SOCK_CLOEXEC-only-if-available.patch b/patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch
index c8a54068c..c8a54068c 100644
--- a/patches/dbus-1.4.6/0004-use-SOCK_CLOEXEC-only-if-available.patch
+++ b/patches/dbus-1.4.8/0004-use-SOCK_CLOEXEC-only-if-available.patch
diff --git a/patches/dbus-1.4.6/autogen.sh b/patches/dbus-1.4.8/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/dbus-1.4.6/autogen.sh
+++ b/patches/dbus-1.4.8/autogen.sh
diff --git a/patches/dbus-1.4.6/series b/patches/dbus-1.4.8/series
index ef803ac61..ef803ac61 100644
--- a/patches/dbus-1.4.6/series
+++ b/patches/dbus-1.4.8/series
diff --git a/rules/dbus.make b/rules/dbus.make
index 7e230447a..7ff06ddda 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
#
# Paths and names
#
-DBUS_VERSION := 1.4.6
+DBUS_VERSION := 1.4.8
DBUS := dbus-$(DBUS_VERSION)
DBUS_SUFFIX := tar.gz
DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)