Re: [ptxdist] [APPLIED] net-snmp: version bump 5.9 -> 5.9.1

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 7a13a9174d1d92f8d9c70dfb9d35a36ff632eb9a.

Michael

[sent from post-receive hook]

On Fri, 29 Jul 2022 08:23:20 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Bugfixes. Released last year already.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220630150003.27426-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/net-snmp-5.9/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
> similarity index 90%
> rename from patches/net-snmp-5.9/0001-net-snmp-config-add-SYSROOT-support.patch
> rename to patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
> index e1c88ae10530..8995a6ea21d0 100644
> --- a/patches/net-snmp-5.9/0001-net-snmp-config-add-SYSROOT-support.patch
> +++ b/patches/net-snmp-5.9.1/0001-net-snmp-config-add-SYSROOT-support.patch
> @@ -16,10 +16,10 @@ Signed-off-by: Alexander Dahl <post@lespocky.de>
>   1 file changed, 4 insertions(+), 4 deletions(-)
>  
>  diff --git a/net-snmp-config.in b/net-snmp-config.in
> -index a412412118af..eb7bd0921fd6 100644
> +index 6b5abf8f838a..366d648dfb19 100644
>  --- a/net-snmp-config.in
>  +++ b/net-snmp-config.in
> -@@ -54,7 +54,7 @@ NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
> +@@ -57,7 +57,7 @@ NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
>   NSC_LMIBLIBS="@LMIBLIBS@"
>   
>   NSC_INCLUDEDIR=${includedir}
> @@ -28,7 +28,7 @@ index a412412118af..eb7bd0921fd6 100644
>   
>   NSC_SNMPLIBS="-lnetsnmp ${NSC_LNETSNMPLIBS}"
>   NSC_SUBAGENTLIBS="-lnetsnmpagent ${NSC_LAGENTLIBS} ${NSC_SNMPLIBS}"
> -@@ -140,10 +140,10 @@ else
> +@@ -143,10 +143,10 @@ else
>         ;;
>       #################################################### compile
>       --base-cflags)
> @@ -41,12 +41,12 @@ index a412412118af..eb7bd0921fd6 100644
>         ;;
>       --srcdir)
>         echo $NSC_SRCDIR
> -@@ -657,7 +657,7 @@ EOF
> +@@ -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"
> -       `$cmd`
> +       echo `$cmd`
>         result=$?
> diff --git a/patches/net-snmp-5.9/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch b/patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> similarity index 93%
> rename from patches/net-snmp-5.9/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> rename to patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> index 4b7338c71cde..bf0b88a82509 100644
> --- a/patches/net-snmp-5.9/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> +++ b/patches/net-snmp-5.9.1/0002-Don-t-disable-udp-and-tcp-when-disable-agentx-dom-so.patch
> @@ -17,10 +17,10 @@ semantic.
>   1 file changed, 5 insertions(+), 3 deletions(-)
>  
>  diff --git a/configure.d/config_project_with_enable b/configure.d/config_project_with_enable
> -index daa0ccc0fbbc..fd7feba777b4 100644
> +index cdf56deb69dc..37d6ed1d6984 100644
>  --- a/configure.d/config_project_with_enable
>  +++ b/configure.d/config_project_with_enable
> -@@ -777,9 +777,11 @@ NETSNMP_ARG_ENABLE(local-smux,
> +@@ -771,9 +771,11 @@ NETSNMP_ARG_ENABLE(local-smux,
>       fi])
>   
>   NETSNMP_ARG_ENABLE(agentx-dom-sock-only,
> diff --git a/patches/net-snmp-5.9/autogen.sh b/patches/net-snmp-5.9.1/autogen.sh
> similarity index 100%
> rename from patches/net-snmp-5.9/autogen.sh
> rename to patches/net-snmp-5.9.1/autogen.sh
> diff --git a/patches/net-snmp-5.9/series b/patches/net-snmp-5.9.1/series
> similarity index 100%
> rename from patches/net-snmp-5.9/series
> rename to patches/net-snmp-5.9.1/series
> diff --git a/rules/net-snmp.make b/rules/net-snmp.make
> index 6bea8c8c225b..1a57da3a35fe 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
> -NET_SNMP_MD5		:= 382da80138897f294299badf9c62c699
> +NET_SNMP_VERSION	:= 5.9.1
> +NET_SNMP_MD5		:= e5ee202dfb15000342354d64f1837d19
>  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))