X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=junkbuster-rh.spec;h=0526e63bbec1eff8ee0bd343484ce7330b7f991f;hp=939d536f044725564c59b3d3b175916c7fb6ec4d;hb=00b04bbd7faeadd174cf81eab266a6308f814a88;hpb=bb414b9127e508d7e5d2fff86775c9a07299e0cd diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec index 939d536f..0526e63b 100644 --- a/junkbuster-rh.spec +++ b/junkbuster-rh.spec @@ -1,4 +1,4 @@ -# $Id: junkbuster-rh.spec,v 1.11 2001/07/03 11:00:25 sarantis Exp $ +# $Id: junkbuster-rh.spec,v 1.23 2001/11/06 12:09:03 steudten Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -26,6 +26,37 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: junkbuster-rh.spec,v $ +# 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 # @@ -70,23 +101,26 @@ Summary: The Internet Junkbuster Vendor: http://ijbswa.sourceforge.net Name: junkbuster -Version: 2.9.8 +Version: 2.9.10 Release: 1 -Source0: http://www.waldherr.org/junkbuster/ijbswa.tar.gz +Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz Copyright: GPL -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Group: Networking/Utilities URL: http://ijbswa.sourceforge.net/ -Packager: Stefan Waldherr Obsoletes: junkbuster-raw junkbuster-blank Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service +BuildRequires: perl Conflicts: junkbuster-raw junkbuster-blank %description -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. +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 @@ -94,12 +128,12 @@ faster. %setup -c -n ijbswa %build -./configure -make +%configure +make "CFLAGS=$RPM_OPT_FLAGS -Ipcre -Wall" strip junkbuster %pre -/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbust > /dev/null 2>&1 || /bin/true +/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbuster -s "" > /dev/null 2>&1 || /bin/true %install rm -rf $RPM_BUILD_ROOT @@ -108,17 +142,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \ ${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 + ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d +gzip README AUTHORS junkbuster.1 install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster -cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8 -cp -f actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile +cp -f junkbuster.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8.gz +cp -f ijb.action $RPM_BUILD_ROOT%{ijbconf}/ijb.action 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 744 -d $RPM_BUILD_ROOT/var/log/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 @@ -132,10 +167,18 @@ cat config | \ # sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \ sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \ $RPM_BUILD_ROOT%{ijbconf}/config +perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\ + $RPM_BUILD_ROOT%{ijbconf}/ijb.action %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/chkconfig --add junkbuster + /sbin/service junkbuster condrestart > /dev/null 2>&1 fi %preun @@ -145,27 +188,49 @@ if [ "$1" = "0" ]; then fi %postun -if [ "$1" -ge "1" ]; then - /sbin/service junkbuster condrestart > /dev/null 2>&1 -fi +#if [ "$1" -ge "1" ]; then +# /sbin/service junkbuster condrestart > /dev/null 2>&1 +#fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -# %doc ijbfaq.html ijbman.html README README.TOO gpl.html -%doc junkbuster.weekly junkbuster.monthly +%doc README.gz AUTHORS.gz +#%doc doc/webserver/developer-manual doc/webserver/user-manual README +#%doc junkbuster.weekly junkbuster.monthly AUTHORS %dir %{ijbconf} %config %{ijbconf}/* -%attr(0744,junkbust,junkbust) %dir /var/log/junkbuster +%attr(0744,junkbuster,junkbuster) %dir /var/log/junkbuster %config %{_sysconfdir}/logrotate.d/junkbuster -%attr(0744,junkbust,junkbust)/usr/sbin/junkbuster +%attr(0744,junkbuster,junkbuster)/usr/sbin/junkbuster %{_mandir}/man8/* %config %{_sysconfdir}/rc.d/init.d/junkbuster %changelog +* Sat Dec 1 2001 Hal Burgiss +- actionsfile is now ijb.action. + +* Tue Nov 6 2001 Thomas Steudten +- Compress manpage +- Add more documents for installation +- Add version string to name and source + +* Wed Oct 24 2001 Hal Burigss +- Back to user 'junkbuster' and fix configure macro. + +* Wed Oct 10 2001 Hal Burigss +- More changes for user 'junkbust'. Init script had 'junkbuster'. + +* Sun Sep 23 2001 Hal Burgiss +- 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 +- 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 - rework of RPM