Updated samba to current stable.

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

diff --git a/lfs/openswan b/lfs/openswan
index b23f253f69b59cd71bf18f23d21ba1023d419391..a5d6520b738b282ed1dd2bed8aebc390f3482c4e 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,20 +24,23 @@
 
 include Config
 
-VER        = 2.4.12
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
 
-THISAPP    = openswan-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+VER        = git-20100309
+
+THISAPP    = openswan.git
+DL_FILE    = openswan.$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
 ifeq "$(KMOD)" "1"
-ifeq "$(SMP)" "1"
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+       TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 else
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
-endif
-else
-TARGET     = $(DIR_INFO)/$(THISAPP)
+       TARGET = $(DIR_INFO)/$(THISAPP)
 endif
 
 ###############################################################################
@@ -48,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a
+$(DL_FILE)_MD5 = f23b716b8ffb242436d8e713d93d209c
 
 install : $(TARGET)
 
@@ -78,19 +81,20 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
 ifeq "$(KMOD)" "1"
-       cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
+       cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make minstall
 else
        cd $(DIR_APP) && sed -i \
                -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
                -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
-               -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
+               -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' \
+               -e 's%^XMLTO.*$$%#&%' Makefile.inc
+
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.24_noxmlto.patch
 
-#      cd $(DIR_APP) && sed -i 's/-Werror//' lib/libdns/Makefile
-#      cd $(DIR_APP) && sed -i 's/-Werror//' lib/libisc/Makefile
-#      cd $(DIR_APP) && sed -i 's/-Werror//' lib/liblwres/Makefile
-#      cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
+       cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
        
        cd $(DIR_APP) && make programs
        cd $(DIR_APP) && make install
@@ -109,10 +113,10 @@ else
        ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
        ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
        
-       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.12-startklips-1.patch
-       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
-       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
-       cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-startklips-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-updown.klips-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.23-updown-add_ipfire-snat.patch
+       cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-clear-1.patch
 endif  
        #@rm -rf $(DIR_APP)
        @$(POSTBUILD)