From 4c3fbf8deff06fcdad15ebc42e116810d545fcbf Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 1 Nov 2004 14:52:49 +0000 Subject: [PATCH] move to unstable --- sys-apps/shadow/Manifest | 10 +- .../shadow/files/digest-shadow-4.0.4.1-r3 | 1 - sys-apps/shadow/shadow-4.0.4.1-r3.ebuild | 212 ------------------ sys-apps/shadow/shadow-4.0.5.ebuild | 5 +- 4 files changed, 6 insertions(+), 222 deletions(-) delete mode 100644 sys-apps/shadow/files/digest-shadow-4.0.4.1-r3 delete mode 100644 sys-apps/shadow/shadow-4.0.4.1-r3.ebuild diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index 77a539f8fd23..65a5d5d83c59 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -3,9 +3,8 @@ Hash: SHA1 MD5 45f252469142b03dec4a9a581c3df5a2 ChangeLog 14412 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 f227fddac93c5f27799b9a8c9e34cd2b shadow-4.0.4.1-r3.ebuild 6076 MD5 23ef7363bf5ffa1d0f3343ff2a618e5d shadow-4.0.4.1-r4.ebuild 5943 -MD5 e531273bb3064bdc79cc36da2d7533ac shadow-4.0.5.ebuild 4917 +MD5 d612d0da474849d68dfa53c55d50e200 shadow-4.0.5.ebuild 4902 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67 MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380 @@ -19,7 +18,6 @@ MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504 -MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r3 67 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431 @@ -31,7 +29,7 @@ MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBgbI5HTu7gpaalycRAobjAJ9wxipsxzPgXs8yRQEaL97+HPWzLACg3zse -BtL2RdjLw5oSMIjKWMs9Mjo= -=eGJ/ +iD8DBQFBhk3iHTu7gpaalycRAgHJAKDc+hUE84uLI9YGiSl4zObcTnkr4QCg8ORn +gxokEtTOewJjafE2/Fy0mG0= +=8bZL -----END PGP SIGNATURE----- diff --git a/sys-apps/shadow/files/digest-shadow-4.0.4.1-r3 b/sys-apps/shadow/files/digest-shadow-4.0.4.1-r3 deleted file mode 100644 index 86c719561f0b..000000000000 --- a/sys-apps/shadow/files/digest-shadow-4.0.4.1-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 3a3d17d3d7c630b602baf66ae7434c61 shadow-4.0.4.1.tar.bz2 814234 diff --git a/sys-apps/shadow/shadow-4.0.4.1-r3.ebuild b/sys-apps/shadow/shadow-4.0.4.1-r3.ebuild deleted file mode 100644 index 053ed84c85bf..000000000000 --- a/sys-apps/shadow/shadow-4.0.4.1-r3.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# 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-r3.ebuild,v 1.8 2004/10/13 23:05:13 vapier Exp $ - -inherit eutils libtool gnuconfig flag-o-matic - -FORCE_SYSTEMAUTH_UPDATE="no" - -SELINUX_PATCH="shadow-4.0.4.1-selinux.diff" - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/" -SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" -IUSE="pam selinux nls uclibc" - -DEPEND=">=sys-libs/cracklib-2.7-r3 - pam? ( >=sys-libs/pam-0.75-r4 ) - nls? ( sys-devel/gettext ) - selinux? ( sys-libs/libselinux )" -RDEPEND=">=sys-libs/cracklib-2.7-r3 - pam? ( >=sys-libs/pam-0.75-r4 ) - selinux? ( sys-libs/libselinux )" - -pkg_preinst() { - rm -f ${ROOT}/etc/pam.d/system-auth.new -} - -src_unpack() { - unpack ${A} - - cd ${S} - - use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} - - # uclibc support, corrects NIS usage - use uclibc && epatch ${FILESDIR}/shadow-4.0.4.1-nonis.patch - - # Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY, - # else the session entries in /etc/pam.d/su never get executed, and - # pam_xauth for one, is then never used. This should close bug #8831. - # - # (19 Oct 2002) - use pam && epatch ${FILESDIR}/${P}-su-pam_open_session.patch - - # If su should not simulate a login shell, use '/bin/sh' as shell to enable - # running of commands as user with /bin/false as shell, closing bug #15015. - # - # (23 Feb 2003) -# This one could be a security hole ... -# cd ${S}; epatch ${FILESDIR}/${P}-nologin-run-sh.patch - - # Patch the useradd manpage to be a bit more clear, closing bug #13203. - # Thanks to Guy . - epatch ${FILESDIR}/${P}-useradd-manpage-update.patch - - # Patch to correct the definition if malloc, so that shadow can compile - # using gcc 3.4. see bug #47455 for more information - epatch ${FILESDIR}/${P}-gcc34-xmalloc.patch -} - -src_compile() { - # Allows shadow configure detect mips systems properly - gnuconfig_update - elibtoolize - - local myconf - use pam \ - && myconf="${myconf} --with-libpam --with-libcrack" \ - || myconf="${myconf} --without-libpam" - - ./configure --disable-desrpc \ - --with-libcrypt \ - --with-libcrack \ - --enable-shared=no \ - --enable-static=yes \ - --host=${CHOST} \ - $(use_enable nls) \ - ${myconf} || die "bad configure" - - # Parallel make fails sometimes - emake -j1 || die "compile problem" -} - -src_install() { - dodir /etc/default /etc/skel - - make prefix=${D}/usr \ - exec_prefix=${D} \ - mandir=${D}/usr/share/man \ - install || die "install problem" - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f ${D}/lib/lib{misc,shadow}.{a,la} - - # Do not install this login, but rather the one from - # pam-login, as this one have a serious root exploit - # with pam_limits in use. - use pam && rm ${D}/bin/login - - dosym newgrp /usr/bin/sg - dosym useradd /usr/sbin/adduser - dosym vipw /usr/sbin/vigr - # Remove dead links - rm -f ${D}/bin/{sg,vipw,vigr} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins ${FILESDIR}/securetty - insopts -m0600 ; doins ${S}/etc/login.access - insopts -m0644 ; doins ${S}/etc/limits - - # needed for 'adduser -D' - insinto /etc/default - insopts -m0600 - doins ${FILESDIR}/default/useradd - # From sys-apps/pam-login now - #insopts -m0644 ; doins ${FILESDIR}/login.defs - - # move passwd to / to help recover broke systems #64441 - mv ${D}/usr/bin/passwd ${D}/bin/ - dosym ../../bin/passwd /usr/bin/passwd - - if use pam; then - insinto /etc/pam.d ; insopts -m0644 - for x in ${FILESDIR}/pam.d/*; do - [ -f ${x} ] && doins ${x} - done - cd ${FILESDIR}/pam.d - # Make sure /etc/pam.d/system-auth is the new version .. - mv ${D}/etc/pam.d/system-auth-1.1 ${D}/etc/pam.d/system-auth - newins system-auth-1.1 system-auth.new || die - newins shadow chage - newins shadow chsh - newins shadow chfn - newins shadow useradd - newins shadow groupadd - fi - - 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 - # login with shadow - rm -f ${D}/usr/share/man/man1/login.* - # We use pam, so this is not applicable. - rm -f ${D}/usr/share/man/man5/suauth.* - fi - - cd ${S}/doc - dodoc INSTALL README WISHLIST - docinto txt - dodoc HOWTO LSM README.* *.txt - - # Fix sparc serial console - if [ "${ARCH}" = "sparc" ] - then - # ttyS0 and its devfsd counterpart (Sparc serial port "A") - dosed 's:\(vc/1\)$:tts/0\n\1:' /etc/securetty - dosed 's:\(tty1\)$:ttyS0\n\1:' /etc/securetty - fi - - # fix hppa serial console - if [ "${ARCH}" = "hppa" ] - then - # ttyB0 is the PDC software console - dosed 's:\(vc/1\)$:tts/0\n\1:' /etc/securetty - dosed 's:\(tty1\)$:ttyS0\n\1:' /etc/securetty - dosed 's:\(tty1\)$:ttyB0\n\1:' /etc/securetty - fi -} - -pkg_postinst() { - use pam || return 0; - local CHECK1="$(md5sum ${ROOT}/etc/pam.d/system-auth | cut -d ' ' -f 1)" - local CHECK2="$(md5sum ${ROOT}/etc/pam.d/system-auth.new | cut -d ' ' -f 1)" - - if [ "${CHECK1}" != "${CHECK2}" -a "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ] - then - ewarn "Due to a security issue, ${ROOT}etc/pam.d/system-auth " - ewarn "is being updated automatically. Your old " - ewarn "system-auth will be backed up as:" - ewarn - ewarn " ${ROOT}etc/pam.d/system-auth.bak" - echo - - cp -a ${ROOT}/etc/pam.d/system-auth \ - ${ROOT}/etc/pam.d/system-auth.bak; - mv -f ${ROOT}/etc/pam.d/system-auth.new \ - ${ROOT}/etc/pam.d/system-auth - rm -f ${ROOT}/etc/pam.d/._cfg????_system-auth - else - rm -f ${ROOT}/etc/pam.d/system-auth.new - fi -} diff --git a/sys-apps/shadow/shadow-4.0.5.ebuild b/sys-apps/shadow/shadow-4.0.5.ebuild index 4724496216ba..6d49fa2dda05 100644 --- a/sys-apps/shadow/shadow-4.0.5.ebuild +++ b/sys-apps/shadow/shadow-4.0.5.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.5.ebuild,v 1.3 2004/10/29 02:59:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5.ebuild,v 1.4 2004/11/01 14:52:49 vapier Exp $ inherit eutils libtool gnuconfig flag-o-matic @@ -13,8 +13,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="-*" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="pam selinux nls skey" RDEPEND=">=sys-libs/cracklib-2.7-r3 -- 2.26.2