[packages/net-snmp] - Remove-U64-typedef is back for 5.8, renumbered patches
hawk
hawk at pld-linux.org
Fri Aug 31 12:59:33 CEST 2018
commit 8be54fabe8eb91fd3e86825c98c2706b32a7b9ec
Author: Marcin Krol <hawk at tld-linux.org>
Date: Fri Aug 31 10:58:58 2018 +0000
- Remove-U64-typedef is back for 5.8, renumbered patches
net-snmp-Remove-U64-typedef.patch | 18 ++++++++++++++++++
net-snmp.spec | 18 ++++++++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/net-snmp.spec b/net-snmp.spec
index 4e0b989..db1b35c 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -47,13 +47,14 @@ Patch4: %{name}-link.patch
Patch5: %{name}-llinterfaces.patch
Patch6: %{name}-kernel_headers.patch
Patch7: %{name}-rpmpath.patch
-Patch9: %{name}-python.patch
-Patch10: %{name}-lvalue.patch
-Patch11: %{name}-defaultconfig.patch
-Patch12: %{name}-use-rpm-hrmib.patch
-Patch13: %{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch14: %{name}-logging.patch
-Patch17: 1314610.patch
+Patch8: %{name}-python.patch
+Patch9: %{name}-lvalue.patch
+Patch10: %{name}-defaultconfig.patch
+Patch11: %{name}-use-rpm-hrmib.patch
+Patch12: %{name}-TCP_STATS_CACHE_TIMEOUT.patch
+Patch13: %{name}-logging.patch
+Patch14: %{name}-Remove-U64-typedef.patch
+Patch15: 1314610.patch
URL: http://www.net-snmp.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -449,13 +450,14 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch17 -p1
+%patch15 -p1
%build
%{__libtoolize}
diff --git a/net-snmp-Remove-U64-typedef.patch b/net-snmp-Remove-U64-typedef.patch
new file mode 100644
index 0000000..d95a39a
--- /dev/null
+++ b/net-snmp-Remove-U64-typedef.patch
@@ -0,0 +1,18 @@
+diff -ur net-snmp-5.8.orig/include/net-snmp/library/int64.h net-snmp-5.8/include/net-snmp/library/int64.h
+--- net-snmp-5.8.orig/include/net-snmp/library/int64.h 2018-07-16 14:33:40.000000000 +0000
++++ net-snmp-5.8/include/net-snmp/library/int64.h 2018-08-31 10:50:18.665987890 +0000
+@@ -5,14 +5,6 @@
+ extern "C" {
+ #endif
+
+-#ifndef NETSNMP_REMOVE_U64
+- /*
+- * Note: using the U64 typedef is deprecated because this typedef conflicts
+- * with a typedef with the same name defined in the Perl header files.
+- */
+- typedef struct counter64 U64;
+-#endif
+-
+ #define I64CHARSZ 21
+
+ void divBy10(struct counter64, struct counter64 *,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/net-snmp.git/commitdiff/8be54fabe8eb91fd3e86825c98c2706b32a7b9ec
More information about the pld-cvs-commit
mailing list