Date: Friday, November 16, 2012 @ 09:04:18 Author: allan Revision: 171075
archrelease: copy trunk to extra-i686 Added: slim/repos/extra-i686/PKGBUILD (from rev 171074, slim/trunk/PKGBUILD) slim/repos/extra-i686/fix-array-overflow.patch (from rev 171074, slim/trunk/fix-array-overflow.patch) slim/repos/extra-i686/libpng-1.4+-support.patch (from rev 171074, slim/trunk/libpng-1.4+-support.patch) slim/repos/extra-i686/logrotate (from rev 171074, slim/trunk/logrotate) slim/repos/extra-i686/pam.d (from rev 171074, slim/trunk/pam.d) slim/repos/extra-i686/rc.d (from rev 171074, slim/trunk/rc.d) slim/repos/extra-i686/session-name.patch (from rev 171074, slim/trunk/session-name.patch) slim/repos/extra-i686/slim.service (from rev 171074, slim/trunk/slim.service) slim/repos/extra-i686/tty-slowness.patch (from rev 171074, slim/trunk/tty-slowness.patch) Deleted: slim/repos/extra-i686/PKGBUILD slim/repos/extra-i686/fix-glibc-segfault-1.3.4.patch slim/repos/extra-i686/libpng-1.4+-support.patch slim/repos/extra-i686/logrotate slim/repos/extra-i686/pam.d slim/repos/extra-i686/rc.d slim/repos/extra-i686/session-name.patch slim/repos/extra-i686/slim.service slim/repos/extra-i686/tty-slowness.patch --------------------------------+ PKGBUILD | 126 +++++++++++++++++++-------------------- fix-array-overflow.patch | 13 ++++ fix-glibc-segfault-1.3.4.patch | 13 ---- libpng-1.4+-support.patch | 28 ++++---- logrotate | 18 ++--- pam.d | 20 +++--- rc.d | 72 +++++++++++----------- session-name.patch | 42 ++++++------- slim.service | 18 ++--- tty-slowness.patch | 60 +++++++++--------- 10 files changed, 205 insertions(+), 205 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-11-16 14:02:49 UTC (rev 171074) +++ PKGBUILD 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Hugo Ideler <hugoide...@dse.nl> - -pkgname=slim -pkgver=1.3.4 -pkgrel=4 -pkgdesc='Desktop-independent graphical login manager for X11' -arch=('i686' 'x86_64') -url='http://slim.berlios.de/' -license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft') -makedepends=('cmake' 'freeglut') -backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'pam.d' - 'logrotate' - 'slim.service' - 'session-name.patch' - 'libpng-1.4+-support.patch' - 'fix-glibc-segfault-1.3.4.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 - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_PAM=yes -DUSE_CONSOLEKIT=no - make -} - -package() { - cd ${srcdir}/build/ - make DESTDIR="${pkgdir}" install - - install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim - install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim - install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim - - # Provide sane defaults - sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf - sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf - # install systemd files - install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service -} -md5sums=('51543533e492b41007811f7d880720fa' - 'd8ea9c4dee2811524b67f4f666311a1f' - '37ef35079139544d04b8316c7f66f754' - '43da096480bf72c3ccec8ad8400f34f0' - 'a5d6bde9e63899df7d2081e1585bbe54' - 'ebcb6829028615686de7b64ceeaaf8ed' - '6d19bd7a91592ed2bb902b22b9594565' - '9efc4e0d82d354f0c578be7723870769') Copied: slim/repos/extra-i686/PKGBUILD (from rev 171074, slim/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Hugo Ideler <hugoide...@dse.nl> + +pkgname=slim +pkgver=1.3.4 +pkgrel=4 +pkgdesc='Desktop-independent graphical login manager for X11' +arch=('i686' 'x86_64') +url='http://slim.berlios.de/' +license=('GPL2') +depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft') +makedepends=('cmake' 'freeglut') +backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'rc.d' + 'pam.d' + 'logrotate' + 'slim.service' + 'session-name.patch' + 'libpng-1.4+-support.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-array-overflow.patch # FS#30864 + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_PAM=yes -DUSE_CONSOLEKIT=no + make +} + +package() { + cd ${srcdir}/build/ + make DESTDIR="${pkgdir}" install + + install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim + install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim + install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim + + # Provide sane defaults + sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf + sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf + # install systemd files + install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service +} +md5sums=('51543533e492b41007811f7d880720fa' + 'd8ea9c4dee2811524b67f4f666311a1f' + '37ef35079139544d04b8316c7f66f754' + '43da096480bf72c3ccec8ad8400f34f0' + 'a5d6bde9e63899df7d2081e1585bbe54' + 'ebcb6829028615686de7b64ceeaaf8ed' + '6d19bd7a91592ed2bb902b22b9594565' + '9efc4e0d82d354f0c578be7723870769') Copied: slim/repos/extra-i686/fix-array-overflow.patch (from rev 171074, slim/trunk/fix-array-overflow.patch) =================================================================== --- fix-array-overflow.patch (rev 0) +++ fix-array-overflow.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -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:02:49 UTC (rev 171074) +++ fix-glibc-segfault-1.3.4.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -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; Deleted: libpng-1.4+-support.patch =================================================================== --- libpng-1.4+-support.patch 2012-11-16 14:02:49 UTC (rev 171074) +++ libpng-1.4+-support.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,14 +0,0 @@ ---- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 -+++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 -@@ -781,7 +781,11 @@ - (png_infopp) NULL); - } - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((png_ptr)))) { -+#else - if (setjmp(png_ptr->jmpbuf)) { -+#endif - goto png_destroy; - } - Copied: slim/repos/extra-i686/libpng-1.4+-support.patch (from rev 171074, slim/trunk/libpng-1.4+-support.patch) =================================================================== --- libpng-1.4+-support.patch (rev 0) +++ libpng-1.4+-support.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,14 @@ +--- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 ++++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 +@@ -781,7 +781,11 @@ + (png_infopp) NULL); + } + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png_ptr)))) { ++#else + if (setjmp(png_ptr->jmpbuf)) { ++#endif + goto png_destroy; + } + Deleted: logrotate =================================================================== --- logrotate 2012-11-16 14:02:49 UTC (rev 171074) +++ logrotate 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} Copied: slim/repos/extra-i686/logrotate (from rev 171074, slim/trunk/logrotate) =================================================================== --- logrotate (rev 0) +++ logrotate 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,9 @@ +/var/log/slim.log { + compress + rotate 1 + size 1024k + notifempty + missingok + copytruncate + noolddir +} Deleted: pam.d =================================================================== --- pam.d 2012-11-16 14:02:49 UTC (rev 171074) +++ pam.d 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_loginuid.so --session optional pam_systemd.so Copied: slim/repos/extra-i686/pam.d (from rev 171074, slim/trunk/pam.d) =================================================================== --- pam.d (rev 0) +++ pam.d 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_loginuid.so +-session optional pam_systemd.so Deleted: rc.d =================================================================== --- rc.d 2012-11-16 14:02:49 UTC (rev 171074) +++ rc.d 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/slim` -case "$1" in - start) - stat_busy "Starting Simple Login Manager" - [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon slim - stat_done - fi - ;; - stop) - stat_busy "Stopping Simple Login Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon slim - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Copied: slim/repos/extra-i686/rc.d (from rev 171074, slim/trunk/rc.d) =================================================================== --- rc.d (rev 0) +++ rc.d 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/slim` +case "$1" in + start) + stat_busy "Starting Simple Login Manager" + [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon slim + stat_done + fi + ;; + stop) + stat_busy "Stopping Simple Login Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon slim + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Deleted: session-name.patch =================================================================== --- session-name.patch 2012-11-16 14:02:49 UTC (rev 171074) +++ session-name.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,21 +0,0 @@ -diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp ---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 -+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 -@@ -23,7 +23,7 @@ - Root = root; - cfg = config; - -- session = ""; -+ session = cfg->nextSession(session); - - // Init GC - XGCValues gcv; -@@ -188,7 +188,7 @@ - } - - void Panel::ClearPanel() { -- session = ""; -+ session = cfg->nextSession(session); - Reset(); - XClearWindow(Dpy, Root); - XClearWindow(Dpy, Win); Copied: slim/repos/extra-i686/session-name.patch (from rev 171074, slim/trunk/session-name.patch) =================================================================== --- session-name.patch (rev 0) +++ session-name.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,21 @@ +diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp +--- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 ++++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 +@@ -23,7 +23,7 @@ + Root = root; + cfg = config; + +- session = ""; ++ session = cfg->nextSession(session); + + // Init GC + XGCValues gcv; +@@ -188,7 +188,7 @@ + } + + void Panel::ClearPanel() { +- session = ""; ++ session = cfg->nextSession(session); + Reset(); + XClearWindow(Dpy, Root); + XClearWindow(Dpy, Win); Deleted: slim.service =================================================================== --- slim.service 2012-11-16 14:02:49 UTC (rev 171074) +++ slim.service 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,9 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon - -[Install] -Alias=display-manager.service Copied: slim/repos/extra-i686/slim.service (from rev 171074, slim/trunk/slim.service) =================================================================== --- slim.service (rev 0) +++ slim.service 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,9 @@ +[Unit] +Description=SLiM Simple Login Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/slim -nodaemon + +[Install] +Alias=display-manager.service Deleted: tty-slowness.patch =================================================================== --- tty-slowness.patch 2012-11-16 14:02:49 UTC (rev 171074) +++ tty-slowness.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -1,30 +0,0 @@ -diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp ---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200 -+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 -@@ -280,21 +280,22 @@ - signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG -- OpenLog(); -- - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { - daemonmode = true; - } - - // Daemonize - if (daemonmode) { -- if (daemon(0, 1) == -1) { -+ if (daemon(0, 0) == -1) { - cerr << APPNAME << ": " << strerror(errno) << endl; - exit(ERR_EXIT); - } -- UpdatePid(); - } - -+ OpenLog(); -+ -+ if (daemonmode) UpdatePid(); -+ - CreateServerAuth(); - StartServer(); - alarm(2); Copied: slim/repos/extra-i686/tty-slowness.patch (from rev 171074, slim/trunk/tty-slowness.patch) =================================================================== --- tty-slowness.patch (rev 0) +++ tty-slowness.patch 2012-11-16 14:04:18 UTC (rev 171075) @@ -0,0 +1,30 @@ +diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp +--- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200 ++++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 +@@ -280,21 +280,22 @@ + signal(SIGALRM, AlarmSignal); + + #ifndef XNEST_DEBUG +- OpenLog(); +- + if (!force_nodaemon && cfg->getOption("daemon") == "yes") { + daemonmode = true; + } + + // Daemonize + if (daemonmode) { +- if (daemon(0, 1) == -1) { ++ if (daemon(0, 0) == -1) { + cerr << APPNAME << ": " << strerror(errno) << endl; + exit(ERR_EXIT); + } +- UpdatePid(); + } + ++ OpenLog(); ++ ++ if (daemonmode) UpdatePid(); ++ + CreateServerAuth(); + StartServer(); + alarm(2);