Add a new revision that uses the new system-login provided by pambase.

Package-Manager: portage-2.1.4.4

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index b4d3f7023556abd681164d41621b105cf93c22f7..ba79a650681f75f83d0ede6320374746af5446d4 100644 (file)
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.179 2007/11/04 15:12:28 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.180 2008/02/19 11:43:39 flameeyes Exp $
+
+*shadow-4.0.18.2-r1 (19 Feb 2008)
+
+  19 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> +files/login.pamd.3,
+  +shadow-4.0.18.2-r1.ebuild:
+  Add a new revision that uses the new system-login provided by pambase.
 
   04 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> +files/login.pamd.2,
   shadow-4.0.18.2.ebuild:

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 784c7849e5f10b6b2c4480f3f2e27cfbe51afa3f..d23ce0923d819bed1d48a0b848d0d0eb503a33a0 100644 (file)
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX default/useradd 96 RMD160 55c38953c800c6aae1ebe4312028560f77e7414f SHA1 348916abd4f794ee99310e1c006fbf00296ea2d7 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490
 AUX login.defs 6254 RMD160 1daa093f13d56126833e6e97d6dd60498a68304a SHA1 0cb67ea901d9544f1bb6f8f147aa25bb2f50628e SHA256 b7bfd7b1c34ce3d35865b572abc69d278dea4eef4f349c26b238735547c4ac22
 AUX login.pamd 1019 RMD160 062e018d7c0e6c3b9963f695051322f762809edc SHA1 9d7d986a0e89efab8454c6528722e6e0d2ad5cb2 SHA256 4d1844dbfc9292ae82789c26767190b6ca2cad0f77a55fee86dbf292444762e0
 AUX login.pamd.1 1020 RMD160 9f0ec8ff53bf96b89dc8a03d73839e5d8ea83552 SHA1 544aed588284a68aa6d4162d835664a24a993e39 SHA256 592c941fc935a85a0605df993ac130aadca0f5cb156aeed163d97fbc9483f457
 AUX login.pamd.2 915 RMD160 753976e3e134d8ce45560cf268683703d7d612fc SHA1 bf0b761a9ab5f35b0b035380b8bf986e08326f1e SHA256 6bc326f38a8948313e5b6032c45cd2a4973d2f518000325e744545e82d517573
+AUX login.pamd.3 247 RMD160 f49577de0dc32aa9abd851336f9719bdc06a44ba SHA1 f5a7b4c4a9aed0475b495a39ff2eb18ee68dccc1 SHA256 ef0f2edd1efff6cde8e6f2b7234fe50f094b28d29115d6b9b68443c7483ad5e7
 AUX login_defs.awk 738 RMD160 4c05e7ab04b1b630bba093fdb2c2501c11a2d5be SHA1 74a28544ec0de8dbc530846c54af763f8ebc9f18 SHA256 6ceb9e03c2f7df817f3162de48886c9c66a596cb2af98fbf523c93e26840113b
 AUX pam.d-include/login 245 RMD160 100e5514b65603d1fa0001cc0dce5dd2caaf232f SHA1 12c3524fe5565c722adffef58804b18bdaa1f411 SHA256 39bbe2ed696a22c7549a39a7cfd47c16e347e5af4fd71b8c01ec87fce59ba0a0
 AUX pam.d-include/other 142 RMD160 ccd73af37364c1c7edbe9150255fd0bcf8b12b09 SHA1 e038542a11ff3da16756518f236b6d273da1d08d SHA256 5e05df2743ec0021364b05f4bbe2e5a3a670abb5af845c3fa760731e5b7272ca
@@ -26,6 +30,14 @@ AUX shadow-4.0.18.2-useradd.patch 489 RMD160 8b4b6f9e83a1da6152ae588355709d0df3d
 DIST shadow-4.0.18.1.tar.bz2 1516296 RMD160 05a1f609370371de3112479cb6a98d966c45fa6c SHA1 1a30458e9db05560bfc82529048bd5d60b45cf9b SHA256 3da368d87a94270c3db4bae6ff634b8db5dcbc8822d554dbfea955a676c1ab12
 DIST shadow_4.0.18.2.orig.tar.gz 2501791 RMD160 f13d5c06bc88eea8d851a8c396110b2e96d1bb39 SHA1 c3426cddc8605ddb7ff55fdc231dc191ecc46989 SHA256 0b3cbfb32200cacd8544734d227d0a576642baf573f972f046bbbae457145cae
 EBUILD shadow-4.0.18.1-r1.ebuild 5914 RMD160 c5323f6fd8b05ffc826d444e12dd62f9780c987c SHA1 edf2c72b3ecd2f004cfa6f95ff430a930ce3561f SHA256 780da8cb7536fe971f803c2371d40ecff6eb7ec3d7541f084b1ace8570f9ed9c
+EBUILD shadow-4.0.18.2-r1.ebuild 5051 RMD160 a5a6c8280eac7a629298a91ffb140eaab46be485 SHA1 bf53a26eb437ac9fe0e414c231302205e9d1493f SHA256 948ef57c774d2dfbb6daf68dfef00cb103b5ce6cbc2b6dfbcce2795e17f57582
 EBUILD shadow-4.0.18.2.ebuild 5124 RMD160 955b0e83690bc5fab79e5d0376c16bc99e501120 SHA1 2ddd5b0ba21078685fee9f19e532f262ea264bf3 SHA256 ce6134223c39bf097470722e4031553ad121dae089cf9291c61022f4e1a11a84
-MISC ChangeLog 32162 RMD160 7a7903202baea3846ad6ce56c07d6cf34d43bdde SHA1 e3b90254a7747807bc98c016b64ee3f308dc52de SHA256 5c84c1faf515fe6e0a54b0be0d5a54573ba4922329d58726ddeff9e5bbd6b0b8
+MISC ChangeLog 32375 RMD160 b6e0f2406110354294d7cca94e0164cb15234b58 SHA1 46cecafd981d10a92c3b9ea9fee3ae4da35cd4b9 SHA256 94f6b4cbdc41eb3b048e57ba1d5ea8303396d439952a3c4b50062fd1e1ec7bc9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHusDxAiZjviIA2XgRAolzAJ9p3o3wj/c07KKr2a69feYrMEcVwQCgvGV7
+vOPNIpZLrF5Bj0jqTZyI2xc=
+=bupJ
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/shadow/files/login.pamd.3 b/sys-apps/shadow/files/login.pamd.3
new file mode 100644 (file)
index 0000000..545de84
--- /dev/null
+++ b/sys-apps/shadow/files/login.pamd.3
@@ -0,0 +1,10 @@
+auth       required    pam_securetty.so
+auth       include     system-login
+
+account    include     system-login
+
+password   include     system-login
+
+session    include     system-login
+session    optional    pam_motd.so motd=/etc/motd
+session    optional    pam_mail.so

