Version bumped.

Package-Manager: portage-2.1.6.11/cvs/Linux i686

3 files changed, 450 insertions, 6 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index aaf9a34e0788..ab3126989527 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.456 2009/03/14 08:18:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.457 2009/04/09 10:29:17 zzam Exp $
+
+*udev-141 (09 Apr 2009)
+
+  09 Apr 2009; Matthias Schwarzott <zzam@gentoo.org> +udev-141.ebuild:
+  Version bumped.
 
 *udev-140 (14 Mar 2009)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index d672ed5efb9d..9e8f364c9959 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -72,6 +72,7 @@ DIST udev-135.tar.bz2 446675 RMD160 c56d146e0d56e140f7c6dd9294673259d27b162c SHA
 DIST udev-138.tar.bz2 448611 RMD160 5be1fed7f4ec2ca6953536f9ada982e36db3ca64 SHA1 8b96b5d80782f4f636a13fb1cba7efd7c4c37fc0 SHA256 bc525a4d6bdbace1b23433256643cc331e4049e1e2442333707e6d2ba8a173b4
 DIST udev-139.tar.bz2 450006 RMD160 cb3e5c7d557b6fd0aa93e9717cc1b87a82586c4e SHA1 678eec992c84ce96f40b5a3264651a8b55dedd94 SHA256 6786a896146b12323d0ef31601dc23b6e5501762d7d61c475d09e405494c21df
 DIST udev-140.tar.bz2 450894 RMD160 e3a0a6a7996d43fa8263b0e7ddc91a640d9faa37 SHA1 603c34d413e983659650f41cc6b95141b6a0d029 SHA256 869e015257457c58209d5aaae0c0f1f41d124c53601bb74e4dbb637442ea5b33
+DIST udev-141.tar.bz2 448373 RMD160 54da17bd8d37c00a97d0914e6b003096dedf5753 SHA1 f82279e4b4759b9e3134f99a538ccd1a437bf7f0 SHA256 51e0128c3fc29971d978050839fd59f103fddae4a47c8fd2b36f2836cfb59d35
 EBUILD udev-114.ebuild 9031 RMD160 1b7e45d1a384c52a336727a17e6fbd087855fb34 SHA1 207b330f01cb9970eee14b4c39b7bf2d5b9ce181 SHA256 f45fda83e1308079b9d932586b07acf2d7bf65527f8b414c8d43738fd0c129e5
 EBUILD udev-115-r1.ebuild 10108 RMD160 86ec04530480872e2ac1fbb2fa37fa2819639752 SHA1 1021b13461ac7625f97a60634982416c2a8dddc4 SHA256 765135b405bd90ee6c527c0be00e87c12400121e30261de9ba6d3e4a3c50f872
 EBUILD udev-119.ebuild 10145 RMD160 7b978b270ce5d39443310b7da58aa5ff4bdd02f9 SHA1 fdd10d47bb62517d78f0e7d811903203b4cc3d8e SHA256 2998cfa7681f16132aaad0a8a033e83418c4e418430cabf5ebf1d8631fcc58bd
@@ -88,13 +89,14 @@ EBUILD udev-135.ebuild 12079 RMD160 88554ff3379d6d74c0537a0848b71e346e5a6108 SHA
 EBUILD udev-138.ebuild 12247 RMD160 6f419cdc60571ed69b9832101d9dd38b067e15a1 SHA1 0374fc0a03163255f7bf347c47212327815d196b SHA256 cd34e393b78ff4003d5c1691f82bc4731d474682c9f6930fe2445be995b504f0
 EBUILD udev-139.ebuild 12247 RMD160 7e0f9f444debd034269b239caf474abb284f018c SHA1 114e057db09e9779ef9a90b37fb62802d1115131 SHA256 44152d8440f6bb8c8c540d5906b4a3d922a7f1ed753184462cc00a00d710eea0
 EBUILD udev-140.ebuild 12247 RMD160 649ec35ee7b92db9247a78c998c5a756f3559554 SHA1 c8467e07416438ea45ab7a2e60adea5f449485ab SHA256 5fb6b44badf72e3abb49414352688a8f9547f025436840b32375b51dfe75f650
+EBUILD udev-141.ebuild 12247 RMD160 bdd9e01f2c7d31bd7d48dc00e4becaaf2f10075c SHA1 99364feae13c1c6aeef45b8fae639a77e81d2279 SHA256 72ccf04cdb48fdec7a1affe87be4cc004b1623ed93f4d4f21b81c0ca2ea6d2a3
 EBUILD udev-9999.ebuild 12172 RMD160 a7671070cb3666ddae8da3640fdcc335201e1ade SHA1 a62d36bac7e3bbf9f2fa0ffb1bd8c128c2536f5d SHA256 00fdf03591ecbd5ca71fdc44ff31c91c8fb4447e9f0d1fe6538967634d711798
