From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from moutng.kundenserver.de ([212.227.17.8]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1VHptn-0008KT-9I for ptxdist@pengutronix.de; Fri, 06 Sep 2013 08:52:08 +0200 From: Alexander Dahl Date: Fri, 6 Sep 2013 08:51:19 +0200 Message-Id: <1378450279-14811-1-git-send-email-post@lespocky.de> In-Reply-To: <1378390006-9741-2-git-send-email-post@lespocky.de> References: <1378390006-9741-2-git-send-email-post@lespocky.de> Subject: [ptxdist] [PATCH 2/3] net-snmp: version bump to 5.7.x LTS branch Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Signed-off-by: Alexander Dahl --- patches/net-snmp-5.6.1/series | 1 - .../0001-net-snmp-config-add-SYSROOT-support.patch | 28 +++++++++++--------- patches/net-snmp-5.7.2/series | 4 +++ rules/net-snmp.in | 2 -- rules/net-snmp.make | 4 +-- 5 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 patches/net-snmp-5.6.1/series rename patches/{net-snmp-5.6.1 => net-snmp-5.7.2}/0001-net-snmp-config-add-SYSROOT-support.patch (74%) create mode 100644 patches/net-snmp-5.7.2/series diff --git a/patches/net-snmp-5.6.1/series b/patches/net-snmp-5.6.1/series deleted file mode 100644 index 89093b4..0000000 --- a/patches/net-snmp-5.6.1/series +++ /dev/null @@ -1 +0,0 @@ -0001-net-snmp-config-add-SYSROOT-support.patch -p0 diff --git a/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch similarity index 74% rename from patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch rename to patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch index 4ddf848..9c46268 100644 --- a/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch +++ b/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch @@ -1,4 +1,3 @@ -From 2ffcbd9a46108c837b8f5c577a71de4160007678 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sun, 10 Jan 2010 00:33:45 +0100 Subject: [PATCH] net-snmp-config; add SYSROOT support @@ -9,24 +8,27 @@ Adapted to 5.6.1 Signed-off-by: Wolfram Sang +Adapted to 5.7.2 + +Signed-off-by: Alexander Dahl --- net-snmp-config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -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@" +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_LIBS="@LIBS@" - NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@" - NSC_PREFIX=$prefix -@@ -127,10 +127,10 @@ else + + NSC_SNMPLIBS="-lnetsnmp ${NSC_LNETSNMPLIBS}" + NSC_SUBAGENTLIBS="-lnetsnmpagent ${NSC_LAGENTLIBS} ${NSC_SNMPLIBS}" +@@ -138,10 +138,10 @@ else ;; #################################################### compile --base-cflags) @@ -39,7 +41,7 @@ Index: net-snmp-config.in ;; --srcdir) echo $NSC_SRCDIR -@@ -588,7 +588,7 @@ EOF +@@ -598,7 +598,7 @@ EOF echo "Ack. Can't create $tmpfile." exit 1 fi diff --git a/patches/net-snmp-5.7.2/series b/patches/net-snmp-5.7.2/series new file mode 100644 index 0000000..bc12d06 --- /dev/null +++ b/patches/net-snmp-5.7.2/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-net-snmp-config-add-SYSROOT-support.patch +# c0c32590b398be9cff8f7a3d62d3efe4 - git-ptx-patches magic diff --git a/rules/net-snmp.in b/rules/net-snmp.in index 6205a19..10dbab0 100644 --- a/rules/net-snmp.in +++ b/rules/net-snmp.in @@ -6,8 +6,6 @@ menuconfig NET_SNMP select GCCLIBS_GCC_S if NET_SNMP_AGENT select LIBC_DL if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS select LIBNL if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS - select NET_SNMP_MD5 -# ^ build fix for 5.6.1 (see http://sourceforge.net/tracker/index.php?func=detail&aid=3184697&group_id=12694&atid=112694) if NET_SNMP diff --git a/rules/net-snmp.make b/rules/net-snmp.make index 4151d2b..dfc0ff6 100644 --- a/rules/net-snmp.make +++ b/rules/net-snmp.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp # # Paths and names # -NET_SNMP_VERSION := 5.6.1 -NET_SNMP_MD5 := b4e30ead5783b0bb1d280172c6095ea4 +NET_SNMP_VERSION := 5.7.2 +NET_SNMP_MD5 := 5bddd02e2f82b62daa79f82717737a14 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)) -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de