diff options
author | Oliver Graute <oliver.graute@gmail.com> | 2015-07-03 14:43:16 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-07-06 20:35:44 +0200 |
commit | 4cb0b96e0df94644e42a735039967c6a5fa22a27 (patch) | |
tree | 8b67103e97ec6c01ee9f1cb9342bf01a2de30730 /patches/net-snmp-5.7.3 | |
parent | 7d05e624b36630bafeb2df8a7080e07ee96ca14a (diff) | |
download | ptxdist-4cb0b96e0df94644e42a735039967c6a5fa22a27.tar.gz ptxdist-4cb0b96e0df94644e42a735039967c6a5fa22a27.tar.xz |
net-snmp: version bump to 5.7.3 LTS
Version bump to net-snmp version 5.7.3
Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
[mol: fix series file]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/net-snmp-5.7.3')
4 files changed, 97 insertions, 0 deletions
diff --git a/patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch new file mode 100644 index 000000000..4aedd8072 --- /dev/null +++ b/patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch @@ -0,0 +1,52 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Sun, 10 Jan 2010 00:33:45 +0100 +Subject: [PATCH] net-snmp-config; add SYSROOT support + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +Adapted to 5.6.1 + +Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> + +Adapted to 5.7.2 + +Signed-off-by: Alexander Dahl <post@lespocky.de> +--- + net-snmp-config.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/net-snmp-config.in b/net-snmp-config.in +index d55872cdd50a..c8611bcc7ebe 100644 +--- a/net-snmp-config.in ++++ b/net-snmp-config.in +@@ -54,7 +54,7 @@ NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@" + NSC_LMIBLIBS="@LMIBLIBS@" + + NSC_INCLUDEDIR=${includedir} +-NSC_LIBDIR=-L${libdir} ++NSC_LIBDIR=-L${SYSROOT}${libdir} + + NSC_SNMPLIBS="-lnetsnmp ${NSC_LNETSNMPLIBS}" + NSC_SUBAGENTLIBS="-lnetsnmpagent ${NSC_LAGENTLIBS} ${NSC_SNMPLIBS}" +@@ -138,10 +138,10 @@ else + ;; + #################################################### compile + --base-cflags) +- echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR} ++ echo @CFLAGS@ @CPPFLAGS@ -I${SYSROOT}${NSC_INCLUDEDIR} + ;; + --cflags|--cf*) +- echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR} ++ echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${SYSROOT}${NSC_INCLUDEDIR} + ;; + --srcdir) + echo $NSC_SRCDIR +@@ -598,7 +598,7 @@ EOF + echo "Ack. Can't create $tmpfile." + exit 1 + fi +- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags" ++ 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 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.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch new file mode 100644 index 000000000..252020eb5 --- /dev/null +++ b/patches/net-snmp-5.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch @@ -0,0 +1,37 @@ +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> +Date: Tue, 3 Sep 2013 21:12:46 +0200 +Subject: [PATCH] Don't disable udp and tcp when --disable-agentx-dom-sock-only + is given + +The configure magic without this patch treats all + + --enable-agentx-dom-sock-only + --enable-agentx-dom-sock-only=no + --disable-agentx-dom-sock-only + +the same; i.e. disables the udp and tcp transports. With this patch only the +first option does have this effect which matches the usual and expected +semantic. +--- + configure.d/config_project_with_enable | 8 +++++--- + 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 +--- a/configure.d/config_project_with_enable ++++ b/configure.d/config_project_with_enable +@@ -723,9 +723,11 @@ NETSNMP_ARG_ENABLE(local-smux, + fi]) + + NETSNMP_ARG_ENABLE(agentx-dom-sock-only, +-[ --enable-agentx-dom-sock-only Disable UDP/TCP transports for agentx.], +-AC_DEFINE(NETSNMP_AGENTX_DOM_SOCK_ONLY, 1, +- [define if agentx transport is to use domain sockets only])) ++[ --enable-agentx-dom-sock-only Disable UDP/TCP transports for agentx.]) ++if test "x$enable_agentx_dom_sock_only" = "xyes"; then ++ AC_DEFINE(NETSNMP_AGENTX_DOM_SOCK_ONLY, 1, ++ [define if agentx transport is to use domain sockets only]) ++fi + + NETSNMP_ARG_ENABLE(snmptrapd-subagent, + [ --disable-snmptrapd-subagent Disable agentx subagent code in snmptrapd.]) diff --git a/patches/net-snmp-5.7.3/autogen.sh b/patches/net-snmp-5.7.3/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/net-snmp-5.7.3/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/net-snmp-5.7.3/series b/patches/net-snmp-5.7.3/series new file mode 100644 index 000000000..ddf3dbc34 --- /dev/null +++ b/patches/net-snmp-5.7.3/series @@ -0,0 +1,7 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:upstream --start-number 1 +#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 +# 1f82ffbca883f30fa71dcd5f51d85e41 - git-ptx-patches magic |