[arch-commits] Commit in slim/trunk (PKGBUILD fix-glibc-segfault-1.3.4.patch)

[Tobias Powalowski]

    Date: Wednesday, September 12, 2012 @ 16:21:03
  Author: tpowa
Revision: 166598

upgpkg: slim 1.3.4-3

fix glibc segfault

Added:
  slim/trunk/fix-glibc-segfault-1.3.4.patch
Modified:
  slim/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    9 ++++++---
 fix-glibc-segfault-1.3.4.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-12 20:12:20 UTC (rev 166597)
+++ PKGBUILD	2012-09-12 20:21:03 UTC (rev 166598)
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -20,7 +20,8 @@
         'logrotate'
         'slim.service'
         'session-name.patch'
-        'libpng-1.4+-support.patch')
+        'libpng-1.4+-support.patch'
+        'fix-glibc-segfault-1.3.4.patch')
 
 install=install
 
@@ -28,6 +29,7 @@
         cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
         patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
+        patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864
         cd ${srcdir}
         mkdir build
         cd build
@@ -59,4 +61,5 @@
          '43da096480bf72c3ccec8ad8400f34f0'
          'a5d6bde9e63899df7d2081e1585bbe54'
          'ebcb6829028615686de7b64ceeaaf8ed'
-         '6d19bd7a91592ed2bb902b22b9594565')
+         '6d19bd7a91592ed2bb902b22b9594565'
+         '9efc4e0d82d354f0c578be7723870769')

Added: fix-glibc-segfault-1.3.4.patch
===================================================================
--- fix-glibc-segfault-1.3.4.patch	                        (rev 0)
+++ fix-glibc-segfault-1.3.4.patch	2012-09-12 20:21:03 UTC (rev 166598)
@@ -0,0 +1,13 @@
+Index: app.cpp
+===================================================================
+--- app.cpp	(revision 223)
++++ app.cpp	(working copy)
+@@ -593,7 +593,7 @@
+ 
+         n++;
+ 
+-        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
++        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
+         memcpy(child_env, old_env, sizeof(char*)*n);
+         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+         child_env[n] = NULL;