1 # $Id: privoxy-rh.spec,v 1.47 2006/09/09 00:35:10 hal9 Exp $
3 # Written by and Copyright (C) 2001 the SourceForge
4 # Privoxy team. http://www.privoxy.org/
6 # Based on the Internet Junkbuster originally written
7 # by and Copyright (C) 1997 Anonymous Coders and
8 # Junkbusters Corporation. http://www.junkbusters.com
10 # This program is free software; you can redistribute it
11 # and/or modify it under the terms of the GNU General
12 # Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at
14 # your option) any later version.
16 # This program is distributed in the hope that it will
17 # be useful, but WITHOUT ANY WARRANTY; without even the
18 # implied warranty of MERCHANTABILITY or FITNESS FOR A
19 # PARTICULAR PURPOSE. See the GNU General Public
20 # License for more details.
22 # The GNU General Public License should be included with
23 # this file. If not, you can view it at
24 # http://www.gnu.org/copyleft/gpl.html
25 # or write to the Free Software Foundation, Inc., 59
26 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
29 # Defines should happen in the begining of the file
30 %define veryoldname junkbust
31 %define oldname junkbuster
32 %define privoxyconf %{_sysconfdir}/%{name}
33 %define privoxy_uid 73
34 %define privoxy_gid 73
38 # Version and release should be updated acordingly on configure.in and
39 # configure. Otherwise, the package can be build with the wrong value
42 Summary: Privoxy - privacy enhancing proxy
44 Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz
45 BuildRoot: %{_tmppath}/%{name}-%{version}-root
46 Group: System Environment/Daemons
47 URL: http://www.privoxy.org/
48 Obsoletes: junkbuster-raw junkbuster-blank junkbuster
49 # Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
50 Prereq: shadow-utils, chkconfig, initscripts, sh-utils
51 BuildRequires: perl gzip sed libtool autoconf
52 Conflicts: junkbuster-raw junkbuster-blank junkbuster
55 Privoxy is a web proxy with advanced filtering capabilities for
56 protecting privacy, filtering web page data, 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(noreplace) %{privoxyconf}/user.filter
274 %config(noreplace) %{privoxyconf}/trust
276 # Please keep these alphabetized so its easier to find one that
278 %config %{privoxyconf}/templates/blocked
279 %config %{privoxyconf}/templates/cgi-error-404
280 %config %{privoxyconf}/templates/cgi-error-bad-param
281 %config %{privoxyconf}/templates/cgi-error-disabled
282 %config %{privoxyconf}/templates/cgi-error-file
283 %config %{privoxyconf}/templates/cgi-error-file-read-only
284 %config %{privoxyconf}/templates/cgi-error-modified
285 %config %{privoxyconf}/templates/cgi-error-parse
286 %config %{privoxyconf}/templates/cgi-style.css
287 %config %{privoxyconf}/templates/connect-failed
288 %config %{privoxyconf}/templates/default
289 %config %{privoxyconf}/templates/edit-actions-add-url-form
290 %config %{privoxyconf}/templates/edit-actions-for-url
291 %config %{privoxyconf}/templates/edit-actions-for-url-filter
292 %config %{privoxyconf}/templates/edit-actions-list
293 %config %{privoxyconf}/templates/edit-actions-list-button
294 %config %{privoxyconf}/templates/edit-actions-list-section
295 %config %{privoxyconf}/templates/edit-actions-list-url
296 %config %{privoxyconf}/templates/edit-actions-remove-url-form
297 %config %{privoxyconf}/templates/edit-actions-url-form
298 %config %{privoxyconf}/templates/mod-local-help
299 %config %{privoxyconf}/templates/mod-support-and-service
300 %config %{privoxyconf}/templates/mod-title
301 %config %{privoxyconf}/templates/mod-unstable-warning
302 %config %{privoxyconf}/templates/no-such-domain
303 %config %{privoxyconf}/templates/show-request
304 %config %{privoxyconf}/templates/show-status
305 %config %{privoxyconf}/templates/show-status-file
306 %config %{privoxyconf}/templates/show-url-info
307 %config %{privoxyconf}/templates/show-version
308 %config %{privoxyconf}/templates/toggle
309 %config %{privoxyconf}/templates/toggle-mini
310 %config %{privoxyconf}/templates/untrusted
312 # Attention, new defattr change here !
313 %defattr(0644,root,root,0755)
315 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
316 %config(noreplace) %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
318 %{_mandir}/man1/%{name}.*
321 * Wed Sep 20 2006 Hal Burgiss <hal@foobox.net>
322 - Bump version to 3.0.5
324 * Fri Sep 08 2006 Hal Burgiss <hal@foobox.net>
325 - Bump version to 3.0.4
327 * Sat Sep 02 2006 Hal Burgiss <hal@foobox.net>
328 - Include new file, user.filter. Do not overwrite "trust" file
329 (does anyone use this?).
331 * Wed Mar 26 2003 Andreas Oesterhelt <andreas@oesterhelt.org>
332 - Bump version for 3.0.2.
334 * Wed Mar 19 2003 Hal Burgiss <hal@foobox.net>
335 - Bump version for 3.0.1.
337 * Tue Aug 25 2002 Hal Burgiss <hal@foobox.net>
338 - Bump version for 3.0.0 :)
340 * Tue Aug 06 2002 Hal Burgiss <hal@foobox.net>
341 - Reset version for 2.9.20.
343 * Tue Jul 30 2002 Hal Burgiss <hal@foobox.net>
344 - Reset version for 2.9.18.
346 * Sat Jul 27 2002 Hal Burgiss <hal@foobox.net>
347 - Reset version and release for 2.9.16.
349 * Fri Jul 12 2002 Karsten Hopp <karsten@redhat.de>
350 - don't use ghost files for rcX.d/*, using chkconfig is the
351 correct way to do this job (#68619)
353 * Fri Jul 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
355 - Changing delete order for groups and users (users should be first)
357 * Wed Jul 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
359 - Changing sed expression that removed CR from the end of the lines. This
360 new one removes any control caracter, and should work with older versions
363 * Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
365 - Fixing defattr values. File and directory modes where swapped
367 * Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
369 - Bumping Release number (which should be changed every time the specfile
372 * Tue Jul 02 2002 Hal Burgiss <hal@foobox.net>
374 - Fix typo in templates creation.
376 * Wed Jun 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
378 - Fixing issues created by specfile sync between branches
379 - Correcting the release number (WARNING)
380 - Reintroducing text file conversion (dos -> unix)
381 - Reconverting hardcoded directories to macros
382 - Refixing ownership of privoxy files (now using multiple defattr
385 * Thu Jun 20 2002 Karsten Hopp <karsten@redhat.de>
386 - fix several .spec file issues to shut up rpmlint
387 - non-standard-dir-perm /var/log/privoxy 0744
388 - invalid-vendor Privoxy.Org (This is ok for binaries compiled by privoxy
389 members, but not for packages from Red Hat)
390 - non-standard-group Networking/Utilities
391 - logrotate and init scripts should be noreplace
393 * Mon May 27 2002 Hal Burgiss <hal@foobox.net>
395 - Index.html is now privoxy-index.html for doc usage.
397 * Sat May 25 2002 Hal Burgiss <hal@foobox.net>
399 - Add html man page so index.html does not 404.
401 * Fri May 24 2002 Hal Burgiss <hal@foobox.net>
403 - Add another template and alphabetize these for easier tracking.
404 - Add doc/images directory.
406 * Wed May 15 2002 Hal Burgiss <hal@foobox.net>
408 - Add templates/edit-actions-list-button
410 * Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
413 - Adding noreplace for %%{privoxyconf}/config
414 - Included a method to verify if the versions declared on the specfile and
415 configure.in match. Interrupt the build if they don't.
417 * Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
419 - Changing Vendor to Privoxy.Org
421 * Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
423 - Adjust for new *actions files.
425 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
427 - Removed the redhat hack that prevented the user and group from
428 being dealocated. That was a misundestanding of my part regarding
431 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
433 - Using macros to define uid and gid values
436 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
438 - Changes to fixate the uid and gid values as (both) 73. This is a
439 value we hope to standarize for all distributions. RedHat already
440 uses it, and Conectiva should start as soon as I find where the heck
441 I left my cluebat :-)
442 - Only remove the user and group on uninstall if this is not redhat, once
443 redhat likes to have the values allocated even if the package is not
446 * Tue Apr 16 2002 Hal Burgiss <hal@foobox.net>
448 - Add --disable-dynamic-pcre to configure.
450 * Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
452 - Relisting template files on the %%files section
454 * Tue Apr 09 2002 Hal Burgiss <hal@foobox.net>
456 - Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
458 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
460 - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
461 - Remove templates/blocked-compact.
462 - Add more docbook stuff to Builderquires.
464 * Thu Mar 28 2002 Sarantis Paskalis <sarantis@cnl.di.uoa.gr>
466 - Include correct documentation file.
468 * Tue Mar 26 2002 Hal Burgiss <hal@foobox.net>
470 - Fix typo in Description.
472 * Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
474 - Added commentary asking to update the release value on the configure
477 * Tue Mar 25 2002 Hal Burgiss <hal@foobox.net>
479 - Added the missing edit-actions-for-url-filter to templates.
481 * Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
483 - Fixing Release number
485 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
489 * Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@suespammers.org>
491 - Fixed the init files entries. Now we use %%ghost
492 - improved username (and groupname) handling on the %%pre section. By improved
493 I mean: we do it by brute force now. Much easier to maintain. Yeah, you
494 got it right. No more Mr. Nice Guy.
495 - Removed the userdel call on %%post. No need, once it's complety handled on
498 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
499 + junkbusterng-2.9.13-1
500 Added autoheader. Added autoconf to buildrequires.
502 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
503 + junkbusterng-2.9.13-1
504 - Fixed build problems re: name conflicts with man page and logrotate.
505 - Commented out rc?d/* configs for time being, which are causing a build
506 - failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
507 - changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
509 * Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
510 + junkbusterng-2.9.13-1
511 - References to the expression ijb where changed where possible
512 - New package name: junkbusterng (all in lower case, acording to
513 the LSB recomendation)
514 - Version changed to: 2.9.13
516 - Added: junkbuster to obsoletes and conflicts (Not sure this is
517 right. If it obsoletes, why conflict ? Have to check it later)
518 - Summary changed: Stefan, please check and aprove it
519 - Changes description to use the new name
520 - Sed string was NOT changed. Have to wait to the manpage to
522 - Keeping the user junkbuster for now. It will require some aditional
523 changes on the script (scheduled for the next specfile release)
524 - Added post entry to move the old logfile to the new log directory
525 - Removing "chkconfig --add" entry (not good to have it automaticaly
526 added to the startup list).
527 - Added preun section to stop the service with the old name, as well
528 as remove it from the startup list
529 - Removed the chkconfig --del entry from the conditional block on
530 the preun scriptlet (now handled on the %files section)
532 * Thu Mar 21 2002 Hal Burgiss <hal@foobox.net>
533 - added ijb_docs.css to docs.
535 * Mon Mar 11 2002 Hal Burgiss <hal@foobox.net>
536 + junkbuster-2.9.11-8
537 - Take out --enable-no-gifs, breaks some browsers.
539 * Sun Mar 10 2002 Hal Burgiss <hal@foobox.net>
540 + junkbuster-2.9.11-8
541 - Add --enable-no-gifs to configure.
543 * Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
544 + junkbuster-2.9.11-7
545 - Added BuildRequires to libtool.
547 * Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
548 + junkbuster-2.9.11-6
549 - Changed the routined that handle the junkbust and junkbuster users on
550 %%pre and %%post to work in a smoother manner
551 - %%files now uses hardcoded usernames, to avoid problems with package
552 name changes in the future
554 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
555 + junkbuster-2.9.11-5
556 - Added "make redhat-dok" to the build process
557 - Added docbook-utils to BuildRequires
559 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
560 + junkbuster-2.9.11-4
561 - Changing man section in the manpage from 1 to 8
562 - We now require packages, not files, to avoid issues with apt
564 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
565 + junkbuster-2.9.11-3
566 - Fixing permissions of the init script
568 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
569 + junkbuster-2.9.11-2
570 - General specfile fixup, using the best recomended practices, including:
571 - Adding -q to %%setup
572 - Using macros whereever possible
573 - Not using wildchars on %%files section
574 - Doubling the percentage char on changelog and comments, to
575 avoid rpm expanding them
577 * Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
578 - /bin/false for shell causes init script to fail. Reverting.
580 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
581 - Removed UID 73. Included user-manual and developer-manual in docs.
582 Include other actions files. Default shell is now /bin/false.
583 Userdel user=junkbust. ChangeLog was not zipped. Removed
584 RPM_OPT_FLAGS kludge.
586 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
587 - add paranoia check for 'rm -rf %%{buildroot}'
588 - add gzip to 'BuildRequires'
590 * Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
591 - actionsfile is now ijb.action.
593 * Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
595 - Add more documents for installation
596 - Add version string to name and source
598 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
599 - Back to user 'junkbuster' and fix configure macro.
601 * Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
602 - More changes for user 'junkbust'. Init script had 'junkbuster'.
604 * Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
605 - Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
606 - Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
608 * Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
609 - Added $RPM_OPT_FLAGS support, renaming of old logfile, and
610 - made sure no default shell exists for user junkbust.
612 * Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
615 * Mon Sep 25 2000 Stefan Waldherr <stefan@waldherr.org>
616 - CLF Logging patch by davep@cyw.uklinux.net
617 - Hal DeVore <haldevore@earthling.net> fix akamaitech in blocklist
619 * Sun Sep 17 2000 Stefan Waldherr <stefan@waldherr.org>
620 - Steve Kemp skx@tardis.ed.ac.uk's javascript popup patch.
621 - Markus Breitenbach breitenb@rbg.informatik.tu-darmstadt.de supplied
622 numerous fixes and enhancements for Steve's patch.
623 - adamlock@netscape.com (Adam Lock) in the windows version:
624 - Taskbar activity spinner always spins even when logging is
625 turned off (which is the default) - people who don't
626 like the spinner can turn it off from a menu option.
627 - Taskbar popup menu has a options submenu - people can now
628 open the settings files for cookies, blockers etc.
629 without opening the JB window.
630 - Logging functionality works again
631 - Buffer overflow is fixed - new code uses a bigger buffer
632 and snprintf so it shouldn't overflow anymore.
633 - Fixed userid swa, group learning problem while installing.
635 - Added patch by Benjamin Low <ben@snrc.uow.edu.au> that prevents JB to
636 core dump when there is no log file.
637 - Tweaked SuSE startup with the help of mohataj@gmx.net and Doc.B@gmx.de.
638 - Fixed man page to include imagefile and popupfile.
639 - Sanity check for the statistics function added.
640 - "Patrick D'Cruze" <pdcruze@orac.iinet.net.au>: It seems Microsoft
641 are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
642 With IIS/5, it appears to omit the trailing \r\n from http header
643 only messages. eg, when I visit http://www.hotmail.com, IIS/5
644 responds with a HTTP 302 redirect header. However, this header
645 message is missing the trailing \r\n. IIS/5 then closes the
646 connection. Junkbuster, unfortunately, discards the header becomes
647 it thinks it is incomplete - and it is. MS have transmitted an
649 - Added bug reports and patch submission forms in the docs.
651 * Mon Mar 20 2000 Stefan Waldherr <stefan@waldherr.org>
652 Andrew <anw@tirana.freewire.co.uk> extended the JB:
653 Display of statistics of the total number of requests and the number
654 of requests filtered by junkbuster, also the percentage of requests
655 filtered. Suppression of the listing of files on the proxy-args page.
656 All stuff optional and configurable.
658 * Sun Sep 12 1999 Stefan Waldherr <stefan@waldherr.org>
659 Jan Willamowius (jan@janhh.shnet.org) fixed a bug in the
660 code which prevented the JB from handling URLs of the form
661 user:password@www.foo.com. Fixed.
663 * Mon Aug 2 1999 Stefan Waldherr <stefan@waldherr.org>
664 Blank images are no longer cached, thanks to a hint from Markus
665 Breitenbach <breitenb@rbg.informatik.tu-darmstadt.de>. The user
666 agent is NO longer set by the Junkbuster. Sadly, many sites depend
667 on the correct browser version nowadays. Incorporated many
668 suggestions from Jan "Yenya" Kasprzak <kas@fi.muni.cz> for the
669 spec file. Fixed logging problem and since runlevel 2 does not
670 use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
671 /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
672 <walker@netgate.net>. You should now be able to build this RPM as
673 a non-root user (mathias@weidner.sem.lipsia.de).
675 * Sun Jan 31 1999 Stefan Waldherr <stefan@waldherr.org>
676 %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
677 to allow more sophisticated matching of blocked images. Logrotate
678 logfile. Added files for auto-updating the blocklist et al.
680 * Wed Dec 16 1998 Stefan Waldherr <stefan@waldherr.org>
681 Configure blank version via config file. No separate blank
682 version anymore. Added Roland's <roland@spinnaker.rhein.de>
683 patch to show a logo instead of a blank area. Added a suggestion
684 from Alex <alex@cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
685 More regexps in the blocklist. Prepared the forwardfile for
686 squid. Extended image regexp with help from gabriel
687 <somlo@CS.ColoState.EDU>.
689 * Thu Nov 19 1998 Stefan Waldherr <stefan@waldherr.org>
690 All RPMs now identify themselves in the show-proxy-args page.
691 Released Windoze version. Run junkbuster as nobody instead of
694 * Fri Oct 30 1998 Stefan Waldherr <stefan@waldherr.org>
695 Newest version. First release (hence the little version number
696 mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
697 security over 2.0.1; some multi-user sites will need to change
698 the listen-address in the configuration file. The blank version of
699 the Internet Junkbuster has a more sophisticated way of replacing
700 images. All RPMs identify themselves in the show-proxy-args page.
702 * Thu Sep 23 1998 Stefan Waldherr <stefan@waldherr.org>
703 Modified the blocking feature, so that only GIFs and JPEGs are
704 blocked and replaced but not HTML pages. Thanks to
705 "Gerd Flender" <plgerd@informatik.uni-siegen.de> for this nice
706 idea. Added numerous stuff to the blocklist. Keep patches in
707 seperate files and no longer in diffs (easier to maintain).
709 * Tue Jun 16 1998 Stefan Waldherr <swa@cs.cmu.edu>
710 Moved config files to /etc/junkbuster directory, moved man page,
711 added BuildRoot directive (Thanks to Alexey Nogin <ayn2@cornell.edu>)
712 Made new version junkbuster-raw (which is only a stripped version of
713 the junkuster rpm, i.e. without my blocklist, etc.)
715 * Tue Jun 16 1998 (2.0-1)
716 Uhm, not that much. Just a new junkbuster version that
717 fixes a couple of bugs ... and of course a bigger
718 blocklist with the unique Now-less-ads-than-ever(SM)
720 Oh, one thing: I changed the default user agent to Linux -- no
721 need anymore to support Apple.
723 * Tue Jun 16 1998 (2.0-0)
724 Now-less-ads-than-ever (SM)
725 compiled with gcc instead of cc
726 compiled with -O3, thus it should be a little faster
727 show-proxy-args now works
728 /etc/junkbuster.init wasn't necessary
730 * Tue Jun 16 1998 (1.4)
731 some more config files were put into /etc
732 The junkbuster-blank rpm returns a 1x1 pixel image, that gets
733 displayed by Netscape instead of the blocked image.
734 Read http://www.waldherr.org/junkbuster/ for
737 * Tue Jun 16 1998 (1.3)
738 The program has been moved to /usr/sbin (from /usr/local/bin)
739 Init- and stopscripts (/etc/rc.d/rc*) have been added so
740 that the junkbuster starts automatically during bootup.
741 The /etc/blocklist file is much more sophisticated. Theoretically
742 one should e.g. browse all major US and German newspapers without
743 seeing one annoying ad.
744 junkbuster.init was modified. It now starts junkbuster with an
745 additional "-r @" flag.
747 # $Log: privoxy-rh.spec,v $
748 # Revision 1.47 2006/09/09 00:35:10 hal9
749 # Bumped versions to 3.0.4. Both files should be checked further.
751 # Revision 1.46 2006/09/02 22:22:59 hal9
752 # Include user.filter, and do not overwrite trust file on updates.
754 # Revision 1.45 2006/07/18 14:48:47 david__schmidt
755 # Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
756 # with what was really the latest development (the v_3_0_branch branch)
758 # Revision 1.33.2.22 2004/01/30 17:09:29 oes
759 # Bumped version for 3.0.3
761 # Revision 1.33.2.21 2003/03/26 00:25:00 oes
762 # Bump version for 3.0.2
764 # Revision 1.33.2.20 2003/03/20 03:27:11 hal9
765 # Bump version for 3.0.1 pending release.
767 # Revision 1.33.2.19 2002/08/25 23:36:03 hal9
768 # Bump version for 3.0.0.
770 # Revision 1.33.2.18 2002/08/10 11:28:50 oes
773 # Revision 1.33.2.17 2002/08/07 01:08:49 hal9
774 # Bumped version to 2.9.18.
776 # Revision 1.33.2.16 2002/08/05 08:42:13 kick_
777 # same permissions, same runlevels as all the other initscripts
779 # Revision 1.33.2.15 2002/07/30 21:51:19 hal9
780 # Bump version to 2.9.17.
782 # Revision 1.33.2.14 2002/07/27 21:58:16 kick_
785 # Revision 1.33.2.13 2002/07/27 21:39:41 kick_
786 # condrestart raised an error during an fresh install when privoxy wasn't already running
788 # Revision 1.33.2.12 2002/07/27 15:47:10 hal9
789 # Reset version and release for 2.9.16.
791 # Revision 1.33.2.11 2002/07/25 09:47:57 kick_
792 # 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
794 # Revision 1.33.2.10 2002/07/12 09:14:26 kick_
795 # don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge
797 # Revision 1.33.2.9 2002/07/05 17:16:19 morcego
798 # - Changing delete order for groups and users (users should be first)
800 # Revision 1.33.2.8 2002/07/03 20:46:24 morcego
801 # - Changing sed expression that removed CR from the end of the lines. This
802 # new one removes any control caracter, and should work with older versions
805 # Revision 1.33.2.7 2002/07/02 18:16:48 morcego
806 # - Fixing defattr values. File and directory modes where swapped
808 # Revision 1.33.2.6 2002/07/02 17:38:10 morcego
809 # Bumping Release number
811 # Revision 1.33.2.5 2002/07/02 11:43:20 hal9
812 # Fix typo in templates creation.
814 # Revision 1.33.2.4 2002/06/26 17:32:45 morcego
815 # Integrating fixed from the main branch.
817 # Revision 1.33.2.3 2002/06/24 12:13:34 kick_
818 # shut up rpmlint. btw: The vendor tag should be set in you .rpmmacros file, not in the spec file!
820 # Revision 1.33.2.2 2002/05/28 02:39:38 hal9
821 # Replace index.html with privoxy-index.html for docs.
823 # Revision 1.33.2.1 2002/05/26 17:20:23 hal9
824 # Add images to doc dirs.
826 # Revision 1.33 2002/05/25 02:08:23 hal9
827 # Add doc/images directory.
828 # Redhat: alphabetized list of templates (and I think added one in the process)
830 # Revision 1.32 2002/05/16 01:37:29 hal9
831 # Add new template file so CGI stuff works :)
833 # Revision 1.31 2002/05/03 17:14:35 morcego
834 # *.spec: Version bump to 2.9.15
835 # -rh.spec: noreplace for %%{privoxyconf}/config
836 # Will interrupt the build if versions from configure.in and
837 # specfile do not match
839 # Revision 1.30 2002/04/26 15:51:05 morcego
840 # Changing Vendor value to Privoxy.Org
842 # Revision 1.29 2002/04/24 03:13:51 hal9
843 # New actions files changes.
845 # Revision 1.28 2002/04/22 18:51:33 morcego
846 # user and group now get removed on rh too.
848 # Revision 1.27 2002/04/22 16:32:31 morcego
849 # configure.in, *.spec: Bumping release to 2 (2.9.14-2)
850 # -rh.spec: uid and gid are now macros
851 # -suse.spec: Changing the header Copyright to License (Copyright is
854 # Revision 1.26 2002/04/22 16:24:36 morcego
855 # - Changes to fixate the uid and gid values as (both) 73. This is a
856 # value we hope to standarize for all distributions. RedHat already
857 # uses it, and Conectiva should start as soon as I find where the heck
858 # I left my cluebat :-)
859 # - Only remove the user and group on uninstall if this is not redhat, once
860 # redhat likes to have the values allocated even if the package is not
863 # Revision 1.25 2002/04/17 01:59:12 hal9
864 # Add --disable-dynamic-pcre.
866 # Revision 1.24 2002/04/11 10:09:20 oes
869 # Revision 1.23 2002/04/10 18:14:45 morcego
870 # - (privoxy-rh.spec only) Relisting template files on the %%files section
871 # - (configure.in, privoxy-rh.spec) Bumped package release to 5
873 # Revision 1.22 2002/04/09 22:06:12 hal9
876 # Revision 1.21 2002/04/09 02:52:26 hal9
877 # - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
878 # - Remove templates/blocked-compact.
879 # - Add more docbook stuff to Buildrequires.
881 # Revision 1.20 2002/04/08 20:27:45 swa
884 # Revision 1.19 2002/03/27 22:44:59 sarantis
885 # Include correct documentation file.
887 # Revision 1.18 2002/03/27 22:10:14 sarantis
888 # bumped Hal's last commit 1 day to the future to make rpm build again.
890 # Revision 1.17 2002/03/27 00:48:23 hal9
893 # Revision 1.16 2002/03/26 22:29:55 swa
894 # we have a new homepage!
896 # Revision 1.15 2002/03/26 17:39:54 morcego
897 # Adding comment on the specfile to remember the packager to update
898 # the release number on the configure script
900 # Revision 1.14 2002/03/26 14:25:15 hal9
901 # Added edit-actions-for-url-filter to templates in %%config
903 # Revision 1.13 2002/03/25 13:31:04 morcego
904 # Bumping Release tag.
906 # Revision 1.12 2002/03/25 03:11:40 hal9
907 # Do it right way this time :/
909 # Revision 1.11 2002/03/25 03:09:51 hal9
912 # Revision 1.10 2002/03/24 22:16:14 morcego
913 # Just removing some old commentaries.
915 # Revision 1.9 2002/03/24 22:03:22 morcego
916 # Should be working now. See %changelog for details
918 # Revision 1.8 2002/03/24 21:13:01 morcego
921 # Revision 1.7 2002/03/24 21:07:18 hal9
922 # Add autoheader, etc.
924 # Revision 1.6 2002/03/24 19:56:40 hal9
925 # /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
927 # Revision 1.4 2002/03/24 13:32:42 swa
928 # name change related issues
930 # Revision 1.3 2002/03/24 12:56:21 swa
931 # name change related issues.
933 # Revision 1.2 2002/03/24 11:40:14 swa
936 # Revision 1.1 2002/03/24 11:23:44 swa
939 # Revision 1.1 2002/03/22 20:53:03 morcego
940 # - Ongoing process to change name to JunkbusterNG
941 # - configure/configure.in: no change needed
943 # - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
944 # - PROGRAM = jbng@EXEEXT@
945 # - rh-spec now references as junkbusterng-rh.spec
946 # - redhat-upload: references changed to junkbusterng-* (package names)
947 # - tarball-dist: references changed to JunkbusterNG-distribution-*
948 # - tarball-src: now JunkbusterNG-*
949 # - install: initscript now junkbusterng.init and junkbusterng (when
951 # - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
952 # - junkbusterng.spec:
953 # - References to the expression ijb where changed where possible
954 # - New package name: junkbusterng (all in lower case, acording to
955 # the LSB recomendation)
956 # - Version changed to: 2.9.13
958 # - Added: junkbuster to obsoletes and conflicts (Not sure this is
959 # right. If it obsoletes, why conflict ? Have to check it later)
960 # - Summary changed: Stefan, please check and aprove it
961 # - Changes description to use the new name
962 # - Sed string was NOT changed. Have to wait to the manpage to
964 # - Keeping the user junkbuster for now. It will require some aditional
965 # changes on the script (scheduled for the next specfile release)
966 # - Added post entry to move the old logfile to the new log directory
967 # - Removing "chkconfig --add" entry (not good to have it automaticaly
968 # added to the startup list).
969 # - Added preun section to stop the service with the old name, as well
970 # as remove it from the startup list
971 # - Removed the chkconfig --del entry from the conditional block on
972 # the preun scriptlet (now handled on the %files section)
973 # - junkbuster.init: renamed to junkbusterng.init
974 # - junkbusterng.init:
975 # - Changed JB_BIN to jbng
976 # - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
977 # be used where necessary (config dir)
980 # - The config directory is /etc/junkbuster yet. Have to change it on the
981 # specfile, after it is changes on the code
982 # - The only files that got renamed on the cvs tree were the rh specfile and
983 # the init file. Some file references got changes on the makefile and on the
984 # rh-spec (as listed above)
986 # Revision 1.43 2002/03/21 16:04:10 hal9
987 # added ijb_docs.css to %doc
989 # Revision 1.42 2002/03/12 13:41:18 sarantis
990 # remove hard-coded "ijbswa" string in build phase
992 # Revision 1.41 2002/03/11 22:58:32 hal9
993 # Remove --enable-no-gifs
995 # Revision 1.39 2002/03/08 18:57:29 swa
996 # remove user junkbuster after de-installation.
998 # Revision 1.38 2002/03/08 13:45:27 morcego
999 # Adding libtool to Buildrequires
1001 # Revision 1.37 2002/03/07 19:23:49 swa
1002 # i hate to scroll. suse: wrong configdir.
1004 # Revision 1.36 2002/03/07 05:06:54 morcego
1005 # Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
1007 # Revision 1.34 2002/03/07 00:11:57 morcego
1008 # Few changes on the %pre and %post sections of the rh specfile to handle
1009 # usernames more cleanly
1011 # Revision 1.33 2002/03/05 13:13:57 morcego
1012 # - Added "make redhat-dok" to the build phase
1013 # - Added docbook-utils to BuildRequires
1015 # Revision 1.32 2002/03/05 12:34:24 morcego
1016 # - Changing section internaly on the manpage from 1 to 8
1017 # - We now require packages, not files, to avoid issues with apt
1019 # Revision 1.31 2002/03/04 18:06:09 morcego
1020 # SPECFILE: fixing permissing of the init script (broken by the last change)
1022 # Revision 1.30 2002/03/04 16:18:03 morcego
1023 # General cleanup of the rh specfile.
1026 # * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
1027 # + junkbuster-2.9.11-2
1028 # - General specfile fixup, using the best recomended practices, including:
1029 # - Adding -q to %%setup
1030 # - Using macros whereever possible
1031 # - Not using wildchars on %%files section
1032 # - Doubling the percentage char on changelog and comments, to
1033 # avoid rpm expanding them
1035 # Revision 1.29 2002/03/03 19:21:22 hal9
1036 # Init script fails if shell is /bin/false.
1038 # Revision 1.28 2002/01/09 18:34:03 hal9
1041 # Revision 1.27 2002/01/09 18:32:02 hal9
1042 # Removed RPM_OPT_FLAGS kludge.
1044 # Revision 1.26 2002/01/09 18:21:10 hal9
1045 # A few minor updates.
1047 # Revision 1.25 2001/12/28 01:45:36 steudten
1048 # Add paranoia check and BuildReq: gzip
1050 # Revision 1.24 2001/12/01 21:43:14 hal9
1051 # Allowed for new ijb.action file.
1053 # Revision 1.23 2001/11/06 12:09:03 steudten
1054 # Compress doc files. Install README and AUTHORS at last as document.
1056 # Revision 1.22 2001/11/05 21:37:34 steudten
1057 # Fix to include the actual version for name.
1058 # Let the 'real' packager be included - sorry stefan.
1060 # Revision 1.21 2001/10/31 19:27:27 swa
1061 # consistent description. new name for suse since
1062 # we had troubles with rpms of identical names
1065 # Revision 1.20 2001/10/24 15:45:49 hal9
1066 # To keep Thomas happy (aka correcting my mistakes)
1068 # Revision 1.19 2001/10/15 03:23:59 hal9
1071 # Revision 1.17 2001/10/10 18:59:28 hal9
1072 # Minor change for init script.
1074 # Revision 1.16 2001/09/24 20:56:23 hal9
1077 # Revision 1.13 2001/09/10 17:44:43 swa
1078 # integrate three pieces of documentation. needs work.
1079 # will not build cleanly under redhat.
1081 # Revision 1.12 2001/09/10 16:25:04 swa
1082 # copy all templates. version updated.
1084 # Revision 1.11 2001/07/03 11:00:25 sarantis
1085 # replaced permissionsfile with actionsfile
1087 # Revision 1.10 2001/07/03 09:34:44 sarantis
1088 # bumped up version number.
1090 # Revision 1.9 2001/06/12 18:15:29 swa
1091 # the %% in front of configure (see tag below) confused
1092 # the rpm build process on 7.1.
1094 # Revision 1.8 2001/06/12 17:15:56 swa
1095 # fixes, because a clean build on rh6.1 was impossible.
1096 # GZIP confuses make, %% configure confuses rpm, etc.
1098 # Revision 1.7 2001/06/11 12:17:26 sarantis
1099 # fix typo in %%post
1101 # Revision 1.6 2001/06/11 11:28:25 sarantis
1102 # Further optimizations and adaptations in the spec file.
1104 # Revision 1.5 2001/06/09 09:14:11 swa
1105 # shamelessly adapted RPM stuff from the newest rpm that
1106 # RedHat provided for the JB.
1108 # Revision 1.4 2001/06/08 20:54:18 swa
1109 # type with status file. remove forward et. al from file list.
1111 # Revision 1.3 2001/06/07 17:28:10 swa
1114 # Revision 1.2 2001/06/04 18:31:58 swa
1115 # files are now prefixed with either `confdir' or `logdir'.
1116 # `make redhat-dist' replaces both entries confdir and logdir
1117 # with redhat values
1119 # Revision 1.1 2001/06/04 10:44:57 swa
1120 # `make redhatr-dist' now works. Except for the paths
1121 # in the config file.