Hello community, here is the log from the commit of package tinyproxy for openSUSE:Factory checked in at 2015-01-07 09:39:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tinyproxy (Old) and /work/SRC/openSUSE:Factory/.tinyproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tinyproxy" Changes: -------- --- /work/SRC/openSUSE:Factory/tinyproxy/tinyproxy.changes 2014-03-21 14:06:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tinyproxy.new/tinyproxy.changes 2015-01-07 09:39:07.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Jan 6 10:12:12 UTC 2015 - [email protected] + +- Provide service file instead of script + +------------------------------------------------------------------- +Mon Dec 29 20:34:48 UTC 2014 - [email protected] + +- Update to new upstream release 1.8.4 +* Fix crash (infinite loop) when logfile writing fails +* Allow listening on multiple families when no Listen is + provided in config. +* Fix CONNECT requsts with IPv6 literal addresses as host. +* Fix invalid free when connecting to ipv6 literal address +* Limit the number of headers per request to prevent DoS +- Remove 110-seeding.diff (merged upstream), 110-headerlimit.diff + (solved upstream) + +------------------------------------------------------------------- Old: ---- 110-headerlimit.diff 110-seeding.diff tinyproxy-1.8.3.tar.bz2 tinyproxy.init New: ---- tinyproxy-1.8.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tinyproxy.spec ++++++ --- /var/tmp/diff_new_pack.DZNKL3/_old 2015-01-07 09:39:08.000000000 +0100 +++ /var/tmp/diff_new_pack.DZNKL3/_new 2015-01-07 09:39:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tinyproxy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,28 +16,27 @@ # -%if 0%{?suse_version} == 1110 -%define _initddir /etc/init.d -%endif - Name: tinyproxy +Version: 1.8.4 +Release: 0 Summary: Minimalist WWW proxy License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 1.8.3 -Release: 0 Url: https://banu.com/tinyproxy/ -Source: https://banu.com/pub/tinyproxy/1.8/%{name}-%{version}.tar.bz2 -Source1: %{name}.logrotate -Source2: %{name}.init + +#Git-Clone: git://git.banu.com/tinyproxy +#Source: https://banu.com/pub/tinyproxy/1.8/%name-%version.tar.bz2 +#1.8.4 made from Git tag +Source: %name-%version.tar.xz +Source1: %name.logrotate Patch1: tinyproxy-conf.patch -Patch2: 110-seeding.diff -Patch3: 110-headerlimit.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build - -# libxslt -> xsltproc BuildRequires: asciidoc +BuildRequires: autoconf +BuildRequires: automake BuildRequires: libxslt +BuildRequires: systemd-rpm-macros +BuildRequires: xz Requires: logrotate %description @@ -48,67 +47,63 @@ system resources for a larger proxy are unavailable. %prep -%setup -q -%patch -P 1 -P 2 -P 3 -p1 +%setup -qn %name +%patch -P 1 -p1 %build +autoreconf -fiv %configure -make %{?_smp_mflags}; +make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} - -# add logrotate file -install -D -m0644 %{S:1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} - -# add init script + rc_link -install -D -m0755 %{S:2} %{buildroot}/%{_initddir}/%{name} -ln -sf %{_initddir}/%{name} %{buildroot}/%{_sbindir}/rc%{name} - -# add logdir -install -d -m0750 %{buildroot}/var/log/%{name} +%make_install +b="%buildroot" +install -d -m0750 "%buildroot/var/log/%name" +install -D -m0644 "%{S:1}" "$b/%_sysconfdir/logrotate.d/%name" + +mkdir -p "$b/%_unitdir" "$b/%_prefix/lib/tmpfiles.d" +cat >>"$b/%_unitdir/tinyproxy.service" <<-EOF + [Unit] + Description=A small HTTP/1 proxy + After=network.target named.service nss-lookup.service + [Service] + Type=simple + ExecStart=/usr/sbin/tinyproxy -d + CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID + [Install] + WantedBy=multi-user.target +EOF +cat >>"$b/%_prefix/lib/tmpfiles.d/tinyproxy.conf" <<-EOF + d /run/tinyproxy 0755 tinyproxy tinyproxy - +EOF +ln -sf service "$b/%_sbindir/rc%name" %pre -# add group -%{_sbindir}/groupadd -r %{name} 2>/dev/null || : -# add user -%{_sbindir}/useradd -c "Tinyproxy" -d /usr/share/%{name} -G %{name} -g %{name} \ - -r -s /bin/false %{name} 2>/dev/null || : -#if 0%{?has_systemd} -#service_add_pre tinyproxy.service -#endif +getent group tinyproxy >/dev/null || groupadd -r tinyproxy || : +getent passwd tinyproxy >/dev/null || \ + useradd -c "Tinyproxy" -d "%_datadir/%name" -g tinyproxy \ + -r -s /bin/false tinyproxy || : +%service_add_pre tinyproxy.service %post -%{fillup_and_insserv -n "tinyproxy"} - -#if 0%{?has_systemd} -#service_add_post tinyproxy.service -#endif +systemd-tmpfiles --create tinyproxy.conf || : +%service_add_post tinyproxy.service %preun -%stop_on_removal tinyproxy - -#if 0%{?has_systemd} -#service_del_preun tinyproxy.service -#endif +%service_del_preun tinyproxy.service %postun -#if 0%{?has_systemd} -#service_del_postun tinyproxy.service -#endif - -%restart_on_update tinyproxy -%insserv_cleanup -%stop_on_removal +%service_del_postun tinyproxy.service %files %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/*.conf -%config %{_sysconfdir}/logrotate.d/%{name} -%attr(0755,root,root) %{_initddir}/%{name} -%{_sbindir}/* -%{_mandir}/man*/* -%{_datadir}/%{name} -%attr(750,%{name},root) /var/log/%{name} +%config(noreplace) %_sysconfdir/*.conf +%config %_sysconfdir/logrotate.d/%name +%_sbindir/* +%_mandir/man*/* +%_datadir/%name +%_unitdir/*.service +%_prefix/lib/tmpfiles.d/ +%attr(750,%name,root) /var/log/%name %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
