diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
| commit | 38b5b952ddc3b86560fc02e98105bf5826d25354 (patch) | |
| tree | 0e689740cb7cc4cf171a6c962e623dbe7e53fc64 /core/util-linux | |
| parent | 1146fc0894bfda25180d63716029aabfa7ce017a (diff) | |
| parent | 0615a909b089a81d068ae10517ceff31dabfece1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/performous/PKGBUILD
community-testing/oss/PKGBUILD
community-testing/picard/PKGBUILD
community/deadbeef/PKGBUILD
community/gnash/PKGBUILD
community/mplayer2/PKGBUILD
community/radvd/PKGBUILD
community/tinc/PKGBUILD
core/glibc/PKGBUILD
core/lvm2/PKGBUILD
core/util-linux/PKGBUILD
extra/avidemux/PKGBUILD
extra/boost/PKGBUILD
extra/cppunit/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kradio/PKGBUILD
extra/opal/PKGBUILD
extra/pidgin/PKGBUILD
extra/postfix/PKGBUILD
extra/ptlib/PKGBUILD
extra/xine-lib/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kdm.service
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
libre/virtualbox-libre/PKGBUILD
libre/virtualbox-modules-lts/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
multilib/lib32-pixman/PKGBUILD
staging/ekiga/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/glibc/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kdm.service
testing/nilfs-utils/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'core/util-linux')
| -rw-r--r-- | core/util-linux/PKGBUILD | 28 | ||||
| -rw-r--r-- | core/util-linux/pam-common | 6 | ||||
| -rw-r--r-- | core/util-linux/pam-login | 7 |
3 files changed, 34 insertions, 7 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 21e3289e4..963879f71 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $ +# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.21.2 -pkgrel=1.1 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') groups=('base') -depends=('udev' 'pam') +depends=('pam') conflicts=('util-linux-ng') provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz + pam-login + pam-common) +backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,13 +31,14 @@ build() { --enable-write \ --enable-raw \ --disable-wall \ - --enable-new-mount + --enable-new-mount \ + --enable-login-utils make } check() { - make -C "$pkgname-$pkgver" check + make -C "$pkgname-$pkgver" check } package() { @@ -51,5 +55,15 @@ package() { # delete stray empty dir, fixed upstream rm -r usr/share/man/ru + + # setuid chfn and chsh + chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + + # install PAM files for login-utils + install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" + install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" + install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" } -md5sums=('54ba880f1d66782c2287ee2c898520e9') +md5sums=('54ba880f1d66782c2287ee2c898520e9' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4') diff --git a/core/util-linux/pam-common b/core/util-linux/pam-common new file mode 100644 index 000000000..a7bf8a4a5 --- /dev/null +++ b/core/util-linux/pam-common @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so diff --git a/core/util-linux/pam-login b/core/util-linux/pam-login new file mode 100644 index 000000000..1960d9497 --- /dev/null +++ b/core/util-linux/pam-login @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +account include system-local-login +session include system-local-login |