[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD kde-np.pam kde.pam)

2012-10-13 Thread Andrea Scarpino
Date: Saturday, October 13, 2012 @ 07:05:03
  Author: andrea
Revision: 168548

upgpkg: kdebase-workspace 4.9.2-4

Use pambase

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kde-np.pam
  kdebase-workspace/trunk/kde.pam

+
 PKGBUILD   |   13 +
 kde-np.pam |   19 +++
 kde.pam|   15 +++
 3 files changed, 27 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-13 11:00:14 UTC (rev 168547)
+++ PKGBUILD2012-10-13 11:05:03 UTC (rev 168548)
@@ -18,7 +18,7 @@
  'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
  'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
  'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
- 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' 'glu')
+ 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
 makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 install=${pkgname}.install
@@ -34,8 +34,8 @@
 'logind-support.patch')
 sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
   '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-  '712a90999bd429883dcef5dcaf288aace332ced8'
-  'b321b5e613b60231330e606fdf1e124646148388'
+  '660eae40a707d2711d8d7f32a93214865506b795'
+  'b7980f2e199963caf8e92b499042d244ece2fca0'
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
   'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
   'd7b5883f7e65c6839b1f65f94d58026673dd0226'
@@ -46,11 +46,16 @@
 
 build() {
cd ${_pkgname}-${pkgver}
+
+# FS#26120
patch -p1 -i ${srcdir}/kdm-xinitrd.patch
+
patch -p0 -i ${srcdir}/fixpath.patch
+
+# KDEBUG#202629
patch -p0 -i ${srcdir}/terminate-server.patch
 
-# KDEBUG 307412
+# KDEBUG#307412 (fixed upstream)
 patch -p1 -i ${srcdir}/logind-support.patch
 
 cd ../

Modified: kde-np.pam
===
--- kde-np.pam  2012-10-13 11:00:14 UTC (rev 168547)
+++ kde-np.pam  2012-10-13 11:05:03 UTC (rev 168548)
@@ -1,9 +1,12 @@
 #%PAM-1.0
-auth   requiredpam_nologin.so
-auth   requiredpam_permit.so
-authrequiredpam_env.so
-accountrequiredpam_unix.so
-password   requiredpam_unix.so
-sessionrequiredpam_unix.so
-sessionrequiredpam_limits.so
--sessionoptionalpam_systemd.so
+auth   requiredpam_tally.soonerr=succeed 
file=/var/log/faillog
+auth   requiredpam_shells.so
+auth   requisite   pam_nologin.so
+auth   requiredpam_env.so
+auth   optionalpam_permit.s
+
+accountinclude  system-login
+
+password   include  system-login
+
+sessioninclude  system-login

Modified: kde.pam
===
--- kde.pam 2012-10-13 11:00:14 UTC (rev 168547)
+++ kde.pam 2012-10-13 11:05:03 UTC (rev 168548)
@@ -1,9 +1,8 @@
 #%PAM-1.0
-auth   requiredpam_unix.so
-auth   requiredpam_nologin.so
-authrequiredpam_env.so
-accountrequiredpam_unix.so
-password   requiredpam_unix.so
-sessionrequiredpam_unix.so
-sessionrequiredpam_limits.so
--sessionoptionalpam_systemd.so
+auth   include system-login
+
+accountinclude system-login
+
+password   include system-login
+
+sessioninclude system-login



[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD kde-np.pam kde.pam)

2012-03-10 Thread Andrea Scarpino
Date: Saturday, March 10, 2012 @ 04:53:45
  Author: andrea
Revision: 152856

Add pam_env.so (FS#28842)

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kde-np.pam
  kdebase-workspace/trunk/kde.pam

+
 PKGBUILD   |4 ++--
 kde-np.pam |1 +
 kde.pam|1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-10 09:48:31 UTC (rev 152855)
+++ PKGBUILD2012-03-10 09:53:45 UTC (rev 152856)
@@ -36,8 +36,8 @@
 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
 sha1sums=('675df4befd736e770e3029af8d38800c9018e888'
   '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-  'e4198a443703f749b58a4fec88362fced1b45789'
-  '264e395c2c44cdda5a242c6dee649afab44cd6e5'
+  '712a90999bd429883dcef5dcaf288aace332ced8'
+  'b321b5e613b60231330e606fdf1e124646148388'
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
   'd7b5883f7e65c6839b1f65f94d58026673dd0226'
   'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'

Modified: kde-np.pam
===
--- kde-np.pam  2012-03-10 09:48:31 UTC (rev 152855)
+++ kde-np.pam  2012-03-10 09:53:45 UTC (rev 152856)
@@ -1,6 +1,7 @@
 #%PAM-1.0
 auth   requiredpam_nologin.so
 auth   requiredpam_permit.so
+authrequiredpam_env.so
 accountrequiredpam_unix.so
 password   requiredpam_unix.so
 sessionrequiredpam_unix.so

Modified: kde.pam
===
--- kde.pam 2012-03-10 09:48:31 UTC (rev 152855)
+++ kde.pam 2012-03-10 09:53:45 UTC (rev 152856)
@@ -1,6 +1,7 @@
 #%PAM-1.0
 auth   requiredpam_unix.so
 auth   requiredpam_nologin.so
+authrequiredpam_env.so
 accountrequiredpam_unix.so
 password   requiredpam_unix.so
 sessionrequiredpam_unix.so



[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD kde-np.pam kde.pam)

2012-01-13 Thread Andrea Scarpino
Date: Friday, January 13, 2012 @ 16:15:24
  Author: andrea
Revision: 146583

Use pam_systemd.so

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kde-np.pam
  kdebase-workspace/trunk/kde.pam

+
 PKGBUILD   |6 +++---
 kde-np.pam |3 ++-
 kde.pam|3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-13 21:04:54 UTC (rev 146582)
+++ PKGBUILD2012-01-13 21:15:24 UTC (rev 146583)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.7.97
-pkgrel=1
+pkgrel=3
 pkgdesc=KDE Base Workspace
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -34,8 +34,8 @@
 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
 sha1sums=('a48197748c59edf0849f0a964f6e0a9a0596538c'
-  '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-  'f7b38af38549242a240f1a90ab9964ca8a366129'
+  'e4198a443703f749b58a4fec88362fced1b45789'
+  '264e395c2c44cdda5a242c6dee649afab44cd6e5'
   '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
   'd7b5883f7e65c6839b1f65f94d58026673dd0226'

Modified: kde-np.pam
===
--- kde-np.pam  2012-01-13 21:04:54 UTC (rev 146582)
+++ kde-np.pam  2012-01-13 21:15:24 UTC (rev 146583)
@@ -4,4 +4,5 @@
 accountrequiredpam_unix.so
 password   requiredpam_unix.so
 sessionrequiredpam_unix.so
-sessionrequiredpam_limits.so
\ No newline at end of file
+sessionrequiredpam_limits.so
+-sessionoptionalpam_systemd.so

Modified: kde.pam
===
--- kde.pam 2012-01-13 21:04:54 UTC (rev 146582)
+++ kde.pam 2012-01-13 21:15:24 UTC (rev 146583)
@@ -4,4 +4,5 @@
 accountrequiredpam_unix.so
 password   requiredpam_unix.so
 sessionrequiredpam_unix.so
-sessionrequiredpam_limits.so
\ No newline at end of file
+sessionrequiredpam_limits.so
+-sessionoptionalpam_systemd.so