* [ptxdist] [PATCH] net-snmp: Version bump 5.9.1 -> 5.9.4
@ 2024-07-19 8:00 Lars Pedersen
2024-08-05 6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Lars Pedersen @ 2024-07-19 8:00 UTC (permalink / raw)
To: ptxdist; +Cc: Lars Pedersen
* Removed sysroot patch. Now seems to work fine without it
* Enabled parallel building, since --disable-minimalist is set
>From net-snmp project ci/build.sh file:
Net-SNMP uses static dependencies, the Makefile.depend files have
been generated for MODE=regular, net-snmp-features.h includes
<net-snmp/library/features.h> in minimalist mode and that file is
generated dynamically and is not in Makefile.depend. Hence disable
parallel compilation for minimalist mode.
Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
---
...-net-snmp-config-add-SYSROOT-support.patch | 52 -------------------
patches/net-snmp-5.9.1/series | 5 --
...-and-tcp-when-disable-agentx-dom-so.patch} | 0
.../autogen.sh | 0
patches/net-snmp-5.9.4/series | 4 ++
rules/net-snmp.make | 6 +--
6 files changed, 6 insertions(+), 61 deletions(-)
delete mode 100644 patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
delete mode 100644 patches/net-snmp-5.9.1/series
rename patches/{net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch => net-snmp-5.9.4/0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch} (100%)
rename patches/{net-snmp-5.9.1 => net-snmp-5.9.4}/autogen.sh (100%)
create mode 100644 patches/net-snmp-5.9.4/series
diff --git a/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
deleted file mode 100644
index 8995a6ea2..000000000
--- a/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 6b5abf8f838a..366d648dfb19 100644
---- a/net-snmp-config.in
-+++ b/net-snmp-config.in
-@@ -57,7 +57,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}"
-@@ -143,10 +143,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
-@@ -660,7 +660,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"
- echo `$cmd`
- result=$?
diff --git a/patches/net-snmp-5.9.1/series b/patches/net-snmp-5.9.1/series
deleted file mode 100644
index 1596362e4..000000000
--- a/patches/net-snmp-5.9.1/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-net-snmp-config-add-SYSROOT-support.patch
-0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
-# 97810382623b86e69e492f3a5712bcf4 - git-ptx-patches magic
diff --git a/patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch b/patches/net-snmp-5.9.4/0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
similarity index 100%
rename from patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
rename to patches/net-snmp-5.9.4/0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
diff --git a/patches/net-snmp-5.9.1/autogen.sh b/patches/net-snmp-5.9.4/autogen.sh
similarity index 100%
rename from patches/net-snmp-5.9.1/autogen.sh
rename to patches/net-snmp-5.9.4/autogen.sh
diff --git a/patches/net-snmp-5.9.4/series b/patches/net-snmp-5.9.4/series
new file mode 100644
index 000000000..50f3e9b73
--- /dev/null
+++ b/patches/net-snmp-5.9.4/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
+# b1db2da68fc49d98e70f533e3bf34909 - git-ptx-patches magic
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 5c5463a56..e8b309f4c 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
#
# Paths and names
#
-NET_SNMP_VERSION := 5.9.1
-NET_SNMP_MD5 := e5ee202dfb15000342354d64f1837d19
+NET_SNMP_VERSION := 5.9.4
+NET_SNMP_MD5 := 395f7988f1ee4fd9b61eebbbb0961245
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))
@@ -115,8 +115,6 @@ NET_SNMP_CONF_OPT := \
--without-bzip2 \
--without-mysql
-NET_SNMP_MAKE_PAR := NO
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
--
2.45.2
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [ptxdist] [APPLIED] net-snmp: Version bump 5.9.1 -> 5.9.4
2024-07-19 8:00 [ptxdist] [PATCH] net-snmp: Version bump 5.9.1 -> 5.9.4 Lars Pedersen
@ 2024-08-05 6:49 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-08-05 6:49 UTC (permalink / raw)
To: ptxdist; +Cc: Lars Pedersen
Thanks, applied as ebbc7cc2fb5554b4136b27c56e9721e686747db9.
Michael
[sent from post-receive hook]
On Mon, 05 Aug 2024 08:49:46 +0200, Lars Pedersen <lapeddk@gmail.com> wrote:
> * Removed sysroot patch. Now seems to work fine without it
> * Enabled parallel building, since --disable-minimalist is set
>
> >From net-snmp project ci/build.sh file:
> Net-SNMP uses static dependencies, the Makefile.depend files have
> been generated for MODE=regular, net-snmp-features.h includes
> <net-snmp/library/features.h> in minimalist mode and that file is
> generated dynamically and is not in Makefile.depend. Hence disable
> parallel compilation for minimalist mode.
>
> Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> Message-Id: <20240719080021.759064-1-lapeddk@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
> deleted file mode 100644
> index 8995a6ea21d0..000000000000
> --- a/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -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 6b5abf8f838a..366d648dfb19 100644
> ---- a/net-snmp-config.in
> -+++ b/net-snmp-config.in
> -@@ -57,7 +57,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}"
> -@@ -143,10 +143,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
> -@@ -660,7 +660,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"
> - echo `$cmd`
> - result=$?
> diff --git a/patches/net-snmp-5.9.1/series b/patches/net-snmp-5.9.1/series
> deleted file mode 100644
> index 1596362e4141..000000000000
> --- a/patches/net-snmp-5.9.1/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-net-snmp-config-add-SYSROOT-support.patch
> -0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> -# 97810382623b86e69e492f3a5712bcf4 - git-ptx-patches magic
> diff --git a/patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch b/patches/net-snmp-5.9.4/0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> similarity index 100%
> rename from patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> rename to patches/net-snmp-5.9.4/0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> diff --git a/patches/net-snmp-5.9.1/autogen.sh b/patches/net-snmp-5.9.4/autogen.sh
> similarity index 100%
> rename from patches/net-snmp-5.9.1/autogen.sh
> rename to patches/net-snmp-5.9.4/autogen.sh
> diff --git a/patches/net-snmp-5.9.4/series b/patches/net-snmp-5.9.4/series
> new file mode 100644
> index 000000000000..50f3e9b730e7
> --- /dev/null
> +++ b/patches/net-snmp-5.9.4/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> +# b1db2da68fc49d98e70f533e3bf34909 - git-ptx-patches magic
> diff --git a/rules/net-snmp.make b/rules/net-snmp.make
> index 5c5463a56127..e8b309f4c1cb 100644
> --- a/rules/net-snmp.make
> +++ b/rules/net-snmp.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
> #
> # Paths and names
> #
> -NET_SNMP_VERSION := 5.9.1
> -NET_SNMP_MD5 := e5ee202dfb15000342354d64f1837d19
> +NET_SNMP_VERSION := 5.9.4
> +NET_SNMP_MD5 := 395f7988f1ee4fd9b61eebbbb0961245
> 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))
> @@ -115,8 +115,6 @@ NET_SNMP_CONF_OPT := \
> --without-bzip2 \
> --without-mysql
>
> -NET_SNMP_MAKE_PAR := NO
> -
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-05 6:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-19 8:00 [ptxdist] [PATCH] net-snmp: Version bump 5.9.1 -> 5.9.4 Lars Pedersen
2024-08-05 6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox