Automatic import for version 2.6.28

2025-02-23 03:02:45 +00:00 · 2012-02-01 22:31:05 +04:00 · 2012-02-01 22:31:05 +04:00 · 078c7d9fa3
commit 078c7d9fa3
5 changed files with 312 additions and 0 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -0,0 +1,2 @@
+sources:
+  "openswan-2.6.28.tar.gz": bc6706d9070292c069bcea2f568e4467d8540194
--- a/openswan-2.6.21-format_not_a_string_literal_and_no_format_arguments.diff
+++ b/openswan-2.6.21-format_not_a_string_literal_and_no_format_arguments.diff
@ -0,0 +1,43 @@
+--- lib/libisc/mem.c	2009-03-30 15:11:28.000000000 +0200
+++ lib/libisc/mem.c.oden	2009-03-31 13:23:29.000000000 +0200
+@@ -1099,7 +1099,7 @@ print_active(isc_mem_t *mctx, FILE *out)
+ 		const char *format;
+ 		isc_boolean_t found;
+ 
+-		fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+		fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+ 					    ISC_MSG_DUMPALLOC,
+ 					    "Dump of all outstanding "
+ 					    "memory allocations:\n"));
+@@ -1125,7 +1125,7 @@ print_active(isc_mem_t *mctx, FILE *out)
+ 			}
+ 		}
+ 		if (!found)
+-			fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+			fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+ 						    ISC_MSG_NONE, "\tNone.\n"));
+ 	}
+ }
+@@ -1168,7 +1168,7 @@ isc_mem_stats(isc_mem_t *ctx, FILE *out)
+ 	 */
+ 	pool = ISC_LIST_HEAD(ctx->pools);
+ 	if (pool != NULL) {
+-		fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+		fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+ 					    ISC_MSG_POOLSTATS,
+ 					    "[Pool statistics]\n"));
+ 		fprintf(out, "%15s %10s %10s %10s %10s %10s %10s %10s %1s\n",
+--- programs/pluto/state.c	2009-03-30 15:11:28.000000000 +0200
+++ programs/pluto/state.c.oden	2009-03-31 13:26:52.000000000 +0200
+@@ -1408,9 +1408,9 @@ show_states_status(void)
+ 	  st = array[i];
+ 	  fmt_state(st, n, state_buf, sizeof(state_buf)
+ 		, state_buf2, sizeof(state_buf2));
+-	  whack_log(RC_COMMENT, state_buf);
+	  whack_log(RC_COMMENT, "%s", state_buf);
+ 	  if (state_buf2[0] != '\0')
+-		whack_log(RC_COMMENT, state_buf2);
+		whack_log(RC_COMMENT, "%s", state_buf2);
+ 
+ 	  /* show any associated pending Phase 2s */
+ 	  if (IS_PHASE1(st->st_state))
--- a/openswan-2.6.28-manfix.patch
+++ b/openswan-2.6.28-manfix.patch
@ -0,0 +1,11 @@
+--- programs/spi/spi.8	2010-07-29 20:45:59.000000000 +0200
+++ programs/spi/spi.8.dlucio	2010-09-03 02:34:15.000000000 +0200
+@@ -368,7 +368,7 @@
+ (4)\&.
+ .SH "FILES"
+ .PP
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
+/proc/net/ipsec_spi, /usr/sbin/ipsec
+ .SH "SEE ALSO"
+ .PP
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5)
--- a/openswan-2.6.28.tar.gz.asc
+++ b/openswan-2.6.28.tar.gz.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQEcBAABAgAGBQJMUcxwAAoJEA1YKYS36C343/8H/2xocAJG2FHMrm4PNsVaXBcM
+PL2jfA8mkDvdd3s3oHVolb/Nhce54JU43xk6mdJUeTeYs+pl6SNlL57Obf4sBcXW
+N6g/q+v7Ptf1r/vTYoEUB0F3K/aJBlML+iwW1ZVC3HXzf75ADJP+0vuGfrBOtzko
+OYPBSDrjGAwpoJhMLoIziwRV7nOAobAyGW2pQ6zMml6iLd9dHFlQJFboYsPECMiU
+dNk5NkSCmLTORP96fne1ruastrzi3TkPXHineRdBP7VbtYkBOgwaTHG5eIyWPFMP
+C7wtJQZpso1xB4JQXkiOD/wU+IvMvfPJfcNapcxn9zyNmCtZdE3BsP8D+OO4aKc=
+=SG6t
+-----END PGP SIGNATURE-----
--- a/openswan.spec
+++ b/openswan.spec
@ -0,0 +1,245 @@
+%define _enable_debug_packages %{nil}
+%define debug_package %{nil}
+
+Summary:	An implementation of IPSEC & IKE for Linux
+Name:		openswan
+Version:	2.6.28
+Release:	%mkrel 2
+License:	GPLv2+
+Group:		System/Servers
+URL:		http://www.openswan.org/
+Source0:	http://www.openswan.org/download/openswan-%{version}.tar.gz
+Source1:	http://www.openswan.org/download/openswan-%{version}.tar.gz.asc
+Patch0:		openswan-2.6.28-manfix.patch
+Patch1:		openswan-2.6.21-format_not_a_string_literal_and_no_format_arguments.diff
+Requires(post): rpm-helper
+Requires(preun): rpm-helper
+Provides:	ipsec-userland
+Requires:	lsof
+Requires:	iproute2
+Requires:	ipsec-tools
+Conflicts:	freeswan
+BuildRequires:	bison
+BuildRequires:	gmp-devel
+BuildRequires:	pam-devel
+BuildRequires:	dos2unix
+BuildRequires:	flex
+BuildRequires:  xmlto
+BuildRequires:	docbook-dtd412-xml
+BuildRoot:	%{_tmppath}/%{name}-buildroot
+
+%description
+Openswan is a free implementation of IPSEC & IKE for Linux, a fork of the
+FreeS/WAN project.
+
+IPSEC is Internet Protocol Security and uses strong cryptography to
+provide both authentication and encryption services.  These services
+allow you to build secure tunnels through untrusted networks.
+Everything passing through the untrusted net is encrypted by the ipsec
+gateway machine and decrypted by the gateway at the other end of the
+tunnel.  The resulting tunnel is a virtual private network or VPN.
+
+This package contains the daemons and userland tools for setting up
+Openswan on a kernel with either the 2.6 native IPsec code, or
+FreeS/WAN's KLIPS.
+
+%package	doc
+Summary:	An implementation of IPSEC & IKE for Linux
+Group:		System/Servers
+
+%description	doc
+Openswan is a free implementation of IPSEC & IKE for Linux, a fork of the
+FreeS/WAN project.
+
+This is the documentation for Openswan.
+
+%prep
+
+%setup -q -n openswan-%{version}
+%patch0 -p0 -b .manfix
+%patch1 -p0 -b .format_not_a_string_literal_and_no_format_arguments
+
+find . -type f -name "*.html" -exec dos2unix -U {} \;
+
+%build
+
+%serverbuild
+
+find . -name "Makefile*" | xargs perl -pi -e "s|libexec|%{_lib}|g"
+export CLFAGS=$(echo %{optflags} -fno-strict-aliasing)
+# the %make macro doesn't seem to work
+make \
+    USERCOMPILE="-g $CLFAGS" \
+    INC_USRLOCAL=%{_prefix} \
+    MANTREE=%{_mandir} \
+    INC_RCDEFAULT=%{_initrddir} \
+    CONFDIR=%{_sysconfdir}/%name \
+    FINALCONFDIR=%{_sysconfdir}/%name \
+    FINALCONFFILE=%{_sysconfdir}/%name/ipsec.conf \
+    FINALLIBEXECDIR=%{_libdir}/ipsec \
+    FINALLIBDIR=%{_libdir}/ipsec \
+    programs
+
+%install
+rm -rf %{buildroot}
+
+%{make} \
+    DESTDIR=%{buildroot} \
+    INC_USRLOCAL=%{_prefix} \
+    MANTREE=%{buildroot}%{_mandir} \
+    INC_RCDEFAULT=%{_initrddir} \
+    INC_USRLOCAL=%{_prefix} \
+    INC_RCDEFAULT=%{_initrddir} \
+    FINALCONFDIR=%{_sysconfdir}/%name \
+    FINALLIBEXECDIR=%{_libdir}/ipsec \
+    FINALLIBDIR=%{_libdir}/ipsec \
+    install
+
+install -d -m700 %{buildroot}%{_localstatedir}/lib/run/pluto
+install -d %{buildroot}%{_sbindir}
+
+# Remove old documentation for the time being.
+rm -rf %{buildroot}%{_defaultdocdir}/freeswan
+
+# cleanup
+rm -rf %{buildroot}%{_sysconfdir}/rc.d/rc*
+rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/setup
+rm -rf %{buildroot}%{_docdir}/%{name}
+
+%preun
+%_preun_service ipsec
+
+%post
+%_post_service ipsec
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc BUGS CHANGES COPYING CREDITS README
+%attr(0755,root,root) %{_initrddir}/ipsec
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/ipsec.conf
+%attr(0700,root,root) %dir %{_sysconfdir}/%{name}/ipsec.d
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/ipsec.d/*/*
+%{_sbindir}/ipsec
+%dir %{_libdir}/ipsec
+%{_libdir}/ipsec/*
+%{_localstatedir}/lib/run/pluto
+%{_mandir}/*/*
+
+%files doc
+%defattr(-,root,root)
+%doc doc/*
+
+
+%changelog
+* Fri Sep 03 2010 Luis Daniel Lucio Quiroz <dlucio@mandriva.org> 2.6.28-2mdv2011.0
+ Revision: 575574
+- lsof as require
+- 2.6.28
+  P0 rediffed
+
+* Wed Feb 10 2010 Funda Wang <fwang@mandriva.org> 2.6.24-2mdv2010.1
+ Revision: 503615
+- rebuild for new gmp
+
+* Tue Jan 19 2010 Frederik Himpe <fhimpe@mandriva.org> 2.6.24-1mdv2010.1
+ Revision: 493791
+- Update to new version 2.6.24
+
+* Sat Nov 07 2009 Frederik Himpe <fhimpe@mandriva.org> 2.6.23-1mdv2010.1
+ Revision: 462705
+- Update to new version 2.6.23
+
+* Thu Jun 25 2009 Frederik Himpe <fhimpe@mandriva.org> 2.6.22-1mdv2010.0
+ Revision: 389267
+- BuildRequires docbook-dtd412-xml for documentation
+- Update to new version 2.6.22
+- Build with -fno-strict-aliasing, otherwise it fails
+
+* Tue Mar 31 2009 Oden Eriksson <oeriksson@mandriva.com> 2.6.21-1mdv2009.1
+ Revision: 362883
+- 2.6.21 (fixes CVE-2009-0790)
+- rediffed P0
+- added P1 to fix build with -Werror=format-security
+
+* Wed Dec 03 2008 Jérôme Soyer <saispo@mandriva.org> 2.6.19-1mdv2009.1
+ Revision: 309656
+- Add BuildRequires
+- New release 2.6.19
+
+* Mon Nov 10 2008 Michael Scherer <misc@mandriva.org> 2.6.18-1mdv2009.1
+ Revision: 301689
+- upgrade to 2.6.18
+- clean end of line ( automatic with vim )
+
+* Mon Sep 01 2008 Olivier Blin <oblin@mandriva.com> 2.6.16-1mdv2009.0
+ Revision: 278117
+- 2.6.16
+
+* Tue Jul 15 2008 Funda Wang <fwang@mandriva.org> 2.6.14-1mdv2009.0
+ Revision: 235755
+- drop unneeded setup file
+- BR flex
+- New version 2.6.14
+- rediff man-fix patch
+
+  + Pixel <pixel@mandriva.com>
+    - adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
+
+* Sat Mar 01 2008 Olivier Blin <oblin@mandriva.com> 2.4.12-1mdv2008.1
+ Revision: 177431
+- 2.4.12
+- restore BuildRoot
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Fri May 25 2007 Olivier Blin <oblin@mandriva.com> 2.4.8-1mdv2008.0
+ Revision: 31108
+- 2.4.8 (from Zombie Ryushu)
+
+
+* Fri Mar 23 2007 Olivier Blin <oblin@mandriva.com> 2.4.7-2mdv2007.1
+ Revision: 148619
+- conflict with freeswan (#19011)
+
+* Fri Mar 16 2007 Olivier Blin <oblin@mandriva.com> 2.4.7-1mdv2007.1
+ Revision: 145114
+- 2.4.7
+- Import openswan
+
+* Tue Sep 19 2006 Andreas Hasenack <andreas@mandriva.com> 2.4.5-2mdv2007.0
+- fix ipsec path in manpage (#11921)
+- added patch to fix syntax error which was preventing build
+
+* Sat Apr 29 2006 Oden Eriksson <oeriksson@mandriva.com> 2.4.5-1mdk
+- 2.4.5
+
+* Mon Mar 06 2006 Lenny Cartier <lenny@mandriva.com> 2.4.4-1mdk
+- 2.4.4
+
+* Fri Aug 19 2005 Arnaud de Lorbeau <> 2.3.1-1mdk
+- 2.3.1
+- patch for gcc4 from [Openswan dev] ML
+
+* Tue Oct 05 2004 Robert Vojta <robert.vojta@mandrake.org> 2.2.0-2mdk
+- missing BuildRequires for bison
+
+* Wed Sep 29 2004 Florin <florin@mandrakesoft.com> 2.2.0-1mdk
+- 2.2.0
+- build with -j2 doesn't seem to work (use make instead of make -j2)
+- remove the no longer existing INSTALL file
+- add the docs files
+- add the missing htmldoc in BuildRequires
+
+* Wed May 19 2004 Florin <florin@mandrakesoft.com> 2.1.2-0.rc3.3mdk
+- sysconfdir is now /etc/openswan
+
+* Thu Apr 22 2004 Florin <florin@mandrakesoft.com> 2.1.2-0.rc3.2mdk
+- add the signature file
+
+* Thu Apr 22 2004 Florin <florin@mandrakesoft.com> 2.1.2-0.rc3.1mdk
+- first Mandrake release
+