Revision: 7866
http://sourceforge.net/p/ipcop/svn/7866
Author: owes
Date: 2015-02-05 16:35:16 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
Update openswan to 2.6.42
Modified Paths:
--------------
ipcop/trunk/lfs/openswan
ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
ipcop/trunk/updates/2.2.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/openswan-2.6.41_fix-natt.patch
Modified: ipcop/trunk/lfs/openswan
===================================================================
--- ipcop/trunk/lfs/openswan 2015-02-05 16:31:45 UTC (rev 7865)
+++ ipcop/trunk/lfs/openswan 2015-02-05 16:35:16 UTC (rev 7866)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = openswan
-VER = 2.6.41
+VER = 2.6.42
HOST_ARCH = all
OTHER_SRC = yes
KERNEL_MOD = yes
@@ -46,8 +46,8 @@
# Used to include same timestamp for all
# This is the release date
-DATESTAMP = "Jun 3 2013"
-TIMESTAMP = "19:33:00"
+DATESTAMP = "Oct 21 2014"
+TIMESTAMP = "15:56:00"
###############################################################################
# Top-level Rules
@@ -57,7 +57,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = da2e8b02ecc30a408cc5766767fef84f
+$(DL_FILE)_MD5 = 22240ce28be48f051bfdc874083c8947
install : $(TARGET)
@@ -86,8 +86,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_fix-natt.patch
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
# Remove Python verify script and patch in an old Perl version
cd $(DIR_APP) && rm programs/verify/verify.in
Deleted: ipcop/trunk/src/patches/openswan-2.6.41_fix-natt.patch
===================================================================
--- ipcop/trunk/src/patches/openswan-2.6.41_fix-natt.patch 2015-02-05
16:31:45 UTC (rev 7865)
+++ ipcop/trunk/src/patches/openswan-2.6.41_fix-natt.patch 2015-02-05
16:35:16 UTC (rev 7866)
@@ -1,37 +0,0 @@
-From b6041cb5d1d07974596be79606a977e88dd9ec48 Mon Sep 17 00:00:00 2001
-From: Patrick Naubert <patri...@xelerance.com>
-Date: Fri, 28 Feb 2014 19:59:54 -0500
-Subject: [PATCH] Bring back NAT traversal that got mistakenly pulled out by
- CVE-2014-2037 patch. Patch by Thomas Geulig
-
----
- lib/libopenswan/constants.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/lib/libopenswan/constants.c b/lib/libopenswan/constants.c
-index 932b205..09f7e80 100644
---- a/lib/libopenswan/constants.c
-+++ b/lib/libopenswan/constants.c
-@@ -167,9 +167,18 @@ const char *const payload_name_ikev2_main[] = {
- NULL /* termination for bitnamesof() */
- };
-
-+const char *const payload_name_nat_d[] = {
-+ "ISAKMP_NEXT_NAT-D",
-+ "ISAKMP_NEXT_NAT-OA",
-+ NULL
-+};
-+
-+static enum_names payload_names_nat_d =
-+{ ISAKMP_NEXT_NATD_DRAFTS, ISAKMP_NEXT_NATOA_DRAFTS, payload_name_nat_d, NULL
};
-+
- static enum_names payload_names_ikev2_main =
- { ISAKMP_NEXT_v2SA, ISAKMP_NEXT_v2EAP, payload_name_ikev2_main,
-- NULL };
-+ &payload_names_nat_d };
-
- const char *const payload_name_ikev2[] = {
- "ISAKMP_NEXT_v2NONE", /* 33 */
---
-1.9.1
-
Modified: ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
===================================================================
--- ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-02-05 16:31:45 UTC
(rev 7865)
+++ ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-02-05 16:35:16 UTC
(rev 7866)
@@ -131,6 +131,23 @@
/usr/lib/liblzo2.so.2
/usr/lib/liblzo2.so.2.0.0
##
+## openswan-2.6.42
+/usr/lib/ipsec/_copyright
+/usr/libexec/ipsec/_pluto_adns
+/usr/libexec/ipsec/addconn
+/usr/libexec/ipsec/eroute
+/usr/libexec/ipsec/ikeping
+/usr/libexec/ipsec/klipsdebug
+/usr/libexec/ipsec/pluto
+/usr/libexec/ipsec/ranbits
+/usr/libexec/ipsec/rsasigkey
+/usr/libexec/ipsec/showhostkey
+/usr/libexec/ipsec/spi
+/usr/libexec/ipsec/spigrp
+/usr/libexec/ipsec/tncfg
+/usr/libexec/ipsec/whack
+/usr/sbin/ipsec
+##
## patch-2.7.4
/usr/bin/patch
##
Modified: ipcop/trunk/updates/2.2.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.2.0/information.xml 2015-02-05 16:31:45 UTC (rev
7865)
+++ ipcop/trunk/updates/2.2.0/information.xml 2015-02-05 16:35:16 UTC (rev
7866)
@@ -7,7 +7,7 @@
<description>Language updates.<br />
Upgrade coreutils to 8.23, dhcpcd to 6.7.1, ethtool to 3.18, glib to
2.42.1,
libffi to 3.2.1, libtool to 2.4.5, lzo to 2.08,
- patch to 2.7.4, perl to 5.20.1-4, rsyslog to 8.7.0,
+ openswan to 2.6.42, patch to 2.7.4, perl to 5.20.1-4, rsyslog to 8.7.0,
sqlite to 3.8.8.2, tzdata to 2015a, xz to 5.2.0.
<br />
Upgrade Perl modules Archive-Zip to 1.45, IO-Socket-SSL to 2.010,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
