From e7dfb32ea8a2b38fb61762442bf123d71641ab50 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 24 Mar 2014 22:18:48 +1100 Subject: [PATCH] LOG New version 2.6.39, spec cleanup --- .abf.yml | 3 +- openswan-2.6.38.tar.gz.asc | 17 ---- openswan.service | 13 +++ openswan.spec | 171 ++++++++++--------------------------- 4 files changed, 62 insertions(+), 142 deletions(-) delete mode 100644 openswan-2.6.38.tar.gz.asc create mode 100644 openswan.service diff --git a/.abf.yml b/.abf.yml index 5e6d3ba..5bef83a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: - "openswan-2.6.38.tar.gz": 39fa279d43aa1ea736ad1a70450b7bc0504c96eb + openswan-2.6.39.tar.gz: 0100c226ef82222243aba74deeb47bead594fbc2 + openswan-2.6.39.tar.gz.asc: 74917d65f6bcdc66d84ca76a14a7ed323b9344eb diff --git a/openswan-2.6.38.tar.gz.asc b/openswan-2.6.38.tar.gz.asc deleted file mode 100644 index 07cf1f8..0000000 --- a/openswan-2.6.38.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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.service b/openswan.service new file mode 100644 index 0000000..6d89970 --- /dev/null +++ b/openswan.service @@ -0,0 +1,13 @@ +[Unit] +Description=Openswan daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/lib/systemd/scripts/ipsec --start +ExecStop=/usr/lib/systemd/scripts/ipsec --stop +ExecReload=/usr/lib/systemd/scripts/ipsec --restart +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/openswan.spec b/openswan.spec index 534d8f8..518900e 100644 --- a/openswan.spec +++ b/openswan.spec @@ -1,31 +1,31 @@ Summary: An implementation of IPSEC & IKE for Linux Name: openswan -Version: 2.6.38 -Release: 1 +Version: 2.6.39 +Release: 2 License: GPLv2+ Group: System/Servers -URL: http://www.openswan.org/ +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 +Source2: openswan.service Patch0: openswan-2.6.28-manfix.patch -Requires(post): rpm-helper -Requires(preun): rpm-helper -Provides: ipsec-userland BuildRequires: bison -BuildRequires: curl-devel BuildRequires: docbook-dtd412-xml BuildRequires: dos2unix BuildRequires: flex +BuildRequires: xmlto BuildRequires: gmp-devel -BuildRequires: libcap-ng-devel BuildRequires: openldap-devel BuildRequires: pam-devel -BuildRequires: xmlto +BuildRequires: pkgconfig(libcap-ng) +BuildRequires: pkgconfig(libcurl) Requires: curl Requires: iproute2 Requires: ipsec-tools Requires: lsof Requires: openldap +Requires(post,preun): rpm-helper +Provides: ipsec-userland Conflicts: freeswan %description @@ -43,26 +43,53 @@ 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 +%files +%doc BUGS CHANGES COPYING CREDITS README +%{_unitdir}/%{name}.service +%{_prefix}/lib/systemd/scripts/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 +%{_libdir}/ipsec/* +%{_localstatedir}/lib/run/pluto +%{_mandir}/*/* + +%preun +%_preun_service %{name} + +%post +%_post_service %{name} + +#---------------------------------------------------------------------------- + +%package doc Summary: An implementation of IPSEC & IKE for Linux Group: System/Servers BuildArch: noarch -%description doc +%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 +%files doc +%doc docs/README.* docs/CREDITS.* docs/*.txt +%doc docs/quickstarts docs/html-old-need-merge-with-wiki +#---------------------------------------------------------------------------- + +%prep %setup -q -n openswan-%{version} %patch0 -p0 -b .manfix find . -type f -name "*.html" -exec dos2unix {} \; %build - %serverbuild find . -name "Makefile*" | xargs perl -pi -e "s|libexec|%{_lib}|g" @@ -73,9 +100,9 @@ make \ INC_USRLOCAL=%{_prefix} \ MANTREE=%{_mandir} \ INC_RCDEFAULT=%{_initrddir} \ - CONFDIR=%{_sysconfdir}/%name \ - FINALCONFDIR=%{_sysconfdir}/%name \ - FINALCONFFILE=%{_sysconfdir}/%name/ipsec.conf \ + CONFDIR=%{_sysconfdir}/%{name} \ + FINALCONFDIR=%{_sysconfdir}/%{name} \ + FINALCONFFILE=%{_sysconfdir}/%{name}/ipsec.conf \ FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \ USE_LIBCAP_NG=true \ @@ -85,7 +112,6 @@ make \ programs %install - make \ DESTDIR=%{buildroot} \ INC_USRLOCAL=%{_prefix} \ @@ -93,7 +119,7 @@ make \ INC_RCDEFAULT=%{_initrddir} \ INC_USRLOCAL=%{_prefix} \ INC_RCDEFAULT=%{_initrddir} \ - FINALCONFDIR=%{_sysconfdir}/%name \ + FINALCONFDIR=%{_sysconfdir}/%{name} \ FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \ install @@ -109,111 +135,8 @@ 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 - -%files -%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 -%{_libdir}/ipsec/* -%{_localstatedir}/lib/run/pluto -%{_mandir}/*/* - -%files doc -%doc docs/README.* docs/CREDITS.* docs/*.txt -%doc docs/quickstarts docs/html-old-need-merge-with-wiki +install -Dm644 %{SOURCE2} %{buildroot}%{_unitdir}/openswan.service +mkdir -p %{buildroot}%{_prefix}/lib/systemd/scripts/ +mv %{buildroot}/%{_initrddir}/ipsec %{buildroot}/%{_prefix}/lib/systemd/scripts/ -%changelog -* 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 - -* Sat Oct 22 2011 Zombie Ryushu 2.6.36-1 -+ Revision: 705678 -- fix docdir -- fix deprecated patch -- Upgrade to 2.6.36 - -* Fri Sep 03 2010 Luis Daniel Lucio Quiroz 2.6.28-2mdv2011.0 -+ Revision: 575574 -- lsof as require -- 2.6.28 - P0 rediffed - -* Wed Feb 10 2010 Funda Wang 2.6.24-2mdv2010.1 -+ Revision: 503615 -- rebuild for new gmp - -* Tue Jan 19 2010 Frederik Himpe 2.6.24-1mdv2010.1 -+ Revision: 493791 -- Update to new version 2.6.24 - -* Sat Nov 07 2009 Frederik Himpe 2.6.23-1mdv2010.1 -+ Revision: 462705 -- Update to new version 2.6.23 - -* Thu Jun 25 2009 Frederik Himpe 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 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 2.6.19-1mdv2009.1 -+ Revision: 309656 -- Add BuildRequires -- New release 2.6.19 - -* Mon Nov 10 2008 Michael Scherer 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 2.6.16-1mdv2009.0 -+ Revision: 278117 -- 2.6.16 - -* Tue Jul 15 2008 Funda Wang 2.6.14-1mdv2009.0 -+ Revision: 235755 -- drop unneeded setup file -- BR flex -- New version 2.6.14 -- rediff man-fix patch - - + Pixel - - adapt to %%_localstatedir now being /var instead of /var/lib (#22312) - -* Sat Mar 01 2008 Olivier Blin 2.4.12-1mdv2008.1 -+ Revision: 177431 -- 2.4.12 -- restore BuildRoot - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - -* Fri May 25 2007 Olivier Blin 2.4.8-1mdv2008.0 -+ Revision: 31108 -- 2.4.8 (from Zombie Ryushu) -