mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCHv2] net-snmp: version bump to 5.7.3 LTS
@ 2015-07-02 13:56 Oliver Graute
  2015-07-02 14:01 ` Marc Kleine-Budde
  0 siblings, 1 reply; 6+ messages in thread
From: Oliver Graute @ 2015-07-02 13:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Oliver Graute

Version bump to net-snmp version 5.7.3

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 .../0200-net-snmp-config-add-SYSROOT-support.patch |   52 ++++++++++++++++++++
 ...le-udp-and-tcp-when-disable-agentx-dom-so.patch |   37 ++++++++++++++
 patches/net-snmp-5.7.3/autogen.sh                  |    1 +
 patches/net-snmp-5.7.3/series                      |    7 +++
 rules/net-snmp.make                                |    5 +-
 5 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 patches/net-snmp-5.7.3/0200-net-snmp-config-add-SYSROOT-support.patch
 create mode 100644 patches/net-snmp-5.7.3/0201-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
 create mode 120000 patches/net-snmp-5.7.3/autogen.sh
 create mode 100644 patches/net-snmp-5.7.3/series

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 0000000..9c46268
--- /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 2300fe1..361c658 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 0000000..fb7be8c
--- /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 61ba026..d7c2132 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 0000000..9f8a4cb
--- /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 0000000..82bf61c
--- /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
+# eda93cf4517290230962af7514bfd246  - git-ptx-patches magic
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 0b7fbf1..fd65659 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -18,13 +18,14 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
 #
 # Paths and names
 #
-NET_SNMP_VERSION	:= 5.7.2
-NET_SNMP_MD5		:= 5bddd02e2f82b62daa79f82717737a14
+NET_SNMP_VERSION	:= 5.7.3
+NET_SNMP_MD5		:= d4a3459e1577d0efa8d96ca70a885e53
 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))
 NET_SNMP_SOURCE		:= $(SRCDIR)/$(NET_SNMP).$(NET_SNMP_SUFFIX)
 NET_SNMP_DIR		:= $(BUILDDIR)/$(NET_SNMP)
+NET_LICENSE		:= BSD like
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-03 10:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-02 13:56 [ptxdist] [PATCHv2] net-snmp: version bump to 5.7.3 LTS Oliver Graute
2015-07-02 14:01 ` Marc Kleine-Budde
2015-07-02 14:08   ` [ptxdist] Antwort: " Oliver.Graute
2015-07-02 14:43     ` Michael Olbrich
2015-07-02 14:45     ` Alexander Dahl
2015-07-03 12:24       ` [ptxdist] Antwort: " Oliver.Graute

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox