Zwischencommit fuer LFS.

[people/pmueller/ipfire-2.x.git] / lfs / openswan

diff --git a/lfs/openswan b/lfs/openswan
index b6f99a1bdeae26d93c82aba1545c896a6d25165a..114f0f10e5cb0a1378c7cae4e7d8c0a7d8ad88d3 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -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: openswan,v 1.6.2.17 2005/12/01 23:00:25 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 1.0.10
+VER        = 2.4.6
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openswan.org/download/
+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 = 3767814e3c080d146a8c7233dc31e0a9
+$(DL_FILE)_MD5 = b34d71ca49dedad017879b0e912d40dd
 
 install : $(TARGET)
 
@@ -78,19 +72,13 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.1-plutoctl.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.6-numif.patch
        cd $(DIR_APP) && sed -i \
-           -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
-           -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
-           -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
-       #remove keywords that may be used to run scripts sf bug#1350181 (bash file=> easy to recover)
-       cd $(DIR_APP)/utils && sed -i \
-           -e 's% prepluto postpluto%%' \
-           -e 's% leftupdown%%' _confread
-       cd $(DIR_APP) && make programs
-       cd $(DIR_APP) && make install
-       mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
+               -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
+               -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
+               -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
+       cd $(DIR_APP) && make $(MAKETUNING) programs
+       cd $(DIR_APP) && make $(MAKETUNING) install
+       #mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
        rm -f /etc/ipsec.conf /etc/ipsec.secrets
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets