openvpn: Update to 2.3.6

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

diff --git a/lfs/openvpn b/lfs/openvpn
index 4f10e7afbe8874b384b4aa867efc087d7435cb96..44a8b469785b2fd916b91b7f929063fc055046d1 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  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.2.2
+VER        = 2.3.6
 
 THISAPP    = openvpn-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 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 = c5181e27b7945fa6276d21873329c5c7
+$(DL_FILE)_MD5 = bcc30c296566df14feebdd8aa0e408ca
 
 install : $(TARGET)
 
@@ -69,21 +69,22 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/var/ipfire/ovpn \
+               --enable-iproute2 \
                --enable-password-save \
-               --enable-pthread
+               --enable-plugins \
+               --enable-plugin-auth-pam \
+               --enable-plugin-down-root
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
-       -mkdir -pv /usr/lib/openvpn
-       cd $(DIR_APP)/plugin/auth-pam && make
-       cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /usr/lib/openvpn
-       cd $(DIR_APP)/plugin/down-root && make
-       cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
+       -mkdir -vp /usr/lib/openvpn/plugins
        -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
@@ -92,8 +93,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R root:root /var/ipfire/ovpn/scripts
        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
+       mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
+       chown root:root /usr/lib/openvpn/verify
+       chmod 755 /usr/lib/openvpn/verify
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)