[arch-commits] Commit in (5 files)

[Laurent Carlier]

    Date: Friday, January 24, 2014 @ 21:08:15
  Author: lcarlier
Revision: 104714

Use same namesheme than in extra, to replace lib32-dbus package

Added:
  lib32-libdbus/
  lib32-libdbus/repos/
  lib32-libdbus/trunk/
  lib32-libdbus/trunk/PKGBUILD
  lib32-libdbus/trunk/memleak.patch

---------------+
 PKGBUILD      |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 memleak.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

Added: lib32-libdbus/trunk/PKGBUILD
===================================================================
--- lib32-libdbus/trunk/PKGBUILD	                        (rev 0)
+++ lib32-libdbus/trunk/PKGBUILD	2014-01-24 20:08:15 UTC (rev 104714)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+
+pkgname=lib32-libdbus
+_pkgbasename=libdbus
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="DBus library (32-bit)"
+arch=('x86_64')
+url="http://www.freedesktop.org/Software/dbus"
+license=('GPL' 'custom')
+depends=('lib32-glibc' 'lib32-expat' 'libdbus')
+makedepends=('gcc-multilib' 'lib32-libx11')
+provides=('lib32-dbus-core' 'lib32-dbus')
+conflicts=('lib32-dbus-core' 'lib32-dbus')
+replaces=('lib32-dbus-core' 'lib32-dbus')
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz)
+md5sums=('059fbe84e39fc99c67a14f15b1f39dff')
+
+build() {
+    export CC="gcc -m32"
+    export CXX="g++ -m32"
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+    cd "${srcdir}/dbus-${pkgver}"
+
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
+        --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
+        --with-system-pid-file=/run/dbus.pid \
+        --with-console-auth-dir=/run/console/ \
+        --enable-inotify --disable-dnotify \
+        --disable-verbose-mode --disable-static \
+        --disable-tests --disable-asserts --disable-systemd		
+
+    make
+}
+
+package() {
+    cd "${srcdir}/dbus-${pkgver}"
+    make DESTDIR=${pkgdir} install
+
+    rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
+    rm -rf "${pkgdir}"/{etc,var}
+
+    mkdir -p "${pkgdir}/usr/share/licenses"
+    ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}"
+}


Property changes on: lib32-libdbus/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: lib32-libdbus/trunk/memleak.patch
===================================================================
--- lib32-libdbus/trunk/memleak.patch	                        (rev 0)
+++ lib32-libdbus/trunk/memleak.patch	2014-01-24 20:08:15 UTC (rev 104714)
@@ -0,0 +1,37 @@
+From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
+From: Radoslaw Pajak <r.pajak at 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 at samsung.com>
+Reviewed-by: Simon McVittie <simon.mcvittie at 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