rpms/privoxy/devel privoxy-3.0.6-stripchangelog.patch, NONE, 1.1 privoxy.spec, 1.16, 1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 22 14:10:22 UTC 2007
Author: karsten
Update of /cvs/dist/rpms/privoxy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26083
Modified Files:
privoxy.spec
Added Files:
privoxy-3.0.6-stripchangelog.patch
Log Message:
- remove changelog from init script
- added many spec file fixes from Sarantis Paskalis <paskalis at di.uoa.gr>:
- remove unnecessary perl invocation
- fix Requires(pre), (post), (preun) and (postun) for scriptlets
- fix rpmlint 'conffile-marked-as-executable'
- fix other stuff, so that it can actually be installed and erased
- do not remove user/group on erase because due to logs remaining
- major cleanup of the spec file
privoxy-3.0.6-stripchangelog.patch:
privoxy.init | 143 -----------------------------------------------------------
1 files changed, 143 deletions(-)
--- NEW FILE privoxy-3.0.6-stripchangelog.patch ---
--- privoxy-3.0.6-stable/privoxy.init.rh2 2007-02-22 15:06:30.000000000 +0100
+++ privoxy-3.0.6-stable/privoxy.init 2007-02-22 15:07:34.000000000 +0100
@@ -9,11 +9,6 @@
# such as filtering web page content, managing \
# cookies and removing ads
#
-
-# ********************************************************************
-#
-# File : $Source: /cvsroot/ijbswa/current/privoxy.init,v $
-#
# Purpose : This shell script takes care of starting and stopping
# privoxy.
#
@@ -42,145 +37,7 @@
# or write to the Free Software Foundation, Inc., 59
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# Revisions :
-# $Log: privoxy.init,v $
-# Revision 1.11 2006/07/18 14:48:47 david__schmidt
-# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
-# with what was really the latest development (the v_3_0_branch branch)
-#
-# Revision 1.8.2.3 2002/12/10 20:52:16 kick_
-# better service description. This text will be shown when the user configures the services
-#
-# Revision 1.8.2.2 2002/08/05 08:42:13 kick_
-# same permissions, same runlevels as all the other initscripts
-#
-# Revision 1.8.2.1 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.8 2002/04/09 02:51:31 hal9
-# Changed $JB to $PRIVOXY.
-#
-# Revision 1.7 2002/04/08 14:54:51 morcego
-# Moved the chkconfig comments to the begining of the file, couse Linuxconf
-# was getting confused with it where it was.
-#
-# Revision 1.6 2002/03/26 22:29:55 swa
-# we have a new homepage!
-#
-# Revision 1.5 2002/03/25 06:14:18 morcego
-# Removing the OPRG definition (no longer needed)
-#
-# Revision 1.4 2002/03/25 04:16:48 hal9
-# Fix proper config file location.
-#
-# Revision 1.3 2002/03/24 19:12:15 hal9
-# Fixed some naming conflicts.
-#
-# 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 = jbng at EXEEXT@
-# - 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.15 2002/03/09 15:05:58 swa
-# wrong user.group
-#
-# Revision 1.14 2002/03/06 06:13:40 hal9
-# Adapted for Andreas' changes for --user and --pidfile.
-#
-# Revision 1.13 2002/03/05 05:10:10 oes
-# Changed pidfile path to conform with FHS
-#
-# Revision 1.12 2002/03/04 20:44:36 oes
-# Changed to new cmdline syntax
-#
-# Revision 1.11 2001/12/30 14:07:32 steudten
-# - Add signal handling (unix)
-# - Add SIGHUP handler (unix)
-# - Add creation of pidfile (unix)
-# - Add action 'top' in rc file (RH)
-# - Add entry 'SIGNALS' to manpage
-# - Add exit message to logfile (unix)
-#
-# Revision 1.10 2001/11/05 21:30:23 steudten
-# Make JB startup without & due to be a 'real' daemon right now.
-# Make the script easy to change.
-#
-# Revision 1.9 2001/09/15 01:53:12 steudten
-#
-# Remove test for subsys flag in start. Some minor changes.
-#
-# Revision 1.8 2001/06/28 13:50:36 sarantis
-# swap ?$ with $?; remove bogus ";;"
-#
-# Revision 1.7 2001/06/28 13:40:26 sarantis
-# remove single quotes from $JB; it was not expanded.
-#
-# Revision 1.6 2001/06/28 13:38:42 sarantis
-# formatting changes; individual return values are returned from the init script.
-#
-# Revision 1.5 2001/06/11 11:37:40 sarantis
-# Minor editing changes.
-#
-# Revision 1.4 2001/06/09 09:14:11 swa
-# shamelessly adapted RPM stuff from the newest rpm that
-# RedHat provided for the JB.
-#
-# Revision 1.3 2001/05/25 10:12:44 oes
-# Fixed default case in switch statement (# -> *)
-#
-# Revision 1.2 2001/05/24 07:52:24 swa
-# added header. removed ^M.
-#
#
-# ********************************************************************/
# Source function library.
Index: privoxy.spec
===================================================================
RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- privoxy.spec 28 Nov 2006 12:52:40 -0000 1.16
+++ privoxy.spec 22 Feb 2007 14:10:20 -0000 1.17
@@ -27,31 +27,27 @@
#
# Defines should happen in the begining of the file
-%define veryoldname junkbust
-%define oldname junkbuster
%define privoxyconf %{_sysconfdir}/%{name}
%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.6
-Release: 2
+Release: 4
Summary: Privoxy - privacy enhancing proxy
License: GPL
Source0: http://dl.sf.net/ijbswa/%{name}/%{name}-%{version}-stable-src.tar.gz
#Source1: http://unc.dl.sourceforge.net/sourceforge/ijbswa/default.action
-Patch: privoxy-3.0.3-service.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch: privoxy-3.0.3-service.patch
+Patch1: privoxy-3.0.6-stripchangelog.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
-Conflicts: junkbuster-raw junkbuster-blank junkbuster
+Requires(pre): shadow-utils
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/service
+BuildRequires: libtool autoconf
%description
Privoxy is a web proxy with advanced filtering capabilities for
@@ -65,41 +61,21 @@
%prep
%setup -q -n %{name}-%{version}-stable
-%patch -p1 -b .rh1
+%patch -p1
+%patch1 -p1
iconv -f iso-8859-1 -t utf-8 < privoxy.1 > privoxy.1_
mv privoxy.1_ privoxy.1
%build
rm -rf autom4te.cache
-autoheader
-autoconf
-
-# We check to see if versions match
-VERSION_MAJOR=3
-VERSION_MINOR=0
-VERSION_POINT=6
-
-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 [ "%{version}" != "${CONFIG_VERSION}" ]; 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
-
+autoreconf
%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 %{name}
+make %{?_smp_mflags}
+
%install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+/bin/rm -rf %{buildroot}
mkdir -p %{buildroot}%{_sbindir} \
%{buildroot}%{_mandir}/man1 \
%{buildroot}%{_localstatedir}/log/%{name} \
@@ -107,225 +83,78 @@
%{buildroot}%{_sysconfdir}/logrotate.d \
%{buildroot}%{_sysconfdir}/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 %{name}.1 || /bin/true
-
-install -m 744 %{name} %{buildroot}%{_sbindir}/%{name}
-
-# 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:]]*$//' > %{buildroot}%{privoxyconf}/$i
-done
-cat default.filter | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/default.filter
-cat trust | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/trust
-(
-cd templates
-for i in `ls`
-do
- cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/templates/$i
-done
-)
-
-cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-cp -f %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
-install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name}
-
-# 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 %{privoxyconf}@g' | \
-# sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
-# sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
-# sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \
-# sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \
-# sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \
-# sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \
- sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' | \
- sed -e 's/[[:cntrl:]]*$//' > \
- %{buildroot}%{privoxyconf}/config
-perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
- %{buildroot}%{privoxyconf}/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 %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "/sbin/nologin" %{oldname} > /dev/null 2>&1 || :
-usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "/sbin/nologin" %{veryoldname} > /dev/null 2>&1 || :
-userdel %{oldname} > /dev/null 2>&1 ||:
-userdel %{veryoldname} > /dev/null 2>&1 ||:
-
-# Change the group name. Remove anything left behind.
-groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||:
-groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
-groupdel %{oldname} > /dev/null 2>&1 ||:
-groupdel %{veryoldname} > /dev/null 2>&1 ||:
-
-# Doublecheck to see if the group exist, and that it has the correct gid
-/bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null 2>&1
-if [ $? -eq 1 ]; then
- # Looks like it does not exist. Create it
- groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1
-else
- /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' %{_sysconfdir}/group > /dev/null 2>&1
- if [ $? -eq 1 ]; then
- # The group exists, but does not have the correct gid
- groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1
- fi
-fi
+install -p -m 744 %{name} %{buildroot}%{_sbindir}/%{name}
+install -p -m 644 {config,*.action,default.filter,trust} %{buildroot}%{privoxyconf}/
+install -p -m 644 templates/* %{buildroot}%{privoxyconf}/templates
+install -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
+install -p -m 644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -p -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
+install -p -m 711 -d %{buildroot}%{_localstatedir}/log/%{name}
+
+# Customize the configuration file
+sed -i -e 's@^confdir.*@confdir %{privoxyconf}@g' %{buildroot}%{privoxyconf}/config
+sed -i -e 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' %{buildroot}%{privoxyconf}/config
-# Check to see if everything is okey. Create user if it still does not
-# exist
-id %{name} > /dev/null 2>&1
-if [ $? -eq 1 ]; then
- %{_sbindir}/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "/sbin/nologin" %{name} > /dev/null 2>&1
-fi
-# Double check that the group has the correct uid
-P_UID=`id -u %{name} 2>/dev/null`
-if [ $P_UID -ne %{privoxy_uid} ]; then
- %{_sbindir}/usermod -u %{privoxy_uid} %{name}
+%pre
+# Add user/group on install
+if [ $1 -eq "1" ]; then
+ %{_sbindir}/groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1 ||:
+ %{_sbindir}/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{privoxyconf} -r -s "/sbin/nologin" %{name} > /dev/null 2>&1 ||:
fi
-# The same for the gid
-P_GID=`id -g %{name} 2>/dev/null`
-if [ $P_GID -ne %{privoxy_gid} ]; then
- %{_sbindir}/usermod -g %{privoxy_gid} %{name}
-fi
%post
-# for upgrade from 2.0.x
-[ -f %{_localstatedir}/log/%{oldname}/logfile ] && {
- mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile ||: ;
- chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null ||: ;
-}
-[ -f %{_localstatedir}/log/%{name}/%{name} ] && {
- mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile ||: ;
- chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null ||: ;
-}
-/sbin/chkconfig --add privoxy
-if [ "$1" = "1" ]; then
- /sbin/service %{name} condrestart > /dev/null 2>&1 ||:
+# Add privoxy service to management facilities on install
+if [ "$1" -eq "1" ]; then
+ /sbin/chkconfig --add %{name}
fi
-%preun
-/sbin/service %{veryoldname} stop > /dev/null 2>&1 ||:
-/sbin/service %{oldname} stop > /dev/null 2>&1 ||:
-if [ "$1" = "0" ]; then
- /sbin/service %{name} stop > /dev/null 2>&1 ||:
- /sbin/chkconfig --del privoxy
+%preun
+# Remove privoxy service from management facilities on erase
+if [ "$1" -eq "0" ]; then
+ /sbin/service %{name} stop > /dev/null 2>&1 ||:
+ /sbin/chkconfig --del %{name}
fi
%postun
-#if [ "$1" -ge "1" ]; then
-# /sbin/service %{name} 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 && %{_sbindir}/userdel privoxy || /bin/true
- /bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null && %{_sbindir}/groupdel %{name} || /bin/true
+# Restart service if already running on upgrade
+if [ "$1" -gt "1" ]; then
+ /sbin/service %{name} condrestart > /dev/null 2>&1 ||:
fi
%clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+/bin/rm -rf %{buildroot}
%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/p_web.css
-%doc doc/webserver/privoxy-index.html
-%doc doc/webserver/images
-%doc doc/webserver/man-page
-
-# ATTENTION FOR defattr change here !
-%defattr(0644,%{name},%{name},0755)
-
+%defattr(-,%{name},%{name},-)
%dir %{privoxyconf}
%dir %{privoxyconf}/templates
%dir %{_localstatedir}/log/%{name}
-
%attr(0744,%{name},%{name})%{_sbindir}/%{name}
+%config(noreplace) %{privoxyconf}
-# 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) %{privoxyconf}/config
-%config %{privoxyconf}/standard.action
-%config(noreplace) %{privoxyconf}/user.action
-%config %{privoxyconf}/default.action
-%config %{privoxyconf}/default.filter
-%config %{privoxyconf}/trust
-
-# Please keep these alphabetized so its easier to find one that
-# is not included.
-%config %{privoxyconf}/templates/blocked
-%config %{privoxyconf}/templates/cgi-error-404
-%config %{privoxyconf}/templates/cgi-error-bad-param
-%config %{privoxyconf}/templates/cgi-error-disabled
-%config %{privoxyconf}/templates/cgi-error-file
-%config %{privoxyconf}/templates/cgi-error-file-read-only
-%config %{privoxyconf}/templates/cgi-error-modified
-%config %{privoxyconf}/templates/cgi-error-parse
-%config %{privoxyconf}/templates/cgi-style.css
-%config %{privoxyconf}/templates/connect-failed
-%config %{privoxyconf}/templates/default
-%config %{privoxyconf}/templates/edit-actions-add-url-form
-%config %{privoxyconf}/templates/edit-actions-for-url
-%config %{privoxyconf}/templates/edit-actions-for-url-filter
-%config %{privoxyconf}/templates/edit-actions-list
-%config %{privoxyconf}/templates/edit-actions-list-button
-%config %{privoxyconf}/templates/edit-actions-list-section
-%config %{privoxyconf}/templates/edit-actions-list-url
-%config %{privoxyconf}/templates/edit-actions-remove-url-form
-%config %{privoxyconf}/templates/edit-actions-url-form
-%config %{privoxyconf}/templates/mod-local-help
-%config %{privoxyconf}/templates/mod-support-and-service
-%config %{privoxyconf}/templates/mod-title
-%config %{privoxyconf}/templates/mod-unstable-warning
-%config %{privoxyconf}/templates/no-such-domain
-%config %{privoxyconf}/templates/show-request
-%config %{privoxyconf}/templates/show-status
-%config %{privoxyconf}/templates/show-status-file
-%config %{privoxyconf}/templates/show-url-info
-%config %{privoxyconf}/templates/show-version
-%config %{privoxyconf}/templates/toggle
-%config %{privoxyconf}/templates/toggle-mini
-%config %{privoxyconf}/templates/untrusted
-
-# Attention, new defattr change here !
-%defattr(0644,root,root,0755)
-
+# Owned by root
+%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
-
+%attr(0755,root,root) %{_initrddir}/%{name}
%{_mandir}/man1/%{name}.*
+%doc README AUTHORS ChangeLog LICENSE
+%doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
+%doc doc/webserver
%changelog
+* Thu Feb 22 2007 Karsten Hopp <karsten at redhat.com> 3.0.6-4
+- remove changelog from init script
+- added many spec file fixes from Sarantis Paskalis <paskalis at di.uoa.gr>:
+- remove unnecessary perl invocation
+- fix Requires(pre), (post), (preun) and (postun) for scriptlets
+- fix rpmlint 'conffile-marked-as-executable'
+- fix other stuff, so that it can actually be installed and erased
+- do not remove user/group on erase because due to logs remaining
+- major cleanup of the spec file
+
* Tue Nov 28 2006 Karsten Hopp <karsten at redhat.com> 3.0.6-2
- fix download URL
- cleanups
@@ -681,11 +510,11 @@
* Mon Mar 04 2002 Rodrigo Barbosa <rodrigob at tisbrasil.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
+ - 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 <hal at foobox.net>
- /bin/false for shell causes init script to fail. Reverting.
@@ -774,11 +603,11 @@
user:password at www.foo.com. Fixed.
* Mon Aug 2 1999 Stefan Waldherr <stefan at waldherr.org>
- Blank images are no longer cached, thanks to a hint from Markus
+ Blank images are no longer cached, thanks to a hint from Markus
Breitenbach <breitenb at rbg.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 <kas at fi.muni.cz> for the
+ suggestions from Jan "Yenya" Kasprzak <kas at fi.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
@@ -786,74 +615,74 @@
a non-root user (mathias at weidner.sem.lipsia.de).
* Sun Jan 31 1999 Stefan Waldherr <stefan at waldherr.org>
- %%{_localstatedir}/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.
+ %%{_localstatedir}/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 <stefan at waldherr.org>
- Configure blank version via config file. No separate blank
- version anymore. Added Roland's <roland at spinnaker.rhein.de>
- patch to show a logo instead of a blank area. Added a suggestion
- from Alex <alex at cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
- More regexps in the blocklist. Prepared the forwardfile for
- squid. Extended image regexp with help from gabriel
- <somlo at CS.ColoState.EDU>.
+ Configure blank version via config file. No separate blank
+ version anymore. Added Roland's <roland at spinnaker.rhein.de>
+ patch to show a logo instead of a blank area. Added a suggestion
+ from Alex <alex at cocoa.demon.co.uk>: %%{_localstatedir}/lock/subsys/junkbuster.
+ More regexps in the blocklist. Prepared the forwardfile for
+ squid. Extended image regexp with help from gabriel
+ <somlo at CS.ColoState.EDU>.
* Thu Nov 19 1998 Stefan Waldherr <stefan at waldherr.org>
- All RPMs now identify themselves in the show-proxy-args page.
- Released Windoze version. Run junkbuster as nobody instead of
- root.
+ 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 <stefan at waldherr.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
+ 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.
+ images. All RPMs identify themselves in the show-proxy-args page.
* Thu Sep 23 1998 Stefan Waldherr <stefan at waldherr.org>
- Modified the blocking feature, so that only GIFs and JPEGs are
- blocked and replaced but not HTML pages. Thanks to
- "Gerd Flender" <plgerd at informatik.uni-siegen.de> for this nice
- idea. Added numerous stuff to the blocklist. Keep patches in
+ Modified the blocking feature, so that only GIFs and JPEGs are
+ blocked and replaced but not HTML pages. Thanks to
+ "Gerd Flender" <plgerd at informatik.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 <swa at cs.cmu.edu>
Moved config files to /etc/junkbuster directory, moved man page,
- added BuildRoot directive (Thanks to Alexey Nogin <ayn2 at cornell.edu>)
+ added BuildRoot directive (Thanks to Alexey Nogin <ayn2 at cornell.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.
+ 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
+ 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.waldherr.org/junkbuster/ for
- further info.
+ 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.waldherr.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.
+ 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.
More information about the fedora-cvs-commits
mailing list