diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /core/dbus | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'core/dbus')
| -rw-r--r-- | core/dbus/PKGBUILD | 22 | ||||
| -rw-r--r-- | core/dbus/memleak.patch | 37 |
2 files changed, 50 insertions, 9 deletions
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD index c748a8611..f347e17d3 100644 --- a/core/dbus/PKGBUILD +++ b/core/dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197807 2013-10-30 11:03:01Z allan $ +# $Id: PKGBUILD 200253 2013-11-23 20:09:30Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@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,7 +17,17 @@ provides=('dbus-core') 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 @@ -31,9 +41,6 @@ build() { --disable-tests --disable-asserts \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-systemd - - patch -p1 < "$srcdir/systemd-user-session.patch" - make } @@ -47,6 +54,3 @@ package(){ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -md5sums=('1de63d9983d7785836ffae6c2181c698' - '3314d727fa57fc443fce25b5cbeebbcc' - 'd8a1bd529b3ddca671ee1a695a143db9') diff --git a/core/dbus/memleak.patch b/core/dbus/memleak.patch new file mode 100644 index 000000000..7dea7943e --- /dev/null +++ b/core/dbus/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 |