-# $Id: junkbuster-rh.spec,v 1.2 2001/06/04 18:31:58 swa Exp $
+# $Id: junkbuster-rh.spec,v 1.28 2002/01/09 18:34:03 hal9 Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: junkbuster-rh.spec,v $
+# Revision 1.28 2002/01/09 18:34:03 hal9
+# nit.
+#
+# Revision 1.27 2002/01/09 18:32:02 hal9
+# Removed RPM_OPT_FLAGS kludge.
+#
+# Revision 1.26 2002/01/09 18:21:10 hal9
+# A few minor updates.
+#
+# Revision 1.25 2001/12/28 01:45:36 steudten
+# Add paranoia check and BuildReq: gzip
+#
+# Revision 1.24 2001/12/01 21:43:14 hal9
+# Allowed for new ijb.action file.
+#
+# Revision 1.23 2001/11/06 12:09:03 steudten
+# Compress doc files. Install README and AUTHORS at last as document.
+#
+# Revision 1.22 2001/11/05 21:37:34 steudten
+# Fix to include the actual version for name.
+# Let the 'real' packager be included - sorry stefan.
+#
+# Revision 1.21 2001/10/31 19:27:27 swa
+# consistent description. new name for suse since
+# we had troubles with rpms of identical names
+# on the webserver.
+#
+# Revision 1.20 2001/10/24 15:45:49 hal9
+# To keep Thomas happy (aka correcting my mistakes)
+#
+# Revision 1.19 2001/10/15 03:23:59 hal9
+# Nits.
+#
+# Revision 1.17 2001/10/10 18:59:28 hal9
+# Minor change for init script.
+#
+# Revision 1.16 2001/09/24 20:56:23 hal9
+# Minor changes.
+#
+# Revision 1.13 2001/09/10 17:44:43 swa
+# integrate three pieces of documentation. needs work.
+# will not build cleanly under redhat.
+#
+# Revision 1.12 2001/09/10 16:25:04 swa
+# copy all templates. version updated.
+#
+# Revision 1.11 2001/07/03 11:00:25 sarantis
+# replaced permissionsfile with actionsfile
+#
+# Revision 1.10 2001/07/03 09:34:44 sarantis
+# bumped up version number.
+#
+# Revision 1.9 2001/06/12 18:15:29 swa
+# the % in front of configure (see tag below) confused
+# the rpm build process on 7.1.
+#
+# Revision 1.8 2001/06/12 17:15:56 swa
+# fixes, because a clean build on rh6.1 was impossible.
+# GZIP confuses make, % configure confuses rpm, etc.
+#
+# Revision 1.7 2001/06/11 12:17:26 sarantis
+# fix typo in %post
+#
+# Revision 1.6 2001/06/11 11:28:25 sarantis
+# Further optimizations and adaptations in the spec file.
+#
+# Revision 1.5 2001/06/09 09:14:11 swa
+# shamelessly adapted RPM stuff from the newest rpm that
+# RedHat provided for the JB.
+#
+# 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.2 2001/06/04 18:31:58 swa
# files are now prefixed with either `confdir' or `logdir'.
# `make redhat-dist' replaces both entries confdir and logdir
#
#
#
-%define PACKAGE_NAME junkbuster
-%define PACKAGE_URL http://ijbswa.sourceforge.net
Summary: The Internet Junkbuster
Vendor: http://ijbswa.sourceforge.net
-Name: %PACKAGE_NAME
-Version: 2.9
-Release: 4
-Source0: http://www.waldherr.org/junkbuster/ijbswa.tar.gz
+Name: junkbuster
+Version: 2.9.11
+Release: 1
+Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
Copyright: GPL
-BuildRoot: /tmp/junkbuster
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
Group: Networking/Utilities
-URL: %PACKAGE_URL
-Packager: Stefan Waldherr <stefan@waldherr.org>
-Distribution: defineme
+URL: http://ijbswa.sourceforge.net/
Obsoletes: junkbuster-raw junkbuster-blank
-Prereq: chkconfig
+Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
+BuildRequires: perl gzip
+Conflicts: junkbuster-raw junkbuster-blank
-Conflicts: junkbuster-raw junkbuster
-
-#
-# -----------------------------------------------------------------------------
-#
%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.
-
-#
-# -----------------------------------------------------------------------------
-#
-%prep
+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.
-#
-# -----------------------------------------------------------------------------
-#
+%define ijbconf %{_sysconfdir}/junkbuster
-#
+%prep
%setup -c -n ijbswa
-#
-# -----------------------------------------------------------------------------
-#
%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)"'
-# adds 486 optimization and stuff => bad
-#make MORE_CFLAGS=' -D_DISTNAME="DDD" -D_DISTURL="UUU"'
-./configure
-make
+%configure
+make
strip junkbuster
-#
-# -----------------------------------------------------------------------------
-#
%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
+/usr/sbin/useradd -d /etc/junkbuster -r junkbuster -s "" > /dev/null 2>&1 || /bin/true
-if test -d /var/log/junkbuster
-then
- mv -f /var/log/junkbuster /var/log/junkbuster.rpmorig
-fi
-
-#
-# -----------------------------------------------------------------------------
-#
%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}}}
-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 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
+[ "$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}%{ijbconf}/templates \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/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
+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 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/junkbuster
+install -m 711 -d $RPM_BUILD_ROOT/var/log/junkbuster
# verify all file locations, etc. in the config file
# don't start with ^ or commented lines are not replaced
# sed 's/^forward.*/forward \/etc\/junkbuster\/forward/g' | \
# 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 $RPM_BUILD_ROOT/etc/junkbuster/templates/
+ $RPM_BUILD_ROOT%{ijbconf}/config
+perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\
+ $RPM_BUILD_ROOT%{ijbconf}/ijb.action
-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
-
-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
+#%makeinstall
+%post
+# for upgrade from 2.0.x
+[ -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
+if [ "$1" = "1" ]; then
+ /sbin/chkconfig --add junkbuster
+ /sbin/service junkbuster condrestart > /dev/null 2>&1
+fi
+# 01/09/02 HB, getting rid of any user=junkbust
+grep junkbust: /etc/passwd >/dev/null && userdel junkbust || /bin/true
-#
-# -----------------------------------------------------------------------------
-#
%preun
-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
+if [ "$1" = "0" ]; then
+ /sbin/service junkbuster stop > /dev/null 2>&1 ||:
+ /sbin/chkconfig --del junkbuster
fi
-#
-# -----------------------------------------------------------------------------
-#
-%post
-cat << EOT >&2
+%postun
+#if [ "$1" -ge "1" ]; then
+# /sbin/service junkbuster condrestart > /dev/null 2>&1
+#fi
-Now you'll need to start junkbuster with
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
- /etc/rc.d/init.d/junkbuster start
+%files
+%defattr(-,root,root)
+%doc README.gz AUTHORS.gz ChangeLog.gz
+%doc doc/webserver/developer-manual doc/webserver/user-manual
+%doc doc/webserver/user-manual
+#%doc junkbuster.weekly junkbuster.monthly AUTHORS
+%dir %{ijbconf}
+%config %{ijbconf}/*
+%attr(0744,junkbuster,junkbuster) %dir /var/log/junkbuster
+%config %{_sysconfdir}/logrotate.d/junkbuster
+%attr(0744,junkbuster,junkbuster)/usr/sbin/junkbuster
+%{_mandir}/man8/*
+%config %{_sysconfdir}/rc.d/init.d/junkbuster
-or simply reboot; It will be started automatically at boot time.
-Don't forget to add the proxy stuff in Netscape.
-EOT
+%changelog
+* Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
+- /bin/false for shell causes init script to fail. Reverting.
-# check configuration of start/stop/ scripts
-# /sbin/chkconfig --add junkbuster
+* Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
+- Removed UID 73. Included user-manual and developer-manual in docs.
+ Include other actions files. Default shell is now /bin/false.
+ Userdel user=junkbust. ChangeLog was not zipped. Removed
+ RPM_OPT_FLAGS kludge.
+* Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
+- add paranoia check for 'rm -rf $RPM_BUILD_ROOT'
+- add gzip to 'BuildRequires'
-#
-# -----------------------------------------------------------------------------
-#
-%clean
-rm -rf $RPM_BUILD_ROOT
+* Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
+- actionsfile is now ijb.action.
-#
-# -----------------------------------------------------------------------------
-#
-%files
-%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/*
-%config /etc/logrotate.d/junkbuster
-%attr (-,nobody,nobody) /usr/sbin/junkbuster
-/usr/man/man8/junkbuster.8
-%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
+* Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
+- Compress manpage
+- Add more documents for installation
+- Add version string to name and source
-#
-# -----------------------------------------------------------------------------
-#
+* Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
+- Back to user 'junkbuster' and fix configure macro.
-%changelog
+* Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
+- More changes for user 'junkbust'. Init script had 'junkbuster'.
+
+* Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
+- Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
+- Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
+
+* Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
+- Added $RPM_OPT_FLAGS support, renaming of old logfile, and
+- made sure no default shell exists for user junkbust.
* Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
- rework of RPM
projects / privoxy.git / blobdiff