diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build index ccbe154647..907079ccb3 100755 --- a/packages/sysutils/dbus/build +++ b/packages/sysutils/dbus/build @@ -10,8 +10,6 @@ export ac_cv_have_abstract_sockets=yes cd $PKG_BUILD -$AUTORECONF - mkdir -p .build-target cd .build-target diff --git a/packages/sysutils/dbus/install b/packages/sysutils/dbus/install index 552f415f0e..1edf6c67dd 100755 --- a/packages/sysutils/dbus/install +++ b/packages/sysutils/dbus/install @@ -10,15 +10,15 @@ add_group dbus 81 add_group netdev 497 mkdir -p $INSTALL/usr/bin -# cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin + cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin -# cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin + cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dbus cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus @@ -29,11 +29,7 @@ mkdir -p $INSTALL/etc/dbus-1 cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1 cp $PKG_BUILD/.build-target/bus/system.conf $INSTALL/etc/dbus-1 -mkdir -p $INSTALL/etc/dbus-1/event.d mkdir -p $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/dbus-1/session.d mkdir -p $INSTALL/usr/share/dbus-1/services mkdir -p $INSTALL/usr/share/dbus-1/system-services - -# sed 's%.*%/usr/lib/dbus-1.0/dbus-daemon-launch-helper%' \ -# $PKG_BUILD/.build-target/bus/system.conf > $INSTALL/etc/dbus-1/system.conf diff --git a/packages/sysutils/dbus/patches/dbus-1.2.24-remove_pie.diff b/packages/sysutils/dbus/patches/dbus-1.2.24-remove_pie.diff deleted file mode 100644 index adc9b8c526..0000000000 --- a/packages/sysutils/dbus/patches/dbus-1.2.24-remove_pie.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur dbus-1.2.24-old/bus/Makefile.am dbus-1.2.24-new/bus/Makefile.am ---- dbus-1.2.24-old/bus/Makefile.am 2010-03-23 12:01:27.000000000 -0700 -+++ dbus-1.2.24-new/bus/Makefile.am 2010-03-25 15:59:19.000000000 -0700 -@@ -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"\" \ - -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION - -@@ -81,7 +81,7 @@ - $(top_builddir)/dbus/libdbus-convenience.la \ - $(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.2.24-old/bus/Makefile.in dbus-1.2.24-new/bus/Makefile.in ---- dbus-1.2.24-old/bus/Makefile.in 2010-03-23 12:11:23.000000000 -0700 -+++ dbus-1.2.24-new/bus/Makefile.in 2010-03-25 15:59:19.000000000 -0700 -@@ -459,7 +459,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"\" \ - -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION - -@@ -523,7 +523,7 @@ - $(top_builddir)/dbus/libdbus-convenience.la \ - $(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 \ diff --git a/packages/sysutils/dbus/url b/packages/sysutils/dbus/url index eb4532f882..386a52f802 100644 --- a/packages/sysutils/dbus/url +++ b/packages/sysutils/dbus/url @@ -1 +1 @@ -http://dbus.freedesktop.org/releases/dbus/dbus-1.2.24.tar.gz \ No newline at end of file +http://dbus.freedesktop.org/releases/dbus/dbus-1.3.1.tar.gz \ No newline at end of file