diff options
| author | root <root@rshg054.dnsready.net> | 2012-09-14 00:04:07 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-09-14 00:04:07 +0000 |
| commit | 1b99470a0c85186f768a328fcc11a7cfcc85be51 (patch) | |
| tree | e08ce57006ed5455ffcfb1fb57544ed5604b0a80 /extra/slim | |
| parent | 843685ce9dd76d37a4c7b0230eacb6d26bdf30dd (diff) | |
Fri Sep 14 00:04:06 UTC 2012
Diffstat (limited to 'extra/slim')
| -rw-r--r-- | extra/slim/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/slim/fix-glibc-segfault-1.3.4.patch | 13 |
2 files changed, 20 insertions, 4 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 01c2c4369..c36dcd09f 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163599 2012-07-16 15:36:12Z tpowa $ +# $Id: PKGBUILD 166599 2012-09-12 20:22:19Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -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 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" '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 @@ 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 cd ${srcdir} mkdir build cd build @@ -59,4 +61,5 @@ md5sums=('51543533e492b41007811f7d880720fa' '43da096480bf72c3ccec8ad8400f34f0' 'a5d6bde9e63899df7d2081e1585bbe54' 'ebcb6829028615686de7b64ceeaaf8ed' - '6d19bd7a91592ed2bb902b22b9594565') + '6d19bd7a91592ed2bb902b22b9594565' + '9efc4e0d82d354f0c578be7723870769') diff --git a/extra/slim/fix-glibc-segfault-1.3.4.patch b/extra/slim/fix-glibc-segfault-1.3.4.patch new file mode 100644 index 000000000..b035f8a78 --- /dev/null +++ b/extra/slim/fix-glibc-segfault-1.3.4.patch @@ -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; |