Hello community, here is the log from the commit of package openswan checked in at Thu Sep 13 18:54:09 CEST 2007. -------- --- openswan/openswan.changes 2007-06-21 17:25:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/openswan/openswan.changes 2007-09-10 15:27:24.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 10 15:26:56 CEST 2007 - mt@suse.de + +- Moved html and man3 documentation into openswan-doc +- Added a Short-Description LSB tag and $remote_fs start + requirement to the init script (openswan_40_rcscript.dif) +- Added stop_on_removal/restart_on_update to rpm pre/postun +- Cleaned up installation of the documentation as well as + another problems mentioned by rpmlint. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openswan.spec ++++++ --- /var/tmp/diff_new_pack.wG4512/_old 2007-09-13 18:53:45.000000000 +0200 +++ /var/tmp/diff_new_pack.wG4512/_new 2007-09-13 18:53:45.000000000 +0200 @@ -11,11 +11,11 @@ # norootforbuild Name: openswan -BuildRequires: curl-devel gmp-devel htmldoc libjpeg-devel libpcap lynx xorg-x11-devel +BuildRequires: curl-devel gmp-devel htmldoc libjpeg-devel libpcap-devel lynx xorg-x11-devel Version: 2.4.7 -Release: 34 +Release: 58 %define irel 2.4.7 -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Networking/Security Summary: IPsec Implementation which Allows Building of VPNs URL: http://www.openswan.org/ @@ -85,6 +85,25 @@ Sandy Harris <sandy.harris@sympatico.ca> Hugh Daniels <hugh@toad.com> +%package doc +Summary: OpenSWAN documentation +Group: Productivity/Networking/Security + +%description doc +This package provides OpenSWAN HTML documentation and development +(section 3) manual pages. + + + +Authors: +-------- + John Gilmore <gnu@toad.com> + Henry Spencer <henry@spsystems.net> + Richard Guy Briggs <rgb@conscoop.ottawa.on.ca> + Hugh Redelmeier <hugh@mimosa.com> + Sandy Harris <sandy.harris@sympatico.ca> + Hugh Daniels <hugh@toad.com> + %prep %setup -q -n %{name}-%{irel} # @@ -119,11 +138,10 @@ # %build -make programs prefix=%{prefix} LIBD=%{_lib} DESTDIR=$RPM_BUILD_ROOT RPM_OPT_FLAGS="$RPM_OPT_FLAGS -W" +make programs prefix=%{prefix} LIBD=%{_lib} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -W" test -e programs/pluto/pluto %install -test -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" || rm -rf $RPM_BUILD_ROOT make install prefix=%{prefix} LIBD=%{_lib} DESTDIR=$RPM_BUILD_ROOT ln -sf /etc/init.d/ipsec ${RPM_BUILD_ROOT}%{prefix}/sbin/rcipsec touch $RPM_BUILD_ROOT/etc/ipsec.secrets @@ -142,7 +160,77 @@ #chmod -x *.html *.txt *.ps *.pdf man/*.html install -m 644 %SOURCE10 %{buildroot}/%{_docdir}/%{name}/README.SUSE install -m 644 programs/_confread/README.conf.V2 %{buildroot}/%{_docdir}/%{name}/ +install -m 644 BUGS CHANGES CREDITS README %{buildroot}%{_docdir}/%{name}/ +install -m 644 COPYING LICENSE ROADMAP.txt %{buildroot}%{_docdir}/%{name}/ +install -m 644 docs/debugging-tcpdump.txt %{buildroot}%{_docdir}/%{name}/ +install -m 644 docs/KNOWN_BUGS %{buildroot}%{_docdir}/%{name}/ +install -m 644 docs/RELEASE-NOTES.txt %{buildroot}%{_docdir}/%{name}/ +rm -f %{buildroot}%{_docdir}/%{name}/GOING-AWAY +rm -f %{buildroot}%{_docdir}/%{name}/doxygen.cfg +rm -f %{buildroot}%{_docdir}/%{name}/impl.notes rm -f %{buildroot}/etc/rc?.d/[KS]*ipsec +# +base="${RPM_BUILD_ROOT}%{_mandir}" +rm -f ${base}/man5/pf_key.5.gz +rm -f ${base}/man8/ipsec_ipsec.8.gz +rm -f ${base}/man5/ipsec_ipsec.secrets.5.gz +rm -f ${base}/man5/ipsec_ipsec.conf.5.gz +# +base="${RPM_BUILD_ROOT}%{_docdir}/%{name}" +rm -f ${base}/manpage.d/ipsec_version_code.3.html +ln -s ipsec_version.3.html ${base}/manpage.d/ipsec_version_code.3.html +rm -f ${base}/manpage.d/ipsec_version_string.3.html +ln -s ipsec_version.3.html ${base}/manpage.d/ipsec_version_string.3.html +rm -f ${base}/manpage.d/ipsec_ultot.3.html +ln -s ipsec_ttoul.3.html ${base}/manpage.d/ipsec_ultot.3.html +rm -f ${base}/manpage.d/ipsec_tnatoaddr.3.html +ln -s ipsec_subnettot.3.html ${base}/manpage.d/ipsec_tnatoaddr.3.html +rm -f ${base}/manpage.d/ipsec_ttoaddr.3.html +ln -s ipsec_subnettot.3.html ${base}/manpage.d/ipsec_ttoaddr.3.html +rm -f ${base}/manpage.d/ipsec_subnetishost.3.html +ln -s ipsec_subnetinsubnet.3.html ${base}/manpage.d/ipsec_subnetishost.3.html +rm -f ${base}/manpage.d/ipsec_setportof.3.html +ln -s ipsec_sockaddrlenof.3.html ${base}/manpage.d/ipsec_setportof.3.html +rm -f ${base}/manpage.d/ipsec_sameaddrtype.3.html +ln -s ipsec_sameaddr.3.html ${base}/manpage.d/ipsec_sameaddrtype.3.html +rm -f ${base}/manpage.d/ipsec_samesaid.3.html +ln -s ipsec_sameaddr.3.html ${base}/manpage.d/ipsec_samesaid.3.html +rm -f ${base}/manpage.d/ipsec_samesubnet.3.html +ln -s ipsec_sameaddr.3.html ${base}/manpage.d/ipsec_samesubnet.3.html +rm -f ${base}/manpage.d/ipsec_prng_init.3.html +ln -s ipsec_prng.3.html ${base}/manpage.d/ipsec_prng_init.3.html +rm -f ${base}/manpage.d/ipsec_prng_bytes.3.html +ln -s ipsec_prng.3.html ${base}/manpage.d/ipsec_prng_bytes.3.html +rm -f ${base}/manpage.d/ipsec_prng_final.3.html +ln -s ipsec_prng.3.html ${base}/manpage.d/ipsec_prng_final.3.html +rm -f ${base}/manpage.d/ipsec_maskof.3.html +ln -s ipsec_networkof.3.html ${base}/manpage.d/ipsec_maskof.3.html +rm -f ${base}/manpage.d/ipsec_masktocount.3.html +ln -s ipsec_networkof.3.html ${base}/manpage.d/ipsec_masktocount.3.html +rm -f ${base}/manpage.d/ipsec_isloopbackaddr.3.html +ln -s ipsec_isanyaddr.3.html ${base}/manpage.d/ipsec_isloopbackaddr.3.html +rm -f ${base}/manpage.d/ipsec_atosubnet.3.html +ln -s ipsec_atoaddr.3.html ${base}/manpage.d/ipsec_atosubnet.3.html +rm -f ${base}/manpage.d/ipsec_addrbytesptr.3.html +ln -s ipsec_addrlenof.3.html ${base}/manpage.d/ipsec_addrbytesptr.3.html +rm -f ${base}/manpage.d/ipsec_addrbytesof.3.html +ln -s ipsec_addrlenof.3.html ${base}/manpage.d/ipsec_addrbytesof.3.html +rm -f ${base}/manpage.d/ipsec_addrinsubnet.3.html +ln -s ipsec_addrcmp.3.html ${base}/manpage.d/ipsec_addrinsubnet.3.html +rm -f ${base}/manpage.d/ipsec_sockaddrlenof.3.html +ln -s ipsec_sockaddrof.3.html ${base}/manpage.d/ipsec_sockaddrlenof.3.html +rm -f ${base}/manpage.d/ipsec_isanyaddr.3.html +ln -s ipsec_isunspecaddr.3.html ${base}/manpage.d/ipsec_isanyaddr.3.html +rm -f ${base}/manpage.d/ipsec_loopbackaddr.3.html +ln -s ipsec_isunspecaddr.3.html ${base}/manpage.d/ipsec_loopbackaddr.3.html +rm -f ${base}/manpage.d/ipsec_addrlenof.3.html +ln -s ipsec_addrtypeof.3.html ${base}/manpage.d/ipsec_addrlenof.3.html +rm -f ${base}/manpage.d/ipsec_goodmask.3.html +ln -s ipsec_bitstomask.3.html ${base}/manpage.d/ipsec_goodmask.3.html +rm -f ${base}/manpage.d/ipsec_broadcastof.3.html +ln -s ipsec_hostof.3.html ${base}/manpage.d/ipsec_broadcastof.3.html +rm -f ${base}/manpage.d/ipsec_addrtoa.3.html +ln -s ipsec_atoaddr.3.html ${base}/manpage.d/ipsec_addrtoa.3.html %files %defattr(-,root,root) @@ -152,10 +240,6 @@ %if "%{_lib}" != "lib" /usr/%{_lib}/ipsec/ %endif -%doc %{_mandir}/man3/ipsec* -%doc %{_mandir}/man5/ipsec* -%doc %{_mandir}/man5/pf* -%doc %{_mandir}/man8/ipsec* %config /etc/init.d/ipsec %attr(600,root,root) %config(noreplace) /etc/ipsec.secrets #%attr(600,root,root) %config /etc/ipsec.secrets.rpmbuild @@ -172,13 +256,38 @@ /etc/ppp/ip-up.d/freeswan /etc/ppp/ip-down.d/freeswan %dir %attr(700,root,root) /etc/ipsec.d/private -#%dir %doc %{_docdir}/%{name} -#%doc %attr(644,root,root) %{_docdir}/%{name}/* -%doc %{_docdir}/%{name}/ -#%doc BUGS CHANGES COPYING CREDITS README -#%doc doc/*.html doc/README.doc doc/std/* doc/Makefile -#%doc doc/*.notes doc/examples doc/prob.report doc/iab-iesg.stmt RFCs.tar.bz2 -#%doc doc/*.howto doc/*.known-issues doc/*.txt linux/README.freeswan +%doc %{_mandir}/man8/ipsec* +%doc %{_mandir}/man5/ipsec* +%doc %{_mandir}/man5/pf* +%dir %doc %{_docdir}/%{name} +%doc %{_docdir}/%{name}/BUGS +%doc %{_docdir}/%{name}/CHANGES +%doc %{_docdir}/%{name}/CREDITS +%doc %{_docdir}/%{name}/COPYING +%doc %{_docdir}/%{name}/LICENSE +%doc %{_docdir}/%{name}/ROADMAP.txt +%doc %{_docdir}/%{name}/README* +%doc %{_docdir}/%{name}/ALG-TODO +%doc %{_docdir}/%{name}/CHANGES.x509 +%doc %{_docdir}/%{name}/CREDITS.freeswan +%doc %{_docdir}/%{name}/KNOWN_BUGS +%doc %{_docdir}/%{name}/RELEASE-NOTES.txt +%doc %{_docdir}/%{name}/2.6.known-issues +%doc %{_docdir}/%{name}/prob.report +%doc %{_docdir}/%{name}/kernel.notes +%doc %{_docdir}/%{name}/iab-iesg.stmt +%doc %{_docdir}/%{name}/ipsec.conf-sample +%doc %{_docdir}/%{name}/ipsec.conf.2_to_1 +%doc %{_docdir}/%{name}/debugging-tcpdump.txt + +%files doc +%defattr(-,root,root) +%dir %doc %{_docdir}/%{name} +%doc %{_docdir}/%{name}/oppimpl.txt +%doc %{_docdir}/%{name}/opportunism* +%doc %{_docdir}/%{name}/*.html +%doc %{_docdir}/%{name}/manpage.d +%doc %{_mandir}/man3/ipsec* %clean test -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" || rm -rf $RPM_BUILD_ROOT @@ -240,10 +349,9 @@ echo -e "using FreeS/WAN-1.9x\n" >>/var/adm/notify/messages/freeswan fi fi -#%preun -#usr/sbin/rcipsec stop %preun +%{stop_on_removal ipsec} # Some people expect to not loose their secrets even after multiple rpm -e. if test -s etc/ipsec.secrets.rpmsave; then cp -p --backup=numbered etc/ipsec.secrets.rpmsave etc/ipsec.secrets.rpmsave.old @@ -251,9 +359,17 @@ exit 0 %postun +%{restart_on_update ipsec} %{insserv_cleanup} %changelog +* Mon Sep 10 2007 - mt@suse.de +- Moved html and man3 documentation into openswan-doc +- Added a Short-Description LSB tag and $remote_fs start + requirement to the init script (openswan_40_rcscript.dif) +- Added stop_on_removal/restart_on_update to rpm pre/postun +- Cleaned up installation of the documentation as well as + another problems mentioned by rpmlint. * Thu Jun 21 2007 - adrian@suse.de - fix changelog entry order * Fri Mar 23 2007 - mt@suse.de ++++++ openswan_40_rcscript.dif ++++++ --- /var/tmp/diff_new_pack.wG4512/_old 2007-09-13 18:53:46.000000000 +0200 +++ /var/tmp/diff_new_pack.wG4512/_new 2007-09-13 18:53:46.000000000 +0200 @@ -1,5 +1,5 @@ --- programs/_realsetup/_realsetup.in -+++ programs/_realsetup/_realsetup.in 2007/01/19 11:38:13 ++++ programs/_realsetup/_realsetup.in 2007/09/10 11:41:36 @@ -178,7 +178,7 @@ # First, does it seem to be going already? perform test ! -f $lock "||" "{" \ @@ -152,17 +152,18 @@ *) --- programs/setup/setup.in -+++ programs/setup/setup.in 2007/01/19 11:42:01 -@@ -31,6 +31,23 @@ ++++ programs/setup/setup.in 2007/09/10 11:50:16 +@@ -31,6 +31,24 @@ # description: IPsec provides encrypted and authenticated communications; \ # KLIPS is the kernel half of it, Pluto is the user-level management daemon. +### BEGIN INIT INFO +# Provides: ipsec -+# Required-Start: $network $named -+# Required-Stop: $network ++# Required-Start: $network $syslog $remote_fs $named ++# Required-Stop: $network $syslog $remote_fs +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 ++# Short-Description: Start openswan IPSec +# Description: IPSEC provides encrypted and authenticated communications +# via a unsafe network, such as the internet (VPN). +# This scripts loads the kernel module and starts the @@ -177,7 +178,7 @@ me='ipsec setup' # for messages # where the private directory and the config files are -@@ -63,7 +80,7 @@ +@@ -63,7 +81,7 @@ then echo "cannot find ipsec command -- \`$1' aborted" | logger -s -p daemon.error -t ipsec_setup @@ -186,7 +187,7 @@ fi # accept a few flags -@@ -121,7 +138,9 @@ +@@ -121,7 +139,9 @@ then echo "permission denied (must be superuser)" | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1 @@ -197,7 +198,7 @@ fi tmp=/var/run/pluto/ipsec_setup.st outtmp=/var/run/pluto/ipsec_setup.out -@@ -139,39 +158,62 @@ +@@ -139,39 +159,62 @@ cat ${outtmp} | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1 rm -f ${outtmp} fi ++++++ sysconfig.network.scripts.openswan-functions ++++++ --- openswan/sysconfig.network.scripts.openswan-functions 2004-03-09 10:22:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/openswan/sysconfig.network.scripts.openswan-functions 2007-09-10 13:52:53.000000000 +0200 @@ -1,4 +1,3 @@ -#!/bin/bash # hook cleanup () { true; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org