diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build index bb258f5c8d..920be07ca5 100755 --- a/packages/sysutils/dbus/build +++ b/packages/sysutils/dbus/build @@ -41,7 +41,6 @@ mkdir -p .build-target && cd .build-target --disable-checks \ --disable-xml-docs \ --disable-doxygen-docs \ - --disable-gcov \ --enable-abstract-sockets \ --disable-selinux \ --disable-libaudit \ diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta index 3ba92a7a79..c9d427d781 100644 --- a/packages/sysutils/dbus/meta +++ b/packages/sysutils/dbus/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="dbus" -PKG_VERSION="1.4.1" +PKG_VERSION="1.4.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/dbus/patches/dbus-1.4.6-remove_pie.patch b/packages/sysutils/dbus/patches/dbus-1.4.6-remove_pie.patch new file mode 100644 index 0000000000..192e401c94 --- /dev/null +++ b/packages/sysutils/dbus/patches/dbus-1.4.6-remove_pie.patch @@ -0,0 +1,42 @@ +diff -Naur dbus-1.4.6-old/bus/Makefile.am dbus-1.4.6-new/bus/Makefile.am +--- dbus-1.4.6-old/bus/Makefile.am 2011-02-17 08:15:23.000000000 -0800 ++++ dbus-1.4.6-new/bus/Makefile.am 2011-02-18 09:11:44.000000000 -0800 +@@ -1,7 +1,7 @@ + + configdir=$(sysconfdir)/dbus-1 + +-INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ ++INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_COMPILATION + +@@ -88,7 +88,7 @@ + $(EFENCE) \ + $(DBUS_BUS_LIBS) + +-dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ ++dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ + + LAUNCH_HELPER_SOURCES= \ + $(XML_SOURCES) \ +diff -Naur dbus-1.4.6-old/bus/Makefile.in dbus-1.4.6-new/bus/Makefile.in +--- dbus-1.4.6-old/bus/Makefile.in 2011-02-17 12:06:58.000000000 -0800 ++++ dbus-1.4.6-new/bus/Makefile.in 2011-02-18 09:11:44.000000000 -0800 +@@ -514,7 +514,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + configdir = $(sysconfdir)/dbus-1 +-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ ++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_COMPILATION + +@@ -582,7 +582,7 @@ + $(EFENCE) \ + $(DBUS_BUS_LIBS) + +-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ ++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ + LAUNCH_HELPER_SOURCES = \ + $(XML_SOURCES) \ + config-parser-common.c \