aboutsummaryrefslogtreecommitdiffstats
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 09:18:20 +0000
commite2b78d8aaecccd0111a10a016573f3f64c3b381a (patch)
tree8cf66c19415dc9441d1d7ef9172ad23d9df321b6
parent6f0ba9819c5496e6da5783836e68418caacc7b10 (diff)
downloadaports-e2b78d8aaecccd0111a10a016573f3f64c3b381a.tar.gz
aports-e2b78d8aaecccd0111a10a016573f3f64c3b381a.tar.bz2
aports-e2b78d8aaecccd0111a10a016573f3f64c3b381a.tar.xz
community/shadow: fix conflict with util-linux-doc and coreutils-doc
ref #8665
-rw-r--r--community/shadow/APKBUILD8
1 files changed, 6 insertions, 2 deletions
diff --git a/community/shadow/APKBUILD b/community/shadow/APKBUILD
index 383f4ff89a..dca8b5c60c 100644
--- a/community/shadow/APKBUILD
+++ b/community/shadow/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor:
+# Contributor:
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=shadow
pkgver=4.6
-pkgrel=1
+pkgrel=2
pkgdesc="PAM-using login and passwd utilities (usermod, useradd, ...)"
url="http://pkg-shadow.alioth.debian.org/"
arch="all"
@@ -75,6 +75,10 @@ package() {
done
# nologin is provided by util-linux.
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