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