mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] openvpn: Version bump, 2.6.9 -> 2.6.11
@ 2024-06-24 16:36 Andreas Helmcke
  2024-06-26 16:18 ` Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: Andreas Helmcke @ 2024-06-24 16:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Andreas Helmcke

various bugfixes, including various CVE releated

License: update copyright notices to 2024

Link: https://github.com/OpenVPN/openvpn/releases/tag/v2.6.11
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
 rules/openvpn.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/openvpn.make b/rules/openvpn.make
index 0c56028fc..66e7f5641 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
 #
 # Paths and names
 #
-OPENVPN_VERSION		:= 2.6.9
-OPENVPN_MD5		:= e5beda906a40e997e26766f0de09ecbf
+OPENVPN_VERSION		:= 2.6.11
+OPENVPN_MD5		:= 467b270c54955681add7f253aa03fc5a
 OPENVPN			:= openvpn-$(OPENVPN_VERSION)
 OPENVPN_SUFFIX		:= tar.gz
 OPENVPN_URL		:= https://github.com/OpenVPN/openvpn/releases/download/v$(OPENVPN_VERSION)/$(OPENVPN).$(OPENVPN_SUFFIX)
@@ -23,9 +23,9 @@ OPENVPN_SOURCE		:= $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
 OPENVPN_DIR		:= $(BUILDDIR)/$(OPENVPN)
 OPENVPN_LICENSE		:= GPL-2.0-only WITH (openvpn-openssl-exception AND custom-exception) AND BSD-2-Clause AND BSD-3-Clause AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT)
 OPENVPN_LICENSE_FILES := \
-	file://COPYING;md5=4b34e946059f80dcfd811e8dd471b5ed \
+	file://COPYING;md5=89196bacc47ed37a5b242a535661a049 \
 	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
-	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=b9fb1976bc6d8ad5e02a251351dc58f2 \
+	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=80aebe6059f2989b52c49783938e7221 \
 	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
 	file://src/openvpn/ovpn_dco_linux.h;startline=1;endline=1;md5=b317f96dbe63f35baef28266acb68512 \
 	file://src/openvpn/ovpn_dco_freebsd.h;startline=1;endline=1;md5=a7ba62aad20f9685c53b0565a263af30
-- 
2.43.0




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] openvpn: Version bump, 2.6.9 -> 2.6.11
  2024-06-24 16:36 [ptxdist] [PATCH] openvpn: Version bump, 2.6.9 -> 2.6.11 Andreas Helmcke
@ 2024-06-26 16:18 ` Michael Olbrich
  2024-06-26 16:39   ` [ptxdist] [PATCH v2] " Andreas Helmcke
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2024-06-26 16:18 UTC (permalink / raw)
  To: Andreas Helmcke; +Cc: ptxdist

On Mon, Jun 24, 2024 at 06:36:03PM +0200, Andreas Helmcke wrote:
> various bugfixes, including various CVE releated
> 
> License: update copyright notices to 2024
> 
> Link: https://github.com/OpenVPN/openvpn/releases/tag/v2.6.11
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>

With all options enabled, targetinstall fails with:

No suitable file '/usr/share/openvpn/sample-config-files/tls-home.conf' could be found in any of these locations:
.../build-target/openvpn-2.6.11/sample/sample-config-files/tls-home.conf.arm-hf
.../build-target/openvpn-2.6.11/sample/sample-config-files/tls-home.conf

Michael

> ---
>  rules/openvpn.make | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 0c56028fc..66e7f5641 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
>  #
>  # Paths and names
>  #
> -OPENVPN_VERSION		:= 2.6.9
> -OPENVPN_MD5		:= e5beda906a40e997e26766f0de09ecbf
> +OPENVPN_VERSION		:= 2.6.11
> +OPENVPN_MD5		:= 467b270c54955681add7f253aa03fc5a
>  OPENVPN			:= openvpn-$(OPENVPN_VERSION)
>  OPENVPN_SUFFIX		:= tar.gz
>  OPENVPN_URL		:= https://github.com/OpenVPN/openvpn/releases/download/v$(OPENVPN_VERSION)/$(OPENVPN).$(OPENVPN_SUFFIX)
> @@ -23,9 +23,9 @@ OPENVPN_SOURCE		:= $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
>  OPENVPN_DIR		:= $(BUILDDIR)/$(OPENVPN)
>  OPENVPN_LICENSE		:= GPL-2.0-only WITH (openvpn-openssl-exception AND custom-exception) AND BSD-2-Clause AND BSD-3-Clause AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT)
>  OPENVPN_LICENSE_FILES := \
> -	file://COPYING;md5=4b34e946059f80dcfd811e8dd471b5ed \
> +	file://COPYING;md5=89196bacc47ed37a5b242a535661a049 \
>  	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
> -	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=b9fb1976bc6d8ad5e02a251351dc58f2 \
> +	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=80aebe6059f2989b52c49783938e7221 \
>  	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
>  	file://src/openvpn/ovpn_dco_linux.h;startline=1;endline=1;md5=b317f96dbe63f35baef28266acb68512 \
>  	file://src/openvpn/ovpn_dco_freebsd.h;startline=1;endline=1;md5=a7ba62aad20f9685c53b0565a263af30
> -- 
> 2.43.0
> 
> 
> 

-- 
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] 4+ messages in thread

* [ptxdist] [PATCH v2] openvpn: Version bump, 2.6.9 -> 2.6.11
  2024-06-26 16:18 ` Michael Olbrich
