version 1.6.18-2

5 files changed, 81 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2133131bffc2..a2d5cf6be45c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,34 @@
 pkgbase = dbus-nosystemd
 	pkgdesc = Freedesktop.org message bus system
-	pkgver = 1.8.18
-	pkgrel = 1
+	pkgver = 1.6.18
+	pkgrel = 2
 	url = http://www.freedesktop.org/Software/dbus
 	install = dbus-nosystemd.install
 	arch = i686
 	arch = x86_64
-	groups = eudev-base
 	license = GPL
 	license = custom
 	makedepends = libx11
-	makedepends = xmlto
-	makedepends = docbook-xsl
 	depends = expat
 	depends = coreutils
 	depends = filesystem
 	depends = shadow
-	depends = libdbus>=1.8.18
 	optdepends = libx11: dbus-launch support
-	optdepends = dbus-openrc: dbus openrc initscript
 	provides = dbus-core
-	provides = dbus=1.8.18
+	provides = dbus=1.6.18
+	provides = libdbus=1.6.18
 	conflicts = dbus-core
 	conflicts = dbus
-	conflicts = dbus-eudev
 	replaces = dbus-core
 	replaces = dbus
-	replaces = dbus-eudev
-	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.18.tar.gz
-	source = 30-dbus.sh
+	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.6.18.tar.gz
+	source = 30-dbus
 	source = dbus
-	md5sums = 83e607e9ccb1c921d5b6bbea2376a36c
-	md5sums = 6683a05bd749929ef9442816c22c3268
-	md5sums = 6f116e46adcbe99326ee67e597598d29
+	source = memleak.patch
+	md5sums = b02e9c95027a416987b81f9893831061
+	md5sums = 3314d727fa57fc443fce25b5cbeebbcc
+	md5sums = f0364f3f5dc5f653bb05d39aa36e3264
+	md5sums = cf86d68e39d975cec1e9f0342eb9b142
 
 pkgname = dbus-nosystemd
 
diff --git a/30-dbus b/30-dbus
new file mode 100644
index 000000000000..42b3a5ff7f16
--- /dev/null
+++ b/30-dbus
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# launches a session dbus instance
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+  eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
diff --git a/PKGBUILD b/PKGBUILD
index a741850e103a..262e69279896 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,62 +3,54 @@
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-nosystemd
-pkgver=1.8.18
-pkgrel=1
+pkgver=1.6.18
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-groups=('eudev-base')
 # dep on shadow for install scriptlet FS#29341
-depends=('expat' 'coreutils' 'filesystem' 'shadow' "libdbus>=${pkgver}")
-makedepends=('libx11' 'xmlto' 'docbook-xsl')
-optdepends=('libx11: dbus-launch support'
-            'dbus-openrc: dbus openrc initscript')
-provides=('dbus-core' "dbus=${pkgver}")
-conflicts=('dbus-core' 'dbus' 'dbus-eudev')
-replaces=('dbus-core' 'dbus' 'dbus-eudev')
+depends=('expat' 'coreutils' 'filesystem' 'shadow')
+makedepends=('libx11')
+optdepends=('libx11: dbus-launch support')
+provides=('dbus-core' "dbus=${pkgver}" "libdbus=${pkgver}")
+conflicts=('dbus-core' 'dbus')
+replaces=('dbus-core' 'dbus')
 install=dbus-nosystemd.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-	30-dbus.sh dbus)
-md5sums=('83e607e9ccb1c921d5b6bbea2376a36c'
-         '6683a05bd749929ef9442816c22c3268'
-         '6f116e46adcbe99326ee67e597598d29')
+	30-dbus dbus memleak.patch)
+md5sums=('b02e9c95027a416987b81f9893831061'
+         '3314d727fa57fc443fce25b5cbeebbcc'
+         'f0364f3f5dc5f653bb05d39aa36e3264'
+         'cf86d68e39d975cec1e9f0342eb9b142')
+
+prepare() {
+	cd dbus-$pkgver
+
+	patch -Np1 -i ../memleak.patch
+}
 
 build() {
   cd dbus-$pkgver
-  ./configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 \
-      --with-dbus-user=dbus \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
       --with-system-pid-file=/run/dbus/pid \
       --with-system-socket=/run/dbus/system_bus_socket \
       --with-console-auth-dir=/run/console/ \
-      --enable-inotify \
-      --disable-verbose-mode \
-      --disable-static \
-      --disable-tests \
-      --disable-asserts \
-      --disable-systemd
+      --enable-inotify --disable-dnotify \
+      --disable-verbose-mode --disable-static \
+      --disable-tests --disable-asserts
 
   make
 }
 
 package(){
   cd dbus-$pkgver
-
-  # Disable installation of libdbus
-  sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
-
   make DESTDIR="$pkgdir" install
 
-  rm -rf "${pkgdir}/var/run"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
+  rm -rf "$pkgdir/var/run"
 
   install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus"
-  install -Dm755 ../30-dbus.sh "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
+  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
-
diff --git a/dbus b/dbus
index a3d874d61e10..bf532a274454 100644
--- a/dbus
+++ b/dbus
@@ -8,7 +8,7 @@ case $1 in
     start)
         stat_busy "Starting D-BUS system messagebus"
         if [[ ! -d /run/dbus ]] ; then
-            install -m755 -g dbus -o dbus -d /run/dbus
+            install -m755 -g 81 -o 81 -d /run/dbus
         fi
 
         if ! dbus-daemon --system; then
diff --git a/memleak.patch b/memleak.patch
new file mode 100644
index 000000000000..7dea7943eca0
--- /dev/null
+++ b/memleak.patch
@@ -0,0 +1,37 @@
+From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
+From: Radoslaw Pajak <r.pajak@samsung.com>
+Date: Fri, 08 Nov 2013 12:51:32 +0000
+Subject: fixed memory freeing if error during listing services
+
+Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
+Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
+---
+diff --git a/bus/activation.c b/bus/activation.c
+index fcb7133..ea48a26 100644
+--- a/bus/activation.c
++++ b/bus/activation.c
+@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
+ 
+  error:
+   for (j = 0; j < i; j++)
+-    dbus_free (retval[i]);
++    dbus_free (retval[j]);
+   dbus_free (retval);
+ 
+   return FALSE;
+diff --git a/bus/services.c b/bus/services.c
+index 6f380fa..01a720e 100644
+--- a/bus/services.c
++++ b/bus/services.c
+@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
+   
+  error:
+   for (j = 0; j < i; j++)
+-    dbus_free (retval[i]);
++    dbus_free (retval[j]);
+   dbus_free (retval);
+ 
+   return FALSE;
+--
+cgit v0.9.0.2-2-gbebe