From 1e7bee0bbdefcdaa76759d56e16e78134882d0dd Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 10 Sep 2009 23:27:10 +0200 Subject: [PATCH] Updated openswan to 2.6.23 --- config/rootfiles/common/openswan | 90 ++++++++++---------------------- doc/packages-list.txt | 6 +-- lfs/openswan | 4 +- 3 files changed, 34 insertions(+), 66 deletions(-) diff --git a/config/rootfiles/common/openswan b/config/rootfiles/common/openswan index 8f4f926278..378792a411 100644 --- a/config/rootfiles/common/openswan +++ b/config/rootfiles/common/openswan @@ -5,13 +5,14 @@ etc/ipsec.d/cacerts etc/ipsec.d/certs etc/ipsec.d/crls #etc/ipsec.d/examples -#etc/ipsec.d/examples/l2tp-cert-orgWIN2KXP.conf +#etc/ipsec.d/examples/hub-spoke.conf +#etc/ipsec.d/examples/ipv6.conf #etc/ipsec.d/examples/l2tp-cert.conf -#etc/ipsec.d/examples/l2tp-psk-orgWIN2KXP.conf #etc/ipsec.d/examples/l2tp-psk.conf #etc/ipsec.d/examples/linux-linux.conf -#etc/ipsec.d/examples/no_oe.conf +#etc/ipsec.d/examples/oe-exclude-dns.conf #etc/ipsec.d/examples/sysctl.conf +#etc/ipsec.d/examples/xauth.conf etc/ipsec.d/ocspcerts etc/ipsec.d/policies #etc/ipsec.d/policies/block @@ -43,21 +44,24 @@ usr/lib/ipsec #usr/lib/ipsec/_realsetup #usr/lib/ipsec/_secretcensor #usr/lib/ipsec/_startklips +#usr/lib/ipsec/_startklips.old +#usr/lib/ipsec/_startnetkey #usr/lib/ipsec/_updown -#usr/lib/ipsec/_updown_x509 -#usr/libexec +#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 #usr/libexec/ipsec/_pluto_adns +#usr/libexec/ipsec/addconn #usr/libexec/ipsec/auto #usr/libexec/ipsec/barf -#usr/libexec/ipsec/calcgoo #usr/libexec/ipsec/eroute #usr/libexec/ipsec/ikeping #usr/libexec/ipsec/klipsdebug -#usr/libexec/ipsec/livetest #usr/libexec/ipsec/look -#usr/libexec/ipsec/mailkey -#usr/libexec/ipsec/manual #usr/libexec/ipsec/newhostkey #usr/libexec/ipsec/pf_key #usr/libexec/ipsec/pluto @@ -67,6 +71,7 @@ usr/libexec/ipsec #usr/libexec/ipsec/setup #usr/libexec/ipsec/showdefaults #usr/libexec/ipsec/showhostkey +#usr/libexec/ipsec/showpolicy #usr/libexec/ipsec/spi #usr/libexec/ipsec/spigrp #usr/libexec/ipsec/tncfg @@ -89,7 +94,6 @@ usr/libexec/ipsec #usr/man/man3/ipsec_bitstomask.3 #usr/man/man3/ipsec_broadcastof.3 #usr/man/man3/ipsec_copyright_notice.3 -#usr/man/man3/ipsec_datatot.3 #usr/man/man3/ipsec_goodmask.3 #usr/man/man3/ipsec_hostof.3 #usr/man/man3/ipsec_initaddr.3 @@ -128,16 +132,13 @@ usr/libexec/ipsec #usr/man/man3/ipsec_ttosa.3 #usr/man/man3/ipsec_ttosubnet.3 #usr/man/man3/ipsec_ttoul.3 -#usr/man/man3/ipsec_ultoa.3 -#usr/man/man3/ipsec_ultot.3 #usr/man/man3/ipsec_unspecaddr.3 #usr/man/man3/ipsec_version.3 #usr/man/man3/ipsec_version_code.3 #usr/man/man3/ipsec_version_string.3 -#usr/man/man5/ipsec.conf.5 -#usr/man/man5/ipsec.secrets.5 #usr/man/man5/ipsec_eroute.5 #usr/man/man5/ipsec_klipsdebug.5 +#usr/man/man5/ipsec_showpolicy.8 #usr/man/man5/ipsec_spi.5 #usr/man/man5/ipsec_spigrp.5 #usr/man/man5/ipsec_tncfg.5 @@ -146,7 +147,6 @@ usr/libexec/ipsec #usr/man/man5/ipsec_version.5 #usr/man/man5/pf_key.5 #usr/man/man8/ipsec.8 -#usr/man/man8/ipsec__confread.8 #usr/man/man8/ipsec__copyright.8 #usr/man/man8/ipsec__include.8 #usr/man/man8/ipsec__keycensor.8 @@ -155,27 +155,27 @@ usr/libexec/ipsec #usr/man/man8/ipsec__realsetup.8 #usr/man/man8/ipsec__secretcensor.8 #usr/man/man8/ipsec__startklips.8 +#usr/man/man8/ipsec__startnetkey.8 #usr/man/man8/ipsec__updown.8 -#usr/man/man8/ipsec__updown_x509.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_auto.8 #usr/man/man8/ipsec_barf.8 -#usr/man/man8/ipsec_calcgoo.8 #usr/man/man8/ipsec_eroute.8 #usr/man/man8/ipsec_ikeping.8 #usr/man/man8/ipsec_klipsdebug.8 -#usr/man/man8/ipsec_livetest.8 #usr/man/man8/ipsec_look.8 -#usr/man/man8/ipsec_mailkey.8 -#usr/man/man8/ipsec_manual.8 #usr/man/man8/ipsec_newhostkey.8 #usr/man/man8/ipsec_pf_key.8 -#usr/man/man8/ipsec_pluto.8 #usr/man/man8/ipsec_ranbits.8 #usr/man/man8/ipsec_rsasigkey.8 #usr/man/man8/ipsec_secrets.8 #usr/man/man8/ipsec_setup.8 #usr/man/man8/ipsec_showdefaults.8 #usr/man/man8/ipsec_showhostkey.8 +#usr/man/man8/ipsec_showpolicy.8 #usr/man/man8/ipsec_spi.8 #usr/man/man8/ipsec_spigrp.8 #usr/man/man8/ipsec_tncfg.8 @@ -185,7 +185,6 @@ usr/sbin/ipsec #usr/share/doc/openswan/index.html #usr/share/doc/openswan/ipsec.8.html #usr/share/doc/openswan/ipsec.conf-sample -#usr/share/doc/openswan/ipsec.conf.5.html #usr/share/doc/openswan/ipsec.secrets.5.html #usr/share/doc/openswan/ipsec__confread.8.html #usr/share/doc/openswan/ipsec__copyright.8.html @@ -196,8 +195,12 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec__realsetup.8.html #usr/share/doc/openswan/ipsec__secretcensor.8.html #usr/share/doc/openswan/ipsec__startklips.8.html +#usr/share/doc/openswan/ipsec__startnetkey.8.html #usr/share/doc/openswan/ipsec__updown.8.html -#usr/share/doc/openswan/ipsec__updown_x509.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_addrbytesof.3.html #usr/share/doc/openswan/ipsec_addrbytesptr.3.html #usr/share/doc/openswan/ipsec_addrcmp.3.html @@ -216,9 +219,7 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec_barf.8.html #usr/share/doc/openswan/ipsec_bitstomask.3.html #usr/share/doc/openswan/ipsec_broadcastof.3.html -#usr/share/doc/openswan/ipsec_calcgoo.8.html #usr/share/doc/openswan/ipsec_copyright_notice.3.html -#usr/share/doc/openswan/ipsec_datatot.3.html #usr/share/doc/openswan/ipsec_eroute.5.html #usr/share/doc/openswan/ipsec_eroute.8.html #usr/share/doc/openswan/ipsec_goodmask.3.html @@ -256,6 +257,7 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec_ranbits.8.html #usr/share/doc/openswan/ipsec_rangetoa.3.html #usr/share/doc/openswan/ipsec_rangetosubnet.3.html +#usr/share/doc/openswan/ipsec_readwriteconf.8.html #usr/share/doc/openswan/ipsec_rsasigkey.8.html #usr/share/doc/openswan/ipsec_sameaddr.3.html #usr/share/doc/openswan/ipsec_sameaddrtype.3.html @@ -264,7 +266,7 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec_samesubnettype.3.html #usr/share/doc/openswan/ipsec_satot.3.html #usr/share/doc/openswan/ipsec_secrets.8.html -#usr/share/doc/openswan/ipsec_send-pr.8.html +#usr/share/doc/openswan/ipsec_set_policy.3.html #usr/share/doc/openswan/ipsec_setportof.3.html #usr/share/doc/openswan/ipsec_setup.8.html #usr/share/doc/openswan/ipsec_showdefaults.8.html @@ -276,8 +278,7 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec_spi.8.html #usr/share/doc/openswan/ipsec_spigrp.5.html #usr/share/doc/openswan/ipsec_spigrp.8.html -#usr/share/doc/openswan/ipsec_splitkeytoid.3.html -#usr/share/doc/openswan/ipsec_starter.8.html +#usr/share/doc/openswan/ipsec_strerror.3.html #usr/share/doc/openswan/ipsec_subnetinsubnet.3.html #usr/share/doc/openswan/ipsec_subnetishost.3.html #usr/share/doc/openswan/ipsec_subnetof.3.html @@ -294,8 +295,6 @@ usr/sbin/ipsec #usr/share/doc/openswan/ipsec_ttosa.3.html #usr/share/doc/openswan/ipsec_ttosubnet.3.html #usr/share/doc/openswan/ipsec_ttoul.3.html -#usr/share/doc/openswan/ipsec_ultoa.3.html -#usr/share/doc/openswan/ipsec_ultot.3.html #usr/share/doc/openswan/ipsec_unspecaddr.3.html #usr/share/doc/openswan/ipsec_verify.8.html #usr/share/doc/openswan/ipsec_version.3.html @@ -303,34 +302,3 @@ 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 -#etc/ipsec.d/examples/ipv6.conf diff --git a/doc/packages-list.txt b/doc/packages-list.txt index b782b84400..9f3f1c11e7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -250,9 +250,9 @@ * openmailadmin-1.0.0 * openssh-5.2p1 * openssl-0.9.8k -* openswan-2.6.22 -* openswan-2.6.22-kmod-2.6.27.31-ipfire -* openswan-2.6.22-kmod-2.6.27.31-ipfire-xen +* openswan-2.6.23 +* openswan-2.6.23-kmod-2.6.27.31-ipfire +* openswan-2.6.23-kmod-2.6.27.31-ipfire-xen * openvpn-2.1_rc19 * p7zip_4.65 * pam_mysql-0.7RC1 diff --git a/lfs/openswan b/lfs/openswan index 11e35ef446..a72596deba 100644 --- a/lfs/openswan +++ b/lfs/openswan @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.22 +VER = 2.6.23 THISAPP = openswan-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9a30009bade8a1b09fba27680c87cf72 +$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83 install : $(TARGET) -- 2.39.2