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 * Fri May 24 2002 Hal Burgiss <hal@foobox.net>
317 - Add another template and alphabetize these for easier tracking.
318 - Add doc/images directory.
320 * Wed May 15 2002 Hal Burgiss <hal@foobox.net>
322 - Add templates/edit-actions-list-button
324 * Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
327 - Adding noreplace for %%{privoxyconf}/config
328 - Included a method to verify if the versions declared on the specfile and
329 configure.in match. Interrupt the build if they don't.
331 * Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
333 - Changing Vendor to Privoxy.Org
335 * Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
337 - Adjust for new *actions files.
339 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
341 - Removed the redhat hack that prevented the user and group from
342 being dealocated. That was a misundestanding of my part regarding
345 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
347 - Using macros to define uid and gid values
350 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
352 - Changes to fixate the uid and gid values as (both) 73. This is a
353 value we hope to standarize for all distributions. RedHat already
354 uses it, and Conectiva should start as soon as I find where the heck
355 I left my cluebat :-)
356 - Only remove the user and group on uninstall if this is not redhat, once
357 redhat likes to have the values allocated even if the package is not
360 * Tue Apr 16 2002 Hal Burgiss <hal@foobox.net>
362 - Add --disable-dynamic-pcre to configure.
364 * Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
366 - Relisting template files on the %%files section
368 * Tue Apr 09 2002 Hal Burgiss <hal@foobox.net>
370 - Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
372 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
374 - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
375 - Remove templates/blocked-compact.
376 - Add more docbook stuff to Builderquires.
378 * Thu Mar 28 2002 Sarantis Paskalis <sarantis@cnl.di.uoa.gr>
380 - Include correct documentation file.
382 * Tue Mar 26 2002 Hal Burgiss <hal@foobox.net>
384 - Fix typo in Description.
386 * Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
388 - Added commentary asking to update the release value on the configure
391 * Tue Mar 25 2002 Hal Burgiss <hal@foobox.net>
393 - Added the missing edit-actions-for-url-filter to templates.
395 * Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
397 - Fixing Release number
399 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
403 * Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@suespammers.org>
405 - Fixed the init files entries. Now we use %%ghost
406 - improved username (and groupname) handling on the %%pre section. By improved
407 I mean: we do it by brute force now. Much easier to maintain. Yeah, you
408 got it right. No more Mr. Nice Guy.
409 - Removed the userdel call on %%post. No need, once it's complety handled on
412 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
413 + junkbusterng-2.9.13-1
414 Added autoheader. Added autoconf to buildrequires.
416 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
417 + junkbusterng-2.9.13-1
418 - Fixed build problems re: name conflicts with man page and logrotate.
419 - Commented out rc?d/* configs for time being, which are causing a build
420 - failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
421 - changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
423 * Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
424 + junkbusterng-2.9.13-1
425 - References to the expression ijb where changed where possible
426 - New package name: junkbusterng (all in lower case, acording to
427 the LSB recomendation)
428 - Version changed to: 2.9.13
430 - Added: junkbuster to obsoletes and conflicts (Not sure this is
431 right. If it obsoletes, why conflict ? Have to check it later)
432 - Summary changed: Stefan, please check and aprove it
433 - Changes description to use the new name
434 - Sed string was NOT changed. Have to wait to the manpage to
436 - Keeping the user junkbuster for now. It will require some aditional
437 changes on the script (scheduled for the next specfile release)
438 - Added post entry to move the old logfile to the new log directory
439 - Removing "chkconfig --add" entry (not good to have it automaticaly
440 added to the startup list).
441 - Added preun section to stop the service with the old name, as well
442 as remove it from the startup list
443 - Removed the chkconfig --del entry from the conditional block on
444 the preun scriptlet (now handled on the %files section)
446 * Thu Mar 21 2002 Hal Burgiss <hal@foobox.net>
447 - added ijb_docs.css to docs.
449 * Mon Mar 11 2002 Hal Burgiss <hal@foobox.net>
450 + junkbuster-2.9.11-8
451 - Take out --enable-no-gifs, breaks some browsers.
453 * Sun Mar 10 2002 Hal Burgiss <hal@foobox.net>
454 + junkbuster-2.9.11-8
455 - Add --enable-no-gifs to configure.
457 * Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
458 + junkbuster-2.9.11-7
459 - Added BuildRequires to libtool.
461 * Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
462 + junkbuster-2.9.11-6
463 - Changed the routined that handle the junkbust and junkbuster users on
464 %%pre and %%post to work in a smoother manner
465 - %%files now uses hardcoded usernames, to avoid problems with package
466 name changes in the future
468 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
469 + junkbuster-2.9.11-5
470 - Added "make redhat-dok" to the build process
471 - Added docbook-utils to BuildRequires
473 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
474 + junkbuster-2.9.11-4
475 - Changing man section in the manpage from 1 to 8
476 - We now require packages, not files, to avoid issues with apt
478 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
479 + junkbuster-2.9.11-3
480 - Fixing permissions of the init script
482 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
483 + junkbuster-2.9.11-2
484 - General specfile fixup, using the best recomended practices, including:
485 - Adding -q to %%setup
486 - Using macros whereever possible
487 - Not using wildchars on %%files section
488 - Doubling the percentage char on changelog and comments, to
489 avoid rpm expanding them
491 * Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
492 - /bin/false for shell causes init script to fail. Reverting.
494 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
495 - Removed UID 73. Included user-manual and developer-manual in docs.
496 Include other actions files. Default shell is now /bin/false.
497 Userdel user=junkbust. ChangeLog was not zipped. Removed
498 RPM_OPT_FLAGS kludge.
500 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
501 - add paranoia check for 'rm -rf %%{buildroot}'
502 - add gzip to 'BuildRequires'
504 * Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
505 - actionsfile is now ijb.action.
507 * Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
509 - Add more documents for installation
510 - Add version string to name and source
512 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
513 - Back to user 'junkbuster' and fix configure macro.
515 * Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
516 - More changes for user 'junkbust'. Init script had 'junkbuster'.
518 * Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
519 - Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
520 - Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
522 * Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
523 - Added $RPM_OPT_FLAGS support, renaming of old logfile, and
524 - made sure no default shell exists for user junkbust.
526 * Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
529 * Mon Sep 25 2000 Stefan Waldherr <stefan@waldherr.org>
530 - CLF Logging patch by davep@cyw.uklinux.net
531 - Hal DeVore <haldevore@earthling.net> fix akamaitech in blocklist
533 * Sun Sep 17 2000 Stefan Waldherr <stefan@waldherr.org>
534 - Steve Kemp skx@tardis.ed.ac.uk's javascript popup patch.
535 - Markus Breitenbach breitenb@rbg.informatik.tu-darmstadt.de supplied
536 numerous fixes and enhancements for Steve's patch.
537 - adamlock@netscape.com (Adam Lock) in the windows version:
538 - Taskbar activity spinner always spins even when logging is
539 turned off (which is the default) - people who don't
540 like the spinner can turn it off from a menu option.
541 - Taskbar popup menu has a options submenu - people can now
542 open the settings files for cookies, blockers etc.
543 without opening the JB window.
544 - Logging functionality works again
545 - Buffer overflow is fixed - new code uses a bigger buffer
546 and snprintf so it shouldn't overflow anymore.
547 - Fixed userid swa, group learning problem while installing.
549 - Added patch by Benjamin Low <ben@snrc.uow.edu.au> that prevents JB to
550 core dump when there is no log file.
551 - Tweaked SuSE startup with the help of mohataj@gmx.net and Doc.B@gmx.de.
552 - Fixed man page to include imagefile and popupfile.
553 - Sanity check for the statistics function added.
554 - "Patrick D'Cruze" <pdcruze@orac.iinet.net.au>: It seems Microsoft
555 are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
556 With IIS/5, it appears to omit the trailing \r\n from http header
557 only messages. eg, when I visit http://www.hotmail.com, IIS/5
558 responds with a HTTP 302 redirect header. However, this header
559 message is missing the trailing \r\n. IIS/5 then closes the
560 connection. Junkbuster, unfortunately, discards the header becomes
561 it thinks it is incomplete - and it is. MS have transmitted an
563 - Added bug reports and patch submission forms in the docs.
565 * Mon Mar 20 2000 Stefan Waldherr <stefan@waldherr.org>
566 Andrew <anw@tirana.freewire.co.uk> extended the JB:
567 Display of statistics of the total number of requests and the number
568 of requests filtered by junkbuster, also the percentage of requests
569 filtered. Suppression of the listing of files on the proxy-args page.
570 All stuff optional and configurable.
572 * Sun Sep 12 1999 Stefan Waldherr <stefan@waldherr.org>
573 Jan Willamowius (jan@janhh.shnet.org) fixed a bug in the
574 code which prevented the JB from handling URLs of the form
575 user:password@www.foo.com. Fixed.
577 * Mon Aug 2 1999 Stefan Waldherr <stefan@waldherr.org>
578 Blank images are no longer cached, thanks to a hint from Markus
579 Breitenbach <breitenb@rbg.informatik.tu-darmstadt.de>. The user
580 agent is NO longer set by the Junkbuster. Sadly, many sites depend
581 on the correct browser version nowadays. Incorporated many
582 suggestions from Jan "Yenya" Kasprzak <kas@fi.muni.cz> for the
583 spec file. Fixed logging problem and since runlevel 2 does not
584 use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
585 /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
586 <walker@netgate.net>. You should now be able to build this RPM as
587 a non-root user (mathias@weidner.sem.lipsia.de).
589 * Sun Jan 31 1999 Stefan Waldherr <stefan@waldherr.org>
590 %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
591 to allow more sophisticated matching of blocked images. Logrotate
592 logfile. Added files for auto-updating the blocklist et al.
594 * Wed Dec 16 1998 Stefan Waldherr <stefan@waldherr.org>
595 Configure blank version via config file. No separate blank
596 version anymore. Added Roland's <roland@spinnaker.rhein.de>
597 patch to show a logo instead of a blank area. Added a suggestion
598 from Alex <alex@cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
599 More regexps in the blocklist. Prepared the forwardfile for
600 squid. Extended image regexp with help from gabriel
601 <somlo@CS.ColoState.EDU>.
603 * Thu Nov 19 1998 Stefan Waldherr <stefan@waldherr.org>
604 All RPMs now identify themselves in the show-proxy-args page.
605 Released Windoze version. Run junkbuster as nobody instead of
608 * Fri Oct 30 1998 Stefan Waldherr <stefan@waldherr.org>
609 Newest version. First release (hence the little version number
610 mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
611 security over 2.0.1; some multi-user sites will need to change
612 the listen-address in the configuration file. The blank version of
613 the Internet Junkbuster has a more sophisticated way of replacing
614 images. All RPMs identify themselves in the show-proxy-args page.
616 * Thu Sep 23 1998 Stefan Waldherr <stefan@waldherr.org>
617 Modified the blocking feature, so that only GIFs and JPEGs are
618 blocked and replaced but not HTML pages. Thanks to
619 "Gerd Flender" <plgerd@informatik.uni-siegen.de> for this nice
620 idea. Added numerous stuff to the blocklist. Keep patches in
621 seperate files and no longer in diffs (easier to maintain).
623 * Tue Jun 16 1998 Stefan Waldherr <swa@cs.cmu.edu>
624 Moved config files to /etc/junkbuster directory, moved man page,
625 added BuildRoot directive (Thanks to Alexey Nogin <ayn2@cornell.edu>)
626 Made new version junkbuster-raw (which is only a stripped version of
627 the junkuster rpm, i.e. without my blocklist, etc.)
629 * Tue Jun 16 1998 (2.0-1)
630 Uhm, not that much. Just a new junkbuster version that
631 fixes a couple of bugs ... and of course a bigger
632 blocklist with the unique Now-less-ads-than-ever(SM)
634 Oh, one thing: I changed the default user agent to Linux -- no
635 need anymore to support Apple.
637 * Tue Jun 16 1998 (2.0-0)
638 Now-less-ads-than-ever (SM)
639 compiled with gcc instead of cc
640 compiled with -O3, thus it should be a little faster
641 show-proxy-args now works
642 /etc/junkbuster.init wasn't necessary
644 * Tue Jun 16 1998 (1.4)
645 some more config files were put into /etc
646 The junkbuster-blank rpm returns a 1x1 pixel image, that gets
647 displayed by Netscape instead of the blocked image.
648 Read http://www.waldherr.org/junkbuster/ for
651 * Tue Jun 16 1998 (1.3)
652 The program has been moved to /usr/sbin (from /usr/local/bin)
653 Init- and stopscripts (/etc/rc.d/rc*) have been added so
654 that the junkbuster starts automatically during bootup.
655 The /etc/blocklist file is much more sophisticated. Theoretically
656 one should e.g. browse all major US and German newspapers without
657 seeing one annoying ad.
658 junkbuster.init was modified. It now starts junkbuster with an
659 additional "-r @" flag.
661 # $Log: privoxy-rh.spec,v $
662 # Revision 1.33 2002/05/25 02:08:23 hal9
663 # Add doc/images directory.
664 # Redhat: alphabetized list of templates (and I think added one in the process)
666 # Revision 1.32 2002/05/16 01:37:29 hal9
667 # Add new template file so CGI stuff works :)
669 # Revision 1.31 2002/05/03 17:14:35 morcego
670 # *.spec: Version bump to 2.9.15
671 # -rh.spec: noreplace for %%{privoxyconf}/config
672 # Will interrupt the build if versions from configure.in and
673 # specfile do not match
675 # Revision 1.30 2002/04/26 15:51:05 morcego
676 # Changing Vendor value to Privoxy.Org
678 # Revision 1.29 2002/04/24 03:13:51 hal9
679 # New actions files changes.
681 # Revision 1.28 2002/04/22 18:51:33 morcego
682 # user and group now get removed on rh too.
684 # Revision 1.27 2002/04/22 16:32:31 morcego
685 # configure.in, *.spec: Bumping release to 2 (2.9.14-2)
686 # -rh.spec: uid and gid are now macros
687 # -suse.spec: Changing the header Copyright to License (Copyright is
690 # Revision 1.26 2002/04/22 16:24:36 morcego
691 # - Changes to fixate the uid and gid values as (both) 73. This is a
692 # value we hope to standarize for all distributions. RedHat already
693 # uses it, and Conectiva should start as soon as I find where the heck
694 # I left my cluebat :-)
695 # - Only remove the user and group on uninstall if this is not redhat, once
696 # redhat likes to have the values allocated even if the package is not
699 # Revision 1.25 2002/04/17 01:59:12 hal9
700 # Add --disable-dynamic-pcre.
702 # Revision 1.24 2002/04/11 10:09:20 oes
705 # Revision 1.23 2002/04/10 18:14:45 morcego
706 # - (privoxy-rh.spec only) Relisting template files on the %%files section
707 # - (configure.in, privoxy-rh.spec) Bumped package release to 5
709 # Revision 1.22 2002/04/09 22:06:12 hal9
712 # Revision 1.21 2002/04/09 02:52:26 hal9
713 # - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
714 # - Remove templates/blocked-compact.
715 # - Add more docbook stuff to Buildrequires.
717 # Revision 1.20 2002/04/08 20:27:45 swa
720 # Revision 1.19 2002/03/27 22:44:59 sarantis
721 # Include correct documentation file.
723 # Revision 1.18 2002/03/27 22:10:14 sarantis
724 # bumped Hal's last commit 1 day to the future to make rpm build again.
726 # Revision 1.17 2002/03/27 00:48:23 hal9
729 # Revision 1.16 2002/03/26 22:29:55 swa
730 # we have a new homepage!
732 # Revision 1.15 2002/03/26 17:39:54 morcego
733 # Adding comment on the specfile to remember the packager to update
734 # the release number on the configure script
736 # Revision 1.14 2002/03/26 14:25:15 hal9
737 # Added edit-actions-for-url-filter to templates in %%config
739 # Revision 1.13 2002/03/25 13:31:04 morcego
740 # Bumping Release tag.
742 # Revision 1.12 2002/03/25 03:11:40 hal9
743 # Do it right way this time :/
745 # Revision 1.11 2002/03/25 03:09:51 hal9
748 # Revision 1.10 2002/03/24 22:16:14 morcego
749 # Just removing some old commentaries.
751 # Revision 1.9 2002/03/24 22:03:22 morcego
752 # Should be working now. See %changelog for details
754 # Revision 1.8 2002/03/24 21:13:01 morcego
757 # Revision 1.7 2002/03/24 21:07:18 hal9
758 # Add autoheader, etc.
760 # Revision 1.6 2002/03/24 19:56:40 hal9
761 # /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
763 # Revision 1.4 2002/03/24 13:32:42 swa
764 # name change related issues
766 # Revision 1.3 2002/03/24 12:56:21 swa
767 # name change related issues.
769 # Revision 1.2 2002/03/24 11:40:14 swa
772 # Revision 1.1 2002/03/24 11:23:44 swa
775 # Revision 1.1 2002/03/22 20:53:03 morcego
776 # - Ongoing process to change name to JunkbusterNG
777 # - configure/configure.in: no change needed
779 # - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
780 # - PROGRAM = jbng@EXEEXT@
781 # - rh-spec now references as junkbusterng-rh.spec
782 # - redhat-upload: references changed to junkbusterng-* (package names)
783 # - tarball-dist: references changed to JunkbusterNG-distribution-*
784 # - tarball-src: now JunkbusterNG-*
785 # - install: initscript now junkbusterng.init and junkbusterng (when
787 # - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
788 # - junkbusterng.spec:
789 # - References to the expression ijb where changed where possible
790 # - New package name: junkbusterng (all in lower case, acording to
791 # the LSB recomendation)
792 # - Version changed to: 2.9.13
794 # - Added: junkbuster to obsoletes and conflicts (Not sure this is
795 # right. If it obsoletes, why conflict ? Have to check it later)
796 # - Summary changed: Stefan, please check and aprove it
797 # - Changes description to use the new name
798 # - Sed string was NOT changed. Have to wait to the manpage to
800 # - Keeping the user junkbuster for now. It will require some aditional
801 # changes on the script (scheduled for the next specfile release)
802 # - Added post entry to move the old logfile to the new log directory
803 # - Removing "chkconfig --add" entry (not good to have it automaticaly
804 # added to the startup list).
805 # - Added preun section to stop the service with the old name, as well
806 # as remove it from the startup list
807 # - Removed the chkconfig --del entry from the conditional block on
808 # the preun scriptlet (now handled on the %files section)
809 # - junkbuster.init: renamed to junkbusterng.init
810 # - junkbusterng.init:
811 # - Changed JB_BIN to jbng
812 # - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
813 # be used where necessary (config dir)
816 # - The config directory is /etc/junkbuster yet. Have to change it on the
817 # specfile, after it is changes on the code
818 # - The only files that got renamed on the cvs tree were the rh specfile and
819 # the init file. Some file references got changes on the makefile and on the
820 # rh-spec (as listed above)
822 # Revision 1.43 2002/03/21 16:04:10 hal9
823 # added ijb_docs.css to %doc
825 # Revision 1.42 2002/03/12 13:41:18 sarantis
826 # remove hard-coded "ijbswa" string in build phase
828 # Revision 1.41 2002/03/11 22:58:32 hal9
829 # Remove --enable-no-gifs
831 # Revision 1.39 2002/03/08 18:57:29 swa
832 # remove user junkbuster after de-installation.
834 # Revision 1.38 2002/03/08 13:45:27 morcego
835 # Adding libtool to Buildrequires
837 # Revision 1.37 2002/03/07 19:23:49 swa
838 # i hate to scroll. suse: wrong configdir.
840 # Revision 1.36 2002/03/07 05:06:54 morcego
841 # Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
843 # Revision 1.34 2002/03/07 00:11:57 morcego
844 # Few changes on the %pre and %post sections of the rh specfile to handle
845 # usernames more cleanly
847 # Revision 1.33 2002/03/05 13:13:57 morcego
848 # - Added "make redhat-dok" to the build phase
849 # - Added docbook-utils to BuildRequires
851 # Revision 1.32 2002/03/05 12:34:24 morcego
852 # - Changing section internaly on the manpage from 1 to 8
853 # - We now require packages, not files, to avoid issues with apt
855 # Revision 1.31 2002/03/04 18:06:09 morcego
856 # SPECFILE: fixing permissing of the init script (broken by the last change)
858 # Revision 1.30 2002/03/04 16:18:03 morcego
859 # General cleanup of the rh specfile.
862 # * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
863 # + junkbuster-2.9.11-2
864 # - General specfile fixup, using the best recomended practices, including:
865 # - Adding -q to %%setup
866 # - Using macros whereever possible
867 # - Not using wildchars on %%files section
868 # - Doubling the percentage char on changelog and comments, to
869 # avoid rpm expanding them
871 # Revision 1.29 2002/03/03 19:21:22 hal9
872 # Init script fails if shell is /bin/false.
874 # Revision 1.28 2002/01/09 18:34:03 hal9
877 # Revision 1.27 2002/01/09 18:32:02 hal9
878 # Removed RPM_OPT_FLAGS kludge.
880 # Revision 1.26 2002/01/09 18:21:10 hal9
881 # A few minor updates.
883 # Revision 1.25 2001/12/28 01:45:36 steudten
884 # Add paranoia check and BuildReq: gzip
886 # Revision 1.24 2001/12/01 21:43:14 hal9
887 # Allowed for new ijb.action file.
889 # Revision 1.23 2001/11/06 12:09:03 steudten
890 # Compress doc files. Install README and AUTHORS at last as document.
892 # Revision 1.22 2001/11/05 21:37:34 steudten
893 # Fix to include the actual version for name.
894 # Let the 'real' packager be included - sorry stefan.
896 # Revision 1.21 2001/10/31 19:27:27 swa
897 # consistent description. new name for suse since
898 # we had troubles with rpms of identical names
901 # Revision 1.20 2001/10/24 15:45:49 hal9
902 # To keep Thomas happy (aka correcting my mistakes)
904 # Revision 1.19 2001/10/15 03:23:59 hal9
907 # Revision 1.17 2001/10/10 18:59:28 hal9
908 # Minor change for init script.
910 # Revision 1.16 2001/09/24 20:56:23 hal9
913 # Revision 1.13 2001/09/10 17:44:43 swa
914 # integrate three pieces of documentation. needs work.
915 # will not build cleanly under redhat.
917 # Revision 1.12 2001/09/10 16:25:04 swa
918 # copy all templates. version updated.
920 # Revision 1.11 2001/07/03 11:00:25 sarantis
921 # replaced permissionsfile with actionsfile
923 # Revision 1.10 2001/07/03 09:34:44 sarantis
924 # bumped up version number.
926 # Revision 1.9 2001/06/12 18:15:29 swa
927 # the %% in front of configure (see tag below) confused
928 # the rpm build process on 7.1.
930 # Revision 1.8 2001/06/12 17:15:56 swa
931 # fixes, because a clean build on rh6.1 was impossible.
932 # GZIP confuses make, %% configure confuses rpm, etc.
934 # Revision 1.7 2001/06/11 12:17:26 sarantis
937 # Revision 1.6 2001/06/11 11:28:25 sarantis
938 # Further optimizations and adaptations in the spec file.
940 # Revision 1.5 2001/06/09 09:14:11 swa
941 # shamelessly adapted RPM stuff from the newest rpm that
942 # RedHat provided for the JB.
944 # Revision 1.4 2001/06/08 20:54:18 swa
945 # type with status file. remove forward et. al from file list.
947 # Revision 1.3 2001/06/07 17:28:10 swa
950 # Revision 1.2 2001/06/04 18:31:58 swa
951 # files are now prefixed with either `confdir' or `logdir'.
952 # `make redhat-dist' replaces both entries confdir and logdir
955 # Revision 1.1 2001/06/04 10:44:57 swa
956 # `make redhatr-dist' now works. Except for the paths
957 # in the config file.