From: Rosen Penev <redacted>
Date: Fri, 17 May 2024 06:44:08 +0000 (-0700)
Subject: Revert "net-snmp: fix compilation with GCC 14"
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5bce0b09e63a428afa4c129db427d1f8e9bc3576;p=openwrt-packages.git

Revert "net-snmp: fix compilation with GCC 14"

This reverts commit 7d398682941d79be1e3c2f83f6a57f163ef43a50.
---

diff --git a/net/net-snmp/patches/750-ieee802dot11.patch b/net/net-snmp/patches/750-ieee802dot11.patch
index aaee1b661..a3c5c0a9d 100644
--- a/net/net-snmp/patches/750-ieee802dot11.patch
+++ b/net/net-snmp/patches/750-ieee802dot11.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/agent/mibgroup/ieee802dot11.c
-@@ -0,0 +1,4916 @@
+@@ -0,0 +1,4915 @@
 +/****************************************************************************
 +*                                                                           *
 +*  File Name:           ieee802dot11.c                                      *
@@ -30,7 +30,6 @@
 +#include <net-snmp/agent/net-snmp-agent-includes.h>
 +#include "ieee802dot11.h"
 +#include "iwlib.h"
-+#include "util_funcs/header_generic.h"
 +
 +/****************************************************************************
 +*                                Defines                                    *
@@ -4701,12 +4700,12 @@
 +addList ( char *l, char *data, int len  )
 +{
 +  char uid[256];
-+  avList_t *list;       
++  LIST_HEAD ( , avNode ) *list;       
 +
 +  // NOTE: this assumes the UID is at the beginning of the 
 +  //       data structure and that UIDs are strings
 +  
-+  list = ( avList_t * ) l;            // NOTE: don't know how to get 
++  list = ( LIST_HEAD ( , avNode ) * ) l;            // NOTE: don't know how to get 
 +  strcpy ( uid, data );                             //  rid of compiler warning on
 +                                                    //  LISTHEAD typecast
 +  // create a new node and the data that goes in it
@@ -4788,9 +4787,9 @@
 +****************************************************************************/
 +static void flushList ( char *l )
 +{
-+  avList_t *list;
++  LIST_HEAD ( , avNode ) *list;
 +  
-+  list = ( avList_t * ) l;    // NOTE: don't know how to get 
++  list = ( LIST_HEAD ( , avNode ) * ) l;    // NOTE: don't know how to get 
 +  while ( !LIST_EMPTY ( list )) {           //  rid of compiler warning on
 +    np = LIST_FIRST ( list );               //  LISTHEAD typecast
 +    if ( np->data )
@@ -4919,7 +4918,7 @@
 +
 --- /dev/null
 +++ b/agent/mibgroup/ieee802dot11.h
-@@ -0,0 +1,732 @@
+@@ -0,0 +1,730 @@
 +/****************************************************************************
 +*                                                                           *
 +*  File Name:           ieee802dot11.h                                      *
@@ -5649,12 +5648,10 @@
 +WriteMethod write_dot11SupportedRxAntenna;
 +WriteMethod write_dot11DiversitySelectionRx;
 +
-+void shutdown_ieee802dot11 ( void );
-+
 +#endif /* _MIBGROUP_IEEE802DOT11_H */
 --- /dev/null
 +++ b/agent/mibgroup/iwlib.h
-@@ -0,0 +1,509 @@
+@@ -0,0 +1,502 @@
 +/*
 + *	Wireless Tools
 + *
@@ -5686,9 +5683,6 @@
 +#include <unistd.h>
 +#include <netdb.h>		/* gethostbyname, getnetbyname */
 +#include <net/ethernet.h>	/* struct ether_addr */
-+#ifdef HAVE_NET_IF_H
-+#include <net/if.h>
-+#endif
 +#include <sys/time.h>		/* struct timeval */
 +#include <unistd.h>
 +
@@ -5745,10 +5739,6 @@
 +      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
 +#define LIBC5_HEADERS
 +
-+/* Musl */
-+#elif !defined(__GLIBC__) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
-+#define GENERIC_HEADERS
-+
 +/* Unsupported combination */
 +#else
 +#error "Your kernel/libc combination is not supported"
diff --git a/net/net-snmp/patches/751-gcc-14-fix.patch b/net/net-snmp/patches/751-gcc-14-fix.patch
deleted file mode 100644
index a217bb708..000000000
--- a/net/net-snmp/patches/751-gcc-14-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/agent/mib_modules.c
-+++ b/agent/mib_modules.c
-@@ -42,6 +42,7 @@
- #include <net-snmp/agent/table.h>
- #include <net-snmp/agent/table_iterator.h>
- #include "mib_module_includes.h"
-+#include "mibgroup/ieee802dot11.h"
- 
- static int need_shutdown = 0;
- 
diff --git a/net/net-snmp/patches/900-musl-compat.patch b/net/net-snmp/patches/900-musl-compat.patch
index c4234dd21..7bc6ae1ef 100644
--- a/net/net-snmp/patches/900-musl-compat.patch
+++ b/net/net-snmp/patches/900-musl-compat.patch
@@ -1,8 +1,8 @@
 --- a/agent/mibgroup/iwlib.h
 +++ b/agent/mibgroup/iwlib.h
-@@ -92,6 +92,10 @@
- #elif !defined(__GLIBC__) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
- #define GENERIC_HEADERS
+@@ -85,6 +85,10 @@
+       && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+ #define LIBC5_HEADERS
  
 +/* Musl */
 +#elif !defined(__GLIBC__) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)