Also add the possibility to add a daemon configuration. Signed-off-by: Wolfram Sang <[email protected]> --- .../0001-net-snmp-config-add-SYSROOT-support.patch | 48 ------------------- patches/net-snmp-5.3.3/series | 1 - .../0001-net-snmp-config-add-SYSROOT-support.patch | 50 ++++++++++++++++++++ patches/net-snmp-5.6.1/series | 1 + rules/net-snmp.in | 26 ++++++++++ rules/net-snmp.make | 16 +++++- 6 files changed, 90 insertions(+), 52 deletions(-) delete mode 100644 patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch delete mode 100644 patches/net-snmp-5.3.3/series create mode 100644 patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch create mode 100644 patches/net-snmp-5.6.1/series
diff --git a/patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch deleted file mode 100644 index a1a5385..0000000 --- a/patches/net-snmp-5.3.3/0001-net-snmp-config-add-SYSROOT-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2ffcbd9a46108c837b8f5c577a71de4160007678 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <[email protected]> -Date: Sun, 10 Jan 2010 00:33:45 +0100 -Subject: [PATCH] net-snmp-config; add SYSROOT support - -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - net-snmp-config.in | 8 ++++---- - 1 files 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@ - NSC_LDFLAGS="@LDFLAGS@" - NSC_INCLUDEDIR=${includedir} --NSC_LIBDIR=-L${libdir} -+NSC_LIBDIR=-L${SYSROOT}${libdir} - NSC_LIBS="@LIBS@ @WRAPLIBS@" - NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@ @PERLLDOPTS@" - NSC_PREFIX=$prefix -@@ -105,10 +105,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 -@@ -473,7 +473,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 --- -1.6.6 - diff --git a/patches/net-snmp-5.3.3/series b/patches/net-snmp-5.3.3/series deleted file mode 100644 index d1c36f1..0000000 --- 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.6.1/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch new file mode 100644 index 0000000..4ddf848 --- /dev/null +++ b/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch @@ -0,0 +1,50 @@ +From 2ffcbd9a46108c837b8f5c577a71de4160007678 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <[email protected]> +Date: Sun, 10 Jan 2010 00:33:45 +0100 +Subject: [PATCH] net-snmp-config; add SYSROOT support + +Signed-off-by: Marc Kleine-Budde <[email protected]> + +Adapted to 5.6.1 + +Signed-off-by: Wolfram Sang <[email protected]> + +--- + 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@" + 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 + ;; + #################################################### 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 +@@ -588,7 +588,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.6.1/series b/patches/net-snmp-5.6.1/series new file mode 100644 index 0000000..89093b4 --- /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 c6e82e1..ff49d90 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 @@ -17,6 +19,30 @@ config NET_SNMP_AGENT bool prompt "agent (snmpd)" +choice + prompt "Which daemon-configuration (snmpd.conf) to install" + default NET_SNMP_AGENT_EXAMPLE_SNMPD_CONF + depends on NET_SNMP_AGENT + + config NET_SNMP_AGENT_NO_SNMPD_CONF + bool + prompt "No snmpd.conf" + help + Install no /etc/snmp/snmpd.conf. + + config NET_SNMP_AGENT_EXAMPLE_SNMPD_CONF + bool + prompt "Example snmpd.conf" + help + Install example snmpd.conf from the source package. + + config NET_SNMP_AGENT_CUSTOM_SNMPD_CONF + bool + prompt "Custom snmpd.conf" + help + Install custom /etc/snmp/snmpd.conf from projectroot. +endchoice + config NET_SNMP_APPLICATIONS bool prompt "apps (snmpget, ...)" diff --git a/rules/net-snmp.make b/rules/net-snmp.make index c863a04..025bcb4 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 @@ -272,6 +274,14 @@ ifdef PTXCONF_NET_SNMP_AGENT # agent helper libs @$(call install_lib, net-snmp, 0, 0, 0644, libnetsnmphelpers) + +ifdef PTXCONF_NET_SNMP_AGENT_EXAMPLE_SNMPD_CONF + @$(call install_copy, net-snmp, 0, 0, 0644, $(NET_SNMP_DIR)/EXAMPLE.conf, /etc/snmp/snmpd.conf) +endif + +ifdef PTXCONF_NET_SNMP_AGENT_CUSTOM_SNMPD_CONF + @$(call install_alternative, net-snmp, 0, 0, 0644, /etc/snmp/snmpd.conf) +endif endif ifdef PTXCONF_NET_SNMP_APPLICATIONS -- 1.7.2.3 -- ptxdist mailing list [email protected]
