X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=privoxy-rh.spec;h=d402c411ef449bdd9d9435a504678ce76c855a9b;hb=8d7cdd184298be68f6864c828ae592656ba6b43c;hp=bb404dad5a9e0a37fd8b3d052ca56446df68685e;hpb=60adfb320a5a421cf69e91fba0b3c0ad2eb664ae;p=privoxy.git diff --git a/privoxy-rh.spec b/privoxy-rh.spec index bb404dad..d402c411 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,7 +1,7 @@ -# $Id: junkbusterng-rh.spec,v 1.1 2002/03/22 20:53:03 morcego Exp $ +# $Id: privoxy-rh.spec,v 1.18 2002/03/27 22:10:14 sarantis Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -27,38 +27,49 @@ # # Defines should happen in the begining of the file +%define veryoldname junkbust %define oldname junkbuster -%define jbngconf %{_sysconfdir}/%{oldname} +%define privoxyconf %{_sysconfdir}/%{name} -Summary: JunkbusterNG (The Internet Junkbuster NextGeneration) -Vendor: http://ijbswa.sourceforge.net -Name: junkbusterng +Name: privoxy +# ATTENTION +# Version and release should be updated acordingly on configure.in and +# configure. Otherwise, the package can be build with the wrong value Version: 2.9.13 -Release: 1 -Source0: http://www.waldherr.org/%{name}/ijbswa-%{version}.tar.gz +Release: 3 +Summary: Privoxy - privacy enhancing proxy License: GPL +Vendor: http://www.privoxy.org +Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Group: Networking/Utilities -URL: http://ijbswa.sourceforge.net/ +URL: http://www.privoxy.org/ Obsoletes: junkbuster-raw junkbuster-blank junkbuster # Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service Prereq: shadow-utils, chkconfig, initscripts, sh-utils -BuildRequires: perl gzip sed docbook-utils libtool +BuildRequires: perl gzip sed docbook-utils libtool autoconf Conflicts: junkbuster-raw junkbuster-blank junkbuster -%description -JunkbusterNG 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. JunkbusterNG has a very -flexible configuration and can be customized to suit individual needs -and tastes. JunkbusterNG has application for both stand-alone -systems and multi-user networks. +%description +Privoxy 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. Privoxy has a very flexible configuration and +can be customized to suit individual needs and tastes. Privoxy has application +for both stand-alone systems and multi-user networks. + +Privoxy is based on the code of the Internet Junkbuster. Junkbuster +was originally written by JunkBusters Corporation, and was released as +free open-source software under the GNU GPL. Stefan Waldherr made many +improvements, and started the SourceForge project to continue +development. Several other developers are now contributing. %prep %setup -q -c %build +autoheader +autoconf %configure make make redhat-dok @@ -71,9 +82,9 @@ make redhat-dok %install [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} \ - %{buildroot}%{_mandir}/man8 \ + %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_localstatedir}/log/%{name} \ - %{buildroot}%{jbngconf}/templates \ + %{buildroot}%{privoxyconf}/templates \ %{buildroot}%{_sysconfdir}/logrotate.d \ %{buildroot}%{_sysconfdir}/rc.d/init.d @@ -83,17 +94,14 @@ mkdir -p %{buildroot}%{_sbindir} \ ## Gziping the documentation files is not recomended - morcego #gzip README AUTHORS ChangeLog %{name}.1 || /bin/true -install -s -m 744 jbng %{buildroot}%{_sbindir}/jbng - -## We need to change the man section internaly on the manpage -## -- morcego (sugestion by Hal Burgiss) -#cp -f %{name}.1 %{buildroot}%{_mandir}/man8/%{name}.8 -sed -e 's@^.TH JUNKBUSTER 1@.TH JUNKBUSTER 8@g' %{oldname}.1 > %{buildroot}%{_mandir}/man8/%{oldname}.8 -cp -f *.action %{buildroot}%{jbngconf}/ -cp -f re_filterfile %{buildroot}%{jbngconf}/re_filterfile -cp -f trust %{buildroot}%{jbngconf}/trust -cp -f templates/* %{buildroot}%{jbngconf}/templates/ -cp -f %{oldname}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{oldname} +install -s -m 744 %{name} %{buildroot}%{_sbindir}/%{name} + +cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +cp -f *.action %{buildroot}%{privoxyconf}/ +cp -f default.filter %{buildroot}%{privoxyconf}/default.filter +cp -f trust %{buildroot}%{privoxyconf}/trust +cp -f templates/* %{buildroot}%{privoxyconf}/templates/ +cp -f %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} @@ -102,36 +110,58 @@ install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} ## Changing the sed paramter delimiter to @, so we don't have to ## escape the slashes cat config | \ - sed 's@^confdir.*@confdir %{jbngconf}@g' | \ + sed 's@^confdir.*@confdir %{privoxyconf}@g' | \ # sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \ -# sed 's/^re_filterfile.*/re_filterfile \/etc\/%{name}\/re_filterfile/g' | \ +# sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \ # sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \ # sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \ # sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \ # sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \ sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' > \ - %{buildroot}%{jbngconf}/config -perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\ - %{buildroot}%{jbngconf}/ijb.action + %{buildroot}%{privoxyconf}/config +perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\ + %{buildroot}%{privoxyconf}/default.action + + +# Creating ghost init files +mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc{0,1,2,3,4,5,6}.d +for i in 0 1 4 6 +do +ln -sf ../init.d/%{name} %{buildroot}/%{_sysconfdir}/rc.d/rc${i}.d/K09%{name} +done +for i in 2 3 5 +do +ln -sf ../init.d/%{name} %{buildroot}/%{_sysconfdir}/rc.d/rc${i}.d/S84%{name} +done ## Macros are expanded even on commentaries. So, we have to use %% ## -- morcego #%%makeinstall %pre -# We check to see if the user junkbuster exists. -# If it does, we do nothing -# If we don't, we check to see if the user junkbust exist and, in case it -# does, we change it do junkbuster. If it also does not exist, we create the -# junkbuster user -- morcego -id junkbuster > /dev/null 2>&1 +# This is where we handle old usernames (junkbust and junkbuster) +# I'm not sure we should do that, but this is the way we have been +# doing it for some time now -- morcego +# We should do it for the group as well -- morcego +# Doing it by brute force. Much cleaner (no more Mr. Nice Guy) -- morcego + +# Change the group name. Remove anything left behind. +groupmod -n %{name} %{oldname} > /dev/null 2>&1 ||: +groupmod -n %{name} %{veryoldname} > /dev/null 2>&1 ||: +groupdel %{oldname} > /dev/null 2>&1 ||: +groupdel %{veryoldname} > /dev/null 2>&1 ||: + +# Same for username +usermod -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || : +usermod -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || : +userdel %{oldname} > /dev/null 2>&1 ||: +userdel %{veryoldname} > /dev/null 2>&1 ||: + +# Check to see if everything is okey. Create user if it still does not +# exist +id %{name} > /dev/null 2>&1 if [ $? -eq 1 ]; then - id junkbust > /dev/null 2>&1 - if [ $? -eq 0 ]; then - /usr/sbin/usermod -l junkbuster -d %{_sysconfdir}/%{name} -s "" junkbust > /dev/null 2>&1 - else - /usr/sbin/useradd -d %{_sysconfdir}/%{name} -r -s "" junkbuster > /dev/null 2>&1 - fi + /usr/sbin/useradd -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1 fi %post @@ -143,27 +173,26 @@ fi chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null chown -R %{name}:%{name} /etc/%{name} 2>/dev/null if [ "$1" = "1" ]; then -# /sbin/chkconfig --add %{name} /sbin/service %{name} condrestart > /dev/null 2>&1 fi -# 01/09/02 HB, getting rid of any user=junkbust -# Changed by morcego to use the id command. -id junkbust > /dev/null 2>&1 && /usr/sbin/userdel junkbust || /bin/true %preun +/sbin/service %{veryoldname} stop > /dev/null 2>&1 ||: /sbin/service %{oldname} stop > /dev/null 2>&1 ||: -/sbin/chkconfig --del %{oldname} if [ "$1" = "0" ]; then /sbin/service %{name} stop > /dev/null 2>&1 ||: + # No need to use chkconfig. The %%ghost files will handle it fi %postun #if [ "$1" -ge "1" ]; then # /sbin/service %{name} condrestart > /dev/null 2>&1 #fi -# dont forget to remove user and group junkbuster -id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true +# We only remove it we this is not an upgrade +if [ "$1" = "0" ]; then + id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true +fi %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} @@ -174,65 +203,112 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true %doc doc/text/developer-manual.txt doc/text/user-manual.txt %doc doc/webserver/developer-manual %doc doc/webserver/user-manual -%doc doc/webserver/ijb_docs.css -#%doc %{name}.weekly %{name}.monthly AUTHORS +%doc doc/webserver/faq +%doc doc/webserver/p_doc.css -%dir %{jbngconf} -%dir %{jbngconf}/templates -%attr(0744,junkbuster,junkbuster) %dir %{_localstatedir}/log/%{name} +%dir %{privoxyconf} +%dir %{privoxyconf}/templates +%attr(0744,%{name},%{name}) %dir %{_localstatedir}/log/%{name} -%attr(0744,junkbuster,junkbuster)%{_sbindir}/jbng +%attr(0744,%{name},%{name})%{_sbindir}/%{name} +# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! # We should not use wildchars here. This could mask missing files problems # -- morcego -%config %{jbngconf}/config -%config %{jbngconf}/ijb-advanced.action -%config %{jbngconf}/ijb-basic.action -%config %{jbngconf}/ijb-intermediate.action -%config %{jbngconf}/ijb.action -%config %{jbngconf}/re_filterfile -%config %{jbngconf}/trust - -%config %{jbngconf}/templates/blocked -%config %{jbngconf}/templates/blocked-compact -%config %{jbngconf}/templates/cgi-error-404 -%config %{jbngconf}/templates/cgi-error-bad-param -%config %{jbngconf}/templates/cgi-error-disabled -%config %{jbngconf}/templates/cgi-error-file -%config %{jbngconf}/templates/cgi-error-modified -%config %{jbngconf}/templates/cgi-error-parse -%config %{jbngconf}/templates/connect-failed -%config %{jbngconf}/templates/default -%config %{jbngconf}/templates/edit-actions-add-url-form -%config %{jbngconf}/templates/edit-actions-for-url -%config %{jbngconf}/templates/edit-actions-list -%config %{jbngconf}/templates/edit-actions-list-section -%config %{jbngconf}/templates/edit-actions-list-url -%config %{jbngconf}/templates/edit-actions-remove-url-form -%config %{jbngconf}/templates/edit-actions-url-form -%config %{jbngconf}/templates/no-such-domain -%config %{jbngconf}/templates/show-request -%config %{jbngconf}/templates/show-status -%config %{jbngconf}/templates/show-status-file -%config %{jbngconf}/templates/show-url-info -%config %{jbngconf}/templates/show-version -%config %{jbngconf}/templates/toggle -%config %{jbngconf}/templates/toggle-mini -%config %{jbngconf}/templates/untrusted - -%config %{_sysconfdir}/logrotate.d/%{oldname} +# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! +%config %{privoxyconf}/config +%config %{privoxyconf}/advanced.action +%config %{privoxyconf}/basic.action +%config %{privoxyconf}/intermediate.action +%config %{privoxyconf}/default.action +%config %{privoxyconf}/default.filter +%config %{privoxyconf}/trust + +%config %{privoxyconf}/templates/blocked +%config %{privoxyconf}/templates/blocked-compact +%config %{privoxyconf}/templates/cgi-error-404 +%config %{privoxyconf}/templates/cgi-error-bad-param +%config %{privoxyconf}/templates/cgi-error-disabled +%config %{privoxyconf}/templates/cgi-error-file +%config %{privoxyconf}/templates/cgi-error-modified +%config %{privoxyconf}/templates/cgi-error-parse +%config %{privoxyconf}/templates/connect-failed +%config %{privoxyconf}/templates/default +%config %{privoxyconf}/templates/edit-actions-add-url-form +%config %{privoxyconf}/templates/edit-actions-for-url +%config %{privoxyconf}/templates/edit-actions-list +%config %{privoxyconf}/templates/edit-actions-list-section +%config %{privoxyconf}/templates/edit-actions-list-url +%config %{privoxyconf}/templates/edit-actions-remove-url-form +%config %{privoxyconf}/templates/edit-actions-url-form +%config %{privoxyconf}/templates/no-such-domain +%config %{privoxyconf}/templates/show-request +%config %{privoxyconf}/templates/show-status +%config %{privoxyconf}/templates/show-status-file +%config %{privoxyconf}/templates/show-url-info +%config %{privoxyconf}/templates/show-version +%config %{privoxyconf}/templates/toggle +%config %{privoxyconf}/templates/toggle-mini +%config %{privoxyconf}/templates/untrusted +%config %{privoxyconf}/templates/edit-actions-for-url-filter +%config %{_sysconfdir}/logrotate.d/%{name} %config %attr(0744,root,root) %{_sysconfdir}/rc.d/init.d/%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc0.d/K09%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc1.d/K09%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc2.d/S84%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc3.d/S84%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc4.d/S84%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc5.d/S84%{name} -%config(missingok) %attr(-,root,root) %{_sysconfdir}/rc.d/rc6.d/S84%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc0.d/K09%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc1.d/K09%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc2.d/S84%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc3.d/S84%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc4.d/K09%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc5.d/S84%{name} +%ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc6.d/K09%{name} -%{_mandir}/man8/%{oldname}.8* +%{_mandir}/man1/%{name}.* %changelog +* Thu Mar 28 2002 Sarantis Paskalis ++ privoxy-2.9.13-3 +- Include correct documentation file. + +* Tue Mar 26 2002 Hal Burgiss ++ privoxy-2.9.13-3 +- Fix typo in Description. + +* Tue Mar 26 2002 Rodrigo Barbosa ++ privoxy-2.9.13-3 +- Added commentary asking to update the release value on the configure + script + +* Tue Mar 25 2002 Hal Burgiss ++ privoxy-2.9.13-3 +- Added the missing edit-actions-for-url-filter to templates. + +* Mon Mar 25 2002 Rodrigo Barbosa ++ privoxy-2.9.13-2 +- Fixing Release number + +* Sun Mar 24 2002 Hal Burgiss ++ privoxy-2.9.13-2 +- Added faq to docs. + +* Sun Mar 24 2002 Rodrigo Barbosa ++ privoxy-2.9.13-2 +- Fixed the init files entries. Now we use %%ghost +- improved username (and groupname) handling on the %%pre section. By improved + I mean: we do it by brute force now. Much easier to maintain. Yeah, you + got it right. No more Mr. Nice Guy. +- Removed the userdel call on %%post. No need, once it's complety handled on + the %%pre section + +* Sun Mar 24 2002 Hal Burgiss ++ junkbusterng-2.9.13-1 + Added autoheader. Added autoconf to buildrequires. + +* Sun Mar 24 2002 Hal Burgiss ++ junkbusterng-2.9.13-1 +- Fixed build problems re: name conflicts with man page and logrotate. +- Commented out rc?d/* configs for time being, which are causing a build +- failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name +- changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail. + * Fri Mar 22 2002 Rodrigo Barbosa + junkbusterng-2.9.13-1 - References to the expression ijb where changed where possible @@ -471,7 +547,59 @@ id junkbuster > /dev/null 2>&1 && /usr/sbin/userdel junkbuster || /bin/true junkbuster.init was modified. It now starts junkbuster with an additional "-r @" flag. -# $Log: junkbusterng-rh.spec,v $ +# $Log: privoxy-rh.spec,v $ +# Revision 1.18 2002/03/27 22:10:14 sarantis +# bumped Hal's last commit 1 day to the future to make rpm build again. +# +# Revision 1.17 2002/03/27 00:48:23 hal9 +# Fix up descrition. +# +# Revision 1.16 2002/03/26 22:29:55 swa +# we have a new homepage! +# +# Revision 1.15 2002/03/26 17:39:54 morcego +# Adding comment on the specfile to remember the packager to update +# the release number on the configure script +# +# Revision 1.14 2002/03/26 14:25:15 hal9 +# Added edit-actions-for-url-filter to templates in %%config +# +# Revision 1.13 2002/03/25 13:31:04 morcego +# Bumping Release tag. +# +# Revision 1.12 2002/03/25 03:11:40 hal9 +# Do it right way this time :/ +# +# Revision 1.11 2002/03/25 03:09:51 hal9 +# Added faq to docs. +# +# Revision 1.10 2002/03/24 22:16:14 morcego +# Just removing some old commentaries. +# +# Revision 1.9 2002/03/24 22:03:22 morcego +# Should be working now. See %changelog for details +# +# Revision 1.8 2002/03/24 21:13:01 morcego +# Tis broken. +# +# Revision 1.7 2002/03/24 21:07:18 hal9 +# Add autoheader, etc. +# +# Revision 1.6 2002/03/24 19:56:40 hal9 +# /etc/junkbuster is now /etc/privoxy. Fixed ';' typo. +# +# Revision 1.4 2002/03/24 13:32:42 swa +# name change related issues +# +# Revision 1.3 2002/03/24 12:56:21 swa +# name change related issues. +# +# Revision 1.2 2002/03/24 11:40:14 swa +# name change +# +# Revision 1.1 2002/03/24 11:23:44 swa +# name change +# # Revision 1.1 2002/03/22 20:53:03 morcego # - Ongoing process to change name to JunkbusterNG # - configure/configure.in: no change needed