From: swa <swa@users.sourceforge.net>
Date: Thu, 24 May 2001 07:52:24 +0000 (+0000)
Subject: added header. removed ^M.
X-Git-Tag: v_2_9_9~501
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/developer-manual/static/@default-cgi@send-stylesheet?a=commitdiff_plain;h=f1bf394c77bc1f9c62a9124091a01034db09ecfa;p=privoxy.git

added header. removed ^M.
---

diff --git a/junkbuster.init b/junkbuster.init
index c74b6b7a..6516ab53 100644
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -1,149 +1,163 @@
-#!/bin/sh
-#
-# $Id: junkbuster.init,v 1.2 2001/04/30 02:36:54 rodney Exp $
-#
-# This is file is either 
-#
-#         /etc/rc.d/init.d/junkbuster 
-#
-# or
-#
-#         /sbin/init.d/junkbuster
-#
-# and was put here by the junkbuster rpm
-#
-# junkbuster  This shell script takes care of starting and stopping
-#             junkbuster.
-#
-# This works only correctly if the user `nobody' is allowed
-# to be in the directory where this file is called 
-# (for example: /root is NOT ok)
-# ---------------------------------------------------------------------------
-# Force /bin/sh as shell (padraic@renaghan.com).
-# Augmented with help by Sterling <wolffe@sempai.org>
-# Hints from mjohnson11@uswest.net
-# Hints from rochedav@primenet.com
-# ---------------------------------------------------------------------------
-# These lines are needed so Redhat's config tools will "see" this script:
-# chkconfig: 35 84 09
-# description: Blocks annoying ads from the internet, along with cookies \
-#              and a few other privacy features.      
-# processname: junkbuster
-# config: /etc/junkbuster/config
-
-
-# ---------------------------------------------------------------------------
-#
-# SuSE only
-#
-# ---------------------------------------------------------------------------
-if [ -f /etc/rc.config ]; then
-
-# Author: Daniel Bischof <daniel@suse.de>, 1999
-# Adjustment: Axel Braun <doc.b@gmx.de>, 17.08.2000 
-. /etc/rc.config
-#base=${0##*/}
-#link=${base#*[SK][0-9][0-9]}
-#test $link = $base && START_IJB=yes
-#test "$START_IJB" = "yes" || exit 0
-return=$rc_done
-case "$1" in
-    start)
-        echo -n "Starting The Internet Junkbuster"
-        su - nobody -c 'nohup /usr/sbin/junkbuster /etc/junkbuster/config < /dev/null > /dev/null &'         
-        sleep 1
-        echo -e "$return"
-        ;;
-    stop)
-        echo -n "Shutting down The Internet Junkbuster"
-        killproc -TERM /usr/sbin/junkbuster || return=$rc_failed
-        echo -e "$return"
-        ;;
-    restart|reload)
-        echo -n "Reload The Internet Junkbuster"
-        killproc -HUP /usr/sbin/junkbuster || return=$rc_failed
-        echo -e "$return"
-        ;;
-    status)
-        checkproc /usr/sbin/junkbuster && echo OK || echo No process
-        ;;
-    *)
-        echo "Usage: $0 {start|restart|status|stop}"
-        exit 1
-esac
-test "$return" = "$rc_done" || exit 1
-exit 0
-
-else
-# ---------------------------------------------------------------------------
-#
-# RedHat only
-#
-# ---------------------------------------------------------------------------
-
-# Source function library.
-if [ -f /etc/rc.d/init.d/functions ]; then
-. /etc/rc.d/init.d/functions
-fi
-
-if [ -f /etc/sysconfig/network ]; then
-. /etc/sysconfig/network
-fi
-
-#  Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -f /etc/junkbuster/config ] || exit 0
-
-[ -f /usr/sbin/junkbuster ] || exit 0
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-
-   start)
-           # abort if already started
-      pid=`pidofproc junkbuster`
-      [ -n "$pid" ] && ps h $pid >/dev/null 2>&1 && \
-      echo -n "Already started: " && status junkbuster && \
-      exit 0
-
-      # Start daemon.
-      echo -n "Starting junkbuster:" && RETVAL=1
-      ulimit -c 0
-                su - nobody -s /bin/sh -c '/usr/sbin/junkbuster /etc/junkbuster/config' &
-      sleep 1
-      pid=`pidofproc junkbuster`
-      [ -n "$pid" ] && ps h $pid >/dev/null 2>&1 && RETVAL=0 && echo_success && touch /var/lock/subsys/junkbuster
-      [ $RETVAL -eq 1 ] && echo_failure
-      echo
-      ;;
-
-   stop)
-      # Stop daemon.
-      echo -n "Shutting down junkbuster:"
-                killproc junkbuster
-      RETVAL=$?
-      [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/junkbuster
-      echo
-      ;;
-
-   status)
-      status junkbuster
-      RETVAL=$?
-      ;;
-
-   restart|reload)
-                $0 stop && $0 start
-      ;;
-
-   *)
-      echo "Usage: junkbuster {start|stop|status|restart|reload}"
-      exit 1
-esac
-
-exit $RETVAL
-
-fi
-
+#!/bin/sh
+#  ********************************************************************
+# 
+#  File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
+# 
+#  Purpose     :  This shell script takes care of starting and stopping
+#                 junkbuster.
+#                 This works only correctly if the user `nobody' is allowed
+#                 to be in the directory where this file is called 
+#                 (for example: /root is NOT ok)
+# 
+#  Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+#                 IJBSWA team.  http://ijbswa.sourceforge.net
+# 
+#                 Based on the Internet Junkbuster originally written
+#                 by and Copyright (C) 1997 Anonymous Coders and
+#                 Junkbusters Corporation.  http://www.junkbusters.com
+# 
+#                 This program is free software; you can redistribute it
+#                 and/or modify it under the terms of the GNU General
+#                 Public License as published by the Free Software
+#                 Foundation; either version 2 of the License, or (at
+#                 your option) any later version.
+# 
+#                 This program is distributed in the hope that it will
+#                 be useful, but WITHOUT ANY WARRANTY; without even the
+#                 implied warranty of MERCHANTABILITY or FITNESS FOR A
+#                 PARTICULAR PURPOSE.  See the GNU General Public
+#                 License for more details.
+# 
+#                 The GNU General Public License should be included with
+#                 this file.  If not, you can view it at
+#                 http://www.gnu.org/copyleft/gpl.html
+#                 or write to the Free Software Foundation, Inc., 59
+#                 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# 
+#  Revisions   :
+#     $Log: loaders.c,v $
+# 
+# ********************************************************************/
+
+# These lines are needed so Redhat's config tools will "see" this script:
+# chkconfig: 35 84 09
+# description: Blocks annoying ads from the internet, along with cookies \
+#              and a few other privacy features.      
+# processname: junkbuster
+# config: /etc/junkbuster/config
+
+# ---------------------------------------------------------------------------
+#
+# SuSE only
+#
+# ---------------------------------------------------------------------------
+if [ -f /etc/rc.config ]; then
+
+# Author: Daniel Bischof <daniel@suse.de>, 1999
+# Adjustment: Axel Braun <doc.b@gmx.de>, 17.08.2000 
+. /etc/rc.config
+#base=${0##*/}
+#link=${base#*[SK][0-9][0-9]}
+#test $link = $base && START_IJB=yes
+#test "$START_IJB" = "yes" || exit 0
+return=$rc_done
+case "$1" in
+    start)
+        echo -n "Starting The Internet Junkbuster"
+        su - nobody -c 'nohup /usr/sbin/junkbuster /etc/junkbuster/config < /dev/null > /dev/null &'         
+        sleep 1
+        echo -e "$return"
+        ;;
+    stop)
+        echo -n "Shutting down The Internet Junkbuster"
+        killproc -TERM /usr/sbin/junkbuster || return=$rc_failed
+        echo -e "$return"
+        ;;
+    restart|reload)
+        echo -n "Reload The Internet Junkbuster"
+        killproc -HUP /usr/sbin/junkbuster || return=$rc_failed
+        echo -e "$return"
+        ;;
+    status)
+        checkproc /usr/sbin/junkbuster && echo OK || echo No process
+        ;;
+   # )
+        echo "Usage: $0 {start|restart|status|stop}"
+        exit 1
+esac
+test "$return" = "$rc_done" || exit 1
+exit 0
+
+else
+# ---------------------------------------------------------------------------
+#
+# RedHat only
+#
+# ---------------------------------------------------------------------------
+
+# Source function library.
+if [ -f /etc/rc.d/init.d/functions ]; then
+. /etc/rc.d/init.d/functions
+fi
+
+if [ -f /etc/sysconfig/network ]; then
+. /etc/sysconfig/network
+fi
+
+#  Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+[ -f /etc/junkbuster/config ] || exit 0
+
+[ -f /usr/sbin/junkbuster ] || exit 0
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+
+   start)
+           # abort if already started
+      pid=`pidofproc junkbuster`
+      [ -n "$pid" ] && ps h $pid >/dev/null 2>&1 && \
+      echo -n "Already started: " && status junkbuster && \
+      exit 0
+
+      # Start daemon.
+      echo -n "Starting junkbuster:" && RETVAL=1
+      ulimit -c 0
+                su - nobody -s /bin/sh -c '/usr/sbin/junkbuster /etc/junkbuster/config' &
+      sleep 1
+      pid=`pidofproc junkbuster`
+      [ -n "$pid" ] && ps h $pid >/dev/null 2>&1 && RETVAL=0 && echo_success && touch /var/lock/subsys/junkbuster
+      [ $RETVAL -eq 1 ] && echo_failure
+      echo
+      ;;
+
+   stop)
+      # Stop daemon.
+      echo -n "Shutting down junkbuster:"
+                killproc junkbuster
+      RETVAL=$?
+      [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/junkbuster
+      echo
+      ;;
+
+   status)
+      status junkbuster
+      RETVAL=$?
+      ;;
+
+   restart|reload)
+                $0 stop && $0 start
+      ;;
+
+  # )
+      echo "Usage: junkbuster {start|stop|status|restart|reload}"
+      exit 1
+esac
+
+exit $RETVAL
+
+fi
+
diff --git a/junkbuster.logrotate b/junkbuster.logrotate
index e8e8b92d..f79d2f99 100644
--- a/junkbuster.logrotate
+++ b/junkbuster.logrotate
@@ -1,18 +1,50 @@
 #
 # Logrotate file for Junkbuster RPM
 #
-# $Id: junkbuster.logrotate,v 1.1 2001/04/30 03:17:00 rodney Exp $
-
-# Fixed problems of 
-#  filename.1 -> filename.1.2 -> filename.1.3
-#  filename.1.2.2, filename.1.2.3, filename.1.3.2, filename.1.3.3
-#  filename.1.2.2.2, filename.1.2.2.3  ...
-# by explicitly listing each logfile in the directory instead of `*'.
+# ********************************************************************
+# 
+#  File        :  $Source: /cvsroot/ijbswa/current/junkbuster.monthly,v $
+# 
+#  Purpose     :  Rotates all potential Junkbuster logfiles
+#                 
+# 
+#  Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+#                 IJBSWA team.  http://ijbswa.sourceforge.net
+# 
+#                 Based on the Internet Junkbuster originally written
+#                 by and Copyright (C) 1997 Anonymous Coders and 
+#                 Junkbusters Corporation.  http://www.junkbusters.com
+# 
+#                 This program is free software; you can redistribute it 
+#                 and/or modify it under the terms of the GNU General
+#                 Public License as published by the Free Software
+#                 Foundation; either version 2 of the License, or (at
+#                 your option) any later version.
+# 
+#                 This program is distributed in the hope that it will
+#                 be useful, but WITHOUT ANY WARRANTY; without even the
+#                 implied warranty of MERCHANTABILITY or FITNESS FOR A
+#                 PARTICULAR PURPOSE.  See the GNU General Public
+#                 License for more details.
+# 
+#                 The GNU General Public License should be included with
+#                 this file.  If not, you can view it at
+#                 http://www.gnu.org/copyleft/gpl.html
+#                 or write to the Free Software Foundation, Inc., 59
+#                 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# 
+#  Revisions   :
+#     $Log: junkbuster.monthly,v $
+#     Revision 1.3  2001/05/24 07:41:33  swa
+#     added header
 #
