Updated kernel to 2.6.25.20 and also updated openswan to 2.6.20.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Mar 2009 19:43:29 +0000 (20:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Mar 2009 19:46:34 +0000 (20:46 +0100)
This this will be helpful to solve this error:
http://forum.ipfire.org/index.php?topic=1022.0

See changelog of openswan to read more about this issue.

This commit will cause to replace kernel in core 28 or above.

lfs/linux
lfs/openswan
src/patches/openswan-2.6.20_noxmlto.patch [new file with mode: 0644]

index ec4e3a0..792f07c 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .19
-VER        = 2.6.25.19
+PATCHLEVEL = .20
+VER        = 2.6.25.20
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -59,7 +59,7 @@ squashfs3.4.tar.gz                    = $(URL_IPFIRE)/squashfs3.4.tar.gz
 mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz = $(URL_IPFIRE)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
 reiser4-for-2.6.25.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
 
-$(DL_FILE)_MD5                         = 1b20d2d2a5a0f119372a166eaf816e13
+$(DL_FILE)_MD5                         = 0da698edccf03e2235abc2830a495114
 netfilter-layer7-v2.20.tar.gz_MD5      = 525a821c973b730c8feaf9eedb57d1e4
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5                 = 2a4d2995ad5aa6840c95a95ffa6b1da6
@@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
 
        # Openswan
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
 
        # Reiser4
        cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1
index ccbd4db..9f5afc4 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.18
+VER        = 2.6.20
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b485b38b1074155bc337f80557c24c0d
+$(DL_FILE)_MD5 = 2e4751e39b2421406692e767e96a6f14
 
 install : $(TARGET)
 
@@ -85,7 +85,10 @@ 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.20_noxmlto.patch
 
        cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
        
diff --git a/src/patches/openswan-2.6.20_noxmlto.patch b/src/patches/openswan-2.6.20_noxmlto.patch
new file mode 100644 (file)
index 0000000..5898bd5
--- /dev/null
@@ -0,0 +1,68 @@
+diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/programs/pluto/Makefile
+--- openswan-2.6.20dr2.old/programs/pluto/Makefile     2008-12-20 19:53:00.000000000 +0100
++++ openswan-2.6.20dr2/programs/pluto/Makefile 2008-12-20 20:14:07.000000000 +0100
+@@ -171,7 +171,7 @@
+ all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT) 
+ programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
+ clean:        cleanall
+-install: doinstall
++install: doinstall doinstalldoc
+ endif
+ doinstall: all
+@@ -187,6 +187,9 @@
+       $(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
+       #$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
+       if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
++
++ifeq ($(findstring $(SUBDIRS),doc),doc)
++doinstalldoc:
+       ( cd ${OPENSWANSRCDIR}/programs/pluto ; xmlto man pluto.8.xml ; mv ipsec_pluto.8 pluto.8; xmlto man ipsec.secrets.5.xml)
+       $(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
+       sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
+@@ -201,10 +204,7 @@
+                ln -s -f $$from $(FMANDIR)/$$to; \
+               done
+-install_file_list:
+-      @echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
+-      @if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
+-      @echo $(LIBEXECDIR)/$(BINNAMEWHACK)
++install_file_listdoc:
+       @echo $(PMANDIR)/ipsec_pluto.8
+       @sh ${OPENSWANSRCDIR}/packaging/utils/manlink pluto.8 | \
+               while read from to; \
+@@ -217,6 +217,15 @@
+               do \
+                       echo $(FMANDIR)/$$to; \
+               done
++else
++doinstalldoc:
++install_file_listdoc:
++endif
++
++install_file_list: install_file_listdoc
++      @echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
++      @if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
++      @echo $(LIBEXECDIR)/$(BINNAMEWHACK)
+ alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
+       $(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)
+diff -Nur openswan-2.6.20dr2.old/programs/_confread/Makefile openswan-2.6.20dr2/programs/_confread/Makefile
+--- openswan-2.6.20dr2.old/programs/_confread/Makefile 2008-12-20 19:53:00.000000000 +0100
++++ openswan-2.6.20dr2/programs/_confread/Makefile     2008-12-21 00:13:23.000000000 +0100
+@@ -16,7 +16,13 @@
+ OPENSWANSRCDIR?=$(shell cd ../..; pwd)
+ include ${OPENSWANSRCDIR}/Makefile.inc
+-EXTRA5MAN=ipsec.conf.5
++SUBDIRS=doc lib programs testing
++ifeq ($(findstring $(SUBDIRS),doc),doc)
++  EXTRA5MAN=ipsec.conf.5
++else
++  EXTRA5MAN=
++endif
++
+ CONFFILES=ipsec.conf
+ EXCONFILES=ipsec.win2k.conf
+ SOURCEDIR=_confread