diff --git a/net-snmp-5.4-ethtool-config.patch b/net-snmp-5.4-ethtool-config.patch new file mode 100644 index 0000000..3cb72e9 --- /dev/null +++ b/net-snmp-5.4-ethtool-config.patch @@ -0,0 +1,34 @@ +--- net-snmp-5.4/configure.ethtool-config 2007-01-11 17:26:28.000000000 +0100 ++++ net-snmp-5.4/configure 2007-01-11 17:26:28.000000000 +0100 +@@ -32741,10 +32741,10 @@ + /* end confdefs.h. */ + + #include +-typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */ +-typedef __uint32_t u32; /* ditto */ +-typedef __uint16_t u16; /* ditto */ +-typedef __uint8_t u8; /* ditto */ ++typedef unsigned long long __u64; /* hack, so we may include kernel's ethtool.h */ ++typedef __uint32_t __u32; /* ditto */ ++typedef __uint16_t __u16; /* ditto */ ++typedef __uint8_t __u8; /* ditto */ + + + #include <$ac_header> +--- net-snmp-5.4/agent/mibgroup/if-mib/data_access/interface_linux.c.ethtool-config 2006-09-21 15:09:18.000000000 +0200 ++++ net-snmp-5.4/agent/mibgroup/if-mib/data_access/interface_linux.c 2007-01-11 17:27:32.000000000 +0100 +@@ -26,10 +26,10 @@ + #include + + #ifdef HAVE_LINUX_ETHTOOL_H +-typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */ +-typedef __uint32_t u32; /* ditto */ +-typedef __uint16_t u16; /* ditto */ +-typedef __uint8_t u8; /* ditto */ ++typedef unsigned long long __u64; /* hack, so we may include kernel's ethtool.h */ ++typedef __uint32_t __u32; /* ditto */ ++typedef __uint16_t __u16; /* ditto */ ++typedef __uint8_t __u8; /* ditto */ + #include + #endif /* HAVE_LINUX_ETHTOOL_H */ + #include diff --git a/net-snmp.spec b/net-snmp.spec index 3dc0b41..354f140 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -7,7 +7,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: BSDish @@ -34,6 +34,7 @@ Patch9: net-snmp-5.4-config_libdir.patch #Patch10: net-snmp-5.4-if_addr.patch Patch11: net-snmp-5.4-ip-addr-route-leaks.patch Patch12: net-snmp-5.4-tcpConn-tcp6-fopen.patch +Patch13: net-snmp-5.4-ethtool-config.patch Requires(pre): /sbin/chkconfig Obsoletes: ucd-snmp @@ -143,6 +144,8 @@ and applications. %patch11 -p0 -b .route-leak %patch12 -p1 -b .tcp6-fopen +%patch13 -p1 -b .ethtool-config + # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -353,6 +356,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/lib*.so.* %changelog +* Thu Jan 11 2007 Radek Vokál - 5.4-7 +- fix ethtool extension (#222268) + * Thu Jan 11 2007 Radek Vokál - 5.4-6 - swith to new disman implementation