X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=junkbuster-rh.spec;h=cb1e876111077e1f7678503f256823bc7ac2a0b2;hb=24cdb66ed8cc95a3731010e6de12bb3d2d3a36bc;hp=8b78a26c59c274c0f1d19e38226336efc444c0b2;hpb=1600e2fcbed999451cf6790ae7c4b9e17d57bff6;p=privoxy.git diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec index 8b78a26c..cb1e8761 100644 --- a/junkbuster-rh.spec +++ b/junkbuster-rh.spec @@ -1,4 +1,4 @@ -# $Id: junkbuster-rh.spec,v 1.6 2001/06/11 11:28:25 sarantis Exp $ +# $Id: junkbuster-rh.spec,v 1.17 2001/10/10 18:59:28 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -26,6 +26,36 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: junkbuster-rh.spec,v $ +# 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. # @@ -53,7 +83,7 @@ Summary: The Internet Junkbuster Vendor: http://ijbswa.sourceforge.net Name: junkbuster -Version: 2.9.4 +Version: 2.9.9 Release: 1 Source0: http://www.waldherr.org/junkbuster/ijbswa.tar.gz Copyright: GPL @@ -63,6 +93,7 @@ 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 @@ -74,14 +105,16 @@ faster. %define ijbconf %{_sysconfdir}/junkbuster %prep -%setup -c -n %{name}-%{version}-%{release} +%setup -c -n ijbswa + %build -%configure -make +OPT_FLAGS="$RPM_OPT_FLAGS -Ipcre -Wall" +./configure +make "CFLAGS=$OPT_FLAGS" 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 junkbust -s "" > /dev/null 2>&1 || /bin/true %install rm -rf $RPM_BUILD_ROOT @@ -90,18 +123,17 @@ 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 install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster +# Out temporarily cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8 -cp -f permissionsfile $RPM_BUILD_ROOT%{ijbconf}/permissionsfile +cp -f actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust -cp -f templates/default $RPM_BUILD_ROOT%{ijbconf}/templates/ -cp -f templates/show-status $RPM_BUILD_ROOT%{ijbconf}/templates/ -cp -f templates/show-status-file $RPM_BUILD_ROOT%{ijbconf}/templates/ -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 +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 # verify all file locations, etc. in the config file @@ -115,12 +147,22 @@ cat config | \ # 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 + $RPM_BUILD_ROOT%{ijbconf}/config +perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' actionsfile >\ + $RPM_BUILD_ROOT%{ijbconf}/actionsfile +perl -pi -e 's/JB_USER=\"junkbuster\"/JB_USER=\"junkbust\"/' \ + $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/junkbuster %post if [ "$1" = "1" ]; then - /sbin/chkconfig --add junkbuster + /sbin/chkconfig --add junkbuster + /sbin/service junkbuster condrestart > /dev/null 2>&1 fi +# for upgrade from 2.0.x +chown junkbust:junkbust /var/log/junkbuster/* 2>/dev/null +chown junkbust:junkbust /etc/junkbuster 2>/dev/null +[ -f /var/log/junkbuster/junkbuster ] &&\ + mv -f /var/log/junkbuster/junkbuster /var/log/junkbuster/logfile || /bin/true %preun if [ "$1" = "0" ]; then @@ -129,27 +171,37 @@ 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 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 %config %{_sysconfdir}/logrotate.d/junkbuster %attr(0744,junkbust,junkbust)/usr/sbin/junkbuster %{_mandir}/man8/* -%config /etc/rc.d/init.d/junkbuster +%config %{_sysconfdir}/rc.d/init.d/junkbuster %changelog +* 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