shamelessly adapted RPM stuff from the newest rpm that

RedHat provided for the JB.

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index 406005f..ae93128 100644 (file)
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-rh.spec,v 1.3 2001/06/07 17:28:10 swa Exp $
+# $Id: junkbuster-rh.spec,v 1.4 2001/06/08 20:54:18 swa Exp $

 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net


@@ -26,6 +26,9 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-rh.spec,v $
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-rh.spec,v $

+# Revision 1.4  2001/06/08 20:54:18  swa
+# type with status file. remove forward et. al from file list.
+#

 # Revision 1.3  2001/06/07 17:28:10  swa
 # cosmetics
 #
 # Revision 1.3  2001/06/07 17:28:10  swa
 # cosmetics
 #


@@ -49,27 +52,23 @@ Version: 2.9
 Release: 4
 Source0: http://www.waldherr.org/junkbuster/ijbswa.tar.gz
 Copyright: GPL
 Release: 4
 Source0: http://www.waldherr.org/junkbuster/ijbswa.tar.gz
 Copyright: GPL

-BuildRoot: /tmp/junkbuster-rpmbuild
+BuildRoot: %{_tmppath}/%{name}-root

 Group: Networking/Utilities
 URL: %PACKAGE_URL
 Packager: Stefan Waldherr <stefan@waldherr.org>
 Distribution: defineme
 Obsoletes: junkbuster-raw junkbuster-blank
 Group: Networking/Utilities
 URL: %PACKAGE_URL
 Packager: Stefan Waldherr <stefan@waldherr.org>
 Distribution: defineme
 Obsoletes: junkbuster-raw junkbuster-blank

-Prereq: chkconfig
-
-Conflicts: junkbuster-raw junkbuster
+Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service 
+Conflicts: junkbuster-raw junkbuster-blank

 
 #
 # -----------------------------------------------------------------------------
 #
 %description
 
 #
 # -----------------------------------------------------------------------------
 #
 %description

-The Internet Junkbuster (TM) blocks unwanted banner ads and protects
-your privacy from cookies and other threats. It's free under the GPL
-(no warranty), runs under *NIX and works with almost any browser. You
-need to clear you browser's cache and specify the proxy-server,
-described in /usr/doc/junkbuster.  This is a modified version which
-returns a blank GIF for blocked images by default.  But you can
-configure this via /etc/junkbuster/config.
+The Internet Junkbuster stops your browser from displaying the
+advertisement images that pervade many commercial web pages.  Since
+your browser has to download fewer images, surfing the web should be
+faster.

 
 #
 # -----------------------------------------------------------------------------
 
 #
 # -----------------------------------------------------------------------------


@@ -87,7 +86,6 @@ configure this via /etc/junkbuster/config.
 # -----------------------------------------------------------------------------
 #
 %build
 # -----------------------------------------------------------------------------
 #
 %build

-

 #export DISTNAME='\"%PACKAGE_NAME-%PACKAGE_VERSION-%PACKAGE_RELEASE\"'
 #export DISTURL='\"%PACKAGE_URL\"'
 #make MORE_CFLAGS="$RPM_OPT_FLAGS"' -D_DISTNAME="$(DISTNAME)" -D_DISTURL="$(DISTURL)"'
 #export DISTNAME='\"%PACKAGE_NAME-%PACKAGE_VERSION-%PACKAGE_RELEASE\"'
 #export DISTURL='\"%PACKAGE_URL\"'
 #make MORE_CFLAGS="$RPM_OPT_FLAGS"' -D_DISTNAME="$(DISTNAME)" -D_DISTURL="$(DISTURL)"'


@@ -101,35 +99,25 @@ strip junkbuster
 # -----------------------------------------------------------------------------
 #
 %pre
 # -----------------------------------------------------------------------------
 #
 %pre

