Fix s-s-d's handling of daemons that change user without a pidfile, #191206.

Package-Manager: portage-2.1.3.7

5 files changed, 312 insertions, 5 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index ca4fa4ea7b5c..71e0ea62845a 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.435 2007/09/02 13:16:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.436 2007/09/04 11:10:18 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-2.0.0_rc4-r1 (04 Sep 2007)
+
+  04 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-2.0.0_rc4-ssd.patch, +baselayout-2.0.0_rc4-r1.ebuild:
+  Fix s-s-d's handling of daemons that change user without a pidfile, #191206.
+
 *baselayout-2.0.0_rc4 (02 Sep 2007)
 
   02 Sep 2007; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 6085d8ee7544..9985bb9d9d16 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -18,6 +18,10 @@ AUX baselayout-1.12.9-wireless-deprecate.patch 664 RMD160 9bcd7f2b7e0f104e3345cc
 MD5 65436e2104eb96e5153bac819bbe4f11 files/baselayout-1.12.9-wireless-deprecate.patch 664
 RMD160 9bcd7f2b7e0f104e3345cc018b3f0861e3c69c8d files/baselayout-1.12.9-wireless-deprecate.patch 664
 SHA256 2ebf280db2954783a55f1045cf5f9b2100dd257f7b34d0ad5664bc1ee286886e files/baselayout-1.12.9-wireless-deprecate.patch 664
+AUX baselayout-2.0.0_rc4-ssd.patch 406 RMD160 07a26ed885ed730c8db792fa85ebba4df95580ad SHA1 389a299791b1e01f86c8f6bd93bee571e0350494 SHA256 4ad8872c2f54b834fb17f08eb71dfddd44ab4005f0fb7f59d97d822f35bfafa5
+MD5 3a0a911bb3a710df539bac156ab37237 files/baselayout-2.0.0_rc4-ssd.patch 406
+RMD160 07a26ed885ed730c8db792fa85ebba4df95580ad files/baselayout-2.0.0_rc4-ssd.patch 406
+SHA256 4ad8872c2f54b834fb17f08eb71dfddd44ab4005f0fb7f59d97d822f35bfafa5 files/baselayout-2.0.0_rc4-ssd.patch 406
 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
@@ -42,14 +46,18 @@ EBUILD baselayout-1.12.9-r2.ebuild 18710 RMD160 7879bfd15fe63fd128517cbfef988e66
 MD5 d84c12175eb5e6ac9e86001cb5e21991 baselayout-1.12.9-r2.ebuild 18710
 RMD160 7879bfd15fe63fd128517cbfef988e66f4d8b6e8 baselayout-1.12.9-r2.ebuild 18710
 SHA256 4d2bfc07cf36f7282996cf109ede3e145f2f5365ed1ba3db446180411c9ac54b baselayout-1.12.9-r2.ebuild 18710
+EBUILD baselayout-2.0.0_rc4-r1.ebuild 9470 RMD160 9999d5e3a797068f5e715338c5ee1890435efea7 SHA1 4c3da7bb0ecd03f51620f8b126b14d73e8e362d6 SHA256 03df6ead6fec08f2c3f6bf610392d00c78a18d6333b264546d60e400b2c69a4b
+MD5 1e6bb322d40d3cb0739184146d49cc82 baselayout-2.0.0_rc4-r1.ebuild 9470
+RMD160 9999d5e3a797068f5e715338c5ee1890435efea7 baselayout-2.0.0_rc4-r1.ebuild 9470
+SHA256 03df6ead6fec08f2c3f6bf610392d00c78a18d6333b264546d60e400b2c69a4b baselayout-2.0.0_rc4-r1.ebuild 9470
 EBUILD baselayout-2.0.0_rc4.ebuild 9429 RMD160 02831d6ab4bf219cde2b3ae0ddca60be7be0555c SHA1 ca8b9322fc6058f5bc4b5f21deeff90f2f647cbe SHA256 cf636dcc354e5441a5177d22cdb75506da85a19e95fe4a0199384381e31a5c40
 MD5 e75516cf74b7293aca1b250ca3f678de baselayout-2.0.0_rc4.ebuild 9429
 RMD160 02831d6ab4bf219cde2b3ae0ddca60be7be0555c baselayout-2.0.0_rc4.ebuild 9429
 SHA256 cf636dcc354e5441a5177d22cdb75506da85a19e95fe4a0199384381e31a5c40 baselayout-2.0.0_rc4.ebuild 9429
