rpms/net-snmp/devel net-snmp-5.4.1-shared-ip.patch, 1.2, 1.3 net-snmp.spec, 1.157, 1.158

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29083

Modified Files:
	net-snmp-5.4.1-shared-ip.patch net-snmp.spec 
Log Message:
rediff to new net-snmp version

net-snmp-5.4.1-shared-ip.patch:

Index: net-snmp-5.4.1-shared-ip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-shared-ip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net-snmp-5.4.1-shared-ip.patch	25 Jul 2008 11:03:32 -0000	1.2
+++ net-snmp-5.4.1-shared-ip.patch	17 Sep 2008 14:45:20 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
---- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13	2007-05-17 23:53:28.000000000 +0200
-+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c	2008-07-25 12:53:42.000000000 +0200
-@@ -272,11 +272,15 @@ _netsnmp_ioctl_ipaddress_container_load_
+diff -up net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.shared-ip net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
+--- net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.shared-ip	2008-01-17 01:09:33.000000000 +0100
++++ net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c	2008-09-17 16:43:18.000000000 +0200
+@@ -279,11 +279,15 @@ _netsnmp_ioctl_ipaddress_container_load_
          /*
           * add entry to container
           */
@@ -21,10 +21,10 @@
          }
      }
  
-diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
---- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13	2006-09-15 02:48:50.000000000 +0200
-+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c	2008-07-25 12:53:42.000000000 +0200
-@@ -324,7 +324,16 @@ _load_v6(netsnmp_container *container, i
+diff -up net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.shared-ip net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
+--- net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.shared-ip	2008-08-13 15:02:12.000000000 +0200
++++ net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c	2008-09-17 16:43:18.000000000 +0200
+@@ -325,7 +325,16 @@ _load_v6(netsnmp_container *container, i
          /*
           * add entry to container
           */
@@ -42,11 +42,11 @@
      }
  
      fclose(in);
-diff -up net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13 net-snmp-5.4.1/include/net-snmp/library/container.h
---- net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13	2005-12-04 19:43:04.000000000 +0100
-+++ net-snmp-5.4.1/include/net-snmp/library/container.h	2008-07-25 12:53:42.000000000 +0200
-@@ -370,8 +370,32 @@ extern "C" {
-             }
+diff -up net-snmp-5.4.2/include/net-snmp/library/container.h.shared-ip net-snmp-5.4.2/include/net-snmp/library/container.h
+--- net-snmp-5.4.2/include/net-snmp/library/container.h.shared-ip	2008-02-14 00:37:48.000000000 +0100
++++ net-snmp-5.4.2/include/net-snmp/library/container.h	2008-09-17 16:43:18.000000000 +0200
+@@ -406,8 +406,32 @@ extern "C" {
+             
          }
          return rc;
 +    }    
@@ -79,10 +79,10 @@
      /*------------------------------------------------------------------
       * These functions should EXACTLY match the function version in
       * container.c. If you change one, change them both.
-diff -up net-snmp-5.4.1/snmplib/container.c.backup_patch_13 net-snmp-5.4.1/snmplib/container.c
---- net-snmp-5.4.1/snmplib/container.c.backup_patch_13	2006-08-25 11:41:06.000000000 +0200
-+++ net-snmp-5.4.1/snmplib/container.c	2008-07-25 12:53:42.000000000 +0200
-@@ -286,6 +286,29 @@ int CONTAINER_INSERT(netsnmp_container *
+diff -up net-snmp-5.4.2/snmplib/container.c.shared-ip net-snmp-5.4.2/snmplib/container.c
+--- net-snmp-5.4.2/snmplib/container.c.shared-ip	2008-02-14 00:37:48.000000000 +0100
++++ net-snmp-5.4.2/snmplib/container.c	2008-09-17 16:43:18.000000000 +0200
+@@ -323,6 +323,29 @@ int CONTAINER_REMOVE(netsnmp_container *
      return rc;
  }
  


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- net-snmp.spec	17 Sep 2008 14:32:07 -0000	1.157
+++ net-snmp.spec	17 Sep 2008 14:45:20 -0000	1.158
@@ -172,6 +172,7 @@
 %patch8 -p1 -b .libdir
 %patch9 -p1 -b .libpath
 %patch10 -p1 -b .shared-ip
+exit 1
 %patch11 -p1 -b .sensors
 %patch12 -p1 -b .xen-crash