Thanks, applied as 3319ce8d85e26106096a6020afb2adb5fc776102.

Michael

[sent from post-receive hook]

On Tue, 02 Jul 2024 14:29:57 +0200, Andreas Helmcke <[email protected]> 
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 <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> 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

Reply via email to