rpms/clamav/devel clamd-gen, NONE, 1.1 clamav-0.80-initoff.patch, NONE, 1.1 sources, 1.2, 1.3 clamd.SERVICE.init, 1.1, 1.2 clamd-README, 1.1, 1.2 clamav.spec, 1.5, 1.6 .cvsignore, 1.2, 1.3 clamav-0.71.tar.gz.sig, 1.1, NONE clamav-0.70-initoff.patch, 1.1, NONE
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Thu Feb 3 08:40:46 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/clamav/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv25345
Modified Files:
sources clamd.SERVICE.init clamd-README clamav.spec .cvsignore
Added Files:
clamd-gen clamav-0.80-initoff.patch
Removed Files:
clamav-0.71.tar.gz.sig clamav-0.70-initoff.patch
Log Message:
* Fri Jan 28 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2
- build the package with '--disable-zlib-vcheck' because RH is unable to
apply a fix for a 5 month old and solved security issue. Please fill
your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385
- added 'BuildRequires: bc' (should work without also, but ./configure
gives out ugly warnings else)
* Fri Jan 28 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1
- updated to 0.81
- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports
an internal mode now which is enabled by default
- updated -milter %%description
* Thu Jan 20 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2
- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update
subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39)
* Wed Nov 3 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1
- updated to 0.80
- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore
- buildrequire 'curl-devel'
- renamed clamav.conf to clamd.conf (upstream change)
- updated -initoff patch
* Tue Sep 14 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1
- updated to 0.75.1
- use %%configure, the problems with the architecture specification
seem to have passed (probably because of an autoconf update)
- set mode 0600 for the cron-script (required by vixie-cron)
- made the cronjob a spambot and send mail about deactivated freshclam
service to nearly everybody... (root, postmaster, webmaster)
- other fixes in the notification cronjob
* Fri Jul 23 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1
- updated to 0.75
* Thu Jul 15 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2
- moved /usr/bin/clamav-config from main into -devel
* Wed Jun 30 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1
- updated to 0.74
* Mon Jun 14 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1
- updated to 0.73
- added pkgconfig file
* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3
- notify the user about a deactivated clamav-update service
- added clamd-gen script which generates template spec-files for
services using clamd
- copied template configuration files to %pkgdatadir/template (needed
for clamd-gen)
- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink
will be provided for compatibility reasons
- conditionalized building of the -milter subpackage ('--without
milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7)
* Fri Jun 4 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2
- removed 'BuildRequires: dietlibc'; it was a leftover from the
pre-use-signal era (before 0.70) (bug #1716)
* Thu Jun 3 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1
- updated to 0.72
--- NEW FILE clamd-gen ---
#! /bin/bash
# Copyright (C) 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
#
# 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; version 2 of the License.
#
# 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.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
function showHelp()
{
echo \
$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE>
--license=<LICENSE> --username=>USERNAME>
"
exit 0
}
function rpm.generatePreamble()
{
cat <<EOF
%{!?release_func:%define release_func() 0.fdr.%1}
# The name of the minit service
%define minitsvcdir %minitdir/services/%name
# The configuration file for the SysV initservice
%define conffile %_sysconfdir/clamd.d/%service.conf
# The directory, where the milter socket will be placed into; this
# socket will be named clamd.sock
%define rundir /var/run/clamd.%service
# The name of the logfile
%define logfile /var/log/clamd.%service
# The user under whose id, the clamd shall be running. This user must
# be able to read the files from the base-service and is usually
# created there.
%define username $USERNAME
# The packagename of the service
%define service $SERVICE
# The service name as used by the system's initscripts; usually this
# is %service
%define baseservice %service
%define __chkconfig /sbin/chkconfig
%define minitdir %_sysconfdir/minit
EOF
}
function rpm.generateHeader()
{
cat <<EOF
Summary: Clamav server for '%service'
Name: clamd.%service
Version: $VERSION
Release: %release_func $RELEASE
Epoch: 0
License: $LICENSE
Group: System Environment/Daemons
BuildRoot: %_tmppath/%name-%version-%release-root
BuildArch: noarch
Requires: init(%name)
Requires(pre): %service
Requires: clamav-server
BuildRequires: clamav-devel
%package sysv
Summary: SysV initscripts for a %service clamav-server
Group: System Environment/Daemons
Provides: init(%name) = sysv
Conflicts: init(%name) < sysv
Conflicts: init(%name) > sysv
Requires(post): %name = %epoch:%version-%release
Requires(post): diffutils mktemp %__chkconfig
Requires(preun): %__chkconfig
Requires(pre): %_initrddir
Requires(postun): %_initrddir
%package minit
Summary: minit initscripts for a %service clamav-server
Group: System Environment/Daemons
Provides: init(%name) = minit
Conflicts: init(%name) < minit
Conflicts: init(%name) > minit
Requires(post): %name = %epoch:%version-%release
Requires(post): diffutils mktemp
Requires(pre): minit-setup
Requires(postun): minit-setup
Requires(triggers): minit-tools
%description
Basic setup for a clamav server for '%service'.
%description sysv
Basic setup for a clamav server for '%service'.
This package contains initscripts for SysV based systems.
%description minit
Basic setup for a clamav server for '%service'.
This package contains initscripts for minit based systems.
EOF
}
function rpm.genBody()
{
cat <<"XEOFX"
%prep
%build
%install
rm -rf $RPM_BUILD_ROOT
%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log}
d=/usr/share/clamav/template
function subst
{
src=$d/$1
dst=$RPM_BUILD_ROOT$2
%__install -d -m755 $(dirname "$dst")
sed -e 's!^\(#?LogFile \).*!\1%logfile!g;
s!^#?\(LocalSocket \).*!\1%rundir/clamd.sock!g;
s!^#?\(PidFile \).*!\1%rundir/clamd.pid!g;
s!<SERVICE>!%service!g;
s!<USER>!%username!g;' "$src" >"$dst"
chmod --reference "$src" "$dst"
}
subst clamd.conf %conffile
subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service
%if 0%{!?_without_sysv:1}
subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service
subst clamd.init %_initrddir/clamd.%service
%endif
ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service
touch $RPM_BUILD_ROOT%logfile
touch $RPM_BUILD_ROOT%rundir/clamd.sock
%if 0%{!?_without_minit:1}
ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run
touch $RPM_BUILD_ROOT%minitsvcdir/respawn
cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params
-c
%conffile
EOF
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%triggerin minit -- %baseservice
minit-svc add services/clamd.%service services/%baseservice/
%triggerun minit -- %baseservice
test "$1" != 0 -a "$2" != 0 || \
minit-svc del services/clamd.%service services/%baseservice/
%post minit
d=$(mktemp /tmp/clamd.%service.XXXXXX)
sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d"
grep -q '^Foreground' $d || echo 'Foreground' >>$d
cmp -s "$d" %conffile || cat "$d" >"%conffile"
rm -f "$d"
%post sysv
d=$(mktemp /tmp/clamd.%service.XXXXXX)
sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d"
cmp -s "$d" %conffile || cat "$d" >"%conffile"
rm -f "$d"
%__chkconfig --add %name
%preun sysv
test "$1" != 0 || %__chkconfig --del %name
XEOFX
}
function rpm.genFiles
{
cat <<"EOF"
%files
%defattr(-,root,root,-)
%doc
%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile
%config(noreplace) %verify(not mtime) %conffile
%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service
%_sbindir/clamd.%service
%dir %attr(0700,%username,root) %rundir
%ghost %rundir/clamd.sock
%if 0%{!?_without_sysv:1}
%files sysv
%defattr(-,root,root,-)
%config %verify(not mtime) %_initrddir/clamd.%service
%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service
%endif
%if 0%{!?_without_minit:1}
%files minit
%defattr(-,root,root,-)
%dir %minitsvcdir
%config(noreplace) %verify(not mtime) %minitsvcdir/params
%config %minitsvcdir/run
%minitsvcdir/respawn
%endif
EOF
}
SERVICE=
VERSION=
RELEASE=
LICENSE=
USERNAME=
tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1
eval set -- "$tmp"
while true; do
case "$1" in
(--help) showHelp $0;;
(--service) SERVICE=$2; shift;;
(--version) VERSION=$2; shift;;
(--release) RELEASE=$2; shift;;
(--license) LICENSE=$2; shift;;
(--username) USERNAME=$2; shift;;
(--) shift; break;;
esac
shift
done
for i in SERVICE VERSION RELEASE LICENSE USERNAME; do
eval tmp=\$${i}
test "$tmp" || {
echo $"No value for $i specified; assuming @${i}@" >&2;
eval $i=@${i}@;
}
done
rpm.generatePreamble
rpm.generateHeader
rpm.genBody
rpm.genFiles
clamav-0.80-initoff.patch:
--- NEW FILE clamav-0.80-initoff.patch ---
--- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100
+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100
@@ -2,7 +2,7 @@
#
# clamav-milter This script starts and stops the clamav-milter daemon
#
-# chkconfig: 2345 71 40
+# chkconfig: - 71 40
#
# description: clamav-milter is a daemon which hooks into sendmail and routes
# email messages to clamav
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:10:52 -0000 1.2
+++ sources 3 Feb 2005 08:40:44 -0000 1.3
@@ -1 +1,2 @@
-096cffd2633cbac5a14b7080b6f67a67 clamav-0.71.tar.gz
+60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz
+b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig
Index: clamd.SERVICE.init
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd.SERVICE.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd.SERVICE.init 8 Nov 2004 04:10:52 -0000 1.1
+++ clamd.SERVICE.init 3 Feb 2005 08:40:44 -0000 1.2
@@ -4,4 +4,4 @@
# description: The clamd server running for <SERVICE>
CLAMD_SERVICE=<SERVICE>
-. /etc/init.d/clamd-wrapper
+. /usr/share/clamav/clamd-wrapper
Index: clamd-README
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd-README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd-README 8 Nov 2004 04:10:52 -0000 1.1
+++ clamd-README 3 Feb 2005 08:40:44 -0000 1.2
@@ -1,7 +1,7 @@
To create individual clamd-instance take the following files and
modify/copy them in the suggested way:
-clamav.conf:
+clamd.conf:
* set LogFile, PidFile, LocalSocket and User to suitable values
* place this file into /etc/clamd.d with a unique service-name;
e.g. as /etc/clamd.d/<SERVICE>.conf
@@ -42,7 +42,7 @@
Additionally, a symlink must be set to clamd in a way like
| # ln -s clamd /usr/sbin/clamd.<SERVICE>
and the directory for the socket file must be created (see 'LocalSocket'
-in clamav.conf)
+in clamd.conf)
| # mkdir -p /var/run/clamd.<SERVICE>
Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clamav.spec 10 Dec 2004 22:03:01 -0000 1.5
+++ clamav.spec 3 Feb 2005 08:40:44 -0000 1.6
@@ -1,15 +1,24 @@
+## This package understands the following switches:
+## --without milter ... deactivate the -milter subpackage
+
+
+## Fedora Extras specific customization below...
+%{!?release_func:%define release_func() %1}
+##
+
+
%define username clamav
%define homedir %_var/lib/clamav
%define freshclamlog %_var/log/freshclam.log
%define milterlog %_var/log/clamd.milter
%define milteruser clamilt
%define milterstatedir %_var/run/clamav-milter
-%define milterclamddir %_var/run/clamd.milter
+%define pkgdatadir %_datadir/%name
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 0.71
-Release: 2
+Version: 0.81
+Release: %release_func 2
Epoch: 0
License: GPL
Group: Applications/File
@@ -25,11 +34,12 @@
Source8: clamav-notify-servers
Patch20: clamav-0.70-user.patch
Patch21: clamav-0.70-path.patch
-Patch22: clamav-0.70-initoff.patch
+Patch22: clamav-0.80-initoff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: clamav-lib = %{epoch}:%{version}-%{release}
Requires: data(clamav)
-BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers
+BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel
+BuildRequires: bc
%package lib
Summary: Dynamic libraries for the Clam Antivirus scanner
@@ -39,7 +49,9 @@
%package devel
Summary: Headerfiles and libraries for the Clam Antivirus scanner
Group: Development/Libraries
+Source100: clamd-gen
Requires: clamav-lib = %{epoch}:%{version}-%{release}
+Requires(pre): %_libdir/pkgconfig
%package data
Summary: The virus-signatures for clamav
@@ -68,7 +80,6 @@
Provides: init(clamav-server)
Requires: data(clamav)
Requires: clamav-lib = %{epoch}:%{version}-%{release}
-BuildRequires: dietlibc
Requires(pre): %_initrddir
Requires(postun): %_initrddir
@@ -79,9 +90,7 @@
## and -minit subpackages
Requires: init(clamav-milter)
Provides: init(clamav-milter)
-BuildRequires: sendmail-devel
-Requires(preun): clamav-server = %{epoch}:%{version}-%{release}
-Requires(postun): clamav-server = %{epoch}:%{version}-%{release}
+%{!?_without_milter:BuildRequires: sendmail-devel}
Requires: sendmail
Requires(pre): %_initrddir
Requires(postun): %_initrddir
@@ -104,6 +113,16 @@
(including signatures for popular polymorphic viruses, too) and is KEPT UP
TO DATE.
+WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat
+ is unable to apply a simple security fix within 5 months. On
+ failures or successful DOS attacks on your mailserver, please
+ blame RH but not fedora.us.
+
+ See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
+ http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
+ for references
+
+
%description lib
This package contains dynamic libraries shared between applications
using the Clam Antivirus scanner.
@@ -120,7 +139,7 @@
%description update
This package contains programs which can be used to update the clamav
anti-virus database automatically. It uses the freshclam(1) utility for
-this task. To activate it, uncomment the entry in /etc/cron.d/clamav.
+this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update.
%description server
ATTENTION: most users do not need this package; the main package has
@@ -138,7 +157,6 @@
can be activated by adding
| INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl
-| define(`confINPUT_MAIL_FILTERS', `clamav')dnl
to your sendmail.mc.
@@ -157,23 +175,35 @@
s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g;
s!^#?(User ).*!\1<USER>!g;
s! /usr/local/share/clamav,! %homedir,!g;
- ' etc/clamav.conf
+ ' etc/clamd.conf
perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
## ------------------------------------------------------------
%build
-#%%configure --disable-clamav --with-dbdir=/var/lib/clamav
-## The %%configure macro can not be used since the script breaks on
-## the old architecture specification
-
-CFLAGS=$RPM_OPT_FLAGS; export CFLAGS
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \
- --disable-clamav --with-dbdir=%{homedir} \
- --enable-milter
+cat <<EOF
+*********************
+**
+** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable
+** to apply a simple security fix within 5 months. On failures or
+** successful DOS attacks on your mailserver, please blame RH
+** but not fedora.us.
+**
+** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385
+** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
+** for references
+**
+*********************
+EOF
+
+sleep 10
-## HACK: ./configure checks if freshclam.conf/clamav.conf are existing
+%configure --disable-clamav --with-dbdir=/var/lib/clamav \
+ --disable-zlib-vcheck \
+ %{!?_without_milter:--enable-milter}
+
+## HACK: ./configure checks if freshclam.conf/clamd.conf are existing
## in current filesystem and skips its installation then. Was introduced
## by 0.66.
perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g;
@@ -192,20 +222,34 @@
%{__install} -d -m755 \
${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
${RPM_BUILD_ROOT}%{_var}/log \
- ${RPM_BUILD_ROOT}{%milterstatedir,%milterclamddir} \
+ ${RPM_BUILD_ROOT}%milterstatedir \
+ ${RPM_BUILD_ROOT}%pkgdatadir/template \
${RPM_BUILD_ROOT}%{_initrddir}
-rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamav.conf \
+rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \
${RPM_BUILD_ROOT}%{_libdir}/*.la
+%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*}
+
## prepare the server-files
mkdir _doc_server
-%{__install} -m644 -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_initrddir}/clamd-wrapper
%{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig
%{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate
%{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init
%{__install} -m644 -p %{SOURCE5} _doc_server/README
+%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf
+
+%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir
+%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir
+cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template
+ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
+
+f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
+sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
+cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
+rm -f "$f".tmp
+
## prepare the update-files
%{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update
@@ -213,26 +257,28 @@
touch ${RPM_BUILD_ROOT}%{freshclamlog}
cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
+## Adjust this line...
+MAILTO=root,postmaster,webmaster,%username
+
## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
## Note: replace 'MIN' and 'HOUR' with random values
# MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
-EOF
+## Comment out or remove this line...
+1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
+EOF
+%if 0%{!?_without_milter:1}
#### The milter stuff
function subst() {
sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
}
-subst %SOURCE3 /etc/logrotate.d/clamd.milter
-subst %SOURCE7 %_initrddir/clamd.milter
-subst etc/clamav.conf /etc/clamd.d/milter.conf \
+subst etc/clamd.conf /etc/clamd.d/milter.conf \
's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
-chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.milter
-ln -s ./clamd $RPM_BUILD_ROOT%_sbindir/clamd.milter
cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter
## The '-blo' options might be usefully here -- especially for testing; see
@@ -242,8 +288,9 @@
EOF
%__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter
-touch $RPM_BUILD_ROOT%milterclamddir/{clamd.sock,clamd.pid,milter.sock}
touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog
+%endif # _without_milter
+
## ------------------------------------------------------------
@@ -275,18 +322,14 @@
%post milter
/sbin/chkconfig --add clamav-milter
-/sbin/chkconfig --add clamd.milter
%preun milter
test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || :
-test "$1" != 0 || %{_initrddir}/clamd.milter stop &>/dev/null || :
test "$1" != 0 || /sbin/chkconfig --del clamav-milter
-test "$1" != 0 || /sbin/chkconfig --del clamd.milter
%postun milter
test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
-test "$1" = 0 || %{_initrddir}/clamd.milter condrestart >/dev/null || :
test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
@@ -298,15 +341,9 @@
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO
%doc docs/*.pdf
-%doc docs/html docs/DMS docs/FreeBSD-HowTo
-%lang(fr) %doc docs/French
-%lang(ja) %doc docs/Japanese
-%lang(pl) %doc docs/Polish
-%lang(pt) %doc docs/Portugese
-%lang(es) %doc docs/Spanish
-%lang(tr) %doc docs/Turkish
%doc %{_mandir}/man[15]/*
%{_bindir}/*
+%exclude %_bindir/clamav-config
%exclude %_bindir/freshclam
%exclude %_mandir/man1/freshclam*
@@ -323,12 +360,20 @@
%{_includedir}/*
%{_libdir}/*.*a
%{_libdir}/*.so
+%dir %pkgdatadir
+%pkgdatadir/template
+%pkgdatadir/clamd-gen
+%_libdir/pkgconfig/*
+%_bindir/clamav-config
## -----------------------
%files data
%defattr(-,%{username},%{username},-)
%dir %{homedir}
+# use %%config to keep files which were updated by 'freshclam'
+# already. Without this tag, they would be overridden with older
+# versions whenever a new -data package is installed.
%config %verify(not size md5 mtime) %{homedir}/*.cvd
## -----------------------
@@ -338,7 +383,7 @@
%_bindir/freshclam
%_mandir/man1/freshclam*
%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %_sysconfdir/cron.d/*
+%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
%ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
@@ -348,12 +393,15 @@
%files server
%defattr(-,root,root,-)
%doc _doc_server/*
-%doc etc/clamav.conf
%doc %{_mandir}/man8/*
%{_sbindir}/*
-%config %{_initrddir}/clamd-wrapper
+%_initrddir/clamd-wrapper
+%dir %pkgdatadir
%dir %{_sysconfdir}/clamd.d
+%pkgdatadir/clamd-wrapper
+
+%if 0%{!?_without_milter:1}
%exclude %_sbindir/*milter*
%exclude %_mandir/man8/clamav-milter*
@@ -364,18 +412,79 @@
%doc clamav-milter/INSTALL
%_sbindir/*milter*
%_mandir/man8/clamav-milter*
-%config %{_initrddir}/clamd.milter
%config %{_initrddir}/clamav-milter
%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf
%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter
-%attr(0700,%milteruser,%milteruser) %dir %milterclamddir
%attr(0700,%milteruser,%milteruser) %dir %milterstatedir
-%ghost %milterclamddir/*
%ghost %milterstatedir/*
%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog
-
+%endif # _without_milter
%changelog
+* Fri Jan 28 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2
+- build the package with '--disable-zlib-vcheck' because RH is unable to
+ apply a fix for a 5 month old and solved security issue. Please fill
+ your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385
+- added 'BuildRequires: bc' (should work without also, but ./configure
+ gives out ugly warnings else)
+
+* Fri Jan 28 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1
+- updated to 0.81
+- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports
+ an internal mode now which is enabled by default
+- updated -milter %%description
+
+* Thu Jan 20 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2
+- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update
+ subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39)
+
+* Wed Nov 3 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1
+- updated to 0.80
+- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore
+- buildrequire 'curl-devel'
+- renamed clamav.conf to clamd.conf (upstream change)
+- updated -initoff patch
+
+* Tue Sep 14 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1
+- updated to 0.75.1
+- use %%configure, the problems with the architecture specification
+ seem to have passed (probably because of an autoconf update)
+- set mode 0600 for the cron-script (required by vixie-cron)
+- made the cronjob a spambot and send mail about deactivated freshclam
+ service to nearly everybody... (root, postmaster, webmaster)
+- other fixes in the notification cronjob
+
+* Fri Jul 23 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1
+- updated to 0.75
+
+* Thu Jul 15 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2
+- moved /usr/bin/clamav-config from main into -devel
+
+* Wed Jun 30 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1
+- updated to 0.74
+
+* Mon Jun 14 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1
+- updated to 0.73
+- added pkgconfig file
+
+* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3
+- notify the user about a deactivated clamav-update service
+- added clamd-gen script which generates template spec-files for
+ services using clamd
+- copied template configuration files to %pkgdatadir/template (needed
+ for clamd-gen)
+- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink
+ will be provided for compatibility reasons
+- conditionalized building of the -milter subpackage ('--without
+ milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7)
+
+* Fri Jun 4 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2
+- removed 'BuildRequires: dietlibc'; it was a leftover from the
+ pre-use-signal era (before 0.70) (bug #1716)
+
+* Thu Jun 3 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1
+- updated to 0.72
+
* Thu May 20 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2
- removed the randomization in the cronjob; it seems to be impossible
to use the mod-operator (%%) there. Instead of, the user has to
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:10:52 -0000 1.2
+++ .cvsignore 3 Feb 2005 08:40:44 -0000 1.3
@@ -1 +1,3 @@
-clamav-0.71.tar.gz
+clamav-*.tar.gz*
+clamav-0.81.tar.gz
+clamav-0.81.tar.gz.sig
--- clamav-0.71.tar.gz.sig DELETED ---
--- clamav-0.70-initoff.patch DELETED ---
More information about the fedora-extras-commits
mailing list