diff --git a/.abf.yml b/.abf.yml index 45ed6b6..5e6d3ba 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "openswan-2.6.37.tar.gz": a0da03e113f1a54c60513f7e8f9908e198c5cd15 + "openswan-2.6.38.tar.gz": 39fa279d43aa1ea736ad1a70450b7bc0504c96eb diff --git 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 deleted file mode 100644 index 64537c6..0000000 --- a/openswan-2.6.21-format_not_a_string_literal_and_no_format_arguments.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- 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)) diff --git a/openswan-2.6.37.tar.gz.asc b/openswan-2.6.37.tar.gz.asc deleted file mode 100644 index 29cbf75..0000000 --- a/openswan-2.6.37.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iQEVAwUATqsaoA1YKYS36C34AQL8CQf+LkrzcXc8UeCm1zHtOuKj9Z+Oc5Ns2tSV -wKh7g53J9XDQ5mkVj/LDaAmQZvwL0/MooCd5pJEoQpTewHyx/ZWkIuF5GRWANiUf -ubJLFsLV/ceO36aAUx7AtqG5kzHdETC2TmRNZvayF22bJekHUDSwbrk1exeztTw6 -uJAwNzIpAG1oo8BpG3RY2RA61NbVFjO1isI5sxoO7XF/VjX4zdVTykyA72oU6GSM -yjiJlfulqfUnjlGsF3Q8K4B6KiaCbA4k0DjMelIeZdjYippgR8w5CBFBgJ0zEjc3 -Ccz22VtjoDXr7JbyCEyl9Odg2W3sO3IVZUqixBLVxRzbyh3/2DxoFQ== -=vr56 ------END PGP SIGNATURE----- diff --git a/openswan-2.6.38.tar.gz.asc b/openswan-2.6.38.tar.gz.asc new file mode 100644 index 0000000..07cf1f8 --- /dev/null +++ b/openswan-2.6.38.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABAgAGBQJPbO6hAAoJEHMCena1gVXqrx4P/14P6d7r13fbN8XXqsqOMkme +rWn52yCRmPV9FZvxGK8sdjcwPBDBN3AtBI6vd7pLRDRLZvzjd5Go2xlORAx6sAll +7CkINwTRjv7ajBctMzBV9wlSV/j4XMiR1B1Y97CA+zsq2XfYvZsbbMWtltai1Yjv +Am3p+hAqXJW73SmaRgNja5R/oQ+gdJNYpAOqvac4phSiR9POVH8iPWeYG+q0MXhQ ++hkryxOrY/ReUGgMFlrcoDv2dOt5FmJhE6ssMzjjDAxBtFoSmc40BUFhaGDkxjD+ +4rcSTrd9V9oWlXxig/JiNspKt7Ip1TvFe5fCPP2p0D+zq/t6H7lutx9dqhOtwJBx +/qka+TIpolBs8ryUfKv0dv8kDBt8nWwgkYQaPstBi+gEWXkYV5qszz/T0DZblPsN +pic2eMENtbLTI92boCG6LDEspDKQdvvtWztbhWcuvmyH17Rr9XnVBV/BG1vYTbtr +XsEAhj9zV0q7FSs0XbwRjngjh7c8JsgezE6Cm+d+PVpwGyZPQG2Cwl1rpxjcNZmk +BeMRYlt5/MmCfJWKCy7CJ4c97vvVO8UiHeyPD17Zoryp2U2g6R4/3680f6h01k3m +RgzohXwWF8i8QfSNqwwdY8l5BUY6W6nfxc5Wd2Kz1+//sdh+5Hk/zl+Lfhn1IQNc +s9WGmE6ISJiX89S3Gy5Q +=ghOr +-----END PGP SIGNATURE----- diff --git a/openswan.spec b/openswan.spec index fe47e60..534d8f8 100644 --- a/openswan.spec +++ b/openswan.spec @@ -1,32 +1,32 @@ -%define _enable_debug_packages %{nil} -%define debug_package %{nil} - Summary: An implementation of IPSEC & IKE for Linux Name: openswan -Version: 2.6.37 -Release: %mkrel 1 +Version: 2.6.38 +Release: 1 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: curl-devel +BuildRequires: docbook-dtd412-xml BuildRequires: dos2unix BuildRequires: flex +BuildRequires: gmp-devel +BuildRequires: libcap-ng-devel +BuildRequires: openldap-devel +BuildRequires: pam-devel BuildRequires: xmlto -BuildRequires: docbook-dtd412-xml -BuildRoot: %{_tmppath}/%{name}-buildroot +Requires: curl +Requires: iproute2 +Requires: ipsec-tools +Requires: lsof +Requires: openldap +Conflicts: freeswan %description Openswan is a free implementation of IPSEC & IKE for Linux, a fork of the @@ -46,6 +46,7 @@ FreeS/WAN's KLIPS. %package doc Summary: An implementation of IPSEC & IKE for Linux Group: System/Servers +BuildArch: noarch %description doc Openswan is a free implementation of IPSEC & IKE for Linux, a fork of the @@ -57,9 +58,8 @@ This is the documentation for Openswan. %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 {} \; +find . -type f -name "*.html" -exec dos2unix {} \; %build @@ -78,12 +78,15 @@ make \ FINALCONFFILE=%{_sysconfdir}/%name/ipsec.conf \ FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \ + USE_LIBCAP_NG=true \ + USE_LDAP=true \ + USE_LIBCURL=true \ + HAVE_THREADS=true \ programs %install -rm -rf %{buildroot} -%{make} \ +make \ DESTDIR=%{buildroot} \ INC_USRLOCAL=%{_prefix} \ MANTREE=%{buildroot}%{_mandir} \ @@ -112,15 +115,13 @@ rm -rf %{buildroot}%{_docdir}/%{name} %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(0700,root,root) %dir %{_sysconfdir}/%{name}/ipsec.d/examples +%attr(0700,root,root) %dir %{_sysconfdir}/%{name}/ipsec.d/policies %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/ipsec.d/*/* %{_sbindir}/ipsec %dir %{_libdir}/ipsec @@ -129,11 +130,18 @@ rm -rf %{buildroot} %{_mandir}/*/* %files doc -%defattr(-,root,root) +%doc docs/README.* docs/CREDITS.* docs/*.txt +%doc docs/quickstarts docs/html-old-need-merge-with-wiki %changelog -* Tue Nov 08 2011 Alexander Khrukin 2.6.37-1mdv2012.0 +* Tue Jul 17 2012 Oden Eriksson 2.6.38-1 ++ Revision: 809978 +- 2.6.38 +- sync deps slipthly with fedora +- various fixes + +* Tue Nov 08 2011 Alexander Khrukin 2.6.37-1 + Revision: 729094 - update to 2.6.37 upstream release