1 # $Id: privoxy-rh.spec,v 1.33.2.3 2002/06/24 12:13:34 kick_ 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 cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
111 cp -f *.action %{buildroot}%{privoxyconf}/
112 cp -f default.filter %{buildroot}%{privoxyconf}/default.filter
113 cp -f trust %{buildroot}%{privoxyconf}/trust
114 cp -f templates/* %{buildroot}%{privoxyconf}/templates/
115 cp -f %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
116 install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
117 install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name}
119 # verify all file locations, etc. in the config file
120 # don't start with ^ or commented lines are not replaced
121 ## Changing the sed paramter delimiter to @, so we don't have to
122 ## escape the slashes
124 sed 's@^confdir.*@confdir %{privoxyconf}@g' | \
125 # sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
126 # sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
127 # sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \
128 # sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \
129 # sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \
130 # sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \
131 sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' > \
132 %{buildroot}%{privoxyconf}/config
133 perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
134 %{buildroot}%{privoxyconf}/default.action
137 # Creating ghost init files
138 mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc{0,1,2,3,4,5,6}.d
141 ln -sf ../init.d/%{name} %{buildroot}/%{_sysconfdir}/rc.d/rc${i}.d/K09%{name}
145 ln -sf ../init.d/%{name} %{buildroot}/%{_sysconfdir}/rc.d/rc${i}.d/S84%{name}
148 ## Macros are expanded even on commentaries. So, we have to use %%
153 # This is where we handle old usernames (junkbust and junkbuster)
154 # I'm not sure we should do that, but this is the way we have been
155 # doing it for some time now -- morcego
156 # We should do it for the group as well -- morcego
157 # Doing it by brute force. Much cleaner (no more Mr. Nice Guy) -- morcego
159 # Change the group name. Remove anything left behind.
160 groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||:
161 groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
162 groupdel %{oldname} > /dev/null 2>&1 ||:
163 groupdel %{veryoldname} > /dev/null 2>&1 ||:
166 usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || :
167 usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || :
168 userdel %{oldname} > /dev/null 2>&1 ||:
169 userdel %{veryoldname} > /dev/null 2>&1 ||:
171 # Doublecheck to see if the group exist, and that it has the correct gid
172 /bin/grep -E '^%{name}:' /etc/group > /dev/null 2>&1
173 if [ $? -eq 1 ]; then
174 # Looks like it does not exist. Create it
175 groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1
177 /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' /etc/group > /dev/null 2>&1
178 if [ $? -eq 1 ]; then
179 # The group exists, but does not have the correct gid
180 groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1
184 # Check to see if everything is okey. Create user if it still does not
186 id %{name} > /dev/null 2>&1
187 if [ $? -eq 1 ]; then
188 /usr/sbin/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1
191 # Double check that the group has the correct uid
192 P_UID=`id -u %{name} 2>/dev/null`
193 if [ $P_UID -ne %{privoxy_uid} ]; then
194 /usr/sbin/usermod -u %{privoxy_uid} %{name}
197 # The same for the gid
198 P_GID=`id -g %{name} 2>/dev/null`
199 if [ $P_GID -ne %{privoxy_gid} ]; then
200 /usr/sbin/usermod -g %{privoxy_gid} %{name}
204 # for upgrade from 2.0.x
205 [ -f %{_localstatedir}/log/%{oldname}/logfile ] &&\
206 mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile || /bin/true
207 [ -f %{_localstatedir}/log/%{name}/%{name} ] &&\
208 mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile || /bin/true
209 chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null
210 chown -R %{name}:%{name} /etc/%{name} 2>/dev/null
211 if [ "$1" = "1" ]; then
212 /sbin/service %{name} condrestart > /dev/null 2>&1
216 /sbin/service %{veryoldname} stop > /dev/null 2>&1 ||:
217 /sbin/service %{oldname} stop > /dev/null 2>&1 ||:
219 if [ "$1" = "0" ]; then
220 /sbin/service %{name} stop > /dev/null 2>&1 ||:
221 # No need to use chkconfig. The %%ghost files will handle it
225 #if [ "$1" -ge "1" ]; then
226 # /sbin/service %{name} condrestart > /dev/null 2>&1
228 # We only remove it we this is not an upgrade
229 if [ "$1" = "0" ]; then
230 /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true
231 id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true
235 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
238 %defattr(0644,root,root,0755)
239 %doc README AUTHORS ChangeLog LICENSE
240 %doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
241 %doc doc/webserver/developer-manual
242 %doc doc/webserver/user-manual
243 %doc doc/webserver/faq
244 %doc doc/webserver/p_doc.css doc/webserver/p_web.css doc/webserver/privoxy-index.html
245 %doc doc/webserver/images
246 %doc doc/webserver/man-page
249 %dir %{privoxyconf}/templates
250 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
252 %attr(0744,%{name},%{name})%{_sbindir}/%{name}
254 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
255 # We should not use wildchars here. This could mask missing files problems
257 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
258 %config(noreplace) %{privoxyconf}/config
259 %config %{privoxyconf}/standard.action
260 %config(noreplace) %{privoxyconf}/user.action
261 %config %{privoxyconf}/default.action
262 %config %{privoxyconf}/default.filter
263 %config %{privoxyconf}/trust
265 # Please keep these alphabetized so its easier to find one that
267 %config %{privoxyconf}/templates/blocked
268 %config %{privoxyconf}/templates/cgi-error-404
269 %config %{privoxyconf}/templates/cgi-error-bad-param
270 %config %{privoxyconf}/templates/cgi-error-disabled
271 %config %{privoxyconf}/templates/cgi-error-file
272 %config %{privoxyconf}/templates/cgi-error-file-read-only
273 %config %{privoxyconf}/templates/cgi-error-modified
274 %config %{privoxyconf}/templates/cgi-error-parse
275 %config %{privoxyconf}/templates/cgi-style.css
276 %config %{privoxyconf}/templates/connect-failed
277 %config %{privoxyconf}/templates/default
278 %config %{privoxyconf}/templates/edit-actions-add-url-form
279 %config %{privoxyconf}/templates/edit-actions-for-url
280 %config %{privoxyconf}/templates/edit-actions-for-url-filter
281 %config %{privoxyconf}/templates/edit-actions-list
282 %config %{privoxyconf}/templates/edit-actions-list-button
283 %config %{privoxyconf}/templates/edit-actions-list-section
284 %config %{privoxyconf}/templates/edit-actions-list-url
285 %config %{privoxyconf}/templates/edit-actions-remove-url-form
286 %config %{privoxyconf}/templates/edit-actions-url-form
287 %config %{privoxyconf}/templates/mod-local-help
288 %config %{privoxyconf}/templates/mod-support-and-service
289 %config %{privoxyconf}/templates/mod-title
290 %config %{privoxyconf}/templates/mod-unstable-warning
291 %config %{privoxyconf}/templates/no-such-domain
292 %config %{privoxyconf}/templates/show-request
293 %config %{privoxyconf}/templates/show-status
294 %config %{privoxyconf}/templates/show-status-file
295 %config %{privoxyconf}/templates/show-url-info
296 %config %{privoxyconf}/templates/show-version
297 %config %{privoxyconf}/templates/toggle
298 %config %{privoxyconf}/templates/toggle-mini
299 %config %{privoxyconf}/templates/untrusted
301 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
302 %config(noreplace) %attr(0744,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
303 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc0.d/K09%{name}
304 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc1.d/K09%{name}
305 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc2.d/S84%{name}
306 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc3.d/S84%{name}
307 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc4.d/K09%{name}
308 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc5.d/S84%{name}
309 %ghost %attr(-,root,root) %{_sysconfdir}/rc.d/rc6.d/K09%{name}
311 %{_mandir}/man1/%{name}.*
314 * Thu Jun 20 2002 Karsten Hopp <karsten@redhat.de>
315 - fix several .spec file issues to shut up rpmlint
316 - non-standard-dir-perm /var/log/privoxy 0744
317 - invalid-vendor Privoxy.Org (This is ok for binaries compiled by privoxy
318 members, but not for packages from Red Hat)
319 - non-standard-group Networking/Utilities
320 - logrotate and init scripts should be noreplace
322 * Mon May 27 2002 Hal Burgiss <hal@foobox.net>
324 - Index.html is now privoxy-index.html for doc usage.
326 * Sat May 25 2002 Hal Burgiss <hal@foobox.net>
328 - Add html man page so index.html does not 404.
330 * Fri May 24 2002 Hal Burgiss <hal@foobox.net>
332 - Add another template and alphabetize these for easier tracking.
333 - Add doc/images directory.
335 * Wed May 15 2002 Hal Burgiss <hal@foobox.net>
337 - Add templates/edit-actions-list-button
339 * Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
342 - Adding noreplace for %%{privoxyconf}/config
343 - Included a method to verify if the versions declared on the specfile and
344 configure.in match. Interrupt the build if they don't.
346 * Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
348 - Changing Vendor to Privoxy.Org
350 * Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
352 - Adjust for new *actions files.
354 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
356 - Removed the redhat hack that prevented the user and group from
357 being dealocated. That was a misundestanding of my part regarding
360 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
362 - Using macros to define uid and gid values
365 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
367 - Changes to fixate the uid and gid values as (both) 73. This is a
368 value we hope to standarize for all distributions. RedHat already
369 uses it, and Conectiva should start as soon as I find where the heck
370 I left my cluebat :-)
371 - Only remove the user and group on uninstall if this is not redhat, once
372 redhat likes to have the values allocated even if the package is not
375 * Tue Apr 16 2002 Hal Burgiss <hal@foobox.net>
377 - Add --disable-dynamic-pcre to configure.
379 * Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
381 - Relisting template files on the %%files section
383 * Tue Apr 09 2002 Hal Burgiss <hal@foobox.net>
385 - Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
387 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
389 - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
390 - Remove templates/blocked-compact.
391 - Add more docbook stuff to Builderquires.
393 * Thu Mar 28 2002 Sarantis Paskalis <sarantis@cnl.di.uoa.gr>
395 - Include correct documentation file.
397 * Tue Mar 26 2002 Hal Burgiss <hal@foobox.net>
399 - Fix typo in Description.
401 * Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
403 - Added commentary asking to update the release value on the configure
406 * Tue Mar 25 2002 Hal Burgiss <hal@foobox.net>
408 - Added the missing edit-actions-for-url-filter to templates.
410 * Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
412 - Fixing Release number
414 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
418 * Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@suespammers.org>
420 - Fixed the init files entries. Now we use %%ghost
421 - improved username (and groupname) handling on the %%pre section. By improved
422 I mean: we do it by brute force now. Much easier to maintain. Yeah, you
423 got it right. No more Mr. Nice Guy.
424 - Removed the userdel call on %%post. No need, once it's complety handled on
427 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
428 + junkbusterng-2.9.13-1
429 Added autoheader. Added autoconf to buildrequires.
431 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
432 + junkbusterng-2.9.13-1
433 - Fixed build problems re: name conflicts with man page and logrotate.
434 - Commented out rc?d/* configs for time being, which are causing a build
435 - failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
436 - changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
438 * Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
439 + junkbusterng-2.9.13-1
440 - References to the expression ijb where changed where possible
441 - New package name: junkbusterng (all in lower case, acording to
442 the LSB recomendation)
443 - Version changed to: 2.9.13
445 - Added: junkbuster to obsoletes and conflicts (Not sure this is
446 right. If it obsoletes, why conflict ? Have to check it later)
447 - Summary changed: Stefan, please check and aprove it
448 - Changes description to use the new name
449 - Sed string was NOT changed. Have to wait to the manpage to
451 - Keeping the user junkbuster for now. It will require some aditional
452 changes on the script (scheduled for the next specfile release)
453 - Added post entry to move the old logfile to the new log directory
454 - Removing "chkconfig --add" entry (not good to have it automaticaly
455 added to the startup list).
456 - Added preun section to stop the service with the old name, as well
457 as remove it from the startup list
458 - Removed the chkconfig --del entry from the conditional block on
459 the preun scriptlet (now handled on the %files section)
461 * Thu Mar 21 2002 Hal Burgiss <hal@foobox.net>
462 - added ijb_docs.css to docs.
464 * Mon Mar 11 2002 Hal Burgiss <hal@foobox.net>
465 + junkbuster-2.9.11-8
466 - Take out --enable-no-gifs, breaks some browsers.
468 * Sun Mar 10 2002 Hal Burgiss <hal@foobox.net>
469 + junkbuster-2.9.11-8
470 - Add --enable-no-gifs to configure.
472 * Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
473 + junkbuster-2.9.11-7
474 - Added BuildRequires to libtool.
476 * Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
477 + junkbuster-2.9.11-6
478 - Changed the routined that handle the junkbust and junkbuster users on
479 %%pre and %%post to work in a smoother manner
480 - %%files now uses hardcoded usernames, to avoid problems with package
481 name changes in the future
483 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
484 + junkbuster-2.9.11-5
485 - Added "make redhat-dok" to the build process
486 - Added docbook-utils to BuildRequires
488 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
489 + junkbuster-2.9.11-4
490 - Changing man section in the manpage from 1 to 8
491 - We now require packages, not files, to avoid issues with apt
493 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
494 + junkbuster-2.9.11-3
495 - Fixing permissions of the init script
497 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
498 + junkbuster-2.9.11-2
499 - General specfile fixup, using the best recomended practices, including:
500 - Adding -q to %%setup
501 - Using macros whereever possible
502 - Not using wildchars on %%files section
503 - Doubling the percentage char on changelog and comments, to
504 avoid rpm expanding them
506 * Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
507 - /bin/false for shell causes init script to fail. Reverting.
509 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
510 - Removed UID 73. Included user-manual and developer-manual in docs.
511 Include other actions files. Default shell is now /bin/false.
512 Userdel user=junkbust. ChangeLog was not zipped. Removed
513 RPM_OPT_FLAGS kludge.
515 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
516 - add paranoia check for 'rm -rf %%{buildroot}'
517 - add gzip to 'BuildRequires'
519 * Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
520 - actionsfile is now ijb.action.
522 * Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
524 - Add more documents for installation
525 - Add version string to name and source
527 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
528 - Back to user 'junkbuster' and fix configure macro.
530 * Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
531 - More changes for user 'junkbust'. Init script had 'junkbuster'.
533 * Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
534 - Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
535 - Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
537 * Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
538 - Added $RPM_OPT_FLAGS support, renaming of old logfile, and
539 - made sure no default shell exists for user junkbust.
541 * Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
544 * Mon Sep 25 2000 Stefan Waldherr <stefan@waldherr.org>
545 - CLF Logging patch by davep@cyw.uklinux.net
546 - Hal DeVore <haldevore@earthling.net> fix akamaitech in blocklist
548 * Sun Sep 17 2000 Stefan Waldherr <stefan@waldherr.org>
549 - Steve Kemp skx@tardis.ed.ac.uk's javascript popup patch.
550 - Markus Breitenbach breitenb@rbg.informatik.tu-darmstadt.de supplied
551 numerous fixes and enhancements for Steve's patch.
552 - adamlock@netscape.com (Adam Lock) in the windows version:
553 - Taskbar activity spinner always spins even when logging is
554 turned off (which is the default) - people who don't
555 like the spinner can turn it off from a menu option.
556 - Taskbar popup menu has a options submenu - people can now
557 open the settings files for cookies, blockers etc.
558 without opening the JB window.
559 - Logging functionality works again
560 - Buffer overflow is fixed - new code uses a bigger buffer
561 and snprintf so it shouldn't overflow anymore.
562 - Fixed userid swa, group learning problem while installing.
564 - Added patch by Benjamin Low <ben@snrc.uow.edu.au> that prevents JB to
565 core dump when there is no log file.
566 - Tweaked SuSE startup with the help of mohataj@gmx.net and Doc.B@gmx.de.
567 - Fixed man page to include imagefile and popupfile.
568 - Sanity check for the statistics function added.
569 - "Patrick D'Cruze" <pdcruze@orac.iinet.net.au>: It seems Microsoft
570 are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
571 With IIS/5, it appears to omit the trailing \r\n from http header
572 only messages. eg, when I visit http://www.hotmail.com, IIS/5
573 responds with a HTTP 302 redirect header. However, this header
574 message is missing the trailing \r\n. IIS/5 then closes the
575 connection. Junkbuster, unfortunately, discards the header becomes
576 it thinks it is incomplete - and it is. MS have transmitted an
578 - Added bug reports and patch submission forms in the docs.
580 * Mon Mar 20 2000 Stefan Waldherr <stefan@waldherr.org>
581 Andrew <anw@tirana.freewire.co.uk> extended the JB:
582 Display of statistics of the total number of requests and the number
583 of requests filtered by junkbuster, also the percentage of requests
584 filtered. Suppression of the listing of files on the proxy-args page.
585 All stuff optional and configurable.
587 * Sun Sep 12 1999 Stefan Waldherr <stefan@waldherr.org>
588 Jan Willamowius (jan@janhh.shnet.org) fixed a bug in the
589 code which prevented the JB from handling URLs of the form
590 user:password@www.foo.com. Fixed.
592 * Mon Aug 2 1999 Stefan Waldherr <stefan@waldherr.org>
593 Blank images are no longer cached, thanks to a hint from Markus
594 Breitenbach <breitenb@rbg.informatik.tu-darmstadt.de>. The user
595 agent is NO longer set by the Junkbuster. Sadly, many sites depend
596 on the correct browser version nowadays. Incorporated many
597 suggestions from Jan "Yenya" Kasprzak <kas@fi.muni.cz> for the
598 spec file. Fixed logging problem and since runlevel 2 does not
599 use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
600 /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
601 <walker@netgate.net>. You should now be able to build this RPM as
602 a non-root user (mathias@weidner.sem.lipsia.de).
604 * Sun Jan 31 1999 Stefan Waldherr <stefan@waldherr.org>
605 %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
606 to allow more sophisticated matching of blocked images. Logrotate
607 logfile. Added files for auto-updating the blocklist et al.
609 * Wed Dec 16 1998 Stefan Waldherr <stefan@waldherr.org>
610 Configure blank version via config file. No separate blank
611 version anymore. Added Roland's <roland@spinnaker.rhein.de>
612 patch to show a logo instead of a blank area. Added a suggestion
613 from Alex <alex@cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
614 More regexps in the blocklist. Prepared the forwardfile for
615 squid. Extended image regexp with help from gabriel
616 <somlo@CS.ColoState.EDU>.
618 * Thu Nov 19 1998 Stefan Waldherr <stefan@waldherr.org>
619 All RPMs now identify themselves in the show-proxy-args page.
620 Released Windoze version. Run junkbuster as nobody instead of
623 * Fri Oct 30 1998 Stefan Waldherr <stefan@waldherr.org>
624 Newest version. First release (hence the little version number
625 mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
626 security over 2.0.1; some multi-user sites will need to change
627 the listen-address in the configuration file. The blank version of
628 the Internet Junkbuster has a more sophisticated way of replacing
629 images. All RPMs identify themselves in the show-proxy-args page.
631 * Thu Sep 23 1998 Stefan Waldherr <stefan@waldherr.org>
632 Modified the blocking feature, so that only GIFs and JPEGs are
633 blocked and replaced but not HTML pages. Thanks to
634 "Gerd Flender" <plgerd@informatik.uni-siegen.de> for this nice
635 idea. Added numerous stuff to the blocklist. Keep patches in
636 seperate files and no longer in diffs (easier to maintain).
638 * Tue Jun 16 1998 Stefan Waldherr <swa@cs.cmu.edu>
639 Moved config files to /etc/junkbuster directory, moved man page,
640 added BuildRoot directive (Thanks to Alexey Nogin <ayn2@cornell.edu>)
641 Made new version junkbuster-raw (which is only a stripped version of
642 the junkuster rpm, i.e. without my blocklist, etc.)
644 * Tue Jun 16 1998 (2.0-1)
645 Uhm, not that much. Just a new junkbuster version that
646 fixes a couple of bugs ... and of course a bigger
647 blocklist with the unique Now-less-ads-than-ever(SM)
649 Oh, one thing: I changed the default user agent to Linux -- no
650 need anymore to support Apple.
652 * Tue Jun 16 1998 (2.0-0)
653 Now-less-ads-than-ever (SM)
654 compiled with gcc instead of cc
655 compiled with -O3, thus it should be a little faster
656 show-proxy-args now works
657 /etc/junkbuster.init wasn't necessary
659 * Tue Jun 16 1998 (1.4)
660 some more config files were put into /etc
661 The junkbuster-blank rpm returns a 1x1 pixel image, that gets
662 displayed by Netscape instead of the blocked image.
663 Read http://www.waldherr.org/junkbuster/ for
666 * Tue Jun 16 1998 (1.3)
667 The program has been moved to /usr/sbin (from /usr/local/bin)
668 Init- and stopscripts (/etc/rc.d/rc*) have been added so
669 that the junkbuster starts automatically during bootup.
670 The /etc/blocklist file is much more sophisticated. Theoretically
671 one should e.g. browse all major US and German newspapers without
672 seeing one annoying ad.
673 junkbuster.init was modified. It now starts junkbuster with an
674 additional "-r @" flag.
676 # $Log: privoxy-rh.spec,v $
677 # Revision 1.33.2.3 2002/06/24 12:13:34 kick_
678 # shut up rpmlint. btw: The vendor tag should be set in you .rpmmacros file, not in the spec file!
680 # Revision 1.33.2.2 2002/05/28 02:39:38 hal9
681 # Replace index.html with privoxy-index.html for docs.
683 # Revision 1.33.2.1 2002/05/26 17:20:23 hal9
684 # Add images to doc dirs.
686 # Revision 1.33 2002/05/25 02:08:23 hal9
687 # Add doc/images directory.
688 # Redhat: alphabetized list of templates (and I think added one in the process)
690 # Revision 1.32 2002/05/16 01:37:29 hal9
691 # Add new template file so CGI stuff works :)
693 # Revision 1.31 2002/05/03 17:14:35 morcego
694 # *.spec: Version bump to 2.9.15
695 # -rh.spec: noreplace for %%{privoxyconf}/config
696 # Will interrupt the build if versions from configure.in and
697 # specfile do not match
699 # Revision 1.30 2002/04/26 15:51:05 morcego
700 # Changing Vendor value to Privoxy.Org
702 # Revision 1.29 2002/04/24 03:13:51 hal9
703 # New actions files changes.
705 # Revision 1.28 2002/04/22 18:51:33 morcego
706 # user and group now get removed on rh too.
708 # Revision 1.27 2002/04/22 16:32:31 morcego
709 # configure.in, *.spec: Bumping release to 2 (2.9.14-2)
710 # -rh.spec: uid and gid are now macros
711 # -suse.spec: Changing the header Copyright to License (Copyright is
714 # Revision 1.26 2002/04/22 16:24:36 morcego
715 # - Changes to fixate the uid and gid values as (both) 73. This is a
716 # value we hope to standarize for all distributions. RedHat already
717 # uses it, and Conectiva should start as soon as I find where the heck
718 # I left my cluebat :-)
719 # - Only remove the user and group on uninstall if this is not redhat, once
720 # redhat likes to have the values allocated even if the package is not
723 # Revision 1.25 2002/04/17 01:59:12 hal9
724 # Add --disable-dynamic-pcre.
726 # Revision 1.24 2002/04/11 10:09:20 oes
729 # Revision 1.23 2002/04/10 18:14:45 morcego
730 # - (privoxy-rh.spec only) Relisting template files on the %%files section
731 # - (configure.in, privoxy-rh.spec) Bumped package release to 5
733 # Revision 1.22 2002/04/09 22:06:12 hal9
736 # Revision 1.21 2002/04/09 02:52:26 hal9
737 # - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
738 # - Remove templates/blocked-compact.
739 # - Add more docbook stuff to Buildrequires.
741 # Revision 1.20 2002/04/08 20:27:45 swa
744 # Revision 1.19 2002/03/27 22:44:59 sarantis
745 # Include correct documentation file.
747 # Revision 1.18 2002/03/27 22:10:14 sarantis
748 # bumped Hal's last commit 1 day to the future to make rpm build again.
750 # Revision 1.17 2002/03/27 00:48:23 hal9
753 # Revision 1.16 2002/03/26 22:29:55 swa
754 # we have a new homepage!
756 # Revision 1.15 2002/03/26 17:39:54 morcego
757 # Adding comment on the specfile to remember the packager to update
758 # the release number on the configure script
760 # Revision 1.14 2002/03/26 14:25:15 hal9
761 # Added edit-actions-for-url-filter to templates in %%config
763 # Revision 1.13 2002/03/25 13:31:04 morcego
764 # Bumping Release tag.
766 # Revision 1.12 2002/03/25 03:11:40 hal9
767 # Do it right way this time :/
769 # Revision 1.11 2002/03/25 03:09:51 hal9
772 # Revision 1.10 2002/03/24 22:16:14 morcego
773 # Just removing some old commentaries.
775 # Revision 1.9 2002/03/24 22:03:22 morcego
776 # Should be working now. See %changelog for details
778 # Revision 1.8 2002/03/24 21:13:01 morcego
781 # Revision 1.7 2002/03/24 21:07:18 hal9
782 # Add autoheader, etc.
784 # Revision 1.6 2002/03/24 19:56:40 hal9
785 # /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
787 # Revision 1.4 2002/03/24 13:32:42 swa
788 # name change related issues
790 # Revision 1.3 2002/03/24 12:56:21 swa
791 # name change related issues.
793 # Revision 1.2 2002/03/24 11:40:14 swa
796 # Revision 1.1 2002/03/24 11:23:44 swa
799 # Revision 1.1 2002/03/22 20:53:03 morcego
800 # - Ongoing process to change name to JunkbusterNG
801 # - configure/configure.in: no change needed
803 # - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
804 # - PROGRAM = jbng@EXEEXT@
805 # - rh-spec now references as junkbusterng-rh.spec
806 # - redhat-upload: references changed to junkbusterng-* (package names)
807 # - tarball-dist: references changed to JunkbusterNG-distribution-*
808 # - tarball-src: now JunkbusterNG-*
809 # - install: initscript now junkbusterng.init and junkbusterng (when
811 # - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
812 # - junkbusterng.spec:
813 # - References to the expression ijb where changed where possible
814 # - New package name: junkbusterng (all in lower case, acording to
815 # the LSB recomendation)
816 # - Version changed to: 2.9.13
818 # - Added: junkbuster to obsoletes and conflicts (Not sure this is
819 # right. If it obsoletes, why conflict ? Have to check it later)
820 # - Summary changed: Stefan, please check and aprove it
821 # - Changes description to use the new name
822 # - Sed string was NOT changed. Have to wait to the manpage to
824 # - Keeping the user junkbuster for now. It will require some aditional
825 # changes on the script (scheduled for the next specfile release)
826 # - Added post entry to move the old logfile to the new log directory
827 # - Removing "chkconfig --add" entry (not good to have it automaticaly
828 # added to the startup list).
829 # - Added preun section to stop the service with the old name, as well
830 # as remove it from the startup list
831 # - Removed the chkconfig --del entry from the conditional block on
832 # the preun scriptlet (now handled on the %files section)
833 # - junkbuster.init: renamed to junkbusterng.init
834 # - junkbusterng.init:
835 # - Changed JB_BIN to jbng
836 # - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
837 # be used where necessary (config dir)
840 # - The config directory is /etc/junkbuster yet. Have to change it on the
841 # specfile, after it is changes on the code
842 # - The only files that got renamed on the cvs tree were the rh specfile and
843 # the init file. Some file references got changes on the makefile and on the
844 # rh-spec (as listed above)
846 # Revision 1.43 2002/03/21 16:04:10 hal9
847 # added ijb_docs.css to %doc
849 # Revision 1.42 2002/03/12 13:41:18 sarantis
850 # remove hard-coded "ijbswa" string in build phase
852 # Revision 1.41 2002/03/11 22:58:32 hal9
853 # Remove --enable-no-gifs
855 # Revision 1.39 2002/03/08 18:57:29 swa
856 # remove user junkbuster after de-installation.
858 # Revision 1.38 2002/03/08 13:45:27 morcego
859 # Adding libtool to Buildrequires
861 # Revision 1.37 2002/03/07 19:23:49 swa
862 # i hate to scroll. suse: wrong configdir.
864 # Revision 1.36 2002/03/07 05:06:54 morcego
865 # Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
867 # Revision 1.34 2002/03/07 00:11:57 morcego
868 # Few changes on the %pre and %post sections of the rh specfile to handle
869 # usernames more cleanly
871 # Revision 1.33 2002/03/05 13:13:57 morcego
872 # - Added "make redhat-dok" to the build phase
873 # - Added docbook-utils to BuildRequires
875 # Revision 1.32 2002/03/05 12:34:24 morcego
876 # - Changing section internaly on the manpage from 1 to 8
877 # - We now require packages, not files, to avoid issues with apt
879 # Revision 1.31 2002/03/04 18:06:09 morcego
880 # SPECFILE: fixing permissing of the init script (broken by the last change)
882 # Revision 1.30 2002/03/04 16:18:03 morcego
883 # General cleanup of the rh specfile.
886 # * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
887 # + junkbuster-2.9.11-2
888 # - General specfile fixup, using the best recomended practices, including:
889 # - Adding -q to %%setup
890 # - Using macros whereever possible
891 # - Not using wildchars on %%files section
892 # - Doubling the percentage char on changelog and comments, to
893 # avoid rpm expanding them
895 # Revision 1.29 2002/03/03 19:21:22 hal9
896 # Init script fails if shell is /bin/false.
898 # Revision 1.28 2002/01/09 18:34:03 hal9
901 # Revision 1.27 2002/01/09 18:32:02 hal9
902 # Removed RPM_OPT_FLAGS kludge.
904 # Revision 1.26 2002/01/09 18:21:10 hal9
905 # A few minor updates.
907 # Revision 1.25 2001/12/28 01:45:36 steudten
908 # Add paranoia check and BuildReq: gzip
910 # Revision 1.24 2001/12/01 21:43:14 hal9
911 # Allowed for new ijb.action file.
913 # Revision 1.23 2001/11/06 12:09:03 steudten
914 # Compress doc files. Install README and AUTHORS at last as document.
916 # Revision 1.22 2001/11/05 21:37:34 steudten
917 # Fix to include the actual version for name.
918 # Let the 'real' packager be included - sorry stefan.
920 # Revision 1.21 2001/10/31 19:27:27 swa
921 # consistent description. new name for suse since
922 # we had troubles with rpms of identical names
925 # Revision 1.20 2001/10/24 15:45:49 hal9
926 # To keep Thomas happy (aka correcting my mistakes)
928 # Revision 1.19 2001/10/15 03:23:59 hal9
931 # Revision 1.17 2001/10/10 18:59:28 hal9
932 # Minor change for init script.
934 # Revision 1.16 2001/09/24 20:56:23 hal9
937 # Revision 1.13 2001/09/10 17:44:43 swa
938 # integrate three pieces of documentation. needs work.
939 # will not build cleanly under redhat.
941 # Revision 1.12 2001/09/10 16:25:04 swa
942 # copy all templates. version updated.
944 # Revision 1.11 2001/07/03 11:00:25 sarantis
945 # replaced permissionsfile with actionsfile
947 # Revision 1.10 2001/07/03 09:34:44 sarantis
948 # bumped up version number.
950 # Revision 1.9 2001/06/12 18:15:29 swa
951 # the %% in front of configure (see tag below) confused
952 # the rpm build process on 7.1.
954 # Revision 1.8 2001/06/12 17:15:56 swa
955 # fixes, because a clean build on rh6.1 was impossible.
956 # GZIP confuses make, %% configure confuses rpm, etc.
958 # Revision 1.7 2001/06/11 12:17:26 sarantis
961 # Revision 1.6 2001/06/11 11:28:25 sarantis
962 # Further optimizations and adaptations in the spec file.
964 # Revision 1.5 2001/06/09 09:14:11 swa
965 # shamelessly adapted RPM stuff from the newest rpm that
966 # RedHat provided for the JB.
968 # Revision 1.4 2001/06/08 20:54:18 swa
969 # type with status file. remove forward et. al from file list.
971 # Revision 1.3 2001/06/07 17:28:10 swa
974 # Revision 1.2 2001/06/04 18:31:58 swa
975 # files are now prefixed with either `confdir' or `logdir'.
976 # `make redhat-dist' replaces both entries confdir and logdir
979 # Revision 1.1 2001/06/04 10:44:57 swa
980 # `make redhatr-dist' now works. Except for the paths
981 # in the config file.