Merge branch 'kernel-update' into next

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

diff --git a/lfs/openvpn b/lfs/openvpn
index 43fc61a1f1444121cb6a1133dff069114d204ff0..e118f8b6cbc6cef472247d9c5749c0657601b722 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.9
+VER        = 2.1_rc19
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 60745008b90b7dbe25fe8337c550fec6
+$(DL_FILE)_MD5 = ba2ee667a8b7606b125b7d32f47ca578
 
 install : $(TARGET)
 
@@ -75,11 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
+       -mkdir -p /var/ipfire/ovpn/ca
+       -mkdir -p /var/ipfire/ovpn/crls
        chown -R nobody:nobody /var/ipfire/ovpn
        chown root.nobody /var/log/ovpnserver.log
        chmod 755 /var/ipfire/ovpn/verify
        chmod 660 /var/log/ovpnserver.log
        chmod 700 /var/ipfire/ovpn/certs
-       -cd $(DIR_APP) && find /var/ipfire/ovpn -name .svn -exec rm -rf {} \;
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)