[openswan/f14/master] - New upstream release openswan-2.6.31
avesh agarwal
avesh at fedoraproject.org
Wed Oct 20 16:41:04 UTC 2010
commit 5243a9f1cfe4921ee9b3f4fd4d66d890bfb29600
Author: Avesh Agarwal <avagarwa at redhat.com>
Date: Wed Oct 20 12:41:01 2010 -0400
- New upstream release openswan-2.6.31
.gitignore | 1 +
openswan-2.6-relpath.patch | 30 +++++++++++++++---------------
openswan-600167.patch | 28 ++++++++++++++--------------
openswan-600174.patch | 6 +++---
openswan-ipsec-help-524146-509318.patch | 6 +++---
openswan-setup.patch | 6 +++---
openswan.spec | 7 +++++--
sources | 2 +-
8 files changed, 45 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b201aaa..64b7a71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ openswan-2.6.25.tar.gz
openswan-2.6.27.tar.gz
openswan-2.6.28.tar.gz
/openswan-2.6.29.tar.gz
+/openswan-2.6.31.tar.gz
diff --git a/openswan-2.6-relpath.patch b/openswan-2.6-relpath.patch
index b17d844..3980173 100644
--- a/openswan-2.6-relpath.patch
+++ b/openswan-2.6-relpath.patch
@@ -1,24 +1,24 @@
-diff -urNp openswan-2.6.29-orig/Makefile.inc openswan-2.6.29-cvs-patched/Makefile.inc
---- openswan-2.6.29-orig/Makefile.inc 2010-09-27 13:10:05.456420264 -0400
-+++ openswan-2.6.29-cvs-patched/Makefile.inc 2010-09-27 13:10:25.270412552 -0400
-@@ -123,6 +123,8 @@ FINALRCDIR=$(shell for d in $(INC_RCDIRS
+diff -urNp openswan-2.6.31-orig/Makefile.inc openswan-2.6.31-cvs-patched/Makefile.inc
+--- openswan-2.6.31-orig/Makefile.inc 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/Makefile.inc 2010-10-19 17:14:39.464412221 -0400
+@@ -123,6 +123,8 @@ FINALRCDIR?=$(shell for d in $(INC_RCDIR
do if test -d $(DESTDIR)/$$d ; \
then echo $$d ; exit 0 ; \
fi ; done ; echo $(INC_RCDEFAULT) )
+# this needs to be a relative path from BINDIR
-+RELFINALRCDIR=../../..$(FINALRCDIR)
- RCDIR=$(DESTDIR)$(FINALRCDIR)
++RELFINALRCDIR?=../../..$(FINALRCDIR)
+ RCDIR?=$(DESTDIR)$(FINALRCDIR)
-diff -urNp openswan-2.6.29-orig/programs/setup/Makefile openswan-2.6.29-cvs-patched/programs/setup/Makefile
---- openswan-2.6.29-orig/programs/setup/Makefile 2010-09-27 13:10:05.486420297 -0400
-+++ openswan-2.6.29-cvs-patched/programs/setup/Makefile 2010-09-27 13:10:25.271412259 -0400
-@@ -32,7 +32,7 @@ include ${srcdir}../Makefile.program
- doinstall:: setup
- @rm -f $(BINDIR)/setup
+diff -urNp openswan-2.6.31-orig/programs/setup/Makefile openswan-2.6.31-cvs-patched/programs/setup/Makefile
+--- openswan-2.6.31-orig/programs/setup/Makefile 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/setup/Makefile 2010-10-19 17:17:40.177162674 -0400
+@@ -37,7 +37,7 @@ doinstall:: $(PROGRAM) $(CONFFILES) $(EX
+ @mkdir -p $(RCDIR) $(BINDIR)
+ # install and link everything
@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
+ @ln -s $(RELFINALRCDIR)/ipsec $(BINDIR)/setup
- - at for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
- - at cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
- - at cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
+
+ install_file_list::
+ @echo $(RCDIR)/ipsec
diff --git a/openswan-600167.patch b/openswan-600167.patch
index ae82d27..c74e78c 100644
--- a/openswan-600167.patch
+++ b/openswan-600167.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.29-orig/programs/auto/auto.in openswan-2.6.29-cvs-patched/programs/auto/auto.in
---- openswan-2.6.29-orig/programs/auto/auto.in 2010-09-27 13:10:05.509412095 -0400
-+++ openswan-2.6.29-cvs-patched/programs/auto/auto.in 2010-09-27 13:21:42.080412196 -0400
+diff -urNp openswan-2.6.31-orig/programs/auto/auto.in openswan-2.6.31-cvs-patched/programs/auto/auto.in
+--- openswan-2.6.31-orig/programs/auto/auto.in 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/auto/auto.in 2010-10-19 17:29:31.936412416 -0400
@@ -40,6 +40,112 @@ op=
argc=
utc=
@@ -114,9 +114,9 @@ diff -urNp openswan-2.6.29-orig/programs/auto/auto.in openswan-2.6.29-cvs-patche
for dummy
do
case "$1" in
-diff -urNp openswan-2.6.29-orig/programs/pluto/connections.c openswan-2.6.29-cvs-patched/programs/pluto/connections.c
---- openswan-2.6.29-orig/programs/pluto/connections.c 2010-09-27 13:10:05.513420574 -0400
-+++ openswan-2.6.29-cvs-patched/programs/pluto/connections.c 2010-09-27 13:23:51.288412353 -0400
+diff -urNp openswan-2.6.31-orig/programs/pluto/connections.c openswan-2.6.31-cvs-patched/programs/pluto/connections.c
+--- openswan-2.6.31-orig/programs/pluto/connections.c 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/pluto/connections.c 2010-10-19 17:30:59.352411130 -0400
@@ -462,7 +462,7 @@ check_orientations(void)
}
}
@@ -136,9 +136,9 @@ diff -urNp openswan-2.6.29-orig/programs/pluto/connections.c openswan-2.6.29-cvs
{
/* other side is wildcard: we must check if other conditions met */
if (that->host_type != KH_IPHOSTNAME && isanyaddr(&this->host_addr))
-diff -urNp openswan-2.6.29-orig/programs/pluto/connections.h openswan-2.6.29-cvs-patched/programs/pluto/connections.h
---- openswan-2.6.29-orig/programs/pluto/connections.h 2010-09-27 13:10:05.521420141 -0400
-+++ openswan-2.6.29-cvs-patched/programs/pluto/connections.h 2010-09-27 13:24:39.600412208 -0400
+diff -urNp openswan-2.6.31-orig/programs/pluto/connections.h openswan-2.6.31-cvs-patched/programs/pluto/connections.h
+--- openswan-2.6.31-orig/programs/pluto/connections.h 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/pluto/connections.h 2010-10-19 17:31:04.846411878 -0400
@@ -291,6 +291,8 @@ extern size_t format_end(char *buf, size
, const struct end *this, const struct end *that
, bool is_left, lset_t policy);
@@ -148,10 +148,10 @@ diff -urNp openswan-2.6.29-orig/programs/pluto/connections.h openswan-2.6.29-cvs
struct whack_message; /* forward declaration of tag whack_msg */
extern void add_connection(const struct whack_message *wm);
extern void initiate_connection(const char *name
-diff -urNp openswan-2.6.29-orig/programs/pluto/initiate.c openswan-2.6.29-cvs-patched/programs/pluto/initiate.c
---- openswan-2.6.29-orig/programs/pluto/initiate.c 2010-09-27 13:10:05.511412073 -0400
-+++ openswan-2.6.29-cvs-patched/programs/pluto/initiate.c 2010-09-27 13:25:36.244411412 -0400
-@@ -151,6 +151,121 @@ struct initiate_stuff {
+diff -urNp openswan-2.6.31-orig/programs/pluto/initiate.c openswan-2.6.31-cvs-patched/programs/pluto/initiate.c
+--- openswan-2.6.31-orig/programs/pluto/initiate.c 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/pluto/initiate.c 2010-10-19 17:32:01.911161510 -0400
+@@ -158,6 +158,121 @@ struct initiate_stuff {
enum crypto_importance importance;
};
@@ -273,7 +273,7 @@ diff -urNp openswan-2.6.29-orig/programs/pluto/initiate.c openswan-2.6.29-cvs-pa
static int
initiate_a_connection(struct connection *c
, void *arg)
-@@ -165,9 +280,14 @@ initiate_a_connection(struct connection
+@@ -172,9 +287,14 @@ initiate_a_connection(struct connection
/* turn on any extra debugging asked for */
c->extra_debugging |= moredebug;
diff --git a/openswan-600174.patch b/openswan-600174.patch
index 0764a41..886de9c 100644
--- a/openswan-600174.patch
+++ b/openswan-600174.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.29-orig/programs/_updown.netkey/_updown.netkey.in openswan-2.6.29-cvs-patched/programs/_updown.netkey/_updown.netkey.in
---- openswan-2.6.29-orig/programs/_updown.netkey/_updown.netkey.in 2010-09-27 13:10:05.457433103 -0400
-+++ openswan-2.6.29-cvs-patched/programs/_updown.netkey/_updown.netkey.in 2010-09-27 13:18:21.561412463 -0400
+diff -urNp openswan-2.6.31-orig/programs/_updown.netkey/_updown.netkey.in openswan-2.6.31-cvs-patched/programs/_updown.netkey/_updown.netkey.in
+--- openswan-2.6.31-orig/programs/_updown.netkey/_updown.netkey.in 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/_updown.netkey/_updown.netkey.in 2010-10-19 17:28:15.672162125 -0400
@@ -270,8 +270,15 @@ fi
addsource() {
st=0
diff --git a/openswan-ipsec-help-524146-509318.patch b/openswan-ipsec-help-524146-509318.patch
index 283c3d5..7bbced4 100644
--- a/openswan-ipsec-help-524146-509318.patch
+++ b/openswan-ipsec-help-524146-509318.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.29-orig/programs/ipsec/ipsec.in openswan-2.6.29-cvs-patched/programs/ipsec/ipsec.in
---- openswan-2.6.29-orig/programs/ipsec/ipsec.in 2010-09-27 13:10:05.529420266 -0400
-+++ openswan-2.6.29-cvs-patched/programs/ipsec/ipsec.in 2010-09-27 13:12:47.588189664 -0400
+diff -urNp openswan-2.6.31-orig/programs/ipsec/ipsec.in openswan-2.6.31-cvs-patched/programs/ipsec/ipsec.in
+--- openswan-2.6.31-orig/programs/ipsec/ipsec.in 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/ipsec/ipsec.in 2010-10-19 17:21:03.993177107 -0400
@@ -79,9 +79,9 @@ case "$1" in
--help)
echo "Usage: ipsec command argument ..."
diff --git a/openswan-setup.patch b/openswan-setup.patch
index 028fd8d..3700686 100644
--- a/openswan-setup.patch
+++ b/openswan-setup.patch
@@ -1,11 +1,11 @@
---- openswan-2.6.29-orig/programs/setup/setup.in 2010-09-27 12:40:32.000000000 -0400
-+++ openswan-2.6.29-cvs-patched/programs/setup/setup.in 2010-09-30 11:26:10.533181945 -0400
+--- openswan-2.6.31-orig/programs/setup/setup.in 2010-10-18 12:13:36.000000000 -0400
++++ openswan-2.6.31-cvs-patched/programs/setup/setup.in 2010-10-19 17:59:49.691397954 -0400
@@ -5,7 +5,7 @@
# Provides: ipsec
# Required-Start: $network $remote_fs $syslog $named
# Required-Stop: $syslog $remote_fs
-# Default-Start: 2 3 4 5
-+# Default-Start:
++# Default-Start:
# Default-Stop: 0 1 6
# Short-Description: Start Openswan IPsec at boot time
# Description: Enable automatic key management for IPsec (KLIPS and NETKEY)
diff --git a/openswan.spec b/openswan.spec
index 7983a5e..59c5f24 100644
--- a/openswan.spec
+++ b/openswan.spec
@@ -8,9 +8,9 @@
Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
Name: openswan
-Version: 2.6.29
+Version: 2.6.31
-Release: 2%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Url: http://www.openswan.org/
Source: openswan-%{version}.tar.gz
@@ -232,6 +232,9 @@ fi
chkconfig --add ipsec || :
%changelog
+* Wed Oct 20 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.31-1
+- New upstream release openswan-2.6.31
+
* Thu Sep 30 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.29-2
- rhbz#636572, fix to openswan default start issue
diff --git a/sources b/sources
index 024834e..0c6dbf6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd6c127585ec6db63780e9a40d5387fb openswan-2.6.29.tar.gz
+1f508adf9d0be4f34c003b833d8fce4a openswan-2.6.31.tar.gz
More information about the scm-commits
mailing list