-MISC ChangeLog 96208 RMD160 15183c6432c8a78258abd25e16e3b4feb5a6e6a6 SHA1 fc1720308d99a9712a8c1ea325b73af1d9cc6c25 SHA256 550c5be191f11598420f38e17e4ea3cda5d034b4877533f226baf2eee82b0129
-MD5 cf90a9ee52788291933516d6e8fb00eb ChangeLog 96208
-RMD160 15183c6432c8a78258abd25e16e3b4feb5a6e6a6 ChangeLog 96208
-SHA256 550c5be191f11598420f38e17e4ea3cda5d034b4877533f226baf2eee82b0129 ChangeLog 96208
+MISC ChangeLog 96451 RMD160 6789d89bc8a662ffbdd1f37dd3038f1fabb1894c SHA1 cc6a29e990fba6a784d155d1e8869e526a775a8f SHA256 6db257f1309b23eeaca4bf8799e66cbb251baddb0851c294cccc8c283cff441d
+MD5 aa8e2228d3f0e5765d52c111b471e95f ChangeLog 96451
+RMD160 6789d89bc8a662ffbdd1f37dd3038f1fabb1894c ChangeLog 96451
+SHA256 6db257f1309b23eeaca4bf8799e66cbb251baddb0851c294cccc8c283cff441d ChangeLog 96451
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -69,3 +77,6 @@ SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/di
 MD5 f1d98e9596ba0fa2c88bc6c2b5d9d3a5 files/digest-baselayout-2.0.0_rc4 265
 RMD160 285c61e9e4a33c9b6fa99e53f003466825089553 files/digest-baselayout-2.0.0_rc4 265
 SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/digest-baselayout-2.0.0_rc4 265
