From 3dfa72cbeeba304d704071182934905c439e7285 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 8 Oct 2008 22:30:05 +0200 Subject: [PATCH 1/3] Update openswan to 2.6.18 --- config/rootfiles/common/openswan | 30 +++++++++++++++++++ lfs/openswan | 19 +++++------- .../openswan-2.6.16-sa_fam_unspec.patch | 11 ------- 3 files changed, 38 insertions(+), 22 deletions(-) delete mode 100644 src/patches/openswan-2.6.16-sa_fam_unspec.patch diff --git a/config/rootfiles/common/openswan b/config/rootfiles/common/openswan index fece11f0d..ce375572d 100644 --- a/config/rootfiles/common/openswan +++ b/config/rootfiles/common/openswan @@ -303,3 +303,33 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec_version_code.3.html #usr/share/doc/openswan/ipsec_version_string.3.html var/run/pluto +#etc/ipsec.d/examples/xauth.conf +#etc/rc.d/init.d/setup +#usr/lib/ipsec/_startklips.old +#usr/lib/ipsec/_startnetkey +#usr/lib/ipsec/_updown.klips +#usr/lib/ipsec/_updown.klips.old +#usr/lib/ipsec/_updown.klips~ +#usr/lib/ipsec/_updown.mast +#usr/lib/ipsec/_updown.mast.old +#usr/lib/ipsec/_updown.netkey +#usr/libexec/ipsec/addconn +#usr/libexec/ipsec/lwdnsq +#usr/libexec/ipsec/showpolicy +#usr/man/man5/ipsec_showpolicy.8 +#usr/man/man8/ipsec__startnetkey.8 +#usr/man/man8/ipsec__updown.klips.8 +#usr/man/man8/ipsec__updown.mast.8 +#usr/man/man8/ipsec__updown.netkey.8 +#usr/man/man8/ipsec_addconn.8 +#usr/man/man8/ipsec_lwdnsq.8 +#usr/man/man8/ipsec_showpolicy.8 +#usr/share/doc/openswan/ipsec__startnetkey.8.html +#usr/share/doc/openswan/ipsec__updown.bsdkame.8.html +#usr/share/doc/openswan/ipsec__updown.klips.8.html +#usr/share/doc/openswan/ipsec__updown.mast.8.html +#usr/share/doc/openswan/ipsec__updown.netkey.8.html +#usr/share/doc/openswan/ipsec_addconn.8.html +#usr/share/doc/openswan/ipsec_readwriteconf.8.html +#usr/share/doc/openswan/ipsec_set_policy.3.html +#usr/share/doc/openswan/ipsec_strerror.3.html diff --git a/lfs/openswan b/lfs/openswan index b23f253f6..bcd66487c 100644 --- a/lfs/openswan +++ b/lfs/openswan @@ -24,7 +24,7 @@ include Config -VER = 2.4.12 +VER = 2.6.18 THISAPP = openswan-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ ifeq "$(KMOD)" "1" ifeq "$(SMP)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-kmod-smp else -TARGET = $(DIR_INFO)/$(THISAPP)-kmod +TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$KVER endif else TARGET = $(DIR_INFO)/$(THISAPP) @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a +$(DL_FILE)_MD5 = b485b38b1074155bc337f80557c24c0d install : $(TARGET) @@ -87,10 +87,7 @@ else -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) && sed -i 's/-Werror//' programs/Makefile.program cd $(DIR_APP) && make programs cd $(DIR_APP) && make install @@ -109,10 +106,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) diff --git a/src/patches/openswan-2.6.16-sa_fam_unspec.patch b/src/patches/openswan-2.6.16-sa_fam_unspec.patch deleted file mode 100644 index 9511bcb25..000000000 --- a/src/patches/openswan-2.6.16-sa_fam_unspec.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur openswan-2.6.16.org/linux/net/ipsec/pfkey_v2_build.c openswan-2.6.16/linux/net/ipsec/pfkey_v2_build.c ---- openswan-2.6.16.org/linux/net/ipsec/pfkey_v2_build.c 2008-08-18 19:07:48.000000000 +0200 -+++ openswan-2.6.16/linux/net/ipsec/pfkey_v2_build.c 2008-09-13 15:38:43.000000000 +0200 -@@ -442,6 +442,7 @@ - } - - switch(address->sa_family) { -+ case AF_UNSPEC: - case AF_INET: - DEBUGGING(PF_KEY_DEBUG_BUILD, - "pfkey_address_build: " From 6e9d800f239e596a6850e9602659544a34883ec8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 9 Oct 2008 13:50:10 +0200 Subject: [PATCH 2/3] enable klips for kernel25 --- doc/packages-list.txt | 7 ++++--- make.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 8b70cd3de..0f69043ed 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -1,4 +1,4 @@ -== List of softwares used to build IPFire Version: 2.3-beta4 == +== List of softwares used to build IPFire Version: 2.3-test == * Archive-Tar-1.29 * Archive-Zip-1.16 * BerkeleyDB-0.27 @@ -228,9 +228,10 @@ * openmailadmin-1.0.0 * openssh-4.7p1 * openssl-0.9.8g -* openswan-2.4.12 -* openswan-2.4.12-kmod +* openswan-2.6.18 +* openswan-2.6.18-kmod-VER * openvpn-2.0.9 +* p7zip_4.58 * pam_mysql-0.7RC1 * patch-2.5.4 * pciutils-2.2.3 diff --git a/make.sh b/make.sh index 9c42c6d36..a6ebd3aef 100755 --- a/make.sh +++ b/make.sh @@ -349,7 +349,7 @@ buildipfire() { ipfiremake v4l-dvb KVER=2.6.25.17 ipfiremake madwifi KVER=2.6.25.17 ipfiremake alsa KMOD=1 KVER=2.6.25.17 -# ipfiremake openswan KMOD=1 KVER=2.6.25.17 + ipfiremake openswan KMOD=1 KVER=2.6.25.17 ipfiremake linux ipfiremake atl2 ipfiremake r8168 From b466eef1221a3bff54b57046404b64a8d83e0e4a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 9 Oct 2008 22:44:21 +0200 Subject: [PATCH 3/3] Create /var/lock/subsys if it not exist --- src/initscripts/init.d/tmpfs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs index a7ead9d28..fc45db231 100644 --- a/src/initscripts/init.d/tmpfs +++ b/src/initscripts/init.d/tmpfs @@ -22,6 +22,9 @@ case "$1" in # # create some folders # + if [ ! -e /var/lock/subsys ]; then + mkdir -p /var/lock/subsys + fi if [ ! -e /var/run/clamav ]; then mkdir -p /var/run/clamav chown clamav:clamav /var/run/clamav