-if [ -f /etc/rc.d/init.d/junkbuster.init ]; then
-        /etc/rc.d/init.d/junkbuster.init stop
-fi
-if [ -f /etc/rc.d/init.d/junkbuster ]; then
-        /etc/rc.d/init.d/junkbuster stop
-fi
-rm -f /usr/local/bin/junkbuster
-rm -f /usr/local/man/man1/junkbuster.1
-
-if test -d /var/log/junkbuster
-then
-       mv -f /var/log/junkbuster /var/log/junkbuster.rpmorig
-fi
+/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbust > /dev/null 2>&1 || /bin/true

 
 #
 # -----------------------------------------------------------------------------
 #
 %install
 rm -rf $RPM_BUILD_ROOT
 
 #
 # -----------------------------------------------------------------------------
 #
 %install
 rm -rf $RPM_BUILD_ROOT

-mkdir -p $RPM_BUILD_ROOT/{var/log/junkbuster,usr/{sbin,man/man8},etc/{junkbuster,junkbuster/templates,logrotate.d,cron.weekly,cron.monthly,rc.d/{init.d,rc{0,1,2,3,5,6}.d}}}
+mkdir -p $RPM_BUILD_ROOT/var/log/junkbuster \
+       $RPM_BUILD_ROOT%{_sbindir} \
+       $RPM_BUILD_ROOT%{_mandir}/man8 \
+       $RPM_BUILD_ROOT/etc/{junkbuster,junkbuster/templates,logrotate.d,cron.weekly,cron.monthly,rc.d/init.d}

 install -s -m 744 junkbuster $RPM_BUILD_ROOT/usr/sbin/junkbuster
 install -s -m 744 junkbuster $RPM_BUILD_ROOT/usr/sbin/junkbuster

-cp -f junkbuster.1 $RPM_BUILD_ROOT/usr/man/man8/junkbuster.8
+cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8

 cp -f permissionsfile $RPM_BUILD_ROOT/etc/junkbuster/permissionsfile
 cp -f re_filterfile $RPM_BUILD_ROOT/etc/junkbuster/re_filterfile
 # cp -f blocklist $RPM_BUILD_ROOT/etc/junkbuster/blocklist
 # cp -f imagelist $RPM_BUILD_ROOT/etc/junkbuster/imagelist
 # cp -f cookiefile $RPM_BUILD_ROOT/etc/junkbuster/cookiefile
 #cp -f aclfile $RPM_BUILD_ROOT/etc/junkbuster/aclfile
 cp -f permissionsfile $RPM_BUILD_ROOT/etc/junkbuster/permissionsfile
 cp -f re_filterfile $RPM_BUILD_ROOT/etc/junkbuster/re_filterfile
 # cp -f blocklist $RPM_BUILD_ROOT/etc/junkbuster/blocklist
 # cp -f imagelist $RPM_BUILD_ROOT/etc/junkbuster/imagelist
 # cp -f cookiefile $RPM_BUILD_ROOT/etc/junkbuster/cookiefile
 #cp -f aclfile $RPM_BUILD_ROOT/etc/junkbuster/aclfile

-

 # verify all file locations, etc. in the config file
 # don't start with ^ or commented lines are not replaced
 cat config | \
 # verify all file locations, etc. in the config file
 # don't start with ^ or commented lines are not replaced
 cat config | \


@@ -142,56 +130,38 @@ cat config | \
 #    sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \
     sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \
     $RPM_BUILD_ROOT/etc/junkbuster/config
 #    sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \
     sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \
     $RPM_BUILD_ROOT/etc/junkbuster/config

-

 #cp -f forward $RPM_BUILD_ROOT/etc/junkbuster/forward
 cp -f trust $RPM_BUILD_ROOT/etc/junkbuster/trust
 # cp -f popup $RPM_BUILD_ROOT/etc/junkbuster/popup
 cp -f templates/default $RPM_BUILD_ROOT/etc/junkbuster/templates/
 cp -f templates/show-status  $RPM_BUILD_ROOT/etc/junkbuster/templates/
 cp -f templates/show-status-file  $RPM_BUILD_ROOT/etc/junkbuster/templates/
 #cp -f forward $RPM_BUILD_ROOT/etc/junkbuster/forward
 cp -f trust $RPM_BUILD_ROOT/etc/junkbuster/trust
 # cp -f popup $RPM_BUILD_ROOT/etc/junkbuster/popup
 cp -f templates/default $RPM_BUILD_ROOT/etc/junkbuster/templates/
 cp -f templates/show-status  $RPM_BUILD_ROOT/etc/junkbuster/templates/
 cp -f templates/show-status-file  $RPM_BUILD_ROOT/etc/junkbuster/templates/

