[arch-commits] Commit in slim/trunk (11 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat Jan 19 04:33:45 UTC 2013
Date: Friday, January 18, 2013 @ 23:33:45
Author: foutrelis
Revision: 175526
upgpkg: slim 1.3.5-1
New upstream release; adopt package; rewrite PAM file; drop all patches (two are fixed in 1.3.5 and the remaining third issue (FS#30900, FS#26693) needs to be fixed upstream).
Added:
slim/trunk/slim.logrotate
(from rev 175525, slim/trunk/logrotate)
slim/trunk/slim.pam
(from rev 175525, slim/trunk/pam.d)
Modified:
slim/trunk/PKGBUILD
Deleted:
slim/trunk/fix-array-overflow.patch
slim/trunk/libpng-1.4+-support.patch
slim/trunk/logrotate
slim/trunk/pam.d
slim/trunk/rc.d
slim/trunk/session-name.patch
slim/trunk/slim.service
slim/trunk/tty-slowness.patch
---------------------------+
PKGBUILD | 77 +++++++++++++++++++-------------------------
fix-array-overflow.patch | 13 -------
libpng-1.4+-support.patch | 14 --------
logrotate | 9 -----
pam.d | 10 -----
rc.d | 36 --------------------
session-name.patch | 21 ------------
slim.logrotate | 9 +++++
slim.pam | 7 ++++
slim.service | 9 -----
tty-slowness.patch | 30 -----------------
11 files changed, 50 insertions(+), 185 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-18 23:21:53 UTC (rev 175525)
+++ PKGBUILD 2013-01-19 04:33:45 UTC (rev 175526)
@@ -1,63 +1,54 @@
# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
# Contributor: Thayer Williams <thayer at archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Hugo Ideler <hugoideler at dse.nl>
pkgname=slim
-pkgver=1.3.4
-pkgrel=4
-pkgdesc='Desktop-independent graphical login manager for X11'
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="Desktop-independent graphical login manager for X11"
arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
+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')
+source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
+ slim.pam
+ slim.logrotate)
+sha256sums=('818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629'
+ 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4'
+ '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def')
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
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix installation path of slim.service
+ sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DUSE_PAM=yes \
+ -DUSE_CONSOLEKIT=no
make
}
package() {
- cd ${srcdir}/build/
- make DESTDIR="${pkgdir}" install
+ cd "$srcdir/$pkgname-$pkgver"
- 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
+ make DESTDIR="$pkgdir" install
- # 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
+ install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim"
+ install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim"
+
+ # Provide sane defaults
+ sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \
+ -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
+ "$pkgdir/etc/slim.conf"
}
-md5sums=('51543533e492b41007811f7d880720fa'
- 'd8ea9c4dee2811524b67f4f666311a1f'
- '37ef35079139544d04b8316c7f66f754'
- '43da096480bf72c3ccec8ad8400f34f0'
- 'a5d6bde9e63899df7d2081e1585bbe54'
- 'ebcb6829028615686de7b64ceeaaf8ed'
- '6d19bd7a91592ed2bb902b22b9594565'
- '9efc4e0d82d354f0c578be7723870769')
+
+# vim:set ts=2 sw=2 et:
Deleted: fix-array-overflow.patch
===================================================================
--- fix-array-overflow.patch 2013-01-18 23:21:53 UTC (rev 175525)
+++ fix-array-overflow.patch 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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 2013-01-18 23:21:53 UTC (rev 175525)
+++ libpng-1.4+-support.patch 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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;
- }
-
Deleted: logrotate
===================================================================
--- logrotate 2013-01-18 23:21:53 UTC (rev 175525)
+++ logrotate 2013-01-19 04:33:45 UTC (rev 175526)
@@ -1,9 +0,0 @@
-/var/log/slim.log {
- compress
- rotate 1
- size 1024k
- notifempty
- missingok
- copytruncate
- noolddir
-}
Deleted: pam.d
===================================================================
--- pam.d 2013-01-18 23:21:53 UTC (rev 175525)
+++ pam.d 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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
Deleted: rc.d
===================================================================
--- rc.d 2013-01-18 23:21:53 UTC (rev 175525)
+++ rc.d 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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
Deleted: session-name.patch
===================================================================
--- session-name.patch 2013-01-18 23:21:53 UTC (rev 175525)
+++ session-name.patch 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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/trunk/slim.logrotate (from rev 175525, slim/trunk/logrotate)
===================================================================
--- slim.logrotate (rev 0)
+++ slim.logrotate 2013-01-19 04:33:45 UTC (rev 175526)
@@ -0,0 +1,9 @@
+/var/log/slim.log {
+ compress
+ rotate 1
+ size 1024k
+ notifempty
+ missingok
+ copytruncate
+ noolddir
+}
Copied: slim/trunk/slim.pam (from rev 175525, slim/trunk/pam.d)
===================================================================
--- slim.pam (rev 0)
+++ slim.pam 2013-01-19 04:33:45 UTC (rev 175526)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth include system-local-login
+-auth optional pam_gnome_keyring.so
+account include system-local-login
+session include system-local-login
+-session optional pam_gnome_keyring.so auto_start
Deleted: slim.service
===================================================================
--- slim.service 2013-01-18 23:21:53 UTC (rev 175525)
+++ slim.service 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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
Deleted: tty-slowness.patch
===================================================================
--- tty-slowness.patch 2013-01-18 23:21:53 UTC (rev 175525)
+++ tty-slowness.patch 2013-01-19 04:33:45 UTC (rev 175526)
@@ -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);
More information about the arch-commits
mailing list