From 60adfb320a5a421cf69e91fba0b3c0ad2eb664ae Mon Sep 17 00:00:00 2001 From: swa Date: Sun, 24 Mar 2002 11:23:44 +0000 Subject: [PATCH] name change --- junkbusterng-rh.spec => privoxy-rh.spec | 51 ++++++++++++++++++++++- junkbuster-suse.spec => privoxy-suse.spec | 7 +++- junkbuster.1 => privoxy.1 | 0 junkbusterng.init => privoxy.init | 51 ++++++++++++++++++++++- junkbuster.init.suse => privoxy.init.suse | 3 ++ junkbuster.logrotate => privoxy.logrotate | 8 ++++ junkbuster.monthly => privoxy.monthly | 7 +++- junkbuster.weekly => privoxy.weekly | 7 +++- 8 files changed, 124 insertions(+), 10 deletions(-) rename junkbusterng-rh.spec => privoxy-rh.spec (90%) rename junkbuster-suse.spec => privoxy-suse.spec (98%) rename junkbuster.1 => privoxy.1 (100%) rename junkbusterng.init => privoxy.init (64%) rename junkbuster.init.suse => privoxy.init.suse (97%) rename junkbuster.logrotate => privoxy.logrotate (90%) rename junkbuster.monthly => privoxy.monthly (93%) rename junkbuster.weekly => privoxy.weekly (91%) diff --git a/junkbusterng-rh.spec b/privoxy-rh.spec similarity index 90% rename from junkbusterng-rh.spec rename to privoxy-rh.spec index 7417ffcc..bb404dad 100644 --- a/junkbusterng-rh.spec +++ b/privoxy-rh.spec @@ -1,4 +1,4 @@ -# $Id: junkbuster-rh.spec,v 1.43 2002/03/21 16:04:10 hal9 Exp $ +# $Id: junkbusterng-rh.spec,v 1.1 2002/03/22 20:53:03 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -471,7 +471,54 @@ 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: junkbuster-rh.spec,v $ +# $Log: junkbusterng-rh.spec,v $ +# Revision 1.1 2002/03/22 20:53:03 morcego +# - Ongoing process to change name to JunkbusterNG +# - configure/configure.in: no change needed +# - GNUmakefile.in: +# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz +# - PROGRAM = jbng@EXEEXT@ +# - rh-spec now references as junkbusterng-rh.spec +# - redhat-upload: references changed to junkbusterng-* (package names) +# - tarball-dist: references changed to JunkbusterNG-distribution-* +# - tarball-src: now JunkbusterNG-* +# - install: initscript now junkbusterng.init and junkbusterng (when +# installed) +# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec +# - junkbusterng.spec: +# - References to the expression ijb where changed where possible +# - New package name: junkbusterng (all in lower case, acording to +# the LSB recomendation) +# - Version changed to: 2.9.13 +# - Release: 1 +# - Added: junkbuster to obsoletes and conflicts (Not sure this is +# right. If it obsoletes, why conflict ? Have to check it later) +# - Summary changed: Stefan, please check and aprove it +# - Changes description to use the new name +# - Sed string was NOT changed. Have to wait to the manpage to +# change first +# - Keeping the user junkbuster for now. It will require some aditional +# changes on the script (scheduled for the next specfile release) +# - Added post entry to move the old logfile to the new log directory +# - Removing "chkconfig --add" entry (not good to have it automaticaly +# added to the startup list). +# - Added preun section to stop the service with the old name, as well +# as remove it from the startup list +# - Removed the chkconfig --del entry from the conditional block on +# the preun scriptlet (now handled on the %files section) +# - junkbuster.init: renamed to junkbusterng.init +# - junkbusterng.init: +# - Changed JB_BIN to jbng +# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to +# be used where necessary (config dir) +# +# Aditional notes: +# - The config directory is /etc/junkbuster yet. Have to change it on the +# specfile, after it is changes on the code +# - The only files that got renamed on the cvs tree were the rh specfile and +# the init file. Some file references got changes on the makefile and on the +# rh-spec (as listed above) +# # Revision 1.43 2002/03/21 16:04:10 hal9 # added ijb_docs.css to %doc # diff --git a/junkbuster-suse.spec b/privoxy-suse.spec similarity index 98% rename from junkbuster-suse.spec rename to privoxy-suse.spec index 990c840b..a921b83f 100644 --- a/junkbuster-suse.spec +++ b/privoxy-suse.spec @@ -1,4 +1,4 @@ -# $Id: junkbuster-suse.spec,v 1.20 2002/03/12 13:42:14 sarantis Exp $ +# $Id: junkbuster-suse.spec,v 1.21 2002/03/21 16:04:33 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -34,7 +34,7 @@ Vendor: http://ijbswa.sourceforge.net Name: junkbuster-suse Distribution: defineme Version: 2.9.11 -Release: 1 +Release: 3 Source: http://www.waldherr.org/%{name}/ijbswa-%{version}.tar.gz # not sure if this works BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -276,6 +276,9 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true - new package: version 2.0 # $Log: junkbuster-suse.spec,v $ +# Revision 1.21 2002/03/21 16:04:33 hal9 +# added ijb_docs.css to %%doc +# # Revision 1.20 2002/03/12 13:42:14 sarantis # remove hardcoded "ijbswa" from build phase # diff --git a/junkbuster.1 b/privoxy.1 similarity index 100% rename from junkbuster.1 rename to privoxy.1 diff --git a/junkbusterng.init b/privoxy.init similarity index 64% rename from junkbusterng.init rename to privoxy.init index 28ace8b8..bf52aaba 100644 --- a/junkbusterng.init +++ b/privoxy.init @@ -1,7 +1,7 @@ #!/bin/sh # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbuster.init,v $ +# File : $Source: /cvsroot/ijbswa/current/junkbusterng.init,v $ # # Purpose : This shell script takes care of starting and stopping # junkbuster. @@ -32,7 +32,54 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbuster.init,v $ +# $Log: junkbusterng.init,v $ +# Revision 1.1 2002/03/22 20:53:03 morcego +# - Ongoing process to change name to JunkbusterNG +# - configure/configure.in: no change needed +# - GNUmakefile.in: +# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz +# - PROGRAM = jbng@EXEEXT@ +# - rh-spec now references as junkbusterng-rh.spec +# - redhat-upload: references changed to junkbusterng-* (package names) +# - tarball-dist: references changed to JunkbusterNG-distribution-* +# - tarball-src: now JunkbusterNG-* +# - install: initscript now junkbusterng.init and junkbusterng (when +# installed) +# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec +# - junkbusterng.spec: +# - References to the expression ijb where changed where possible +# - New package name: junkbusterng (all in lower case, acording to +# the LSB recomendation) +# - Version changed to: 2.9.13 +# - Release: 1 +# - Added: junkbuster to obsoletes and conflicts (Not sure this is +# right. If it obsoletes, why conflict ? Have to check it later) +# - Summary changed: Stefan, please check and aprove it +# - Changes description to use the new name +# - Sed string was NOT changed. Have to wait to the manpage to +# change first +# - Keeping the user junkbuster for now. It will require some aditional +# changes on the script (scheduled for the next specfile release) +# - Added post entry to move the old logfile to the new log directory +# - Removing "chkconfig --add" entry (not good to have it automaticaly +# added to the startup list). +# - Added preun section to stop the service with the old name, as well +# as remove it from the startup list +# - Removed the chkconfig --del entry from the conditional block on +# the preun scriptlet (now handled on the %files section) +# - junkbuster.init: renamed to junkbusterng.init +# - junkbusterng.init: +# - Changed JB_BIN to jbng +# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to +# be used where necessary (config dir) +# +# Aditional notes: +# - The config directory is /etc/junkbuster yet. Have to change it on the +# specfile, after it is changes on the code +# - The only files that got renamed on the cvs tree were the rh specfile and +# the init file. Some file references got changes on the makefile and on the +# rh-spec (as listed above) +# # Revision 1.15 2002/03/09 15:05:58 swa # wrong user.group # diff --git a/junkbuster.init.suse b/privoxy.init.suse similarity index 97% rename from junkbuster.init.suse rename to privoxy.init.suse index 114c5714..f345f8a2 100644 --- a/junkbuster.init.suse +++ b/privoxy.init.suse @@ -33,6 +33,9 @@ # # Revisions : # $Log: junkbuster.init.suse,v $ +# Revision 1.7 2002/03/11 11:44:46 oes +# Working in suggestions by Thorsten Kukuk +# # Revision 1.6 2002/03/09 14:56:34 swa # wrong user.group # diff --git a/junkbuster.logrotate b/privoxy.logrotate similarity index 90% rename from junkbuster.logrotate rename to privoxy.logrotate index 0b88ac7a..29bb0169 100644 --- a/junkbuster.logrotate +++ b/privoxy.logrotate @@ -35,6 +35,14 @@ # # Revisions : # $Log: junkbuster.logrotate,v $ +# Revision 1.7 2001/12/30 14:07:32 steudten +# - Add signal handling (unix) +# - Add SIGHUP handler (unix) +# - Add creation of pidfile (unix) +# - Add action 'top' in rc file (RH) +# - Add entry 'SIGNALS' to manpage +# - Add exit message to logfile (unix) +# # Revision 1.6 2001/12/13 23:19:43 steudten # Add 'restart' of junkbuster service after rotate logfiles. # Better we could use the well known 'kill -HUP', but the handler diff --git a/junkbuster.monthly b/privoxy.monthly similarity index 93% rename from junkbuster.monthly rename to privoxy.monthly index 89dac657..eaf8aca5 100644 --- a/junkbuster.monthly +++ b/privoxy.monthly @@ -2,7 +2,7 @@ # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/gateway.h,v $ +# File : $Source: /cvsroot/ijbswa/current/junkbuster.monthly,v $ # # Purpose : Downloads updated configuration (blocklists, ...) # to the machine. @@ -33,7 +33,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: gateway.h,v $ +# $Log: junkbuster.monthly,v $ +# Revision 1.3 2001/05/24 07:41:33 swa +# added header +# # # # ********************************************************************/ diff --git a/junkbuster.weekly b/privoxy.weekly similarity index 91% rename from junkbuster.weekly rename to privoxy.weekly index fdd5bf14..1682f8c5 100644 --- a/junkbuster.weekly +++ b/privoxy.weekly @@ -2,7 +2,7 @@ # ******************************************************************** # -# File : $Source: /cvsroot/ijbswa/current/junkbuster.monthly,v $ +# File : $Source: /cvsroot/ijbswa/current/junkbuster.weekly,v $ # # Purpose : Downloads updated configuration (blocklists, ...) # to the machine. @@ -33,7 +33,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log: junkbuster.monthly,v $ +# $Log: junkbuster.weekly,v $ +# Revision 1.2 2001/05/24 07:52:24 swa +# added header. removed ^M. +# # Revision 1.3 2001/05/24 07:41:33 swa # added header # -- 2.39.2