removed old patches

7 files changed, 10 insertions, 410 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 3c1cf0e87807..11befaf3f4ea 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # 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.63 2004/09/10 21:40:12 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.64 2004/09/13 21:28:50 gregkh Exp $
+
+  13 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  -files/udev-015-no-wait-for-sleep.patch,
+  -files/udev-016-logging-config-option.patch,
+  -files/udev-017-no-wait-for-sleep.patch,
+  -files/udev-018-sysfs-build-fix.patch,
+  -files/udev-019-unlink-existing.patch:
+  deleted a lot of old patches from the tree
 
 *udev-031 (10 Sep 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 37b97a1577b6..22781a0f8788 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,5 +1,5 @@
 MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
-MD5 f53d0727017870308c62237193c981ed ChangeLog 12484
+MD5 2946818c70002547076237b8334cf6e4 ChangeLog 12799
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
 MD5 61627f421ee2c1603a7feda4a6a31787 udev-026-r1.ebuild 3518
@@ -15,11 +15,6 @@ MD5 05b440530066098b69f77ae477fbc74d files/digest-udev-028 61
 MD5 7ce9bba52fe0dc39b7b2ced37200fce2 files/udev.conf.post_024 1189
 MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
 MD5 cd92c9e177215e4622cfb5b4d4534b72 files/digest-udev-031 61
-MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617
-MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
-MD5 d0a7b64f76b612bef576c02a48e83caf files/udev-017-no-wait-for-sleep.patch 1673
-MD5 073a6bdccda0208ab0e443dd3cb6561a files/udev-018-sysfs-build-fix.patch 3265
-MD5 7c0242bfd86f0e0cb928dfb9f7f6edf3 files/udev-019-unlink-existing.patch 1963
 MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
 MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184
 MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
diff --git a/sys-fs/udev/files/udev-015-no-wait-for-sleep.patch b/sys-fs/udev/files/udev-015-no-wait-for-sleep.patch
deleted file mode 100644
index e21de378e525..000000000000
--- a/sys-fs/udev/files/udev-015-no-wait-for-sleep.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- udev-015/namedev.c	2004-01-29 19:02:10.067218096 +0200
-+++ udev-015.no_sleep/namedev.c	2004-01-29 19:10:21.440518000 +0200
-@@ -285,6 +285,10 @@ static void wait_for_device_to_initializ
- 	struct bus_file *b = &bus_files[0];
- 	struct sysfs_attribute *tmpattr;
- 	int loop;
-+	int wait = 1;
-+	
-+	if (getenv("UDEV_NO_SLEEP") != NULL)
-+		wait = 0;
- 
- 	while (1) {
- 		if (b->bus == NULL)
-@@ -300,7 +304,8 @@ static void wait_for_device_to_initializ
- 					goto exit;
- 				}
- 				/* sleep to give the kernel a chance to create the file */
--				sleep(1);
-+				if (wait)
-+					sleep(1);
- 			}
- 			dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
- 			goto exit;
-@@ -524,6 +529,10 @@ static struct sysfs_device *get_sysfs_de
- 	struct sysfs_class_device *class_dev_parent;
- 	struct timespec tspec;
- 	int loop;
-+	int wait = 1;
-+
-+	if (getenv("UDEV_NO_SLEEP") != NULL)
-+		wait = 0;
- 
- 	/* Figure out where the device symlink is at.  For char devices this will
- 	 * always be in the class_dev->path.  But for block devices, it's different.
-@@ -542,7 +551,8 @@ static struct sysfs_device *get_sysfs_de
- 	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
- 	loop = 10;
- 	while (loop--) {
--		nanosleep(&tspec, NULL);
-+		if (wait)
-+			nanosleep(&tspec, NULL);
- 		if (class_dev_parent)
- 			sysfs_device = sysfs_get_classdev_device(class_dev_parent);
- 		else
-@@ -569,7 +579,8 @@ device_found:
- 		loop = 10;
- 		tspec.tv_nsec = 10000000;
- 		while (loop--) {
--			nanosleep(&tspec, NULL);
-+			if (wait)
-+				nanosleep(&tspec, NULL);
- 			sysfs_get_device_bus(sysfs_device);
- 			
- 			if (sysfs_device->bus[0] != '\0')
diff --git a/sys-fs/udev/files/udev-016-logging-config-option.patch b/sys-fs/udev/files/udev-016-logging-config-option.patch
deleted file mode 100644
index 5611e98f3218..000000000000
--- a/sys-fs/udev/files/udev-016-logging-config-option.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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/files/udev-017-no-wait-for-sleep.patch b/sys-fs/udev/files/udev-017-no-wait-for-sleep.patch
deleted file mode 100644
index 17812c7dd1ed..000000000000
--- a/sys-fs/udev/files/udev-017-no-wait-for-sleep.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- udev-015/namedev.c	2004-01-29 19:02:10.067218096 +0200
-+++ udev-015.no_sleep/namedev.c	2004-01-29 19:10:21.440518000 +0200
-#@@ -285,6 +285,10 @@ static void wait_for_device_to_initializ
-# 	struct bus_file *b = &bus_files[0];
-# 	struct sysfs_attribute *tmpattr;
-# 	int loop;
-#+	int udev_wait = 1;
-#+	
-#+	if (getenv("UDEV_NO_SLEEP") != NULL)
-#+		udev_wait = 0;
-# 
-# 	while (1) {
-# 		if (b->bus == NULL)
-#@@ -300,7 +304,8 @@ static void wait_for_device_to_initializ
-# 					goto exit;
-# 				}
-# 				/* sleep to give the kernel a chance to create the file */
-#-				sleep(1);
-#+				if (udev_wait)
-#+					sleep(1);
-# 			}
-# 			dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
-# 			goto exit;
-@@ -524,6 +529,10 @@ static struct sysfs_device *get_sysfs_de
- 	struct sysfs_class_device *class_dev_parent;
- 	struct timespec tspec;
- 	int loop;
-+	int udev_wait = 1;
-+
-+	if (getenv("UDEV_NO_SLEEP") != NULL)
-+		udev_wait = 0;
- 
- 	/* Figure out where the device symlink is at.  For char devices this will
- 	 * always be in the class_dev->path.  But for block devices, it's different.
-@@ -542,7 +551,8 @@ static struct sysfs_device *get_sysfs_de
- 	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
- 	loop = 10;
- 	while (loop--) {
--		nanosleep(&tspec, NULL);
-+		if (udev_wait)
-+			nanosleep(&tspec, NULL);
- 		if (class_dev_parent)
- 			sysfs_device = sysfs_get_classdev_device(class_dev_parent);
- 		else
-@@ -569,7 +579,8 @@ device_found:
- 		loop = 10;
- 		tspec.tv_nsec = 10000000;
- 		while (loop--) {
--			nanosleep(&tspec, NULL);
-+			if (udev_wait)
-+				nanosleep(&tspec, NULL);
- 			sysfs_get_device_bus(sysfs_device);
- 			
- 			if (sysfs_device->bus[0] != '\0')
diff --git a/sys-fs/udev/files/udev-018-sysfs-build-fix.patch b/sys-fs/udev/files/udev-018-sysfs-build-fix.patch
deleted file mode 100644
index e9567660e0d3..000000000000
--- a/sys-fs/udev/files/udev-018-sysfs-build-fix.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-# fix up libsysfs header file usage to fix bug reports from users that have sysfsutils installed already.
-
-diff -Nru a/libsysfs/sysfs/libsysfs.h b/libsysfs/sysfs/libsysfs.h
---- a/libsysfs/sysfs/libsysfs.h	Mon Feb 23 16:35:20 2004
-+++ b/libsysfs/sysfs/libsysfs.h	Mon Feb 23 16:35:20 2004
-@@ -24,7 +24,6 @@
- #define _LIBSYSFS_H_
- 
- #include <sys/types.h>
--#include "dlist.h"
- 
- /*
-  * Generic #defines go here..
-@@ -46,6 +45,8 @@
- 
- #define SYSFS_METHOD_SHOW	0x01	/* attr can be read by user */
- #define SYSFS_METHOD_STORE	0x02	/* attr can be changed by user */
-+
-+struct dlist;
- 
- struct sysfs_attribute {
- 	unsigned char *value;
-diff -Nru a/libsysfs/sysfs.h b/libsysfs/sysfs.h
---- a/libsysfs/sysfs.h	Mon Feb 23 16:35:20 2004
-+++ b/libsysfs/sysfs.h	Mon Feb 23 16:35:20 2004
-@@ -31,6 +31,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include "dlist.h"
- 
- /* Debugging */
- #ifdef DEBUG
-diff -Nru a/namedev.c b/namedev.c
---- a/namedev.c	Mon Feb 23 16:35:24 2004
-+++ b/namedev.c	Mon Feb 23 16:35:24 2004
-@@ -32,8 +32,8 @@
- #include <time.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
- #include "list.h"
- #include "udev.h"
- #include "udev_version.h"
-diff -Nru a/udev-add.c b/udev-add.c
---- a/udev-add.c	Mon Feb 23 16:35:24 2004
-+++ b/udev-add.c	Mon Feb 23 16:35:24 2004
-@@ -33,8 +33,8 @@
- #ifndef __KLIBC__
- #include <pwd.h>
- #endif
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
- #include "udev.h"
- #include "udev_version.h"
- #include "udev_dbus.h"
-diff -Nru a/udev.c b/udev.c
---- a/udev.c	Mon Feb 23 16:35:24 2004
-+++ b/udev.c	Mon Feb 23 16:35:24 2004
-@@ -26,8 +26,8 @@
- #include <errno.h>
- #include <ctype.h>
- #include <signal.h>
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
- #include "udev.h"
- #include "udev_version.h"
- #include "udev_dbus.h"
-diff -Nru a/udev_config.c b/udev_config.c
---- a/udev_config.c	Mon Feb 23 16:35:24 2004
-+++ b/udev_config.c	Mon Feb 23 16:35:24 2004
-@@ -31,8 +31,8 @@
- #include <unistd.h>
- #include <errno.h>
- #include <ctype.h>
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
- #include "udev.h"
- #include "udev_version.h"
- #include "logging.h"
-diff -Nru a/udevdb.c b/udevdb.c
---- a/udevdb.c	Mon Feb 23 16:35:24 2004
-+++ b/udevdb.c	Mon Feb 23 16:35:24 2004
-@@ -32,8 +32,8 @@
- #include <sys/stat.h>
- #include <errno.h>
- #include <signal.h>
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
- #include "udev_version.h"
- #include "udev.h"
- #include "logging.h"
-diff -Nru a/udevinfo.c b/udevinfo.c
---- a/udevinfo.c	Mon Feb 23 16:35:24 2004
-+++ b/udevinfo.c	Mon Feb 23 16:35:24 2004
-@@ -26,8 +26,9 @@
- #include <stdarg.h>
- #include <unistd.h>
- #include <errno.h>
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
-+#include "libsysfs/dlist.h"
- #include "udev.h"
- #include "udev_version.h"
- #include "logging.h"
-diff -Nru a/udevtest.c b/udevtest.c
---- a/udevtest.c	Mon Feb 23 16:35:24 2004
-+++ b/udevtest.c	Mon Feb 23 16:35:24 2004
-@@ -26,8 +26,8 @@
- #include <errno.h>
- #include <ctype.h>
- #include <signal.h>
--#include <sysfs/libsysfs.h>
- 
-+#include "libsysfs/sysfs/libsysfs.h"
- #include "udev.h"
- #include "udev_version.h"
- #include "logging.h"
diff --git a/sys-fs/udev/files/udev-019-unlink-existing.patch b/sys-fs/udev/files/udev-019-unlink-existing.patch
deleted file mode 100644
index fa5e09538fc9..000000000000
--- a/sys-fs/udev/files/udev-019-unlink-existing.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- udev-019/udev-add.c.orig	2004-02-29 01:06:08.867518640 +0200
-+++ udev-019/udev-add.c	2004-02-29 01:12:55.516698568 +0200
-@@ -132,9 +132,27 @@ static int make_node(char *filename, int
- 	return 0;
- }
- 
--static int create_node(struct udevice *dev, int fake)
-+static int unlink_entry(char *filename, int fake)
- {
- 	struct stat stats;
-+	int retval;
-+	
-+	if (!fake && (lstat(filename, &stats) == 0)) {
-+		if ((stats.st_mode & S_IFMT) != S_IFDIR) {
-+			retval = unlink(filename);
-+			if (retval) {
-+				dbg("unlink(%s) failed with error '%s'",
-+				    filename, strerror(errno));
-+				return retval;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int create_node(struct udevice *dev, int fake)
-+{
- 	char filename[255];
- 	char linktarget[255];
- 	char partitionname[255];
-@@ -198,6 +216,8 @@ static int create_node(struct udevice *d
- 	}
- 
- 	if (!fake) {
-+		/* unlink existing files to ensure that our symlink is created */
-+		unlink_entry(filename, fake);
- 		info("creating device node '%s'", filename);
- 		make_node(filename, dev->major, dev->minor, dev->mode, uid, gid);
- 	} else {
-@@ -212,6 +232,8 @@ static int create_node(struct udevice *d
- 		if (!fake) {
- 			for (i = 1; i <= dev->partitions; i++) {
- 				sprintf(partitionname, "%s%i", filename, i);
-+				/* unlink existing files to ensure that our symlink is created */
-+				unlink_entry(partitionname, fake);
- 				make_node(partitionname, dev->major,
- 					  dev->minor + i, dev->mode, uid, gid);
- 			}
-@@ -254,13 +276,7 @@ static int create_node(struct udevice *d
- 			strfieldcat(linktarget, &dev->name[tail]);
- 
- 			/* unlink existing files to ensure that our symlink is created */
--			if (!fake && (lstat(filename, &stats) == 0)) {
--				if ((stats.st_mode & S_IFMT) != S_IFDIR) {
--					if (unlink(filename))
--						dbg("unlink(%s) failed with error '%s'",
--						    filename, strerror(errno));
--				}
--			}
-+			unlink_entry(filename, fake);
- 
- 			dbg("symlink(%s, %s)", linktarget, filename);
- 			if (!fake) {