From: swa Date: Sun, 24 Mar 2002 11:40:14 +0000 (+0000) Subject: name change X-Git-Tag: v_2_9_13~45 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=c39030e5381369a9cabd2ee15ef34926f11697de name change --- diff --git a/privoxy-rh.spec b/privoxy-rh.spec index bb404dad..504af0a6 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,7 +1,7 @@ -# $Id: junkbusterng-rh.spec,v 1.1 2002/03/22 20:53:03 morcego Exp $ +# $Id: privoxy-rh.spec,v 1.1 2002/03/24 11:23:44 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -28,14 +28,14 @@ # Defines should happen in the begining of the file %define oldname junkbuster -%define jbngconf %{_sysconfdir}/%{oldname} +%define privoxyconf %{_sysconfdir}/%{oldname} -Summary: JunkbusterNG (The Internet Junkbuster NextGeneration) +Summary: Privoxy - privacy enhancing proxy Vendor: http://ijbswa.sourceforge.net -Name: junkbusterng +Name: privoxy Version: 2.9.13 Release: 1 -Source0: http://www.waldherr.org/%{name}/ijbswa-%{version}.tar.gz +Source0: http://www.waldherr.org/%{name}/privoxy-%{version}.tar.gz License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root Group: Networking/Utilities @@ -46,14 +46,20 @@ Prereq: shadow-utils, chkconfig, initscripts, sh-utils BuildRequires: perl gzip sed docbook-utils libtool Conflicts: junkbuster-raw junkbuster-blank junkbuster -%description -JunkbusterNG is a web proxy with advanced filtering -capabilities for protecting privacy, filtering web page content, -managing cookies, controlling access, and removing ads, banners, -pop-ups and other obnoxious Internet Junk. JunkbusterNG has a very -flexible configuration and can be customized to suit individual needs -and tastes. JunkbusterNG has application for both stand-alone -systems and multi-user networks. +%description +Privoxy is a web proxy with advanced filtering capabilities for +protecting privacy, filtering web page content, managing cookies, +controlling access, and removing ads, banners, pop-ups and other +obnoxious Internet junk. Privoxy has a very flexible configuration and +can be customized to suit individual needs and tastes. Internet +Privoxy has application for both stand-alone systems and multi-user +networks. + +Privoxy is based on the code of the Internet Junkbuster. Junkbuster +was originally written by JunkBusters Corporation, and was released as +free open-source software under the GNU GPL. Stefan Waldherr made many +improvements, and started the SourceForge project to continue +development. Several other developers are now contributing. %prep %setup -q -c @@ -73,7 +79,7 @@ make redhat-dok mkdir -p %{buildroot}%{_sbindir} \ %{buildroot}%{_mandir}/man8 \ %{buildroot}%{_localstatedir}/log/%{name} \ - %{buildroot}%{jbngconf}/templates \ + %{buildroot}%{privoxyconf}/templates \ %{buildroot}%{_sysconfdir}/logrotate.d \ %{buildroot}%{_sysconfdir}/rc.d/init.d @@ -88,11 +94,13 @@ install -s -m 744 jbng %{buildroot}%{_sbindir}/jbng ## We need to change the man section internaly on the manpage ## -- morcego (sugestion by Hal Burgiss) #cp -f %{name}.1 %{buildroot}%{_mandir}/man8/%{name}.8 -sed -e 's@^.TH JUNKBUSTER 1@.TH JUNKBUSTER 8@g' %{oldname}.1 > %{buildroot}%{_mandir}/man8/%{oldname}.8 -cp -f *.action %{buildroot}%{jbngconf}/ -cp -f re_filterfile %{buildroot}%{jbngconf}/re_filterfile -cp -f trust %{buildroot}%{jbngconf}/trust -cp -f templates/* %{buildroot}%{jbngconf}/templates/ + +# do we need this??? +#sed -e 's@^.TH JUNKBUSTER 1@.TH JUNKBUSTER 8@g' %{oldname}.1 > %{buildroot}%{_mandir}/man8/%{oldname}.8 +cp -f *.action %{buildroot}%{privoxyconf}/ +cp -f re_filterfile %{buildroot}%{privoxyconf}/re_filterfile +cp -f trust %{buildroot}%{privoxyconf}/trust +cp -f templates/* %{buildroot}%{privoxyconf}/templates/ cp -f %{oldname}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{oldname} install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} @@ -102,7 +110,7 @@ install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} ## Changing the sed paramter delimiter to @, so we don't have to ## escape the slashes cat config | \ - sed 's@^confdir.*@confdir %{jbngconf}@g' | \ + sed 's@^confdir.*@confdir %{privoxyconf}@g' | \ # sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \ # sed 's/^re_filterfile.*/re_filterfile \/etc\/%{name}\/re_filterfile/g' | \ # sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \ @@ -110,27 +118,27 @@ cat config | \ # sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \ # sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \ sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' > \ - %{buildroot}%{jbngconf}/config + %{buildroot}%{privoxyconf}/config perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\ - %{buildroot}%{jbngconf}/ijb.action + %{buildroot}%{privoxyconf}/ijb.action ## Macros are expanded even on commentaries. So, we have to use %% ## -- morcego #%%makeinstall %pre -# We check to see if the user junkbuster exists. +# We check to see if the user privoxy exists. # If it does, we do nothing # If we don't, we check to see if the user junkbust exist and, in case it # does, we change it do junkbuster. If it also does not exist, we create the -# junkbuster user -- morcego -id junkbuster > /dev/null 2>&1 +# privoxy user -- morcego +id privoxy > /dev/null 2>&1 if [ $? -eq 1 ]; then - id junkbust > /dev/null 2>&1 + id privoxy > /dev/null 2>&1 if [ $? -eq 0 ]; then - /usr/sbin/usermod -l junkbuster -d %{_sysconfdir}/%{name} -s "" junkbust > /dev/null 2>&1 + /usr/sbin/usermod -l privoxy -d %{_sysconfdir}/%{name} -s "" privoxy > /dev/null 2>&1 else - /usr/sbin/useradd -d %{_sysconfdir}/%{name} -r -s "" junkbuster > /dev/null 2>&1 + /usr/sbin/useradd -d %{_sysconfdir}/%{name} -r -s "" privoxy > /dev/null 2>&1 fi fi @@ -162,8 +170,8 @@ fi #if [ "$1" -ge "1" ]; then # /sbin/service %{name} condrestart > /dev/null 2>&1 #fi -# dont forget to remove user and group junkbuster -id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true +# dont forget to remove user and group privoxy +id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} @@ -177,48 +185,48 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true %doc doc/webserver/ijb_docs.css #%doc %{name}.weekly %{name}.monthly AUTHORS -%dir %{jbngconf} -%dir %{jbngconf}/templates -%attr(0744,junkbuster,junkbuster) %dir %{_localstatedir}/log/%{name} +%dir %{privoxyconf} +%dir %{privoxyconf}/templates +%attr(0744,privoxy,privoxy) %dir %{_localstatedir}/log/%{name} -%attr(0744,junkbuster,junkbuster)%{_sbindir}/jbng +%attr(0744,privoxy,privoxy)%{_sbindir}/jbng # We should not use wildchars here. This could mask missing files problems # -- morcego -%config %{jbngconf}/config -%config %{jbngconf}/ijb-advanced.action -%config %{jbngconf}/ijb-basic.action -%config %{jbngconf}/ijb-intermediate.action -%config %{jbngconf}/ijb.action -%config %{jbngconf}/re_filterfile -%config %{jbngconf}/trust - -%config %{jbngconf}/templates/blocked -%config %{jbngconf}/templates/blocked-compact -%config %{jbngconf}/templates/cgi-error-404 -%config %{jbngconf}/templates/cgi-error-bad-param -%config %{jbngconf}/templates/cgi-error-disabled -%config %{jbngconf}/templates/cgi-error-file -%config %{jbngconf}/templates/cgi-error-modified -%config %{jbngconf}/templates/cgi-error-parse -%config %{jbngconf}/templates/connect-failed -%config %{jbngconf}/templates/default -%config %{jbngconf}/templates/edit-actions-add-url-form -%config %{jbngconf}/templates/edit-actions-for-url -%config %{jbngconf}/templates/edit-actions-list -%config %{jbngconf}/templates/edit-actions-list-section -%config %{jbngconf}/templates/edit-actions-list-url -%config %{jbngconf}/templates/edit-actions-remove-url-form -%config %{jbngconf}/templates/edit-actions-url-form -%config %{jbngconf}/templates/no-such-domain -%config %{jbngconf}/templates/show-request -%config %{jbngconf}/templates/show-status -%config %{jbngconf}/templates/show-status-file -%config %{jbngconf}/templates/show-url-info -%config %{jbngconf}/templates/show-version -%config %{jbngconf}/templates/toggle -%config %{jbngconf}/templates/toggle-mini -%config %{jbngconf}/templates/untrusted +%config %{privoxyconf}/config +%config %{privoxyconf}/ijb-advanced.action +%config %{privoxyconf}/ijb-basic.action +%config %{privoxyconf}/ijb-intermediate.action +%config %{privoxyconf}/ijb.action +%config %{privoxyconf}/re_filterfile +%config %{privoxyconf}/trust + +%config %{privoxyconf}/templates/blocked +%config %{privoxyconf}/templates/blocked-compact +%config %{privoxyconf}/templates/cgi-error-404 +%config %{privoxyconf}/templates/cgi-error-bad-param +%config %{privoxyconf}/templates/cgi-error-disabled +%config %{privoxyconf}/templates/cgi-error-file +%config %{privoxyconf}/templates/cgi-error-modified +%config %{privoxyconf}/templates/cgi-error-parse +%config %{privoxyconf}/templates/connect-failed +%config %{privoxyconf}/templates/default +%config %{privoxyconf}/templates/edit-actions-add-url-form +%config %{privoxyconf}/templates/edit-actions-for-url +%config %{privoxyconf}/templates/edit-actions-list +%config %{privoxyconf}/templates/edit-actions-list-section +%config %{privoxyconf}/templates/edit-actions-list-url +%config %{privoxyconf}/templates/edit-actions-remove-url-form +%config %{privoxyconf}/templates/edit-actions-url-form +%config %{privoxyconf}/templates/no-such-domain +%config %{privoxyconf}/templates/show-request +%config %{privoxyconf}/templates/show-status +%config %{privoxyconf}/templates/show-status-file +%config %{privoxyconf}/templates/show-url-info +%config %{privoxyconf}/templates/show-version +%config %{privoxyconf}/templates/toggle +%config %{privoxyconf}/templates/toggle-mini +%config %{privoxyconf}/templates/untrusted %config %{_sysconfdir}/logrotate.d/%{oldname} %config %attr(0744,root,root) %{_sysconfdir}/rc.d/init.d/%{name} @@ -471,7 +479,10 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true junkbuster.init was modified. It now starts junkbuster with an additional "-r @" flag. -# $Log: junkbusterng-rh.spec,v $ +# $Log: privoxy-rh.spec,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.1 2002/03/22 20:53:03 morcego # - Ongoing process to change name to JunkbusterNG # - configure/configure.in: no change needed diff --git a/privoxy-suse.spec b/privoxy-suse.spec index a921b83f..cdf0808c 100644 --- a/privoxy-suse.spec +++ b/privoxy-suse.spec @@ -1,7 +1,7 @@ -# $Id: junkbuster-suse.spec,v 1.21 2002/03/21 16:04:33 hal9 Exp $ +# $Id: privoxy-suse.spec,v 1.1 2002/03/24 11:23:44 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -27,37 +27,44 @@ # # do not set to %{name} -%define ijbconf %{_sysconfdir}/junkbuster +%define ijbconf %{_sysconfdir}/privoxy -Summary: The Internet Junkbuster +Summary: Privoxy - privacy enhancing proxy Vendor: http://ijbswa.sourceforge.net -Name: junkbuster-suse +Name: privoxy-suse Distribution: defineme Version: 2.9.11 Release: 3 -Source: http://www.waldherr.org/%{name}/ijbswa-%{version}.tar.gz +Source: http://www.waldherr.org/%{name}/privoxy-%{version}.tar.gz # not sure if this works BuildRoot: %{_tmppath}/%{name}-%{version}-root Packager: Stefan Waldherr Copyright: GPL Group: Networking/Utilities -URL: http://ijbswa.sourceforge.net/ -Provides: ijb -Obsoletes: ijb +URL: http://ijbswa.sourceforge.net/ +Provides: privoxy +Obsoletes: privoxy Autoreqprov: on BuildRequires: perl gzip docbktls libtool +Conflicts: junkbuster-raw junkbuster-blank junkbuster # # ----------------------------------------------------------------------------- # %description -Internet Junkbuster is a web proxy with advanced filtering -capabilities for protecting privacy, filtering web page content, -managing cookies, controlling access, and removing ads, banners, -pop-ups and other obnoxious Internet Junk. Junkbuster has a very -flexible configuration and can be customized to suit individual needs -and tastes. Internet Junkbuster has application for both stand-alone -systems and multi-user networks. +Privoxy is a web proxy with advanced filtering capabilities for +protecting privacy, filtering web page content, managing cookies, +controlling access, and removing ads, banners, pop-ups and other +obnoxious Internet junk. Privoxy has a very flexible configuration and +can be customized to suit individual needs and tastes. Internet +Privoxy has application for both stand-alone systems and multi-user +networks. + +Privoxy is based on the code of the Internet Junkbuster. Junkbuster +was originally written by JunkBusters Corporation, and was released as +free open-source software under the GNU GPL. Stefan Waldherr made many +improvements, and started the SourceForge project to continue +development. Several other developers are now contributing. Authors: -------- @@ -84,7 +91,7 @@ make dok ## Explicitily stripping is not recomended. ## This is handled altomaticaly by RPM, and can couse troubles if ## anyone wants to build an unstriped version - morcego -#strip junkbuster +#strip privoxy # # ----------------------------------------------------------------------------- @@ -93,53 +100,53 @@ make dok [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \ ${RPM_BUILD_ROOT}%{_mandir}/man8 \ - ${RPM_BUILD_ROOT}/var/log/junkbuster \ + ${RPM_BUILD_ROOT}/var/log/privoxy \ ${RPM_BUILD_ROOT}%{ijbconf}/templates \ ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \ ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d -gzip README AUTHORS ChangeLog junkbuster.1 || /bin/true -install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster -cp -f junkbuster.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8.gz +gzip README AUTHORS ChangeLog privoxy.1 || /bin/true +install -s -m 744 privoxy $RPM_BUILD_ROOT%{_sbindir}/privoxy +cp -f privoxy.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/privoxy.8.gz cp -f *.action $RPM_BUILD_ROOT%{ijbconf}/ cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust cp -f templates/* $RPM_BUILD_ROOT%{ijbconf}/templates/ -cp -f junkbuster.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/junkbuster -install -m 755 junkbuster.init.suse $RPM_BUILD_ROOT%{_sysconfdir}/init.d/junkbuster -install -m 711 -d $RPM_BUILD_ROOT/var/log/junkbuster -ln -sf /etc/init.d/junkbuster $RPM_BUILD_ROOT/usr/sbin/rcjunkbuster +cp -f privoxy.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/privoxy +install -m 755 privoxy.init.suse $RPM_BUILD_ROOT%{_sysconfdir}/init.d/privoxy +install -m 711 -d $RPM_BUILD_ROOT/var/log/privoxy +ln -sf /etc/init.d/privoxy $RPM_BUILD_ROOT/usr/sbin/rcprivoxy # verify all file locations, etc. in the config file # don't start with ^ or commented lines are not replaced cat config | \ - sed 's/^confdir.*/confdir \/etc\/junkbuster/g' | \ -# sed 's/^permissionsfile.*/permissionsfile \/etc\/junkbuster\/permissionsfile/g' | \ -# sed 's/^re_filterfile.*/re_filterfile \/etc\/junkbuster\/re_filterfile/g' | \ -# sed 's/^logfile.*/logfile \/var\/log\/junkbuster\/logfile/g' | \ -# sed 's/^jarfile.*/jarfile \/var\/log\/junkbuster\/jarfile/g' | \ -# sed 's/^forward.*/forward \/etc\/junkbuster\/forward/g' | \ -# sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \ - sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \ + sed 's/^confdir.*/confdir \/etc\/privoxy/g' | \ +# sed 's/^permissionsfile.*/permissionsfile \/etc\/privoxy\/permissionsfile/g' | \ +# sed 's/^re_filterfile.*/re_filterfile \/etc\/privoxy\/re_filterfile/g' | \ +# sed 's/^logfile.*/logfile \/var\/log\/privoxy\/logfile/g' | \ +# sed 's/^jarfile.*/jarfile \/var\/log\/privoxy\/jarfile/g' | \ +# sed 's/^forward.*/forward \/etc\/privoxy\/forward/g' | \ +# sed 's/^aclfile.*/aclfile \/etc\/privoxy\/aclfile/g' > \ + sed 's/^logdir.*/logdir \/var\/log\/privoxy/g' > \ $RPM_BUILD_ROOT%{ijbconf}/config # # ----------------------------------------------------------------------------- # %pre -# We check to see if the user junkbuster exists. +# We check to see if the user privoxy exists. # If it does, we do nothing # If we don't, we check to see if the user junkbust exist and, in case it -# does, we change it do junkbuster. If it also does not exist, we create the -# junkbuster user -- morcego -id junkbuster > /dev/null 2>&1 +# does, we change it do privoxy. If it also does not exist, we create the +# privoxy user -- morcego +id privoxy > /dev/null 2>&1 if [ $? -eq 1 ]; then id junkbust > /dev/null 2>&1 if [ $? -eq 0 ]; then - /usr/sbin/usermod -l junkbuster -d %{_sysconfdir}/junkbuster -s "" junkbust > /dev/null 2>&1 + /usr/sbin/usermod -l privoxy -d %{_sysconfdir}/privoxy -s "" junkbust > /dev/null 2>&1 else # -r does not work on suse. - /usr/sbin/groupadd junkbuster - /usr/sbin/useradd -d %{_sysconfdir}/junkbuster -g junkbuster -s "" junkbuster > /dev/null 2>&1 + /usr/sbin/groupadd privoxy + /usr/sbin/useradd -d %{_sysconfdir}/privoxy -g privoxy -s "" privoxy > /dev/null 2>&1 fi fi @@ -147,19 +154,19 @@ fi # ----------------------------------------------------------------------------- # %post -[ -f /var/log/junkbuster/junkbuster ] &&\ - mv -f /var/log/junkbuster/junkbuster /var/log/junkbuster/logfile || /bin/true -chown -R junkbuster:junkbuster /var/log/junkbuster 2>/dev/null -chown -R junkbuster:junkbuster /etc/junkbuster 2>/dev/null +[ -f /var/log/privoxy/privoxy ] &&\ + mv -f /var/log/privoxy/privoxy /var/log/privoxy/logfile || /bin/true +chown -R privoxy:privoxy /var/log/privoxy 2>/dev/null +chown -R privoxy:privoxy /etc/privoxy 2>/dev/null # not available on suse #if [ "$1" = "1" ]; then -# /sbin/chkconfig --add junkbuster -# /sbin/service junkbuster condrestart > /dev/null 2>&1 +# /sbin/chkconfig --add privoxy +# /sbin/service privoxy condrestart > /dev/null 2>&1 #fi # 01/09/02 HB, getting rid of any user=junkbust # Changed by morcego to use the id command. id junkbust > /dev/null 2>&1 && /usr/sbin/userdel junkbust || /bin/true -sbin/insserv etc/init.d/junkbuster +sbin/insserv etc/init.d/privoxy # # ----------------------------------------------------------------------------- @@ -167,7 +174,7 @@ sbin/insserv etc/init.d/junkbuster %preun # need to stop the service on suse. swa. #if [ "$1" = "0" ]; then -# /sbin/service junkbuster stop > /dev/null 2>&1 ||: +# /sbin/service privoxy stop > /dev/null 2>&1 ||: #fi # @@ -175,8 +182,8 @@ sbin/insserv etc/init.d/junkbuster # %postun sbin/insserv etc/init.d/ -# dont forget to remove user and group junkbuster -id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true +# dont forget to remove user and group privoxy +id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true # # ----------------------------------------------------------------------------- @@ -193,15 +200,15 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true %doc doc/webserver/developer-manual doc/webserver/user-manual %doc doc/webserver/user-manual %doc doc/webserver/ijb_docs.css -#%doc junkbuster.weekly junkbuster.monthly AUTHORS +#%doc privoxy.weekly privoxy.monthly AUTHORS %dir %{ijbconf} %config %{ijbconf}/* -%attr(0744,junkbuster,junkbuster) %dir /var/log/junkbuster -%config %{_sysconfdir}/logrotate.d/junkbuster -%attr(0755,root,root)/usr/sbin/junkbuster +%attr(0744,privoxy,privoxy) %dir /var/log/privoxy +%config %{_sysconfdir}/logrotate.d/privoxy +%attr(0755,root,root)/usr/sbin/privoxy %{_mandir}/man8/* -%config %{_sysconfdir}/init.d/junkbuster -/usr/sbin/rcjunkbuster +%config %{_sysconfdir}/init.d/privoxy +/usr/sbin/rcprivoxy # # ----------------------------------------------------------------------------- @@ -275,7 +282,10 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true * Mon Mar 01 1999 - daniel@suse.de - new package: version 2.0 -# $Log: junkbuster-suse.spec,v $ +# $Log: privoxy-suse.spec,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.21 2002/03/21 16:04:33 hal9 # added ijb_docs.css to %%doc # diff --git a/privoxy.init b/privoxy.init index bf52aaba..02769f55 100644 --- a/privoxy.init +++ b/privoxy.init @@ -1,13 +1,13 @@ #!/bin/sh # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbusterng.init,v $ +# File : $Source: /cvsroot/ijbswa/current/privoxy.init,v $ # # Purpose : This shell script takes care of starting and stopping -# junkbuster. +# privoxy. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -32,7 +32,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbusterng.init,v $ +# $Log: privoxy.init,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.1 2002/03/22 20:53:03 morcego # - Ongoing process to change name to JunkbusterNG # - configure/configure.in: no change needed @@ -133,13 +136,13 @@ # # ********************************************************************/ -# This is file /etc/rc.d/init.d/junkbuster and was put here -# by the junkbuster rpm +# This is file /etc/rc.d/init.d/privoxy and was put here +# by the privoxy rpm # # chkconfig: 235 84 09 # # description: This shell script takes care of starting and stopping \ -# junkbuster. +# privoxy. # @@ -151,11 +154,11 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -JB_OPRG="junkbuster" +JB_OPRG="privoxy" JB_PRG="jbng" JB_BIN="/usr/sbin/$JB_PRG" JB_CONF="/etc/$JB_OPRG/config" -JB_USER="junkbuster" +JB_USER="privoxy" JB_PID=/var/run/$JB_PRG.pid JB_LOCK=/var/lock/subsys/$JB_PRG JB="$JB_BIN --user $JB_USER.$JB_USER --pidfile $JB_PID $JB_CONF" diff --git a/privoxy.init.suse b/privoxy.init.suse index f345f8a2..c51c7afc 100644 --- a/privoxy.init.suse +++ b/privoxy.init.suse @@ -1,13 +1,13 @@ #! /bin/sh # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbuster.init.suse,v $ +# File : $Source: /cvsroot/ijbswa/current/privoxy.init.suse,v $ # # Purpose : This shell script takes care of starting and stopping -# junkbuster. +# privoxy. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -32,7 +32,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbuster.init.suse,v $ +# $Log: privoxy.init.suse,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.7 2002/03/11 11:44:46 oes # Working in suggestions by Thorsten Kukuk # @@ -58,12 +61,12 @@ # # ********************************************************************/ ### BEGIN INIT INFO -# Provides: junkbuster ijb +# Provides: privoxy # Required-Start: $network $syslog $remote_fs # Required-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Description: Starts the Internet Junkbuster +# Description: Starts Privoxy ### END INIT INFO . /etc/rc.config @@ -71,22 +74,22 @@ rc_reset case "$1" in start) - echo -n "Starting The Internet Junkbuster" - if [ ! -f /var/run/junkbuster.pid ] || ! kill -0 `cat /var/run/junkbuster.pid` 2> /dev/null; then - /usr/sbin/junkbuster --user junkbuster.junkbuster --pidfile /var/run/junkbuster.pid /etc/junkbuster/config 2> /dev/null + echo -n "Starting Privoxy" + if [ ! -f /var/run/privoxy.pid ] || ! kill -0 `cat /var/run/privoxy.pid` 2> /dev/null; then + /usr/sbin/privoxy --user privoxy.privoxy --pidfile /var/run/privoxy.pid /etc/privoxy/config 2> /dev/null else false fi rc_status -v ;; stop) - echo -n "Shutting down The Internet Junkbuster" - killproc -TERM /usr/sbin/junkbuster && rm -f /var/run/junkbuster.pid + echo -n "Shutting down Privoxy" + killproc -TERM /usr/sbin/privoxy && rm -f /var/run/privoxy.pid rc_status -v ;; reload) - echo -n "Reloading The Internet Junkbuster" - kill -HUP `cat /var/run/junkbuster.pid` + echo -n "Reloading Privoxy" + kill -HUP `cat /var/run/privoxy.pid` rc_status -v ;; try-restart) @@ -99,8 +102,8 @@ case "$1" in rc_status ;; status) - echo -n "Checking for The Internet Junkbuster" - checkproc /usr/sbin/junkbuster + echo -n "Checking for Privoxy" + checkproc /usr/sbin/privoxy rc_status -v ;; *) diff --git a/privoxy.logrotate b/privoxy.logrotate index 29bb0169..994a8587 100644 --- a/privoxy.logrotate +++ b/privoxy.logrotate @@ -1,15 +1,15 @@ # -# Logrotate file for Junkbuster RPM +# Logrotate file for Privoxy RPM # # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbuster.logrotate,v $ +# File : $Source: /cvsroot/ijbswa/current/privoxy.logrotate,v $ # # Purpose : Rotates all potential Junkbuster logfiles # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -34,7 +34,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbuster.logrotate,v $ +# $Log: privoxy.logrotate,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.7 2001/12/30 14:07:32 steudten # - Add signal handling (unix) # - Add SIGHUP handler (unix) @@ -69,19 +72,19 @@ # # ********************************************************************/ -/var/log/junkbuster/logfile { +/var/log/privoxy/logfile { compress size 1M postrotate - /sbin/service junkbuster reload 2> /dev/null || true + /sbin/service privoxy reload 2> /dev/null || true endscript } -/var/log/junkbuster/jarfile { +/var/log/privoxy/jarfile { missingok compress size 1M postrotate - /sbin/service junkbuster reload 2> /dev/null || true + /sbin/service privoxy reload 2> /dev/null || true endscript } diff --git a/privoxy.monthly b/privoxy.monthly index eaf8aca5..63a93cec 100644 --- a/privoxy.monthly +++ b/privoxy.monthly @@ -2,13 +2,13 @@ # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbuster.monthly,v $ +# File : $Source: /cvsroot/ijbswa/current/privoxy.monthly,v $ # # Purpose : Downloads updated configuration (blocklists, ...) # to the machine. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -33,7 +33,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbuster.monthly,v $ +# $Log: privoxy.monthly,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.3 2001/05/24 07:41:33 swa # added header # diff --git a/privoxy.weekly b/privoxy.weekly index 1682f8c5..43aa209e 100644 --- a/privoxy.weekly +++ b/privoxy.weekly @@ -2,13 +2,13 @@ # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbuster.weekly,v $ +# File : $Source: /cvsroot/ijbswa/current/privoxy.weekly,v $ # # Purpose : Downloads updated configuration (blocklists, ...) # to the machine. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# PRIVOXY team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -33,7 +33,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbuster.weekly,v $ +# $Log: privoxy.weekly,v $ +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.2 2001/05/24 07:52:24 swa # added header. removed ^M. #