Re: [ptxdist] [PATCH v2] openvpn: Upgrade to 2.5.6; resend Patch with tabs

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

On Fri, Jun 10, 2022 at 10:46:34AM +0200, Andreas Helmcke wrote:
> openvpn: Upgrade to 2.5.6
> 
> Version bump 2.4.6 -> 2.5.6
> For an overview of changes see: https://github.com/OpenVPN/openvpn/blob/v2.5.6/Changes.rst
> 
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> ---
> V2: resent patch with proper formatting (tabs)

The patch applies now, but my build tests report changes to the license
file. Please update OPENVPN_LICENSE_FILES and add a comment about the
changes to the commit message.

In the future, please use "ptxdist licensecheck <package>" before
submitting patches that may cause changes here.

Michael

> 
>  rules/openvpn.make | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 46cca64ca..8713b7d7d 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
>  #
>  # Paths and names
>  #
> -OPENVPN_VERSION		:= 2.4.6
> -OPENVPN_MD5		:= 3a1f3f63bdaede443b4df49957df9405
> +OPENVPN_VERSION		:= 2.5.6
> +OPENVPN_MD5		:= 434f02d3b371bf1dcd1e618e56969a4c
>  OPENVPN			:= openvpn-$(OPENVPN_VERSION)
> -OPENVPN_SUFFIX		:= tar.xz
> -OPENVPN_URL		:= http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
> +OPENVPN_SUFFIX		:= tar.gz
> +OPENVPN_URL		:= https://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
>  OPENVPN_SOURCE		:= $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
>  OPENVPN_DIR		:= $(BUILDDIR)/$(OPENVPN)
>  OPENVPN_LICENSE		:= GPL-2.0-only WITH openvpn-openssl-exception AND BSD-2-Clause AND BSD-3-Clause
> @@ -55,10 +55,8 @@ OPENVPN_CONF_OPT	:= \
>  	--$(call ptx/endis, PTXCONF_OPENVPN_LZO)-lzo \
>  	--disable-lz4 \
>  	--disable-comp-stub \
> -	--enable-crypto \
>  	--enable-ofb-cfb \
>  	--disable-x509-alt-username \
> -	--enable-server \
>  	--disable-plugins \
>  	--enable-management \
>  	--disable-pkcs11 \
> @@ -72,6 +70,7 @@ OPENVPN_CONF_OPT	:= \
>  	--enable-pf \
>  	--disable-plugin-auth-pam \
>  	--enable-plugin-down-root \
> +	--disable-pam-dlopen \
>  	--disable-strict \
>  	--disable-pedantic \
>  	--disable-werror \
> -- 
> 2.34.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |