Mon Mar 29 18:36:23 UTC 2010

Author: avesh

Update of /cvs/pkgs/rpms/openswan/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8188

Modified Files:
	.cvsignore openswan-2.6-relpath.patch 
	openswan-2.6-selinux.patch 
	openswan-ipsec-help-524146-509318.patch openswan-rfc5114.patch 
	openswan.spec sources 
Removed Files:
	openswan-2.6.24-nspr.patch openswan-2.6.24-warnings.patch 
	openswan-565140.patch openswan-cisco-additional.patch 
	openswan-hmac-sha1-96.patch openswan-setup.patch 
	openswan-various-fixes.patch 
Log Message:
* Mon Mar 29 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.25-1
- New upstream release
- Updated existing patches that could not make into this release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30

--- .cvsignore	11 Jan 2010 18:02:35 -0000	1.29
+++ .cvsignore	29 Mar 2010 18:36:19 -0000	1.30
@@ -1,15 +1 @@
-openswan-2.6.02.tar.gz
-openswan-2.6.03.tar.gz
-openswan-2.6.04.tar.gz
-openswan-2.6.05rh.tar.gz
-openswan-2.6.07.tar.gz
-openswan-2.6.09.tar.gz
-openswan-2.6.14.tar.gz
-openswan-2.6.15.tar.gz
-openswan-2.6.16.tar.gz
-openswan-2.6.18.tar.gz
-openswan-2.6.19.tar.gz
-openswan-2.6.21.tar.gz
-openswan-2.6.22.tar.gz
-openswan-2.6.23.tar.gz
-openswan-2.6.24.tar.gz
+openswan-2.6.25.tar.gz

openswan-2.6-relpath.patch:
 Makefile.inc            |    2 ++
 programs/setup/Makefile |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: openswan-2.6-relpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/openswan-2.6-relpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openswan-2.6-relpath.patch	11 Jan 2010 18:02:35 -0000	1.2
+++ openswan-2.6-relpath.patch	29 Mar 2010 18:36:19 -0000	1.3
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.24-orig/Makefile.inc openswan-2.6.24/Makefile.inc
---- openswan-2.6.24-orig/Makefile.inc	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24/Makefile.inc	2010-01-11 12:15:53.000000000 -0500
+diff -urNp openswan-2.6.25-orig/Makefile.inc openswan-2.6.25/Makefile.inc
+--- openswan-2.6.25-orig/Makefile.inc	2010-03-21 13:39:35.000000000 -0400
++++ openswan-2.6.25/Makefile.inc	2010-03-29 12:06:47.000000000 -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.24-orig/Makefile
  RCDIR=$(DESTDIR)$(FINALRCDIR)
  
  
-diff -urNp openswan-2.6.24-orig/programs/setup/Makefile openswan-2.6.24/programs/setup/Makefile
---- openswan-2.6.24-orig/programs/setup/Makefile	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24/programs/setup/Makefile	2010-01-11 12:15:53.000000000 -0500
+diff -urNp openswan-2.6.25-orig/programs/setup/Makefile openswan-2.6.25/programs/setup/Makefile
+--- openswan-2.6.25-orig/programs/setup/Makefile	2010-03-21 13:39:35.000000000 -0400
++++ openswan-2.6.25/programs/setup/Makefile	2010-03-29 12:01:08.000000000 -0400
 @@ -32,7 +32,7 @@ include ${srcdir}../Makefile.program
  doinstall:: setup
  	@rm -f $(BINDIR)/setup

openswan-2.6-selinux.patch:
 verify.in |   13 -------------
 1 file changed, 13 deletions(-)

Index: openswan-2.6-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/openswan-2.6-selinux.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openswan-2.6-selinux.patch	11 Jan 2010 18:02:35 -0000	1.4
+++ openswan-2.6-selinux.patch	29 Mar 2010 18:36:20 -0000	1.5
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.24-orig/programs/verify/verify.in openswan-2.6.24/programs/verify/verify.in
---- openswan-2.6.24-orig/programs/verify/verify.in	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24/programs/verify/verify.in	2010-01-11 12:17:47.000000000 -0500
+diff -urNp openswan-2.6.25-orig/programs/verify/verify.in openswan-2.6.25/programs/verify/verify.in
+--- openswan-2.6.25-orig/programs/verify/verify.in	2010-03-21 13:39:35.000000000 -0400
++++ openswan-2.6.25/programs/verify/verify.in	2010-03-29 12:05:30.000000000 -0400
 @@ -276,19 +276,6 @@ sub installstartcheck {
  	   } else { warnchk "","UNKNOWN"; }
  	}

