Updated pcre to version 7.7 and add it to core16

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

diff --git a/lfs/openswan b/lfs/openswan
index a9c6f0987f4c5f1606880b4c6d7d2d3496bd04c2..825f4936e9d28074bfaba3d45b6416894c9650d6 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,13 +24,21 @@
 
 include Config
 
-VER        = 2.4.9
+VER        = 2.4.12
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+ifeq "$(KMOD)" "1"
+ifeq "$(SMP)" "1"
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
+endif
+else
 TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 845f12d80d443cfa1a52f2b53b987bee
+$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a
 
 install : $(TARGET)
 
@@ -70,6 +78,10 @@ $(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 minstall
+else
        cd $(DIR_APP) && sed -i \
                -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
                -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
@@ -88,8 +100,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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.9-startklips-1.patch
-       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-realsetup-1.patch
-       
+       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-realsetup-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
+endif  
        #@rm -rf $(DIR_APP)
        @$(POSTBUILD)