050 release

5 files changed, 199 insertions, 63 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index bd8bcd90701d..002fc13d2af3 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.91 2004/12/18 06:03:34 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.92 2004/12/18 06:42:36 gregkh Exp $
+
+*udev-050 (17 Dec 2004)
+
+  17 Dec 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  +files/udev-050-udev_volume_id.patch, +udev-050.ebuild:
+  050 release (fixes some segfaults in the 049 release)
 
 *udev-039 (17 Dec 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index d3d89058de76..2677a7f42c4d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,69 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b76d462c0c2675f4d60b4bbeae6029ae udev-049.ebuild 4113
-MD5 ad951edb25a0fd72163f353f619dbd20 ChangeLog 17545
-MD5 327457456f51bff81a9561a6dab650db udev-024-r1.ebuild 3949
-MD5 74b4229e5b22febad5874a84a4150e96 udev-038.ebuild 3588
-MD5 476db9ae4891cc8a278aa70b6e26d154 udev-048.ebuild 4113
-MD5 758b15537e2b36026aaa11a53b27d0ee udev-039.ebuild 3588
-MD5 c30b5735565abaafb2229dbee61cca8b udev-032.ebuild 3621
-MD5 7db4ad93365d330f2c7653c2da1360b3 udev-036.ebuild 3588
-MD5 eeba77e94b809595362130307b8fda5d udev-043.ebuild 3597
-MD5 4895712d0631b6e784384010e40a7ecb udev-044.ebuild 3552
+MD5 b76d462c0c2675f4d60b4bbeae6029ae udev-050.ebuild 4113
+MD5 846edcb913e33c7637b4856bc3566b3d ChangeLog 17990
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 54343e889ed8e1685908d27c9633dbb3 udev-025-r1.ebuild 3811
-MD5 744bc0045f1b0c2f8ec635240e955f6e udev-045.ebuild 3624
-MD5 e1ef3b20ac57f3f82e79b301ff5eea48 udev-040.ebuild 3588
-MD5 61627f421ee2c1603a7feda4a6a31787 udev-026-r1.ebuild 3518
-MD5 1ed5a700a2b2209de427b7449633f330 udev-028.ebuild 3516
 MD5 c73fe26a417dc01898ae32907316bd6b udev-030.ebuild 3525
-MD5 fe7b1f0fe65a9241ddab0e48bf107e7f udev-034.ebuild 3588
-MD5 098e831ac088f8ab1f12b03f753053e1 udev-046.ebuild 4011
 MD5 1be28133b4b566a7815a4210c4ad9ab7 udev-042.ebuild 3586
-MD5 22944a40778a8322963b150a2087138b udev-035.ebuild 3588
-MD5 23765c0c973e9614c100ecae43f22295 udev-031.ebuild 3617
-MD5 43f06a13e6e46c4ca41491ded1369593 udev-033.ebuild 3598
-MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
-MD5 61bb2401341b879f2ee89392d357c973 udev-034-r1.ebuild 3591
-MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
-MD5 1c035649bafbb62a521bbc4325b0f6d0 files/digest-udev-049 61
-MD5 a691746515d05e3574c0a26b4cc6f0cc files/digest-udev-026-r1 61
-MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
+MD5 eeba77e94b809595362130307b8fda5d udev-043.ebuild 3597
+MD5 744bc0045f1b0c2f8ec635240e955f6e udev-045.ebuild 3624
+MD5 098e831ac088f8ab1f12b03f753053e1 udev-046.ebuild 4011
+MD5 b76d462c0c2675f4d60b4bbeae6029ae udev-049.ebuild 4113
+MD5 476db9ae4891cc8a278aa70b6e26d154 udev-048.ebuild 4113
+MD5 222215c06d2dc8a4e3115b164fbafec6 files/digest-udev-050 61
+MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
+MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
+MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
+MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
+MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
+MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
+MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
-MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
-MD5 6d7c7441686712fb1845375857306560 files/digest-udev-029 61
 MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
-MD5 1bb7bad6e00af55cffe1f0b500c8aecd files/digest-udev-044 61
-MD5 0d0a933459ee059a7c4d25208d603210 files/digest-udev-039 61
-MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
-MD5 a45b61c66f1fda878a6967010476eb70 files/digest-udev-038 61
-MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
-MD5 0242d3feb75eb74c9c755842f2e756c5 files/digest-udev-040 61
-MD5 cd92c9e177215e4622cfb5b4d4534b72 files/digest-udev-031 61
-MD5 3f3fd84a95d1fabbf66be0cba8057a29 files/digest-udev-032 61
-MD5 e7511f848411dc5e0cf7f768e48d940f files/digest-udev-027 61
-MD5 f5238b4aac82b9740f1663faef808c06 files/digest-udev-035 61
+MD5 cd839ae6d648dfcaa93ae36c53d7e365 files/digest-udev-042 61
 MD5 34ef6b0a15a8c5a92bc6c7abdb1e6021 files/digest-udev-043 61
-MD5 ff1308698e8a861838bd8855de2fa38f files/digest-udev-048 61
-MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034 61
-MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
-MD5 186bd762511bf62b129d67efabf76513 files/digest-udev-036 61
+MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
+MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
 MD5 a16a9eb4125f3a1ec8002d4876c3c7e2 files/digest-udev-046 61
-MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034-r1 61
-MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
-MD5 cd839ae6d648dfcaa93ae36c53d7e365 files/digest-udev-042 61
-MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
-MD5 05b440530066098b69f77ae477fbc74d files/digest-udev-028 61
-MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
-MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
-MD5 71df3b63d0e1d8e660f4dccd286fe3b4 files/digest-udev-033 61
-MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
-MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBwLljugEuf3OQ0akRAjTDAKCQuWyDCZgFNeJ4WcPJG6el5ODYXwCgiAjb
-7SxTCk/y860mFFosqJXL3JI=
-=T0NV
------END PGP SIGNATURE-----
+MD5 ff1308698e8a861838bd8855de2fa38f files/digest-udev-048 61
+MD5 1c035649bafbb62a521bbc4325b0f6d0 files/digest-udev-049 61
diff --git a/sys-fs/udev/files/digest-udev-050 b/sys-fs/udev/files/digest-udev-050
new file mode 100644
index 000000000000..e247d7ed01ba
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-050
@@ -0,0 +1 @@
+MD5 eefa5f012ae66ac5adc7d9d7a6a5a6fc udev-050.tar.bz2 359737
diff --git a/sys-fs/udev/files/udev-050-udev_volume_id.patch b/sys-fs/udev/files/udev-050-udev_volume_id.patch
new file mode 100644
index 000000000000..e741cdf9a146
--- /dev/null
+++ b/sys-fs/udev/files/udev-050-udev_volume_id.patch
@@ -0,0 +1,11 @@
+===== extras/volume_id/udev_volume_id.c 1.6 vs edited =====
+--- 1.6/extras/volume_id/udev_volume_id.c	2004-12-08 11:35:29 -08:00
++++ edited/extras/volume_id/udev_volume_id.c	2004-12-17 22:16:14 -08:00
+@@ -37,7 +37,6 @@
+ #define BLKGETSIZE64 _IOR(0x12,114,size_t)
+ 
+ #ifdef LOG
+-unsigned char logname[LOGNAME_SIZE];
+ void log_message(int level, const char *format, ...)
+ {
+ 	va_list args;
diff --git a/sys-fs/udev/udev-050.ebuild b/sys-fs/udev/udev-050.ebuild
new file mode 100644
index 000000000000..22e438a4a7b3
--- /dev/null
+++ b/sys-fs/udev/udev-050.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-050.ebuild,v 1.1 2004/12/18 06:42:36 gregkh Exp $
+
+inherit eutils
+
+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="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static selinux"
+
+DEPEND="virtual/libc
+	sys-apps/hotplug-base"
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+PROVIDE="virtual/dev-manager"
+
+if use static
+then
+	USE_KLIBC=true
+else
+	USE_KLIBC=false
+fi
+export USE_KLIBC
+
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "true" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# patches go here...
+	epatch ${FILESDIR}/${P}-udev_volume_id.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 ...)
+	if [ "`md5sum < "${S}/etc/udev/gentoo/udev.rules"`" != \
+	     "fd05b09fe3d79459a972259e789176b2  -" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	local myconf=
+	local extras="extras/scsi_id extras/volume_id"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	# Do not work with emake
+	make \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS=${mycross} \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo
+	dobin udevtest
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin extras/scsi_id/scsi_id
+	dosbin extras/volume_id/udev_volume_id
+	dosym /sbin/udev /sbin/udevstart
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+	doexe extras/cdsymlinks.sh
+
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_046 udev.conf
+	doins extras/cdsymlinks.conf
+
+	# For devfs style layout
+	insinto /etc/udev/rules.d/
+	newins etc/udev/gentoo/udev.rules 50-udev.rules
+
+	# Our own custom udev.permissions
+	insinto /etc/udev/permissions.d/
+	newins etc/udev/gentoo/udev.permissions 50-udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up symlinks in /etc/hotplug.d/default
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe etc/dev.d/net/hotplug.dev
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ HOWTO-udev_for_dev README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d}
+	newdoc extras/volume_id/README README_volume_id
+}
+
+pkg_preinst() {
+	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
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+
+	ewarn "Note: If you are upgrading from a version of udev prior to 046"
+	ewarn "      and you rely on the output of udevinfo for anything, please"
+	ewarn "      either run 'udevstart' now, or reboot, in order to get a"
+	ewarn "      up-to-date udev database."
+}