1 # $Id: privoxy-rh.spec,v 1.33.2.9 2002/07/05 17:16:19 morcego 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 || /bin/true
211 [ -f %{_localstatedir}/log/%{name}/%{name} ] &&\
212 mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile || /bin/true
213 chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null
214 chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null
215 /sbin/chkconfig --add privoxy
216 if [ "$1" = "1" ]; then
217 /sbin/service %{name} condrestart > /dev/null 2>&1
221 /sbin/service %{veryoldname} stop > /dev/null 2>&1 ||:
222 /sbin/service %{oldname} stop > /dev/null 2>&1 ||:
224 if [ "$1" = "0" ]; then
225 /sbin/service %{name} stop > /dev/null 2>&1 ||:
226 /sbin/chkconfig --del privoxy
230 #if [ "$1" -ge "1" ]; then
231 # /sbin/service %{name} condrestart > /dev/null 2>&1
233 # We only remove it we this is not an upgrade
234 if [ "$1" = "0" ]; then
235 id privoxy > /dev/null 2>&1 && %{_sbindir}/userdel privoxy || /bin/true
236 /bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null && %{_sbindir}/groupdel %{name} || /bin/true
240 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
243 %defattr(0644,root,root,0755)
244 %doc README AUTHORS ChangeLog LICENSE
245 %doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
246 %doc doc/webserver/developer-manual
247 %doc doc/webserver/user-manual
248 %doc doc/webserver/faq
249 %doc doc/webserver/p_doc.css doc/webserver/p_web.css doc/webserver/privoxy-index.html
250 %doc doc/webserver/images
251 %doc doc/webserver/man-page
253 # ATTENTION FOR defattr change here !
254 %defattr(0644,%{name},%{name},0755)
257 %dir %{privoxyconf}/templates
258 %dir %{_localstatedir}/log/%{name}
260 %attr(0744,%{name},%{name})%{_sbindir}/%{name}
262 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
263 # We should not use wildchars here. This could mask missing files problems
265 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
266 %config(noreplace) %{privoxyconf}/config
267 %config %{privoxyconf}/standard.action
268 %config(noreplace) %{privoxyconf}/user.action
269 %config %{privoxyconf}/default.action
270 %config %{privoxyconf}/default.filter
271 %config %{privoxyconf}/trust
273 # Please keep these alphabetized so its easier to find one that
275 %config %{privoxyconf}/templates/blocked
276 %config %{privoxyconf}/templates/cgi-error-404
277 %config %{privoxyconf}/templates/cgi-error-bad-param
278 %config %{privoxyconf}/templates/cgi-error-disabled
279 %config %{privoxyconf}/templates/cgi-error-file
280 %config %{privoxyconf}/templates/cgi-error-file-read-only
281 %config %{privoxyconf}/templates/cgi-error-modified
282 %config %{privoxyconf}/templates/cgi-error-parse
283 %config %{privoxyconf}/templates/cgi-style.css
284 %config %{privoxyconf}/templates/connect-failed
285 %config %{privoxyconf}/templates/default
286 %config %{privoxyconf}/templates/edit-actions-add-url-form
287 %config %{privoxyconf}/templates/edit-actions-for-url
288 %config %{privoxyconf}/templates/edit-actions-for-url-filter
289 %config %{privoxyconf}/templates/edit-actions-list
290 %config %{privoxyconf}/templates/edit-actions-list-button
291 %config %{privoxyconf}/templates/edit-actions-list-section
292 %config %{privoxyconf}/templates/edit-actions-list-url
293 %config %{privoxyconf}/templates/edit-actions-remove-url-form
294 %config %{privoxyconf}/templates/edit-actions-url-form
295 %config %{privoxyconf}/templates/mod-local-help
296 %config %{privoxyconf}/templates/mod-support-and-service
297 %config %{privoxyconf}/templates/mod-title
298 %config %{privoxyconf}/templates/mod-unstable-warning
299 %config %{privoxyconf}/templates/no-such-domain
300 %config %{privoxyconf}/templates/show-request
301 %config %{privoxyconf}/templates/show-status
302 %config %{privoxyconf}/templates/show-status-file
303 %config %{privoxyconf}/templates/show-url-info
304 %config %{privoxyconf}/templates/show-version
305 %config %{privoxyconf}/templates/toggle
306 %config %{privoxyconf}/templates/toggle-mini
307 %config %{privoxyconf}/templates/untrusted
309 # Attention, new defattr change here !
310 %defattr(0644,root,root,0755)
312 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
313 %config(noreplace) %attr(0744,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
315 %{_mandir}/man1/%{name}.*
318 * Fri Jul 12 2002 Karsten Hopp <karsten@redhat.de>
319 - don't use ghost files for rcX.d/*, using chkconfig is the
320 correct way to do this job (#68619)
322 * Fri Jul 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
324 - Changing delete order for groups and users (users should be first)
326 * Wed Jul 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
328 - Changing sed expression that removed CR from the end of the lines. This
329 new one removes any control caracter, and should work with older versions
332 * Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
334 - Fixing defattr values. File and directory modes where swapped
336 * Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
338 - Bumping Release number (which should be changed every time the specfile
341 * Tue Jul 02 2002 Hal Burgiss <hal@foobox.net>
343 - Fix typo in templates creation.
345 * Wed Jun 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
347 - Fixing issues created by specfile sync between branches
348 - Correcting the release number (WARNING)
349 - Reintroducing text file conversion (dos -> unix)
350 - Reconverting hardcoded directories to macros
351 - Refixing ownership of privoxy files (now using multiple defattr
354 * Thu Jun 20 2002 Karsten Hopp <karsten@redhat.de>
355 - fix several .spec file issues to shut up rpmlint
356 - non-standard-dir-perm /var/log/privoxy 0744
357 - invalid-vendor Privoxy.Org (This is ok for binaries compiled by privoxy
358 members, but not for packages from Red Hat)
359 - non-standard-group Networking/Utilities
360 - logrotate and init scripts should be noreplace
362 * Mon May 27 2002 Hal Burgiss <hal@foobox.net>
364 - Index.html is now privoxy-index.html for doc usage.
366 * Sat May 25 2002 Hal Burgiss <hal@foobox.net>
368 - Add html man page so index.html does not 404.
370 * Fri May 24 2002 Hal Burgiss <hal@foobox.net>
372 - Add another template and alphabetize these for easier tracking.
373 - Add doc/images directory.
375 * Wed May 15 2002 Hal Burgiss <hal@foobox.net>
377 - Add templates/edit-actions-list-button
379 * Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
382 - Adding noreplace for %%{privoxyconf}/config
383 - Included a method to verify if the versions declared on the specfile and
384 configure.in match. Interrupt the build if they don't.
386 * Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
388 - Changing Vendor to Privoxy.Org
390 * Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
392 - Adjust for new *actions files.
394 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
396 - Removed the redhat hack that prevented the user and group from
397 being dealocated. That was a misundestanding of my part regarding
400 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
402 - Using macros to define uid and gid values
405 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
407 - Changes to fixate the uid and gid values as (both) 73. This is a
408 value we hope to standarize for all distributions. RedHat already
409 uses it, and Conectiva should start as soon as I find where the heck
410 I left my cluebat :-)
411 - Only remove the user and group on uninstall if this is not redhat, once
412 redhat likes to have the values allocated even if the package is not
415 * Tue Apr 16 2002 Hal Burgiss <hal@foobox.net>
417 - Add --disable-dynamic-pcre to configure.
419 * Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
421 - Relisting template files on the %%files section
423 * Tue Apr 09 2002 Hal Burgiss <hal@foobox.net>
425 - Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
427 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
429 - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
430 - Remove templates/blocked-compact.
431 - Add more docbook stuff to Builderquires.
433 * Thu Mar 28 2002 Sarantis Paskalis <sarantis@cnl.di.uoa.gr>
435 - Include correct documentation file.
437 * Tue Mar 26 2002 Hal Burgiss <hal@foobox.net>
439 - Fix typo in Description.
441 * Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
443 - Added commentary asking to update the release value on the configure
446 * Tue Mar 25 2002 Hal Burgiss <hal@foobox.net>
448 - Added the missing edit-actions-for-url-filter to templates.
450 * Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
452 - Fixing Release number
454 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
458 * Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@suespammers.org>
460 - Fixed the init files entries. Now we use %%ghost
461 - improved username (and groupname) handling on the %%pre section. By improved
462 I mean: we do it by brute force now. Much easier to maintain. Yeah, you
463 got it right. No more Mr. Nice Guy.
464 - Removed the userdel call on %%post. No need, once it's complety handled on
467 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
468 + junkbusterng-2.9.13-1
469 Added autoheader. Added autoconf to buildrequires.
471 * Sun Mar 24 2002 Hal Burgiss <hal@foobox.net>
472 + junkbusterng-2.9.13-1
473 - Fixed build problems re: name conflicts with man page and logrotate.
474 - Commented out rc?d/* configs for time being, which are causing a build
475 - failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
476 - changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
478 * Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
479 + junkbusterng-2.9.13-1
480 - References to the expression ijb where changed where possible
481 - New package name: junkbusterng (all in lower case, acording to
482 the LSB recomendation)
483 - Version changed to: 2.9.13
485 - Added: junkbuster to obsoletes and conflicts (Not sure this is
486 right. If it obsoletes, why conflict ? Have to check it later)
487 - Summary changed: Stefan, please check and aprove it
488 - Changes description to use the new name
489 - Sed string was NOT changed. Have to wait to the manpage to
491 - Keeping the user junkbuster for now. It will require some aditional
492 changes on the script (scheduled for the next specfile release)
493 - Added post entry to move the old logfile to the new log directory
494 - Removing "chkconfig --add" entry (not good to have it automaticaly
495 added to the startup list).
496 - Added preun section to stop the service with the old name, as well
497 as remove it from the startup list
498 - Removed the chkconfig --del entry from the conditional block on
499 the preun scriptlet (now handled on the %files section)
501 * Thu Mar 21 2002 Hal Burgiss <hal@foobox.net>
502 - added ijb_docs.css to docs.
504 * Mon Mar 11 2002 Hal Burgiss <hal@foobox.net>
505 + junkbuster-2.9.11-8
506 - Take out --enable-no-gifs, breaks some browsers.
508 * Sun Mar 10 2002 Hal Burgiss <hal@foobox.net>
509 + junkbuster-2.9.11-8
510 - Add --enable-no-gifs to configure.
512 * Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
513 + junkbuster-2.9.11-7
514 - Added BuildRequires to libtool.
516 * Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
517 + junkbuster-2.9.11-6
518 - Changed the routined that handle the junkbust and junkbuster users on
519 %%pre and %%post to work in a smoother manner
520 - %%files now uses hardcoded usernames, to avoid problems with package
521 name changes in the future
523 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
524 + junkbuster-2.9.11-5
525 - Added "make redhat-dok" to the build process
526 - Added docbook-utils to BuildRequires
528 * Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
529 + junkbuster-2.9.11-4
530 - Changing man section in the manpage from 1 to 8
531 - We now require packages, not files, to avoid issues with apt
533 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
534 + junkbuster-2.9.11-3
535 - Fixing permissions of the init script
537 * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
538 + junkbuster-2.9.11-2
539 - General specfile fixup, using the best recomended practices, including:
540 - Adding -q to %%setup
541 - Using macros whereever possible
542 - Not using wildchars on %%files section
543 - Doubling the percentage char on changelog and comments, to
544 avoid rpm expanding them
546 * Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
547 - /bin/false for shell causes init script to fail. Reverting.
549 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
550 - Removed UID 73. Included user-manual and developer-manual in docs.
551 Include other actions files. Default shell is now /bin/false.
552 Userdel user=junkbust. ChangeLog was not zipped. Removed
553 RPM_OPT_FLAGS kludge.
555 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
556 - add paranoia check for 'rm -rf %%{buildroot}'
557 - add gzip to 'BuildRequires'
559 * Sat Dec 1 2001 Hal Burgiss <hal@foobox.net>
560 - actionsfile is now ijb.action.
562 * Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
564 - Add more documents for installation
565 - Add version string to name and source
567 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
568 - Back to user 'junkbuster' and fix configure macro.
570 * Wed Oct 10 2001 Hal Burigss <hal@foobox.net>
571 - More changes for user 'junkbust'. Init script had 'junkbuster'.
573 * Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
574 - Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
575 - Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
577 * Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
578 - Added $RPM_OPT_FLAGS support, renaming of old logfile, and
579 - made sure no default shell exists for user junkbust.
581 * Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
584 * Mon Sep 25 2000 Stefan Waldherr <stefan@waldherr.org>
585 - CLF Logging patch by davep@cyw.uklinux.net
586 - Hal DeVore <haldevore@earthling.net> fix akamaitech in blocklist
588 * Sun Sep 17 2000 Stefan Waldherr <stefan@waldherr.org>
589 - Steve Kemp skx@tardis.ed.ac.uk's javascript popup patch.
590 - Markus Breitenbach breitenb@rbg.informatik.tu-darmstadt.de supplied
591 numerous fixes and enhancements for Steve's patch.
592 - adamlock@netscape.com (Adam Lock) in the windows version:
593 - Taskbar activity spinner always spins even when logging is
594 turned off (which is the default) - people who don't
595 like the spinner can turn it off from a menu option.
596 - Taskbar popup menu has a options submenu - people can now
597 open the settings files for cookies, blockers etc.
598 without opening the JB window.
599 - Logging functionality works again
600 - Buffer overflow is fixed - new code uses a bigger buffer
601 and snprintf so it shouldn't overflow anymore.
602 - Fixed userid swa, group learning problem while installing.
604 - Added patch by Benjamin Low <ben@snrc.uow.edu.au> that prevents JB to
605 core dump when there is no log file.
606 - Tweaked SuSE startup with the help of mohataj@gmx.net and Doc.B@gmx.de.
607 - Fixed man page to include imagefile and popupfile.
608 - Sanity check for the statistics function added.
609 - "Patrick D'Cruze" <pdcruze@orac.iinet.net.au>: It seems Microsoft
610 are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
611 With IIS/5, it appears to omit the trailing \r\n from http header
612 only messages. eg, when I visit http://www.hotmail.com, IIS/5
613 responds with a HTTP 302 redirect header. However, this header
614 message is missing the trailing \r\n. IIS/5 then closes the
615 connection. Junkbuster, unfortunately, discards the header becomes
616 it thinks it is incomplete - and it is. MS have transmitted an
618 - Added bug reports and patch submission forms in the docs.
620 * Mon Mar 20 2000 Stefan Waldherr <stefan@waldherr.org>
621 Andrew <anw@tirana.freewire.co.uk> extended the JB:
622 Display of statistics of the total number of requests and the number
623 of requests filtered by junkbuster, also the percentage of requests
624 filtered. Suppression of the listing of files on the proxy-args page.
625 All stuff optional and configurable.
627 * Sun Sep 12 1999 Stefan Waldherr <stefan@waldherr.org>
628 Jan Willamowius (jan@janhh.shnet.org) fixed a bug in the
629 code which prevented the JB from handling URLs of the form
630 user:password@www.foo.com. Fixed.
632 * Mon Aug 2 1999 Stefan Waldherr <stefan@waldherr.org>
633 Blank images are no longer cached, thanks to a hint from Markus
634 Breitenbach <breitenb@rbg.informatik.tu-darmstadt.de>. The user
635 agent is NO longer set by the Junkbuster. Sadly, many sites depend
636 on the correct browser version nowadays. Incorporated many
637 suggestions from Jan "Yenya" Kasprzak <kas@fi.muni.cz> for the
638 spec file. Fixed logging problem and since runlevel 2 does not
639 use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
640 /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
641 <walker@netgate.net>. You should now be able to build this RPM as
642 a non-root user (mathias@weidner.sem.lipsia.de).
644 * Sun Jan 31 1999 Stefan Waldherr <stefan@waldherr.org>
645 %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
646 to allow more sophisticated matching of blocked images. Logrotate
647 logfile. Added files for auto-updating the blocklist et al.
649 * Wed Dec 16 1998 Stefan Waldherr <stefan@waldherr.org>
650 Configure blank version via config file. No separate blank
651 version anymore. Added Roland's <roland@spinnaker.rhein.de>
652 patch to show a logo instead of a blank area. Added a suggestion
653 from Alex <alex@cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
654 More regexps in the blocklist. Prepared the forwardfile for
655 squid. Extended image regexp with help from gabriel
656 <somlo@CS.ColoState.EDU>.
658 * Thu Nov 19 1998 Stefan Waldherr <stefan@waldherr.org>
659 All RPMs now identify themselves in the show-proxy-args page.
660 Released Windoze version. Run junkbuster as nobody instead of
663 * Fri Oct 30 1998 Stefan Waldherr <stefan@waldherr.org>
664 Newest version. First release (hence the little version number
665 mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
666 security over 2.0.1; some multi-user sites will need to change
667 the listen-address in the configuration file. The blank version of
668 the Internet Junkbuster has a more sophisticated way of replacing
669 images. All RPMs identify themselves in the show-proxy-args page.
671 * Thu Sep 23 1998 Stefan Waldherr <stefan@waldherr.org>
672 Modified the blocking feature, so that only GIFs and JPEGs are
673 blocked and replaced but not HTML pages. Thanks to
674 "Gerd Flender" <plgerd@informatik.uni-siegen.de> for this nice
675 idea. Added numerous stuff to the blocklist. Keep patches in
676 seperate files and no longer in diffs (easier to maintain).
678 * Tue Jun 16 1998 Stefan Waldherr <swa@cs.cmu.edu>
679 Moved config files to /etc/junkbuster directory, moved man page,
680 added BuildRoot directive (Thanks to Alexey Nogin <ayn2@cornell.edu>)
681 Made new version junkbuster-raw (which is only a stripped version of
682 the junkuster rpm, i.e. without my blocklist, etc.)
684 * Tue Jun 16 1998 (2.0-1)
685 Uhm, not that much. Just a new junkbuster version that
686 fixes a couple of bugs ... and of course a bigger
687 blocklist with the unique Now-less-ads-than-ever(SM)
689 Oh, one thing: I changed the default user agent to Linux -- no
690 need anymore to support Apple.
692 * Tue Jun 16 1998 (2.0-0)
693 Now-less-ads-than-ever (SM)
694 compiled with gcc instead of cc
695 compiled with -O3, thus it should be a little faster
696 show-proxy-args now works
697 /etc/junkbuster.init wasn't necessary
699 * Tue Jun 16 1998 (1.4)
700 some more config files were put into /etc
701 The junkbuster-blank rpm returns a 1x1 pixel image, that gets
702 displayed by Netscape instead of the blocked image.
703 Read http://www.waldherr.org/junkbuster/ for
706 * Tue Jun 16 1998 (1.3)
707 The program has been moved to /usr/sbin (from /usr/local/bin)
708 Init- and stopscripts (/etc/rc.d/rc*) have been added so
709 that the junkbuster starts automatically during bootup.
710 The /etc/blocklist file is much more sophisticated. Theoretically
711 one should e.g. browse all major US and German newspapers without
712 seeing one annoying ad.
713 junkbuster.init was modified. It now starts junkbuster with an
714 additional "-r @" flag.
716 # $Log: privoxy-rh.spec,v $
717 # Revision 1.33.2.9 2002/07/05 17:16:19 morcego
718 # - Changing delete order for groups and users (users should be first)
720 # Revision 1.33.2.8 2002/07/03 20:46:24 morcego
721 # - Changing sed expression that removed CR from the end of the lines. This
722 # new one removes any control caracter, and should work with older versions
725 # Revision 1.33.2.7 2002/07/02 18:16:48 morcego
726 # - Fixing defattr values. File and directory modes where swapped
728 # Revision 1.33.2.6 2002/07/02 17:38:10 morcego
729 # Bumping Release number
731 # Revision 1.33.2.5 2002/07/02 11:43:20 hal9
732 # Fix typo in templates creation.
734 # Revision 1.33.2.4 2002/06/26 17:32:45 morcego
735 # Integrating fixed from the main branch.
737 # Revision 1.33.2.3 2002/06/24 12:13:34 kick_
738 # shut up rpmlint. btw: The vendor tag should be set in you .rpmmacros file, not in the spec file!
740 # Revision 1.33.2.2 2002/05/28 02:39:38 hal9
741 # Replace index.html with privoxy-index.html for docs.
743 # Revision 1.33.2.1 2002/05/26 17:20:23 hal9
744 # Add images to doc dirs.
746 # Revision 1.33 2002/05/25 02:08:23 hal9
747 # Add doc/images directory.
748 # Redhat: alphabetized list of templates (and I think added one in the process)
750 # Revision 1.32 2002/05/16 01:37:29 hal9
751 # Add new template file so CGI stuff works :)
753 # Revision 1.31 2002/05/03 17:14:35 morcego
754 # *.spec: Version bump to 2.9.15
755 # -rh.spec: noreplace for %%{privoxyconf}/config
756 # Will interrupt the build if versions from configure.in and
757 # specfile do not match
759 # Revision 1.30 2002/04/26 15:51:05 morcego
760 # Changing Vendor value to Privoxy.Org
762 # Revision 1.29 2002/04/24 03:13:51 hal9
763 # New actions files changes.
765 # Revision 1.28 2002/04/22 18:51:33 morcego
766 # user and group now get removed on rh too.
768 # Revision 1.27 2002/04/22 16:32:31 morcego
769 # configure.in, *.spec: Bumping release to 2 (2.9.14-2)
770 # -rh.spec: uid and gid are now macros
771 # -suse.spec: Changing the header Copyright to License (Copyright is
774 # Revision 1.26 2002/04/22 16:24:36 morcego
775 # - Changes to fixate the uid and gid values as (both) 73. This is a
776 # value we hope to standarize for all distributions. RedHat already
777 # uses it, and Conectiva should start as soon as I find where the heck
778 # I left my cluebat :-)
779 # - Only remove the user and group on uninstall if this is not redhat, once
780 # redhat likes to have the values allocated even if the package is not
783 # Revision 1.25 2002/04/17 01:59:12 hal9
784 # Add --disable-dynamic-pcre.
786 # Revision 1.24 2002/04/11 10:09:20 oes
789 # Revision 1.23 2002/04/10 18:14:45 morcego
790 # - (privoxy-rh.spec only) Relisting template files on the %%files section
791 # - (configure.in, privoxy-rh.spec) Bumped package release to 5
793 # Revision 1.22 2002/04/09 22:06:12 hal9
796 # Revision 1.21 2002/04/09 02:52:26 hal9
797 # - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
798 # - Remove templates/blocked-compact.
799 # - Add more docbook stuff to Buildrequires.
801 # Revision 1.20 2002/04/08 20:27:45 swa
804 # Revision 1.19 2002/03/27 22:44:59 sarantis
805 # Include correct documentation file.
807 # Revision 1.18 2002/03/27 22:10:14 sarantis
808 # bumped Hal's last commit 1 day to the future to make rpm build again.
810 # Revision 1.17 2002/03/27 00:48:23 hal9
813 # Revision 1.16 2002/03/26 22:29:55 swa
814 # we have a new homepage!
816 # Revision 1.15 2002/03/26 17:39:54 morcego
817 # Adding comment on the specfile to remember the packager to update
818 # the release number on the configure script
820 # Revision 1.14 2002/03/26 14:25:15 hal9
821 # Added edit-actions-for-url-filter to templates in %%config
823 # Revision 1.13 2002/03/25 13:31:04 morcego
824 # Bumping Release tag.
826 # Revision 1.12 2002/03/25 03:11:40 hal9
827 # Do it right way this time :/
829 # Revision 1.11 2002/03/25 03:09:51 hal9
832 # Revision 1.10 2002/03/24 22:16:14 morcego
833 # Just removing some old commentaries.
835 # Revision 1.9 2002/03/24 22:03:22 morcego
836 # Should be working now. See %changelog for details
838 # Revision 1.8 2002/03/24 21:13:01 morcego
841 # Revision 1.7 2002/03/24 21:07:18 hal9
842 # Add autoheader, etc.
844 # Revision 1.6 2002/03/24 19:56:40 hal9
845 # /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
847 # Revision 1.4 2002/03/24 13:32:42 swa
848 # name change related issues
850 # Revision 1.3 2002/03/24 12:56:21 swa
851 # name change related issues.
853 # Revision 1.2 2002/03/24 11:40:14 swa
856 # Revision 1.1 2002/03/24 11:23:44 swa
859 # Revision 1.1 2002/03/22 20:53:03 morcego
860 # - Ongoing process to change name to JunkbusterNG
861 # - configure/configure.in: no change needed
863 # - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
864 # - PROGRAM = jbng@EXEEXT@
865 # - rh-spec now references as junkbusterng-rh.spec
866 # - redhat-upload: references changed to junkbusterng-* (package names)
867 # - tarball-dist: references changed to JunkbusterNG-distribution-*
868 # - tarball-src: now JunkbusterNG-*
869 # - install: initscript now junkbusterng.init and junkbusterng (when
871 # - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
872 # - junkbusterng.spec:
873 # - References to the expression ijb where changed where possible
874 # - New package name: junkbusterng (all in lower case, acording to
875 # the LSB recomendation)
876 # - Version changed to: 2.9.13
878 # - Added: junkbuster to obsoletes and conflicts (Not sure this is
879 # right. If it obsoletes, why conflict ? Have to check it later)
880 # - Summary changed: Stefan, please check and aprove it
881 # - Changes description to use the new name
882 # - Sed string was NOT changed. Have to wait to the manpage to
884 # - Keeping the user junkbuster for now. It will require some aditional
885 # changes on the script (scheduled for the next specfile release)
886 # - Added post entry to move the old logfile to the new log directory
887 # - Removing "chkconfig --add" entry (not good to have it automaticaly
888 # added to the startup list).
889 # - Added preun section to stop the service with the old name, as well
890 # as remove it from the startup list
891 # - Removed the chkconfig --del entry from the conditional block on
892 # the preun scriptlet (now handled on the %files section)
893 # - junkbuster.init: renamed to junkbusterng.init
894 # - junkbusterng.init:
895 # - Changed JB_BIN to jbng
896 # - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
897 # be used where necessary (config dir)
900 # - The config directory is /etc/junkbuster yet. Have to change it on the
901 # specfile, after it is changes on the code
902 # - The only files that got renamed on the cvs tree were the rh specfile and
903 # the init file. Some file references got changes on the makefile and on the
904 # rh-spec (as listed above)
906 # Revision 1.43 2002/03/21 16:04:10 hal9
907 # added ijb_docs.css to %doc
909 # Revision 1.42 2002/03/12 13:41:18 sarantis
910 # remove hard-coded "ijbswa" string in build phase
912 # Revision 1.41 2002/03/11 22:58:32 hal9
913 # Remove --enable-no-gifs
915 # Revision 1.39 2002/03/08 18:57:29 swa
916 # remove user junkbuster after de-installation.
918 # Revision 1.38 2002/03/08 13:45:27 morcego
919 # Adding libtool to Buildrequires
921 # Revision 1.37 2002/03/07 19:23:49 swa
922 # i hate to scroll. suse: wrong configdir.
924 # Revision 1.36 2002/03/07 05:06:54 morcego
925 # Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
927 # Revision 1.34 2002/03/07 00:11:57 morcego
928 # Few changes on the %pre and %post sections of the rh specfile to handle
929 # usernames more cleanly
931 # Revision 1.33 2002/03/05 13:13:57 morcego
932 # - Added "make redhat-dok" to the build phase
933 # - Added docbook-utils to BuildRequires
935 # Revision 1.32 2002/03/05 12:34:24 morcego
936 # - Changing section internaly on the manpage from 1 to 8
937 # - We now require packages, not files, to avoid issues with apt
939 # Revision 1.31 2002/03/04 18:06:09 morcego
940 # SPECFILE: fixing permissing of the init script (broken by the last change)
942 # Revision 1.30 2002/03/04 16:18:03 morcego
943 # General cleanup of the rh specfile.
946 # * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
947 # + junkbuster-2.9.11-2
948 # - General specfile fixup, using the best recomended practices, including:
949 # - Adding -q to %%setup
950 # - Using macros whereever possible
951 # - Not using wildchars on %%files section
952 # - Doubling the percentage char on changelog and comments, to
953 # avoid rpm expanding them
955 # Revision 1.29 2002/03/03 19:21:22 hal9
956 # Init script fails if shell is /bin/false.
958 # Revision 1.28 2002/01/09 18:34:03 hal9
961 # Revision 1.27 2002/01/09 18:32:02 hal9
962 # Removed RPM_OPT_FLAGS kludge.
964 # Revision 1.26 2002/01/09 18:21:10 hal9
965 # A few minor updates.
967 # Revision 1.25 2001/12/28 01:45:36 steudten
968 # Add paranoia check and BuildReq: gzip
970 # Revision 1.24 2001/12/01 21:43:14 hal9
971 # Allowed for new ijb.action file.
973 # Revision 1.23 2001/11/06 12:09:03 steudten
974 # Compress doc files. Install README and AUTHORS at last as document.
976 # Revision 1.22 2001/11/05 21:37:34 steudten
977 # Fix to include the actual version for name.
978 # Let the 'real' packager be included - sorry stefan.
980 # Revision 1.21 2001/10/31 19:27:27 swa
981 # consistent description. new name for suse since
982 # we had troubles with rpms of identical names
985 # Revision 1.20 2001/10/24 15:45:49 hal9
986 # To keep Thomas happy (aka correcting my mistakes)
988 # Revision 1.19 2001/10/15 03:23:59 hal9
991 # Revision 1.17 2001/10/10 18:59:28 hal9
992 # Minor change for init script.
994 # Revision 1.16 2001/09/24 20:56:23 hal9
997 # Revision 1.13 2001/09/10 17:44:43 swa
998 # integrate three pieces of documentation. needs work.
999 # will not build cleanly under redhat.
1001 # Revision 1.12 2001/09/10 16:25:04 swa
1002 # copy all templates. version updated.
1004 # Revision 1.11 2001/07/03 11:00:25 sarantis
1005 # replaced permissionsfile with actionsfile
1007 # Revision 1.10 2001/07/03 09:34:44 sarantis
1008 # bumped up version number.
1010 # Revision 1.9 2001/06/12 18:15:29 swa
1011 # the %% in front of configure (see tag below) confused
1012 # the rpm build process on 7.1.
1014 # Revision 1.8 2001/06/12 17:15:56 swa
1015 # fixes, because a clean build on rh6.1 was impossible.
1016 # GZIP confuses make, %% configure confuses rpm, etc.
1018 # Revision 1.7 2001/06/11 12:17:26 sarantis
1019 # fix typo in %%post
1021 # Revision 1.6 2001/06/11 11:28:25 sarantis
1022 # Further optimizations and adaptations in the spec file.
1024 # Revision 1.5 2001/06/09 09:14:11 swa
1025 # shamelessly adapted RPM stuff from the newest rpm that
1026 # RedHat provided for the JB.
1028 # Revision 1.4 2001/06/08 20:54:18 swa
1029 # type with status file. remove forward et. al from file list.
1031 # Revision 1.3 2001/06/07 17:28:10 swa
1034 # Revision 1.2 2001/06/04 18:31:58 swa
1035 # files are now prefixed with either `confdir' or `logdir'.
1036 # `make redhat-dist' replaces both entries confdir and logdir
1037 # with redhat values
1039 # Revision 1.1 2001/06/04 10:44:57 swa
1040 # `make redhatr-dist' now works. Except for the paths
1041 # in the config file.