-MISC ChangeLog 93820 RMD160 4bdb1d01a7e23a36d584809d0c9558d2f8154574 SHA1 6c49ddbe1ff8040e020b81f22ba88ec5ea5f5c4e SHA256 087f518942f0ce8ae3741f0e5eef3179659caf8a92ec8211cb08134c47f0d9a3
+MISC ChangeLog 93935 RMD160 7e80e7d9578455bca6dc93f09bdfa81cedc9af1d SHA1 5de7b49f50fb34f88f1c5d41c87bd0796ad22bb5 SHA256 26f9534a35501177adb15683e370e34b1c01990b06f8cfc16dbd238f2cdfe2c1
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm7aG8ACgkQt2vP6XvVdOcSnQCaAlEurSFPNQyvg8gz1UusWWZt
-kmwAn2+qICr26kNTIJmLqHtVvjb6UowN
-=JgN6
+iEYEARECAAYFAkndzgMACgkQt2vP6XvVdOfwBQCbBEDE3L6gRfSHq4CZ0QXblPvM
+8NMAnR0+Nc4cTnO1aRiXgxaG78j/IK9k
+=bVpI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-141.ebuild b/sys-fs/udev/udev-141.ebuild
new file mode 100644
index 000000000000..0ee2903f808b
--- /dev/null
+++ b/sys-fs/udev/udev-141.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141.ebuild,v 1.1 2009/04/09 10:29:17 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+	EGIT_BRANCH="master"
+	inherit git autotools
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+fi
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )"
+
+if [[ ${PV} == "9999" ]]; then
+	# for documentation processing with xsltproc
+	DEPEND="${COMMON_DEPEND}
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd"
+else
+	DEPEND="${COMMON_DEPEND}"
+fi
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/coldplug
+	!<sys-fs/device-mapper-1.02.19-r1
+	>=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"
+
+	# comparing kernel version without linux-info.eclass to not pull
+	# virtual/linux-sources
+
+	local KV=$(uname -r)
+	local KV_MAJOR=$(get_major_version ${KV})
+	local KV_MINOR=$(get_version_component_range 2 ${KV})
+	local KV_MICRO=$(get_version_component_range 3 ${KV})
+
+	local KV_min_micro=15 KV_min_micro_reliable=22
+	KV_min=2.6.${KV_min_micro}
+	KV_min_reliable=2.6.${KV_min_micro_reliable}
+
+	local ok=0
+	if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
+	then
+		if [[ ${KV_MICRO} -ge ${KV_min_micro_reliable} ]]; then
+			ok=2
+		elif [[ ${KV_MICRO} -ge ${KV_min_micro} ]]; then
+			ok=1
+		fi
+	fi
+
+	if [[ ${ok} -lt 1 ]]
+	then
+		ewarn
+		ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+	fi
+	if [[ ${ok} -lt 2 ]]; then
+		ewarn "If you want to use udev reliable you should update"
+		ewarn "to at least kernel version ${KV_min_reliable}!"
+		ewarn
+		ebeep
+	fi
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+
+	# patches go here...
+
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-i rules/{rules.d,packages,gentoo}/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	if [[ ${PV} != 9999 ]]; then
+		# Make sure there is no sudden changes to upstream rules file
+		# (more for my own needs than anything else ...)
+		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
+		MD5=${MD5/  -/}
+		if [[ ${MD5} != b5c2f014a48a53921de37c4e469aab96 ]]
+		then
+			echo
+			eerror "50-udev-default.rules has been updated, please validate!"
+			eerror "md5sum=${MD5}"
+			die "50-udev-default.rules has been updated, please validate!"
+		fi
+	fi
+
+	sed_helper_dir \
+		rules/rules.d/50-udev-default.rules \
+		extras/rule_generator/write_*_rules \
+		udev/udev-util.c \
+		udev/udev-rules.c \
+		udev/udevd.c || die "sed failed"
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	econf \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--exec-prefix= \
+		--with-libdir-name=$(get_libdir) \
+		--enable-logging \
+		$(use_with selinux)
+
+	emake || die "compiling udev failed"
+}
+
+src_install() {
+	local scriptdir="${FILESDIR}/136"
+
+	into /
+	emake DESTDIR="${D}" install || die "make install failed"
+	if [[ "$(get_libdir)" != "lib" ]]; then
+		# we can not just rename /lib to /lib64, because
+		# make install creates /lib64 and /lib
+		mkdir -p "${D}/$(get_libdir)"
+		mv "${D}"/lib/* "${D}/$(get_libdir)/"
+		rmdir "${D}"/lib
+	fi
+
+	exeinto "${udev_helper_dir}"
+	newexe "${FILESDIR}"/net-130-r1.sh net.sh	|| die "net.sh not installed properly"
+	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+		|| die "move_tmp_persistent_rules.sh not installed properly"
+	newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \
+		|| die "write_root_link_rule not installed properly"
+
+	doexe "${scriptdir}"/shell-compat-KV.sh \
+		|| die "shell-compat.sh not installed properly"
+	doexe "${scriptdir}"/shell-compat-addon.sh \
+		|| die "shell-compat.sh 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
+
+	# Add gentoo stuff to udev.conf
+	echo "# If you need to change mount-options, do it in /etc/fstab" \
+	>> "${D}"/etc/udev/udev.conf
+
+	# let the dir exist at least
+	keepdir /etc/udev/rules.d
+
+	# Now installing rules
+	cd "${S}"/rules
+	insinto "${udev_helper_dir}"/rules.d/
+
+	# Our rules files
+	doins gentoo/??-*.rules
+	doins packages/40-alsa.rules
+	doins packages/40-isdn.rules
+
+	# Adding arch specific rules
+	if [[ -f packages/40-${ARCH}.rules ]]
+	then
+		doins "packages/40-${ARCH}.rules"
+	fi
+	cd "${S}"
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${scriptdir}"/udev-start.sh \
+		|| die "udev-start.sh not installed properly"
+	doins "${scriptdir}"/udev-stop.sh \
+		|| die "udev-stop.sh not installed properly"
+
+	local init
+	# udev-postmount and init-scripts for >=openrc-0.3.1, Bug #240984
+	for init in udev udev-mount udev-dev-tarball udev-postmount; do
+		newinitd "${scriptdir}/${init}.initd" "${init}" \
+			|| die "initscript ${init} not installed properly"
+	done
+
+	# insert minimum kernel versions
+	sed -e "s/%KV_MIN%/${KV_min}/" \
+		-e "s/%KV_MIN_RELIABLE%/${KV_min_reliable}/" \
+		-i "${D}"/etc/init.d/udev-mount
+
+	# config file for init-script and start-addon
+	newconfd "${scriptdir}/udev.confd" udev \
+		|| die "config file not installed properly"
+
+	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/*
+
+	# documentation
+	dodoc ChangeLog README TODO || die "failed installing docs"
+
+	cd docs/writing_udev_rules
+	mv index.html writing_udev_rules.html
+	dohtml *.html
+
+	cd "${S}"
+
+	newdoc extras/volume_id/README README_volume_id
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev
+	doenvd 20udev
+}
+
+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 &&
+	     ! -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
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
+}
+
+fix_old_persistent_net_rules() {
+	local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
+	[[ -f ${rules} ]] || return
+
+	elog
+	elog "Updating persistent-net rules file"
+
+	# Change ATTRS to ATTR matches, Bug #246927
+	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
+
+	# Add KERNEL matches if missing, Bug #246849
+	sed -ri \
+		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
+		"${rules}"
+}
+
+# See Bug #129204 for a discussion about restarting udevd
+restart_udevd() {
+	# need to merge to our system
+	[[ ${ROOT} = / ]] || return
+
+	# check if root of init-process is identical to ours (not in chroot)
+	[[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
+
+	# abort if there is no udevd running
+	[[ -n $(pidof udevd) ]] || return
+
+	# abort if no /dev/.udev exists
+	[[ -e /dev/.udev ]] || return
+
+	elog
+	elog "restarting udevd now."
+
+	killall -15 udevd &>/dev/null
+	sleep 1
+	killall -9 udevd &>/dev/null
+
+	/sbin/udevd --daemon
+}
+
+pkg_postinst() {
+	fix_old_persistent_net_rules
+
+	restart_udevd
+
+	if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
+	then
+		ewarn
+		ewarn "You need to add the udev init script to the runlevel sysinit,"
+		ewarn "else your system will not be able to boot"
+		ewarn "after updating to >=openrc-0.4.0"
+		ewarn "Run this to enable udev for >=openrc-0.4.0:"
+		ewarn "\trc-update add udev sysinit"
+		ewarn
+	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 [[ $previous_equal_to_103_r3 = 0 ]] &&
+		[[ -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
+
+	# 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 [[ $previous_less_than_104_r5 = 0 ]]
+	then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
+	fi
+
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
+		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
+	then
+		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
+	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 2>/dev/null
+		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
+
+	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
+	# remove it if user don't has sys-fs/device-mapper installed
+	if [[ $previous_less_than_113 = 0 ]] &&
+		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+		! has_version sys-fs/device-mapper
+	then
+			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+			einfo "Removed unneeded file 64-device-mapper.rules"
+	fi
+
+	# requested in Bug #225033:
+	elog
+	elog "persistent-net does assigning fixed names to network devices."
+	elog "If you have problems with the persistent-net rules,"
+	elog "just delete the rules file"
+	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
+	elog "and then reboot."
+	elog
+	elog "This may however number your devices in a different way than they are now."
+
+	ewarn
+	ewarn "If you build an initramfs including udev, then please"
+	ewarn "make sure that the /sbin/udevadm binary gets included,"
+	ewarn "and your scripts changed to use it,as it replaces the"
+	ewarn "old helper apps udevinfo, udevtrigger, ..."
+
+	ewarn
+	ewarn "mount options for directory /dev are no longer"
+	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
+	ewarn "as for other directories."
+
+	elog
+	elog "For more information on udev on Gentoo, writing udev rules, and"
+	elog "         fixing known issues visit:"
+	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}