Added missing inclusion of functions.sh, thanks to steffi from #gentoo-anfaenger. Changed einfo to ebegin/eend.

Package-Manager: portage-2.1.2.9

5 files changed, 340 insertions, 8 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 6f1a9698867f..97842b4e590f 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.311 2007/06/05 12:51:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.312 2007/06/07 13:44:16 zzam Exp $
+
+*udev-112-r1 (07 Jun 2007)
+
+  07 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/move_tmp_persistent_rules-112-r1.sh, +udev-112-r1.ebuild:
+  Added missing inclusion of functions.sh, thanks to steffi from
+  #gentoo-anfaenger. Changed einfo to ebegin/eend.
 
 *udev-112 (05 Jun 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index bb8c1df7ab5c..ddc834856afa 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -33,6 +33,10 @@ AUX modprobe-111-r1.sh 1474 RMD160 9d2680c1921925a02af8e6972df33e08f8a29dc2 SHA1
 MD5 544a873721f948faf423388704c6864d files/modprobe-111-r1.sh 1474
 RMD160 9d2680c1921925a02af8e6972df33e08f8a29dc2 files/modprobe-111-r1.sh 1474
 SHA256 cad8bef24f0cdf0da3381477f94c30e672f5f3791ec847546fbd91685d2de946 files/modprobe-111-r1.sh 1474
+AUX move_tmp_persistent_rules-112-r1.sh 646 RMD160 462b7836fc1492491e8e67de9301acb05cef847e SHA1 32b1cf96cfa55193c7b7e82640296fc11e7e8031 SHA256 d5dcbb9a13223633e9c4ac8b4eb26ddb38b55af7ea0eec9e512eb47475a07400
+MD5 7bf11e11519117f743483c73e0767750 files/move_tmp_persistent_rules-112-r1.sh 646
+RMD160 462b7836fc1492491e8e67de9301acb05cef847e files/move_tmp_persistent_rules-112-r1.sh 646
+SHA256 d5dcbb9a13223633e9c4ac8b4eb26ddb38b55af7ea0eec9e512eb47475a07400 files/move_tmp_persistent_rules-112-r1.sh 646
 AUX move_tmp_persistent_rules.sh 572 RMD160 7697c61236e63ff7c5a72466952d4d9746927bb7 SHA1 5d97d2bedcc2b97c7c6c0d047621a36177099ef0 SHA256 7154b7e63895caf2a89f758ee96cc682ebc5c1751e4038db5d76dae1c0d154e7
 MD5 ad07d95d6a0541396c2d542ab4b1bfc1 files/move_tmp_persistent_rules.sh 572
 RMD160 7697c61236e63ff7c5a72466952d4d9746927bb7 files/move_tmp_persistent_rules.sh 572
@@ -136,14 +140,18 @@ EBUILD udev-111.ebuild 10283 RMD160 d43cbdbd20902f110485e4299a8767a223f3c7fb SHA
 MD5 1304b26ff1a45be54fb571bbac6f3706 udev-111.ebuild 10283
 RMD160 d43cbdbd20902f110485e4299a8767a223f3c7fb udev-111.ebuild 10283
 SHA256 bee390b8c0e10bbc659aca22ef4b073712a6491b8a377797b4639965fb410650 udev-111.ebuild 10283
+EBUILD udev-112-r1.ebuild 8234 RMD160 897db8c7ca3c545891816b8c085904e2393f6f50 SHA1 b8f1cadbac89ee193e8f4dcc9d30077240064171 SHA256 9566d2c6b5e3fbbbe40a603770e877b0df05c60091ab61334fdb46824478c67b
+MD5 6c66054cccc42c02f84d1a9ecd40a014 udev-112-r1.ebuild 8234
+RMD160 897db8c7ca3c545891816b8c085904e2393f6f50 udev-112-r1.ebuild 8234
+SHA256 9566d2c6b5e3fbbbe40a603770e877b0df05c60091ab61334fdb46824478c67b udev-112-r1.ebuild 8234
 EBUILD udev-112.ebuild 8190 RMD160 3e10191956ed648f16cddc802d061b289702c105 SHA1 29af178a7eb07683291b6b6b9eca357afba7d161 SHA256 9c70a091ff92d265f50834bb245288e51f8e917d8df0392cc35b6d59ddaa269e
 MD5 f3155d03e463bd5b52b90fd79b00b050 udev-112.ebuild 8190
 RMD160 3e10191956ed648f16cddc802d061b289702c105 udev-112.ebuild 8190
 SHA256 9c70a091ff92d265f50834bb245288e51f8e917d8df0392cc35b6d59ddaa269e udev-112.ebuild 8190
-MISC ChangeLog 62499 RMD160 1850f0161a964a6eedd4c2adac2f7acbac5e1bd3 SHA1 5882fc763b805326be99818e38e1a26166ca63aa SHA256 319bf55aa5d9b30e65e3c6fcc8b2a0c316f4b3958f80cdc324b373e4af950f19
-MD5 abbbb18a725b92776ef5a1519a52462d ChangeLog 62499
-RMD160 1850f0161a964a6eedd4c2adac2f7acbac5e1bd3 ChangeLog 62499
-SHA256 319bf55aa5d9b30e65e3c6fcc8b2a0c316f4b3958f80cdc324b373e4af950f19 ChangeLog 62499
+MISC ChangeLog 62764 RMD160 721948a95ff04a44803f6598fdef53d003e8b63e SHA1 294349ced6c5035b2f16e35aae435ec75a2fd207 SHA256 b9ce762ee64225081389fe354124a6bf49a28acd737967eededa2acb344f2ec3
+MD5 bf1adf5fe5f3e7afe5c76cafb41ab03b ChangeLog 62764
+RMD160 721948a95ff04a44803f6598fdef53d003e8b63e ChangeLog 62764
+SHA256 b9ce762ee64225081389fe354124a6bf49a28acd737967eededa2acb344f2ec3 ChangeLog 62764
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -163,10 +171,13 @@ SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/di
 MD5 a82010635b4041c2229cf960a9d73eaf files/digest-udev-112 229
 RMD160 a3a88f67863e15305a790346449792c868e00d2f files/digest-udev-112 229
 SHA256 5a6fbdea53905f63b63d8e9c7cdd33c08241cf59dbb4aa9cfdcac6d87ec500eb files/digest-udev-112 229
+MD5 a82010635b4041c2229cf960a9d73eaf files/digest-udev-112-r1 229
+RMD160 a3a88f67863e15305a790346449792c868e00d2f files/digest-udev-112-r1 229
+SHA256 5a6fbdea53905f63b63d8e9c7cdd33c08241cf59dbb4aa9cfdcac6d87ec500eb files/digest-udev-112-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZVxct2vP6XvVdOcRAiVcAJ463o/Cigs9rZRvFEcBNby6sZsv2gCeLPYh
-4ML6phAno9rzhWinLQsKO1A=
-=YNPW
+iD8DBQFGaAu6t2vP6XvVdOcRAkCBAJsEWufs8GLn39IJ8F3iipYDDvqCTgCggMdJ
+rH2/KHdRGx4ncpqNUxPiqL4=
+=og/Y
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-112-r1 b/sys-fs/udev/files/digest-udev-112-r1
new file mode 100644
index 000000000000..8a0f2b24cf78
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-112-r1
@@ -0,0 +1,3 @@
+MD5 89448564541dec05cfbe4176048f2886 udev-112.tar.bz2 194203
+RMD160 1c50bcefc04ea08eb4df5eb0b2a12de2d8ff0228 udev-112.tar.bz2 194203
+SHA256 823fabbef5add28a454f3ab67cd3bcf06a41f45b976590f2fe7ea84d22b5186e udev-112.tar.bz2 194203
diff --git a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh b/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh
new file mode 100755
index 000000000000..1a0259798bc1
--- /dev/null
+++ b/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+. /etc/init.d/functions.sh
+
+# store persistent-rules that got created while booting
+# when / was still read-only
+store_persistent_rules() {
+	local file dest
+
+	for file in /dev/.udev/tmp-rules--*; do
+		dest=${file##*tmp-rules--}
+		[ "$dest" = '*' ] && break
+		type=${dest##70-persistent-}
+		type=${type%%.rules}
+		ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d"
+		cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file"
+		eend $? "Failed moving persistent rules!"
+	done
+}
+
+store_persistent_rules
+
+# vim:ts=4
diff --git a/sys-fs/udev/udev-112-r1.ebuild b/sys-fs/udev/udev-112-r1.ebuild
new file mode 100644
index 000000000000..f793bf5566a3
--- /dev/null
+++ b/sys-fs/udev/udev-112-r1.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-112-r1.ebuild,v 1.1 2007/06/07 13:44:16 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	udev_helper_dir="/$(get_libdir)/udev"
+
+	myconf=
+	extras="extras/ata_id \
+			extras/cdrom_id \
+			extras/edd_id \
+			extras/firmware \
+			extras/floppy \
+			extras/path_id \
+			extras/scsi_id \
+			extras/usb_id \
+			extras/volume_id \
+			extras/rule_generator \
+			extras/root_link"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+	EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff
+	epatch ${FILESDIR}/${PN}-112-rules.diff
+
+	# We already have that rule in 50-udev.rules
+	sed -i extras/cdrom_id/Makefile -e '/60-cdrom_id.rules/d'
+
+	# No need to clutter the logs ...
+	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+	# Do not use optimization flags from the package
+	sed -ie 's|$(OPTIMIZATION)||g' Makefile
+
+	# Make sure there is no sudden changes to udev.rules.gentoo
+	# (more for my own needs than anything else ...)
+	MD5=`md5sum < "${S}/etc/udev/gentoo/50-udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "90d89fa5c97413d01d04eb7e718d34b6" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+
+	sed_helper_dir \
+		etc/udev/gentoo/50-udev.rules \
+		extras/rule_generator/write_*_rules \
+		udev_rules_parse.c \
+		udev_utils_run.c
+
+	# Use correct multilib dir
+	sed -i extras/volume_id/lib/Makefile \
+		-e "/ =/s-/lib-/$(get_libdir)-"
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	emake \
+		EXTRAS="${extras}" \
+		libudevdir=${udev_helper_dir} \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS="" \
+		${myconf} || die
+}
+
+src_install() {
+	into /
+	emake \
+		DESTDIR="${D}" \
+		libudevdir=${udev_helper_dir} \
+		EXTRAS="${extras}" \
+		${myconf} \
+		install || die
+
+	# make install does not install this
+	dosbin udevstart	|| die "Required binary not installed properly"
+	doman udevstart.8
+
+	exeinto "${udev_helper_dir}"
+	newexe "${FILESDIR}"/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
+	newexe "${FILESDIR}"/modprobe-111-r1.sh modprobe.sh	|| die "Required binary not installed properly"
+	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+		|| die "Required binary not installed properly"
+
+	keepdir "${udev_helper_dir}"/state
+	keepdir "${udev_helper_dir}"/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id
+	dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id
+
+	# vol_id library (needed by mount and HAL)
+	into /
+	dolib extras/volume_id/lib/*.so*
+	into /usr
+	dolib extras/volume_id/lib/*.a
+
+	# handle static linking bug #4411
+	rm -f "${D}/usr/$(get_libdir)/libvolume_id.so"
+	gen_usr_ldscript libvolume_id.so
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_108 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	doins etc/udev/gentoo/??-*.rules
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-111-r3.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-111-r2.sh udev-stop.sh
+
+	# The udev-post init-script
+	newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount
+
+	insinto /etc/modprobe.d
+	newins ${FILESDIR}/blacklist-110 blacklist
+	doins ${FILESDIR}/pnp-aliases
+
+	# convert /lib/udev to real used dir
+	sed_helper_dir \
+		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
+		"${D}"/etc/init.d/udev* \
+		"${D}"/etc/modprobe.d/*
+
+	if use s390; then
+		# s390 does not has persistent mac addresses
+		# and we only have persistence rules for mac.
+		# For now just remove the rules file.
+		rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules
+	fi
+
+	# documentation
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+	dodoc docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+
+}
+
+pkg_preinst() {
+	if [[ -d ${ROOT}/lib/udev-state ]] ; then
+		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+		rm -r "${ROOT}"/lib/udev-state
+	fi
+
+	if [ -f "${ROOT}/etc/udev/udev.config" -a \
+	     ! -f "${ROOT}/etc/udev/udev.rules" ]
+	then
+		mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules
+	fi
+
+	# delete the old udev.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
+	# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
+	coldplug_stale=""
+	if [ -f "${ROOT}/etc/init.d/coldplug" ]
+	then
+		coldplug_stale="1"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		# check if root of init-process is identical to ours
+		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
+			einfo "restarting udevd now."
+			if [[ -n $(pidof udevd) ]] ; then
+				killall -15 udevd &>/dev/null
+				sleep 1
+				killall -9 udevd &>/dev/null
+			fi
+			/sbin/udevd --daemon
+		fi
+	fi
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	if [[ ${coldplug_stale} == "1" ]] ; then
+		ewarn "A stale coldplug init script found. You should run:"
+		ewarn
+		ewarn "      rc-update del coldplug"
+		ewarn "      rm -f /etc/init.d/coldplug"
+		ewarn
+		ewarn "udev now provides its own coldplug functionality."
+	fi
+
+	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+	if has_version "=sys-fs/udev-103-r3"; then
+		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
+		then
+			ewarn "Deleting stray 40-scsi-hotplug.rules"
+			ewarn "installed by sys-fs/udev-103-r3"
+			rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules
+		fi
+	fi
+
+	# Removing some device-nodes we thought we need some time ago
+	if [[ -d "${ROOT}"/lib/udev/devices ]]; then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file
+	if has_version "<sys-fs/udev-104-r5"; then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
+	fi
+
+	if has_version "<sys-fs/udev-106-r5"; then
+		if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then
+			rm -f ${ROOT}/etc/udev/rules.d/95-net.rules
+		fi
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete
+	if [[ -d "${ROOT}"/etc/dev.d ]]; then
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d
+		if [[ -d "${ROOT}"/etc/dev.d ]]; then
+			ewarn "You still have the directory /etc/dev.d on your system."
+			ewarn "This is no longer used by udev and can be removed."
+		fi
+	fi
+
+	einfo
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit:"
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}