1 # $Id: privoxy-rh.spec,v 1.33 2002/05/25 02:08:23 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
45 Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz
46 BuildRoot: %{_tmppath}/%{name}-%{version}-root
47 Group: Networking/Utilities
48 URL: http://www.privoxy.org/
49 Obsoletes: junkbuster-raw junkbuster-blank junkbuster
50 # Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
51 Prereq: shadow-utils, chkconfig, initscripts, sh-utils
52 BuildRequires: perl gzip sed libtool autoconf
53 Conflicts: junkbuster-raw junkbuster-blank junkbuster
56 Privoxy is a web proxy with advanced filtering capabilities for
57 protecting privacy, filtering web page content, managing cookies,
58 controlling access, and removing ads, banners, pop-ups and other
59 obnoxious Internet junk. Privoxy has a very flexible configuration and
60 can be customized to suit individual needs and tastes. Privoxy has application
61 for both stand-alone systems and multi-user networks.
63 Privoxy is based on the Internet Junkbuster.
70 # We check to see if versions match
75 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}'`
76 if [ "%{version}" != "${CONFIG_VERSION}" ]; then
77 echo "The version declared on the specfile does not match the version"
78 echo "declared on configure.in. This should not happen. The build will"
79 echo "be interrupted now, so you can fix it."
84 %configure --disable-dynamic-pcre
86 # Docs are in CVS and tarball now.
89 ## Explicitily stripping is not recomended.
90 ## This is handled altomaticaly by RPM, and can couse troubles if
91 ## anyone wants to build an unstriped version - morcego
95 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
96 mkdir -p %{buildroot}%{_sbindir} \
97 %{buildroot}%{_mandir}/man1 \
98 %{buildroot}%{_localstatedir}/log/%{name} \
99 %{buildroot}%{privoxyconf}/templates \
100 %{buildroot}%{_sysconfdir}/logrotate.d \
101 %{buildroot}%{_sysconfdir}/rc.d/init.d
103 ## Manual gziping of manpages should not be done, once it can
104 ## break the building on some distributions. Anyway, rpm does it
105 ## automagicaly these days
106 ## Gziping the documentation files is not recomended - morcego
107 #gzip README AUTHORS ChangeLog %{name}.1 || /bin/true
109 install -s -m 744 %{name} %{buildroot}%{_sbindir}/%{name}
111 cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
112 cp -f *.action %{buildroot}%{privoxyconf}/
113 cp -f default.filter %{buildroot}%{privoxyconf}/default.filter
114 cp -f trust %{buildroot}%{privoxyconf}/trust
115 cp -f templates/* %{buildroot}%{privoxyconf}/templates/
116 cp -f %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
117 install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
118 install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name}
120 # verify all file locations, etc. in the config file
121 # don't start with ^ or commented lines are not replaced
122 ## Changing the sed paramter delimiter to @, so we don't have to
123 ## escape the slashes
125 sed 's@^confdir.*@confdir %{privoxyconf}@g' | \
126 # sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
127 # sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
128 # sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \
129 # sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \
130 # sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \
131 # sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \
132 sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' > \
133 %{buildroot}%{privoxyconf}/config
134 perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
135 %{buildroot}%{privoxyconf}/default.action
138 # Creating ghost init files
139 mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc{0,1,2,3,4,5,6}.d
142 ln -sf ../init.d/%{name} %{buildroot}/%{_sysconfdir}/rc.d/rc${i}.d/K09%{name}
146 ln -sf ../init.d/%{name} %{buildroot}/%{_sysconfdir}/rc.d/rc${i}.d/S84%{name}
149 ## Macros are expanded even on commentaries. So, we have to use %%
154 # This is where we handle old usernames (junkbust and junkbuster)
155 # I'm not sure we should do that, but this is the way we have been
156 # doing it for some time now -- morcego
157 # We should do it for the group as well -- morcego
158 # Doing it by brute force. Much cleaner (no more Mr. Nice Guy) -- morcego
160 # Change the group name. Remove anything left behind.
161 groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||:
162 groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
163 groupdel %{oldname} > /dev/null 2>&1 ||:
164 groupdel %{veryoldname} > /dev/null 2>&1 ||:
167 usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || :
168 usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || :
169 userdel %{oldname} > /dev/null 2>&1 ||:
170 userdel %{veryoldname} > /dev/null 2>&1 ||:
172 # Doublecheck to see if the group exist, and that it has the correct gid
173 /bin/grep -E '^%{name}:' /etc/group > /dev/null 2>&1
174 if [ $? -eq 1 ]; then
175 # Looks like it does not exist. Create it
176 groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1
178 /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' /etc/group > /dev/null 2>&1
179 if [ $? -eq 1 ]; then
180 # The group exists, but does not have the correct gid
181 groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1
185 # Check to see if everything is okey. Create user if it still does not
187 id %{name} > /dev/null 2>&1
188 if [ $? -eq 1 ]; then
189 /usr/sbin/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1
192 # Double check that the group has the correct uid
193 P_UID=`id -u %{name} 2>/dev/null`
194 if [ $P_UID -ne %{privoxy_uid} ]; then
195 /usr/sbin/usermod -u %{privoxy_uid} %{name}
198 # The same for the gid
199 P_GID=`id -g %{name} 2>/dev/null`
200 if [ $P_GID -ne %{privoxy_gid} ]; then
201 /usr/sbin/usermod -g %{privoxy_gid} %{name}
205 # for upgrade from 2.0.x
206 [ -f %{_localstatedir}/log/%{oldname}/logfile ] &&\
207 mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile || /bin/true
208 [ -f %{_localstatedir}/log/%{name}/%{name} ] &&\
209 mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile || /bin/true
210 chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null
211 chown -R %{name}:%{name} /etc/%{name} 2>/dev/null
212 if [ "$1" = "1" ]; then
213 /sbin/service %{name} condrestart > /dev/null 2>&1
217 /sbin/service %{veryoldname} stop > /dev/null 2>&1 ||:
218 /sbin/service %{oldname} stop > /dev/null 2>&1 ||:
220 if [ "$1" = "0" ]; then
221 /sbin/service %{name} stop > /dev/null 2>&1 ||:
222 # No need to use chkconfig. The %%ghost files will handle it
226 #if [ "$1" -ge "1" ]; then
227 # /sbin/service %{name} condrestart > /dev/null 2>&1
229 # We only remove it we this is not an upgrade
230 if [ "$1" = "0" ]; then
231 /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true
232 id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true
236 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
239 %defattr(0644,root,root,0755)
240 %doc README AUTHORS ChangeLog LICENSE
241 %doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
242 %doc doc/webserver/developer-manual
243 %doc doc/webserver/user-manual
244 %doc doc/webserver/faq
245 %doc doc/webserver/p_doc.css doc/webserver/p_web.css doc/webserver/index.html
246 %doc doc/webserver/images
247 %doc doc/webserver/man-page
250 %dir %{privoxyconf}/templates
251 %attr(0744,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
253 %attr(0744,%{name},%{name})%{_sbindir}/%{name}
255 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
256 # We should not use wildchars here. This could mask missing files problems
258 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
259 %config(noreplace) %{privoxyconf}/config
260 %config %{privoxyconf}/standard.action
261 %config(noreplace) %{privoxyconf}/user.action
262 %config %{privoxyconf}/default.action
263 %config %{privoxyconf}/default.filter
264 %config %{privoxyconf}/trust
266 # Please keep these alphabetized so its easier to find one that
268 %config %{privoxyconf}/templates/blocked
269 %config %{privoxyconf}/templates/cgi-error-404
270 %config %{privoxyconf}/templates/cgi-error-bad-param
271 %config %{privoxyconf}/templates/cgi-error-disabled
272 %config %{privoxyconf}/templates/cgi-error-file
273 %config %{privoxyconf}/templates/cgi-error-file-read-only
274 %config %{privoxyconf}/templates/cgi-error-modified
275 %config %{privoxyconf}/templates/cgi-error-parse
276 %config %{privoxyconf}/templates/cgi-style.css
277 %config %{privoxyconf}/templates/connect-failed
278 %config %{privoxyconf}/templates/default
279 %config %{privoxyconf}/templates/edit-actions-add-url-form
280 %config %{privoxyconf}/templates/edit-actions-for-url
281 %config %{privoxyconf}/templates/edit-actions-for-url-filter
282 %config %{privoxyconf}/templates/edit-actions-list
283 %config %{privoxyconf}/templates/edit-actions-list-button
284 %config %{privoxyconf}/templates/edit-actions-list-section
285 %config %{privoxyconf}/templates/edit-actions-list-url
286 %config %{privoxyconf}/templates/edit-actions-remove-url-form
287 %config %{privoxyconf}/templates/edit-actions-url-form
288 %config %{privoxyconf}/templates/mod-local-help
289 %config %{privoxyconf}/templates/mod-support-and-service
290 %config %{privoxyconf}/templates/mod-title
291 %config %{privoxyconf}/templates/mod-unstable-warning
292 %config %{privoxyconf}/templates/no-such-domain
293 %config %{privoxyconf}/templates/show-request
294 %config %{privoxyconf}/templates/show-status
295 %config %{privoxyconf}/templates/show-status-file
296 %config %{privoxyconf}/templates/show-url-info
297 %config %{privoxyconf}/templates/show-version
298 %config %{privoxyconf}/templates/toggle
299 %config %{privoxyconf}/templates/toggle-mini
300 %config %{privoxyconf}/templates/untrusted
302 %config %{_sysconfdir}/logrotate.d/%{name}
303 %config %attr(0744,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
304 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc0.d/K09%{name}
305 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc1.d/K09%{name}
306 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc2.d/S84%{name}
307 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc3.d/S84%{name}
308 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc4.d/K09%{name}
309 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc5.d/S84%{name}
310 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc6.d/K09%{name}
312 %{_mandir}/man1/%{name}.*
315 * Sat May 25 2002 Hal Burgiss <hal@foobox.net>
317 - Add html man page so index.html does not 404.
319 * Fri May 24 2002 Hal Burgiss <hal@foobox.net>
321 - Add another template and alphabetize these for easier tracking.
322 - Add doc/images directory.
324 * Wed May 15 2002 Hal Burgiss <hal@foobox.net>
326 - Add templates/edit-actions-list-button
328 * Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
331 - Adding noreplace for %%{privoxyconf}/config
332 - Included a method to verify if the versions declared on the specfile and
333 configure.in match. Interrupt the build if they don't.
335 * Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
337 - Changing Vendor to Privoxy.Org
339 * Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
341 - Adjust for new *actions files.
343 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
345 - Removed the redhat hack that prevented the user and group from
346 being dealocated. That was a misundestanding of my part regarding
349 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
351 - Using macros to define uid and gid values
354 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
356 - Changes to fixate the uid and gid values as (both) 73. This is a
357 value we hope to standarize for all distributions. RedHat already
358 uses it, and Conectiva should start as soon as I find where the heck
359 I left my cluebat :-)
360 - Only remove the user and group on uninstall if this is not redhat, once
361 redhat likes to have the values allocated even if the package is not
364 * Tue Apr 16 2002 Hal Burgiss <hal@foobox.net>
366 - Add --disable-dynamic-pcre to configure.
368 * Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
370 - Relisting template files on the %%files section
372 * Tue Apr 09 2002 Hal Burgiss <hal@foobox.net>
374 - Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
376 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
378 - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
379 - Remove templates/blocked-compact.
380 - Add more docbook stuff to Builderquires.
382 * Thu Mar 28 2002 Sarantis Paskalis <sarantis@cnl.di.uoa.gr>
384 - Include correct documentation file.
386 * Tue Mar 26 2002 Hal Burgiss <hal@foobox.net>
388 - Fix typo in Description.
390 * Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
392 - Added commentary asking to update the release value on the configure
395 * Tue Mar 25 2002 Hal Burgiss <hal@foobox.net>
397 - Added the missing edit-actions-for-url-filter to templates.
399 * Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
401 - Fixing Release number
403 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
407 * Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@suespammers.org>
409 - Fixed the init files entries. Now we use %%ghost
410 - improved username (and groupname) handling on the %%pre section. By improved
411 I mean: we do it by brute force now. Much easier to maintain. Yeah, you
412 got it right. No more Mr. Nice Guy.
413 - Removed the userdel call on %%post. No need, once it's complety handled on
416 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
417 + junkbusterng-2.9.13-1
418 Added autoheader. Added autoconf to buildrequires.
420 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
421 + junkbusterng-2.9.13-1
422 - Fixed build problems re: name conflicts with man page and logrotate.
423 - Commented out rc?d/* configs for time being, which are causing a build
424 - failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
425 - changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
427 * Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
428 + junkbusterng-2.9.13-1
429 - References to the expression ijb where changed where possible
430 - New package name: junkbusterng (all in lower case, acording to
431 the LSB recomendation)
432 - Version changed to: 2.9.13
434 - Added: junkbuster to obsoletes and conflicts (Not sure this is
435 right. If it obsoletes, why conflict ? Have to check it later)
436 - Summary changed: Stefan, please check and aprove it
437 - Changes description to use the new name
438 - Sed string was NOT changed. Have to wait to the manpage to
440 - Keeping the user junkbuster for now. It will require some aditional
441 changes on the script (scheduled for the next specfile release)
442 - Added post entry to move the old logfile to the new log directory
443 - Removing "chkconfig --add" entry (not good to have it automaticaly
444 added to the startup list).
445 - Added preun section to stop the service with the old name, as well
446 as remove it from the startup list
447 - Removed the chkconfig --del entry from the conditional block on
448 the preun scriptlet (now handled on the %files section)
450 * Thu Mar 21 2002 Hal Burgiss <hal@foobox.net>
451 - added ijb_docs.css to docs.
453 * Mon Mar 11 2002 Hal Burgiss <hal@foobox.net>
454 + junkbuster-2.9.11-8
455 - Take out --enable-no-gifs, breaks some browsers.
457 * Sun Mar 10 2002 Hal Burgiss <hal@foobox.net>
458 + junkbuster-2.9.11-8
459 - Add --enable-no-gifs to configure.
461 * Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
462 + junkbuster-2.9.11-7
463 - Added BuildRequires to libtool.
465 * Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
466 + junkbuster-2.9.11-6
467 - Changed the routined that handle the junkbust and junkbuster users on
468 %%pre and %%post to work in a smoother manner
469 - %%files now uses hardcoded usernames, to avoid problems with package
470 name changes in the future
472 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
473 + junkbuster-2.9.11-5
474 - Added "make redhat-dok" to the build process
475 - Added docbook-utils to BuildRequires
477 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
478 + junkbuster-2.9.11-4
479 - Changing man section in the manpage from 1 to 8
480 - We now require packages, not files, to avoid issues with apt
482 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
483 + junkbuster-2.9.11-3
484 - Fixing permissions of the init script
486 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
487 + junkbuster-2.9.11-2
488 - General specfile fixup, using the best recomended practices, including:
489 - Adding -q to %%setup
490 - Using macros whereever possible
491 - Not using wildchars on %%files section
492 - Doubling the percentage char on changelog and comments, to
493 avoid rpm expanding them
495 * Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
496 - /bin/false for shell causes init script to fail. Reverting.
498 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
499 - Removed UID 73. Included user-manual and developer-manual in docs.
500 Include other actions files. Default shell is now /bin/false.
501 Userdel user=junkbust. ChangeLog was not zipped. Removed
502 RPM_OPT_FLAGS kludge.
504 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
505 - add paranoia check for 'rm -rf %%{buildroot}'
506 - add gzip to 'BuildRequires'
508 * Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
509 - actionsfile is now ijb.action.
511 * Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
513 - Add more documents for installation
514 - Add version string to name and source
516 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
517 - Back to user 'junkbuster' and fix configure macro.
519 * Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
520 - More changes for user 'junkbust'. Init script had 'junkbuster'.
522 * Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
523 - Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
524 - Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
526 * Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
527 - Added $RPM_OPT_FLAGS support, renaming of old logfile, and
528 - made sure no default shell exists for user junkbust.
530 * Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
533 * Mon Sep 25 2000 Stefan Waldherr <stefan@waldherr.org>
534 - CLF Logging patch by davep@cyw.uklinux.net
535 - Hal DeVore <haldevore@earthling.net> fix akamaitech in blocklist
537 * Sun Sep 17 2000 Stefan Waldherr <stefan@waldherr.org>
538 - Steve Kemp skx@tardis.ed.ac.uk's javascript popup patch.
539 - Markus Breitenbach breitenb@rbg.informatik.tu-darmstadt.de supplied
540 numerous fixes and enhancements for Steve's patch.
541 - adamlock@netscape.com (Adam Lock) in the windows version:
542 - Taskbar activity spinner always spins even when logging is
543 turned off (which is the default) - people who don't
544 like the spinner can turn it off from a menu option.
545 - Taskbar popup menu has a options submenu - people can now
546 open the settings files for cookies, blockers etc.
547 without opening the JB window.
548 - Logging functionality works again
549 - Buffer overflow is fixed - new code uses a bigger buffer
550 and snprintf so it shouldn't overflow anymore.
551 - Fixed userid swa, group learning problem while installing.
553 - Added patch by Benjamin Low <ben@snrc.uow.edu.au> that prevents JB to
554 core dump when there is no log file.
555 - Tweaked SuSE startup with the help of mohataj@gmx.net and Doc.B@gmx.de.
556 - Fixed man page to include imagefile and popupfile.
557 - Sanity check for the statistics function added.
558 - "Patrick D'Cruze" <pdcruze@orac.iinet.net.au>: It seems Microsoft
559 are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
560 With IIS/5, it appears to omit the trailing \r\n from http header
561 only messages. eg, when I visit http://www.hotmail.com, IIS/5
562 responds with a HTTP 302 redirect header. However, this header
563 message is missing the trailing \r\n. IIS/5 then closes the
564 connection. Junkbuster, unfortunately, discards the header becomes
565 it thinks it is incomplete - and it is. MS have transmitted an
567 - Added bug reports and patch submission forms in the docs.
569 * Mon Mar 20 2000 Stefan Waldherr <stefan@waldherr.org>
570 Andrew <anw@tirana.freewire.co.uk> extended the JB:
571 Display of statistics of the total number of requests and the number
572 of requests filtered by junkbuster, also the percentage of requests
573 filtered. Suppression of the listing of files on the proxy-args page.
574 All stuff optional and configurable.
576 * Sun Sep 12 1999 Stefan Waldherr <stefan@waldherr.org>
577 Jan Willamowius (jan@janhh.shnet.org) fixed a bug in the
578 code which prevented the JB from handling URLs of the form
579 user:password@www.foo.com. Fixed.
581 * Mon Aug 2 1999 Stefan Waldherr <stefan@waldherr.org>
582 Blank images are no longer cached, thanks to a hint from Markus
583 Breitenbach <breitenb@rbg.informatik.tu-darmstadt.de>. The user
584 agent is NO longer set by the Junkbuster. Sadly, many sites depend
585 on the correct browser version nowadays. Incorporated many
586 suggestions from Jan "Yenya" Kasprzak <kas@fi.muni.cz> for the
587 spec file. Fixed logging problem and since runlevel 2 does not
588 use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
589 /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
590 <walker@netgate.net>. You should now be able to build this RPM as
591 a non-root user (mathias@weidner.sem.lipsia.de).
593 * Sun Jan 31 1999 Stefan Waldherr <stefan@waldherr.org>
594 %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
595 to allow more sophisticated matching of blocked images. Logrotate
596 logfile. Added files for auto-updating the blocklist et al.
598 * Wed Dec 16 1998 Stefan Waldherr <stefan@waldherr.org>
599 Configure blank version via config file. No separate blank
600 version anymore. Added Roland's <roland@spinnaker.rhein.de>
601 patch to show a logo instead of a blank area. Added a suggestion
602 from Alex <alex@cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
603 More regexps in the blocklist. Prepared the forwardfile for
604 squid. Extended image regexp with help from gabriel
605 <somlo@CS.ColoState.EDU>.
607 * Thu Nov 19 1998 Stefan Waldherr <stefan@waldherr.org>
608 All RPMs now identify themselves in the show-proxy-args page.
609 Released Windoze version. Run junkbuster as nobody instead of
612 * Fri Oct 30 1998 Stefan Waldherr <stefan@waldherr.org>
613 Newest version. First release (hence the little version number
614 mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
615 security over 2.0.1; some multi-user sites will need to change
616 the listen-address in the configuration file. The blank version of
617 the Internet Junkbuster has a more sophisticated way of replacing
618 images. All RPMs identify themselves in the show-proxy-args page.
620 * Thu Sep 23 1998 Stefan Waldherr <stefan@waldherr.org>
621 Modified the blocking feature, so that only GIFs and JPEGs are
622 blocked and replaced but not HTML pages. Thanks to
623 "Gerd Flender" <plgerd@informatik.uni-siegen.de> for this nice
624 idea. Added numerous stuff to the blocklist. Keep patches in
625 seperate files and no longer in diffs (easier to maintain).
627 * Tue Jun 16 1998 Stefan Waldherr <swa@cs.cmu.edu>
628 Moved config files to /etc/junkbuster directory, moved man page,
629 added BuildRoot directive (Thanks to Alexey Nogin <ayn2@cornell.edu>)
630 Made new version junkbuster-raw (which is only a stripped version of
631 the junkuster rpm, i.e. without my blocklist, etc.)
633 * Tue Jun 16 1998 (2.0-1)
634 Uhm, not that much. Just a new junkbuster version that
635 fixes a couple of bugs ... and of course a bigger
636 blocklist with the unique Now-less-ads-than-ever(SM)
638 Oh, one thing: I changed the default user agent to Linux -- no
639 need anymore to support Apple.
641 * Tue Jun 16 1998 (2.0-0)
642 Now-less-ads-than-ever (SM)
643 compiled with gcc instead of cc
644 compiled with -O3, thus it should be a little faster
645 show-proxy-args now works
646 /etc/junkbuster.init wasn't necessary
648 * Tue Jun 16 1998 (1.4)
649 some more config files were put into /etc
650 The junkbuster-blank rpm returns a 1x1 pixel image, that gets
651 displayed by Netscape instead of the blocked image.
652 Read http://www.waldherr.org/junkbuster/ for
655 * Tue Jun 16 1998 (1.3)
656 The program has been moved to /usr/sbin (from /usr/local/bin)
657 Init- and stopscripts (/etc/rc.d/rc*) have been added so
658 that the junkbuster starts automatically during bootup.
659 The /etc/blocklist file is much more sophisticated. Theoretically
660 one should e.g. browse all major US and German newspapers without
661 seeing one annoying ad.
662 junkbuster.init was modified. It now starts junkbuster with an
663 additional "-r @" flag.
665 # $Log: privoxy-rh.spec,v $
666 # Revision 1.33 2002/05/25 02:08:23 hal9
667 # Add doc/images directory.
668 # Redhat: alphabetized list of templates (and I think added one in the process)
670 # Revision 1.32 2002/05/16 01:37:29 hal9
671 # Add new template file so CGI stuff works :)
673 # Revision 1.31 2002/05/03 17:14:35 morcego
674 # *.spec: Version bump to 2.9.15
675 # -rh.spec: noreplace for %%{privoxyconf}/config
676 # Will interrupt the build if versions from configure.in and
677 # specfile do not match
679 # Revision 1.30 2002/04/26 15:51:05 morcego
680 # Changing Vendor value to Privoxy.Org
682 # Revision 1.29 2002/04/24 03:13:51 hal9
683 # New actions files changes.
685 # Revision 1.28 2002/04/22 18:51:33 morcego
686 # user and group now get removed on rh too.
688 # Revision 1.27 2002/04/22 16:32:31 morcego
689 # configure.in, *.spec: Bumping release to 2 (2.9.14-2)
690 # -rh.spec: uid and gid are now macros
691 # -suse.spec: Changing the header Copyright to License (Copyright is
694 # Revision 1.26 2002/04/22 16:24:36 morcego
695 # - Changes to fixate the uid and gid values as (both) 73. This is a
696 # value we hope to standarize for all distributions. RedHat already
697 # uses it, and Conectiva should start as soon as I find where the heck
698 # I left my cluebat :-)
699 # - Only remove the user and group on uninstall if this is not redhat, once
700 # redhat likes to have the values allocated even if the package is not
703 # Revision 1.25 2002/04/17 01:59:12 hal9
704 # Add --disable-dynamic-pcre.
706 # Revision 1.24 2002/04/11 10:09:20 oes
709 # Revision 1.23 2002/04/10 18:14:45 morcego
710 # - (privoxy-rh.spec only) Relisting template files on the %%files section
711 # - (configure.in, privoxy-rh.spec) Bumped package release to 5
713 # Revision 1.22 2002/04/09 22:06:12 hal9
716 # Revision 1.21 2002/04/09 02:52:26 hal9
717 # - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
718 # - Remove templates/blocked-compact.
719 # - Add more docbook stuff to Buildrequires.
721 # Revision 1.20 2002/04/08 20:27:45 swa
724 # Revision 1.19 2002/03/27 22:44:59 sarantis
725 # Include correct documentation file.
727 # Revision 1.18 2002/03/27 22:10:14 sarantis
728 # bumped Hal's last commit 1 day to the future to make rpm build again.
730 # Revision 1.17 2002/03/27 00:48:23 hal9
733 # Revision 1.16 2002/03/26 22:29:55 swa
734 # we have a new homepage!
736 # Revision 1.15 2002/03/26 17:39:54 morcego
737 # Adding comment on the specfile to remember the packager to update
738 # the release number on the configure script
740 # Revision 1.14 2002/03/26 14:25:15 hal9
741 # Added edit-actions-for-url-filter to templates in %%config
743 # Revision 1.13 2002/03/25 13:31:04 morcego
744 # Bumping Release tag.
746 # Revision 1.12 2002/03/25 03:11:40 hal9
747 # Do it right way this time :/
749 # Revision 1.11 2002/03/25 03:09:51 hal9
752 # Revision 1.10 2002/03/24 22:16:14 morcego
753 # Just removing some old commentaries.
755 # Revision 1.9 2002/03/24 22:03:22 morcego
756 # Should be working now. See %changelog for details
758 # Revision 1.8 2002/03/24 21:13:01 morcego
761 # Revision 1.7 2002/03/24 21:07:18 hal9
762 # Add autoheader, etc.
764 # Revision 1.6 2002/03/24 19:56:40 hal9
765 # /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
767 # Revision 1.4 2002/03/24 13:32:42 swa
768 # name change related issues
770 # Revision 1.3 2002/03/24 12:56:21 swa
771 # name change related issues.
773 # Revision 1.2 2002/03/24 11:40:14 swa
776 # Revision 1.1 2002/03/24 11:23:44 swa
779 # Revision 1.1 2002/03/22 20:53:03 morcego
780 # - Ongoing process to change name to JunkbusterNG
781 # - configure/configure.in: no change needed
783 # - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
784 # - PROGRAM = jbng@EXEEXT@
785 # - rh-spec now references as junkbusterng-rh.spec
786 # - redhat-upload: references changed to junkbusterng-* (package names)
787 # - tarball-dist: references changed to JunkbusterNG-distribution-*
788 # - tarball-src: now JunkbusterNG-*
789 # - install: initscript now junkbusterng.init and junkbusterng (when
791 # - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
792 # - junkbusterng.spec:
793 # - References to the expression ijb where changed where possible
794 # - New package name: junkbusterng (all in lower case, acording to
795 # the LSB recomendation)
796 # - Version changed to: 2.9.13
798 # - Added: junkbuster to obsoletes and conflicts (Not sure this is
799 # right. If it obsoletes, why conflict ? Have to check it later)
800 # - Summary changed: Stefan, please check and aprove it
801 # - Changes description to use the new name
802 # - Sed string was NOT changed. Have to wait to the manpage to
804 # - Keeping the user junkbuster for now. It will require some aditional
805 # changes on the script (scheduled for the next specfile release)
806 # - Added post entry to move the old logfile to the new log directory
807 # - Removing "chkconfig --add" entry (not good to have it automaticaly
808 # added to the startup list).
809 # - Added preun section to stop the service with the old name, as well
810 # as remove it from the startup list
811 # - Removed the chkconfig --del entry from the conditional block on
812 # the preun scriptlet (now handled on the %files section)
813 # - junkbuster.init: renamed to junkbusterng.init
814 # - junkbusterng.init:
815 # - Changed JB_BIN to jbng
816 # - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
817 # be used where necessary (config dir)
820 # - The config directory is /etc/junkbuster yet. Have to change it on the
821 # specfile, after it is changes on the code
822 # - The only files that got renamed on the cvs tree were the rh specfile and
823 # the init file. Some file references got changes on the makefile and on the
824 # rh-spec (as listed above)
826 # Revision 1.43 2002/03/21 16:04:10 hal9
827 # added ijb_docs.css to %doc
829 # Revision 1.42 2002/03/12 13:41:18 sarantis
830 # remove hard-coded "ijbswa" string in build phase
832 # Revision 1.41 2002/03/11 22:58:32 hal9
833 # Remove --enable-no-gifs
835 # Revision 1.39 2002/03/08 18:57:29 swa
836 # remove user junkbuster after de-installation.
838 # Revision 1.38 2002/03/08 13:45:27 morcego
839 # Adding libtool to Buildrequires
841 # Revision 1.37 2002/03/07 19:23:49 swa
842 # i hate to scroll. suse: wrong configdir.
844 # Revision 1.36 2002/03/07 05:06:54 morcego
845 # Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
847 # Revision 1.34 2002/03/07 00:11:57 morcego
848 # Few changes on the %pre and %post sections of the rh specfile to handle
849 # usernames more cleanly
851 # Revision 1.33 2002/03/05 13:13:57 morcego
852 # - Added "make redhat-dok" to the build phase
853 # - Added docbook-utils to BuildRequires
855 # Revision 1.32 2002/03/05 12:34:24 morcego
856 # - Changing section internaly on the manpage from 1 to 8
857 # - We now require packages, not files, to avoid issues with apt
859 # Revision 1.31 2002/03/04 18:06:09 morcego
860 # SPECFILE: fixing permissing of the init script (broken by the last change)
862 # Revision 1.30 2002/03/04 16:18:03 morcego
863 # General cleanup of the rh specfile.
866 # * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
867 # + junkbuster-2.9.11-2
868 # - General specfile fixup, using the best recomended practices, including:
869 # - Adding -q to %%setup
870 # - Using macros whereever possible
871 # - Not using wildchars on %%files section
872 # - Doubling the percentage char on changelog and comments, to
873 # avoid rpm expanding them
875 # Revision 1.29 2002/03/03 19:21:22 hal9
876 # Init script fails if shell is /bin/false.
878 # Revision 1.28 2002/01/09 18:34:03 hal9
881 # Revision 1.27 2002/01/09 18:32:02 hal9
882 # Removed RPM_OPT_FLAGS kludge.
884 # Revision 1.26 2002/01/09 18:21:10 hal9
885 # A few minor updates.
887 # Revision 1.25 2001/12/28 01:45:36 steudten
888 # Add paranoia check and BuildReq: gzip
890 # Revision 1.24 2001/12/01 21:43:14 hal9
891 # Allowed for new ijb.action file.
893 # Revision 1.23 2001/11/06 12:09:03 steudten
894 # Compress doc files. Install README and AUTHORS at last as document.
896 # Revision 1.22 2001/11/05 21:37:34 steudten
897 # Fix to include the actual version for name.
898 # Let the 'real' packager be included - sorry stefan.
900 # Revision 1.21 2001/10/31 19:27:27 swa
901 # consistent description. new name for suse since
902 # we had troubles with rpms of identical names
905 # Revision 1.20 2001/10/24 15:45:49 hal9
906 # To keep Thomas happy (aka correcting my mistakes)
908 # Revision 1.19 2001/10/15 03:23:59 hal9
911 # Revision 1.17 2001/10/10 18:59:28 hal9
912 # Minor change for init script.
914 # Revision 1.16 2001/09/24 20:56:23 hal9
917 # Revision 1.13 2001/09/10 17:44:43 swa
918 # integrate three pieces of documentation. needs work.
919 # will not build cleanly under redhat.
921 # Revision 1.12 2001/09/10 16:25:04 swa
922 # copy all templates. version updated.
924 # Revision 1.11 2001/07/03 11:00:25 sarantis
925 # replaced permissionsfile with actionsfile
927 # Revision 1.10 2001/07/03 09:34:44 sarantis
928 # bumped up version number.
930 # Revision 1.9 2001/06/12 18:15:29 swa
931 # the %% in front of configure (see tag below) confused
932 # the rpm build process on 7.1.
934 # Revision 1.8 2001/06/12 17:15:56 swa
935 # fixes, because a clean build on rh6.1 was impossible.
936 # GZIP confuses make, %% configure confuses rpm, etc.
938 # Revision 1.7 2001/06/11 12:17:26 sarantis
941 # Revision 1.6 2001/06/11 11:28:25 sarantis
942 # Further optimizations and adaptations in the spec file.
944 # Revision 1.5 2001/06/09 09:14:11 swa
945 # shamelessly adapted RPM stuff from the newest rpm that
946 # RedHat provided for the JB.
948 # Revision 1.4 2001/06/08 20:54:18 swa
949 # type with status file. remove forward et. al from file list.
951 # Revision 1.3 2001/06/07 17:28:10 swa
954 # Revision 1.2 2001/06/04 18:31:58 swa
955 # files are now prefixed with either `confdir' or `logdir'.
956 # `make redhat-dist' replaces both entries confdir and logdir
959 # Revision 1.1 2001/06/04 10:44:57 swa
960 # `make redhatr-dist' now works. Except for the paths
961 # in the config file.