From: Sascha Hauer <s.hauer@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 1/2] net-snmp: version bump v5.7.3 -> v5.8
Date: Wed, 20 Nov 2019 15:24:36 +0100 [thread overview]
Message-ID: <20191120142437.15771-1-s.hauer@pengutronix.de> (raw)
This updates the net-snmp package from v5.7.3 to v5.8.
0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch and
0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch are applied on v5.8
and disappeared during rebasing.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
...ate-the-hard-coded-libnl-3-include-p.patch | 285 ------------------
...g-788964-net-snmp-snmp_pdu_parse-DoS.patch | 128 --------
patches/net-snmp-5.7.3/series | 9 -
...net-snmp-config-add-SYSROOT-support.patch} | 8 +-
...-and-tcp-when-disable-agentx-dom-so.patch} | 4 +-
.../autogen.sh | 0
patches/net-snmp-5.8/series | 5 +
rules/net-snmp.make | 4 +-
8 files changed, 13 insertions(+), 430 deletions(-)
delete mode 100644 patches/net-snmp-5.7.3/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch
delete mode 100644 patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
delete mode 100644 patches/net-snmp-5.7.3/series
rename patches/{net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch => net-snmp-5.8/0001-net-snmp-config-add-SYSROOT-support.patch} (92%)
rename patches/{net-snmp-5.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch => net-snmp-5.8/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch} (93%)
rename patches/{net-snmp-5.7.3 => net-snmp-5.8}/autogen.sh (100%)
create mode 100644 patches/net-snmp-5.8/series
diff --git a/patches/net-snmp-5.7.3/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch b/patches/net-snmp-5.7.3/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch
deleted file mode 100644
index 696f4095e..000000000
--- a/patches/net-snmp-5.7.3/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Mon, 2 Feb 2015 20:31:29 +0100
-Subject: [PATCH] configure: Eliminate the hard-coded libnl-3 include path
-
-See also commit 3dde41998625fe0e24119a2e1f4509ba3ba2fd9a.
----
- aclocal.m4 | 1 +
- configure.d/config_os_libs2 | 30 ++++++-
- m4/pkg.m4 | 214 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 243 insertions(+), 2 deletions(-)
- create mode 100644 m4/pkg.m4
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index cd80c7486f2f..45e3608ed480 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -22,3 +22,4 @@ m4_include([m4/ltversion.m4])
- m4_include([m4/lt~obsolete.m4])
- m4_include([m4/netsnmp_arg.m4])
- m4_include([m4/netsnmp_search_libs.m4])
-+m4_include([m4/pkg.m4])
-diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
-index 47491e24ce0a..10bd414b879e 100644
---- a/configure.d/config_os_libs2
-+++ b/configure.d/config_os_libs2
-@@ -225,11 +225,37 @@ fi
- if test "x$with_nl" != "xno"; then
- case $target_os in
- linux*) # Check for libnl (linux)
-+ # The test below verifies whether the libnl-3 package been installed.
-+ # This test works as follows:
-+ # - If pkg-config was not installed at the time autogen.sh was run,
-+ # the definition of the PKG_CHECK_EXISTS() macro will not be found by
-+ # autogen.sh. Augogen.sh will generate a configure script that prints
-+ # a warning about pkg-config and proceeds as if libnl-3 has not been
-+ # installed.
-+ # - If pkg-config was installed at the time autogen.sh was run,
-+ # the generated configure script will try to detect the presence of
-+ # the libnl-3 library by looking up compile and linker flags in the
-+ # file called libnl-3.pc.
-+ # - pkg-config settings can be overridden via the configure variables
-+ # LIBNL3_CFLAGS and LIBNL3_LIBS (added by the pkg-config m4 macro's to
-+ # the configure script -- see also ./configure --help).
-+ # - The LIBNL3_CFLAGS and LIBNL3_LIBS configure variables can be used
-+ # even if the pkg-config executable is not present on the system on
-+ # which the configure script is run.
-+ ifdef(
-+ [PKG_CHECK_EXISTS],
-+ [PKG_CHECK_EXISTS([libnl-3.0],
-+ [PKG_CHECK_MODULES([LIBNL3], [libnl-3.0])])
-+ ],
-+ AC_MSG_WARN([pkg-config has not been installed or is too old.])
-+ AC_MSG_WARN([Detection of libnl-3.0 will be skipped.])
-+ )
-+
- netsnmp_save_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
-+ CPPFLAGS="${LIBNL3_CFLAGS} $CPPFLAGS"
- NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
- [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])
- if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
- NETSNMP_SEARCH_LIBS(nl_connect, nl, [
-diff --git a/m4/pkg.m4 b/m4/pkg.m4
-new file mode 100644
-index 000000000000..c5b26b52e6cd
---- /dev/null
-+++ b/m4/pkg.m4
-@@ -0,0 +1,214 @@
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+# serial 1 (pkg-config-0.24)
-+#
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+# only at the first occurence in configure.ac, so if the first place
-+# it's called might be skipped (such as if it is within an "if", you
-+# have to call PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes ],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-+
-+
-+# PKG_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable pkgconfigdir as the location where a module
-+# should install pkg-config .pc files. By default the directory is
-+# $libdir/pkgconfig, but the default can be changed by passing
-+# DIRECTORY. The user can override through the --with-pkgconfigdir
-+# parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+ [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+]) dnl PKG_INSTALLDIR
-+
-+
-+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable noarch_pkgconfigdir as the location where a
-+# module should install arch-independent pkg-config .pc files. By
-+# default the directory is $datadir/pkgconfig, but the default can be
-+# changed by passing DIRECTORY. The user can override through the
-+# --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+ [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+]) dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# -------------------------------------------
-+# Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])# PKG_CHECK_VAR
diff --git a/patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch b/patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
deleted file mode 100644
index 7b804576b..000000000
--- a/patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Hideki Yamane <henrich@debian.org>
-Date: Thu, 18 Jun 2015 06:21:20 +0900
-Subject: [PATCH] Bug#788964: net-snmp snmp_pdu_parse() DoS
-
-taken patch from https://sourceforge.net/p/net-snmp/code/ci/f23bcd3ac6ddee5d0a48f9703007ccc738914791/
----
- snmplib/snmp_api.c | 55 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 28 insertions(+), 27 deletions(-)
-
-diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
-index 191debf09a3d..adae4e4a9550 100644
---- a/snmplib/snmp_api.c
-+++ b/snmplib/snmp_api.c
-@@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length)
- u_char type;
- u_char msg_type;
- u_char *var_val;
-- int badtype = 0;
- size_t len;
- size_t four;
-- netsnmp_variable_list *vp = NULL;
-+ netsnmp_variable_list *vp = NULL, *vplast = NULL;
- oid objid[MAX_OID_LEN];
- u_char *p;
-
-@@ -4493,38 +4492,24 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length)
- (ASN_SEQUENCE | ASN_CONSTRUCTOR),
- "varbinds");
- if (data == NULL)
-- return -1;
-+ goto fail;
-
- /*
- * get each varBind sequence
- */
- while ((int) *length > 0) {
-- netsnmp_variable_list *vptemp;
-- vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp));
-- if (NULL == vptemp) {
-- return -1;
-- }
-- if (NULL == vp) {
-- pdu->variables = vptemp;
-- } else {
-- vp->next_variable = vptemp;
-- }
-- vp = vptemp;
-+ vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list);
-+ if (NULL == vp)
-+ goto fail;
-
-- vp->next_variable = NULL;
-- vp->val.string = NULL;
- vp->name_length = MAX_OID_LEN;
-- vp->name = NULL;
-- vp->index = 0;
-- vp->data = NULL;
-- vp->dataFreeHook = NULL;
- DEBUGDUMPSECTION("recv", "VarBind");
- data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type,
- &vp->val_len, &var_val, length);
- if (data == NULL)
-- return -1;
-+ goto fail;
- if (snmp_set_var_objid(vp, objid, vp->name_length))
-- return -1;
-+ goto fail;
-
- len = MAX_PACKET_LENGTH;
- DEBUGDUMPHEADER("recv", "Value");
-@@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length)
- vp->val.string = (u_char *) malloc(vp->val_len);
- }
- if (vp->val.string == NULL) {
-- return -1;
-+ goto fail;
- }
- p = asn_parse_string(var_val, &len, &vp->type, vp->val.string,
- &vp->val_len);
-@@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length)
- vp->val_len *= sizeof(oid);
- vp->val.objid = (oid *) malloc(vp->val_len);
- if (vp->val.objid == NULL) {
-- return -1;
-+ goto fail;
- }
- memmove(vp->val.objid, objid, vp->val_len);
- break;
-@@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length)
- case ASN_BIT_STR:
- vp->val.bitstring = (u_char *) malloc(vp->val_len);
- if (vp->val.bitstring == NULL) {
-- return -1;
-+ goto fail;
- }
- p = asn_parse_bitstring(var_val, &len, &vp->type,
- vp->val.bitstring, &vp->val_len);
-@@ -4640,12 +4625,28 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length)
- break;
- default:
- snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type);
-- badtype = -1;
-+ goto fail;
- break;
- }
- DEBUGINDENTADD(-4);
-+
-+ if (NULL == vplast) {
-+ pdu->variables = vp;
-+ } else {
-+ vplast->next_variable = vp;
-+ }
-+ vplast = vp;
-+ vp = NULL;
- }
-- return badtype;
-+ return 0;
-+
-+ fail:
-+ DEBUGMSGTL(("recv", "error while parsing VarBindList\n"));
-+ /** if we were parsing a var, remove it from the pdu and free it */
-+ if (vp)
-+ snmp_free_var(vp);
-+
-+ return -1;
- }
-
- /*
diff --git a/patches/net-snmp-5.7.3/series b/patches/net-snmp-5.7.3/series
deleted file mode 100644
index 5552fe35a..000000000
--- a/patches/net-snmp-5.7.3/series
+++ /dev/null
@@ -1,9 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream --start-number 1
-0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch
-0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
-#tag:ptx --start-number 200
-0200-net-snmp-config-add-SYSROOT-support.patch
-0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
-# c5d69c906e0a34815049c84f73590cb2 - git-ptx-patches magic
diff --git a/patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.8/0001-net-snmp-config-add-SYSROOT-support.patch
similarity index 92%
rename from patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch
rename to patches/net-snmp-5.8/0001-net-snmp-config-add-SYSROOT-support.patch
index 4aedd8072..e1c88ae10 100644
--- a/patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch
+++ b/patches/net-snmp-5.8/0001-net-snmp-config-add-SYSROOT-support.patch
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Dahl <post@lespocky.de>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-snmp-config.in b/net-snmp-config.in
-index d55872cdd50a..c8611bcc7ebe 100644
+index a412412118af..eb7bd0921fd6 100644
--- a/net-snmp-config.in
+++ b/net-snmp-config.in
@@ -54,7 +54,7 @@ NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
@@ -28,7 +28,7 @@ index d55872cdd50a..c8611bcc7ebe 100644
NSC_SNMPLIBS="-lnetsnmp ${NSC_LNETSNMPLIBS}"
NSC_SUBAGENTLIBS="-lnetsnmpagent ${NSC_LAGENTLIBS} ${NSC_SNMPLIBS}"
-@@ -138,10 +138,10 @@ else
+@@ -140,10 +140,10 @@ else
;;
#################################################### compile
--base-cflags)
@@ -41,7 +41,7 @@ index d55872cdd50a..c8611bcc7ebe 100644
;;
--srcdir)
echo $NSC_SRCDIR
-@@ -598,7 +598,7 @@ EOF
+@@ -657,7 +657,7 @@ EOF
echo "Ack. Can't create $tmpfile."
exit 1
fi
@@ -49,4 +49,4 @@ index d55872cdd50a..c8611bcc7ebe 100644
+ cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${SYSROOT}${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
echo "running: $cmd"
`$cmd`
- if test "x$norm" != "x1" ; then
+ result=$?
diff --git a/patches/net-snmp-5.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch b/patches/net-snmp-5.8/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
similarity index 93%
rename from patches/net-snmp-5.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
rename to patches/net-snmp-5.8/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
index 252020eb5..4b7338c71 100644
--- a/patches/net-snmp-5.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
+++ b/patches/net-snmp-5.8/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
@@ -17,10 +17,10 @@ semantic.
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.d/config_project_with_enable b/configure.d/config_project_with_enable
-index 61ba026f355d..d7c2132a0bd4 100644
+index daa0ccc0fbbc..fd7feba777b4 100644
--- a/configure.d/config_project_with_enable
+++ b/configure.d/config_project_with_enable
-@@ -723,9 +723,11 @@ NETSNMP_ARG_ENABLE(local-smux,
+@@ -777,9 +777,11 @@ NETSNMP_ARG_ENABLE(local-smux,
fi])
NETSNMP_ARG_ENABLE(agentx-dom-sock-only,
diff --git a/patches/net-snmp-5.7.3/autogen.sh b/patches/net-snmp-5.8/autogen.sh
similarity index 100%
rename from patches/net-snmp-5.7.3/autogen.sh
rename to patches/net-snmp-5.8/autogen.sh
diff --git a/patches/net-snmp-5.8/series b/patches/net-snmp-5.8/series
new file mode 100644
index 000000000..1596362e4
--- /dev/null
+++ b/patches/net-snmp-5.8/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-net-snmp-config-add-SYSROOT-support.patch
+0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
+# 97810382623b86e69e492f3a5712bcf4 - git-ptx-patches magic
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 24481cf0d..243b84fe5 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
#
# Paths and names
#
-NET_SNMP_VERSION := 5.7.3
-NET_SNMP_MD5 := d4a3459e1577d0efa8d96ca70a885e53
+NET_SNMP_VERSION := 5.8
+NET_SNMP_MD5 := 63bfc65fbb86cdb616598df1aff6458a
NET_SNMP := net-snmp-$(NET_SNMP_VERSION)
NET_SNMP_SUFFIX := tar.gz
NET_SNMP_URL := $(call ptx/mirror, SF, net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX))
--
2.24.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2019-11-20 14:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 14:24 Sascha Hauer [this message]
2019-11-20 14:24 ` [ptxdist] [PATCH 2/2] net-snmp: explicitly en/disable PCI support Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191120142437.15771-1-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox