Adding another patch from udev-105, to unlink database files before (re)creating them, fixing some symlink issues.

Package-Manager: portage-2.1.2-r7

5 files changed, 339 insertions, 8 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a3b40bb77a98..0a9e04681bb3 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.241 2007/02/03 22:42:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.242 2007/02/04 22:27:57 zzam Exp $
+
+*udev-104-r9 (04 Feb 2007)
+
+  04 Feb 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-105-unlink-db-files.patch, +udev-104-r9.ebuild:
+  Adding another patch from udev-105, to unlink database files before
+  (re)creating them, fixing some symlink issues.
 
 *udev-104-r8 (03 Feb 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 481e90f7a698..d0b056b9bf35 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -49,6 +49,10 @@ AUX udev-104-peristent-net-disable-xen.patch 1027 RMD160 326cfdb0529348013e9b50e
 MD5 88882c2d651f3ede4c105478ee37f977 files/udev-104-peristent-net-disable-xen.patch 1027
 RMD160 326cfdb0529348013e9b50edd1cf878808d980d1 files/udev-104-peristent-net-disable-xen.patch 1027
 SHA256 07ae5cb9ead44ebb032c0322cd93b19d9eba7e43704c3ec55d29ac21f5e24ab0 files/udev-104-peristent-net-disable-xen.patch 1027
+AUX udev-105-unlink-db-files.patch 1211 RMD160 c7be0503126afaa2ba9cd072d399886d5a5dbe61 SHA1 246c1ee2e798bd512c8438757aed47d7d5c87069 SHA256 49f6d4f3073e092a71ac25ce86f084bcd242b4263cb1f82163da12fc5f1e3e97
+MD5 dafe1ab36969b6c6d3f1dd072266fd64 files/udev-105-unlink-db-files.patch 1211
+RMD160 c7be0503126afaa2ba9cd072d399886d5a5dbe61 files/udev-105-unlink-db-files.patch 1211
+SHA256 49f6d4f3073e092a71ac25ce86f084bcd242b4263cb1f82163da12fc5f1e3e97 files/udev-105-unlink-db-files.patch 1211
 AUX udev-105-vol_id-fix.patch 1915 RMD160 662666e3f66aa2c8d360e0271e2211d59eda0658 SHA1 476169645dc943e19f1ae076df8b7de5f34b51ea SHA256 87ce8a679e7555fa48fec826ca1860e349683488af42953b1f74897cc6166d90
 MD5 e8f743323be363683df7fd4c42482d44 files/udev-105-vol_id-fix.patch 1915
 RMD160 662666e3f66aa2c8d360e0271e2211d59eda0658 files/udev-105-vol_id-fix.patch 1915
@@ -287,10 +291,14 @@ EBUILD udev-104-r8.ebuild 9169 RMD160 c0f961377cff35fcfa9dbb08c3345a656a95325b S
 MD5 32a3078aaafe9403e66e12f4fea1d565 udev-104-r8.ebuild 9169
 RMD160 c0f961377cff35fcfa9dbb08c3345a656a95325b udev-104-r8.ebuild 9169
 SHA256 fb02be56950be8a9ca9f98ef64146ee5ba19a8758b1b57a1150fb1d11fed4c5f udev-104-r8.ebuild 9169
-MISC ChangeLog 45356 RMD160 156964abe142fc4d2bcafa36dd7864e5785a2ff6 SHA1 b04167c7b91a7297dca645a9e1241b4134f31bed SHA256 a5296d954918f59b7171d2e11f1e88731728cea7ee6e77aeae1b45a9c03f7c53
-MD5 7868005cdb776c7105b5289d1bffb818 ChangeLog 45356
-RMD160 156964abe142fc4d2bcafa36dd7864e5785a2ff6 ChangeLog 45356
-SHA256 a5296d954918f59b7171d2e11f1e88731728cea7ee6e77aeae1b45a9c03f7c53 ChangeLog 45356
+EBUILD udev-104-r9.ebuild 9221 RMD160 5260a7c204bc8dc0ecc550c6c6f302dad989e50d SHA1 ad3937d8cd171ac483bea8cfd5d4cdf644657838 SHA256 206e588dd1de4b50a61063275d59a6dbfe93a133d66e7a6d4d0d472a9e70c10d
+MD5 0c0910fe472d9c37378858f244234ea4 udev-104-r9.ebuild 9221
+RMD160 5260a7c204bc8dc0ecc550c6c6f302dad989e50d udev-104-r9.ebuild 9221
+SHA256 206e588dd1de4b50a61063275d59a6dbfe93a133d66e7a6d4d0d472a9e70c10d udev-104-r9.ebuild 9221
+MISC ChangeLog 45619 RMD160 a301a2c8a3203fd5a6fc0965e2e95b24527e03c1 SHA1 8e47674374baf9f50d95589cb2b85100d9668d43 SHA256 1135f3e4c571aa1a685e943f917da137788924bea20adc372268a40c2481ba54
+MD5 c6696f1d19c54c231d3d9f0aaab57191 ChangeLog 45619
+RMD160 a301a2c8a3203fd5a6fc0965e2e95b24527e03c1 ChangeLog 45619
+SHA256 1135f3e4c571aa1a685e943f917da137788924bea20adc372268a40c2481ba54 ChangeLog 45619
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -343,10 +351,13 @@ SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/di
 MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r8 229
 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r8 229
 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r8 229
+MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r9 229
+RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r9 229
+SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r9 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxQ/At2vP6XvVdOcRAigBAKDCi1xZxV79z02uU2mLH01tLP0TXQCgmmSt
-OWD26b4L5z5OpMAXkZRKBXw=
-=JFp1
+iD8DBQFFxl34t2vP6XvVdOcRAi51AKDgglSpo1YX89oXAlme8gCG0KtqlACg4UfB
+5J5zXUw1EnQSMBEFtjwAEts=
+=FBE+
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-104-r9 b/sys-fs/udev/files/digest-udev-104-r9
new file mode 100644
index 000000000000..1d88fbeee74a
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-104-r9
@@ -0,0 +1,3 @@
+MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574
+RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574
+SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574
diff --git a/sys-fs/udev/files/udev-105-unlink-db-files.patch b/sys-fs/udev/files/udev-105-unlink-db-files.patch
new file mode 100644
index 000000000000..8bb629af1d34
--- /dev/null
+++ b/sys-fs/udev/files/udev-105-unlink-db-files.patch
@@ -0,0 +1,33 @@
+unlink old database file before creating a new one
+
+udev_db_add_device() can be called when the corressponding database
+entry already exists - it should overwrite the old entry in this case.
+However, if the old entry was a symlink, fopen(filename, "w") will not
+overwrite it properly - it will keep the symlink and create a file
+named after the symlink target.  Calling unlink(filename) before
+trying to create the database file fixes the problem.
+
+Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
+
+---
+commit e0c0807ab32fde7f55776e0a300016bad922e636
+tree 117c38653de162d7f6e31a5b75333d1c6a21442e
+parent 27283c2fdaefd9c7fd557fd4663566eacccca33a
+author Sergey Vlasov <vsu@altlinux.ru> Di, 23 Jan 2007 19:55:38 +0100
+committer Kay Sievers <kay.sievers@vrfy.org> Di, 23 Jan 2007 19:55:38 +0100
+
+ udev_db.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/udev_db.c b/udev_db.c
+index f3c9509..b1217d8 100644
+--- a/udev_db.c
++++ b/udev_db.c
+@@ -93,6 +93,7 @@ int udev_db_add_device(struct udevice *udev)
+ 		struct name_entry *name_loop;
+ 		FILE *f;
+ 
++		unlink(filename);
+ 		f = fopen(filename, "w");
+ 		if (f == NULL) {
+ 			err("unable to create db file '%s': %s", filename, strerror(errno));
diff --git a/sys-fs/udev/udev-104-r9.ebuild b/sys-fs/udev/udev-104-r9.ebuild
new file mode 100644
index 000000000000..e9090c6d7989
--- /dev/null
+++ b/sys-fs/udev/udev-104-r9.ebuild
@@ -0,0 +1,277 @@
+# 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-104-r9.ebuild,v 1.1 2007/02/04 22:27:57 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.11.14"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
+	epatch ${FILESDIR}/${P}-netif-rename-busywait.patch
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+	epatch ${FILESDIR}/${PN}-105-vol_id-fix.patch
+	epatch ${FILESDIR}/${PN}-105-unlink-db-files.patch
+
+	# 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/udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "295a9b7bdc8bdb239f8860d14af761b0" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	local myconf=
+	local extras="extras/ata_id \
+				  extras/cdrom_id \
+				  extras/dasd_id \
+				  extras/edd_id \
+				  extras/firmware \
+				  extras/floppy \
+				  extras/path_id \
+				  extras/run_directory \
+				  extras/scsi_id \
+				  extras/usb_id \
+				  extras/volume_id \
+				  extras/rule_generator"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	echo "get_libdir = $(get_libdir)"
+	# Do not work with emake
+	make \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS_COMPILE=${mycross} \
+		${myconf} || die
+}
+
+src_install() {
+	# we install everything by "hand" and don't rely on the udev Makefile to do
+	# it for us (why? it's easier that way...)
+	dobin udevinfo		|| die "Required binary not installed properly"
+	dobin udevtest		|| die "Required binary not installed properly"
+	dobin udevmonitor	|| die "Required binary not installed properly"
+	into /
+	dosbin udevd		|| die "Required binary not installed properly"
+	dosbin udevstart	|| die "Required binary not installed properly"
+	dosbin udevtrigger	|| die "Required binary not installed properly"
+	dosbin udevcontrol	|| die "Required binary not installed properly"
+	dosbin udevsettle	|| die "Required binary not installed properly"
+
+	# Helpers
+	exeinto /lib/udev
+	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
+	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
+	doexe extras/ata_id/ata_id		|| die "Required helper not installed properly"
+	doexe extras/volume_id/vol_id	|| die "Required helper not installed properly"
+	doexe extras/scsi_id/scsi_id	|| die "Required helper not installed properly"
+	doexe extras/usb_id/usb_id		|| die "Required helper not installed properly"
+	doexe extras/path_id/path_id	|| die "Required helper not installed properly"
+	doexe extras/cdrom_id/cdrom_id	|| die "Required helper not installed properly"
+	doexe extras/dasd_id/dasd_id	|| die "Required helper not installed properly"
+	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_cd_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_net_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/rule_generator.functions	|| die "Required helper not installed properly"
+	keepdir /lib/udev/state
+	keepdir /lib/udev/devices
+
+	# vol_id library (needed by mount and HAL)
+	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
+	# move the .a files to /usr/lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+
+	# handle static linking bug #4411
+	gen_usr_ldscript libvolume_id.so
+
+	# save pkgconfig info
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins extras/volume_id/lib/*.pc
+
+	#exeinto /etc/udev/scripts
+	exeinto /lib/udev
+	#doexe extras/ide-devfs.sh
+	#doexe extras/scsi-devfs.sh
+	#doexe extras/raid-devfs.sh
+	doexe extras/floppy/create_floppy_devices	|| die "Required binary not installed properly"
+	doexe extras/firmware/firmware.sh			|| die "Required binary not installed properly"
+	doexe ${FILESDIR}/net.sh					|| die "Required binary not installed properly"
+	doexe ${FILESDIR}/seq_node.sh				|| die "Required binary not installed properly"
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_081 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	newins etc/udev/gentoo/udev.rules 50-udev.rules
+	newins ${FILESDIR}/udev.rules-104-r7 50-udev.rules
+	newins ${FILESDIR}/05-udev-early.rules-104-r5 05-udev-early.rules
+	doins ${FILESDIR}/95-net.rules
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+	doins extras/rule_generator/75-*.rules || die "rules not installed properly"
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up the /etc/dev.d directory tree
+	keepdir /etc/dev.d
+
+	# all of the man pages
+	doman *.7
+	doman *.8
+	doman extras/ata_id/ata_id.8
+	doman extras/edd_id/edd_id.8
+	doman extras/scsi_id/scsi_id.8
+	doman extras/volume_id/vol_id.8
+	doman extras/dasd_id/dasd_id.8
+	doman extras/cdrom_id/cdrom_id.8
+	# create a extra symlink for udevcontrol
+	dosym udevd.8 /usr/share/man/man8/udevcontrol.8
+
+	# our udev hooks into the rc system
+	insinto /lib/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-104-r5.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-104-r8.sh udev-stop.sh
+
+	# Insert udev-version number into udev-rcscript addon
+	sed -e "s/@@UDEV_VERSION@@/${PV}/" \
+		-i "${D}"/lib/rcscripts/addons/udev-start.sh \
+		-i "${D}"/lib/rcscripts/addons/udev-stop.sh
+
+	# needed to compile latest Hal
+	insinto /usr/include
+	doins extras/volume_id/lib/libvolume_id.h
+
+	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
+		if [[ -n $(pidof udevd) ]] ; then
+			killall -15 udevd &>/dev/null
+			sleep 1
+			killall -9 udevd &>/dev/null
+		fi
+		/sbin/udevd --daemon
+	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
+
+	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"
+}