@ 2024-06-26 16:39   ` Andreas Helmcke
  2024-07-02 12:29     ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: Andreas Helmcke @ 2024-06-26 16:39 UTC (permalink / raw)
  To: ptxdist

various bugfixes, including various CVE releated

License: update copyright notices to 2024

Link: https://github.com/OpenVPN/openvpn/releases/tag/v2.6.11
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
 v2: Fixed list of config files. Some have been removed upstream.


 rules/openvpn.make | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/rules/openvpn.make b/rules/openvpn.make
index 0c56028fc..475f621e7 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
 #
 # Paths and names
 #
-OPENVPN_VERSION		:= 2.6.9
-OPENVPN_MD5		:= e5beda906a40e997e26766f0de09ecbf
+OPENVPN_VERSION		:= 2.6.11
+OPENVPN_MD5		:= 467b270c54955681add7f253aa03fc5a
 OPENVPN			:= openvpn-$(OPENVPN_VERSION)
 OPENVPN_SUFFIX		:= tar.gz
 OPENVPN_URL		:= https://github.com/OpenVPN/openvpn/releases/download/v$(OPENVPN_VERSION)/$(OPENVPN).$(OPENVPN_SUFFIX)
@@ -23,9 +23,9 @@ OPENVPN_SOURCE		:= $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
 OPENVPN_DIR		:= $(BUILDDIR)/$(OPENVPN)
 OPENVPN_LICENSE		:= GPL-2.0-only WITH (openvpn-openssl-exception AND custom-exception) AND BSD-2-Clause AND BSD-3-Clause AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT)
 OPENVPN_LICENSE_FILES := \
-	file://COPYING;md5=4b34e946059f80dcfd811e8dd471b5ed \
+	file://COPYING;md5=89196bacc47ed37a5b242a535661a049 \
 	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
-	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=b9fb1976bc6d8ad5e02a251351dc58f2 \
+	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=80aebe6059f2989b52c49783938e7221 \
 	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
 	file://src/openvpn/ovpn_dco_linux.h;startline=1;endline=1;md5=b317f96dbe63f35baef28266acb68512 \
 	file://src/openvpn/ovpn_dco_freebsd.h;startline=1;endline=1;md5=a7ba62aad20f9685c53b0565a263af30
@@ -86,11 +86,10 @@ OPENVPN_CONF_OPT	:= \
 	--with-openssl-engine
 
 OPENVPN_INSTALL_SAMPLE_CONFIG_FILES := \
-	client.conf loopback-client loopback-server README server.conf \
-	tls-home.conf tls-office.conf
+	client.conf loopback-client loopback-server README server.conf
 
 OPENVPN_INSTALL_SAMPLE_CONFIG_SCRIPTS := \
-	firewall.sh home.up office.up openvpn-shutdown.sh openvpn-startup.sh
+	firewall.sh openvpn-shutdown.sh openvpn-startup.sh
 
 OPENVPN_INSTALL_SAMPLE_SCRIPTS := bridge-start bridge-stop
 ifdef PTXCONF_OPENVPN_INSTALL_SAMPLE_SCRIPTS_PERL
-- 
2.43.0




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [APPLIED] openvpn: Version bump, 2.6.9 -> 2.6.11
  2024-06-26 16:39   ` [ptxdist] [PATCH v2] " Andreas Helmcke
