Hello community, here is the log from the commit of package tinyproxy for openSUSE:Factory checked in at 2012-02-23 15:34:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tinyproxy (Old) and /work/SRC/openSUSE:Factory/.tinyproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tinyproxy", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/tinyproxy/tinyproxy.changes 2011-09-23 12:48:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tinyproxy.new/tinyproxy.changes 2012-02-23 15:34:55.000000000 +0100 @@ -1,0 +2,36 @@ +Wed Feb 22 23:08:32 UTC 2012 - [email protected] + +- fix init script + * TINYPROXY_CFG=/etc/tinyproxy.conf + * create PID DIR +- fix logrotate script + * compress, dateext ..... +- add user, group tinyproxy +- add conf patch +- add missing logdir +- add missing rc_link +- fix pre/post + +------------------------------------------------------------------- +Fri Dec 2 10:15:30 UTC 2011 - [email protected] + +- spec-cleaner +- fix build for suse_version 1110 + * define missing _initdir macro + +------------------------------------------------------------------- +Mon Sep 19 08:51:04 UTC 2011 - [email protected] + +- Update to 1.8.3 version + changed source format to bz2 +* Fix upstream proxy support +* Fix FilterURLs with transparent proxy support +* Fix bug in ACL netmask generation + +------------------------------------------------------------------- +Fri Jul 29 12:04:39 UTC 2011 - [email protected] + +- added /etc/init.d/tinyproxy +- added tinyproxy logrotate + +------------------------------------------------------------------- Old: ---- tinyproxy-1.8.2.tar.xz New: ---- tinyproxy-1.8.3.tar.bz2 tinyproxy-conf.patch tinyproxy.init tinyproxy.logrotate ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tinyproxy.spec ++++++ --- /var/tmp/diff_new_pack.7KOpAG/_old 2012-02-23 15:34:57.000000000 +0100 +++ /var/tmp/diff_new_pack.7KOpAG/_new 2012-02-23 15:34:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tinyproxy # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,21 +16,27 @@ # +%if 0%{?suse_version} == 1110 +%define _initddir /etc/init.d +%endif Name: tinyproxy -Version: 1.8.2 -Release: 1 -Group: Productivity/Networking/Web/Proxy Summary: Minimalist WWW proxy -License: GPLv2+ +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/tinyproxy-1.8.2.tar.bz2 -Source: %name-%version.tar.xz - +Source: https://banu.com/pub/tinyproxy/1.8/%{name}-%{version}.tar.bz2 +Source1: %{name}.logrotate +Source2: %{name}.init +Patch0: %{name}-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build + # libxslt -> xsltproc -BuildRequires: asciidoc libxslt xz +BuildRequires: asciidoc +BuildRequires: libxslt +Requires: logrotate %description Tinyproxy is a light-weight HTTP/HTTPS proxy daemon for POSIX @@ -40,20 +46,67 @@ system resources for a larger proxy are unavailable. %prep -%setup -q +%setup -q -n %{name}-%{version} +%patch0 %build %configure make %{?_smp_mflags}; %install -make install DESTDIR="%buildroot"; +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} + +%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 + +%post +%{fillup_and_insserv -n "tinyproxy"} + +#if 0%{?has_systemd} +#service_add_post tinyproxy.service +#endif + +%preun +%stop_on_removal tinyproxy + +#if 0%{?has_systemd} +#service_del_preun tinyproxy.service +#endif + +%postun +#if 0%{?has_systemd} +#service_del_postun tinyproxy.service +#endif + +%restart_on_update tinyproxy +%insserv_cleanup +%stop_on_removal %files %defattr(-,root,root) -%config(noreplace) %_sysconfdir/*.conf -%_sbindir/* -%_mandir/man*/* -%_datadir/tinyproxy +%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} %changelog ++++++ tinyproxy-1.8.2.tar.xz -> tinyproxy-1.8.3.tar.bz2 ++++++ ++++ 35966 lines of diff (skipped) ++++++ tinyproxy-conf.patch ++++++ Index: etc/tinyproxy.conf.in =================================================================== --- etc/tinyproxy.conf.in.orig +++ etc/tinyproxy.conf.in @@ -12,8 +12,8 @@ # as the root user. Either the user or group name or the UID or GID # number may be used. # -User nobody -Group nobody +User tinyproxy +Group tinyproxy # # Port: Specify the port which tinyproxy will listen on. Please note @@ -116,7 +116,7 @@ StatFile "@pkgdatadir@/stats.html" # LogLevel was set to Warning, then all log messages from Warning to # Critical would be output, but Notice and below would be suppressed. # -LogLevel Info +LogLevel Connect # # PidFile: Write the PID of the main tinyproxy thread to this file so it @@ -173,7 +173,7 @@ LogLevel Info # be created. In other words, only MaxClients number of clients can be # connected at the same time. # -MaxClients 100 +MaxClients 20 # # MinSpareServers/MaxSpareServers: These settings set the upper and @@ -183,13 +183,13 @@ MaxClients 100 # server processes will be spawned. If the number of servers exceeds # MaxSpareServers then the extras will be killed off. # -MinSpareServers 5 -MaxSpareServers 20 +MinSpareServers 2 +MaxSpareServers 5 # # StartServers: The number of servers to start initially. # -StartServers 10 +StartServers 5 # # MaxRequestsPerChild: The number of connections a thread will handle ++++++ tinyproxy.init ++++++ #! /bin/sh # # /etc/init.d/tinyproxy # and symbolic its link # (usr/)sbin/rctinyproxy # # System startup script for the tiny http proxy # ### BEGIN INIT INFO # Provides: tinyproxy # Required-Start: $remote_fs $syslog $named # Required-Stop: $remote_fs $syslog $named # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start tiny http-proxy # Description: tinyproxy is a GPLed, lightweight HTTP proxy. # Designed from the ground up to be fast and yet small, it # is an ideal solution for sites where a full-featured HTTP # proxy is required, but the system resources required to # run a more demanding HTTP proxy are unavailable. ### END INIT INFO # # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. TINYPROXY_BIN=/usr/sbin/tinyproxy test -x $TINYPROXY_BIN || { echo "$TINYPROXY_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } TINYPROXY_CFG=/etc/tinyproxy.conf test -r $TINYPROXY_CFG || { echo "$TINYPROXY_CFG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } TINYPROXY_PID=/var/run/tinyproxy/tinyproxy.pid # create DIR for PID [ ! -d /var/run/tinyproxy ] && { install -d -m0750 -o tinyproxy -g root /var/run/tinyproxy; } TINYPROXY="tiny http proxy" # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset case "$1" in start) echo -n "Starting $TINYPROXY: " /sbin/startproc -p $TINYPROXY_PID $TINYPROXY_BIN # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down $TINYPROXY: " /sbin/killproc -p $TINYPROXY_PID -TERM $TINYPROXY_BIN # Remember status and be verbose rc_status -v ;; try-restart) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) echo -n "Reload service $TINYPROXY: " /sbin/killproc -p $TINYPROXY_PID -HUP $TINYPROXY_BIN # Remember status and be verbose rc_status -v ;; reload) echo -n "Reload service $TINYPROXY: " /sbin/killproc -p $TINYPROXY_PID -HUP $TINYPROXY_BIN # Remember status and be verbose rc_status -v ;; status) echo -n "Checking for $TINYPROXY: " /sbin/checkproc -p $TINYPROXY_PID $TINYPROXY_BIN # Remember status and be verbose rc_status -v ;; probe) test $TINYPROXY_CFG -nt $TINYPROXY_PID && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ tinyproxy.logrotate ++++++ /var/log/tinyproxy/tinyproxy.log { compress dateext maxage 365 rotate 99 size=+4096k notifempty missingok create 640 tinyproxy root sharedscripts postrotate /etc/init.d/tinyproxy reload endscript } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
