X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=junkbuster-suse.spec;h=fa6ae52f3e3552f823a631f91156f63133c67bf5;hp=db616992f48180c13680b6cba38bd89bff8853d2;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=0addd248d2db0c143a151d4be8a9184c6afa2f26 diff --git a/junkbuster-suse.spec b/junkbuster-suse.spec index db616992..fa6ae52f 100644 --- a/junkbuster-suse.spec +++ b/junkbuster-suse.spec @@ -1,4 +1,4 @@ -# $Id: junkbuster-suse.spec,v 1.2 2001/06/07 17:18:44 swa Exp $ +# $Id: junkbuster-suse.spec,v 1.7 2001/09/10 17:44:22 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -26,6 +26,25 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: junkbuster-suse.spec,v $ +# Revision 1.7 2001/09/10 17:44:22 swa +# integrate three pieces of documentation. +# +# Revision 1.6 2001/09/10 16:29:23 swa +# binary contained debug info. +# buildroot definition fucks up the build process under suse. +# program needs to write in varlogjunkbuster +# install all templates +# create varlogjunkbuster +# +# Revision 1.5 2001/06/09 09:13:29 swa +# description shorter +# +# Revision 1.4 2001/06/08 20:53:36 swa +# use buildroot, export init to separate file (better manageability) +# +# Revision 1.3 2001/06/07 17:28:10 swa +# cosmetics +# # Revision 1.2 2001/06/07 17:18:44 swa # header fixed # @@ -39,27 +58,25 @@ Name: junkbuster Packager: Stefan Waldherr Copyright: GPL +# buildroot does not work under f*cking suse :-( +#BuildRoot: /tmp/junkbuster-rpmbuild Group: Networking/Utilities Provides: ijb Obsoletes: ijb Autoreqprov: on -Version: 2.9 -Release: 4 +Version: 2.9.8 +Release: 1 Summary: The Internet Junkbuster Source: http://www.waldherr.org/junkbuster/ijbswa.tar.gz -atch: ijb20.dif # # ----------------------------------------------------------------------------- # %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 is an application that provides privacy and +security to the user of the world wide web. It controls cookies, +removes advertisements or pop-up windows. You can actually modify the +content of web pages on-the-fly. Authors: -------- @@ -71,72 +88,55 @@ SuSE series: n # ----------------------------------------------------------------------------- # %prep -%setup -n ijb20 -%patch +%setup -c -n ijbswa # # ----------------------------------------------------------------------------- # %build +./configure make -cat > /etc/init.d/junkbuster << EOT -#! /bin/sh -# Copyright (c) 1999 SuSE GmbH Nuremberg, Germany. All rights reserved. -# -# Author: Daniel Bischof , 1999 -# -# /sbin/init.d/junkbuster -# -### BEGIN INIT INFO -# Provides: junkbuster ijb -# Required-Start: $network syslog -# Required-Stop: -# Default-Start: 3 5 -# Default-Stop: -# Description: Starts the Internet Junkbuster -### END INIT INFO -. /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/ijb/junkbstr.ini < /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) - \$0 stop && \$0 start || return=\$rc_failed - ;; - 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 -EOT -chmod 755 /etc/init.d/junkbuster -ln -sf /etc/init.d/junkbuster /usr/sbin/rcjunkbuster +strip junkbuster # # ----------------------------------------------------------------------------- # %install -install -m 755 junkbuster /usr/sbin -install -d /etc/ijb -install -m 644 *.ini /etc/ijb -install -m 644 junkbuster.1 /usr/share/man/man1 +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/{var/log/junkbuster,usr/{sbin,share/man/man1,share/doc/packages/junkbuster,share/doc/packages/junkbuster/user-manual,share/doc/packages/junkbuster/developer-manual,share/doc/packages/junkbuster/faq},etc/{junkbuster,junkbuster/templates,init.d}} + +# make sure that we can write in the log directory +chown nobody.nogroup $RPM_BUILD_ROOT/var/log/junkbuster +install -m 755 junkbuster.init.suse $RPM_BUILD_ROOT/etc/init.d/junkbuster +# next line might require an additional rpm_build_root +ln -sf /etc/init.d/junkbuster $RPM_BUILD_ROOT/usr/sbin/rcjunkbuster + +install -m 755 junkbuster $RPM_BUILD_ROOT/usr/sbin +install -d $RPM_BUILD_ROOT/etc/junkbuster +install -d $RPM_BUILD_ROOT/etc/junkbuster/templates +install -m 644 actionsfile $RPM_BUILD_ROOT/etc/junkbuster +install -m 644 re_filterfile $RPM_BUILD_ROOT/etc/junkbuster +# 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/^actionsfile.*/actionsfile \/etc\/junkbuster\/actionsfile/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' > \ + config.tmp +cp -f config.tmp config +install -m 644 config $RPM_BUILD_ROOT/etc/junkbuster +#install -m 644 forward $RPM_BUILD_ROOT/etc/junkbuster +install -m 644 trust $RPM_BUILD_ROOT/etc/junkbuster +install -m 644 templates/* $RPM_BUILD_ROOT/etc/junkbuster/templates +# install -m 644 junkbuster.1 $RPM_BUILD_ROOT/usr/share/man/man1 +cp -r doc/webserver/user-manual $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster +cp -r doc/webserver/developer-manual $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster +cp -r doc/webserver/faq $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster %{?suse_check} # @@ -155,17 +155,22 @@ sbin/insserv etc/init.d/ # ----------------------------------------------------------------------------- # %files -%doc README *.html +%doc /usr/share/doc/packages/junkbuster/faq/ +%doc /usr/share/doc/packages/junkbuster/user-manual/ +%doc /usr/share/doc/packages/junkbuster/developer-manual/ /usr/sbin/junkbuster -/usr/share/man/man1/junkbuster.1.gz -%config(noreplace) /etc/ijb +#/usr/share/man/man1/junkbuster.1.gz +%config(noreplace) /etc/junkbuster /etc/init.d/junkbuster /usr/sbin/rcjunkbuster +/var/log/junkbuster # # ----------------------------------------------------------------------------- # %changelog -n junkbuster +* Sun Jun 3 2001 Stefan Waldherr +- rework of RPM * Wed Feb 14 2001 - uli@suse.de - fixed init script * Wed Dec 06 2000 - bjacke@suse.de