summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2003-12-09 22:16:23 +0000
committerSeemant Kulleen <seemant@gentoo.org>2003-12-09 22:16:23 +0000
commitfe22c60eaf8431aa79c09050b4d1aaa0118c5c37 (patch)
tree69b0cba0d60545d4f0269fddebaeff5d5f9cc0f3 /sys-apps
parentnew init.d/dedicated stuff (diff)
downloadhistorical-fe22c60eaf8431aa79c09050b4d1aaa0118c5c37.tar.gz
historical-fe22c60eaf8431aa79c09050b4d1aaa0118c5c37.tar.bz2
historical-fe22c60eaf8431aa79c09050b4d1aaa0118c5c37.zip
man id.1.gz collision
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/shadow/ChangeLog5
-rw-r--r--sys-apps/shadow/Manifest14
-rw-r--r--sys-apps/shadow/shadow-4.0.3-r9.ebuild4
3 files changed, 14 insertions, 9 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 12bbf8fda205..267253d61d52 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/shadow
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.41 2003/12/08 11:53:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.42 2003/12/09 22:16:21 seemant Exp $
+
+ 09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild:
+ don't install the id man page, coreutils does that
*shadow-4.0.3-r9 (06 Dec 2003)
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 52f3b6a69813..bbd872f4c56f 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,17 +1,17 @@
-MD5 ba6a58b29380381680d45ec1da0e96a9 ChangeLog 8486
+MD5 bc7f33ab8b946a99309e9a956111eec4 shadow-4.0.3-r9.ebuild 5288
+MD5 15d3db7c45655b83fe7c8f4bcb13f89b ChangeLog 8616
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 7b48a967a0103558d454e850191714ab shadow-4.0.3-r9.ebuild 5271
-MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r9 65
+MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230
-MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972
MD5 94728414b91e556a211379f6acc9b52d files/shadow-4.0.3-selinux.diff 3940
-MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
+MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r9 65
MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804
+MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972
MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
+MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247
MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
+MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
-MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247
MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
-MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
diff --git a/sys-apps/shadow/shadow-4.0.3-r9.ebuild b/sys-apps/shadow/shadow-4.0.3-r9.ebuild
index cbf1eb5d0e9b..f17c3f8949c4 100644
--- a/sys-apps/shadow/shadow-4.0.3-r9.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r9.ebuild,v 1.1 2003/12/08 11:53:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r9.ebuild,v 1.2 2003/12/09 22:16:21 seemant Exp $
IUSE="pam selinux"
@@ -139,6 +139,8 @@ src_install() {
# The manpage install is beyond my comprehension, and
# also broken. Just do it over.
rm -rf ${D}/usr/share/man/*
+
+ rm -f man/id.1
for x in man/*.[0-9]
do
[ -f ${x} ] && doman ${x}