Date: Monday, November 18, 2013 @ 12:25:05 Author: jgc Revision: 199897
upgpkg: dbus 1.6.18-1 Update, add post-release fix for a memory leak Added: dbus/trunk/memleak.patch Modified: dbus/trunk/PKGBUILD ---------------+ PKGBUILD | 20 ++++++++++++-------- memleak.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-18 11:24:35 UTC (rev 199896) +++ PKGBUILD 2013-11-18 11:25:05 UTC (rev 199897) @@ -4,7 +4,7 @@ # Contributor: Link Dupont <l...@subpop.net> # pkgname=dbus -pkgver=1.6.16 +pkgver=1.6.18 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus"; @@ -17,8 +17,18 @@ conflicts=('dbus-core') replaces=('dbus-core') source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz - 30-dbus systemd-user-session.patch) + 30-dbus systemd-user-session.patch memleak.patch) +md5sums=('b02e9c95027a416987b81f9893831061' + '3314d727fa57fc443fce25b5cbeebbcc' + 'd8a1bd529b3ddca671ee1a695a143db9' + 'cf86d68e39d975cec1e9f0342eb9b142') +prepare() { + cd dbus-$pkgver + patch -Np1 -i ../systemd-user-session.patch + patch -Np1 -i ../memleak.patch +} + build() { cd dbus-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -31,9 +41,6 @@ --disable-tests --disable-asserts \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-systemd - - patch -p1 < "$srcdir/systemd-user-session.patch" - make } @@ -47,6 +54,3 @@ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -md5sums=('1de63d9983d7785836ffae6c2181c698' - '3314d727fa57fc443fce25b5cbeebbcc' - 'd8a1bd529b3ddca671ee1a695a143db9') Added: memleak.patch =================================================================== --- memleak.patch (rev 0) +++ memleak.patch 2013-11-18 11:25:05 UTC (rev 199897) @@ -0,0 +1,37 @@ +From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001 +From: Radoslaw Pajak <r.pa...@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.pa...@samsung.com> +Reviewed-by: Simon McVittie <simon.mcvit...@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
