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