summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-02-17 14:13:36 +0100
committerWolfram Sang <w.sang@pengutronix.de>2011-02-17 14:13:36 +0100
commitec53dfabe7d407689d633d96218fafbc07b345f0 (patch)
tree223f7b50ca3af79f0587d66c48fd09f73ed5b775 /patches
parent9251ffe202e498a7efd91c86c7a17efb98822d79 (diff)
downloadptxdist-ec53dfabe7d407689d633d96218fafbc07b345f0.tar.gz
ptxdist-ec53dfabe7d407689d633d96218fafbc07b345f0.tar.xz
net-snmp: version bump 5.3.3 -> 5.6.1
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/net-snmp-5.3.3/series1
-rw-r--r--patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch (renamed from patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch)30
-rw-r--r--patches/net-snmp-5.6.1/series1
3 files changed, 17 insertions, 15 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