[openswan/f14/master] * Fri Aug 13 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.28-1 - New upstream release - Updated ex
avesh agarwal
avesh at fedoraproject.org
Fri Aug 13 18:12:15 UTC 2010
commit 304e268d0e0874eb89e5a901081905fa54c69727
Author: Avesh Agarwal <avagarwa at redhat.com>
Date: Fri Aug 13 14:12:13 2010 -0400
* Fri Aug 13 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.28-1
- New upstream release
- Updated existing patches
.gitignore | 1 +
openswan-2.6-relpath.patch | 12 ++--
openswan-600167.patch | 24 ++++----
openswan-600174.patch | 21 ++++++
openswan-ipsec-help-524146-509318.patch | 6 +-
openswan-nm-584224-600174.patch | 104 -------------------------------
openswan.spec | 8 ++-
sources | 2 +-
8 files changed, 50 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fc67be..8b0cd3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ openswan-2.6.23.tar.gz
openswan-2.6.24.tar.gz
openswan-2.6.25.tar.gz
openswan-2.6.27.tar.gz
+openswan-2.6.28.tar.gz
diff --git a/openswan-2.6-relpath.patch b/openswan-2.6-relpath.patch
index 001eaa6..598d11f 100644
--- a/openswan-2.6-relpath.patch
+++ b/openswan-2.6-relpath.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.27-orig/Makefile.inc openswan-2.6.27-cvs-patched/Makefile.inc
---- openswan-2.6.27-orig/Makefile.inc 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/Makefile.inc 2010-07-02 14:39:23.856116570 -0400
+diff -urNp openswan-2.6.28-orig/Makefile.inc openswan-2.6.28-cvs-patched/Makefile.inc
+--- openswan-2.6.28-orig/Makefile.inc 2010-08-13 12:32:39.498355929 -0400
++++ openswan-2.6.28-cvs-patched/Makefile.inc 2010-08-13 12:31:32.151347825 -0400
@@ -123,6 +123,8 @@ FINALRCDIR=$(shell for d in $(INC_RCDIRS
do if test -d $(DESTDIR)/$$d ; \
then echo $$d ; exit 0 ; \
@@ -10,9 +10,9 @@ diff -urNp openswan-2.6.27-orig/Makefile.inc openswan-2.6.27-cvs-patched/Makefil
RCDIR=$(DESTDIR)$(FINALRCDIR)
-diff -urNp openswan-2.6.27-orig/programs/setup/Makefile openswan-2.6.27-cvs-patched/programs/setup/Makefile
---- openswan-2.6.27-orig/programs/setup/Makefile 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/setup/Makefile 2010-07-02 14:39:52.001360412 -0400
+diff -urNp openswan-2.6.28-orig/programs/setup/Makefile openswan-2.6.28-cvs-patched/programs/setup/Makefile
+--- openswan-2.6.28-orig/programs/setup/Makefile 2010-08-13 12:32:39.514356039 -0400
++++ openswan-2.6.28-cvs-patched/programs/setup/Makefile 2010-08-13 12:31:56.645349136 -0400
@@ -32,7 +32,7 @@ include ${srcdir}../Makefile.program
doinstall:: setup
@rm -f $(BINDIR)/setup
diff --git a/openswan-600167.patch b/openswan-600167.patch
index 4a48418..8afbeef 100644
--- a/openswan-600167.patch
+++ b/openswan-600167.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.27-orig/programs/auto/auto.in openswan-2.6.27-cvs-patched/programs/auto/auto.in
---- openswan-2.6.27-orig/programs/auto/auto.in 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/auto/auto.in 2010-07-02 15:24:00.962354620 -0400
+diff -urNp openswan-2.6.28-orig/programs/auto/auto.in openswan-2.6.28-cvs-patched/programs/auto/auto.in
+--- openswan-2.6.28-orig/programs/auto/auto.in 2010-08-13 12:32:39.526355843 -0400
++++ openswan-2.6.28-cvs-patched/programs/auto/auto.in 2010-08-13 12:46:09.160348224 -0400
@@ -40,6 +40,112 @@ op=
argc=
utc=
@@ -114,9 +114,9 @@ diff -urNp openswan-2.6.27-orig/programs/auto/auto.in openswan-2.6.27-cvs-patche
for dummy
do
case "$1" in
-diff -urNp openswan-2.6.27-orig/programs/pluto/connections.c openswan-2.6.27-cvs-patched/programs/pluto/connections.c
---- openswan-2.6.27-orig/programs/pluto/connections.c 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/pluto/connections.c 2010-07-02 15:26:16.746351708 -0400
+diff -urNp openswan-2.6.28-orig/programs/pluto/connections.c openswan-2.6.28-cvs-patched/programs/pluto/connections.c
+--- openswan-2.6.28-orig/programs/pluto/connections.c 2010-08-13 12:32:39.529366288 -0400
++++ openswan-2.6.28-cvs-patched/programs/pluto/connections.c 2010-08-13 12:47:28.026361321 -0400
@@ -457,7 +457,7 @@ check_orientations(void)
}
}
@@ -136,9 +136,9 @@ diff -urNp openswan-2.6.27-orig/programs/pluto/connections.c openswan-2.6.27-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.27-orig/programs/pluto/connections.h openswan-2.6.27-cvs-patched/programs/pluto/connections.h
---- openswan-2.6.27-orig/programs/pluto/connections.h 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/pluto/connections.h 2010-07-02 15:28:20.438354071 -0400
+diff -urNp openswan-2.6.28-orig/programs/pluto/connections.h openswan-2.6.28-cvs-patched/programs/pluto/connections.h
+--- openswan-2.6.28-orig/programs/pluto/connections.h 2010-08-13 12:32:39.540355907 -0400
++++ openswan-2.6.28-cvs-patched/programs/pluto/connections.h 2010-08-13 12:47:45.981097622 -0400
@@ -289,6 +289,8 @@ extern size_t format_end(char *buf, size
, const struct end *this, const struct end *that
, bool is_left, lset_t policy);
@@ -148,9 +148,9 @@ diff -urNp openswan-2.6.27-orig/programs/pluto/connections.h openswan-2.6.27-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.27-orig/programs/pluto/initiate.c openswan-2.6.27-cvs-patched/programs/pluto/initiate.c
---- openswan-2.6.27-orig/programs/pluto/initiate.c 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/pluto/initiate.c 2010-07-02 15:35:02.219359079 -0400
+diff -urNp openswan-2.6.28-orig/programs/pluto/initiate.c openswan-2.6.28-cvs-patched/programs/pluto/initiate.c
+--- openswan-2.6.28-orig/programs/pluto/initiate.c 2010-08-13 12:32:39.527355693 -0400
++++ openswan-2.6.28-cvs-patched/programs/pluto/initiate.c 2010-08-13 12:49:08.196356440 -0400
@@ -151,6 +151,121 @@ struct initiate_stuff {
enum crypto_importance importance;
};
diff --git a/openswan-600174.patch b/openswan-600174.patch
new file mode 100644
index 0000000..cc886c1
--- /dev/null
+++ b/openswan-600174.patch
@@ -0,0 +1,21 @@
+diff -urNp openswan-2.6.28-orig/programs/_updown.netkey/_updown.netkey.in openswan-2.6.28-cvs-patched/programs/_updown.netkey/_updown.netkey.in
+--- openswan-2.6.28-orig/programs/_updown.netkey/_updown.netkey.in 2010-08-13 12:32:39.499355849 -0400
++++ openswan-2.6.28-cvs-patched/programs/_updown.netkey/_updown.netkey.in 2010-08-13 12:41:22.129348564 -0400
+@@ -270,8 +270,15 @@ fi
+ addsource() {
+ st=0
+ # check if given sourceip is local and add as alias if not
+- if ! ip -o route get ${PLUTO_MY_SOURCEIP%/*} | grep -q ^local; then
+- it="ip addr add ${PLUTO_MY_SOURCEIP%/*}/32 dev ${PLUTO_INTERFACE%:*}"
++ saddr=${PLUTO_MY_SOURCEIP%/*}/32
++ if test "${PLUTO_PEER_CLIENT##*/}" != 32
++ then
++ saddr=${PLUTO_MY_SOURCEIP%/*}/"${PLUTO_PEER_CLIENT##*/}"
++ fi
++
++ if ! ip addr show dev ${PLUTO_INTERFACE%:*} | grep -qs "inet ${saddr}"
++ then
++ it="ip addr add ${saddr} dev ${PLUTO_INTERFACE%:*}"
+ oops="`eval $it 2>&1`"
+ st=$?
+ if [ " $oops" = " " -a " $st" != " 0" ]; then
diff --git a/openswan-ipsec-help-524146-509318.patch b/openswan-ipsec-help-524146-509318.patch
index 958782f..74d92e6 100644
--- a/openswan-ipsec-help-524146-509318.patch
+++ b/openswan-ipsec-help-524146-509318.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.27-orig/programs/ipsec/ipsec.in openswan-2.6.27-cvs-patched/programs/ipsec/ipsec.in
---- openswan-2.6.27-orig/programs/ipsec/ipsec.in 2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/ipsec/ipsec.in 2010-07-02 14:45:45.573355284 -0400
+diff -urNp openswan-2.6.28-orig/programs/ipsec/ipsec.in openswan-2.6.28-cvs-patched/programs/ipsec/ipsec.in
+--- openswan-2.6.28-orig/programs/ipsec/ipsec.in 2010-08-13 12:32:39.552355921 -0400
++++ openswan-2.6.28-cvs-patched/programs/ipsec/ipsec.in 2010-08-13 12:37:16.270127186 -0400
@@ -79,9 +79,9 @@ case "$1" in
--help)
echo "Usage: ipsec command argument ..."
diff --git a/openswan.spec b/openswan.spec
index 6dbd689..815fcc6 100644
--- a/openswan.spec
+++ b/openswan.spec
@@ -8,7 +8,7 @@
Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
Name: openswan
-Version: 2.6.27
+Version: 2.6.28
Release: 1%{?dist}
License: GPLv2+
@@ -19,7 +19,7 @@ Source2: ipsec.conf
Patch1: openswan-2.6-relpath.patch
Patch2: openswan-ipsec-help-524146-509318.patch
-Patch3: openswan-nm-584224-600174.patch
+Patch3: openswan-600174.patch
Patch4: openswan-600167.patch
Group: System Environment/Daemons
@@ -230,6 +230,10 @@ fi
chkconfig --add ipsec || :
%changelog
+* Fri Aug 13 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.28-1
+- New upstream release
+- Updated existing patches
+
* Fri Jul 2 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.27-1
- NetworkManager-openswan plugin related changes
- Fixes for bz 600167
diff --git a/sources b/sources
index 1a03d29..0aecb02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5177b7401bb89e84ca1c89029143441e openswan-2.6.27.tar.gz
+37f2ad2664dd89e6ad96ae82f6378166 openswan-2.6.28.tar.gz
More information about the scm-commits
mailing list