[arch-commits] Commit in slim/trunk (3 files)

[Allan McRae]

    Date: Friday, November 16, 2012 @ 09:02:49
  Author: allan
Revision: 171074

rename patch (FS#31521)

Added:
  slim/trunk/fix-array-overflow.patch
    (from rev 171073, slim/trunk/fix-glibc-segfault-1.3.4.patch)
Modified:
  slim/trunk/PKGBUILD
Deleted:
  slim/trunk/fix-glibc-segfault-1.3.4.patch

--------------------------------+
 PKGBUILD                       |    4 ++--
 fix-array-overflow.patch       |   13 +++++++++++++
 fix-glibc-segfault-1.3.4.patch |   13 -------------
 3 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-16 14:00:24 UTC (rev 171073)
+++ PKGBUILD	2012-11-16 14:02:49 UTC (rev 171074)
@@ -21,13 +21,13 @@
         'slim.service'
         'session-name.patch'
         'libpng-1.4+-support.patch'
-        'fix-glibc-segfault-1.3.4.patch')
+        'fix-array-overflow.patch')
 
 build() {
         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
+        patch -Np0 -i ../fix-array-overflow.patch # FS#30864
         cd ${srcdir}
         mkdir build
         cd build

Copied: slim/trunk/fix-array-overflow.patch (from rev 171073, slim/trunk/fix-glibc-segfault-1.3.4.patch)
===================================================================
--- fix-array-overflow.patch	                        (rev 0)
+++ fix-array-overflow.patch	2012-11-16 14:02:49 UTC (rev 171074)
@@ -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;

Deleted: fix-glibc-segfault-1.3.4.patch
===================================================================
--- fix-glibc-segfault-1.3.4.patch	2012-11-16 14:00:24 UTC (rev 171073)
+++ fix-glibc-segfault-1.3.4.patch	2012-11-16 14:02:49 UTC (rev 171074)
@@ -1,13 +0,0 @@
-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;