summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-10-10 03:29:28 +0000
committerMike Frysinger <vapier@gentoo.org>2004-10-10 03:29:28 +0000
commit490af5cb2a2b532a2ec4b5bbe0bce000174ebfce (patch)
treef067af5cce7a1ae466c210a11b3e421a594da26f /sys-apps
parentstable on ppc64, bug #66647 (Manifest recommit) (diff)
downloadgentoo-2-490af5cb2a2b532a2ec4b5bbe0bce000174ebfce.tar.gz
gentoo-2-490af5cb2a2b532a2ec4b5bbe0bce000174ebfce.tar.bz2
gentoo-2-490af5cb2a2b532a2ec4b5bbe0bce000174ebfce.zip
manpage / setuid fixes uNF
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/shadow/ChangeLog5
-rw-r--r--sys-apps/shadow/shadow-4.0.4.1-r4.ebuild21
2 files changed, 14 insertions, 12 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index a2734415afa1..dea6b7d592d3 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/shadow
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.69 2004/10/08 00:01:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.70 2004/10/10 03:29:28 vapier Exp $
+
+ 09 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r4.ebuild:
+ Clean up the manpage fixes and change setuid perms to 4711 by default #47208.
*shadow-4.0.4.1-r4 (07 Oct 2004)
diff --git a/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild b/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
index 8a3e19780a9d..d3622021bdfc 100644
--- a/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild,v 1.2 2004/10/08 04:53:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild,v 1.3 2004/10/10 03:29:28 vapier Exp $
inherit eutils libtool gnuconfig flag-o-matic
@@ -89,7 +89,9 @@ src_compile() {
src_install() {
make DESTDIR=${D} install || die "install problem"
-# dodir /etc/default /etc/skel
+ # lock down setuid perms #47208
+ fperms go-r /bin/su /usr/bin/ch{fn,sh,age} \
+ /usr/bin/{expiry,newgrp,passwd,gpasswd} || die "fperms"
# Remove libshadow and libmisc; see bug 37725 and the following
# comment from shadow's README.linux:
@@ -139,16 +141,13 @@ src_install() {
newins shadow groupadd
fi
+ # Remove manpages that are handled by other packages
+ cd ${D}/usr/share/man
+ find \
+ -name 'id.1' \
+ -o -name 'passwd.5' \
+ -exec rm {} \;
cd ${S}
- # 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 man/getspnam.3 man/passwd.5
- for x in man/*.[0-9]
- do
- [ -f ${x} ] && doman ${x}
- done
if ! use pam; then
# Dont install the manpage, since we dont use