From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Aug 2024 08:55:37 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sard3-006PCe-0g for lore@lore.pengutronix.de; Mon, 05 Aug 2024 08:55:37 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sard2-0000l1-4Q; Mon, 05 Aug 2024 08:55:36 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sarXP-0003od-4n; Mon, 05 Aug 2024 08:49:47 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sarXO-004eBi-Nu; Mon, 05 Aug 2024 08:49:46 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sarXO-003jga-2E; Mon, 05 Aug 2024 08:49:46 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 5 Aug 2024 08:49:46 +0200 Message-Id: <20240805064946.890593-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240719080021.759064-1-lapeddk@gmail.com> References: <20240719080021.759064-1-lapeddk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] net-snmp: Version bump 5.9.1 -> 5.9.4 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lars Pedersen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as ebbc7cc2fb5554b4136b27c56e9721e686747db9. Michael [sent from post-receive hook] On Mon, 05 Aug 2024 08:49:46 +0200, Lars Pedersen 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 > 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 > Message-Id: <20240719080021.759064-1-lapeddk@gmail.com> > Signed-off-by: Michael Olbrich > > 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 > -Date: Sun, 10 Jan 2010 00:33:45 +0100 > -Subject: [PATCH] net-snmp-config; add SYSROOT support > - > -Signed-off-by: Marc Kleine-Budde > - > -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(-) > - > -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 > # ----------------------------------------------------------------------------