+# 
+# 
+# ********************************************************************/
 
 /var/log/junkbuster/junkbuster {
    compress
-        weekly
+   weekly
 }
 
 
diff --git a/junkbuster.weekly b/junkbuster.weekly
index bc07b231..fdd5bf14 100644
--- a/junkbuster.weekly
+++ b/junkbuster.weekly
@@ -1,21 +1,58 @@
-#!/bin/sh
-
-# $Id: junkbuster.weekly,v 1.1 2001/04/16 21:10:38 rodney Exp $
-
-# Revised: Mon Dec 06 10:46:08 PST 1999 by Jon Hamkins
-# Hints by Ulrik Haugen <qha@lysator.liu.se>
-# Hints by mirjamv@theochem.kun.nl
-
-set -e
-
-# blocklist
-wget -q --output-document=/etc/junkbuster/blocklist.new \
-     http://www.waldherr.org/blocklist
-
-mv -f /etc/junkbuster/blocklist.new /etc/junkbuster/blocklist
-
-if [ -f /etc/junkbuster/blocklist.local ] ; then
-   cat /etc/junkbuster/blocklist.local >> /etc/junkbuster/blocklist
-fi
-
-chmod 644 /etc/junkbuster/blocklist
+#!/bin/sh
+
+# ********************************************************************
+# 
+#  File        :  $Source: /cvsroot/ijbswa/current/junkbuster.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
+# 
+#                 Based on the Internet Junkbuster originally written
+#                 by and Copyright (C) 1997 Anonymous Coders and 
+#                 Junkbusters Corporation.  http://www.junkbusters.com
+# 
+#                 This program is free software; you can redistribute it 
+#                 and/or modify it under the terms of the GNU General
+#                 Public License as published by the Free Software
+#                 Foundation; either version 2 of the License, or (at
+#                 your option) any later version.
+# 
+#                 This program is distributed in the hope that it will
+#                 be useful, but WITHOUT ANY WARRANTY; without even the
+#                 implied warranty of MERCHANTABILITY or FITNESS FOR A
+#                 PARTICULAR PURPOSE.  See the GNU General Public
+#                 License for more details.
+# 
+#                 The GNU General Public License should be included with
+#                 this file.  If not, you can view it at
+#                 http://www.gnu.org/copyleft/gpl.html
+#                 or write to the Free Software Foundation, Inc., 59
+#                 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# 
+#  Revisions   :
+#     $Log: junkbuster.monthly,v $
+#     Revision 1.3  2001/05/24 07:41:33  swa
+#     added header
+#
+# 
+# 
+# ********************************************************************/
+
+set -e
+
+# blocklist
+wget -q --output-document=/etc/junkbuster/blocklist.new \
+     http://www.waldherr.org/blocklist
+
+mv -f /etc/junkbuster/blocklist.new /etc/junkbuster/blocklist
+
+if [ -f /etc/junkbuster/blocklist.local ] ; then
+   cat /etc/junkbuster/blocklist.local >> /etc/junkbuster/blocklist
+fi
+
+chmod 644 /etc/junkbuster/blocklist
+
+