1 # $Id: privoxy-rh.spec,v 1.33.2.15 2002/07/30 21:51:19 hal9 Exp $
3 # Written by and Copyright (C) 2001 the SourceForge
4 # Privoxy team. http://www.privoxy.org/
6 # Based on the Internet Junkbuster originally written
7 # by and Copyright (C) 1997 Anonymous Coders and
8 # Junkbusters Corporation. http://www.junkbusters.com
10 # This program is free software; you can redistribute it
11 # and/or modify it under the terms of the GNU General
12 # Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at
14 # your option) any later version.
16 # This program is distributed in the hope that it will
17 # be useful, but WITHOUT ANY WARRANTY; without even the
18 # implied warranty of MERCHANTABILITY or FITNESS FOR A
19 # PARTICULAR PURPOSE. See the GNU General Public
20 # License for more details.
22 # The GNU General Public License should be included with
23 # this file. If not, you can view it at
24 # http://www.gnu.org/copyleft/gpl.html
25 # or write to the Free Software Foundation, Inc., 59
26 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
29 # Defines should happen in the begining of the file
30 %define veryoldname junkbust
31 %define oldname junkbuster
32 %define privoxyconf %{_sysconfdir}/%{name}
33 %define privoxy_uid 73
34 %define privoxy_gid 73
38 # Version and release should be updated acordingly on configure.in and
39 # configure. Otherwise, the package can be build with the wrong value
42 Summary: Privoxy - privacy enhancing proxy
44 Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz
45 BuildRoot: %{_tmppath}/%{name}-%{version}-root
46 Group: System Environment/Daemons
47 URL: http://www.privoxy.org/
48 Obsoletes: junkbuster-raw junkbuster-blank junkbuster
49 # Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
50 Prereq: shadow-utils, chkconfig, initscripts, sh-utils
51 BuildRequires: perl gzip sed libtool autoconf
52 Conflicts: junkbuster-raw junkbuster-blank junkbuster
55 Privoxy is a web proxy with advanced filtering capabilities for
56 protecting privacy, filtering web page content, managing cookies,
57 controlling access, and removing ads, banners, pop-ups and other
58 obnoxious Internet junk. Privoxy has a very flexible configuration and
59 can be customized to suit individual needs and tastes. Privoxy has application
60 for both stand-alone systems and multi-user networks.
62 Privoxy is based on the Internet Junkbuster.
69 # We check to see if versions match
74 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}'`
75 if [ "%{version}" != "${CONFIG_VERSION}" ]; then
76 echo "The version declared on the specfile does not match the version"
77 echo "declared on configure.in. This should not happen. The build will"
78 echo "be interrupted now, so you can fix it."
83 %configure --disable-dynamic-pcre
85 # Docs are in CVS and tarball now.
88 ## Explicitily stripping is not recomended.
89 ## This is handled altomaticaly by RPM, and can couse troubles if
90 ## anyone wants to build an unstriped version - morcego
94 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
95 mkdir -p %{buildroot}%{_sbindir} \
96 %{buildroot}%{_mandir}/man1 \
97 %{buildroot}%{_localstatedir}/log/%{name} \
98 %{buildroot}%{privoxyconf}/templates \
99 %{buildroot}%{_sysconfdir}/logrotate.d \
100 %{buildroot}%{_sysconfdir}/rc.d/init.d
102 ## Manual gziping of manpages should not be done, once it can
103 ## break the building on some distributions. Anyway, rpm does it
104 ## automagicaly these days
105 ## Gziping the documentation files is not recomended - morcego
106 #gzip README AUTHORS ChangeLog %{name}.1 || /bin/true
108 install -s -m 744 %{name} %{buildroot}%{_sbindir}/%{name}
110 # Using sed to "convert" from DOS format to UNIX
111 # This is important behaviour, and should not be removed without some
112 # other assurance that these files don't get packed in the the
114 for i in `ls *.action`
116 cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/$i
118 cat default.filter | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/default.filter
119 cat trust | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/trust
124 cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/templates/$i
128 cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
129 cp -f %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
130 install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
131 install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name}
133 # verify all file locations, etc. in the config file
134 # don't start with ^ or commented lines are not replaced
135 ## Changing the sed paramter delimiter to @, so we don't have to
136 ## escape the slashes
138 sed 's@^confdir.*@confdir %{privoxyconf}@g' | \
139 # sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
140 # sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
141 # sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \
142 # sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \
143 # sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \
144 # sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \
145 sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' | \
146 sed -e 's/[[:cntrl:]]*$//' > \
147 %{buildroot}%{privoxyconf}/config
148 perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
149 %{buildroot}%{privoxyconf}/default.action
152 ## Macros are expanded even on commentaries. So, we have to use %%
157 # This is where we handle old usernames (junkbust and junkbuster)
158 # I'm not sure we should do that, but this is the way we have been
159 # doing it for some time now -- morcego
160 # We should do it for the group as well -- morcego
161 # Doing it by brute force. Much cleaner (no more Mr. Nice Guy) -- morcego
164 usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || :
165 usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || :
166 userdel %{oldname} > /dev/null 2>&1 ||:
167 userdel %{veryoldname} > /dev/null 2>&1 ||:
169 # Change the group name. Remove anything left behind.
170 groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||:
171 groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
172 groupdel %{oldname} > /dev/null 2>&1 ||:
173 groupdel %{veryoldname} > /dev/null 2>&1 ||:
175 # Doublecheck to see if the group exist, and that it has the correct gid
176 /bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null 2>&1
177 if [ $? -eq 1 ]; then
178 # Looks like it does not exist. Create it
179 groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1
181 /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' %{_sysconfdir}/group > /dev/null 2>&1
182 if [ $? -eq 1 ]; then
183 # The group exists, but does not have the correct gid
184 groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1
188 # Check to see if everything is okey. Create user if it still does not
190 id %{name} > /dev/null 2>&1
191 if [ $? -eq 1 ]; then
192 %{_sbindir}/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1
195 # Double check that the group has the correct uid
196 P_UID=`id -u %{name} 2>/dev/null`
197 if [ $P_UID -ne %{privoxy_uid} ]; then
198 %{_sbindir}/usermod -u %{privoxy_uid} %{name}
201 # The same for the gid
202 P_GID=`id -g %{name} 2>/dev/null`
203 if [ $P_GID -ne %{privoxy_gid} ]; then
204 %{_sbindir}/usermod -g %{privoxy_gid} %{name}
208 # for upgrade from 2.0.x
209 [ -f %{_localstatedir}/log/%{oldname}/logfile ] && {
210 mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile ||: ;
211 chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null ||: ;
213 [ -f %{_localstatedir}/log/%{name}/%{name} ] && {
214 mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile ||: ;
215 chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null ||: ;
217 /sbin/chkconfig --add privoxy
218 if [ "$1" = "1" ]; then
219 /sbin/service %{name} condrestart > /dev/null 2>&1 ||:
223 /sbin/service %{veryoldname} stop > /dev/null 2>&1 ||:
224 /sbin/service %{oldname} stop > /dev/null 2>&1 ||:
226 if [ "$1" = "0" ]; then
227 /sbin/service %{name} stop > /dev/null 2>&1 ||:
228 /sbin/chkconfig --del privoxy
232 #if [ "$1" -ge "1" ]; then
233 # /sbin/service %{name} condrestart > /dev/null 2>&1
235 # We only remove it we this is not an upgrade
236 if [ "$1" = "0" ]; then
237 id privoxy > /dev/null 2>&1 && %{_sbindir}/userdel privoxy || /bin/true
238 /bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null && %{_sbindir}/groupdel %{name} || /bin/true
242 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
245 %defattr(0644,root,root,0755)
246 %doc README AUTHORS ChangeLog LICENSE
247 %doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
248 %doc doc/webserver/developer-manual
249 %doc doc/webserver/user-manual
250 %doc doc/webserver/faq
251 %doc doc/webserver/p_doc.css doc/webserver/p_web.css doc/webserver/privoxy-index.html
252 %doc doc/webserver/images
253 %doc doc/webserver/man-page
255 # ATTENTION FOR defattr change here !
256 %defattr(0644,%{name},%{name},0755)
259 %dir %{privoxyconf}/templates
260 %dir %{_localstatedir}/log/%{name}
262 %attr(0744,%{name},%{name})%{_sbindir}/%{name}
264 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
265 # We should not use wildchars here. This could mask missing files problems
267 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
268 %config(noreplace) %{privoxyconf}/config
269 %config %{privoxyconf}/standard.action
270 %config(noreplace) %{privoxyconf}/user.action
271 %config %{privoxyconf}/default.action
272 %config %{privoxyconf}/default.filter
273 %config %{privoxyconf}/trust
275 # Please keep these alphabetized so its easier to find one that
277 %config %{privoxyconf}/templates/blocked
278 %config %{privoxyconf}/templates/cgi-error-404
279 %config %{privoxyconf}/templates/cgi-error-bad-param
280 %config %{privoxyconf}/templates/cgi-error-disabled
281 %config %{privoxyconf}/templates/cgi-error-file
282 %config %{privoxyconf}/templates/cgi-error-file-read-only
283 %config %{privoxyconf}/templates/cgi-error-modified
284 %config %{privoxyconf}/templates/cgi-error-parse
285 %config %{privoxyconf}/templates/cgi-style.css
286 %config %{privoxyconf}/templates/connect-failed
287 %config %{privoxyconf}/templates/default
288 %config %{privoxyconf}/templates/edit-actions-add-url-form
289 %config %{privoxyconf}/templates/edit-actions-for-url
290 %config %{privoxyconf}/templates/edit-actions-for-url-filter
291 %config %{privoxyconf}/templates/edit-actions-list
292 %config %{privoxyconf}/templates/edit-actions-list-button
293 %config %{privoxyconf}/templates/edit-actions-list-section
294 %config %{privoxyconf}/templates/edit-actions-list-url
295 %config %{privoxyconf}/templates/edit-actions-remove-url-form
296 %config %{privoxyconf}/templates/edit-actions-url-form
297 %config %{privoxyconf}/templates/mod-local-help
298 %config %{privoxyconf}/templates/mod-support-and-service
299 %config %{privoxyconf}/templates/mod-title
300 %config %{privoxyconf}/templates/mod-unstable-warning
301 %config %{privoxyconf}/templates/no-such-domain
302 %config %{privoxyconf}/templates/show-request
303 %config %{privoxyconf}/templates/show-status
304 %config %{privoxyconf}/templates/show-status-file
305 %config %{privoxyconf}/templates/show-url-info
306 %config %{privoxyconf}/templates/show-version
307 %config %{privoxyconf}/templates/toggle
308 %config %{privoxyconf}/templates/toggle-mini
309 %config %{privoxyconf}/templates/untrusted
311 # Attention, new defattr change here !
312 %defattr(0644,root,root,0755)
314 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
315 %config(noreplace) %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
317 %{_mandir}/man1/%{name}.*
320 * Tue Jul 30 2002 Hal Burgiss <hal@foobox.net>
321 - Reset version for 2.9.17.
323 * Sat Jul 27 2002 Hal Burgiss <hal@foobox.net>
324 - Reset version and release for 2.9.16.
326 * Fri Jul 12 2002 Karsten Hopp <karsten@redhat.de>
327 - don't use ghost files for rcX.d/*, using chkconfig is the
328 correct way to do this job (#68619)
330 * Fri Jul 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
332 - Changing delete order for groups and users (users should be first)
334 * Wed Jul 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
336 - Changing sed expression that removed CR from the end of the lines. This
337 new one removes any control caracter, and should work with older versions
340 * Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
342 - Fixing defattr values. File and directory modes where swapped
344 * Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
346 - Bumping Release number (which should be changed every time the specfile
349 * Tue Jul 02 2002 Hal Burgiss <hal@foobox.net>
351 - Fix typo in templates creation.
353 * Wed Jun 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
355 - Fixing issues created by specfile sync between branches
356 - Correcting the release number (WARNING)
357 - Reintroducing text file conversion (dos -> unix)
358 - Reconverting hardcoded directories to macros
359 - Refixing ownership of privoxy files (now using multiple defattr
362 * Thu Jun 20 2002 Karsten Hopp <karsten@redhat.de>
363 - fix several .spec file issues to shut up rpmlint
364 - non-standard-dir-perm /var/log/privoxy 0744
365 - invalid-vendor Privoxy.Org (This is ok for binaries compiled by privoxy
366 members, but not for packages from Red Hat)
367 - non-standard-group Networking/Utilities
368 - logrotate and init scripts should be noreplace
370 * Mon May 27 2002 Hal Burgiss <hal@foobox.net>
372 - Index.html is now privoxy-index.html for doc usage.
374 * Sat May 25 2002 Hal Burgiss <hal@foobox.net>
376 - Add html man page so index.html does not 404.
378 * Fri May 24 2002 Hal Burgiss <hal@foobox.net>
380 - Add another template and alphabetize these for easier tracking.
381 - Add doc/images directory.
383 * Wed May 15 2002 Hal Burgiss <hal@foobox.net>
385 - Add templates/edit-actions-list-button
387 * Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
390 - Adding noreplace for %%{privoxyconf}/config
391 - Included a method to verify if the versions declared on the specfile and
392 configure.in match. Interrupt the build if they don't.
394 * Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
396 - Changing Vendor to Privoxy.Org
398 * Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
400 - Adjust for new *actions files.
402 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
404 - Removed the redhat hack that prevented the user and group from
405 being dealocated. That was a misundestanding of my part regarding
408 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
410 - Using macros to define uid and gid values
413 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
415 - Changes to fixate the uid and gid values as (both) 73. This is a
416 value we hope to standarize for all distributions. RedHat already
417 uses it, and Conectiva should start as soon as I find where the heck
418 I left my cluebat :-)
419 - Only remove the user and group on uninstall if this is not redhat, once
420 redhat likes to have the values allocated even if the package is not
423 * Tue Apr 16 2002 Hal Burgiss <hal@foobox.net>
425 - Add --disable-dynamic-pcre to configure.
427 * Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
429 - Relisting template files on the %%files section
431 * Tue Apr 09 2002 Hal Burgiss <hal@foobox.net>
433 - Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
435 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
437 - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
438 - Remove templates/blocked-compact.
439 - Add more docbook stuff to Builderquires.
441 * Thu Mar 28 2002 Sarantis Paskalis <sarantis@cnl.di.uoa.gr>
443 - Include correct documentation file.
445 * Tue Mar 26 2002 Hal Burgiss <hal@foobox.net>
447 - Fix typo in Description.
449 * Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
451 - Added commentary asking to update the release value on the configure
454 * Tue Mar 25 2002 Hal Burgiss <hal@foobox.net>
456 - Added the missing edit-actions-for-url-filter to templates.
458 * Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
460 - Fixing Release number
462 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
466 * Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@suespammers.org>
468 - Fixed the init files entries. Now we use %%ghost
469 - improved username (and groupname) handling on the %%pre section. By improved
470 I mean: we do it by brute force now. Much easier to maintain. Yeah, you
471 got it right. No more Mr. Nice Guy.
472 - Removed the userdel call on %%post. No need, once it's complety handled on
475 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
476 + junkbusterng-2.9.13-1
477 Added autoheader. Added autoconf to buildrequires.
479 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
480 + junkbusterng-2.9.13-1
481 - Fixed build problems re: name conflicts with man page and logrotate.
482 - Commented out rc?d/* configs for time being, which are causing a build
483 - failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
484 - changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
486 * Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
487 + junkbusterng-2.9.13-1
488 - References to the expression ijb where changed where possible
489 - New package name: junkbusterng (all in lower case, acording to
490 the LSB recomendation)
491 - Version changed to: 2.9.13
493 - Added: junkbuster to obsoletes and conflicts (Not sure this is
494 right. If it obsoletes, why conflict ? Have to check it later)
495 - Summary changed: Stefan, please check and aprove it
496 - Changes description to use the new name
497 - Sed string was NOT changed. Have to wait to the manpage to
499 - Keeping the user junkbuster for now. It will require some aditional
500 changes on the script (scheduled for the next specfile release)
501 - Added post entry to move the old logfile to the new log directory
502 - Removing "chkconfig --add" entry (not good to have it automaticaly
503 added to the startup list).
504 - Added preun section to stop the service with the old name, as well
505 as remove it from the startup list
506 - Removed the chkconfig --del entry from the conditional block on
507 the preun scriptlet (now handled on the %files section)
509 * Thu Mar 21 2002 Hal Burgiss <hal@foobox.net>
510 - added ijb_docs.css to docs.
512 * Mon Mar 11 2002 Hal Burgiss <hal@foobox.net>
513 + junkbuster-2.9.11-8
514 - Take out --enable-no-gifs, breaks some browsers.
516 * Sun Mar 10 2002 Hal Burgiss <hal@foobox.net>
517 + junkbuster-2.9.11-8
518 - Add --enable-no-gifs to configure.
520 * Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
521 + junkbuster-2.9.11-7
522 - Added BuildRequires to libtool.
524 * Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
525 + junkbuster-2.9.11-6
526 - Changed the routined that handle the junkbust and junkbuster users on
527 %%pre and %%post to work in a smoother manner
528 - %%files now uses hardcoded usernames, to avoid problems with package
529 name changes in the future
531 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
532 + junkbuster-2.9.11-5
533 - Added "make redhat-dok" to the build process
534 - Added docbook-utils to BuildRequires
536 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
537 + junkbuster-2.9.11-4
538 - Changing man section in the manpage from 1 to 8
539 - We now require packages, not files, to avoid issues with apt
541 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
542 + junkbuster-2.9.11-3
543 - Fixing permissions of the init script
545 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
546 + junkbuster-2.9.11-2
547 - General specfile fixup, using the best recomended practices, including:
548 - Adding -q to %%setup
549 - Using macros whereever possible
550 - Not using wildchars on %%files section
551 - Doubling the percentage char on changelog and comments, to
552 avoid rpm expanding them
554 * Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
555 - /bin/false for shell causes init script to fail. Reverting.
557 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
558 - Removed UID 73. Included user-manual and developer-manual in docs.
559 Include other actions files. Default shell is now /bin/false.
560 Userdel user=junkbust. ChangeLog was not zipped. Removed
561 RPM_OPT_FLAGS kludge.
563 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
564 - add paranoia check for 'rm -rf %%{buildroot}'
565 - add gzip to 'BuildRequires'
567 * Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
568 - actionsfile is now ijb.action.
570 * Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
572 - Add more documents for installation
573 - Add version string to name and source
575 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
576 - Back to user 'junkbuster' and fix configure macro.
578 * Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
579 - More changes for user 'junkbust'. Init script had 'junkbuster'.
581 * Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
582 - Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
583 - Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
585 * Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
586 - Added $RPM_OPT_FLAGS support, renaming of old logfile, and
587 - made sure no default shell exists for user junkbust.
589 * Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
592 * Mon Sep 25 2000 Stefan Waldherr <stefan@waldherr.org>
593 - CLF Logging patch by davep@cyw.uklinux.net
594 - Hal DeVore <haldevore@earthling.net> fix akamaitech in blocklist
596 * Sun Sep 17 2000 Stefan Waldherr <stefan@waldherr.org>
597 - Steve Kemp skx@tardis.ed.ac.uk's javascript popup patch.
598 - Markus Breitenbach breitenb@rbg.informatik.tu-darmstadt.de supplied
599 numerous fixes and enhancements for Steve's patch.
600 - adamlock@netscape.com (Adam Lock) in the windows version:
601 - Taskbar activity spinner always spins even when logging is
602 turned off (which is the default) - people who don't
603 like the spinner can turn it off from a menu option.
604 - Taskbar popup menu has a options submenu - people can now
605 open the settings files for cookies, blockers etc.
606 without opening the JB window.
607 - Logging functionality works again
608 - Buffer overflow is fixed - new code uses a bigger buffer
609 and snprintf so it shouldn't overflow anymore.
610 - Fixed userid swa, group learning problem while installing.
612 - Added patch by Benjamin Low <ben@snrc.uow.edu.au> that prevents JB to
613 core dump when there is no log file.
614 - Tweaked SuSE startup with the help of mohataj@gmx.net and Doc.B@gmx.de.
615 - Fixed man page to include imagefile and popupfile.
616 - Sanity check for the statistics function added.
617 - "Patrick D'Cruze" <pdcruze@orac.iinet.net.au>: It seems Microsoft
618 are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
619 With IIS/5, it appears to omit the trailing \r\n from http header
620 only messages. eg, when I visit http://www.hotmail.com, IIS/5
621 responds with a HTTP 302 redirect header. However, this header
622 message is missing the trailing \r\n. IIS/5 then closes the
623 connection. Junkbuster, unfortunately, discards the header becomes
624 it thinks it is incomplete - and it is. MS have transmitted an
626 - Added bug reports and patch submission forms in the docs.
628 * Mon Mar 20 2000 Stefan Waldherr <stefan@waldherr.org>
629 Andrew <anw@tirana.freewire.co.uk> extended the JB:
630 Display of statistics of the total number of requests and the number
631 of requests filtered by junkbuster, also the percentage of requests
632 filtered. Suppression of the listing of files on the proxy-args page.
633 All stuff optional and configurable.
635 * Sun Sep 12 1999 Stefan Waldherr <stefan@waldherr.org>
636 Jan Willamowius (jan@janhh.shnet.org) fixed a bug in the
637 code which prevented the JB from handling URLs of the form
638 user:password@www.foo.com. Fixed.
640 * Mon Aug 2 1999 Stefan Waldherr <stefan@waldherr.org>
641 Blank images are no longer cached, thanks to a hint from Markus
642 Breitenbach <breitenb@rbg.informatik.tu-darmstadt.de>. The user
643 agent is NO longer set by the Junkbuster. Sadly, many sites depend
644 on the correct browser version nowadays. Incorporated many
645 suggestions from Jan "Yenya" Kasprzak <kas@fi.muni.cz> for the
646 spec file. Fixed logging problem and since runlevel 2 does not
647 use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
648 /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
649 <walker@netgate.net>. You should now be able to build this RPM as
650 a non-root user (mathias@weidner.sem.lipsia.de).
652 * Sun Jan 31 1999 Stefan Waldherr <stefan@waldherr.org>
653 %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
654 to allow more sophisticated matching of blocked images. Logrotate
655 logfile. Added files for auto-updating the blocklist et al.
657 * Wed Dec 16 1998 Stefan Waldherr <stefan@waldherr.org>
658 Configure blank version via config file. No separate blank
659 version anymore. Added Roland's <roland@spinnaker.rhein.de>
660 patch to show a logo instead of a blank area. Added a suggestion
661 from Alex <alex@cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
662 More regexps in the blocklist. Prepared the forwardfile for
663 squid. Extended image regexp with help from gabriel
664 <somlo@CS.ColoState.EDU>.
666 * Thu Nov 19 1998 Stefan Waldherr <stefan@waldherr.org>
667 All RPMs now identify themselves in the show-proxy-args page.
668 Released Windoze version. Run junkbuster as nobody instead of
671 * Fri Oct 30 1998 Stefan Waldherr <stefan@waldherr.org>
672 Newest version. First release (hence the little version number
673 mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
674 security over 2.0.1; some multi-user sites will need to change
675 the listen-address in the configuration file. The blank version of
676 the Internet Junkbuster has a more sophisticated way of replacing
677 images. All RPMs identify themselves in the show-proxy-args page.
679 * Thu Sep 23 1998 Stefan Waldherr <stefan@waldherr.org>
680 Modified the blocking feature, so that only GIFs and JPEGs are
681 blocked and replaced but not HTML pages. Thanks to
682 "Gerd Flender" <plgerd@informatik.uni-siegen.de> for this nice
683 idea. Added numerous stuff to the blocklist. Keep patches in
684 seperate files and no longer in diffs (easier to maintain).
686 * Tue Jun 16 1998 Stefan Waldherr <swa@cs.cmu.edu>
687 Moved config files to /etc/junkbuster directory, moved man page,
688 added BuildRoot directive (Thanks to Alexey Nogin <ayn2@cornell.edu>)
689 Made new version junkbuster-raw (which is only a stripped version of
690 the junkuster rpm, i.e. without my blocklist, etc.)
692 * Tue Jun 16 1998 (2.0-1)
693 Uhm, not that much. Just a new junkbuster version that
694 fixes a couple of bugs ... and of course a bigger
695 blocklist with the unique Now-less-ads-than-ever(SM)
697 Oh, one thing: I changed the default user agent to Linux -- no
698 need anymore to support Apple.
700 * Tue Jun 16 1998 (2.0-0)
701 Now-less-ads-than-ever (SM)
702 compiled with gcc instead of cc
703 compiled with -O3, thus it should be a little faster
704 show-proxy-args now works
705 /etc/junkbuster.init wasn't necessary
707 * Tue Jun 16 1998 (1.4)
708 some more config files were put into /etc
709 The junkbuster-blank rpm returns a 1x1 pixel image, that gets
710 displayed by Netscape instead of the blocked image.
711 Read http://www.waldherr.org/junkbuster/ for
714 * Tue Jun 16 1998 (1.3)
715 The program has been moved to /usr/sbin (from /usr/local/bin)
716 Init- and stopscripts (/etc/rc.d/rc*) have been added so
717 that the junkbuster starts automatically during bootup.
718 The /etc/blocklist file is much more sophisticated. Theoretically
719 one should e.g. browse all major US and German newspapers without
720 seeing one annoying ad.
721 junkbuster.init was modified. It now starts junkbuster with an
722 additional "-r @" flag.
724 # $Log: privoxy-rh.spec,v $
725 # Revision 1.33.2.15 2002/07/30 21:51:19 hal9
726 # Bump version to 2.9.17.
728 # Revision 1.33.2.14 2002/07/27 21:58:16 kick_
731 # Revision 1.33.2.13 2002/07/27 21:39:41 kick_
732 # condrestart raised an error during an fresh install when privoxy wasn't already running
734 # Revision 1.33.2.12 2002/07/27 15:47:10 hal9
735 # Reset version and release for 2.9.16.
737 # Revision 1.33.2.11 2002/07/25 09:47:57 kick_
738 # 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
740 # Revision 1.33.2.10 2002/07/12 09:14:26 kick_
741 # don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge
743 # Revision 1.33.2.9 2002/07/05 17:16:19 morcego
744 # - Changing delete order for groups and users (users should be first)
746 # Revision 1.33.2.8 2002/07/03 20:46:24 morcego
747 # - Changing sed expression that removed CR from the end of the lines. This
748 # new one removes any control caracter, and should work with older versions
751 # Revision 1.33.2.7 2002/07/02 18:16:48 morcego
752 # - Fixing defattr values. File and directory modes where swapped
754 # Revision 1.33.2.6 2002/07/02 17:38:10 morcego
755 # Bumping Release number
757 # Revision 1.33.2.5 2002/07/02 11:43:20 hal9
758 # Fix typo in templates creation.
760 # Revision 1.33.2.4 2002/06/26 17:32:45 morcego
761 # Integrating fixed from the main branch.
763 # Revision 1.33.2.3 2002/06/24 12:13:34 kick_
764 # shut up rpmlint. btw: The vendor tag should be set in you .rpmmacros file, not in the spec file!
766 # Revision 1.33.2.2 2002/05/28 02:39:38 hal9
767 # Replace index.html with privoxy-index.html for docs.
769 # Revision 1.33.2.1 2002/05/26 17:20:23 hal9
770 # Add images to doc dirs.
772 # Revision 1.33 2002/05/25 02:08:23 hal9
773 # Add doc/images directory.
774 # Redhat: alphabetized list of templates (and I think added one in the process)
776 # Revision 1.32 2002/05/16 01:37:29 hal9
777 # Add new template file so CGI stuff works :)
779 # Revision 1.31 2002/05/03 17:14:35 morcego
780 # *.spec: Version bump to 2.9.15
781 # -rh.spec: noreplace for %%{privoxyconf}/config
782 # Will interrupt the build if versions from configure.in and
783 # specfile do not match
785 # Revision 1.30 2002/04/26 15:51:05 morcego
786 # Changing Vendor value to Privoxy.Org
788 # Revision 1.29 2002/04/24 03:13:51 hal9
789 # New actions files changes.
791 # Revision 1.28 2002/04/22 18:51:33 morcego
792 # user and group now get removed on rh too.
794 # Revision 1.27 2002/04/22 16:32:31 morcego
795 # configure.in, *.spec: Bumping release to 2 (2.9.14-2)
796 # -rh.spec: uid and gid are now macros
797 # -suse.spec: Changing the header Copyright to License (Copyright is
800 # Revision 1.26 2002/04/22 16:24:36 morcego
801 # - Changes to fixate the uid and gid values as (both) 73. This is a
802 # value we hope to standarize for all distributions. RedHat already
803 # uses it, and Conectiva should start as soon as I find where the heck
804 # I left my cluebat :-)
805 # - Only remove the user and group on uninstall if this is not redhat, once
806 # redhat likes to have the values allocated even if the package is not
809 # Revision 1.25 2002/04/17 01:59:12 hal9
810 # Add --disable-dynamic-pcre.
812 # Revision 1.24 2002/04/11 10:09:20 oes
815 # Revision 1.23 2002/04/10 18:14:45 morcego
816 # - (privoxy-rh.spec only) Relisting template files on the %%files section
817 # - (configure.in, privoxy-rh.spec) Bumped package release to 5
819 # Revision 1.22 2002/04/09 22:06:12 hal9
822 # Revision 1.21 2002/04/09 02:52:26 hal9
823 # - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
824 # - Remove templates/blocked-compact.
825 # - Add more docbook stuff to Buildrequires.
827 # Revision 1.20 2002/04/08 20:27:45 swa
830 # Revision 1.19 2002/03/27 22:44:59 sarantis
831 # Include correct documentation file.
833 # Revision 1.18 2002/03/27 22:10:14 sarantis
834 # bumped Hal's last commit 1 day to the future to make rpm build again.
836 # Revision 1.17 2002/03/27 00:48:23 hal9
839 # Revision 1.16 2002/03/26 22:29:55 swa
840 # we have a new homepage!
842 # Revision 1.15 2002/03/26 17:39:54 morcego
843 # Adding comment on the specfile to remember the packager to update
844 # the release number on the configure script
846 # Revision 1.14 2002/03/26 14:25:15 hal9
847 # Added edit-actions-for-url-filter to templates in %%config
849 # Revision 1.13 2002/03/25 13:31:04 morcego
850 # Bumping Release tag.
852 # Revision 1.12 2002/03/25 03:11:40 hal9
853 # Do it right way this time :/
855 # Revision 1.11 2002/03/25 03:09:51 hal9
858 # Revision 1.10 2002/03/24 22:16:14 morcego
859 # Just removing some old commentaries.
861 # Revision 1.9 2002/03/24 22:03:22 morcego
862 # Should be working now. See %changelog for details
864 # Revision 1.8 2002/03/24 21:13:01 morcego
867 # Revision 1.7 2002/03/24 21:07:18 hal9
868 # Add autoheader, etc.
870 # Revision 1.6 2002/03/24 19:56:40 hal9
871 # /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
873 # Revision 1.4 2002/03/24 13:32:42 swa
874 # name change related issues
876 # Revision 1.3 2002/03/24 12:56:21 swa
877 # name change related issues.
879 # Revision 1.2 2002/03/24 11:40:14 swa
882 # Revision 1.1 2002/03/24 11:23:44 swa
885 # Revision 1.1 2002/03/22 20:53:03 morcego
886 # - Ongoing process to change name to JunkbusterNG
887 # - configure/configure.in: no change needed
889 # - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
890 # - PROGRAM = jbng@EXEEXT@
891 # - rh-spec now references as junkbusterng-rh.spec
892 # - redhat-upload: references changed to junkbusterng-* (package names)
893 # - tarball-dist: references changed to JunkbusterNG-distribution-*
894 # - tarball-src: now JunkbusterNG-*
895 # - install: initscript now junkbusterng.init and junkbusterng (when
897 # - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
898 # - junkbusterng.spec:
899 # - References to the expression ijb where changed where possible
900 # - New package name: junkbusterng (all in lower case, acording to
901 # the LSB recomendation)
902 # - Version changed to: 2.9.13
904 # - Added: junkbuster to obsoletes and conflicts (Not sure this is
905 # right. If it obsoletes, why conflict ? Have to check it later)
906 # - Summary changed: Stefan, please check and aprove it
907 # - Changes description to use the new name
908 # - Sed string was NOT changed. Have to wait to the manpage to
910 # - Keeping the user junkbuster for now. It will require some aditional
911 # changes on the script (scheduled for the next specfile release)
912 # - Added post entry to move the old logfile to the new log directory
913 # - Removing "chkconfig --add" entry (not good to have it automaticaly
914 # added to the startup list).
915 # - Added preun section to stop the service with the old name, as well
916 # as remove it from the startup list
917 # - Removed the chkconfig --del entry from the conditional block on
918 # the preun scriptlet (now handled on the %files section)
919 # - junkbuster.init: renamed to junkbusterng.init
920 # - junkbusterng.init:
921 # - Changed JB_BIN to jbng
922 # - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
923 # be used where necessary (config dir)
926 # - The config directory is /etc/junkbuster yet. Have to change it on the
927 # specfile, after it is changes on the code
928 # - The only files that got renamed on the cvs tree were the rh specfile and
929 # the init file. Some file references got changes on the makefile and on the
930 # rh-spec (as listed above)
932 # Revision 1.43 2002/03/21 16:04:10 hal9
933 # added ijb_docs.css to %doc
935 # Revision 1.42 2002/03/12 13:41:18 sarantis
936 # remove hard-coded "ijbswa" string in build phase
938 # Revision 1.41 2002/03/11 22:58:32 hal9
939 # Remove --enable-no-gifs
941 # Revision 1.39 2002/03/08 18:57:29 swa
942 # remove user junkbuster after de-installation.
944 # Revision 1.38 2002/03/08 13:45:27 morcego
945 # Adding libtool to Buildrequires
947 # Revision 1.37 2002/03/07 19:23:49 swa
948 # i hate to scroll. suse: wrong configdir.
950 # Revision 1.36 2002/03/07 05:06:54 morcego
951 # Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
953 # Revision 1.34 2002/03/07 00:11:57 morcego
954 # Few changes on the %pre and %post sections of the rh specfile to handle
955 # usernames more cleanly
957 # Revision 1.33 2002/03/05 13:13:57 morcego
958 # - Added "make redhat-dok" to the build phase
959 # - Added docbook-utils to BuildRequires
961 # Revision 1.32 2002/03/05 12:34:24 morcego
962 # - Changing section internaly on the manpage from 1 to 8
963 # - We now require packages, not files, to avoid issues with apt
965 # Revision 1.31 2002/03/04 18:06:09 morcego
966 # SPECFILE: fixing permissing of the init script (broken by the last change)
968 # Revision 1.30 2002/03/04 16:18:03 morcego
969 # General cleanup of the rh specfile.
972 # * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
973 # + junkbuster-2.9.11-2
974 # - General specfile fixup, using the best recomended practices, including:
975 # - Adding -q to %%setup
976 # - Using macros whereever possible
977 # - Not using wildchars on %%files section
978 # - Doubling the percentage char on changelog and comments, to
979 # avoid rpm expanding them
981 # Revision 1.29 2002/03/03 19:21:22 hal9
982 # Init script fails if shell is /bin/false.
984 # Revision 1.28 2002/01/09 18:34:03 hal9
987 # Revision 1.27 2002/01/09 18:32:02 hal9
988 # Removed RPM_OPT_FLAGS kludge.
990 # Revision 1.26 2002/01/09 18:21:10 hal9
991 # A few minor updates.
993 # Revision 1.25 2001/12/28 01:45:36 steudten
994 # Add paranoia check and BuildReq: gzip
996 # Revision 1.24 2001/12/01 21:43:14 hal9
997 # Allowed for new ijb.action file.
999 # Revision 1.23 2001/11/06 12:09:03 steudten
1000 # Compress doc files. Install README and AUTHORS at last as document.
1002 # Revision 1.22 2001/11/05 21:37:34 steudten
1003 # Fix to include the actual version for name.
1004 # Let the 'real' packager be included - sorry stefan.
1006 # Revision 1.21 2001/10/31 19:27:27 swa
1007 # consistent description. new name for suse since
1008 # we had troubles with rpms of identical names
1011 # Revision 1.20 2001/10/24 15:45:49 hal9
1012 # To keep Thomas happy (aka correcting my mistakes)
1014 # Revision 1.19 2001/10/15 03:23:59 hal9
1017 # Revision 1.17 2001/10/10 18:59:28 hal9
1018 # Minor change for init script.
1020 # Revision 1.16 2001/09/24 20:56:23 hal9
1023 # Revision 1.13 2001/09/10 17:44:43 swa
1024 # integrate three pieces of documentation. needs work.
1025 # will not build cleanly under redhat.
1027 # Revision 1.12 2001/09/10 16:25:04 swa
1028 # copy all templates. version updated.
1030 # Revision 1.11 2001/07/03 11:00:25 sarantis
1031 # replaced permissionsfile with actionsfile
1033 # Revision 1.10 2001/07/03 09:34:44 sarantis
1034 # bumped up version number.
1036 # Revision 1.9 2001/06/12 18:15:29 swa
1037 # the %% in front of configure (see tag below) confused
1038 # the rpm build process on 7.1.
1040 # Revision 1.8 2001/06/12 17:15:56 swa
1041 # fixes, because a clean build on rh6.1 was impossible.
1042 # GZIP confuses make, %% configure confuses rpm, etc.
1044 # Revision 1.7 2001/06/11 12:17:26 sarantis
1045 # fix typo in %%post
1047 # Revision 1.6 2001/06/11 11:28:25 sarantis
1048 # Further optimizations and adaptations in the spec file.
1050 # Revision 1.5 2001/06/09 09:14:11 swa
1051 # shamelessly adapted RPM stuff from the newest rpm that
1052 # RedHat provided for the JB.
1054 # Revision 1.4 2001/06/08 20:54:18 swa
1055 # type with status file. remove forward et. al from file list.
1057 # Revision 1.3 2001/06/07 17:28:10 swa
1060 # Revision 1.2 2001/06/04 18:31:58 swa
1061 # files are now prefixed with either `confdir' or `logdir'.
1062 # `make redhat-dist' replaces both entries confdir and logdir
1063 # with redhat values
1065 # Revision 1.1 2001/06/04 10:44:57 swa
1066 # `make redhatr-dist' now works. Except for the paths
1067 # in the config file.