Fix /etc/gshadow reading #327605 by Dirk Sondermann.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index cd364bddbbc5428347504efc076aa18db24cc884..d2a3f1d4d982467157d5896cd646ba5ce21c1678 100644 (file)
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.232 2010/07/03 07:58:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.233 2010/07/10 00:47:17 vapier Exp $
+
+*shadow-4.1.4.2-r4 (10 Jul 2010)
+
+  10 Jul 2010; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.2-r4.ebuild,
+  +files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch:
+  Fix /etc/gshadow reading #327605 by Dirk Sondermann.
 
   03 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   shadow-4.1.4.2-r3.ebuild:

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 8547b7754dfde5038523372a0717af4c5bfd22cf..3dd314bb0a0cd381537dcaf3b33a812006d3454c 100644 (file)
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 4.1.2.2/shadow-svn-2298.patch 1702 RMD160 0c9acfa0a9664e58012dfc86aea2b328aedcfc24 SHA1 aae2e1aa5b40269258f7bef890e93685bd7ff6b4 SHA256 a19dfd9a3f884930f7a1458e9e9767853d09949a9c04274762097ceddfd8129b
 AUX 4.1.2.2/shadow-svn-2364.patch 1944 RMD160 b70c637777ce46115fff0ce1796feff0b5d32e24 SHA1 861172fb52ccafe0e7c35cb740dbfae472a5b59d SHA256 32f1da89c135aaa03062e973b3f2281f560c1cc35663af739ae2b4c2dafc6277
@@ -39,6 +39,7 @@ AUX shadow-4.1.2.2-optional-nscd.patch 3244 RMD160 f844c6958f4f3830e9d98daa7622c
 AUX shadow-4.1.2.2-optional-utimes.patch 1397 RMD160 ffeceac79a9474fcd4c9064ebac6edddc45b6eeb SHA1 b56a1174a5fa591b04d7b93b44ec2c5f9285dd28 SHA256 28de85f16e6f4c52ea8f67beecd483d9a58adcd3c2234e88da049fccb9aabd93
 AUX shadow-4.1.3-dots-in-usernames.patch 302 RMD160 dcd0fdb1646a16cae1f3da0858257a22addefd17 SHA1 997e007090618713f9f0295ab540a6f2c9489885 SHA256 2299ffaec204d20e00d791bf5b982571c9261a74c7a7b865a9f7cad1cdcb43ba
 AUX shadow-4.1.4.2-env-reset-keep-locale.patch 436 RMD160 0acad89469885cc88937e23f20a84231af3840fa SHA1 8410b1b291f9c72efa03003f6afdd3e1fdeebe88 SHA256 5dd113c5cc0ea77dc8d8903b8c327b3b5e2cc9a529306ca85651631f06652e8f
+AUX shadow-4.1.4.2-fix-etc-gshadow-reading.patch 570 RMD160 80cbb45693ce4a1b19ced06819aa0488b72c3433 SHA1 1ce93a152cd17db37bd442da21e06d538cdea544 SHA256 091effa9c0336ffdc269d60a26af707b21ce849bdec7128baa21ce2bb5cba6b2
 AUX shadow-4.1.4.2-groupmod-pam-check.patch 689 RMD160 daa22dfce4b35d02951958fafdbac3816794bd63 SHA1 5823f38c0085b27e7e4327ab17ecc13563a43650 SHA256 ad60c0c26b70007750da034223eca38f1a98512fc80ce2fe40440e31a7585c52
 AUX shadow-4.1.4.2-su_no_sanitize_env.patch 315 RMD160 114abfb9ccc429342a83b8e919929c3818019718 SHA1 28ca6c0624c0fe5e4582ccca54e957ede125e96d SHA256 675098bb3dca4d8ac78e6c1c4ae7f513cb4017583b34b6b4d67611578bff8723
 DIST shadow-4.1.2.2.tar.bz2 1697615 RMD160 19b8d3bc37d26d708ecad6a86e6a1f2dcc3c51d3 SHA1 6cbd29104c219ff6776eececb8068f7326d57a45 SHA256 378fbfb0e8bb8c87be239fccd692818871f763206bb7d881744f4fa72dc6b491
