OpenVPN-DCO-OpenSSL3: Updates for OpenVPN-2.6.0 and OpenSSL-3.0.8

[people/ummeegge/ipfire-2.x.git] / lfs / openvpn

diff --git a/lfs/openvpn b/lfs/openvpn
index a19ac1ff15d2834eaa0f909e47ac8c261514af07..80880c347073d97695411513ab7b95cbf3337b27 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.3.6
+VER        = 2.6.0
 
 THISAPP    = openvpn-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bcc30c296566df14feebdd8aa0e408ca
+$(DL_FILE)_BLAKE2 = df2626d0c320c465faf182fbe20fd5b57cc1a5b94cc05ecc0f11752cfbbcb49d84f2df0088e5387cffeabb8a43785c825919542c4fba83c55c2ec1672f30fb35
 
 install : $(TARGET)
 
@@ -48,10 +48,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -60,8 +60,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -69,15 +69,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && autoreconf -fvi
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/var/ipfire/ovpn \
-               --enable-iproute2 \
-               --enable-password-save \
                --enable-plugins \
                --enable-plugin-auth-pam \
-               --enable-plugin-down-root
+               --enable-plugin-down-root \
+               --enable-dco
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
@@ -90,12 +91,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -vp /var/ipfire/ovpn/n2nconf
        -mkdir -vp /var/ipfire/ovpn/scripts
        touch /var/ipfire/ovpn/ovpn-leases.db
-       chmod 700 /var/ipfire/ovpn/ovpn-leases.db
+       chmod 600 /var/ipfire/ovpn/ovpn-leases.db
        chown -R root:root /var/ipfire/ovpn/scripts
        chown -R nobody:nobody /var/ipfire/ovpn
        chmod 700 /var/ipfire/ovpn/certs
        mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
        chown root:root /usr/lib/openvpn/verify
        chmod 755 /usr/lib/openvpn/verify
+       # Add crl updater
+       mv -v /var/ipfire/ovpn/openvpn-crl-updater /etc/fcron.daily
+       chown root:root /etc/fcron.daily/openvpn-crl-updater
+       chmod 750 /etc/fcron.daily/openvpn-crl-updater
+
+       # Install authenticator
+       install -v -m 755 $(DIR_SRC)/config/ovpn/openvpn-authenticator \
+               /usr/sbin/openvpn-authenticator
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)