[arch-commits] Commit in slim/trunk (PKGBUILD slim-1.3.6-systemd-session.patch)

[Jan de Groot]

    Date: Monday, April 21, 2014 @ 13:29:37
  Author: jgc
Revision: 211583

upgpkg: slim 1.3.6-4

Fix pam reuse problem by applying workaround as gentoo uses. Closes FS#34329, workaround found in upstream report

Added:
  slim/trunk/slim-1.3.6-systemd-session.patch
Modified:
  slim/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   15 +++++++++------
 slim-1.3.6-systemd-session.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-21 10:21:28 UTC (rev 211582)
+++ PKGBUILD	2014-04-21 11:29:37 UTC (rev 211583)
@@ -7,7 +7,7 @@
 
 pkgname=slim
 pkgver=1.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Desktop-independent graphical login manager for X11"
 arch=('i686' 'x86_64')
 url="http://slim.berlios.de/"
@@ -19,26 +19,29 @@
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
         slim-1.3.6-fix-libslim-libraries.patch
         slim-1.3.6-add-sessiondir.patch
+        slim-1.3.6-systemd-session.patch
         slim.pam
         slim.logrotate)
 sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df'
             '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0'
             '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd'
+            '900b7ffe723b741c05bcc0ca857f300a2131a0029c6532eb17be935451bf2c70'
             'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4'
             '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   # Fix installation path of slim.service
   sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
 
-  patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch"
-  patch -Np1 -i "$srcdir/slim-1.3.6-add-sessiondir.patch"
+  patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch
+  patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch
+  patch -Np1 -i ../slim-1.3.6-systemd-session.patch
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -50,7 +53,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
 

Added: slim-1.3.6-systemd-session.patch
===================================================================
--- slim-1.3.6-systemd-session.patch	                        (rev 0)
+++ slim-1.3.6-systemd-session.patch	2014-04-21 11:29:37 UTC (rev 211583)
@@ -0,0 +1,29 @@
+--- a/app.cpp	2013-10-23 16:19:57.074100282 -0400
++++ b/app.cpp	2013-10-23 16:33:13.302122574 -0400
+@@ -829,8 +829,13 @@
+ 
+ 	StopServer();
+ 	RemoveLock();
+-	while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
+-	Run();
++	if (force_nodaemon) {
++		delete LoginPanel;
++		exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */
++	} else {
++		while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
++		Run();
++	}
+ }
+ 
+ void App::KillAllClients(Bool top) {
+--- a/slim.service	2013-10-23 16:19:57.074100282 -0400
++++ b/slim.service	2013-10-23 16:45:14.901142776 -0400
+@@ -4,6 +4,7 @@
+ 
+ [Service]
+ ExecStart=/usr/bin/slim -nodaemon
++Restart=on-failure
+ 
+ [Install]
+ Alias=display-manager.service
+Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes