From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 Feb 2012 11:10:25 +0000 (+0100)
Subject: openvpn: Update to 2.2.2.
X-Git-Tag: v2.11-core58~17
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=524fc726215f527803423b0af51364ff5904221e

openvpn: Update to 2.2.2.

Add --enable-password-save switch that was requested by the
community.

See bug #10036.
---

diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 0f2aa47182..18f4d31972 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -1,5 +1,6 @@
-lib/openvpn-auth-pam.so
-lib/openvpn-down-root.so
+usr/lib/openvpn
+usr/lib/openvpn/openvpn-auth-pam.so
+usr/lib/openvpn/openvpn-down-root.so
 usr/sbin/openvpn
 #usr/share/doc/openvpn
 #usr/share/doc/openvpn/management-notes.txt
@@ -16,5 +17,6 @@ var/ipfire/ovpn/n2nconf
 var/ipfire/ovpn/openssl/ovpn.cnf
 var/ipfire/ovpn/ovpn-leases.db
 var/ipfire/ovpn/ovpnconfig
+var/ipfire/ovpn/scripts
 var/ipfire/ovpn/settings
 var/ipfire/ovpn/verify
diff --git a/lfs/openvpn b/lfs/openvpn
index 41594b7091..4f10e7afbe 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.1
+VER        = 2.2.2
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 500bee5449b29906150569aaf2eb2730
+$(DL_FILE)_MD5 = c5181e27b7945fa6276d21873329c5c7
 
 install : $(TARGET)
 
@@ -70,20 +70,26 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/ovpn \
-						--enable-pthread
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/var/ipfire/ovpn \
+		--enable-password-save \
+		--enable-pthread
 	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 /lib/
+	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 /lib/
+	cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
 	-mkdir -vp /var/ipfire/ovpn/ca
 	-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
+	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