mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] openvpn: Upgrade to 2.5.6
@ 2022-05-30 17:00 Andreas Helmcke
  2022-06-10  6:58 ` Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Andreas Helmcke @ 2022-05-30 17:00 UTC (permalink / raw)
  To: ptxdist

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>
---
  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



^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] openvpn: Upgrade to 2.5.6
  2022-05-30 17:00 [ptxdist] [PATCH] openvpn: Upgrade to 2.5.6 Andreas Helmcke
@ 2022-06-10  6:58 ` Michael Olbrich
  2022-06-10  8:46   ` [ptxdist] [PATCH v2] openvpn: Upgrade to 2.5.6; resend Patch with tabs Andreas Helmcke
  0 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2022-06-10  6:58 UTC (permalink / raw)
  To: Andreas Helmcke; +Cc: ptxdist

On Mon, May 30, 2022 at 07:00:42PM +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>
> ---
>  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

This patch does not apply. All tabs where replaced by spaces at some point.
Please send it again. Maybe as attachment if your mail server is
responsible for this.

Michael

> -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 |



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [ptxdist] [PATCH v2] openvpn: Upgrade to 2.5.6; resend Patch with tabs
  2022-06-10  6:58 ` Michael Olbrich
@ 2022-06-10  8:46   ` Andreas Helmcke
  2022-06-10 20:34     ` Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Andreas Helmcke @ 2022-06-10  8:46 UTC (permalink / raw)
  To: ptxdist

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)

 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



^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH v2] openvpn: Upgrade to 2.5.6; resend Patch with tabs
  2022-06-10  8:46   ` [ptxdist] [PATCH v2] openvpn: Upgrade to 2.5.6; resend Patch with tabs Andreas Helmcke
@ 2022-06-10 20:34     ` Michael Olbrich
  2022-06-13 16:51       ` [ptxdist] [PATCH v3] openvpn: Upgrade to 2.5.6 Andreas Helmcke
  0 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2022-06-10 20:34 UTC (permalink / raw)
  To: Andreas Helmcke; +Cc: ptxdist

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 |



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [ptxdist] [PATCH v3] openvpn: Upgrade to 2.5.6
  2022-06-10 20:34     ` Michael Olbrich
@ 2022-06-13 16:51       ` Andreas Helmcke
  2022-06-17  8:44         ` Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Andreas Helmcke @ 2022-06-13 16:51 UTC (permalink / raw)
  To: ptxdist

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>
---
Patch changes:
	
-> V3: Update licenses files md5
       Only formal changes to licenses: update of copyright to 2022 and company name change
-> V2: resent patch with proper formatting (tabs)


 rules/openvpn.make | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/rules/openvpn.make b/rules/openvpn.make
index 46cca64ca..f77776ade 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -14,20 +14,20 @@ 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
 OPENVPN_LICENSE_FILES := \
-	file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
+	file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89 \
 	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
-	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=0f37ee042b428e513bda42b430344d42 \
+	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=82f794c2390084d34cb32d871c17b4be \
 	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
-	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
+	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5163f975ae122fe0c260002537edab22
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -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




^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH v3] openvpn: Upgrade to 2.5.6
  2022-06-13 16:51       ` [ptxdist] [PATCH v3] openvpn: Upgrade to 2.5.6 Andreas Helmcke
@ 2022-06-17  8:44         ` Michael Olbrich
  2022-06-17  9:09           ` [ptxdist] [PATCH v4] " Andreas Helmcke
  0 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2022-06-17  8:44 UTC (permalink / raw)
  To: Andreas Helmcke; +Cc: ptxdist

On Mon, Jun 13, 2022 at 06:51:41PM +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>
> ---
> Patch changes:
> 	
> -> V3: Update licenses files md5
>        Only formal changes to licenses: update of copyright to 2022 and company name change
> -> V2: resent patch with proper formatting (tabs)

Fails with:

"
No suitable file '/usr/share/openvpn/sample-config-files/static-home.conf' could be found in any of these locations:
"

OPENVPN_INSTALL_SAMPLE_CONFIG_FILES and maybe
OPENVPN_INSTALL_SAMPLE_CONFIG_SCRIPTS and OPENVPN_INSTALL_SAMPLE_SCRIPTS
need to be updated.

Michael

>  rules/openvpn.make | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 46cca64ca..f77776ade 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -14,20 +14,20 @@ 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
>  OPENVPN_LICENSE_FILES := \
> -	file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
> +	file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89 \
>  	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
> -	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=0f37ee042b428e513bda42b430344d42 \
> +	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=82f794c2390084d34cb32d871c17b4be \
>  	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
> -	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
> +	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5163f975ae122fe0c260002537edab22
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -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 |



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [ptxdist] [PATCH v4] openvpn: Upgrade to 2.5.6
  2022-06-17  8:44         ` Michael Olbrich