diff --git a/sys-apps/shadow/shadow-4.0.18.2-r1.ebuild b/sys-apps/shadow/shadow-4.0.18.2-r1.ebuild
new file mode 100644 (file)
index 0000000..6e6230e
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.0.18.2-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.2-r1.ebuild,v 1.1 2008/02/19 11:43:39 flameeyes Exp $
+
+inherit eutils libtool toolchain-funcs autotools pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/ http://packages.qa.debian.org/s/shadow.html"
+SRC_URI="mirror://debian/pool/main/s/shadow/shadow_${PV}.orig.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls pam selinux skey nousuid cracklib"
+
+RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
+       pam? ( sys-auth/pambase )
+       !sys-apps/pam-login
+       !app-admin/nologin
+       skey? ( app-admin/skey )
+       selinux? ( >=sys-libs/libselinux-1.28 )
+       nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # uclibc support, corrects NIS usage
+       epatch "${FILESDIR}"/${PN}-4.0.13-nonis.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.
+       # *** This one could be a security hole; disable for now ***
+       #epatch "${FILESDIR}"/${P}-nologin-run-sh.patch
+
+       # tweak the default login.defs
+       epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch
+
+       # Make user/group names more flexible #3485 / #22920
+       epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch
+       epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch
+
+       # Fix compiling with gcc-2.95.x
+       epatch "${FILESDIR}"/${PN}-4.0.12-gcc2.patch
+
+       # lock down setuid perms #47208
+       epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
+
+       epatch "${FILESDIR}"/${PN}-4.0.15-uclibc-missing-l64a.patch
+       epatch "${FILESDIR}"/${PN}-4.0.16-fix-useradd-usergroups.patch #128715
+       epatch "${FILESDIR}"/${PN}-4.0.18.2-useradd.patch
+
+       # Needed by the UCLIBC patches
+       eautoconf || die
+
+       elibtoolize
+       epunt_cxx
+}
+
+src_compile() {
+       tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
+       econf \
+               --disable-desrpc \
+               --with-libcrypt \
+               --enable-shared=no \
+               --enable-static=yes \
+               $(use_with cracklib libcrack) \
+               $(use_with pam libpam) \
+               $(use_with skey) \
+               $(use_with selinux) \
+               $(use_enable nls) \
+               || die "bad configure"
+       emake || die "compile problem"
+}
+
+src_install() {
+       local perms=4711
+       use nousuid && perms=711
+       make DESTDIR="${D}" suiduperms=${perms} install || die "install problem"
+       dosym useradd /usr/sbin/adduser
+
+       # 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}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+       insinto /etc
+       # Using a securetty with devfs device names added
+       # (compat names kept for non-devfs compatibility)
+       insopts -m0600 ; doins "${FILESDIR}"/securetty
+       if ! use pam ; then
+               insopts -m0600
+               doins etc/login.access etc/limits
+       fi
+       # Output arch-specific cruft
+       case $(tc-arch) in
+               ppc*)  echo "hvc0" >> "${D}"/etc/securetty
+                          echo "hvsi0" >> "${D}"/etc/securetty
+                          echo "ttyPSC0" >> "${D}"/etc/securetty;;
+               hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
+               arm)   echo "ttyFB0" >> "${D}"/etc/securetty;;
+               sh)    echo "ttySC0" >> "${D}"/etc/securetty
+                          echo "ttySC1" >> "${D}"/etc/securetty;;
+       esac
+
+       # needed for 'adduser -D'
+       insinto /etc/default
+       insopts -m0600
+       doins "${FILESDIR}"/default/useradd
+
+       # move passwd to / to help recover broke systems #64441
+       mv "${D}"/usr/bin/passwd "${D}"/bin/
+       dosym /bin/passwd /usr/bin/passwd
+
+       cd "${S}"
+       insinto /etc
+       insopts -m0644
+       newins etc/login.defs login.defs
+
+       if use pam ; then
+               dopamd "${FILESDIR}/pam.d-include/"{su,passwd,shadow}
+
+               newpamd "${FILESDIR}/login.pamd.3" login
+
+               for x in chage chsh chfn chpasswd newusers \
+                                user{add,del,mod} group{add,del,mod} ; do
+                       newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+               done
+
+               # comment out login.defs options that pam hates
+               gawk -f "${FILESDIR}"/login_defs.awk \
+                       lib/getdef.c etc/login.defs \
+                       > "${D}"/etc/login.defs
+
+               # remove manpages that pam will install for us
+               # and/or don't apply when using pam
+               find "${D}"/usr/share/man \
+                       '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+                       -exec rm {} \;
+       fi
+
+       # Remove manpages that are handled by other packages
+       find "${D}"/usr/share/man \
+               '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+               -exec rm {} \;
+
+       cd "${S}"
+       dodoc ChangeLog NEWS TODO
+       newdoc README README.download
+       cd doc
+       dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+       rm -f "${ROOT}"/etc/pam.d/system-auth.new \
+               "${ROOT}/etc/login.defs.new"
+
+       use pam && pam_epam_expand "${D}"/etc/pam.d/login
+}
+
+pkg_postinst() {
+       # Enable shadow groups (we need ROOT=/ here, as grpconv only
+       # operate on / ...).
+       if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
+               if grpck -r &>/dev/null; then
+                       grpconv
+               else
+                       ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+                       ewarn "run 'grpconv' afterwards!"
+               fi
+       fi
+}