X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-rh.spec;h=ed028750526cb467e9283efcf9d4c0dc8aaa59df;hp=bb404dad5a9e0a37fd8b3d052ca56446df68685e;hb=7e35f2b5e960eb44510dc5a7e967ff97cdd748ab;hpb=60adfb320a5a421cf69e91fba0b3c0ad2eb664ae diff --git a/privoxy-rh.spec b/privoxy-rh.spec index bb404dad..ed028750 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.43 2002/07/05 17:15:56 morcego Exp $ # -# Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# Written by and Copyright (C) 2001, 2002 the SourceForge +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -27,41 +27,63 @@ # # Defines should happen in the begining of the file +%define veryoldname junkbust %define oldname junkbuster -%define jbngconf %{_sysconfdir}/%{oldname} +%define privoxyconf %{_sysconfdir}/%{name} +%define privoxy_uid 73 +%define privoxy_gid 73 -Summary: JunkbusterNG (The Internet Junkbuster NextGeneration) -Vendor: http://ijbswa.sourceforge.net -Name: junkbusterng -Version: 2.9.13 +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: 3.1.1 Release: 1 -Source0: http://www.waldherr.org/%{name}/ijbswa-%{version}.tar.gz +Summary: Privoxy - privacy enhancing proxy License: GPL +Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -Group: Networking/Utilities -URL: http://ijbswa.sourceforge.net/ +Group: System Environment/Daemons +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 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 Internet Junkbuster. %prep %setup -q -c %build -%configure + +# We check to see if versions match +VERSION_MAJOR=3 +VERSION_MINOR=1 +VERSION_POINT=1 + +CONFIG_VERSION=`cat configure.in | sed -n -e 's/^VERSION_MAJOR=\([0-9]*\)/\1./p' -e 's/^VERSION_MINOR=\([0-9]*\)/\1./p' -e 's/^VERSION_POINT=\([0-9]*\)/\1/p' | awk '{printf $1}'` +if [ "%{version}" != "${CONFIG_VERSION}" ]; then + echo "The version declared on the specfile does not match the version" + echo "declared on configure.in. This should not happen. The build will" + echo "be interrupted now, so you can fix it." + exit 1 +fi +autoheader +autoconf +%configure --disable-dynamic-pcre make -make redhat-dok +# Docs are in CVS and tarball now. +#%%make dok ## Explicitily stripping is not recomended. ## This is handled altomaticaly by RPM, and can couse troubles if @@ -71,9 +93,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 +105,28 @@ 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} + +# Using sed to "convert" from DOS format to UNIX +# This is important behaviour, and should not be removed without some +# other assurance that these files don't get packed in the the +# wrong format +for i in `ls *.action` +do + cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/$i +done +cat default.filter | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/default.filter +cat trust | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/trust +( +cd templates +for i in `ls` +do + cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/templates/$i +done +) + +cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +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,137 +135,347 @@ 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 + sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' | \ + sed -e 's/[[:cntrl:]]*$//' > \ + %{buildroot}%{privoxyconf}/config +perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\ + %{buildroot}%{privoxyconf}/default.action + ## 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 + +# Same for username +usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || : +usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || : +userdel %{oldname} > /dev/null 2>&1 ||: +userdel %{veryoldname} > /dev/null 2>&1 ||: + +# Change the group name. Remove anything left behind. +groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||: +groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||: +groupdel %{oldname} > /dev/null 2>&1 ||: +groupdel %{veryoldname} > /dev/null 2>&1 ||: + +# Doublecheck to see if the group exist, and that it has the correct gid +/bin/grep -E '^%{name}:' %{_sysconfdir}/group > /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 + # Looks like it does not exist. Create it + groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1 +else + /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' %{_sysconfdir}/group > /dev/null 2>&1 + if [ $? -eq 1 ]; then + # The group exists, but does not have the correct gid + groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1 fi fi +# 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 + %{_sbindir}/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1 +fi + +# Double check that the group has the correct uid +P_UID=`id -u %{name} 2>/dev/null` +if [ $P_UID -ne %{privoxy_uid} ]; then + %{_sbindir}/usermod -u %{privoxy_uid} %{name} +fi + +# The same for the gid +P_GID=`id -g %{name} 2>/dev/null` +if [ $P_GID -ne %{privoxy_gid} ]; then + %{_sbindir}/usermod -g %{privoxy_gid} %{name} +fi + %post # for upgrade from 2.0.x -[ -f %{_localstatedir}/log/%{oldname}/logfile ] &&\ - mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile || /bin/true -[ -f %{_localstatedir}/log/%{name}/%{name} ] &&\ - mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile || /bin/true -chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null -chown -R %{name}:%{name} /etc/%{name} 2>/dev/null +[ -f %{_localstatedir}/log/%{oldname}/logfile ] && { + mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile ||: ; + chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null ||: ; +} +[ -f %{_localstatedir}/log/%{name}/%{name} ] && { + mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile ||: ; + chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null ||: ; +} +/sbin/chkconfig --add privoxy if [ "$1" = "1" ]; then -# /sbin/chkconfig --add %{name} - /sbin/service %{name} condrestart > /dev/null 2>&1 + /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 ||: + /sbin/chkconfig --del privoxy 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 && %{_sbindir}/userdel privoxy || /bin/true + /bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null && %{_sbindir}/groupdel %{name} || /bin/true +fi %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} %files %defattr(0644,root,root,0755) -%doc README AUTHORS ChangeLog -%doc doc/text/developer-manual.txt doc/text/user-manual.txt +%doc README AUTHORS ChangeLog LICENSE +%doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.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 doc/webserver/p_web.css doc/webserver/privoxy-index.html +%doc doc/webserver/images +%doc doc/webserver/man-page + +# ATTENTION FOR defattr change here ! +%defattr(0644,%{name},%{name},0755) -%dir %{jbngconf} -%dir %{jbngconf}/templates -%attr(0744,junkbuster,junkbuster) %dir %{_localstatedir}/log/%{name} +%dir %{privoxyconf} +%dir %{privoxyconf}/templates +%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} -%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} - -%{_mandir}/man8/%{oldname}.8* +# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! +%config(noreplace) %{privoxyconf}/config +%config %{privoxyconf}/standard.action +%config(noreplace) %{privoxyconf}/user.action +%config %{privoxyconf}/default.action +%config %{privoxyconf}/default.filter +%config %{privoxyconf}/trust + +# Please keep these alphabetized so its easier to find one that +# is not included. +%config %{privoxyconf}/templates/blocked +%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-file-read-only +%config %{privoxyconf}/templates/cgi-error-modified +%config %{privoxyconf}/templates/cgi-error-parse +%config %{privoxyconf}/templates/cgi-style.css +%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-for-url-filter +%config %{privoxyconf}/templates/edit-actions-list +%config %{privoxyconf}/templates/edit-actions-list-button +%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/mod-local-help +%config %{privoxyconf}/templates/mod-support-and-service +%config %{privoxyconf}/templates/mod-title +%config %{privoxyconf}/templates/mod-unstable-warning +%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 + +# Attention, new defattr change here ! +%defattr(0644,root,root,0755) + +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name} + +%{_mandir}/man1/%{name}.* + %changelog +* Thu Sep 05 2002 Hal Burgiss +- Import changes from 3.0.0 to main trunk. + +* Fri Jul 12 2002 Karsten Hopp +- don't use ghost files for rcX.d/*, using chkconfig is the + correct way to do this job (#68619) + +* Fri Jul 05 2002 Rodrigo Barbosa ++ privoxy-2.9.15-8 +- Changing delete order for groups and users (users should be first) + +* Wed Jul 03 2002 Rodrigo Barbosa ++ privoxy-2.9.15-7 +- Changing sed expression that removed CR from the end of the lines. This + new one removes any control caracter, and should work with older versions + of sed + +* Tue Jul 02 2002 Rodrigo Barbosa ++ privoxy-2.9.15-6 +- Fixing defattr values. File and directory modes where swapped + +* Tue Jul 02 2002 Rodrigo Barbosa ++ privoxy-2.9.15-5 +- Fix typo in templates creation. + +* Wed Jun 26 2002 Rodrigo Barbosa ++ privoxy-2.9.15-4 +- Fixing issues created by specfile sync between branches + - Correcting the release number (WARNING) + - Reintroducing text file conversion (dos -> unix) + - Reconverting hardcoded directories to macros + - Refixing ownership of privoxy files (now using multiple defattr + definitions) + +* Thu Jun 20 2002 Karsten Hopp +- fix several .spec file issues to shut up rpmlint + - non-standard-dir-perm /var/log/privoxy 0744 + - invalid-vendor Privoxy.Org (This is ok for binaries compiled by privoxy + members, but not for packages from Red Hat) + - non-standard-group Networking/Utilities + - logrotate and init scripts should be noreplace + +* Mon May 27 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Index.html is now privoxy-index.html for doc usage. + +* Sat May 25 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add html man page so index.html does not 404. + +* Fri May 24 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add another template and alphabetize these for easier tracking. +- Add doc/images directory. + +* Wed May 15 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add templates/edit-actions-list-button + +* Fri May 03 2002 Rodrigo Barbosa ++ privoxy-2.9.15-1 +- Version bump +- Adding noreplace for %%{privoxyconf}/config +- Included a method to verify if the versions declared on the specfile and + configure.in match. Interrupt the build if they don't. + +* Fri Apr 26 2002 Rodrigo Barbosa ++ privoxy-2.9.14-3 +- Changing Vendor to Privoxy.Org + +* Tue Apr 23 2002 Hal Burgiss ++ privoxy-2.9.14-2 +- Adjust for new *actions files. + +* Mon Apr 22 2002 Rodrigo Barbosa ++ privoxy-2.9.14-2 +- Removed the redhat hack that prevented the user and group from + being dealocated. That was a misundestanding of my part regarding + redhat policy. + +* Mon Apr 22 2002 Rodrigo Barbosa ++ privoxy-2.9.14-2 +- Using macros to define uid and gid values +- Bumping release + +* Mon Apr 22 2002 Rodrigo Barbosa ++ privoxy-2.9.14-1 +- Changes to fixate the uid and gid values as (both) 73. This is a + value we hope to standarize for all distributions. RedHat already + uses it, and Conectiva should start as soon as I find where the heck + I left my cluebat :-) +- Only remove the user and group on uninstall if this is not redhat, once + redhat likes to have the values allocated even if the package is not + installed + +* Tue Apr 16 2002 Hal Burgiss ++ privoxy-2.9.13-6 +- Add --disable-dynamic-pcre to configure. + +* Wed Apr 10 2002 Rodrigo Barbosa ++ privoxy-2.9.13-5 +- Relisting template files on the %%files section + +* Tue Apr 09 2002 Hal Burgiss ++ privoxy-2.9.13-4 +- Removed 'make dok'. Docs are all maintained in CVS (and tarball) now. + +* Mon Apr 08 2002 Hal Burgiss ++ privoxy-2.9.13-4 +- Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE +- Remove templates/blocked-compact. +- Add more docbook stuff to Builderquires. + +* 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 +714,179 @@ 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.33.2.19 2002/08/25 23:36:03 hal9 +# Bump version for 3.0.0. +# +# Revision 1.33.2.18 2002/08/10 11:28:50 oes +# Bumped version +# +# Revision 1.33.2.17 2002/08/07 01:08:49 hal9 +# Bumped version to 2.9.18. +# +# Revision 1.33.2.16 2002/08/05 08:42:13 kick_ +# same permissions, same runlevels as all the other initscripts +# +# Revision 1.33.2.15 2002/07/30 21:51:19 hal9 +# Bump version to 2.9.17. +# +# Revision 1.33.2.14 2002/07/27 21:58:16 kick_ +# bump version +# +# Revision 1.33.2.13 2002/07/27 21:39:41 kick_ +# condrestart raised an error during an fresh install when privoxy wasn't already running +# +# Revision 1.33.2.12 2002/07/27 15:47:10 hal9 +# Reset version and release for 2.9.16. +# +# Revision 1.33.2.11 2002/07/25 09:47:57 kick_ +# this caused some errors during a fresh installation. It's unnecessary to call an extra program (/bin/true) to set the error code to 0 +# +# Revision 1.33.2.10 2002/07/12 09:14:26 kick_ +# don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge +# +# Revision 1.43 2002/07/05 17:15:56 morcego +# - Changing delete order for groups and users (users should be first) +# +# Revision 1.42 2002/07/03 20:46:38 morcego +# - Changing sed expression that removed CR from the end of the lines. This +# new one removes any control caracter, and should work with older versions +# of sed +# +# Revision 1.41 2002/07/02 18:16:28 morcego +# - Fixing defattr values. File and directory modes where swapped +# +# Revision 1.40 2002/07/02 17:37:24 morcego +# Fix typo in templates creation. +# +# Revision 1.39 2002/06/26 17:32:04 morcego +# Fixing issues created by sync between the branches +# +# Revision 1.38 2002/06/24 21:44:44 hal9 +# Sync with Karsten's update in 3.0 branch. See changelog. +# +# Revision 1.33.2.3 2002/06/24 12:13:34 kick_ +# shut up rpmlint. btw: The vendor tag should be set in you .rpmmacros file, not in the spec file! +# +# Revision 1.33.2.2 2002/05/28 02:39:38 hal9 +# Replace index.html with privoxy-index.html for docs. +# +# Revision 1.33.2.1 2002/05/26 17:20:23 hal9 +# Add images to doc dirs. +# +# Revision 1.33 2002/05/25 02:08:23 hal9 +# Add doc/images directory. +# Redhat: alphabetized list of templates (and I think added one in the process) +# +# Revision 1.32 2002/05/16 01:37:29 hal9 +# Add new template file so CGI stuff works :) +# +# Revision 1.31 2002/05/03 17:14:35 morcego +# *.spec: Version bump to 2.9.15 +# -rh.spec: noreplace for %%{privoxyconf}/config +# Will interrupt the build if versions from configure.in and +# specfile do not match +# +# Revision 1.30 2002/04/26 15:51:05 morcego +# Changing Vendor value to Privoxy.Org +# +# Revision 1.29 2002/04/24 03:13:51 hal9 +# New actions files changes. +# +# Revision 1.28 2002/04/22 18:51:33 morcego +# user and group now get removed on rh too. +# +# Revision 1.27 2002/04/22 16:32:31 morcego +# configure.in, *.spec: Bumping release to 2 (2.9.14-2) +# -rh.spec: uid and gid are now macros +# -suse.spec: Changing the header Copyright to License (Copyright is +# deprecable) +# +# Revision 1.26 2002/04/22 16:24:36 morcego +# - Changes to fixate the uid and gid values as (both) 73. This is a +# value we hope to standarize for all distributions. RedHat already +# uses it, and Conectiva should start as soon as I find where the heck +# I left my cluebat :-) +# - Only remove the user and group on uninstall if this is not redhat, once +# redhat likes to have the values allocated even if the package is not +# installed +# +# Revision 1.25 2002/04/17 01:59:12 hal9 +# Add --disable-dynamic-pcre. +# +# Revision 1.24 2002/04/11 10:09:20 oes +# Version 2.9.14 +# +# Revision 1.23 2002/04/10 18:14:45 morcego +# - (privoxy-rh.spec only) Relisting template files on the %%files section +# - (configure.in, privoxy-rh.spec) Bumped package release to 5 +# +# Revision 1.22 2002/04/09 22:06:12 hal9 +# Remove 'make dok'. +# +# Revision 1.21 2002/04/09 02:52:26 hal9 +# - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE +# - Remove templates/blocked-compact. +# - Add more docbook stuff to Buildrequires. +# +# Revision 1.20 2002/04/08 20:27:45 swa +# fixed JB spelling +# +# Revision 1.19 2002/03/27 22:44:59 sarantis +# Include correct documentation file. +# +# 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