Hello,
Here's my submission for a new package: privoxy, a
privacy-enhanced
HTTP proxy, very useful in conjunction with TOR.
The URL to the SRPM is:
http://www.durval.com.br/RPMS/el4/privox
y/privoxy-3.0.3-2dm1.el4.src.rpm
I've attached the .spec file.
Best Regards,
--
Durval Menezes (durval AT tmp DOT com DOT br, http://www.tmp.com.br/)
# $Id: privoxy-rh.spec,v 1.33.2.22 2004/01/30 17:09:29 oes
Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
# by and Copyright (C) 1997 Anonymous Coders and
# Junkbusters Corporation. http://www.junkbusters.com
#
# This program is free software; you can redistribute it
# and/or modify it under the terms of the GNU General
# Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at
# your option) any later version.
#
# This program is distributed in the hope that it will
# be useful, but WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU General Public
# License for more details.
#
# The GNU General Public License should be included with
# this file. If not, you can view it at
# http://www.gnu.o
rg/copyleft/gpl.html
# or write to the Free Software Foundation, Inc., 59
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Defines should happen in the begining of the file
%define veryoldname junkbust
%define oldname junkbuster
%define privoxyconf %/%
%define privoxy_uid 73
%define privoxy_gid 73
Name: privoxy
# ATTENTION
# Version and release should be updated acordingly on
configure.in and
# configure. Otherwise, the package can be build with the
wrong value
Version: 3.0.3
Release: 2dm1.el4
Summary: Privoxy - privacy enhancing proxy
License: GPL
Source0: http://www.waldherr.org/%/%-%-2-stable.src.tar.gz
BuildRoot: %/%-%-root
Group: System Environment/Daemons
URL: http://www.privoxy.org/
Obsoletes: junkbuster-raw junkbuster-blank junkbuster
# Prereq: /usr/sbin/useradd , /sbin/chkconfig ,
/sbin/service
Prereq: shadow-utils, chkconfig, initscripts, sh-utils
BuildRequires: perl gzip sed libtool autoconf
Packager: Durval Menezes <durval AT tmp DOT com DOT
br>, based on original SPEC file that came in the privoxy
source tarfile
Conflicts: junkbuster-raw junkbuster-blank junkbuster
%description
Privoxy is a web proxy with advanced filtering capabilities
for
protecting privacy, filtering web page content, managing
cookies,
controlling access, and removing ads, banners, pop-ups and
other
obnoxious Internet junk. Privoxy has a very flexible
configuration and
can be customized to suit individual needs and tastes.
Privoxy has application
for both stand-alone systems and multi-user networks.
Privoxy is based on the Internet Junkbuster.
%prep
%setup -q -c
mv privoxy-3.0.3-stable/* .; rmdir privoxy-3.0.3-stable
%build
# We check to see if versions match
VERSION_MAJOR=3
VERSION_MINOR=0
VERSION_POINT=3
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}'`
if [ "%" !=
"$" ]; then
echo "The version declared on the specfile does not
match the version"
echo "declared on configure.in. This should not
happen. The build will"
echo "be interrupted now, so you can fix it."
exit 1
fi
autoheader
autoconf
%configure --disable-dynamic-pcre
make
# Docs are in CVS and tarball now.
#%%make dok
## Explicitily stripping is not recomended.
## This is handled altomaticaly by RPM, and can couse
troubles if
## anyone wants to build an unstriped version - morcego
#strip %
%install
[ "%" != "/" ] &&
rm -rf %
mkdir -p %% \
%%/man1 \
%%/log/% \
%%/templates \
%%/logrotate.d \
%%/rc.d/init.d
## Manual gziping of manpages should not be done, once it
can
## break the building on some distributions. Anyway, rpm
does it
## automagicaly these days
## Gziping the documentation files is not recomended -
morcego
#gzip README AUTHORS ChangeLog %.1 || /bin/true
install -s -m 744 % %%/%
# Using sed to "convert" from DOS format to UNIX
# This is important behaviour, and should not be removed
without some
# other assurance that these files don't get packed in the
the
# wrong format
for i in `ls *.action`
do
cat $i | sed -e 's/[[:cntrl:]]*$//' >
%%/$i
done
cat default.filter | sed -e 's/[[:cntrl:]]*$//' >
%%/default.filter
cat trust | sed -e 's/[[:cntrl:]]*$//' >
%%/trust
(
cd templates
for i in `ls`
do
cat $i | sed -e 's/[[:cntrl:]]*$//' >
%%/templates/$i
done
)
cp -f %.1 %%/man1/%.1
cp -f %.logrotate
%%/logrotate.d/%
install -m 755 %.init
%%/rc.d/init.d/%
install -m 711 -d %%/log/%
# verify all file locations, etc. in the config file
# don't start with ^ or commented lines are not replaced
## Changing the sed paramter delimiter to  , so we
don't have to
## escape the slashes
cat config | \
sed 's^confdir.*confdir %g' | \
# sed 's/^permissionsfile.*/permissionsfile
\/etc\/%\/permissionsfile/g' | \
# sed 's/^filterfile.*/default.filter
\/etc\/%\/default.filter/g' | \
# sed 's/^logfile.*/logfile
\%\/log\/%\/logfile/g' | \
# sed 's/^jarfile.*/jarfile
\%\/log\/%\/jarfile/g' | \
# sed 's/^forward.*/forward
\/etc\/%\/forward/g' | \
# sed 's/^aclfile.*/aclfile
\/etc\/%\/aclfile/g' > \
sed 's^logdir.*logdir %/log/%g' | \
sed -e 's/[[:cntrl:]]*$//' > \
%%/config
perl -pe 's//\n\.redhat.com/'
default.action >\
%%/default.action
## Macros are expanded even on commentaries. So, we have to
use %%
## -- morcego
#%%makeinstall
%pre
# This is where we handle old usernames (junkbust and
junkbuster)
# I'm not sure we should do that, but this is the way we
have been
# doing it for some time now -- morcego
# We should do it for the group as well -- morcego
# Doing it by brute force. Much cleaner (no more Mr. Nice
Guy) -- morcego
# Same for username
usermod -u % -g % -l % -d
%/% -s "" % >
/dev/null 2>&1 || :
usermod -u % -g % -l % -d
%/% -s "" % >
/dev/null 2>&1 || :
userdel % > /dev/null 2>&1 ||:
userdel % > /dev/null 2>&1 ||:
# Change the group name. Remove anything left behind.
groupmod -g % -n % % >
/dev/null 2>&1 ||:
groupmod -g % -n % % >
/dev/null 2>&1 ||:
groupdel % > /dev/null 2>&1 ||:
groupdel % > /dev/null 2>&1 ||:
# Doublecheck to see if the group exist, and that it has the
correct gid
/bin/grep -E '^%:' %/group >
/dev/null 2>&1
if [ $? -eq 1 ]; then
# Looks like it does not exist. Create it
groupadd -g % % > /dev/null
2>&1
else
/bin/grep -E '^%:[^:]*:%:'
%/group > /dev/null 2>&1
if [ $? -eq 1 ]; then
# The group exists, but does not have the correct gid
groupmod -g % % > /dev/null
2>&1
fi
fi
# Check to see if everything is okey. Create user if it
still does not
# exist
id % > /dev/null 2>&1
if [ $? -eq 1 ]; then
%/useradd -u % -g % -d
%/% -r -s "" % >
/dev/null 2>&1
fi
# Double check that the group has the correct uid
P_UID=`id -u % 2>/dev/null`
if [ $P_UID -ne % ]; then
%/usermod -u % %
fi
# The same for the gid
P_GID=`id -g % 2>/dev/null`
if [ $P_GID -ne % ]; then
%/usermod -g % %
fi
%post
# for upgrade from 2.0.x
[ -f %/log/%/logfile ] && {
mv -f %/log/%/logfile
%/log/%/logfile ||: ;
chown -R %:% %/log/%
2>/dev/null ||: ;
}
[ -f %/log/%/% ] && {
mv -f %/log/%/%
%/log/%/logfile ||: ;
chown -R %:% %/%
2>/dev/null ||: ;
}
/sbin/chkconfig --add privoxy
if [ "$1" = "1" ]; then
/sbin/service % condrestart > /dev/null
2>&1 ||:
fi
%preun
/sbin/service % stop > /dev/null 2>&1
||:
/sbin/service % stop > /dev/null 2>&1 ||:
if [ "$1" = "0" ]; then
/sbin/service % stop > /dev/null 2>&1 ||:
/sbin/chkconfig --del privoxy
fi
%postun
#if [ "$1" -ge "1" ]; then
# /sbin/service % condrestart > /dev/null
2>&1
#fi
# We only remove it we this is not an upgrade
if [ "$1" = "0" ]; then
id privoxy > /dev/null 2>&1 &&
%/userdel privoxy || /bin/true
/bin/grep -E '^%:' %/group >
/dev/null && %/groupdel % ||
/bin/true
fi
%clean
[ "%" != "/" ] &&
rm -rf %
%files
%defattr(0644,root,root,0755)
%doc README AUTHORS ChangeLog LICENSE
%doc doc/text/developer-manual.txt doc/text/user-manual.txt
doc/text/faq.txt
%doc doc/webserver/developer-manual
%doc doc/webserver/user-manual
%doc doc/webserver/faq
%doc doc/webserver/p_doc.css
doc/webserver/privoxy-index.html
%doc doc/webserver/images
%doc doc/webserver/man-page
# ATTENTION FOR defattr change here !
%defattr(0644,%,%,0755)
%dir %
%dir %/templates
%dir %/log/%
%attr(0744,%,%)%/%
# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING
! WARNING !
# We should not use wildchars here. This could mask missing
files problems
# -- morcego
# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING
! WARNING !
%config(noreplace) %/config
%config %/standard.action
%config(noreplace) %/user.action
%config %/default.action
%config %/default.filter
%config %/trust
# Please keep these alphabetized so its easier to find one
that
# is not included.
%config %/templates/blocked
%config %/templates/cgi-error-404
%config %/templates/cgi-error-bad-param
%config %/templates/cgi-error-disabled
%config %/templates/cgi-error-file
%config %/templates/cgi-error-file-read-only
%config %/templates/cgi-error-modified
%config %/templates/cgi-error-parse
%config %/templates/cgi-style.css
%config %/templates/connect-failed
%config %/templates/default
%config %/templates/edit-actions-add-url-form
%config %/templates/edit-actions-for-url
%config %/templates/edit-actions-for-url-filter
%config %/templates/edit-actions-list
%config %/templates/edit-actions-list-button
%config %/templates/edit-actions-list-section
%config %/templates/edit-actions-list-url
%config
%/templates/edit-actions-remove-url-form
%config %/templates/edit-actions-url-form
%config %/templates/mod-local-help
%config %/templates/mod-support-and-service
%config %/templates/mod-title
%config %/templates/mod-unstable-warning
%config %/templates/no-such-domain
%config %/templates/show-request
%config %/templates/show-status
%config %/templates/show-status-file
%config %/templates/show-url-info
%config %/templates/show-version
%config %/templates/toggle
%config %/templates/toggle-mini
%config %/templates/untrusted
# Attention, new defattr change here !
%defattr(0644,root,root,0755)
%config(noreplace) %/logrotate.d/%
%config(noreplace) %attr(0755,root,root)
%/rc.d/init.d/%
%/man1/%.*
%changelog
* Mon Aug 7 2006 Durval Menezes <durval AT tmp DOT com
DOT br>
- Bump version to 3.0.3
- Fixed some inconsistencies (missing files, wrong dirs,
etc)
- Adapted for RHEL4
* Wed Mar 26 2003 Andreas Oesterhelt <andreasoesterhelt.org>
- Bump version for 3.0.2.
* Wed Mar 19 2003 Hal Burgiss <halfoobox.net>
- Bump version for 3.0.1.
* Tue Aug 25 2002 Hal Burgiss <halfoobox.net>
- Bump version for 3.0.0 
* Tue Aug 06 2002 Hal Burgiss <halfoobox.net>
- Reset version for 2.9.20.
* Tue Jul 30 2002 Hal Burgiss <halfoobox.net>
- Reset version for 2.9.18.
* Sat Jul 27 2002 Hal Burgiss <halfoobox.net>
- Reset version and release for 2.9.16.
* Fri Jul 12 2002 Karsten Hopp <karstenredhat.de>
- don't use ghost files for rcX.d/*, using chkconfig is the
correct way to do this job (#68619)
* Fri Jul 05 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.15-8
- Changing delete order for groups and users (users should
be first)
* Wed Jul 03 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.15-7
- Changing sed expression that removed CR from the end of
the lines. This
new one removes any control caracter, and should work with
older versions
of sed
* Tue Jul 02 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.15-6
- Fixing defattr values. File and directory modes where
swapped
* Tue Jul 02 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.15-5
- Bumping Release number (which should be changed every time
the specfile
is)
* Tue Jul 02 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.15-4
- Fix typo in templates creation.
* Wed Jun 26 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.15-4
- Fixing issues created by specfile sync between branches
- Correcting the release number (WARNING)
- Reintroducing text file conversion (dos -> unix)
- Reconverting hardcoded directories to macros
- Refixing ownership of privoxy files (now using multiple
defattr
definitions)
* Thu Jun 20 2002 Karsten Hopp <karstenredhat.de>
- fix several .spec file issues to shut up rpmlint
- non-standard-dir-perm /var/log/privoxy 0744
- invalid-vendor Privoxy.Org (This is ok for binaries
compiled by privoxy
members, but not for packages from Red Hat)
- non-standard-group Networking/Utilities
- logrotate and init scripts should be noreplace
* Mon May 27 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.15-1
- Index.html is now privoxy-index.html for doc usage.
* Sat May 25 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.15-1
- Add html man page so index.html does not 404.
* Fri May 24 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.15-1
- Add another template and alphabetize these for easier
tracking.
- Add doc/images directory.
* Wed May 15 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.15-1
- Add templates/edit-actions-list-button
* Fri May 03 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.15-1
- Version bump
- Adding noreplace for %%/config
- Included a method to verify if the versions declared on
the specfile and
configure.in match. Interrupt the build if they don't.
* Fri Apr 26 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.14-3
- Changing Vendor to Privoxy.Org
* Tue Apr 23 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.14-2
- Adjust for new *actions files.
* Mon Apr 22 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.14-2
- Removed the redhat hack that prevented the user and group
from
being dealocated. That was a misundestanding of my part
regarding
redhat policy.
* Mon Apr 22 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.14-2
- Using macros to define uid and gid values
- Bumping release
* Mon Apr 22 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.14-1
- Changes to fixate the uid and gid values as (both) 73.
This is a
value we hope to standarize for all distributions. RedHat
already
uses it, and Conectiva should start as soon as I find
where the heck
I left my cluebat
- Only remove the user and group on uninstall if this is not
redhat, once
redhat likes to have the values allocated even if the
package is not
installed
* Tue Apr 16 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.13-6
- Add --disable-dynamic-pcre to configure.
* Wed Apr 10 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.13-5
- Relisting template files on the %%files section
* Tue Apr 09 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.13-4
- Removed 'make dok'. Docs are all maintained in CVS (and
tarball) now.
* Mon Apr 08 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.13-4
- Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
- Remove templates/blocked-compact.
- Add more docbook stuff to Builderquires.
* Thu Mar 28 2002 Sarantis Paskalis <sarantiscnl.di.uoa.gr>
+ privoxy-2.9.13-3
- Include correct documentation file.
* Tue Mar 26 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.13-3
- Fix typo in Description.
* Tue Mar 26 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.13-3
- Added commentary asking to update the release value on the
configure
script
* Tue Mar 25 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.13-3
- Added the missing edit-actions-for-url-filter to
templates.
* Mon Mar 25 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ privoxy-2.9.13-2
- Fixing Release number
* Sun Mar 24 2002 Hal Burgiss <halfoobox.net>
+ privoxy-2.9.13-2
- Added faq to docs.
* Sun Mar 24 2002 Rodrigo Barbosa <rodrigobsuespammers.org>
+ privoxy-2.9.13-2
- Fixed the init files entries. Now we use %%ghost
- improved username (and groupname) handling on the %%pre
section. By improved
I mean: we do it by brute force now. Much easier to
maintain. Yeah, you
got it right. No more Mr. Nice Guy.
- Removed the userdel call on %%post. No need, once it's
complety handled on
the %%pre section
* Sun Mar 24 2002 Hal Burgiss <halfoobox.net>
+ junkbusterng-2.9.13-1
Added autoheader. Added autoconf to buildrequires.
* Sun Mar 24 2002 Hal Burgiss <halfoobox.net>
+ junkbusterng-2.9.13-1
- Fixed build problems re: name conflicts with man page and
logrotate.
- Commented out rc?d/* configs for time being, which are
causing a build
- failure. /etc/junkbuster is now /etc/privoxy. Stefan did
other name
- changes. Fixed typo ';' should be ':' causing 'rpm
-e' to fail.
* Fri Mar 22 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbusterng-2.9.13-1
- References to the expression ijb where changed where
possible
- New package name: junkbusterng (all in lower case,
acording to
the LSB recomendation)
- Version changed to: 2.9.13
- Release: 1
- Added: junkbuster to obsoletes and conflicts (Not sure
this is
right. If it obsoletes, why conflict ? Have to check it
later)
- Summary changed: Stefan, please check and aprove it
- Changes description to use the new name
- Sed string was NOT changed. Have to wait to the manpage to
change first
- Keeping the user junkbuster for now. It will require some
aditional
changes on the script (scheduled for the next specfile
release)
- Added post entry to move the old logfile to the new log
directory
- Removing "chkconfig --add" entry (not good to
have it automaticaly
added to the startup list).
- Added preun section to stop the service with the old name,
as well
as remove it from the startup list
- Removed the chkconfig --del entry from the conditional
block on
the preun scriptlet (now handled on the %files section)
* Thu Mar 21 2002 Hal Burgiss <halfoobox.net>
- added ijb_docs.css to docs.
* Mon Mar 11 2002 Hal Burgiss <halfoobox.net>
+ junkbuster-2.9.11-8
- Take out --enable-no-gifs, breaks some browsers.
* Sun Mar 10 2002 Hal Burgiss <halfoobox.net>
+ junkbuster-2.9.11-8
- Add --enable-no-gifs to configure.
* Fri Mar 08 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbuster-2.9.11-7
- Added BuildRequires to libtool.
* Tue Mar 06 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbuster-2.9.11-6
- Changed the routined that handle the junkbust and
junkbuster users on
%%pre and %%post to work in a smoother manner
- %%files now uses hardcoded usernames, to avoid problems
with package
name changes in the future
* Tue Mar 05 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbuster-2.9.11-5
- Added "make redhat-dok" to the build process
- Added docbook-utils to BuildRequires
* Tue Mar 05 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbuster-2.9.11-4
- Changing man section in the manpage from 1 to 8
- We now require packages, not files, to avoid issues with
apt
* Mon Mar 04 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbuster-2.9.11-3
- Fixing permissions of the init script
* Mon Mar 04 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
+ junkbuster-2.9.11-2
- General specfile fixup, using the best recomended
practices, including:
- Adding -q to %%setup
- Using macros whereever possible
- Not using wildchars on %%files section
- Doubling the percentage char on changelog and comments,
to
avoid rpm expanding them
* Sun Mar 03 2002 Hal Burgiss <halfoobox.net>
- /bin/false for shell causes init script to fail.
Reverting.
* Wed Jan 09 2002 Hal Burgiss <halfoobox.net>
- Removed UID 73. Included user-manual and developer-manual
in docs.
Include other actions files. Default shell is now
/bin/false.
Userdel user=junkbust. ChangeLog was not zipped. Removed
RPM_OPT_FLAGS kludge.
* Fri Dec 28 2001 Thomas Steudten <thomassteudten.ch>
- add paranoia check for 'rm -rf %%'
- add gzip to 'BuildRequires'
* Sat Dec 1 2001 Hal Burgiss <halfoobox.net>
- actionsfile is now ijb.action.
* Tue Nov 6 2001 Thomas Steudten <thomassteudten.ch>
- Compress manpage
- Add more documents for installation
- Add version string to name and source
* Wed Oct 24 2001 Hal Burigss <halfoobox.net>
- Back to user 'junkbuster' and fix configure macro.
* Wed Oct 10 2001 Hal Burigss <halfoobox.net>
- More changes for user 'junkbust'. Init script had
'junkbuster'.
* Sun Sep 23 2001 Hal Burgiss <halfoobox.net>
- Change of $RPM_OPT_FLAGS handling. Added new HTML doc
files.
- Changed owner of /etc/junkbuster to shut up PAM/xauth log
noise.
* Thu Sep 13 2001 Hal Burgiss <halfoobox.net>
- Added $RPM_OPT_FLAGS support, renaming of old logfile, and
- made sure no default shell exists for user junkbust.
* Sun Jun 3 2001 Stefan Waldherr <stefanwaldherr.org>
- rework of RPM
* Mon Sep 25 2000 Stefan Waldherr <stefanwaldherr.org>
- CLF Logging patch by davepcyw.uklinux.net
- Hal DeVore <haldevoreearthling.net> fix
akamaitech in blocklist
* Sun Sep 17 2000 Stefan Waldherr <stefanwaldherr.org>
- Steve Kemp skxtardis.ed.ac.uk's javascript popup patch.
- Markus Breitenbach breitenbrbg.informatik.tu-darmstadt.de supplied
numerous fixes and enhancements for Steve's patch.
- adamlocknetscape.com (Adam Lock) in the windows version:
- Taskbar activity spinner always spins even when logging
is
turned off (which is the default) - people who don't
like the spinner can turn it off from a menu option.
- Taskbar popup menu has a options submenu - people can
now
open the settings files for cookies, blockers etc.
without opening the JB window.
- Logging functionality works again
- Buffer overflow is fixed - new code uses a bigger buffer
and snprintf so it shouldn't overflow anymore.
- Fixed userid swa, group learning problem while installing.
root must build RPM.
- Added patch by Benjamin Low <bensnrc.uow.edu.au> that
prevents JB to
core dump when there is no log file.
- Tweaked SuSE startup with the help of mohatajgmx.net
and Doc.Bgmx.de.
- Fixed man page to include imagefile and popupfile.
- Sanity check for the statistics function added.
- "Patrick D'Cruze" <pdcruzeorac.iinet.net.au>: It seems Microsoft
are transitioning Hotmail from FreeBSD/Apache to Windows
2000/IIS.
With IIS/5, it appears to omit the trailing \r\n from
http header
only messages. eg, when I visit http://www.hotmail.com,
IIS/5
responds with a HTTP 302 redirect header. However, this
header
message is missing the trailing \r\n. IIS/5 then closes
the
connection. Junkbuster, unfortunately, discards the header
becomes
it thinks it is incomplete - and it is. MS have
transmitted an
incomplete header!
- Added bug reports and patch submission forms in the docs.
* Mon Mar 20 2000 Stefan Waldherr <stefanwaldherr.org>
Andrew <anwtirana.freewire.co.uk> extended the JB:
Display of statistics of the total number of requests
and the number
of requests filtered by junkbuster, also the
percentage of requests
filtered. Suppression of the listing of files on the
proxy-args page.
All stuff optional and configurable.
* Sun Sep 12 1999 Stefan Waldherr <stefanwaldherr.org>
Jan Willamowius (janjanhh.shnet.org) fixed a
bug in the
code which prevented the JB from handling URLs of the
form
user:passwordwww.foo.com. Fixed.
* Mon Aug 2 1999 Stefan Waldherr <stefanwaldherr.org>
Blank images are no longer cached, thanks to a hint from
Markus
Breitenbach <breitenbrbg.informatik.tu-darmstadt.de>. The user
agent is NO longer set by the Junkbuster. Sadly,
many sites depend
on the correct browser version nowadays.
Incorporated many
suggestions from Jan "Yenya" Kasprzak
<kasfi.muni.cz> for the
spec file. Fixed logging problem and since runlevel
2 does not
use networking, I replaced
/etc/rc.d/rc2.d/S84junkbuster with
/etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
<walkernetgate.net>. You should now be able to
build this RPM as
a non-root user (mathiasweidner.sem.lipsia.de).
* Sun Jan 31 1999 Stefan Waldherr <stefanwaldherr.org>
%%/log/junkbuster set to nobody. Added
/etc/junkbuster/imagelist
to allow more sophisticated matching of blocked images.
Logrotate
logfile. Added files for auto-updating the blocklist et al.
* Wed Dec 16 1998 Stefan Waldherr <stefanwaldherr.org>
Configure blank version via config file. No separate blank
version anymore. Added Roland's <rolandspinnaker.rhein.de>
patch to show a logo instead of a blank area. Added a
suggestion
from Alex <alexcocoa.demon.co.uk>:
%%/lock/subsys/junkbuster.
More regexps in the blocklist. Prepared the forwardfile for
squid. Extended image regexp with help from gabriel
<somloCS.ColoState.EDU>.
* Thu Nov 19 1998 Stefan Waldherr <stefanwaldherr.org>
All RPMs now identify themselves in the show-proxy-args
page.
Released Windoze version. Run junkbuster as nobody instead
of
root.
* Fri Oct 30 1998 Stefan Waldherr <stefanwaldherr.org>
Newest version. First release (hence the little version
number
mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
security over 2.0.1; some multi-user sites will need to
change
the listen-address in the configuration file. The blank
version of
the Internet Junkbuster has a more sophisticated way
of replacing
images. All RPMs identify themselves in the show-proxy-args
page.
* Thu Sep 23 1998 Stefan Waldherr <stefanwaldherr.org>
Modified the blocking feature, so that only GIFs and JPEGs
are
blocked and replaced but not HTML pages. Thanks to
"Gerd Flender" <plgerdinformatik.uni-siegen.de> for this nice
idea. Added numerous stuff to the blocklist. Keep patches
in
seperate files and no longer in diffs (easier to
maintain).
* Tue Jun 16 1998 Stefan Waldherr <swacs.cmu.edu>
Moved config files to /etc/junkbuster directory,
moved man page,
added BuildRoot directive (Thanks to Alexey Nogin
<ayn2cornell.edu>)
Made new version junkbuster-raw (which is only a
stripped version of
the junkuster rpm, i.e. without my blocklist, etc.)
* Tue Jun 16 1998 (2.0-1)
Uhm, not that much. Just a new junkbuster version that
fixes a couple of bugs ... and of course a bigger
blocklist with the unique Now-less-ads-than-ever(SM)
feature.
Oh, one thing: I changed the default user agent to Linux --
no
need anymore to support Apple.
* Tue Jun 16 1998 (2.0-0)
Now-less-ads-than-ever (SM)
compiled with gcc instead of cc
compiled with -O3, thus it should be a little faster
show-proxy-args now works
/etc/junkbuster.init wasn't necessary
* Tue Jun 16 1998 (1.4)
some more config files were put into /etc
The junkbuster-blank rpm returns a 1x1 pixel image, that
gets
displayed by Netscape instead of the blocked image.
Read http://www.waldhe
rr.org/junkbuster/ for
further info.
* Tue Jun 16 1998 (1.3)
The program has been moved to /usr/sbin (from
/usr/local/bin)
Init- and stopscripts (/etc/rc.d/rc*) have been added so
that the junkbuster starts automatically during bootup.
The /etc/blocklist file is much more sophisticated.
Theoretically
one should e.g. browse all major US and German newspapers
without
seeing one annoying ad.
junkbuster.init was modified. It now starts junkbuster with
an
additional "-r " flag.
# $Log: privoxy-rh.spec,v $
# Revision 1.33.2.22 2004/01/30 17:09:29 oes
# Bumped version for 3.0.3
#
# Revision 1.33.2.21 2003/03/26 00:25:00 oes
# Bump version for 3.0.2
#
# Revision 1.33.2.20 2003/03/20 03:27:11 hal9
# Bump version for 3.0.1 pending release.
#
# Revision 1.33.2.19 2002/08/25 23:36:03 hal9
# Bump version for 3.0.0.
#
# Revision 1.33.2.18 2002/08/10 11:28:50 oes
# Bumped version
#
# Revision 1.33.2.17 2002/08/07 01:08:49 hal9
# Bumped version to 2.9.18.
#
# Revision 1.33.2.16 2002/08/05 08:42:13 kick_
# same permissions, same runlevels as all the other
initscripts
#
# Revision 1.33.2.15 2002/07/30 21:51:19 hal9
# Bump version to 2.9.17.
#
# Revision 1.33.2.14 2002/07/27 21:58:16 kick_
# bump version
#
# Revision 1.33.2.13 2002/07/27 21:39:41 kick_
# condrestart raised an error during an fresh install when
privoxy wasn't already running
#
# Revision 1.33.2.12 2002/07/27 15:47:10 hal9
# Reset version and release for 2.9.16.
#
# Revision 1.33.2.11 2002/07/25 09:47:57 kick_
# 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
#
# Revision 1.33.2.10 2002/07/12 09:14:26 kick_
# don't use ghost files for rcX.d/*, chkconfig is available
to do this job. Enable translation of error messge
#
# Revision 1.33.2.9 2002/07/05 17:16:19 morcego
# - Changing delete order for groups and users (users should
be first)
#
# Revision 1.33.2.8 2002/07/03 20:46:24 morcego
# - Changing sed expression that removed CR from the end of
the lines. This
# new one removes any control caracter, and should work
with older versions
# of sed
#
# Revision 1.33.2.7 2002/07/02 18:16:48 morcego
# - Fixing defattr values. File and directory modes where
swapped
#
# Revision 1.33.2.6 2002/07/02 17:38:10 morcego
# Bumping Release number
#
# Revision 1.33.2.5 2002/07/02 11:43:20 hal9
# Fix typo in templates creation.
#
# Revision 1.33.2.4 2002/06/26 17:32:45 morcego
# Integrating fixed from the main branch.
#
# Revision 1.33.2.3 2002/06/24 12:13:34 kick_
# shut up rpmlint. btw: The vendor tag should be set in you
.rpmmacros file, not in the spec file!
#
# Revision 1.33.2.2 2002/05/28 02:39:38 hal9
# Replace index.html with privoxy-index.html for docs.
#
# Revision 1.33.2.1 2002/05/26 17:20:23 hal9
# Add images to doc dirs.
#
# Revision 1.33 2002/05/25 02:08:23 hal9
# Add doc/images directory.
# Redhat: alphabetized list of templates (and I think added
one in the process)
#
# Revision 1.32 2002/05/16 01:37:29 hal9
# Add new template file so CGI stuff works
#
# Revision 1.31 2002/05/03 17:14:35 morcego
# *.spec: Version bump to 2.9.15
# -rh.spec: noreplace for %%/config
# Will interrupt the build if versions from
configure.in and
# specfile do not match
#
# Revision 1.30 2002/04/26 15:51:05 morcego
# Changing Vendor value to Privoxy.Org
#
# Revision 1.29 2002/04/24 03:13:51 hal9
# New actions files changes.
#
# Revision 1.28 2002/04/22 18:51:33 morcego
# user and group now get removed on rh too.
#
# Revision 1.27 2002/04/22 16:32:31 morcego
# configure.in, *.spec: Bumping release to 2 (2.9.14-2)
# -rh.spec: uid and gid are now macros
# -suse.spec: Changing the header Copyright to License
(Copyright is
# deprecable)
#
# Revision 1.26 2002/04/22 16:24:36 morcego
# - Changes to fixate the uid and gid values as (both) 73.
This is a
# value we hope to standarize for all distributions.
RedHat already
# uses it, and Conectiva should start as soon as I find
where the heck
# I left my cluebat
# - Only remove the user and group on uninstall if this is
not redhat, once
# redhat likes to have the values allocated even if the
package is not
# installed
#
# Revision 1.25 2002/04/17 01:59:12 hal9
# Add --disable-dynamic-pcre.
#
# Revision 1.24 2002/04/11 10:09:20 oes
# Version 2.9.14
#
# Revision 1.23 2002/04/10 18:14:45 morcego
# - (privoxy-rh.spec only) Relisting template files on the
%%files section
# - (configure.in, privoxy-rh.spec) Bumped package release
to 5
#
# Revision 1.22 2002/04/09 22:06:12 hal9
# Remove 'make dok'.
#
# Revision 1.21 2002/04/09 02:52:26 hal9
# - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
# - Remove templates/blocked-compact.
# - Add more docbook stuff to Buildrequires.
#
# Revision 1.20 2002/04/08 20:27:45 swa
# fixed JB spelling
#
# Revision 1.19 2002/03/27 22:44:59 sarantis
# Include correct documentation file.
#
# Revision 1.18 2002/03/27 22:10:14 sarantis
# bumped Hal's last commit 1 day to the future to make rpm
build again.
#
# Revision 1.17 2002/03/27 00:48:23 hal9
# Fix up descrition.
#
# Revision 1.16 2002/03/26 22:29:55 swa
# we have a new homepage!
#
# Revision 1.15 2002/03/26 17:39:54 morcego
# Adding comment on the specfile to remember the packager to
update
# the release number on the configure script
#
# Revision 1.14 2002/03/26 14:25:15 hal9
# Added edit-actions-for-url-filter to templates in %%config
#
# Revision 1.13 2002/03/25 13:31:04 morcego
# Bumping Release tag.
#
# Revision 1.12 2002/03/25 03:11:40 hal9
# Do it right way this time :/
#
# Revision 1.11 2002/03/25 03:09:51 hal9
# Added faq to docs.
#
# Revision 1.10 2002/03/24 22:16:14 morcego
# Just removing some old commentaries.
#
# Revision 1.9 2002/03/24 22:03:22 morcego
# Should be working now. See %changelog for details
#
# Revision 1.8 2002/03/24 21:13:01 morcego
# Tis broken.
#
# Revision 1.7 2002/03/24 21:07:18 hal9
# Add autoheader, etc.
#
# Revision 1.6 2002/03/24 19:56:40 hal9
# /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
#
# Revision 1.4 2002/03/24 13:32:42 swa
# name change related issues
#
# Revision 1.3 2002/03/24 12:56:21 swa
# name change related issues.
#
# Revision 1.2 2002/03/24 11:40:14 swa
# name change
#
# Revision 1.1 2002/03/24 11:23:44 swa
# name change
#
# Revision 1.1 2002/03/22 20:53:03 morcego
# - Ongoing process to change name to JunkbusterNG
# - configure/configure.in: no change needed
# - GNUmakefile.in:
# - TAR_ARCH =
/tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
# - PROGRAM = jbngEXEEXT
# - rh-spec now references as junkbusterng-rh.spec
# - redhat-upload: references changed to
junkbusterng-* (package names)
# - tarball-dist: references changed to
JunkbusterNG-distribution-*
# - tarball-src: now JunkbusterNG-*
# - install: initscript now junkbusterng.init and
junkbusterng (when
# installed)
# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
# - junkbusterng.spec:
# - References to the expression ijb where changed
where possible
# - New package name: junkbusterng (all in lower
case, acording to
# the LSB recomendation)
# - Version changed to: 2.9.13
# - Release: 1
# - Added: junkbuster to obsoletes and conflicts
(Not sure this is
# right. If it obsoletes, why conflict ? Have to
check it later)
# - Summary changed: Stefan, please check and aprove
it
# - Changes description to use the new name
# - Sed string was NOT changed. Have to wait to the
manpage to
# change first
# - Keeping the user junkbuster for now. It will
require some aditional
# changes on the script (scheduled for the next
specfile release)
# - Added post entry to move the old logfile to the
new log directory
# - Removing "chkconfig --add" entry
(not good to have it automaticaly
# added to the startup list).
# - Added preun section to stop the service with the
old name, as well
# as remove it from the startup list
# - Removed the chkconfig --del entry from the
conditional block on
# the preun scriptlet (now handled on the %files
section)
# - junkbuster.init: renamed to junkbusterng.init
# - junkbusterng.init:
# - Changed JB_BIN to jbng
# - Created JB_OBIN with the old value of JB_BIN
(junkbuster), to
# be used where necessary (config dir)
#
# Aditional notes:
# - The config directory is /etc/junkbuster yet. Have to
change it on the
# specfile, after it is changes on the code
# - The only files that got renamed on the cvs tree were the
rh specfile and
# the init file. Some file references got changes on the
makefile and on the
# rh-spec (as listed above)
#
# Revision 1.43 2002/03/21 16:04:10 hal9
# added ijb_docs.css to %doc
#
# Revision 1.42 2002/03/12 13:41:18 sarantis
# remove hard-coded "ijbswa" string in build
phase
#
# Revision 1.41 2002/03/11 22:58:32 hal9
# Remove --enable-no-gifs
#
# Revision 1.39 2002/03/08 18:57:29 swa
# remove user junkbuster after de-installation.
#
# Revision 1.38 2002/03/08 13:45:27 morcego
# Adding libtool to Buildrequires
#
# Revision 1.37 2002/03/07 19:23:49 swa
# i hate to scroll. suse: wrong configdir.
#
# Revision 1.36 2002/03/07 05:06:54 morcego
# Fixed %pre scriptlet. And, as a bonus, you can even
understand it now.
#
# Revision 1.34 2002/03/07 00:11:57 morcego
# Few changes on the %pre and %post sections of the rh
specfile to handle
# usernames more cleanly
#
# Revision 1.33 2002/03/05 13:13:57 morcego
# - Added "make redhat-dok" to the build phase
# - Added docbook-utils to BuildRequires
#
# Revision 1.32 2002/03/05 12:34:24 morcego
# - Changing section internaly on the manpage from 1 to 8
# - We now require packages, not files, to avoid issues with
apt
#
# Revision 1.31 2002/03/04 18:06:09 morcego
# SPECFILE: fixing permissing of the init script (broken by
the last change)
#
# Revision 1.30 2002/03/04 16:18:03 morcego
# General cleanup of the rh specfile.
#
# %changelog
# * Mon Mar 04 2002 Rodrigo Barbosa <rodrigobtisbrasil.com.br>
# + junkbuster-2.9.11-2
# - General specfile fixup, using the best recomended
practices, including:
# - Adding -q to %%setup
# - Using macros whereever possible
# - Not using wildchars on %%files section
# - Doubling the percentage char on changelog and
comments, to
# avoid rpm expanding them
#
# Revision 1.29 2002/03/03 19:21:22 hal9
# Init script fails if shell is /bin/false.
#
# Revision 1.28 2002/01/09 18:34:03 hal9
# nit.
#
# Revision 1.27 2002/01/09 18:32:02 hal9
# Removed RPM_OPT_FLAGS kludge.
#
# Revision 1.26 2002/01/09 18:21:10 hal9
# A few minor updates.
#
# Revision 1.25 2001/12/28 01:45:36 steudten
# Add paranoia check and BuildReq: gzip
#
# Revision 1.24 2001/12/01 21:43:14 hal9
# Allowed for new ijb.action file.
#
# Revision 1.23 2001/11/06 12:09:03 steudten
# Compress doc files. Install README and AUTHORS at last as
document.
#
# Revision 1.22 2001/11/05 21:37:34 steudten
# Fix to include the actual version for name.
# Let the 'real' packager be included - sorry stefan.
#
# Revision 1.21 2001/10/31 19:27:27 swa
# consistent description. new name for suse since
# we had troubles with rpms of identical names
# on the webserver.
#
# Revision 1.20 2001/10/24 15:45:49 hal9
# To keep Thomas happy (aka correcting my mistakes)
#
# Revision 1.19 2001/10/15 03:23:59 hal9
# Nits.
#
# Revision 1.17 2001/10/10 18:59:28 hal9
# Minor change for init script.
#
# Revision 1.16 2001/09/24 20:56:23 hal9
# Minor changes.
#
# Revision 1.13 2001/09/10 17:44:43 swa
# integrate three pieces of documentation. needs work.
# will not build cleanly under redhat.
#
# Revision 1.12 2001/09/10 16:25:04 swa
# copy all templates. version updated.
#
# Revision 1.11 2001/07/03 11:00:25 sarantis
# replaced permissionsfile with actionsfile
#
# Revision 1.10 2001/07/03 09:34:44 sarantis
# bumped up version number.
#
# Revision 1.9 2001/06/12 18:15:29 swa
# the %% in front of configure (see tag below) confused
# the rpm build process on 7.1.
#
# Revision 1.8 2001/06/12 17:15:56 swa
# fixes, because a clean build on rh6.1 was impossible.
# GZIP confuses make, %% configure confuses rpm, etc.
#
# Revision 1.7 2001/06/11 12:17:26 sarantis
# fix typo in %%post
#
# Revision 1.6 2001/06/11 11:28:25 sarantis
# Further optimizations and adaptations in the spec file.
#
# Revision 1.5 2001/06/09 09:14:11 swa
# shamelessly adapted RPM stuff from the newest rpm that
# RedHat provided for the JB.
#
# Revision 1.4 2001/06/08 20:54:18 swa
# type with status file. remove forward et. al from file
list.
#
# Revision 1.3 2001/06/07 17:28:10 swa
# cosmetics
#
# Revision 1.2 2001/06/04 18:31:58 swa
# files are now prefixed with either `confdir' or
`logdir'.
# `make redhat-dist' replaces both entries confdir and
logdir
# with redhat values
#
# Revision 1.1 2001/06/04 10:44:57 swa
# `make redhatr-dist' now works. Except for the paths
# in the config file.
#
#
#
_______________________________________________
CentOS-devel mailing list
CentOS-develcentos.org
http://lists.centos.org/mailman/listinfo/centos-devel
|