@ 2022-06-17  9:09           ` Andreas Helmcke
  2022-06-20  6:19             ` [ptxdist] [APPLIED] openvpn: Version bump 2.4.6 -> 2.5.6 Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Andreas Helmcke @ 2022-06-17  9:09 UTC (permalink / raw)
  To: ptxdist

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>
---
Patch changes:

-> V4: Update list of sample files to install	
-> V3: Update licenses files md5
       Only formal changes to licenses: update of copyright to 2022 and company name change
-> V2: resent patch with proper formatting (tabs)


 rules/openvpn.make | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/rules/openvpn.make b/rules/openvpn.make
index 46cca64ca..09dbe0cf6 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -14,20 +14,20 @@ 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
 OPENVPN_LICENSE_FILES := \
-	file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
+	file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89 \
 	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
-	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=0f37ee042b428e513bda42b430344d42 \
+	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=82f794c2390084d34cb32d871c17b4be \
 	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
-	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
+	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5163f975ae122fe0c260002537edab22
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -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 \
@@ -83,13 +82,13 @@ OPENVPN_CONF_OPT	:= \
 
 OPENVPN_INSTALL_SAMPLE_CONFIG_FILES := \
 	client.conf loopback-client loopback-server README server.conf \
-	static-home.conf static-office.conf tls-home.conf tls-office.conf \
-	xinetd-client-config xinetd-server-config
+	tls-home.conf tls-office.conf xinetd-client-config xinetd-server-config
 
 OPENVPN_INSTALL_SAMPLE_CONFIG_SCRIPTS := \
 	firewall.sh home.up office.up openvpn-shutdown.sh openvpn-startup.sh
 
-OPENVPN_INSTALL_SAMPLE_SCRIPTS := bridge-start bridge-stop
+OPENVPN_INSTALL_SAMPLE_SCRIPTS := auth-pam.pl bridge-start bridge-stop ucn.pl \
+	verify-cn
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.34.1





^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [APPLIED] openvpn: Version bump 2.4.6 -> 2.5.6
  2022-06-17  9:09           ` [ptxdist] [PATCH v4] " Andreas Helmcke
@ 2022-06-20  6:19             ` Michael Olbrich
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2022-06-20  6:19 UTC (permalink / raw)
  To: ptxdist; +Cc: Andreas Helmcke

Thanks, applied as a4b34e85cf37c26fd81c1e271685e435c8871f1c.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:19:53 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> For an overview of changes see: https://github.com/OpenVPN/openvpn/blob/v2.5.6/Changes.rst
> 
> Only formal changes to licenses: update of copyright to 2022 and company name change
> 
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <1ac47761-b597-e142-f9a2-4425a9b77ccf@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 46cca64ca702..09dbe0cf6ea4 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -14,20 +14,20 @@ 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
>  OPENVPN_LICENSE_FILES := \
> -	file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
> +	file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89 \
>  	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
> -	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=0f37ee042b428e513bda42b430344d42 \
> +	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=82f794c2390084d34cb32d871c17b4be \
>  	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
> -	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
> +	file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5163f975ae122fe0c260002537edab22
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -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 \
> @@ -83,13 +82,13 @@ OPENVPN_CONF_OPT	:= \
>  
>  OPENVPN_INSTALL_SAMPLE_CONFIG_FILES := \
>  	client.conf loopback-client loopback-server README server.conf \
> -	static-home.conf static-office.conf tls-home.conf tls-office.conf \
> -	xinetd-client-config xinetd-server-config
> +	tls-home.conf tls-office.conf xinetd-client-config xinetd-server-config
>  
>  OPENVPN_INSTALL_SAMPLE_CONFIG_SCRIPTS := \
>  	firewall.sh home.up office.up openvpn-shutdown.sh openvpn-startup.sh
>  
> -OPENVPN_INSTALL_SAMPLE_SCRIPTS := bridge-start bridge-stop
> +OPENVPN_INSTALL_SAMPLE_SCRIPTS := auth-pam.pl bridge-start bridge-stop ucn.pl \
> +	verify-cn
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install



^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-06-20  6:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-30 17:00 [ptxdist] [PATCH] openvpn: Upgrade to 2.5.6 Andreas Helmcke
2022-06-10  6:58 ` Michael Olbrich
2022-06-10  8:46   ` [ptxdist] [PATCH v2] openvpn: Upgrade to 2.5.6; resend Patch with tabs Andreas Helmcke
2022-06-10 20:34     ` Michael Olbrich
2022-06-13 16:51       ` [ptxdist] [PATCH v3] openvpn: Upgrade to 2.5.6 Andreas Helmcke
2022-06-17  8:44         ` Michael Olbrich
2022-06-17  9:09           ` [ptxdist] [PATCH v4] " Andreas Helmcke
2022-06-20  6:19             ` [ptxdist] [APPLIED] openvpn: Version bump 2.4.6 -> 2.5.6 Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox