summaryrefslogtreecommitdiff
path: root/testing/kdebase-workspace
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-10-14 00:46:01 -0700
committerroot <root@rshg054.dnsready.net>2012-10-14 00:46:01 -0700
commit4eb56e1b3a80c84f2dddf2692310369dc9cbd31a (patch)
treeb31de2992989d616383f6552ba5d23b75701ef04 /testing/kdebase-workspace
parent21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff)
Sun Oct 14 00:45:38 PDT 2012
Diffstat (limited to 'testing/kdebase-workspace')
-rw-r--r--testing/kdebase-workspace/PKGBUILD20
-rw-r--r--testing/kdebase-workspace/kde-np.pam19
-rw-r--r--testing/kdebase-workspace/kde.pam15
-rw-r--r--testing/kdebase-workspace/kdm.logrotate6
4 files changed, 38 insertions, 22 deletions
diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
index 495c6f549..e3384d191 100644
--- a/testing/kdebase-workspace/PKGBUILD
+++ b/testing/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168268 2012-10-07 11:14:11Z andrea $
+# $Id: PKGBUILD 168549 2012-10-13 11:06:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.9.2
-pkgrel=3
+pkgrel=4
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -18,7 +18,7 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
'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"
@@ -30,25 +30,32 @@ options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+ 'kdm.logrotate'
'logind-support.patch')
sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
- '712a90999bd429883dcef5dcaf288aace332ced8'
- 'b321b5e613b60231330e606fdf1e124646148388'
+ '660eae40a707d2711d8d7f32a93214865506b795'
+ 'b7980f2e199963caf8e92b499042d244ece2fca0'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
'd509dac592bd8b310df27991b208c95b6d907514'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
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 ../
@@ -83,4 +90,5 @@ package() {
install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
install -D -m644 "${srcdir}"/kdm.service \
"${pkgdir}"/usr/lib/systemd/system/kdm.service
+ install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
}
diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam
index 7d60cc35c..eccaa08f4 100644
--- a/testing/kdebase-workspace/kde-np.pam
+++ b/testing/kdebase-workspace/kde-np.pam
@@ -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
diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam
index ec1d8277f..a0a29483d 100644
--- a/testing/kdebase-workspace/kde.pam
+++ b/testing/kdebase-workspace/kde.pam
@@ -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
diff --git a/testing/kdebase-workspace/kdm.logrotate b/testing/kdebase-workspace/kdm.logrotate
new file mode 100644
index 000000000..34331feae
--- /dev/null
+++ b/testing/kdebase-workspace/kdm.logrotate
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+ maxage 365
+ size=+1024k
+ notifempty
+ missingok
+}