@@ -49,12 +50,13 @@ EBUILD shadow-4.1.2.2.ebuild 4754 RMD160 8c5c5bbb82ef37b66dc9da78b4a735dba6660fb
 EBUILD shadow-4.1.4.2-r1.ebuild 5182 RMD160 64c9e2a1454bf1f0d0025aab846b63cced8770e3 SHA1 8b41b0b6d2ab533e91b61e12291b6ed181719cee SHA256 99d8792d19a852282175dd79efa92c45a43e2aa55626ce5d1d58b79b23ebfd8e
 EBUILD shadow-4.1.4.2-r2.ebuild 5143 RMD160 27f95be47f54b4bfe53fc5bc6d1640dd8913c16b SHA1 980a9ba0106a713ad10b86ff350d1253177926f3 SHA256 4a447c3e84acda9b862616566ba6fab9d4f7cb64fbf95284c95ea022d20a3b82
 EBUILD shadow-4.1.4.2-r3.ebuild 5210 RMD160 ea451c348555ece5fad3524d6dfcaff1dda0cadb SHA1 34e7b759c285fc69ecb55287c5e04ac94043e8ec SHA256 232f0e42ce31be91b1fc2e4744ca277704e11e2cf0123a68ee788cf506299e6f
-MISC ChangeLog 40213 RMD160 56e78380049d009ea147eca223d428db81ba08b0 SHA1 2741a498cce418d4e640d653e7a65cfc68cee828 SHA256 362b5d475e44be3b40dee68b24b61da714e9bf759cb2ed9481e8ae7118762402
+EBUILD shadow-4.1.4.2-r4.ebuild 5286 RMD160 85c407253baf39bea32e3f2b87a81d0f62b255f7 SHA1 684b4b748e61207733573517520d5838a27d0220 SHA256 15d7189454be738fa7dcb1aca2b7571626ec5aec8df8572542c5ddd0499e026d
+MISC ChangeLog 40436 RMD160 1df327355965f2cfb7f86cb6ec0e23ff7b602130 SHA1 2cea1fe06ec3327c8fd807dc7827bd2c14cfd8ea SHA256 13d5d7567906abf38ab0dc9e78069b3b7123a23a1f2be8daa2f801fc9447bccc
 MISC metadata.xml 412 RMD160 8cb1c2ffd3365f4334c78591e9349d394771dfed SHA1 e32195b6f24c7feae2ddfa3c9410a109c1e357f2 SHA256 41b211af54ade1542ce67559eeeb233c9fde4c97e66ef3602ae0f2dc228d7504
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwu7fQACgkQNQqtfCuFneM/cACfZgu8yPEttR0Xg8CetCZ7kf1C
-jJwAniRXxssY9FhhmF69uHsrltHuwJvk
-=aVQp
+iF4EAREIAAYFAkw3wqAACgkQTwhj9JtAlp43gwEAryGfYFwz0un6z/hDI1eXGwVM
+bNG5Q7gZYZdPLUbAOwcBAKQLUojNSTCLH40vuANFX3FILz6N4A/6oKp5+n9aWiFk
+=WdaO
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/shadow/files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch b/sys-apps/shadow/files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch
new file mode 100644 (file)
index 0000000..f8025a0
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch
@@ -0,0 +1,27 @@
+http://bugs.debian.org/569899
+http://bugs.gentoo.org/327605
+
+buf is not an array, it's a static pointer, so we have to use buflen
+
+--- lib/gshadow.c
++++ lib/gshadow.c
+@@ -222,6 +222,7 @@
+               if (NULL == buf) {
+                       return NULL;
+               }
++              buflen = BUFSIZ;
+       }
+ 
+       if (NULL == fp) {
+@@ -229,9 +230,9 @@
+       }
+ 
+ #ifdef        USE_NIS
+-      while (fgetsx (buf, (int) sizeof buf, fp) == buf)
++      while (fgetsx (buf, buflen, fp) == buf)
+ #else
+-      if (fgetsx (buf, (int) sizeof buf, fp) == buf)
++      if (fgetsx (buf, buflen, fp) == buf)
+ #endif
+       {
+               while (   ((cp = strrchr (buf, '\n')) == NULL)

diff --git a/sys-apps/shadow/shadow-4.1.4.2-r4.ebuild b/sys-apps/shadow/shadow-4.1.4.2-r4.ebuild
new file mode 100644 (file)
index 0000000..65aa177
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.1.4.2-r4.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.4.2-r4.ebuild,v 1.1 2010/07/10 00:47:17 vapier Exp $
+
+inherit eutils libtool toolchain-funcs pam multilib
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
+SRC_URI="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="audit cracklib nls pam selinux skey"
+
+RDEPEND="audit? ( sys-process/audit )
+       cracklib? ( >=sys-libs/cracklib-2.7-r3 )
+       pam? ( virtual/pam )
+       !sys-apps/pam-login
+       !app-admin/nologin
+       skey? ( sys-auth/skey )
+       selinux? ( >=sys-libs/libselinux-1.28 )
+       nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+       pam? ( >=sys-auth/pambase-20080219.1 )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${PN}-4.1.4.2-env-reset-keep-locale.patch #283725
+       epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920
+       epatch "${FILESDIR}"/${PN}-4.1.4.2-groupmod-pam-check.patch #300790
+       epatch "${FILESDIR}"/${PN}-4.1.4.2-su_no_sanitize_env.patch #301957
+       epatch "${FILESDIR}"/${PN}-4.1.4.2-fix-etc-gshadow-reading.patch #327605
+       elibtoolize
+       epunt_cxx
+}
+
+src_compile() {
+       tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
+       econf \
+               --without-group-name-max-length \
+               --enable-shared=no \
+               --enable-static=yes \
+               $(use_with audit) \
+               $(use_with cracklib libcrack) \
+               $(use_with pam libpam) \
+               $(use_with skey) \
+               $(use_with selinux) \
+               $(use_enable nls) \
+               $(use_with elibc_glibc nscd)
+       emake || die "compile problem"
+}
+
+set_login_opt() {
+       local comment="" opt=$1 val=$2
+       [[ -z ${val} ]] && comment="#"
+       sed -i -r \
+               -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \
+               "${D}"/etc/login.defs
+       local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs)
+       einfo ${res:-Unable to find ${opt} in /etc/login.defs}
+}
+
+src_install() {
+       emake DESTDIR="${D}" suidperms=4711 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}"/{,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
+       local devs
+       case $(tc-arch) in
+               ppc*)  devs="hvc0 hvsi0 ttyPSC0";;
+               hppa)  devs="ttyB0";;
+               arm)   devs="ttyFB0";;
+               sh)    devs="ttySC0 ttySC1";;
+       esac
+       [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty
+
+       # needed for 'useradd -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
+               set_login_opt MAIL_CHECK_ENAB no
+               set_login_opt SU_WHEEL_ONLY yes
+               set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+               set_login_opt LOGIN_RETRIES 3
+               set_login_opt ENCRYPT_METHOD SHA512
+       else
+               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
+               local opt
+               for opt in \
+                       CHFN_AUTH \
+                       CRACKLIB_DICTPATH \
+                       ENV_HZ \
+                       ENVIRON_FILE \
+                       FAILLOG_ENAB \
+                       FTMP_FILE \
+                       LASTLOG_ENAB \
+                       MAIL_CHECK_ENAB \
+                       MOTD_FILE \
+                       NOLOGINS_FILE \
+                       OBSCURE_CHECKS_ENAB \
+                       PASS_ALWAYS_WARN \
+                       PASS_CHANGE_TRIES \
+                       PASS_MIN_LEN \
+                       PORTTIME_CHECKS_ENAB \
+                       QUOTAS_ENAB \
+                       SU_WHEEL_ONLY
+               do
+                       set_login_opt ${opt}
+               done
+
+               sed -i -f "${FILESDIR}"/login_defs_pam.sed \
+                       "${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 2>/dev/null ; then
+                       grpconv
+               else
+                       ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+                       ewarn "run 'grpconv' afterwards!"
+               fi
+       fi
+
+       einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}