rpms/libdhcp/devel libdhcp-1.24-option-list.patch, NONE, 1.1 libdhcp.spec, 1.49, 1.50

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25006

Modified Files:
	libdhcp.spec 
Added Files:
	libdhcp-1.24-option-list.patch 
Log Message:
* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.24-2
- Request and handle static-routes option for IPv4 requests (#149736)


libdhcp-1.24-option-list.patch:
 pump.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE libdhcp-1.24-option-list.patch ---
--- libdhcp-1.24/pump.c.optionlist	2007-03-23 11:07:30.000000000 -0400
+++ libdhcp-1.24/pump.c	2007-04-11 17:03:10.000000000 -0400
@@ -85,6 +85,9 @@
 #include <dhcp4client/dhcp4client.h>
 #include <dhcp4client/isc_dhcp/dhcpd.h>
 
+/* DHCP options to request */
+#define OPTLIST "subnet-mask,broadcast-address,routers,domain-name,domain-name-servers,host-name,static-routes"
+
 enum {
     OOM,
     DHCP_FAILED,
@@ -447,9 +450,11 @@
     pumpEnableInterface(ifx->device);
     ifx->dhcp_nic = dhcp_nic(ifx->nh, dhcp_preference, ifx->device,
                              dhcp_capability, timeout,
-                             (LIBDHCP_Error_Handler) logger, log_level, "-V",
-                             vendor_class, hostname ? "-H" : 0L,
-                             hostname ? hostname : 0L, 0L);
+                             (LIBDHCP_Error_Handler) logger, log_level,
+                             "-R", OPTLIST,
+                             "-V", vendor_class,
+                             hostname ? "-H" : 0L, hostname ? hostname : 0L,
+                             0L);
     if (ifx->dhcp_nic) {
         /* fill in the pumpNetIntf structure.
          * We'll just use the FIRST configured address as ifx->ip -


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libdhcp.spec	23 Mar 2007 17:57:25 -0000	1.49
+++ libdhcp.spec	11 Apr 2007 21:18:52 -0000	1.50
@@ -1,12 +1,13 @@
 Summary:    A library for network interface configuration with DHCP
 Name:       libdhcp
 Version:    1.24
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL
 Group:      Development/Libraries
 URL:        http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
 Source0:    %{name}-%{version}.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:     %{name}-1.24-option-list.patch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18
 BuildRequires: libdhcp6client-devel >= 0.10-38 , libnl-devel >= 1.0-0.10.pre5.4
 BuildRequires: pkgconfig
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .optionlist
 
 %build
 %{__make} %{?_smp_mflags}
@@ -59,6 +61,9 @@
 %{_libdir}/pkgconfig/libdhcp.pc
 
 %changelog
+* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.24-2
+- Request and handle static-routes option for IPv4 requests (#149736)
+
 * Fri Mar 23 2007 David Cantrell <dcantrell at redhat.com> - 1.24-1
 - In pumpSetupInterface(), handle dual stack networks rather than defaulting
   to the value of the 'ip' structure member (#232690)