Djam/openswan
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/openswan.git synced 2025-02-23 08:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG New version 2.6.39, spec cleanup

Browse source
This commit is contained in:
Andrey Bondrov 2014-03-24 22:18:48 +11:00
parent fa024aa139
commit e7dfb32ea8
4 changed files with 62 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml
View file

@ -1,2 +1,3 @@
sources: sources:
"openswan-2.6.38.tar.gz": 39fa279d43aa1ea736ad1a70450b7bc0504c96eb openswan-2.6.39.tar.gz: 0100c226ef82222243aba74deeb47bead594fbc2
openswan-2.6.39.tar.gz.asc: 74917d65f6bcdc66d84ca76a14a7ed323b9344eb

17
openswan-2.6.38.tar.gz.asc
View file

@ -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-----

13
openswan.service Normal file
View file

@ -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

171
openswan.spec
View file

@ -1,31 +1,31 @@
Summary: An implementation of IPSEC & IKE for Linux Summary: An implementation of IPSEC & IKE for Linux
Name: openswan Name: openswan
Version: 2.6.38 Version: 2.6.39
Release: 1 Release: 2
License: GPLv2+ License: GPLv2+
Group: System/Servers Group: System/Servers
URL: http://www.openswan.org/ Url: http://www.openswan.org/
Source0: http://www.openswan.org/download/openswan-%{version}.tar.gz Source0: http://www.openswan.org/download/openswan-%{version}.tar.gz
Source1: http://www.openswan.org/download/openswan-%{version}.tar.gz.asc Source1: http://www.openswan.org/download/openswan-%{version}.tar.gz.asc
Source2: openswan.service
Patch0: openswan-2.6.28-manfix.patch Patch0: openswan-2.6.28-manfix.patch
Requires(post): rpm-helper
Requires(preun): rpm-helper
Provides: ipsec-userland
BuildRequires: bison BuildRequires: bison
BuildRequires: curl-devel
BuildRequires: docbook-dtd412-xml BuildRequires: docbook-dtd412-xml
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: flex BuildRequires: flex
BuildRequires: xmlto
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: libcap-ng-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: xmlto BuildRequires: pkgconfig(libcap-ng)
BuildRequires: pkgconfig(libcurl)
Requires: curl Requires: curl
Requires: iproute2 Requires: iproute2
Requires: ipsec-tools Requires: ipsec-tools
Requires: lsof Requires: lsof
Requires: openldap Requires: openldap
Requires(post,preun): rpm-helper
Provides: ipsec-userland
Conflicts: freeswan Conflicts: freeswan
%description %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 Openswan on a kernel with either the 2.6 native IPsec code, or
FreeS/WAN's KLIPS. 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 Summary: An implementation of IPSEC & IKE for Linux
Group: System/Servers Group: System/Servers
BuildArch: noarch BuildArch: noarch
%description doc %description doc
Openswan is a free implementation of IPSEC & IKE for Linux, a fork of the Openswan is a free implementation of IPSEC & IKE for Linux, a fork of the
FreeS/WAN project. FreeS/WAN project.
This is the documentation for Openswan. 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} %setup -q -n openswan-%{version}
%patch0 -p0 -b .manfix %patch0 -p0 -b .manfix
find . -type f -name "*.html" -exec dos2unix {} \; find . -type f -name "*.html" -exec dos2unix {} \;
%build %build
%serverbuild %serverbuild
find . -name "Makefile*" | xargs perl -pi -e "s|libexec|%{_lib}|g" find . -name "Makefile*" | xargs perl -pi -e "s|libexec|%{_lib}|g"
@ -73,9 +100,9 @@ make \
INC_USRLOCAL=%{_prefix} \ INC_USRLOCAL=%{_prefix} \
MANTREE=%{_mandir} \ MANTREE=%{_mandir} \
INC_RCDEFAULT=%{_initrddir} \ INC_RCDEFAULT=%{_initrddir} \
CONFDIR=%{_sysconfdir}/%name \ CONFDIR=%{_sysconfdir}/%{name} \
FINALCONFDIR=%{_sysconfdir}/%name \ FINALCONFDIR=%{_sysconfdir}/%{name} \
FINALCONFFILE=%{_sysconfdir}/%name/ipsec.conf \ FINALCONFFILE=%{_sysconfdir}/%{name}/ipsec.conf \
FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBEXECDIR=%{_libdir}/ipsec \
FINALLIBDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \
USE_LIBCAP_NG=true \ USE_LIBCAP_NG=true \
@ -85,7 +112,6 @@ make \
programs programs
%install %install
make \ make \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
INC_USRLOCAL=%{_prefix} \ INC_USRLOCAL=%{_prefix} \
@ -93,7 +119,7 @@ make \
INC_RCDEFAULT=%{_initrddir} \ INC_RCDEFAULT=%{_initrddir} \
INC_USRLOCAL=%{_prefix} \ INC_USRLOCAL=%{_prefix} \
INC_RCDEFAULT=%{_initrddir} \ INC_RCDEFAULT=%{_initrddir} \
FINALCONFDIR=%{_sysconfdir}/%name \ FINALCONFDIR=%{_sysconfdir}/%{name} \
FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBEXECDIR=%{_libdir}/ipsec \
FINALLIBDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \
install install
@ -109,111 +135,8 @@ rm -rf %{buildroot}%{_sysconfdir}/rc.d/rc*
rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/setup rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/setup
rm -rf %{buildroot}%{_docdir}/%{name} rm -rf %{buildroot}%{_docdir}/%{name}
%preun install -Dm644 %{SOURCE2} %{buildroot}%{_unitdir}/openswan.service
%_preun_service ipsec mkdir -p %{buildroot}%{_prefix}/lib/systemd/scripts/
mv %{buildroot}/%{_initrddir}/ipsec %{buildroot}/%{_prefix}/lib/systemd/scripts/
%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
%changelog
* Tue Jul 17 2012 Oden Eriksson <oeriksson@mandriva.com> 2.6.38-1
+ Revision: 809978
- 2.6.38
- sync deps slipthly with fedora
- various fixes
* Tue Nov 08 2011 Alexander Khrukin <akhrukin@mandriva.org> 2.6.37-1
+ Revision: 729094
- update to 2.6.37 upstream release
* Sat Oct 22 2011 Zombie Ryushu <ryushu@mandriva.org> 2.6.36-1
+ Revision: 705678
- fix docdir
- fix deprecated patch
- Upgrade to 2.6.36
* 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 <blino@mandriva.org> 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 <blino@mandriva.org> 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 <blino@mandriva.org> 2.4.8-1mdv2008.0
+ Revision: 31108
- 2.4.8 (from Zombie Ryushu)