diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
| commit | a4f3ca8891e50241ac2ca144949e92b26920ffaf (patch) | |
| tree | d31841075429e437c4908580e8ec074f2fe40aa5 /extra/kdebase-workspace | |
| parent | 3156702a5deccd61451be9f7d8ba0fd212a3043b (diff) | |
| parent | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-ca/PKGBUILD
community/corkscrew/PKGBUILD
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/libxi/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/mpc/PKGBUILD
extra/poppler/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/vte3/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
multilib/lib32-libxft/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/grep/PKGBUILD
testing/sudo/PKGBUILD
testing/xf86-input-joystick/PKGBUILD
testing/xf86-input-wacom/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/kdebase-workspace/kde-np.pam | 1 | ||||
| -rw-r--r-- | extra/kdebase-workspace/kde.pam | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 7798c61b1..7633c970e 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152488 2012-03-07 16:12:41Z andrea $ +# $Id: PKGBUILD 153084 2012-03-12 09:07:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -31,13 +31,13 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver') options=('emptydirs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${_pkgname}-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') sha1sums=('675df4befd736e770e3029af8d38800c9018e888' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - 'e4198a443703f749b58a4fec88362fced1b45789' - '264e395c2c44cdda5a242c6dee649afab44cd6e5' + '712a90999bd429883dcef5dcaf288aace332ced8' + 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' diff --git a/extra/kdebase-workspace/kde-np.pam b/extra/kdebase-workspace/kde-np.pam index dfedb8edf..7d60cc35c 100644 --- a/extra/kdebase-workspace/kde-np.pam +++ b/extra/kdebase-workspace/kde-np.pam @@ -1,6 +1,7 @@ #%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 diff --git a/extra/kdebase-workspace/kde.pam b/extra/kdebase-workspace/kde.pam index 9ec074d06..ec1d8277f 100644 --- a/extra/kdebase-workspace/kde.pam +++ b/extra/kdebase-workspace/kde.pam @@ -1,6 +1,7 @@ #%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 |