rpms/pcmciautils/devel pcmciautils-006-udev.patch, NONE, 1.1 pcmciautils.spec, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29245

Modified Files:
	pcmciautils.spec 
Added Files:
	pcmciautils-006-udev.patch 
Log Message:
wow, was that patch ever wrong before. fix the code. (#163311)


pcmciautils-006-udev.patch:
 startup.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

--- NEW FILE pcmciautils-006-udev.patch ---
--- pcmciautils-006/src/startup.c.foo	2005-07-12 11:41:21.000000000 -0400
+++ pcmciautils-006/src/startup.c	2005-07-21 16:38:15.000000000 -0400
@@ -207,16 +207,14 @@
 	char *socket_no;
 	unsigned long socket;
 
-	if (argc != 2) {
-		if ((socket_no = getenv("SOCKET_NO"))) {
-			socket = strtoul(argv[1], NULL, 0);
-		} else {
-			return -EINVAL;
-		}
+	if (argc == 2) {
+		socket = strtoul(argv[1], NULL, 0);
+	} else if ((socket_no = getenv("SOCKET_NO"))) {
+		socket = strtoul(socket_no, NULL, 0);
+	} else {
+		return -EINVAL;
 	}
 
-	socket = strtoul(argv[1], NULL, 0);
-
 	load_config();
 
 	adjust_resources(socket);


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcmciautils.spec	20 Jul 2005 21:34:00 -0000	1.3
+++ pcmciautils.spec	21 Jul 2005 20:41:06 -0000	1.4
@@ -13,6 +13,7 @@
 BuildRequires: sysfsutils-devel >= 1.3.0
 Requires: udev >= 062
 Patch1: pcmciautils-fedora.patch
+Patch2: pcmciautils-006-udev.patch
 
 %description
 The pcmciautils package contains utilities for initializing and
@@ -22,6 +23,7 @@
 %setup -q
 # Fix build peculiarities
 %patch1 -p1
+%patch2 -p1
 
 %build
 make
@@ -46,6 +48,9 @@
 /sbin/*
 
 %changelog
+* Thu Jul 21 2005  Bill Nottingham <notting at redhat.com> 006-2
+- udev patch - right idea, awful execution. fix that (#163311)
+
 * Wed Jul 20 2005  Bill Nottingham <notting at redhat.com> 006-1
 - update to 006
 - link libsysfs statically