rpms/libdhcp/F-7 libdhcp-1.24-libnl.patch, NONE, 1.1 libdhcp.spec, 1.53, 1.54

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/libdhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308

Modified Files:
	libdhcp.spec 
Added Files:
	libdhcp-1.24-libnl.patch 
Log Message:
* Thu Mar  6 2008 Dan Williams <dcbw at redhat.com> - 1.24-6
- Update for libnl 1.1



libdhcp-1.24-libnl.patch:

--- NEW FILE libdhcp-1.24-libnl.patch ---
diff -up libdhcp-1.24/nic.c.libnl libdhcp-1.24/nic.c
--- libdhcp-1.24/nic.c.libnl	2007-03-05 15:36:03.000000000 -0500
+++ libdhcp-1.24/nic.c	2008-02-12 15:35:22.000000000 -0500
@@ -50,7 +50,6 @@
 
 #include <netlink/netlink.h>
 #include <netlink/netlink-kernel.h>
-#include <netlink/rtnetlink-kernel.h>
 #include <netlink/msg.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -367,15 +366,17 @@ static int nic_get_links(NLH_t nh, char 
         }
     }
 
-    if (nl_send_auto_complete(nh->nl, nlmsg_hdr(msg)) < 0) {
+    if (nl_send_auto_complete(nh->nl, msg) < 0) {
         eprintf(NIC_FATAL, "nic_get_links: %m\n");
         return -1;
     }
 
     rlen = 1;
     while (rlen > 0) {
+    struct ucred *creds = NULL;
+
         rhdrs = NULL;
-        if ((rlen = nl_recv(nh->nl, &addr, (void *)&rhdrs)) <= 0)
+        if ((rlen = nl_recv(nh->nl, &addr, (void *)&rhdrs, &creds)) <= 0)
             break;
 
         if (rlen < sizeof (*rhdr) + sizeof (struct ifinfomsg)) {
@@ -738,7 +739,7 @@ NIC_Res_t nic_update( NIC_t nic )
     if(  nic->l.change & NIC_LINK_PROTINFO )
 	NLA_PUT_U32(msg, IFLA_PROTINFO, nic->l.protinfo);
 
-    if( nl_send_auto_complete(nic->nh->nl, nlmsg_hdr(msg)) < 0 )
+    if( nl_send_auto_complete(nic->nh->nl, msg) < 0 )
     {
         eprintf(NIC_ERR,"nic_update_link: send failed - %d %s",
 		nl_get_errno(), nl_geterror());
@@ -746,6 +747,7 @@ NIC_Res_t nic_update( NIC_t nic )
     }
 
     nlmsg_free(msg);
+    nl_disable_sequence_check(nic->nh->nl);
 
     if( nl_wait_for_ack(nic->nh->nl) < 0 )
     {
@@ -1104,7 +1106,7 @@ static int nic_get_addresses(NLH_t nh, I
 		IP_ADDR(&(addr->nla.addr))
 	       );
 
-    if ( nl_send_auto_complete( nh->nl, nlmsg_hdr(msg) ) < 0 )
+    if ( nl_send_auto_complete( nh->nl, msg) < 0 )
     {
         eprintf(NIC_ERR,"nic_get_addresses: send failed: %d %s\n", 
 		nl_get_errno(), nl_geterror());
@@ -1126,7 +1128,8 @@ static int nic_get_addresses(NLH_t nh, I
     
     do
     {
-	if ( (rlen = nl_recv( nh->nl, &kernel, (void*)&buf)) > 0 )
+	struct ucred *creds = NULL;
+	if( (rlen = nl_recv(nh->nl, &kernel, (void*) &buf, &creds)) > 0 )
 	{
 	    if( rlen < (sizeof(struct nlmsghdr) + sizeof(struct ifaddrmsg)) )
 		goto nla_return;
@@ -1692,7 +1695,7 @@ int nic_addr_send( IPaddr_t ipa, NIC_Add
     if( ipa->nla.have & NIC_ADDR_CACHEINFO )
 	NLA_PUT(msg, IFA_CACHEINFO, sizeof(struct ifa_cacheinfo), &(ipa->nla.cacheinfo));
 
-    if( (err = nl_send_auto_complete(ipa->nh->nl, nlmsg_hdr(msg))) < 0 )
+    if( (err = nl_send_auto_complete(ipa->nh->nl, msg)) < 0 )
     {
         eprintf(NIC_ERR,"nic_addr_send: send failed - %d %d %s",
 		err, nl_get_errno(), nl_geterror());
@@ -1700,6 +1703,7 @@ int nic_addr_send( IPaddr_t ipa, NIC_Add
     }
 
     nlmsg_free(msg);
+    nl_disable_sequence_check(ipa->nh->nl);
 
     int n_tries = 0;
     try_again:
@@ -2208,7 +2212,7 @@ static int nic_get_routes(NLH_t nh, RT_t
     if( (rta->have & NIC_RT_IIF) &&  (rta->iif[0] != '\0') )
 	NLA_PUT_STRING(msg, RTA_IIF, &(rta->iif[0]));    	
 
-    if ( nl_send_auto_complete( nh->nl, nlmsg_hdr(msg) ) < 0 )
+    if ( nl_send_auto_complete( nh->nl, msg) < 0 )
     {
         eprintf(NIC_ERR,"nic_get_routes: send failed: %d %s\n", 
 		nl_get_errno(), nl_geterror());
@@ -2223,7 +2227,8 @@ static int nic_get_routes(NLH_t nh, RT_t
     
     do
     {
-	if ( (rlen = nl_recv( nh->nl, &kernel, (void*)&buf)) > 0 )
+	struct ucred *creds = NULL;
+	if ( (rlen = nl_recv( nh->nl, &kernel, (void*)&buf, &creds)) > 0 )
 	{
 	    if( rlen < (sizeof(struct nlmsghdr) + sizeof(struct rtmsg)) )
 		goto rta_return;
@@ -2963,7 +2968,7 @@ static NIC_Res_t nic_route_msg( IProute_
     if ( rt->rt.have & NIC_RT_MP_ALGO )
 	NLA_PUT_U32(msg, RTA_MP_ALGO, rt->rt.mp_algo);
     
-    if( nl_send_auto_complete(rt->nh->nl, nlmsg_hdr(msg)) < 0 )
+    if( nl_send_auto_complete(rt->nh->nl, msg) < 0 )
     {
 	eprintf(NIC_ERR,"%s: send failed - %d %s", tag, nl_get_errno(),
                 nl_geterror());
@@ -2971,6 +2976,7 @@ static NIC_Res_t nic_route_msg( IProute_
     }
 
     nlmsg_free(msg);
+    nl_disable_sequence_check(rt->nh->nl);
 
     if( nl_wait_for_ack(rt->nh->nl) < 0 )
     {


Index: libdhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdhcp/F-7/libdhcp.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libdhcp.spec	8 Aug 2007 22:19:36 -0000	1.53
+++ libdhcp.spec	6 Mar 2008 23:55:12 -0000	1.54
@@ -1,13 +1,14 @@
 Summary: A library for network interface configuration with DHCP
 Name:    libdhcp
 Version: 1.24
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group:   Development/Libraries
 URL:     http://people.redhat.com/dcantrel/%{name}/
 
 Source:  http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
 Patch0:  %{name}-1.24-option-list.patch
+Patch1:  %{name}-1.24-libnl.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18
@@ -43,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .optionlist
+%patch1 -p1 -b .libnl
 
 %build
 %{__make} %{?_smp_mflags}
@@ -74,6 +76,9 @@
 %{_libdir}/libdhcp.a
 
 %changelog
+* Thu Mar  6 2008 Dan Williams <dcbw at redhat.com> - 1.24-6
+- Update for libnl 1.1
+
 * Wed Aug 08 2007 David Cantrell <dcantrell at redhat.com> - 1.24-5
 - Update License tag to GPLv2