+MD5 f1d98e9596ba0fa2c88bc6c2b5d9d3a5 files/digest-baselayout-2.0.0_rc4-r1 265
+RMD160 285c61e9e4a33c9b6fa99e53f003466825089553 files/digest-baselayout-2.0.0_rc4-r1 265
+SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/digest-baselayout-2.0.0_rc4-r1 265
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc4-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc4-r1.ebuild
new file mode 100644
index 000000000000..c1eefdb50545
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.0.0_rc4-r1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc4-r1.ebuild,v 1.1 2007/09/04 11:10:18 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+		!build? (
+			!bootstrap? (
+				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
+				kernel_FreeBSD? ( sys-process/fuser-bsd )
+			)
+		)
+		pam? ( virtual/pam )
+		!<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers"
+PDEPEND="virtual/init
+	!build? ( !bootstrap? (
+		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
+	) )"
+
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}"-ssd.patch
+
+	# Setup unicode defaults for silly unicode users
+	if use unicode ; then
+		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+	fi
+}
+
+make_opts() {
+	local libdir="lib"
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+	local opts="${opts} LIB=${libdir}"
+
+	if use kernel_linux ; then
+		opts="${opts} OS=Linux"
+	else
+		opts="${opts} OS=BSD"
+	fi
+	use pam && opts="${opts} HAVE_PAM=1"
+
+	echo "${opts}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; then
+		sed -e 's/\<domain_/dns_domain_/g' \
+			-e 's/\<mac_domain_/mac_dns_domain_/g' \
+			-e 's/\<nameservers_/dns_servers_/g' \
+			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
+			-e 's/\<searchdomains_/dns_search_domains_/g' \
+			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
+			"${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1"
+	fi
+}
+
+pkg_preinst() {
+	# Move our makefiles to a temporay location
+	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	if use build || use bootstrap ; then
+		local libdirs="$(get_all_libdirs)" dir=
+		# Create our multilib dirs - the Makefile has no knowledge of this
+		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+		for dir in ${libdirs}; do
+			mkdir -p "${ROOT}${dir}"
+			touch "${ROOT}${dir}"/.keep
+			mkdir -p "${ROOT}usr/${dir}"
+			touch "${ROOT}usr/${dir}"/.keep
+			mkdir -p "${ROOT}usr/local/${dir}"
+			touch "${ROOT}usr/local/${dir}"/.keep
+		done
+
+		# Ugly compatibility with stupid ebuilds and old profiles symlinks
+		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
+			ln -s "${lib}" "${ROOT}lib"
+			ln -s "${lib}" "${ROOT}usr/lib"
+			ln -s "${lib}" "${ROOT}usr/local/lib"
+		fi
+
+		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+	fi
+
+	# Change some vars introduced in baselayout-1.11.0 before we go stable
+	# The new names make more sense and allow nis_domain
+	# for use in baselayout-1.12.0
+	remap_dns_vars net
+	remap_dns_vars wireless
+}
+
+src_install() {
+	emake $(make_opts) DESTDIR="${D}" install || die
+	dodoc ChangeLog COPYRIGHT
+
+	# Should this belong in another ebuild? Like say binutils?
+	# List all the multilib libdirs in /etc/env/04multilib (only if they're
+	# actually different from the normal
+	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
+		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
+		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+		for dir in ${libdirs}; do
+			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		done
+
+		# Special-case uglyness... For people updating from lib32 -> lib amd64
+		# profiles, keep lib32 in the search path while it's around
+		if has_multilib_profile && [[ -d ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
+			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+		fi
+		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
+		doenvd "${T}"/04multilib
+	fi
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
+
+	# Remove the installed runlevels, as we don't know about $ROOT yet
+	rm -rf "${D}/etc/runlevels"
+
+	# Copy the make files to /usr/share/baselayout so we can re-use them in
+	# postinst, otherwise binpkg will break.
+	insinto /usr/share/baselayout
+	doins -r Makefile default.mk runlevels*
+}
+
+pkg_postinst() {
+	# Make our runlevels if they don't exist
+	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
+		einfo "Making default runlevels"
+		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
+	fi
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[[ -e "${ROOT}etc/${x}" ]] && continue
+		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
+		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
+	done
+
+	# We need to copy svcdir if upgrading
+	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
+		(
+		source "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
+		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
+		rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console}
+		umount "${ROOT}${svcdir}" 2>/dev/null
+		rm -rf "${ROOT}${svcdir}"
+		)
+	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
+		# The format has changed since 1.13
+		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
+	fi
+
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		/$(get_libdir)/rcscripts/bin/rc-depend --update
+	fi
+
+	# This is also written in src_install (so it's in CONTENTS), but
+	# write it here so that the new version is immediately in the file
+	# (without waiting for the user to do etc-update)
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+	echo "Gentoo Base System release ${PF}" > "${ROOT}"/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!	 You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "	 # etc-update"
+
+	local lo="net.lo0"
+	use kernel_linux && lo="net.lo"
+	for f in ${ROOT}etc/init.d/net.*; do
+		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
+		echo
+		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
+		einfo "They need to be converted to symlinks to ${lo}.	If you haven't"
+		einfo "made personal changes to those files, you can update with the"
+		einfo "following command:"
+		einfo
+		einfo "	 /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
+		break
+	done
+
+	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \
+		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
+			echo
+			ewarn "You have deprecated variables in ${ROOT}etc/conf.d/net"
+			ewarn "or ${ROOT}etc/conf.d/wireless"
+			ewarn
+			ewarn "domain_* -> dns_domain_*"
+			ewarn "nameservers_* -> dns_servers_*"
+			ewarn "searchdomains_* -> dns_search_domains_*"
+			ewarn
+			ewarn "They have been converted for you - ensure that you"
+			ewarn "update them via 'etc-update'"
+	fi
+
+	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \
+		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
+			echo
+			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
+			ewarn "that no longer work"
+			ewarn
+			ewarn "You are advised to review the new configuration variables as"
+			ewarn "found in ${ROOT}etc/conf.d/net.example"
+	fi
+
+	# Remove old stuff that may cause problems.
+	if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then
+		rm -f "${ROOT}"/etc/env.d/01hostname
+	fi
+	if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then
+		rm -f "${ROOT}"/etc/{conf.d,init.d}/domainname \
+			"${ROOT}"/etc/runlevels/*/domainname
+		echo
+		ewarn "The domainname init script has been removed in this version."
+		ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how"
+		ewarn "to apply dns/nis information to the loopback interface."
+	fi
+}
+
+# Handle our downgraders
+# We should remove this when <1.13 has been removed from the tree
+pkg_postrm() {
+	# Remove dir if downgrading
+	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
+		(
+		source "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
+		mkdir -p "${ROOT}${svcdir}"
+		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
+		rm -rf "${ROOT}${svcdir}"/daemons
+		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
+		rm -rf "${ROOT}lib/rcscripts/init.d"
+		)
+	fi
+}
diff --git a/sys-apps/baselayout/files/baselayout-2.0.0_rc4-ssd.patch b/sys-apps/baselayout/files/baselayout-2.0.0_rc4-ssd.patch
new file mode 100644
index 000000000000..a0de71487fee
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-2.0.0_rc4-ssd.patch
@@ -0,0 +1,13 @@
+Index: src/librc-daemon.c
+===================================================================
+--- src/librc-daemon.c	(revision 2865)
++++ src/librc-daemon.c	(working copy)
+@@ -118,7 +118,7 @@
+ 			continue;
+ 
+ 		if (uid) {
+-			snprintf (buffer, sizeof (buffer), "/proc/%d", pid);
++			snprintf (buffer, sizeof (buffer), "/proc/%d", p);
+ 			if (stat (buffer, &sb) != 0 || sb.st_uid != uid)
+ 				continue;
+ 		}
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4-r1 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4-r1
new file mode 100644
index 000000000000..1d845a540da0
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4-r1
@@ -0,0 +1,3 @@
+MD5 d65dfec9aedd3a30a762e2c88f1e9291 baselayout-2.0.0_rc4.tar.bz2 137154
+RMD160 d257f6a6340ea46f56e3e975b096e9a2133ba27b baselayout-2.0.0_rc4.tar.bz2 137154
+SHA256 2c00b8141d6188eec223484453508efceb12afa3a1427994ca823eb594746a92 baselayout-2.0.0_rc4.tar.bz2 137154