X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenvpn;h=31c6ba6b164ab3cb4c073205f2b924bb399dd148;hb=e2627c00f5958ef467df7e93e819c8f77370a09e;hp=7a04ed5206ed02e01746d31ed71632faac08cc40;hpb=180cd3beb8c8ec84520002aaf3c55e748dd89f9b;p=ipfire-2.x.git

diff --git a/lfs/openvpn b/lfs/openvpn
index 7a04ed5206..31c6ba6b16 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -18,12 +18,6 @@
 # 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 $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.0.7
+VER        = 2.0.9
 
 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 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 93528233f1f6d02fc18e2c00f82e0aca
+$(DL_FILE)_MD5 = 60745008b90b7dbe25fe8337c550fec6
 
 install : $(TARGET)
 
@@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#	make-packages.sh postfix $(THISAPP)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -81,8 +72,17 @@ $(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-pthread
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
+	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
+	chmod 700 /var/ipfire/ovpn/n2nconf
+	-cd $(DIR_APP) && find /var/ipfire/ovpn -name .svn -exec rm -rf {} \;
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)