rpms/mkinitrd/devel mkinitrd-6.0.9-nomorepump.patch, NONE, 1.1 mkinitrd.spec, 1.206, 1.207

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv604

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-6.0.9-nomorepump.patch 
Log Message:
fix build, this time on the right cvs server


mkinitrd-6.0.9-nomorepump.patch:

--- NEW FILE mkinitrd-6.0.9-nomorepump.patch ---
diff -up mkinitrd-6.0.9/nash/network.c.foo mkinitrd-6.0.9/nash/network.c
--- mkinitrd-6.0.9/nash/network.c.foo	2007-07-12 22:33:28.000000000 -0400
+++ mkinitrd-6.0.9/nash/network.c	2007-07-12 22:33:36.000000000 -0400
@@ -183,7 +183,7 @@ int nashNetworkCommand(char * cmd) {
         char *c, *buf = strdup(dns);
         
         c = strtok(buf, ",");
-        while ((intf.numDns < MAX_DNS_SERVERS) && (c != NULL)) {
+        while ((intf.numDns < MAXNS) && (c != NULL)) {
             if (nashPton(c, &intf.dnsServers[intf.numDns]))
                 intf.numDns++;
             c = strtok(NULL, ",");


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- mkinitrd.spec	12 Jul 2007 21:10:44 -0000	1.206
+++ mkinitrd.spec	13 Jul 2007 02:45:15 -0000	1.207
@@ -3,13 +3,14 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.9
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 Patch0: mkinitrd-6.0.9-mdadm.patch
 Patch1: mkinitrd-6.0.9-nosegneg.patch
 #Patch2: mkinitrd-6.0.9-lstat.patch
+Patch3: mkinitrd-6.0.9-nomorepump.patch
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -70,6 +71,7 @@
 %patch0 -p0 -b .mdadm
 %patch1 -p0 -b .nosegneg
 #%patch2 -p1 -b .lstat
+%patch3 -p1 -b .pump
 
 %build
 make LIB=%{_lib}
@@ -117,6 +119,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Thu Jul 12 2007 Bill Nottingham <notting at redhat.com> - 6.0.9-9
+- fix build against new libdhcp
+
 * Thu Jul 12 2007 Jesse Keating <jkeating at redhat.com> - 6.0.9-8
 - Rebuild for new libdhcp