From: Mike Frysinger Date: Sun, 24 Feb 2008 12:00:38 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=120e3b2201a9be18c7a602a8c09300c3234755cb;p=gentoo.git Version bump. Package-Manager: portage-2.2_pre2 --- diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index 9b81ecc39575..c81f186e713e 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/shadow # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.183 2008/02/24 11:02:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.184 2008/02/24 12:00:37 vapier Exp $ + +*shadow-4.1.0 (24 Feb 2008) + + 24 Feb 2008; Mike Frysinger + +files/shadow-4.1.0-fix-useradd-usergroups.patch, +shadow-4.1.0.ebuild: + Version bump. 24 Feb 2008; Mike Frysinger files/shadow-4.0.17-login.defs.patch, shadow-4.0.18.1-r1.ebuild, diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index 37988d4176a8..294768df3733 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -27,17 +27,20 @@ AUX shadow-4.0.16-fix-useradd-usergroups.patch 3319 RMD160 22c4f916fe1f9da00b0d5 AUX shadow-4.0.17-login.defs.patch 372 RMD160 055add143d873be6a57dbd1f8620b7e45268b5b3 SHA1 2db43522c24931ef6eacc00fca1c982ee9148bb9 SHA256 c23c744f959f3ea8f8aab23652f439803a5167b3a50fa3ef3ca5d4c1f12a9101 AUX shadow-4.0.18.1-useradd-usermod.patch 1081 RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 SHA1 c13cf8b5c566e129d4fc62ad3ac08b6c856c992e SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb AUX shadow-4.0.18.2-useradd.patch 489 RMD160 8b4b6f9e83a1da6152ae588355709d0df3deb0b6 SHA1 8a829fa144597a0806a136bc275e484c6029dd61 SHA256 9069a1a025e1dd96d3a3b4e5e759f55b297a34a2943f27e160864c090390a8c4 +AUX shadow-4.1.0-fix-useradd-usergroups.patch 2569 RMD160 d8c719470c7df384f9d5ebcdd98603d2d30f1718 SHA1 982b8e53962be4583beeb09efff472d2b34ea2e3 SHA256 c7f7de07b82295289e9bce0e93353527dd70451149978c70129348ff9ad80957 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 +DIST shadow_4.1.0.orig.tar.gz 2651512 RMD160 82c78efd61cb7cadfa2fd7fa0f1f3cb65c72363a SHA1 f4c99d44c33415d9ea68f98e47f6f7e9f47350f9 SHA256 cf132866ad1741da2072b8faa16e6e2d98ff85270151fe7383c818549187e3ae EBUILD shadow-4.0.18.1-r1.ebuild 5981 RMD160 3d55c06ab5a08051d9fcc14d79caf13f23bef699 SHA1 617a0087d5a949bee90135dc4aba0702bfd938b6 SHA256 efb797e3aa03063f0fc1d020daae30e401d5a3ad42c317235d153e52eb40ebb4 EBUILD shadow-4.0.18.2-r2.ebuild 5215 RMD160 a8b1a78dfaa6182e76ab94576fdf907f1ac91e44 SHA1 68f26a57d13bcff59efc1cddce4fa06b0a14ee9f SHA256 850d092f5641d7b9c58359d8fada64c96335c6f180fcc90d7f8c2dc830bdcba4 EBUILD shadow-4.0.18.2.ebuild 5191 RMD160 6716d64cee6e46c8cfd9bf84be0d7c2e1eee1684 SHA1 8023121f304efd1d0ab872d858cdf5e1c2bd837c SHA256 2681f509f51a1d5f01658c60616c43f5e80d75c5621bfe288051cedffbd850be -MISC ChangeLog 32964 RMD160 9ef78de6a94d08b4fb4448c3a27c8b2ce2876440 SHA1 00012cff5880af387e274bfc827377eb645d1388 SHA256 b4b099104cda997c9cc60772a5e313033bf647cfce165f28604ee2542532c145 +EBUILD shadow-4.1.0.ebuild 4718 RMD160 fa0a7e7feb90bf02d369d46c92ff0b0b8696dfa7 SHA1 09d70acde021c8a18c0c5e1e5da0b1edb088c028 SHA256 7ca97061f3dbac39fdc0ef6822b2e8b7686b4cc66f8108be9539fad3acdc2cf7 +MISC ChangeLog 33134 RMD160 01d5cb479cf588b447bf21289463c8aa9145fbfb SHA1 e2283dcdc264225366097826ca25de57c349888c SHA256 da5383fd30993aad0414d329e298e4e6083354d772a29a60bbeb301cb0929d27 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHwU63j9hvisErhMIRAhNFAJ9ecNbhHicjoRrxlwALKL0CjSucXQCfb38G -4tpCsNBNFO06qhRJ60C1MH4= -=BAwG +iD8DBQFHwVxrj9hvisErhMIRAsjuAKCeAHD8dnAhSGxA//DhL4z0teGvMACgi+Fn +cUK3xpa3GWNGDKJgUJhWZcg= +=TzNK -----END PGP SIGNATURE----- diff --git a/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch b/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch new file mode 100644 index 000000000000..8595ec39a91f --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch @@ -0,0 +1,91 @@ +http://bugs.gentoo.org/128715 + +exact implementation details are still in discussion upstream, but this fixes +the behavior to not suck like current code + +--- src/useradd.c ++++ src/useradd.c +@@ -254,6 +254,12 @@ + char *cp, *ep; + + /* ++ * Pull relevant settings from login.defs first. ++ */ ++ if (getdef_bool ("USERGROUPS_ENAB")) ++ nflg = -1; ++ ++ /* + * Open the defaults file for reading. + */ + +@@ -632,6 +638,8 @@ + " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" + " -m, --create-home create home directory for the new user\n" + " account\n" ++ " -n, --user-group create a new group with the same name as the\n" ++ " new user\n" + " -o, --non-unique allow create user with duplicate\n" + " (non-unique) UID\n" + " -p, --password PASSWORD use encrypted password for the new user\n" +@@ -1001,6 +1009,7 @@ + {"skel", required_argument, NULL, 'k'}, + {"key", required_argument, NULL, 'K'}, + {"create-home", no_argument, NULL, 'm'}, ++ {"user-group", no_argument, NULL, 'n'}, + {"non-unique", no_argument, NULL, 'o'}, + {"password", required_argument, NULL, 'p'}, + {"shell", required_argument, NULL, 's'}, +@@ -1008,7 +1017,7 @@ + {NULL, 0, NULL, '\0'} + }; + while ((c = +- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", + long_options, NULL)) != -1) { + switch (c) { + case 'b': +@@ -1145,6 +1154,9 @@ + case 'm': + mflg++; + break; ++ case 'n': ++ nflg = 1; ++ break; + case 'o': + oflg++; + break; +@@ -1192,6 +1204,16 @@ + usage (); + + /* ++ * Using --gid and --user-group doesn't make sense. ++ */ ++ if (nflg == -1 && gflg) ++ nflg = 0; ++ if (nflg && gflg) { ++ fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog); ++ exit (E_BAD_ARG); ++ } ++ ++ /* + * Either -D or username is required. Defaults can be set with -D + * for the -b, -e, -f, -g, -s options only. + */ +@@ -1728,7 +1750,7 @@ + * to that group, use useradd -g username username. + * --bero + */ +- if (!gflg) { ++ if (nflg) { + if (getgrnam (user_name)) { /* local, no need for xgetgrnam */ + fprintf (stderr, + _ +@@ -1762,7 +1784,7 @@ + + /* do we have to add a group for that user? This is why we need to + * open the group files in the open_files() function --gafton */ +- if (!(nflg || gflg)) { ++ if (nflg) { + find_new_gid (); + grp_add (); + } diff --git a/sys-apps/shadow/shadow-4.1.0.ebuild b/sys-apps/shadow/shadow-4.1.0.ebuild new file mode 100644 index 000000000000..278c90557142 --- /dev/null +++ b/sys-apps/shadow/shadow-4.1.0.ebuild @@ -0,0 +1,160 @@ +# 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.1.0.ebuild,v 1.1 2008/02/24 12:00:37 vapier Exp $ + +inherit eutils libtool toolchain-funcs autotools pam multilib + +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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="nls pam selinux skey cracklib" + +RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 ) + pam? ( >=sys-libs/pam-0.99 ) + !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}" + + # 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 + sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die + + # 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 + epatch "${FILESDIR}"/${PN}-4.1.0-fix-useradd-usergroups.patch #128715 + + 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() { + emake DESTDIR="${D}" suidperms=4711 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.2" 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 +}