@ 2024-07-02 12:29     ` Michael Olbrich
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-07-02 12:29 UTC (permalink / raw)
  To: ptxdist; +Cc: Andreas Helmcke

Thanks, applied as 3319ce8d85e26106096a6020afb2adb5fc776102.

Michael

[sent from post-receive hook]

On Tue, 02 Jul 2024 14:29:57 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> various bugfixes, including various CVE releated
> 
> License: update copyright notices to 2024
> 
> Link: https://github.com/OpenVPN/openvpn/releases/tag/v2.6.11
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <20240626163911.152687-2-ahelmcke@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 0c56028fc082..475f621e77fc 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
>  #
>  # Paths and names
>  #
> -OPENVPN_VERSION		:= 2.6.9
> -OPENVPN_MD5		:= e5beda906a40e997e26766f0de09ecbf
> +OPENVPN_VERSION		:= 2.6.11
> +OPENVPN_MD5		:= 467b270c54955681add7f253aa03fc5a
>  OPENVPN			:= openvpn-$(OPENVPN_VERSION)
>  OPENVPN_SUFFIX		:= tar.gz
>  OPENVPN_URL		:= https://github.com/OpenVPN/openvpn/releases/download/v$(OPENVPN_VERSION)/$(OPENVPN).$(OPENVPN_SUFFIX)
> @@ -23,9 +23,9 @@ OPENVPN_SOURCE		:= $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
>  OPENVPN_DIR		:= $(BUILDDIR)/$(OPENVPN)
>  OPENVPN_LICENSE		:= GPL-2.0-only WITH (openvpn-openssl-exception AND custom-exception) AND BSD-2-Clause AND BSD-3-Clause AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT)
>  OPENVPN_LICENSE_FILES := \
> -	file://COPYING;md5=4b34e946059f80dcfd811e8dd471b5ed \
> +	file://COPYING;md5=89196bacc47ed37a5b242a535661a049 \
>  	file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
> -	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=b9fb1976bc6d8ad5e02a251351dc58f2 \
> +	file://src/openvpn/openvpn.c;startline=2;endline=21;md5=80aebe6059f2989b52c49783938e7221 \
>  	file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \
>  	file://src/openvpn/ovpn_dco_linux.h;startline=1;endline=1;md5=b317f96dbe63f35baef28266acb68512 \
>  	file://src/openvpn/ovpn_dco_freebsd.h;startline=1;endline=1;md5=a7ba62aad20f9685c53b0565a263af30
> @@ -86,11 +86,10 @@ OPENVPN_CONF_OPT	:= \
>  	--with-openssl-engine
>  
>  OPENVPN_INSTALL_SAMPLE_CONFIG_FILES := \
> -	client.conf loopback-client loopback-server README server.conf \
> -	tls-home.conf tls-office.conf
> +	client.conf loopback-client loopback-server README server.conf
>  
>  OPENVPN_INSTALL_SAMPLE_CONFIG_SCRIPTS := \
> -	firewall.sh home.up office.up openvpn-shutdown.sh openvpn-startup.sh
> +	firewall.sh openvpn-shutdown.sh openvpn-startup.sh
>  
>  OPENVPN_INSTALL_SAMPLE_SCRIPTS := bridge-start bridge-stop
>  ifdef PTXCONF_OPENVPN_INSTALL_SAMPLE_SCRIPTS_PERL



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-07-02 12:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-24 16:36 [ptxdist] [PATCH] openvpn: Version bump, 2.6.9 -> 2.6.11 Andreas Helmcke
2024-06-26 16:18 ` Michael Olbrich
2024-06-26 16:39   ` [ptxdist] [PATCH v2] " Andreas Helmcke
2024-07-02 12:29     ` [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