From 38ea2e71952c00f18230ed0e691532aadff4e2c1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Nov 2012 02:31:09 -0800 Subject: Thu Nov 22 02:27:52 PST 2012 --- kde-unstable/kdebase-workspace/PKGBUILD | 50 ++++++++++++---------- kde-unstable/kdebase-workspace/etc-scripts.patch | 11 +++++ kde-unstable/kdebase-workspace/kde-np.pam | 19 ++++---- kde-unstable/kdebase-workspace/kde.pam | 15 +++---- .../kdebase-workspace/kdebase-workspace.install | 6 +++ kde-unstable/kdebase-workspace/kdm.logrotate | 6 +++ 6 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 kde-unstable/kdebase-workspace/etc-scripts.patch create mode 100644 kde-unstable/kdebase-workspace/kdm.logrotate (limited to 'kde-unstable/kdebase-workspace') diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD index b4b4a6f3f..4f9c3c767 100644 --- a/kde-unstable/kdebase-workspace/PKGBUILD +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163366 2012-07-11 22:03:30Z andrea $ +# $Id: PKGBUILD 171727 2012-11-21 18:23:25Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.8.97 +pkgver=4.9.80 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') @@ -15,38 +15,42 @@ groups=('kde') # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' - 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork') -makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') + 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' + 'xcb-util-renderutil' 'xcb-util-image') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') install="${pkgname}.install" -backup=('usr/share/config/kdm/kdmrc' - 'etc/pam.d/kde' - 'etc/pam.d/kde-np' - 'etc/pam.d/kscreensaver') -options=('emptydirs') +backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('c02cab54df42b1452c183a1234405cfd6df18be7' + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('6144d8d136b481155d9fcbcb831a5a9b9c58d772' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - '712a90999bd429883dcef5dcaf288aace332ced8' - 'b321b5e613b60231330e606fdf1e124646148388' + '660eae40a707d2711d8d7f32a93214865506b795' + '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' - 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' + 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') build() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} + + # reads the shell scripts in /etc/kde/ + patch -p0 -i "${srcdir}"/etc-scripts.patch + # FS#26120 patch -p1 -i "${srcdir}"/kdm-xinitrd.patch - patch -p0 -i "${srcdir}"/fixpath.patch + + # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch - - cd "${srcdir}" + + cd ../ + mkdir build cd build cmake ../${_pkgname}-${pkgver} \ @@ -56,12 +60,13 @@ build() { -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DWITH_CkConnector=OFF make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde @@ -77,4 +82,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/kde-unstable/kdebase-workspace/etc-scripts.patch b/kde-unstable/kdebase-workspace/etc-scripts.patch new file mode 100644 index 000000000..903a90a53 --- /dev/null +++ b/kde-unstable/kdebase-workspace/etc-scripts.patch @@ -0,0 +1,11 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/kde-unstable/kdebase-workspace/kde-np.pam b/kde-unstable/kdebase-workspace/kde-np.pam index 7d60cc35c..2a4a940c7 100644 --- a/kde-unstable/kdebase-workspace/kde-np.pam +++ b/kde-unstable/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.so + +account include system-login + +password include system-login + +session include system-login diff --git a/kde-unstable/kdebase-workspace/kde.pam b/kde-unstable/kdebase-workspace/kde.pam index ec1d8277f..a0a29483d 100644 --- a/kde-unstable/kdebase-workspace/kde.pam +++ b/kde-unstable/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/kde-unstable/kdebase-workspace/kdebase-workspace.install b/kde-unstable/kdebase-workspace/kdebase-workspace.install index f7d6d305b..c52c06417 100644 --- a/kde-unstable/kdebase-workspace/kdebase-workspace.install +++ b/kde-unstable/kdebase-workspace/kdebase-workspace.install @@ -4,6 +4,7 @@ post_install() { chown -R 135:135 var/lib/kdm &>/dev/null xdg-icon-resource forceupdate --theme hicolor &>/dev/null update-desktop-database -q + genkdmconf --no-old --no-backup &>/dev/null } post_upgrade() { @@ -12,6 +13,7 @@ post_upgrade() { chown -R 135:135 var/lib/kdm &>/dev/null xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q + genkdmconf &>/dev/null } post_remove() { @@ -22,4 +24,8 @@ post_remove() { groupdel kdm fi xdg-icon-resource forceupdate --theme hicolor &> /dev/null + + if [ -d usr/share/apps/kdm/faces ]; then + rm -r usr/share/apps/kdm/faces + fi } diff --git a/kde-unstable/kdebase-workspace/kdm.logrotate b/kde-unstable/kdebase-workspace/kdm.logrotate new file mode 100644 index 000000000..34331feae --- /dev/null +++ b/kde-unstable/kdebase-workspace/kdm.logrotate @@ -0,0 +1,6 @@ +/var/log/kdm.log { + maxage 365 + size=+1024k + notifempty + missingok +} -- cgit v1.2.3-54-g00ecf