rpms/ipsec-tools/devel .cvsignore, 1.6, 1.7 ipsec-tools-0.5-64bit.patch, 1.1, 1.2 ipsec-tools.spec, 1.15, 1.16 sources, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8636

Modified Files:
	.cvsignore ipsec-tools-0.5-64bit.patch ipsec-tools.spec 
	sources 
Log Message:
- version 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Feb 2005 22:17:53 -0000	1.6
+++ .cvsignore	13 Oct 2005 08:16:39 -0000	1.7
@@ -1 +1 @@
-ipsec-tools-0.5.tar.bz2
+ipsec-tools-0.6.1.tar.bz2

ipsec-tools-0.5-64bit.patch:
 ipsec_doi.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ipsec-tools-0.5-64bit.patch
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools-0.5-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipsec-tools-0.5-64bit.patch	28 Mar 2005 19:11:27 -0000	1.1
+++ ipsec-tools-0.5-64bit.patch	13 Oct 2005 08:16:39 -0000	1.2
@@ -1,11 +1,11 @@
---- ipsec-tools-0.5/src/racoon/ipsec_doi.c.foo	2005-03-28 14:05:24.000000000 -0500
-+++ ipsec-tools-0.5/src/racoon/ipsec_doi.c	2005-03-28 14:08:00.000000000 -0500
-@@ -2550,7 +2550,7 @@
+--- ipsec-tools-0.6.1/src/racoon/ipsec_doi.c.64bit	2005-07-12 13:50:15.000000000 +0200
++++ ipsec-tools-0.6.1/src/racoon/ipsec_doi.c	2005-10-12 12:21:43.000000000 +0200
+@@ -2695,7 +2695,7 @@
  		attrlen += sizeof(struct isakmp_data)
  			+ sizeof(struct isakmp_data);
  		if (sa->lifetime > 0xffff)
--			attrlen += sizeof(sa->lifetime);
-+			attrlen += sizeof(u_int32_t);
+-			attrlen += sizeof(lifetime);
++                        attrlen += sizeof(u_int32_t);
  		if (buf) {
  			p = isakmp_set_attr_l(p, OAKLEY_ATTR_SA_LD_TYPE,
  						OAKLEY_ATTR_SA_LD_TYPE_SEC);


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ipsec-tools.spec	28 Mar 2005 19:11:27 -0000	1.15
+++ ipsec-tools.spec	13 Oct 2005 08:16:39 -0000	1.16
@@ -1,6 +1,6 @@
 Name: ipsec-tools
-Version: 0.5
-Release: 4
+Version: 0.6.1
+Release: 1
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -14,8 +14,6 @@
 Source6: udp.h
 Patch: ipsec-tools-0.5-libs.patch
 Patch2: isakmp.c.diff
-Patch3: ipsec-tools-0.3.3-stdin.patch
-Patch4: ipsec-tools-fix.diff
 Patch5: ipsec-tools-0.5-64bit.patch
 BuildPrereq: openssl-devel, krb5-devel, bison, flex
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -33,9 +31,7 @@
 %setup -q
 %patch -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
+%patch5 -p1 -b .64bit
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -45,6 +41,7 @@
 CFLAGS="$RPM_OPT_FLAGS" %configure \
  --with-kernel-headers=`pwd`/kernel-headers \
  --sysconfdir=/etc/racoon \
+ --without-readline \
  --enable-adminport \
  --enable-hybrid \
  --enable-frag \
@@ -60,6 +57,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 # no devel stuff for now
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libipsec.{a,la} \
+      $RPM_BUILD_ROOT/%{_libdir}/libracoon.{a,la} \
       $RPM_BUILD_ROOT/%{_includedir} \
       $RPM_BUILD_ROOT/%{_mandir}/man3
 
@@ -90,6 +88,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Wed Oct 12 2005 Harald Hoyer <harald at redhat.com> 0.6.1-1
+- version 0.6.1
+
 * Mon Mar 28 2005 Bill Nottingham <notting at redhat.com> 0.5-4
 - fix 64-bit issue in setph1attr() (<aviro at redhat.com>)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Feb 2005 22:17:53 -0000	1.6
+++ sources	13 Oct 2005 08:16:39 -0000	1.7
@@ -1 +1 @@
-5447480467377ef8f7b9fda109ff2877  ipsec-tools-0.5.tar.bz2
+0206b64d6531cb5fa3f195fe17e7c2a2  ipsec-tools-0.6.1.tar.bz2