openswan-ipsec-help-524146-509318.patch:
 ipsec.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: openswan-ipsec-help-524146-509318.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/openswan-ipsec-help-524146-509318.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openswan-ipsec-help-524146-509318.patch	3 Mar 2010 19:19:11 -0000	1.1
+++ openswan-ipsec-help-524146-509318.patch	29 Mar 2010 18:36:22 -0000	1.2
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.24-orig/programs/ipsec/ipsec.in openswan-2.6.24/programs/ipsec/ipsec.in
---- openswan-2.6.24-orig/programs/ipsec/ipsec.in	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24/programs/ipsec/ipsec.in	2010-01-13 17:52:10.000000000 -0500
+diff -urNp openswan-2.6.25-orig/programs/ipsec/ipsec.in openswan-2.6.25/programs/ipsec/ipsec.in
+--- openswan-2.6.25-orig/programs/ipsec/ipsec.in	2010-03-21 13:39:35.000000000 -0400
++++ openswan-2.6.25/programs/ipsec/ipsec.in	2010-03-29 11:46:52.000000000 -0400
 @@ -79,9 +79,9 @@ case "$1" in
  --help)
  	echo "Usage: ipsec command argument ..."

openswan-rfc5114.patch:
 Makefile.inc                    |    3 +
 Makefile.top                    |    2 
 include/ietf_constants.h        |   84 ++++++++++++++++++++++++++++++++++++++++
 lib/libopenswan/Makefile        |    4 +
 lib/libopenswan/constants.c     |   22 ++++++++++
 programs/pluto/Makefile.options |    5 ++
 programs/pluto/crypt_ke.c       |   10 ++++
 programs/pluto/crypto.c         |   50 ++++++++++++++++++++++-
 programs/pluto/crypto.h         |    4 +
 9 files changed, 180 insertions(+), 4 deletions(-)

Index: openswan-rfc5114.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/openswan-rfc5114.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openswan-rfc5114.patch	18 Mar 2010 21:14:53 -0000	1.1
+++ openswan-rfc5114.patch	29 Mar 2010 18:36:22 -0000	1.2
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.24-cvs-patched/include/ietf_constants.h openswan-2.6.24-cvs-patched-modified/include/ietf_constants.h
---- openswan-2.6.24-cvs-patched/include/ietf_constants.h	2010-03-03 14:46:07.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/include/ietf_constants.h	2010-03-18 13:25:51.000000000 -0400
+diff -urNp openswan-2.6.25-orig/include/ietf_constants.h openswan-2.6.25/include/ietf_constants.h
+--- openswan-2.6.25-orig/include/ietf_constants.h	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/include/ietf_constants.h	2010-03-29 12:22:18.000000000 -0400
 @@ -21,6 +21,45 @@
  
  #define MODP_GENERATOR "2"
