From 8a31cbf2528b9f0b97d047383d1e8e51ebf94fa2 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Sun, 15 Feb 2004 21:37:57 +0000 Subject: Do not run grpconv if grpck do not return 0, bug #33282. --- sys-apps/baselayout/ChangeLog | 6 ++++- sys-apps/baselayout/Manifest | 33 +++++++++++++------------- sys-apps/baselayout/baselayout-1.8.6.13.ebuild | 15 +++++++++--- 3 files changed, 33 insertions(+), 21 deletions(-) (limited to 'sys-apps') diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index b795d8d04424..f2ddaec8a82a 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.118 2004/02/09 04:12:24 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.119 2004/02/15 21:37:57 azarah Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 15 Feb 2004; Martin Schlemmer + baselayout-1.8.6.13.ebuild: + Do not run grpconv if grpck do not return 0, bug #33282. + 08 Feb 2004; Brad House baselayout-1.8.6.13.ebuild: ppc64 fixes diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index a230328d196c..0230e2d02121 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,22 +1,21 @@ +MD5 434309c1dec0e5aba3d46dceae6ae47f baselayout-1.8.6.13.ebuild 20614 +MD5 3df11c6ed2d63b0aabdfc70566d28f72 baselayout-1.8.6.8-r1.ebuild 19208 +MD5 588528d3d2aad56bc41812645cb30ab9 baselayout-1.8.5.9.ebuild 15443 +MD5 d304fea0294facb045627f3d616d7141 baselayout-1.8.6.10-r1.ebuild 19917 +MD5 b39fcd18b4b7a9116dc8b8276355f188 ChangeLog 22775 +MD5 1fc3ffdb03670a6c96196c7093a260a0 baselayout-1.8.6.12-r5.ebuild 20586 +MD5 002dc1f376ecc83256f5b21b49a924f7 baselayout-1.8.6.12-r2.ebuild 20543 +MD5 1be574d950f6b48f2fb0ea17f3b16d35 baselayout-1.8.6.12-r3.ebuild 20545 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 f315eafc41bfe9ca8d1e29a575b6e3ce baselayout-1.8.6.12-r4.ebuild 20902 +MD5 8fb224d887d827b02d97b992c9e9b0c9 files/digest-baselayout-1.8.6.13 136 +MD5 aff1a583bcfc0f32587751f415f3d0b2 files/digest-baselayout-1.8.6.12-r3 138 +MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397 +MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137 +MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 +MD5 f2639d72920b26007c346d83866928bc files/digest-baselayout-1.8.6.12-r4 138 MD5 791058728d722586ebd7f7d93efac22f files/digest-baselayout-1.8.5.9 134 MD5 a6c521e030d8c87b9617f701fa1ec0f8 files/digest-baselayout-1.8.6.8-r1 136 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206 -MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 -MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137 -MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138 -MD5 aff1a583bcfc0f32587751f415f3d0b2 files/digest-baselayout-1.8.6.12-r3 138 -MD5 f2639d72920b26007c346d83866928bc files/digest-baselayout-1.8.6.12-r4 138 MD5 a79ff80121eeb9d089a142a8c1f4c7b9 files/digest-baselayout-1.8.6.12-r5 138 -MD5 8fb224d887d827b02d97b992c9e9b0c9 files/digest-baselayout-1.8.6.13 136 -MD5 3df11c6ed2d63b0aabdfc70566d28f72 baselayout-1.8.6.8-r1.ebuild 19208 -MD5 1be574d950f6b48f2fb0ea17f3b16d35 baselayout-1.8.6.12-r3.ebuild 20545 -MD5 1fc3ffdb03670a6c96196c7093a260a0 baselayout-1.8.6.12-r5.ebuild 20586 -MD5 d304fea0294facb045627f3d616d7141 baselayout-1.8.6.10-r1.ebuild 19917 -MD5 4e3bbe843c9ec9d771331b83a9b7fa18 baselayout-1.8.6.13.ebuild 20395 -MD5 4612b81643fb944df447f5671933ec0c .#Manifest.1.56 813 -MD5 588528d3d2aad56bc41812645cb30ab9 baselayout-1.8.5.9.ebuild 15443 -MD5 002dc1f376ecc83256f5b21b49a924f7 baselayout-1.8.6.12-r2.ebuild 20543 -MD5 f315eafc41bfe9ca8d1e29a575b6e3ce baselayout-1.8.6.12-r4.ebuild 20902 -MD5 58ca2f66315094444b5803e1c3751704 ChangeLog 22636 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 diff --git a/sys-apps/baselayout/baselayout-1.8.6.13.ebuild b/sys-apps/baselayout/baselayout-1.8.6.13.ebuild index 2faedf12663f..6b9f70102863 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.13.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.13.ebuild,v 1.3 2004/02/09 04:12:24 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.13.ebuild,v 1.4 2004/02/15 21:37:57 azarah Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -703,9 +703,18 @@ EOF # Enable shadow groups (we need ROOT=/ here, as grpconv only # operate on / ...). if [ "${ROOT}" = "/" -a \ - ! -f /etc/gshadow -a -x /usr/sbin/grpconv ] + ! -f /etc/gshadow -a -x /usr/sbin/grpck -a -x /usr/sbin/grpconv ] then - /usr/sbin/grpconv + /usr/sbin/grpck &>/dev/null + if [ "$?" -eq 0 ] + then + /usr/sbin/grpconv + else + echo + ewarn "Running 'grpck' returned errors. Please run it by hand, and then" + ewarn "run 'grpconv' afterwards!" + echo + fi fi # Simple Release version for testing of features that *should* be -- cgit v1.2.3-65-gdbad