net-snmp: version bump 5.3.3 -> 5.6.1

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

5 files changed, 24 insertions, 18 deletions

diff --git a/patches/net-snmp-5.3.3/series b/patches/net-snmp-5.3.3/series
deleted file mode 100644
index d1c36f1a7..000000000
--- a/patches/net-snmp-5.3.3/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-net-snmp-config-add-SYSROOT-support.patch
diff --git a/patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
index a1a538511..4ddf84826 100644
--- a/patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch
+++ b/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
@@ -4,24 +4,29 @@ 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>
+
 ---
  net-snmp-config.in |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/net-snmp-config.in b/net-snmp-config.in
-index fee15be..50cece9 100755
---- a/net-snmp-config.in
-+++ b/net-snmp-config.in
-@@ -33,7 +33,7 @@ includedir=@includedir@
- libdir=@libdir@
+Index: net-snmp-config.in
+===================================================================
+--- net-snmp-config.in.orig
++++ net-snmp-config.in
+@@ -49,7 +49,7 @@ datarootdir=@datarootdir@
  NSC_LDFLAGS="@LDFLAGS@"
+ NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
  NSC_INCLUDEDIR=${includedir}
 -NSC_LIBDIR=-L${libdir}
 +NSC_LIBDIR=-L${SYSROOT}${libdir}
- NSC_LIBS="@LIBS@ @WRAPLIBS@"
- NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@ @PERLLDOPTS@"
+ NSC_LIBS="@LIBS@"
+ NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
  NSC_PREFIX=$prefix
-@@ -105,10 +105,10 @@ else
+@@ -127,10 +127,10 @@ else
        ;;
      #################################################### compile
      --base-cflags)
@@ -34,7 +39,7 @@ index fee15be..50cece9 100755
        ;;
      --srcdir)
        echo $NSC_SRCDIR
-@@ -473,7 +473,7 @@ EOF
+@@ -588,7 +588,7 @@ EOF
          echo "Ack.  Can't create $tmpfile."
  	exit 1
        fi
@@ -43,6 +48,3 @@ index fee15be..50cece9 100755
        echo "running: $cmd"
        `$cmd`
        if test "x$norm" != "x1" ; then
--- 
-1.6.6
-
diff --git a/patches/net-snmp-5.6.1/series b/patches/net-snmp-5.6.1/series
new file mode 100644
index 000000000..89093b4f3
--- /dev/null
+++ b/patches/net-snmp-5.6.1/series
@@ -0,0 +1 @@
+0001-net-snmp-config-add-SYSROOT-support.patch -p0
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index c6e82e187..9b33f92d6 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -5,6 +5,8 @@ menuconfig NET_SNMP
 	select LIBC_M
 	select GCCLIBS_GCC_S if NET_SNMP_AGENT
 	select LIBC_DL if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
+	select NET_SNMP_MD5
+#	^ build fix for 5.6.1
 
 if NET_SNMP
 
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index c863a049e..4104887cb 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
 #
 # Paths and names
 #
-NET_SNMP_VERSION	:= 5.3.3
+NET_SNMP_VERSION	:= 5.6.1
 NET_SNMP		:= net-snmp-$(NET_SNMP_VERSION)
 NET_SNMP_SUFFIX		:= tar.gz
 NET_SNMP_URL		:= $(PTXCONF_SETUP_SFMIRROR)/net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX)
@@ -55,6 +55,8 @@ NET_SNMP_AUTOCONF := \
 	--with-persistent-directory=$(call remove_quotes,$(PTXCONF_NET_SNMP_PERSISTENT_DIR)) \
 	--with-default-snmp-version=$(call remove_quotes,$(PTXCONF_NET_SNMP_DEFAULT_VERSION)) \
 	--enable-shared \
+	--disable-embedded-perl \
+	--without-perl-modules \
 	--disable-static
 
 ifdef PTXCONF_ENDIAN_LITTLE
@@ -211,8 +213,8 @@ NET_SNMP_MAKE_PAR := NO
 # Target-Install
 # ----------------------------------------------------------------------------
 
-NET_SNMP_LIBMAJOR := 10
-NET_SNMP_LIBMINOR := 0.5
+NET_SNMP_LIBMAJOR := 25
+NET_SNMP_LIBMINOR := 0.1
 NET_SNMP_LIBVER :=$(NET_SNMP_LIBMAJOR).$(NET_SNMP_LIBMINOR)
 
 NET_SNMP_V1MIBS := RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt