aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-05-06 08:55:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-06 11:26:40 +0200
commit51b2f7042f969031e9dcc7c557f96645977dbe22 (patch)
tree14eb578db4cb7bec29e0fb7fe4d851ef1130a7bd /community
parentf82ad4a4bd0bcfe6c75ff43189ad29dc14c38add (diff)
downloadaports-51b2f7042f969031e9dcc7c557f96645977dbe22.tar.bz2
aports-51b2f7042f969031e9dcc7c557f96645977dbe22.tar.xz
community/shadow: fix conflict with util-linux-doc and coreutils-doc
fixes #8665
Diffstat (limited to 'community')
-rw-r--r--community/shadow/APKBUILD8
1 files changed, 6 insertions, 2 deletions
diff --git a/community/shadow/APKBUILD b/community/shadow/APKBUILD
index 13dc98d7ae..2cbd13bdde 100644
--- a/community/shadow/APKBUILD
+++ b/community/shadow/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=shadow
pkgver=4.5
-pkgrel=0
+pkgrel=1
pkgdesc="PAM-using login and passwd utilities (usermod, useradd, ...)"
url="http://pkg-shadow.alioth.debian.org/"
arch="all"
@@ -74,7 +74,11 @@ package() {
"$pkgdir/etc/pam.d/$pamf" || return 1
done
# nologin is provided by util-linux.
- rm "$pkgdir"/sbin/nologin || return 1
+ rm "$pkgdir"/sbin/nologin
+ rm "$pkgdir"/usr/share/man/man8/nologin.*
+
+ # avoid conlict with coreutils-doc
+ rm "$pkgdir"/usr/share/man/man1/groups.*
# However, install our own for login.
cp "$srcdir"/login.pamd "$pkgdir"/etc/pam.d/login || return 1