Hello community, here is the log from the commit of package wwwoffle for openSUSE:Factory checked in at 2014-05-13 20:49:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wwwoffle (Old) and /work/SRC/openSUSE:Factory/.wwwoffle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wwwoffle" Changes: -------- --- /work/SRC/openSUSE:Factory/wwwoffle/wwwoffle.changes 2012-05-31 17:11:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wwwoffle.new/wwwoffle.changes 2014-05-13 20:49:18.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 12 12:07:38 UTC 2014 - [email protected] + +- Update to 2.9i + * Check the flex and lex programs are found by configure. + * Allow https requests in outgoing to be requested when next online as https. + * Don't detect webbugs for images with width and height set to auto. + * Fix problem with infinite loop when root certificate expires. +- Run spec-cleaner on the package +- Provide service file instead of init script. + +------------------------------------------------------------------- Old: ---- rc.wwwoffle wwwoffle-2.9h.tgz New: ---- wwwoffle-2.9i.tgz wwwoffle.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wwwoffle.spec ++++++ --- /var/tmp/diff_new_pack.r1Ve9o/_old 2014-05-13 20:49:19.000000000 +0200 +++ /var/tmp/diff_new_pack.r1Ve9o/_new 2014-05-13 20:49:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wwwoffle # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,35 +17,28 @@ Name: wwwoffle +Version: 2.9i +Release: 0 Summary: World Wide Web Offline Proxy License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 2.9h -Release: 0 -Url: http://gedanken.demon.co.uk/wwwoffle/ -Source0: http://gedanken.demon.co.uk/download-wwwoffle/%{name}-%{version}.tgz -Source1: rc.%{name} +Url: http://www.gedanken.org.uk/software/wwwoffle/ +Source0: http://www.gedanken.org.uk/software/%{name}/download/%{name}-%{version}.tgz +Source1: %{name}.service Source3: ip-up.%{name} Source4: ip-down.%{name} Source5: %{name}.cron -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: %{name}-2.8d-IndexProtocol.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-2.9e-implicit.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: %{name}-2.9e-res_init.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq -PreReq: %insserv_prereq BuildRequires: flex -%if 0%{?suse_version} > 1210 -BuildRequires: libgnutls-devel -%else -BuildRequires: gnutls-devel -%endif BuildRequires: htdig-devel +BuildRequires: libgnutls-devel +BuildRequires: systemd BuildRequires: zlib-devel Requires: cron +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description A proxy HTTP server for computers with dial-up internet access. @@ -71,63 +64,64 @@ %patch1 -p1 %patch2 -p1 # easier to delete them now and include whole doc directory later -%{__rm} -f doc/README.win32 doc/*/README.win32 +rm -f doc/README.win32 doc/*/README.win32 %build export LC_ALL=C %configure \ --with-confdir=%{_sysconfdir}/%{name} \ --with-gcrypt \ - --with-gnutls -%{__make} + --with-gnutls \ + --with-ipv6 \ + --with-zlib +make %{?_smp_mflags} %install export LC_ALL=C -%{__mkdir} -p %{buildroot}%{_sysconfdir}/init.d -%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.{daily,weekly} -%makeinstall -%{__install} -m 755 %{S:3} $RPM_BUILD_DIR -%{__sed} "s@/etc/wwwoffle\\.conf@/etc/wwwoffle/wwwoffle.conf@g" < doc/wwwoffled.man \ +mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}/%{_sysconfdir}/cron.{daily,weekly} +make DESTDIR=%{buildroot} install %{?_smp_mflags} +install -m 755 %{SOURCE3} $RPM_BUILD_DIR +sed "s@%{_sysconfdir}/wwwoffle\\.conf@%{_sysconfdir}/wwwoffle/wwwoffle.conf@g" < doc/wwwoffled.man \ > %{buildroot}%{_mandir}/man8/wwwoffled.8 -%{__install} -m 755 %{S:1} %{buildroot}/etc/init.d/%{name} -ln -fs ../../etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/ppp/ip-{up,down}.d -%{__install} -m 755 %{S:3} %{buildroot}/%{_sysconfdir}/ppp/ip-up.d/%{name} -%{__install} -m 755 %{S:4} %{buildroot}/%{_sysconfdir}/ppp/ip-down.d/%{name} -%{__install} -m 644 %{S:5} %{buildroot}/%{_sysconfdir}/cron.weekly/%{name} +install -D -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service +ln -sf service %{buildroot}/%{_sbindir}/rc%{name} +install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates +install -d -m 755 %{buildroot}%{_sysconfdir}/ppp/ip-{up,down}.d +install -m 755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ppp/ip-up.d/%{name} +install -m 755 %{SOURCE4} %{buildroot}/%{_sysconfdir}/ppp/ip-down.d/%{name} +install -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/cron.weekly/%{name} # run as wwwrun:www by default pushd %{buildroot}%{_sysconfdir}/%{name} -%{__sed} "s/^#run-uid.*/ run-uid = wwwrun/ +sed "s/^#run-uid.*/ run-uid = wwwrun/ s/^#run-gid.*/ run-gid = www/" < %{name}.conf > %{name}.conf.t -%{__mv} %{name}.conf.t %{name}.conf +mv %{name}.conf.t %{name}.conf popd -%{__rm} -rf %{buildroot}%{_prefix}/doc/%{name} -%{__rm} -rf %{buildroot}%{_localstatedir}/spool/%{name}/outgoing/* -%{__rm} -f doc/ANNOUNCE~ +rm -rf %{buildroot}%{_prefix}/doc/%{name} +rm -rf %{buildroot}%{_localstatedir}/spool/%{name}/outgoing/* +rm -f doc/ANNOUNCE~ -%post -%fillup_and_insserv wwwoffle +%pre +%service_add_pre %{name}.service %preun -%stop_on_removal wwwoffle +%service_del_preun %{name}.service -%postun -%restart_on_update wwwoffle -%insserv_cleanup +%post +%service_add_post %{name}.service -%clean -%{__rm} -rf %{buildroot} +%postun +%service_del_postun %{name}.service %files %defattr(-, root, root) # docs -%doc ChangeLog* LSM contrib doc/* +%doc ChangeLog* contrib doc/* %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* # wwwoffle configs -%config %{_sysconfdir}/init.d/%{name} +%{_unitdir}/%{name}.service %config(missingok,noreplace) %attr(755,root,root) %{_sysconfdir}/cron.weekly/%{name} %dir %attr(750, wwwrun, root) %{_sysconfdir}/%{name} %config %attr(640, wwwrun, root) %{_sysconfdir}/%{name}/%{name}.conf ++++++ wwwoffle.service ++++++ [Unit] Description=The wwwoffle proxy server After=network.target [Service] ExecStart=/usr/sbin/wwwoffled -c /etc/wwwoffle/wwwoffle.conf ExecReload=/usr/sbin/wwwoffle -config -c /etc/wwwoffle/wwwoffle.conf [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
