Merge branch 'next'

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

diff --git a/lfs/openvpn b/lfs/openvpn
index 44a8b469785b2fd916b91b7f929063fc055046d1..9b2e7853c20e35f1468105de512f61ce2ba10f2d 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-2021  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,7 +24,7 @@
 
 include Config
 
-VER        = 2.3.6
+VER        = 2.5.4
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bcc30c296566df14feebdd8aa0e408ca
+$(DL_FILE)_BLAKE2 = ebc711981ab93da69ba033f3cf1ea1c99e86f700ec98809a3c401d59a6ecf53f977935aafd37df0233a0498762db01bed0555aeb99ab7e7903274e4d78997301
 
 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
@@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --prefix=/usr \
                --sysconfdir=/var/ipfire/ovpn \
                --enable-iproute2 \
-               --enable-password-save \
                --enable-plugins \
                --enable-plugin-auth-pam \
                --enable-plugin-down-root
@@ -83,20 +82,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
        -mkdir -vp /usr/lib/openvpn/plugins
+       -mkdir -vp /var/log/openvpn
        -mkdir -vp /var/ipfire/ovpn/ca
        -mkdir -vp /var/ipfire/ovpn/ccd
        -mkdir -vp /var/ipfire/ovpn/crls
        -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
-       chown root.nobody /var/log/ovpnserver.log
-       chmod 660 /var/log/ovpnserver.log
        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
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)