rpms/pcmciautils/devel pcmciautils-007-udev.patch, NONE, 1.1 pcmciautils-007.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.3, 1.4 pcmciautils.spec, 1.6, 1.7 sources, 1.3, 1.4 pcmciautils-006-udev.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: notting

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

Modified Files:
	.cvsignore pcmciautils.spec sources 
Added Files:
	pcmciautils-007-udev.patch pcmciautils-007.tar.bz2.sign 
Removed Files:
	pcmciautils-006-udev.patch 
Log Message:
update to 007
fix the udev logic, finally.


pcmciautils-007-udev.patch:
 startup.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE pcmciautils-007-udev.patch ---
--- pcmciautils-007/src/startup.c.foo	2005-07-24 22:17:25.000000000 -0400
+++ pcmciautils-007/src/startup.c	2005-07-24 22:18:17.000000000 -0400
@@ -207,10 +207,11 @@
 	char *socket_no;
 	unsigned long socket;
 
-	if (argc == 2) {
-		socket = strtoul(argv[1], NULL, 0);
-	} else if ((socket_no = getenv("SOCKET_NO"))) {
+
+	if ((socket_no = getenv("SOCKET_NO"))) {
 		socket = strtoul(socket_no, NULL, 0);
+	} else if (argc == 2) {
+		socket = strtoul(argv[1], NULL, 0);
 	} else {
 		return -EINVAL;
 	}


--- NEW FILE pcmciautils-007.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBC4rObyGugalF9Dw4RAuSdAKCFTqwV55ujIA38SfBXt1ZsWjasOgCfdtsw
guCwlJcdLNPK0KcD/Wb5f6E=
=kxRP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jul 2005 21:34:00 -0000	1.3
+++ .cvsignore	25 Jul 2005 02:22:22 -0000	1.4
@@ -1 +1 @@
-pcmciautils-006.tar.bz2
+pcmciautils-007.tar.bz2


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcmciautils.spec	21 Jul 2005 20:51:30 -0000	1.6
+++ pcmciautils.spec	25 Jul 2005 02:22:22 -0000	1.7
@@ -1,8 +1,8 @@
 Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPL
-Version: 006
-Release: 2
+Version: 007
+Release: 1
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
@@ -13,7 +13,7 @@
 BuildRequires: sysfsutils-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
 Patch1: pcmciautils-fedora.patch
-Patch2: pcmciautils-006-udev.patch
+Patch2: pcmciautils-007-udev.patch
 
 %description
 The pcmciautils package contains utilities for initializing and
@@ -48,6 +48,9 @@
 /sbin/*
 
 %changelog
+* Sun Jul 24 2005  Bill Nottingham <notting at redhat.com> 007-1
+- further udev-related tweaks (#163311)
+
 * Thu Jul 21 2005  Bill Nottingham <notting at redhat.com> 006-2
 - udev patch - right idea, awful execution. fix that (#163311)
 - add requirement for 2.6.13-rc1, basically


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jul 2005 21:34:00 -0000	1.3
+++ sources	25 Jul 2005 02:22:22 -0000	1.4
@@ -1 +1 @@
-93ba0aad0a9552dffea9308299af0e60  pcmciautils-006.tar.bz2
+af6e65394a194d50df60153f975948b7  pcmciautils-007.tar.bz2


--- pcmciautils-006-udev.patch DELETED ---