Update version.

5 files changed, 264 insertions, 3 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index d7a89140ecdb..e6e934d52f84 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.23 2004/01/30 11:09:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.24 2004/02/03 21:47:04 azarah Exp $
+
+*udev-016 (03 Feb 2004)
+
+  03 Feb 2004; Martin Schlemmer <azarah@gentoo.org> udev-016.ebuild,
+  files/udev-016-logging-config-option.patch:
+  Update version.
 
   30 Jan 2004; Mike Frysinger <vapier@gentoo.org>
   udev-015-sysbus-missing-include.patch :
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 0c533560b3a1..277163d553a2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,18 +1,22 @@
 MD5 39793fbef16989ec7c19fa8ba04370ee udev-013.ebuild 3343
 MD5 813397f1f9255c1b8c5e05e67b182938 udev-013-r1.ebuild 3352
-MD5 92314db0ce808f5e386ff53c71b1e908 ChangeLog 5660
+MD5 abb2d02a2710914011723aa7fdcc16d3 ChangeLog 5979
 MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400
-MD5 bc00dcf8be33408cad432b3b87d2e7c4 udev-015.ebuild 3680
+MD5 1001a80c31740e12beee81fe73e95f37 udev-015.ebuild 3761
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1be180295c05c44871bf03615d021d8c udev-016.ebuild 3685
 MD5 dbe7dc643caeafddc845fe9269430123 files/udev-011-no-wait-for-sleep.patch 1053
 MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184
 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013-r1 62
+MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016 62
 MD5 4e0d7e033730bbe5544745788e7a13a8 files/udev-012-udev_c-gcc295-compat.patch 277
+MD5 194ac8ffc6c63327f8802eec5aeb7811 files/udev-015-sysbus-missing-include.patch 305
 MD5 35fcac8040808dde93580ddfe5ff5a18 files/digest-udev-012 62
 MD5 ea8dcace65aa8d8071236e48ec1684af files/udev-015-logging-config-option.patch 4332
 MD5 8b2a4466a30de6474690e3f93703457b files/digest-udev-015 62
 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013 62
 MD5 fb416fb7ea84ca08f4c1c697248beac2 files/udev.rules.post_012 4355
+MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
 MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
 MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617
 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554
