X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-rh.spec;h=9b539d4d9fd553cece1043f0b6a640aff6089ed2;hp=3d5f19923c1af699ece96662d5dc52df2414b2a2;hb=c4947f02a33d338bf7cdcf6001b8af7b0386d42a;hpb=3b9c83d331404b23fff20b8554798a425bd88817 diff --git a/privoxy-rh.spec b/privoxy-rh.spec index 3d5f1992..9b539d4d 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,7 +1,7 @@ -# $Id: privoxy-rh.spec,v 1.6 2002/03/24 19:56:40 hal9 Exp $ +# $Id: privoxy-rh.spec,v 1.27 2002/04/22 16:32:31 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY 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,23 +27,29 @@ # # Defines should happen in the begining of the file +%define veryoldname junkbust %define oldname junkbuster %define privoxyconf %{_sysconfdir}/%{name} +%define privoxy_uid 73 +%define privoxy_gid 73 -Summary: Privoxy - privacy enhancing proxy -Vendor: http://ijbswa.sourceforge.net Name: privoxy -Version: 2.9.13 -Release: 1 -Source0: http://www.waldherr.org/%{name}/privoxy-%{version}.tar.gz +# 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.14 +Release: 2 +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 autoconf +BuildRequires: perl gzip sed libtool autoconf Conflicts: junkbuster-raw junkbuster-blank junkbuster %description @@ -51,15 +57,10 @@ 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. Internet -Privoxy has application for both stand-alone systems and multi-user -networks. +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. +Privoxy is based on the Internet Junkbuster. %prep %setup -q -c @@ -67,9 +68,10 @@ development. Several other developers are now contributing. %build autoheader autoconf -%configure +%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 @@ -93,12 +95,6 @@ mkdir -p %{buildroot}%{_sbindir} \ install -s -m 744 %{name} %{buildroot}%{_sbindir}/%{name} -## 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 - -# do we need this??? -#sed -e 's@^.TH JUNKBUSTER 1@.TH JUNKBUSTER 8@g' %{oldname}.1 > %{buildroot}%{_mandir}/man8/%{oldname}.8 cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 cp -f *.action %{buildroot}%{privoxyconf}/ cp -f default.filter %{buildroot}%{privoxyconf}/default.filter @@ -125,26 +121,73 @@ cat 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 privoxy 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 -# privoxy user -- morcego -id privoxy > /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 -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 ||: + +# 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 ||: + +# Doublecheck to see if the group exist, and that it has the correct gid +/bin/grep -E '^%{name}:' /etc/group > /dev/null 2>&1 if [ $? -eq 1 ]; then - id privoxy > /dev/null 2>&1 - if [ $? -eq 0 ]; then - /usr/sbin/usermod -l privoxy -d %{_sysconfdir}/%{name} -s "" privoxy > /dev/null 2>&1 - else - /usr/sbin/useradd -d %{_sysconfdir}/%{name} -r -s "" privoxy > /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}:' /etc/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 + /usr/sbin/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 + /usr/sbin/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 + /usr/sbin/usermod -g %{privoxy_gid} %{name} +fi + %post # for upgrade from 2.0.x [ -f %{_localstatedir}/log/%{oldname}/logfile ] &&\ @@ -154,48 +197,50 @@ 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 privoxy -id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true +# We only remove it we this is not an upgrade +if [ "$1" = "0" ]; then + /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true + id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /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/index.html %dir %{privoxyconf} %dir %{privoxyconf}/templates -%attr(0744,privoxy,privoxy) %dir %{_localstatedir}/log/%{name} +%attr(0744,%{name},%{name}) %dir %{_localstatedir}/log/%{name} -%attr(0744,privoxy,privoxy)%{_sbindir}/%{name} +%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 +# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! %config %{privoxyconf}/config %config %{privoxyconf}/advanced.action %config %{privoxyconf}/basic.action @@ -204,46 +249,124 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true %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/untrusted +%config %{privoxyconf}/templates/toggle-mini +%config %{privoxyconf}/templates/default +%config %{privoxyconf}/templates/connect-failed +%config %{privoxyconf}/templates/show-status-file %config %{privoxyconf}/templates/cgi-error-bad-param -%config %{privoxyconf}/templates/cgi-error-disabled +%config %{privoxyconf}/templates/show-version %config %{privoxyconf}/templates/cgi-error-file -%config %{privoxyconf}/templates/cgi-error-modified +%config %{privoxyconf}/templates/cgi-error-404 %config %{privoxyconf}/templates/cgi-error-parse -%config %{privoxyconf}/templates/connect-failed -%config %{privoxyconf}/templates/default +%config %{privoxyconf}/templates/edit-actions-url-form +%config %{privoxyconf}/templates/no-such-domain %config %{privoxyconf}/templates/edit-actions-add-url-form -%config %{privoxyconf}/templates/edit-actions-for-url +%config %{privoxyconf}/templates/cgi-style.css +%config %{privoxyconf}/templates/edit-actions-for-url-filter +%config %{privoxyconf}/templates/cgi-error-disabled +%config %{privoxyconf}/templates/edit-actions-remove-url-form +%config %{privoxyconf}/templates/show-request +%config %{privoxyconf}/templates/cgi-error-modified +%config %{privoxyconf}/templates/mod-unstable-warning %config %{privoxyconf}/templates/edit-actions-list +%config %{privoxyconf}/templates/toggle %config %{privoxyconf}/templates/edit-actions-list-section +%config %{privoxyconf}/templates/mod-title %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/blocked +%config %{privoxyconf}/templates/mod-support-and-service +%config %{privoxyconf}/templates/mod-local-help %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 %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}/man1/%{name}.* %changelog +* 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. @@ -494,6 +617,82 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true additional "-r @" flag. # $Log: privoxy-rh.spec,v $ +# 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. #