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

[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
===================================================================
--- PKGBUILD	2012-10-13 11:00:14 UTC (rev 168547)
+++ PKGBUILD	2012-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		required	pam_nologin.so
-auth		required	pam_permit.so
-auth        required    pam_env.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
+auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
+auth		required	pam_shells.so
+auth		requisite	pam_nologin.so
+auth		required	pam_env.so
+auth		optional	pam_permit.s
+
+account		include      system-login
+
+password	include      system-login
+
+session		include      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		required	pam_unix.so
-auth		required	pam_nologin.so
-auth        required    pam_env.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
+auth		include		system-login
+
+account		include		system-login
+
+password	include		system-login
+
+session		include		system-login