-

 cp -f junkbuster.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/junkbuster
 cp -f junkbuster.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/junkbuster

-

 install -m 755 junkbuster.init $RPM_BUILD_ROOT/etc/rc.d/init.d/junkbuster
 install -m 744 -d $RPM_BUILD_ROOT/var/log/junkbuster
 
 install -m 755 junkbuster.init $RPM_BUILD_ROOT/etc/rc.d/init.d/junkbuster
 install -m 744 -d $RPM_BUILD_ROOT/var/log/junkbuster
 

-ln -sf ../init.d/junkbuster $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K09junkbuster
-ln -sf ../init.d/junkbuster $RPM_BUILD_ROOT/etc/rc.d/rc1.d/K09junkbuster
-ln -sf ../init.d/junkbuster $RPM_BUILD_ROOT/etc/rc.d/rc2.d/K09junkbuster
-ln -sf ../init.d/junkbuster $RPM_BUILD_ROOT/etc/rc.d/rc3.d/S84junkbuster
-ln -sf ../init.d/junkbuster $RPM_BUILD_ROOT/etc/rc.d/rc5.d/S84junkbuster
-ln -sf ../init.d/junkbuster $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K09junkbuster
-
-

 #
 # -----------------------------------------------------------------------------
 #
 %preun
 #
 # -----------------------------------------------------------------------------
 #
 %preun

-if [ -f /etc/rc.d/init.d/junkbuster.init ]; then
-        /etc/rc.d/init.d/junkbuster.init stop
+if [ "$1" = "0" ]; then
+       /sbin/service junkbuster stop > /dev/null 2>&1
+       /sbin/chkconfig --del junkbuster

 fi
 fi

-if [ -f /etc/rc.d/init.d/junkbuster ]; then
-        /etc/rc.d/init.d/junkbuster stop
+
+#
+# -----------------------------------------------------------------------------
+#
+%postun
+if [ "$1" -ge "1" ]; then
+       /sbin/service junkbuster condrestart > /dev/null 2>&1

 fi
 
 #
 # -----------------------------------------------------------------------------
 #
 %post
 fi
 
 #
 # -----------------------------------------------------------------------------
 #
 %post

-cat << EOT >&2
-
-Now you'll need to start junkbuster with 
-
-       /etc/rc.d/init.d/junkbuster start
-
-or simply reboot; It will be started automatically at boot time. 
-Don't forget to add the proxy stuff in Netscape.
-
-EOT
-
-# check configuration of start/stop/ scripts
-# /sbin/chkconfig --add junkbuster
-
+/sbin/chkconfig --add junkbuster

 
 #
 # -----------------------------------------------------------------------------
 
 #
 # -----------------------------------------------------------------------------


@@ -206,18 +176,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 # %doc ijbfaq.html ijbman.html README README.TOO gpl.html 
 %doc junkbuster.weekly junkbuster.monthly
 %defattr(-,root,root)
 # %doc ijbfaq.html ijbman.html README README.TOO gpl.html 
 %doc junkbuster.weekly junkbuster.monthly