diff --git a/sys-fs/udev/files/digest-udev-016 b/sys-fs/udev/files/digest-udev-016
new file mode 100644
index 000000000000..32af573daa78
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-016
@@ -0,0 +1 @@
+MD5 5724a5b7b1756fc948402bf98173a04c udev-016.tar.bz2 1090264
diff --git a/sys-fs/udev/files/udev-016-logging-config-option.patch b/sys-fs/udev/files/udev-016-logging-config-option.patch
new file mode 100644
index 000000000000..5611e98f3218
--- /dev/null
+++ b/sys-fs/udev/files/udev-016-logging-config-option.patch
@@ -0,0 +1,106 @@
+diff -uprN udev-016/Makefile udev-016.logging/Makefile
+--- udev-016/Makefile	2004-02-03 22:55:30.201851776 +0200
++++ udev-016.logging/Makefile	2004-02-03 23:03:55.869978536 +0200
+@@ -239,6 +239,7 @@ udev_version.h:
+ 	@echo \#define UDEV_CONFIG_FILE	\"$(configdir)\udev.conf\" >> $@
+ 	@echo \#define UDEV_RULES_FILE	\"$(configdir)\udev.rules\" >> $@
+ 	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
++	@echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
+ 	@echo \#define UDEV_BIN		\"$(DESTDIR)$(sbindir)/udev\" >> $@
+ 	@echo \#define UDEVD_BIN	\"$(DESTDIR)$(sbindir)/udevd\" >> $@
+ 	@echo \#define UDEVD_SOCK	\"$(udevdir)/\.udevd.sock\" >> $@
+diff -uprN udev-016/etc/udev/udev.conf.in udev-016.logging/etc/udev/udev.conf.in
+--- udev-016/etc/udev/udev.conf.in	2004-02-03 22:58:34.939767344 +0200
++++ udev-016.logging/etc/udev/udev.conf.in	2004-02-03 22:56:46.535247336 +0200
+@@ -29,3 +29,6 @@ default_owner="root"
+ #                 explicit match in the permissions file
+ default_group="root"
+ 
++# udev_log - set to "yes" if you want logging, else "no"
++udev_log="yes"
++
+diff -uprN udev-016/logging.h udev-016.logging/logging.h
+--- udev-016/logging.h	2004-02-02 11:34:49.000000000 +0200
++++ udev-016.logging/logging.h	2004-02-03 23:04:51.204566400 +0200
+@@ -33,6 +33,9 @@
+ #include <stdarg.h>
+ #include <syslog.h>
+ 
++#include "udev.h"
++#include "udev_version.h"
++
+ #undef info
+ #define info(format, arg...)								\
+ 	do {										\
+@@ -62,6 +65,9 @@ static inline void log_message (int leve
+ {
+ 	va_list	args;
+ 
++	if (0 != strncmp(udev_log_str, UDEV_LOG_DEFAULT, BOOL_SIZE))
++		return;
++
+ 	va_start(args, format);
+ 	vsyslog(level, format, args);
+ 	va_end(args);
+diff -uprN udev-016/udev.h udev-016.logging/udev.h
+--- udev-016/udev.h	2004-01-26 22:24:42.000000000 +0200
++++ udev-016.logging/udev.h	2004-02-03 23:03:25.682567720 +0200
+@@ -32,6 +32,8 @@
+ #define OWNER_SIZE	30
+ #define GROUP_SIZE	30
+ #define MODE_SIZE	8
++#define BOOL_SIZE	5	/* 'yes', 'no' and possibly 'true' or 'false'
++				   in future */
+ 
+ struct udevice {
+ 	char name[NAME_SIZE];
+@@ -72,5 +74,6 @@ extern char udev_rules_filename[PATH_MAX
+ extern char default_mode_str[MODE_SIZE];
+ extern char default_owner_str[OWNER_SIZE];
+ extern char default_group_str[GROUP_SIZE];
++extern char udev_log_str[BOOL_SIZE];
+ 
+ #endif
+diff -uprN udev-016/udev_config.c udev-016.logging/udev_config.c
+--- udev-016/udev_config.c	2004-02-03 23:00:40.438688608 +0200
++++ udev-016.logging/udev_config.c	2004-02-03 22:56:46.649230008 +0200
+@@ -48,6 +48,7 @@ char udev_config_filename[PATH_MAX+NAME_
+ char default_mode_str[MODE_SIZE];
+ char default_owner_str[OWNER_SIZE];
+ char default_group_str[GROUP_SIZE];
++char udev_log_str[BOOL_SIZE];
+ 
+ 
+ static void init_variables(void)
+@@ -60,6 +61,7 @@ static void init_variables(void)
+ 	strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
+ 	strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
+ 	strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
++	strfieldcpy(udev_log_str, UDEV_LOG_DEFAULT);
+ }
+ 
+ #define set_var(_name, _var)				\
+@@ -156,6 +158,7 @@ static int parse_config_file(void)
+ 		set_var("default_mode", default_mode_str);
+ 		set_var("default_owner", default_owner_str);
+ 		set_var("default_group", default_group_str);
++		set_var("udev_log", udev_log_str);
+ 	}
+ 	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
+ 		  lineno, temp - line, temp);
+@@ -191,6 +194,7 @@ static void get_dirs(void)
+ 	dbg_parse("udev_db_filename = %s", udev_db_filename);
+ 	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
+ 	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
++	dbg_parse("udev_log_str = %s", udev_log_str);
+ 	parse_config_file();
+ 
+ 	dbg_parse("udev_root = %s", udev_root);
+@@ -198,6 +202,7 @@ static void get_dirs(void)
+ 	dbg_parse("udev_db_filename = %s", udev_db_filename);
+ 	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
+ 	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
++	dbg_parse("udev_log_str = %s", udev_log_str);
+ }
+ 
+ void udev_init_config(void)
diff --git a/sys-fs/udev/udev-016.ebuild b/sys-fs/udev/udev-016.ebuild
new file mode 100644
index 000000000000..23f523d18aa0
--- /dev/null
+++ b/sys-fs/udev/udev-016.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-016.ebuild,v 1.1 2004/02/03 21:47:04 azarah Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+USE_EXT_LIBSYSFS="no"
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~hppa"
+
+DEPEND="virtual/glibc
+	>=sys-apps/hotplug-20030805-r1
+	>=sys-fs/sysfsutils-0.3.0"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "yes" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# 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.devfs
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/udev.rules.devfs"`" != \
+	     "39311afa517b232c6a860371f009d2df  -" ]
+	then
+		echo
+		eerror "udev.rules.devfs has been updated, please validate!"
+		die "udev.rules.devfs has been updated, please validate!"
+	fi
+
+	# Make sure we do not build included libsysfs, but link to
+	# one in sysfsutils ...
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		rm -rf ${S}/libsysfs
+		cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs
+	fi
+
+	# Setup things for klibc
+	if [ "${USE_KLIBC}" = "yes" ]
+	then
+		ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux
+	fi
+
+	# Do not sleep if UDEV_NO_SLEEP is set
+	epatch ${FILESDIR}/${PN}-015-no-wait-for-sleep.patch
+
+	# Make logging a udev.conf option
+	epatch ${FILESDIR}/${P}-logging-config-option.patch
+}
+
+src_compile() {
+	local myconf=
+
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		myconf="USE_DBUS=true"
+	fi
+
+	# Do not work with emake
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		make EXTRAS="extras/scsi_id" \
+			udevdir="/dev/" \
+			ARCH_LIB_OBJS="-lsysfs" \
+			SYSFS="" \
+			${myconf} || die
+	else
+		make EXTRAS="extras/scsi_id" \
+			udevdir="/dev/" \
+			${myconf} || die
+	fi
+}
+
+src_install() {
+	dobin udevinfo
+	into /
+	dosbin udev
+	# *** Note that we do not yet use or install udevd and udevsend, ***
+	# *** as they seem to be still too buggy (udevsend do not even   ***
+	# *** start udevd over here ...                                  ***
+#	dosbin udevd udevsend
+	dosbin extras/scsi_id/scsi_id
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+
+	insinto /etc/udev
+	doins ${FILESDIR}/udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# For devfs style layout
+	newins ${FILESDIR}/udev.rules.post_012 udev.rules
+	# Our own custom udev.permissions
+	doins ${FILESDIR}/udev.permissions
+#	doins etc/udev/udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		insinto /etc/dbus-1/system.d
+		doins etc/dbus-1/system.d/udev_sysbus_policy.conf
+	fi
+
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs}
+}
+
+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
+}
+