diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-28 11:22:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-28 11:22:59 +0000 |
| commit | 19f68a46ef18c9c01d41a7a856955045cde0bad6 (patch) | |
| tree | 124a073b4818727f9d22404ecb608a6a3a84fcf6 | |
| parent | 9f51ab79fc76e65b733975c20b0b571b0ac527b1 (diff) | |
| download | aports-19f68a46ef18c9c01d41a7a856955045cde0bad6.tar.bz2 aports-19f68a46ef18c9c01d41a7a856955045cde0bad6.tar.xz | |
testing/shadow: fix nologin conflict with util-linux
| -rw-r--r-- | testing/shadow/APKBUILD | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/testing/shadow/APKBUILD b/testing/shadow/APKBUILD index d5be67a7f..ba9d8e3bc 100644 --- a/testing/shadow/APKBUILD +++ b/testing/shadow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=shadow pkgver=4.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="PAM-using login and passwd utilities (usermod / useradd / newuidmap etc)" url="http://pkg-shadow.alioth.debian.org/" arch="all" @@ -14,6 +14,7 @@ install="$pkgname.post-upgrade $pkgname.post-deinstall" subpackages="$pkgname-doc" source="http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.xz login.pamd" +options="suid" _builddir="$srcdir"/shadow-$pkgver prepare() { @@ -34,6 +35,7 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --without-nscd \ + --without-nologin \ --disable-nls \ || return 1 make || return 1 @@ -44,7 +46,10 @@ package() { make DESTDIR="$pkgdir" install || return 1 # do not install these pam.d files they are broken and outdated - rm "$pkgdir"/etc/pam.d/* + # nologin is provided by util-linux + rm "$pkgdir"/etc/pam.d/* \ + "$pkgdir"/sbin/nologin \ + || return 1 # however, install our own for login cp "$srcdir"/login.pamd "$pkgdir"/etc/pam.d/login |