Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net-snmp: update to 5.8

Browse source 
Disable PCRE process searching to avoid linking against libprce, which
would cause the build to fail due to a missing dependency. With the
--without-pcre switch, build fails due to an undefined reference, so do
it via CONFIGURE_VARS instead.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[disable PCRE process searching]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Rosen Penev 2018-10-14 19:35:29 -07:00 committed by Stijn Tintel
parent bcd482a194
commit 9251f51084
6 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/net-snmp/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=net-snmp PKG_NAME:=net-snmp
PKG_VERSION:=5.7.3 PKG_VERSION:=5.8
PKG_RELEASE:=10 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/net-snmp PKG_SOURCE_URL:=@SF/net-snmp
PKG_HASH:=12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0 PKG_HASH:=b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be> PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
PKG_LICENSE:=MIT BSD-3-Clause-Clear PKG_LICENSE:=MIT BSD-3-Clause-Clear
@ -209,6 +209,7 @@ CONFIGURE_ARGS += \
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ac_cv_header_netlink_netlink_h=yes \ ac_cv_header_netlink_netlink_h=yes \
ac_cv_header_pcre_h=no \
netsnmp_cv_func_nl_connect_LIBS=-lnl-tiny \ netsnmp_cv_func_nl_connect_LIBS=-lnl-tiny \
ifeq ($(CONFIG_IPV6),y) ifeq ($(CONFIG_IPV6),y)

10
net/net-snmp/patches/000-cross-compile.patch
View file

@ -15,14 +15,14 @@ link tests to fail due to a stray "no" word getting passed to the linker.
Signed-off-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
--- a/configure.d/config_os_libs2 --- a/configure.d/config_os_libs2
+++ b/configure.d/config_os_libs2 +++ b/configure.d/config_os_libs2
@@ -226,14 +226,22 @@ if test "x$with_nl" != "xno"; then @@ -254,14 +254,22 @@ if test "x$with_nl" != "xno"; then
case $target_os in )
linux*) # Check for libnl (linux)
netsnmp_save_CPPFLAGS="$CPPFLAGS" netsnmp_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS" - CPPFLAGS="${LIBNL3_CFLAGS} $CPPFLAGS"
- NETSNMP_SEARCH_LIBS(nl_connect, nl-3, - NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
- [AC_CHECK_HEADERS(netlink/netlink.h) - [AC_CHECK_HEADERS(netlink/netlink.h)
- EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"], - EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES ${LIBNL3_CFLAGS}"],
- [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS]) - [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
+ netsnmp_netlink_include_flags="" + netsnmp_netlink_include_flags=""
if test "x$ac_cv_header_netlink_netlink_h" != xyes; then if test "x$ac_cv_header_netlink_netlink_h" != xyes; then

4
net/net-snmp/patches/100-debian-statistics.patch
View file

@ -1,6 +1,6 @@
--- a/agent/mibgroup/mibII/interfaces.c --- a/agent/mibgroup/mibII/interfaces.c
+++ b/agent/mibgroup/mibII/interfaces.c +++ b/agent/mibgroup/mibII/interfaces.c
@@ -1590,6 +1590,10 @@ Interface_Scan_Init(void) @@ -1588,6 +1588,10 @@ Interface_Scan_Init(void)
struct ifnet *nnew; struct ifnet *nnew;
char *stats, *ifstart = line; char *stats, *ifstart = line;
@ -11,7 +11,7 @@
if (line[strlen(line) - 1] == '\n') if (line[strlen(line) - 1] == '\n')
line[strlen(line) - 1] = '\0'; line[strlen(line) - 1] = '\0';
@@ -1622,7 +1622,7 @@ Interface_Scan_Init(void) @@ -1620,7 +1624,7 @@ Interface_Scan_Init(void)
&coll) != 5)) { &coll) != 5)) {
if ((scan_line_to_use == scan_line_2_2) if ((scan_line_to_use == scan_line_2_2)
&& !strstr(line, "No statistics available")) && !strstr(line, "No statistics available"))

6
net/net-snmp/patches/110-debian-makefiles.patch
View file

@ -1,7 +1,7 @@
diff -uNr a/local/Makefile.in b/local/Makefile.in diff -uNr a/local/Makefile.in b/local/Makefile.in
--- a/local/Makefile.in 2014-02-20 08:36:42.000000000 +0800 --- a/local/Makefile.in 2014-02-20 08:36:42.000000000 +0800
+++ b/local/Makefile.in 2014-05-27 13:21:34.245223503 +0800 +++ b/local/Makefile.in 2014-05-27 13:21:34.245223503 +0800
@@ -103,7 +103,7 @@ @@ -101,7 +101,7 @@
mib2c.made: $(srcdir)/mib2c mib2c.made: $(srcdir)/mib2c
if test "x$(PERL)" != "x" ; then \ if test "x$(PERL)" != "x" ; then \
@ -13,7 +13,7 @@ diff -uNr a/local/Makefile.in b/local/Makefile.in
diff -uNr a/Makefile.top b/Makefile.top diff -uNr a/Makefile.top b/Makefile.top
--- a/Makefile.top 2014-02-20 08:36:42.000000000 +0800 --- a/Makefile.top 2014-02-20 08:36:42.000000000 +0800
+++ b/Makefile.top 2014-05-27 13:26:53.023737120 +0800 +++ b/Makefile.top 2014-05-27 13:26:53.023737120 +0800
@@ -27,6 +27,7 @@ @@ -28,6 +28,7 @@
snmplibdir = $(datadir)/snmp snmplibdir = $(datadir)/snmp
mibdir = $(snmplibdir)/mibs mibdir = $(snmplibdir)/mibs
persistentdir = @PERSISTENT_DIRECTORY@ persistentdir = @PERSISTENT_DIRECTORY@
@ -24,7 +24,7 @@ diff -uNr a/Makefile.top b/Makefile.top
diff -uNr a/mibs/Makefile.in b/mibs/Makefile.in diff -uNr a/mibs/Makefile.in b/mibs/Makefile.in
--- a/mibs/Makefile.in 2014-02-20 08:36:42.000000000 +0800 --- a/mibs/Makefile.in 2014-02-20 08:36:42.000000000 +0800
+++ b/mibs/Makefile.in 2014-05-27 13:25:07.151988585 +0800 +++ b/mibs/Makefile.in 2014-05-27 13:25:07.151988585 +0800
@@ -49,11 +49,15 @@ @@ -47,11 +47,15 @@
UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \ UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt

2
net/net-snmp/patches/160-no_ldconfig.patch
View file

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -14197,7 +14197,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) @@ -15097,7 +15097,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
need_version=no need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major' soname_spec='${libname}${release}${shared_ext}$major'

4
net/net-snmp/patches/170-ldflags.patch
View file

@ -1,8 +1,8 @@
--- a/Makefile.top --- a/Makefile.top
+++ b/Makefile.top +++ b/Makefile.top
@@ -85,7 +85,7 @@ LIBCURRENT = 30 @@ -87,7 +87,7 @@ LIBCURRENT = 30
LIBAGE = 0 LIBAGE = 0
LIBREVISION = 3 LIBREVISION = 0
-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o -LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
+LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) $(LDFLAGS) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o +LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) $(LDFLAGS) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o