diff --git a/net-snmp-5.0.8-ipv6-sock-close.patch b/net-snmp-5.0.8-ipv6-sock-close.patch deleted file mode 100644 index c2fe18d..0000000 --- a/net-snmp-5.0.8-ipv6-sock-close.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c.backup_patch_2 net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c ---- net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c.backup_patch_2 2007-05-25 00:01:04.000000000 +0200 -+++ net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c 2008-07-25 12:52:36.000000000 +0200 -@@ -2017,6 +2017,7 @@ var_ifv6Entry(register struct variable * - break; - } - long_return = (ifr.ifr_flags & flag) ? 1 : 2; -+ close(s); - return (u_char *) & long_return; - } - } diff --git a/net-snmp-5.4.1-shared-ip.patch b/net-snmp-5.4.1-shared-ip.patch index fb7c0b8..9d7138a 100644 --- a/net-snmp-5.4.1-shared-ip.patch +++ b/net-snmp-5.4.1-shared-ip.patch @@ -1,3 +1,5 @@ +TODO: remove with 5.4.3 - another approach is implemented upstream + 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 diff --git a/net-snmp.spec b/net-snmp.spec index 5191e68..7b406dd 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -25,7 +25,6 @@ Source7: net-snmp-config Source8: net-snmp-trapd.redhat.conf Source9: net-snmpd.sysconfig Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch -Patch2: net-snmp-5.0.8-ipv6-sock-close.patch Patch3: net-snmp-5.0.8-readonly.patch Patch4: net-snmp-5.4.1-pie.patch Patch5: net-snmp-5.1.2-dir-fix.patch @@ -160,7 +159,6 @@ Net-SNMP toolkit library. %prep %setup -q -n %{name}-%{major_ver} %patch1 -p1 -b .mnttab -%patch2 -p1 -b .ipv6-sock-close %patch3 -p1 -b .readonly %ifnarch ia64 @@ -172,7 +170,7 @@ Net-SNMP toolkit library. %patch7 -p1 -b .multilib %patch8 -p1 -b .libdir %patch9 -p1 -b .libpath -%patch10 -p1 -b .shared-ip +#%patch10 -p1 -b .shared-ip %patch11 -p1 -b .sensors %patch12 -p1 -b .xen-crash