@@ -106,9 +106,9 @@ diff -urNp openswan-2.6.24-cvs-patched/i
  };
  
  /* Oakley Group Type attribute
-diff -urNp openswan-2.6.24-cvs-patched/lib/libopenswan/constants.c openswan-2.6.24-cvs-patched-modified/lib/libopenswan/constants.c
---- openswan-2.6.24-cvs-patched/lib/libopenswan/constants.c	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/lib/libopenswan/constants.c	2010-03-18 13:28:02.000000000 -0400
+diff -urNp openswan-2.6.25-orig/lib/libopenswan/constants.c openswan-2.6.25/lib/libopenswan/constants.c
+--- openswan-2.6.25-orig/lib/libopenswan/constants.c	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/lib/libopenswan/constants.c	2010-03-29 12:22:18.000000000 -0400
 @@ -793,9 +793,29 @@ static const char *const oakley_group_na
  	"OAKLEY_GROUP_MODP6144",
  	"OAKLEY_GROUP_MODP8192"
@@ -140,9 +140,9 @@ diff -urNp openswan-2.6.24-cvs-patched/l
  
  enum_names oakley_group_names =
      { OAKLEY_GROUP_MODP768, OAKLEY_GROUP_MODP1536, 
-diff -urNp openswan-2.6.24-cvs-patched/lib/libopenswan/Makefile openswan-2.6.24-cvs-patched-modified/lib/libopenswan/Makefile
---- openswan-2.6.24-cvs-patched/lib/libopenswan/Makefile	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/lib/libopenswan/Makefile	2010-03-18 13:29:00.000000000 -0400
+diff -urNp openswan-2.6.25-orig/lib/libopenswan/Makefile openswan-2.6.25/lib/libopenswan/Makefile
+--- openswan-2.6.25-orig/lib/libopenswan/Makefile	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/lib/libopenswan/Makefile	2010-03-29 12:22:18.000000000 -0400
 @@ -103,6 +103,10 @@ CFLAGS+=-DHAVE_LIBNSS
  CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
  endif
@@ -154,10 +154,10 @@ diff -urNp openswan-2.6.24-cvs-patched/l
  CFLAGS+=-DFINALCONFDIR=\"${FINALCONFDIR}\"
  CFLAGS+=-DFINALCONFDDIR=\"${FINALCONFDDIR}\"
  CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\"
-diff -urNp openswan-2.6.24-cvs-patched/Makefile.inc openswan-2.6.24-cvs-patched-modified/Makefile.inc
---- openswan-2.6.24-cvs-patched/Makefile.inc	2010-03-03 14:45:35.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/Makefile.inc	2010-03-18 13:30:58.000000000 -0400
-@@ -344,6 +344,9 @@ endif
+diff -urNp openswan-2.6.25-orig/Makefile.inc openswan-2.6.25/Makefile.inc
+--- openswan-2.6.25-orig/Makefile.inc	2010-03-29 12:23:53.000000000 -0400
++++ openswan-2.6.25/Makefile.inc	2010-03-29 12:22:18.000000000 -0400
+@@ -350,6 +350,9 @@ endif
  # Support for LIBCAP-NG to drop unneeded capabilities for the pluto daemon
  USE_LIBCAP_NG?=false
  
@@ -167,18 +167,18 @@ diff -urNp openswan-2.6.24-cvs-patched/M
  # whether to support NAT Traversal (aka NAT-T)
  USE_NAT_TRAVERSAL?=true
  
-diff -urNp openswan-2.6.24-cvs-patched/Makefile.top openswan-2.6.24-cvs-patched-modified/Makefile.top
---- openswan-2.6.24-cvs-patched/Makefile.top	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/Makefile.top	2010-03-18 13:31:23.000000000 -0400
+diff -urNp openswan-2.6.25-orig/Makefile.top openswan-2.6.25/Makefile.top
+--- openswan-2.6.25-orig/Makefile.top	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/Makefile.top	2010-03-29 12:22:18.000000000 -0400
 @@ -110,4 +110,4 @@ export USE_WEAKSTUFF USE_NOCRYPTO USE_EX
  export USE_TAPROOM USE_OBJDIR
  export HAVE_STATSD USE_DYNAMICDNS
  export USE_IPSEC_CONNECTION_LIMIT IPSEC_CONNECTION_LIMIT
 -export USE_LIBNSS USE_FIPSCHECK
 +export USE_LIBNSS USE_FIPSCHECK USE_MODP_RFC5114
-diff -urNp openswan-2.6.24-cvs-patched/programs/pluto/crypt_ke.c openswan-2.6.24-cvs-patched-modified/programs/pluto/crypt_ke.c
---- openswan-2.6.24-cvs-patched/programs/pluto/crypt_ke.c	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/programs/pluto/crypt_ke.c	2010-03-18 13:35:58.000000000 -0400
+diff -urNp openswan-2.6.25-orig/programs/pluto/crypt_ke.c openswan-2.6.25/programs/pluto/crypt_ke.c
+--- openswan-2.6.25-orig/programs/pluto/crypt_ke.c	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/programs/pluto/crypt_ke.c	2010-03-29 12:22:18.000000000 -0400
 @@ -89,7 +89,12 @@ void calc_ke(struct pluto_crypto_req *r)
      n_to_mpz(&secret, wire_chunk_ptr(kn, &(kn->secret)), LOCALSECRETSIZE);
      
@@ -205,9 +205,9 @@ diff -urNp openswan-2.6.24-cvs-patched/p
      prime = mpz_to_n2(group->modulus);
  
      dhp.prime.data=prime.ptr;
-diff -urNp openswan-2.6.24-cvs-patched/programs/pluto/crypto.c openswan-2.6.24-cvs-patched-modified/programs/pluto/crypto.c
---- openswan-2.6.24-cvs-patched/programs/pluto/crypto.c	2010-03-03 14:46:07.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/programs/pluto/crypto.c	2010-03-18 13:38:24.000000000 -0400
+diff -urNp openswan-2.6.25-orig/programs/pluto/crypto.c openswan-2.6.25/programs/pluto/crypto.c
+--- openswan-2.6.25-orig/programs/pluto/crypto.c	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/programs/pluto/crypto.c	2010-03-29 12:22:18.000000000 -0400
 @@ -59,7 +59,20 @@ static MP_INT
      modp6144_modulus,
      modp8192_modulus;
@@ -294,9 +294,9 @@ diff -urNp openswan-2.6.24-cvs-patched/p
  
  const unsigned int oakley_group_size = elemsof(oakley_group);
  
-diff -urNp openswan-2.6.24-cvs-patched/programs/pluto/crypto.h openswan-2.6.24-cvs-patched-modified/programs/pluto/crypto.h
---- openswan-2.6.24-cvs-patched/programs/pluto/crypto.h	2010-01-09 20:34:38.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/programs/pluto/crypto.h	2010-03-18 13:39:15.000000000 -0400
+diff -urNp openswan-2.6.25-orig/programs/pluto/crypto.h openswan-2.6.25/programs/pluto/crypto.h
+--- openswan-2.6.25-orig/programs/pluto/crypto.h	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/programs/pluto/crypto.h	2010-03-29 12:22:18.000000000 -0400
 @@ -42,6 +42,10 @@ extern MP_INT groupgenerator;	/* MODP gr
  
  struct oakley_group_desc {
@@ -308,18 +308,10 @@ diff -urNp openswan-2.6.24-cvs-patched/p
      MP_INT *modulus;
      size_t bytes;
  };
-diff -urNp openswan-2.6.24-cvs-patched/programs/pluto/Makefile.options openswan-2.6.24-cvs-patched-modified/programs/pluto/Makefile.options
---- openswan-2.6.24-cvs-patched/programs/pluto/Makefile.options	2010-03-03 14:45:35.000000000 -0500
-+++ openswan-2.6.24-cvs-patched-modified/programs/pluto/Makefile.options	2010-03-18 14:17:24.000000000 -0400
-@@ -302,7 +302,6 @@ PLUTOMINUSL+= ${X509_LLIBS} ${CURL_LLIBS
- PLUTOMINUSL+= ${XAUTH_LLIBS} ${XAUTHPAM_LIBS}
- PLUTOMINUSL+= ${OPENSSL_LIBS} ${LIBCRYPT} -lgmp # -lefence
- 
--
- # Use LIBNSS
- ifeq ($(USE_LIBNSS),true)
- HAVE_LIBNSS=1
-@@ -318,6 +317,11 @@ LIBSPLUTO+= -lfipscheck
+diff -urNp openswan-2.6.25-orig/programs/pluto/Makefile.options openswan-2.6.25/programs/pluto/Makefile.options
+--- openswan-2.6.25-orig/programs/pluto/Makefile.options	2010-03-29 12:23:41.000000000 -0400
++++ openswan-2.6.25/programs/pluto/Makefile.options	2010-03-29 12:22:18.000000000 -0400
+@@ -326,6 +326,11 @@ LIBSPLUTO+= -lfipscheck
  endif
  endif
  


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/openswan.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- openswan.spec	18 Mar 2010 21:14:54 -0000	1.88
+++ openswan.spec	29 Mar 2010 18:36:23 -0000	1.89
@@ -7,9 +7,9 @@
 
 Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
 Name: openswan
-Version: 2.6.24
+Version: 2.6.25
 
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -18,15 +18,8 @@ Source2: ipsec.conf
 
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-2.6-selinux.patch
-Patch3: openswan-2.6.24-nspr.patch
-Patch4: openswan-setup.patch
-Patch5: openswan-565140.patch
-Patch6: openswan-hmac-sha1-96.patch
-Patch7: openswan-2.6.24-warnings.patch
-Patch8: openswan-ipsec-help-524146-509318.patch
-Patch9: openswan-various-fixes.patch
-Patch10: openswan-cisco-additional.patch
-Patch11: openswan-rfc5114.patch
+Patch3: openswan-ipsec-help-524146-509318.patch
+Patch4: openswan-rfc5114.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,13 +77,6 @@ find doc -name .gitignore -print0 | xarg
 %patch2 -p1 -b .selinux
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 
@@ -240,6 +226,10 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Mar 29 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.25-1
+- New upstream release
+- Updated existing patches that could not make into this release
+
 * Thu Mar 18 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.24-5
 - Openswan-cisco interop functionality now inlcludes the
   processing of domain defintion attributes obtained from Cisco


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	11 Jan 2010 18:02:35 -0000	1.28
+++ sources	29 Mar 2010 18:36:23 -0000	1.29
@@ -1 +1 @@
-1c76b6982c05392f7c360afb92699661  openswan-2.6.24.tar.gz
+c1223786c9eb58950a4be0ab2d0a84d1  openswan-2.6.25.tar.gz


--- openswan-2.6.24-nspr.patch DELETED ---


--- openswan-2.6.24-warnings.patch DELETED ---


--- openswan-565140.patch DELETED ---


--- openswan-cisco-additional.patch DELETED ---


--- openswan-hmac-sha1-96.patch DELETED ---


--- openswan-setup.patch DELETED ---


--- openswan-various-fixes.patch DELETED ---

