[openswan/f16] Fixes 725371: new upstream release Updated local patches
avesh agarwal
avesh at fedoraproject.org
Mon Aug 1 21:18:50 UTC 2011
commit 9acd3e4cba5191f4eabcc19b0d283cb592eff58c
Author: Avesh Agarwal <avagarwa at redhat.com>
Date: Mon Aug 1 17:18:39 2011 -0400
Fixes 725371: new upstream release
Updated local patches
.gitignore | 1 +
openswan-2.6-relpath.patch | 12 ++--
...sco-704118.patch => openswan-cisco-issues.patch | 77 ++++++++++++--------
openswan-ipsec-help-524146-509318.patch | 6 +-
openswan.spec | 8 ++-
sources | 2 +-
6 files changed, 64 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3ae64c..3059c13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ openswan-2.6.28.tar.gz
/openswan-2.6.32.tar.gz
/openswan-2.6.32.tar.gz.asc
/openswan-2.6.34.tar.gz
+/openswan-2.6.35.tar.gz
diff --git a/openswan-2.6-relpath.patch b/openswan-2.6-relpath.patch
index def018d..a86f28e 100644
--- a/openswan-2.6-relpath.patch
+++ b/openswan-2.6-relpath.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.34-orig/Makefile.inc openswan-2.6.34-cvs-patched/Makefile.inc
---- openswan-2.6.34-orig/Makefile.inc 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/Makefile.inc 2011-06-28 11:09:44.620359574 -0400
+diff -urNp openswan-2.6.35-orig/Makefile.inc openswan-2.6.35-cvs-patched/Makefile.inc
+--- openswan-2.6.35-orig/Makefile.inc 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/Makefile.inc 2011-08-01 16:04:54.411576629 -0400
@@ -123,6 +123,8 @@ FINALRCDIR?=$(shell for d in $(INC_RCDIR
do if test -d $(DESTDIR)/$$d ; \
then echo $$d ; exit 0 ; \
@@ -10,9 +10,9 @@ diff -urNp openswan-2.6.34-orig/Makefile.inc openswan-2.6.34-cvs-patched/Makefil
RCDIR?=$(DESTDIR)$(FINALRCDIR)
-diff -urNp openswan-2.6.34-orig/programs/setup/Makefile openswan-2.6.34-cvs-patched/programs/setup/Makefile
---- openswan-2.6.34-orig/programs/setup/Makefile 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/setup/Makefile 2011-06-28 11:10:02.954193631 -0400
+diff -urNp openswan-2.6.35-orig/programs/setup/Makefile openswan-2.6.35-cvs-patched/programs/setup/Makefile
+--- openswan-2.6.35-orig/programs/setup/Makefile 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/setup/Makefile 2011-08-01 16:04:54.411576629 -0400
@@ -37,7 +37,7 @@ doinstall:: $(PROGRAM) $(CONFFILES) $(EX
@mkdir -p $(RCDIR) $(BINDIR)
# install and link everything
diff --git a/openswan-cisco-704118.patch b/openswan-cisco-issues.patch
similarity index 71%
rename from openswan-cisco-704118.patch
rename to openswan-cisco-issues.patch
index 57d7337..192f160 100644
--- a/openswan-cisco-704118.patch
+++ b/openswan-cisco-issues.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.34-orig/programs/pluto/connections.c openswan-2.6.34-cvs-patched/programs/pluto/connections.c
---- openswan-2.6.34-orig/programs/pluto/connections.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/connections.c 2011-06-28 11:14:16.583893599 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/connections.c openswan-2.6.35-cvs-patched/programs/pluto/connections.c
+--- openswan-2.6.35-orig/programs/pluto/connections.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/connections.c 2011-08-01 16:15:36.750319149 -0400
@@ -222,7 +222,7 @@ delete_end(struct connection *c UNUSED,
pfreeany(e->host_addr_name);
}
@@ -10,9 +10,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/connections.c openswan-2.6.34-cvs
delete_sr(struct connection *c, struct spd_route *sr)
{
delete_end(c, sr, &sr->this);
-diff -urNp openswan-2.6.34-orig/programs/pluto/connections.h openswan-2.6.34-cvs-patched/programs/pluto/connections.h
---- openswan-2.6.34-orig/programs/pluto/connections.h 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/connections.h 2011-06-28 11:14:34.286732473 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/connections.h openswan-2.6.35-cvs-patched/programs/pluto/connections.h
+--- openswan-2.6.35-orig/programs/pluto/connections.h 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/connections.h 2011-08-01 16:15:36.752319129 -0400
@@ -304,6 +304,7 @@ extern void release_connection(struct co
extern void delete_connection(struct connection *c, bool relations);
extern void delete_connections_by_name(const char *name, bool strict);
@@ -21,9 +21,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/connections.h openswan-2.6.34-cvs
extern char *add_group_instance(struct connection *group, const ip_subnet *target);
extern void remove_group_instance(const struct connection *group, const char *name);
extern void release_dead_interfaces(void);
-diff -urNp openswan-2.6.34-orig/programs/pluto/ikev1_aggr.c openswan-2.6.34-cvs-patched/programs/pluto/ikev1_aggr.c
---- openswan-2.6.34-orig/programs/pluto/ikev1_aggr.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/ikev1_aggr.c 2011-06-28 11:15:28.105240612 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/ikev1_aggr.c openswan-2.6.35-cvs-patched/programs/pluto/ikev1_aggr.c
+--- openswan-2.6.35-orig/programs/pluto/ikev1_aggr.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/ikev1_aggr.c 2011-08-01 16:15:36.753319119 -0400
@@ -1183,7 +1183,7 @@ aggr_outI1_tail(struct pluto_crypto_req_
}
#endif
@@ -33,9 +33,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/ikev1_aggr.c openswan-2.6.34-cvs-
reset_cur_state();
return STF_INTERNAL_ERROR;
}
-diff -urNp openswan-2.6.34-orig/programs/pluto/ikev1_main.c openswan-2.6.34-cvs-patched/programs/pluto/ikev1_main.c
---- openswan-2.6.34-orig/programs/pluto/ikev1_main.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/ikev1_main.c 2011-06-28 11:15:43.311102352 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/ikev1_main.c openswan-2.6.35-cvs-patched/programs/pluto/ikev1_main.c
+--- openswan-2.6.35-orig/programs/pluto/ikev1_main.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/ikev1_main.c 2011-08-01 16:15:36.762319030 -0400
@@ -216,7 +216,7 @@ main_outI1(int whack_sock
int np = --numvidtosend > 0 ? ISAKMP_NEXT_VID : ISAKMP_NEXT_NONE;
@@ -45,9 +45,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/ikev1_main.c openswan-2.6.34-cvs-
reset_cur_state();
return STF_INTERNAL_ERROR;
}
-diff -urNp openswan-2.6.34-orig/programs/pluto/kernel.c openswan-2.6.34-cvs-patched/programs/pluto/kernel.c
---- openswan-2.6.34-orig/programs/pluto/kernel.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/kernel.c 2011-06-28 11:16:54.142454550 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/kernel.c openswan-2.6.35-cvs-patched/programs/pluto/kernel.c
+--- openswan-2.6.35-orig/programs/pluto/kernel.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/kernel.c 2011-08-01 16:15:36.763319021 -0400
@@ -436,6 +436,7 @@ fmt_common_shell_out(char *buf, int blen
#endif
"%s " /* PLUTO_MY_SRCIP - if any */
@@ -64,9 +64,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/kernel.c openswan-2.6.34-cvs-patc
, c->cisco_dns_info ? c->cisco_dns_info : ""
, c->cisco_domain_info ? c->cisco_domain_info : ""
, c->cisco_banner ? c->cisco_banner : ""
-diff -urNp openswan-2.6.34-orig/programs/pluto/nat_traversal.c openswan-2.6.34-cvs-patched/programs/pluto/nat_traversal.c
---- openswan-2.6.34-orig/programs/pluto/nat_traversal.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/nat_traversal.c 2011-06-28 11:17:13.280280126 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/nat_traversal.c openswan-2.6.35-cvs-patched/programs/pluto/nat_traversal.c
+--- openswan-2.6.35-orig/programs/pluto/nat_traversal.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/nat_traversal.c 2011-08-01 16:15:36.765319001 -0400
@@ -198,7 +198,7 @@ static void _natd_hash(const struct hash
*
* Used when we're Initiator
@@ -97,9 +97,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/nat_traversal.c openswan-2.6.34-c
if (r) r = out_vid(np, outs, VID_NATT_IETF_00);
}
return r;
-diff -urNp openswan-2.6.34-orig/programs/pluto/nat_traversal.h openswan-2.6.34-cvs-patched/programs/pluto/nat_traversal.h
---- openswan-2.6.34-orig/programs/pluto/nat_traversal.h 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/nat_traversal.h 2011-06-28 11:17:24.523176911 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/nat_traversal.h openswan-2.6.35-cvs-patched/programs/pluto/nat_traversal.h
+--- openswan-2.6.35-orig/programs/pluto/nat_traversal.h 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/nat_traversal.h 2011-08-01 16:15:36.767318981 -0400
@@ -129,7 +129,7 @@ extern int nat_traversal_espinudp_socket
*/
#ifndef PB_STREAM_UNDEFINED
@@ -109,9 +109,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/nat_traversal.h openswan-2.6.34-c
#endif
u_int32_t nat_traversal_vid_to_method(unsigned short nat_t_vid);
-diff -urNp openswan-2.6.34-orig/programs/pluto/spdb_v1_struct.c openswan-2.6.34-cvs-patched/programs/pluto/spdb_v1_struct.c
---- openswan-2.6.34-orig/programs/pluto/spdb_v1_struct.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/spdb_v1_struct.c 2011-06-28 11:18:07.821779560 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/spdb_v1_struct.c openswan-2.6.35-cvs-patched/programs/pluto/spdb_v1_struct.c
+--- openswan-2.6.35-orig/programs/pluto/spdb_v1_struct.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/spdb_v1_struct.c 2011-08-01 16:15:36.767318981 -0400
@@ -1527,7 +1527,7 @@ parse_ipsec_transform(struct isakmp_tran
case SA_LIFE_TYPE_SECONDS:
/* silently limit duration to our maximum */
@@ -135,9 +135,9 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/spdb_v1_struct.c openswan-2.6.34-
}
else if (st->hidden_variables.st_nat_traversal & NAT_T_DETECTED) {
attrs->encapsulation = val - ENCAPSULATION_MODE_UDP_TUNNEL_DRAFTS + ENCAPSULATION_MODE_TUNNEL;
-diff -urNp openswan-2.6.34-orig/programs/pluto/xauth.c openswan-2.6.34-cvs-patched/programs/pluto/xauth.c
---- openswan-2.6.34-orig/programs/pluto/xauth.c 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/pluto/xauth.c 2011-06-28 11:20:21.221553632 -0400
+diff -urNp openswan-2.6.35-orig/programs/pluto/xauth.c openswan-2.6.35-cvs-patched/programs/pluto/xauth.c
+--- openswan-2.6.35-orig/programs/pluto/xauth.c 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/pluto/xauth.c 2011-08-01 16:15:36.768318971 -0400
@@ -1783,7 +1783,9 @@ modecfg_inR1(struct msg_digest *md)
, caddr);
@@ -212,9 +212,26 @@ diff -urNp openswan-2.6.34-orig/programs/pluto/xauth.c openswan-2.6.34-cvs-patch
while (len > 0) {
u_int32_t *ap;
tmp_spd = clone_thing(c->spd, "remote subnets policies");
-diff -urNp openswan-2.6.34-orig/programs/_updown.netkey/_updown.netkey.in openswan-2.6.34-cvs-patched/programs/_updown.netkey/_updown.netkey.in
---- openswan-2.6.34-orig/programs/_updown.netkey/_updown.netkey.in 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/_updown.netkey/_updown.netkey.in 2011-06-28 11:21:19.484019282 -0400
+@@ -1933,13 +1956,13 @@ modecfg_inR1(struct msg_digest *md)
+ tmp_spd->that.cert.type = 0;
+
+ tmp_spd->this.ca.ptr = NULL;
+- tmp_spd->this.ca.ptr = NULL;
++ tmp_spd->that.ca.ptr = NULL;
+
+ tmp_spd->this.groups = NULL;
+- tmp_spd->this.groups = NULL;
++ tmp_spd->that.groups = NULL;
+
+ tmp_spd->this.virt = NULL;
+- tmp_spd->this.virt = NULL;
++ tmp_spd->that.virt = NULL;
+
+ tmp_spd->next = NULL;
+ tmp_spd2->next = tmp_spd;
+diff -urNp openswan-2.6.35-orig/programs/_updown.netkey/_updown.netkey.in openswan-2.6.35-cvs-patched/programs/_updown.netkey/_updown.netkey.in
+--- openswan-2.6.35-orig/programs/_updown.netkey/_updown.netkey.in 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/_updown.netkey/_updown.netkey.in 2011-08-01 16:15:36.769318961 -0400
@@ -188,6 +188,14 @@ downroute() {
ip route flush cache
}
diff --git a/openswan-ipsec-help-524146-509318.patch b/openswan-ipsec-help-524146-509318.patch
index e26e1af..af61405 100644
--- a/openswan-ipsec-help-524146-509318.patch
+++ b/openswan-ipsec-help-524146-509318.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.34-orig/programs/ipsec/ipsec.in openswan-2.6.34-cvs-patched/programs/ipsec/ipsec.in
---- openswan-2.6.34-orig/programs/ipsec/ipsec.in 2011-06-08 14:02:31.000000000 -0400
-+++ openswan-2.6.34-cvs-patched/programs/ipsec/ipsec.in 2011-06-28 11:10:40.705854149 -0400
+diff -urNp openswan-2.6.35-orig/programs/ipsec/ipsec.in openswan-2.6.35-cvs-patched/programs/ipsec/ipsec.in
+--- openswan-2.6.35-orig/programs/ipsec/ipsec.in 2011-07-23 16:53:13.000000000 -0400
++++ openswan-2.6.35-cvs-patched/programs/ipsec/ipsec.in 2011-08-01 16:06:01.315928192 -0400
@@ -80,9 +80,9 @@ case "$1" in
--help)
echo "Usage: ipsec command argument ..."
diff --git a/openswan.spec b/openswan.spec
index b28f591..d578627 100644
--- a/openswan.spec
+++ b/openswan.spec
@@ -7,7 +7,7 @@
Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
Name: openswan
-Version: 2.6.34
+Version: 2.6.35
Release: 1%{?dist}
License: GPLv2+
@@ -18,7 +18,7 @@ Source2: ipsec.conf
Patch1: openswan-2.6-relpath.patch
Patch2: openswan-ipsec-help-524146-509318.patch
-Patch3: openswan-cisco-704118.patch
+Patch3: openswan-cisco-issues.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -196,6 +196,10 @@ fi
chkconfig --add ipsec || :
%changelog
+* Mon Aug 1 2011 Avesh Agarwal <avagarwa at redhat.com> - 2.6.35-1
+- Fixes 725371: new upstream release
+- Updated local patches
+
* Tue Jun 28 2011 Avesh Agarwal <avagarwa at redhat.com> - 2.6.34-1
- New upstream release openswan-2.6.34
- Fixes 716145: Openswan Failed To Build From Source against
diff --git a/sources b/sources
index 57f3d7f..093d8a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9861503498efd74867277f46bdc0a98a openswan-2.6.34.tar.gz
+7909a251fbbb807914545b7f42437013 openswan-2.6.35.tar.gz
More information about the scm-commits
mailing list