X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fopenvpn;h=e57aa30bacf2d190c339c5f012af213c0ef78373;hp=3d839a86c92df0d3fa8c18887de704c46c7fe9bb;hb=274054142e3033aabf5cb1b89d86fa430dee5d72;hpb=a9b17001d6e48e17088246acf89b012599e155a0

diff --git a/lfs/openvpn b/lfs/openvpn
index 3d839a86c..e57aa30ba 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 2.0.6
+VER        = 2.2.2
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://openvpn.net/release
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8d2f95fa825e58363a676b25d4815aa7
+$(DL_FILE)_MD5 = c5181e27b7945fa6276d21873329c5c7
 
 install : $(TARGET)
 
@@ -58,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#	make-packages.sh postfix $(THISAPP)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -81,8 +70,31 @@ $(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 --enable-pthread
-	cd $(DIR_APP) && make
+	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 /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 /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
+	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
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)