-%attr (-,nobody,nobody) /var/log/junkbuster
-%config /etc/junkbuster/*
+%dir /etc/junkbuster
+%config /etc/junkbuster/config
+%config /etc/junkbuster/permissionsfile
+%config /etc/junkbuster/re_filterfile
+%config /etc/junkbuster/trust
+%dir /etc/junkbuster/templates
+%config /etc/junkbuster/templates/default
+%config /etc/junkbuster/templates/show-status
+%config /etc/junkbuster/templates/show-status-file
+%attr(0744,junkbust,junkbust) %dir /var/log/junkbuster

 %config /etc/logrotate.d/junkbuster
 %config /etc/logrotate.d/junkbuster

-%attr (-,nobody,nobody) /usr/sbin/junkbuster
-/usr/man/man8/junkbuster.8
+%attr(0744,junkbust,junkbust)/usr/sbin/junkbuster
+%{_mandir}/*/*

 %config /etc/rc.d/init.d/junkbuster
 %config /etc/rc.d/init.d/junkbuster

-%config(missingok) /etc/rc.d/rc0.d/K09junkbuster
-%config(missingok) /etc/rc.d/rc1.d/K09junkbuster
-%config(missingok) /etc/rc.d/rc2.d/K09junkbuster
-%config(missingok) /etc/rc.d/rc3.d/S84junkbuster
-%config(missingok) /etc/rc.d/rc5.d/S84junkbuster
-%config(missingok) /etc/rc.d/rc6.d/K09junkbuster

 
 #
 # -----------------------------------------------------------------------------
 
 #
 # -----------------------------------------------------------------------------

diff --git a/junkbuster.init b/junkbuster.init
index 3cf2acc..4ab27b7 100644 (file)
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -36,132 +36,75 @@
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $

+#     Revision 1.3  2001/05/25 10:12:44  oes
+#     Fixed default case in switch statement (# -> *)
+#

 #     Revision 1.2  2001/05/24 07:52:24  swa
 #     added header. removed ^M.
 #
 # 
 # ********************************************************************/
 
 #     Revision 1.2  2001/05/24 07:52:24  swa
 #     added header. removed ^M.
 #
 # 
 # ********************************************************************/
 

-# 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
-
-# ---------------------------------------------------------------------------
+# This is file /etc/rc.d/init.d/junkbuster and was put here 
+# by the junkbuster rpm

 #
 #

-# SuSE only
-# FIXME: I need to be updated using the latest skeleton script from SuSE
+# chkconfig: 235 84 09

 #
 #

-# ---------------------------------------------------------------------------
-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
+# description: This shell script takes care of starting and stopping \
+#             junkbuster.

 #
 #

-# ---------------------------------------------------------------------------

 
 # Source function library.
 
 # Source function library.

-if [ -f /etc/rc.d/init.d/functions ]; then

 . /etc/rc.d/init.d/functions
 . /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
 
 
 [ -f /usr/sbin/junkbuster ] || exit 0
 

-RETVAL=0
+[ -f /etc/junkbuster/config ] || exit 0

 
 # See how we were called.
 
 # 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=$?
-      ;;
+JB="/usr/sbin/junkbuster /etc/junkbuster/config & "
+start () {
+       # start daemon
+       [ -f /var/lock/subsys/junkbuster ] && exit 0
+       echo -n $"Starting junkbuster: "
+       daemon --user junkbust $JB 
+       RETVAL=$?
+       echo
+       [ $RETVAL = 0 ] && touch /var/lock/subsys/junkbuster
+       return $RETVAL
+}
+
+stop () {
+       # stop daemon
+       echo -n $"Stopping junkbuster: "
+       killproc junkbuster && rm -f /var/lock/subsys/junkbuster
+       RETVAL=?$
+       echo
+}

 
 

-   restart|reload)
-                $0 stop && $0 start
-      ;;
-
-   *)
-      echo "Usage: junkbuster {start|stop|status|restart|reload}"
-      exit 1
+case "$1" in
+       start)
+               start   
+       ;;
+
+       stop)
+               stop    
+       ;;
+
+       restart)
+               stop
+               start
+               ;;
+       condrestart)
+               [ -f /var/lock/subsys/junkbuster ] && restart || : 
+       ;;
+       status)
+               status junkbuster
+       ;;
+       *)
+               echo $"Usage: junkbuster {start|stop|restart|condrestart|status}"
+               exit 1

 esac
 
 esac
 

-exit $RETVAL
-
-fi
-
+exit 0