Updated openwan to 2.6.16

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

diff --git a/lfs/openswan b/lfs/openswan
index d6e71b2148e06b7db4dfee371dc20a58f7a2036c..3420840c55ae084e1ec884414a7e8a16acf291ec 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.12
+VER        = 2.6.16
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a
+$(DL_FILE)_MD5 = ef0ea8f9082df70c993a035904d538c7
 
 install : $(TARGET)
 
@@ -86,9 +86,18 @@ else
                -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
                -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
                -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
+
+       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) && make programs
        cd $(DIR_APP) && make install
        
+       # don't know why make this doesnt made
+       cd $(DIR_APP) && cp -a programs/_confread/_confread.in /usr/lib/ipsec/_confread
+       
        -rm -rfv /etc/rc*.d/*ipsec
        cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
        rm -f /etc/ipsec.conf /etc/ipsec.secrets
@@ -100,10 +109,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.4.9-updown_x509-1.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)