- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168)
- Fixed discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) - Added build requirement to ncurses-devel for clamdtop (again) - Moved clamd wrapper script and documentation into correct sub-package (#782596, thanks to Philip Prindeville)
This commit is contained in:
parent
faa3f19f03
commit
a1ce11dec4
|
@ -1,10 +1,4 @@
|
||||||
/clamd-wrapper.tar.bz2
|
/clamd-wrapper.tar.bz2
|
||||||
/clamav-0.97.5-norar.tar.xz
|
/clamav-*-norar.tar.xz
|
||||||
/main-54.cvd
|
/main*.cvd
|
||||||
/daily-15103.cvd
|
/daily*.cvd
|
||||||
/clamav-0.97.6-norar.tar.xz
|
|
||||||
/daily-15408.cvd
|
|
||||||
/clamav-0.97.7-norar.tar.xz
|
|
||||||
/daily.cvd
|
|
||||||
/main.cvd
|
|
||||||
/clamav-0.97.8-norar.tar.xz
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# server.
|
# server.
|
||||||
# processname: clamd
|
# processname: clamd
|
||||||
# pidfile: /var/run/clamav/clamd.pid
|
# pidfile: /var/run/clamav/clamd.pid
|
||||||
# config: /etc/clamav.conf
|
# config: /etc/clamd.conf
|
||||||
|
|
||||||
# Source function library.
|
# Source function library.
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
|
@ -29,7 +29,7 @@ case "$1" in
|
||||||
stop)
|
stop)
|
||||||
echo -n "Stopping Clam AntiVirus Daemon: "
|
echo -n "Stopping Clam AntiVirus Daemon: "
|
||||||
killproc clamd
|
killproc clamd
|
||||||
rm -f /var/clamav/clamd.socket
|
rm -f /var/run/clamav/clamd.sock
|
||||||
rm -f /var/run/clamav/clamav.pid
|
rm -f /var/run/clamav/clamav.pid
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
echo
|
echo
|
||||||
|
|
52
clamav.spec
52
clamav.spec
|
@ -4,15 +4,17 @@
|
||||||
|
|
||||||
Summary: Anti-virus software
|
Summary: Anti-virus software
|
||||||
Name: clamav
|
Name: clamav
|
||||||
Version: 0.97.8
|
Version: 0.98
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://www.clamav.net/
|
URL: http://www.clamav.net/
|
||||||
|
|
||||||
# Upstream source includes libunrar that is not distributable.
|
# Unfortunately, clamav includes support for RAR v3, derived from GPL
|
||||||
# rm -r libclamunrar
|
# incompatible unrar from RARlabs. We have to pull this code out. This
|
||||||
#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz
|
# tarball was created by
|
||||||
|
# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
|
||||||
|
# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz
|
||||||
Source0: clamav-%{version}-norar.tar.xz
|
Source0: clamav-%{version}-norar.tar.xz
|
||||||
Source1: clamav.init
|
Source1: clamav.init
|
||||||
Source2: clamav-milter.init
|
Source2: clamav-milter.init
|
||||||
|
@ -23,12 +25,14 @@ Source8: freshclam.logrotate
|
||||||
Source9: clamd.logrotate
|
Source9: clamd.logrotate
|
||||||
Source10: clamav-milter.sysconfig
|
Source10: clamav-milter.sysconfig
|
||||||
|
|
||||||
Source11: http://db.local.clamav.net/main.cvd
|
# To download the *.cvd, go to http://www.clamav.net and use the links
|
||||||
Source12: http://db.local.clamav.net/daily.cvd
|
# there (I renamed the files to add the -version suffix for verifying).
|
||||||
|
Source11: http://db.local.clamav.net/main-55.cvd
|
||||||
|
Source12: http://db.local.clamav.net/daily-17940.cvd
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz
|
BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel
|
||||||
%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12}
|
%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12}
|
||||||
Requires: clamav-db = %{version}-%{release}
|
Requires: clamav-db = %{version}-%{release}
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
|
@ -123,7 +127,7 @@ you will need to install %{name}-devel.
|
||||||
%setup -q -T -c
|
%setup -q -T -c
|
||||||
xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
|
xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
|
||||||
|
|
||||||
%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure
|
%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure
|
||||||
|
|
||||||
%{__perl} -pi.orig -e '
|
%{__perl} -pi.orig -e '
|
||||||
s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g;
|
s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g;
|
||||||
|
@ -162,7 +166,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
|
||||||
s|^#(ArchiveMaxCompressionRatio) .+|$1 300|;
|
s|^#(ArchiveMaxCompressionRatio) .+|$1 300|;
|
||||||
s|^#(ArchiveBlockEncrypted)|$1|;
|
s|^#(ArchiveBlockEncrypted)|$1|;
|
||||||
s|^#(ArchiveBlockMax)|$1|;
|
s|^#(ArchiveBlockMax)|$1|;
|
||||||
' etc/clamd.conf
|
' etc/clamd.conf.sample
|
||||||
|
|
||||||
%{__perl} -pi.orig -e '
|
%{__perl} -pi.orig -e '
|
||||||
s|^(Example)|#$1|;
|
s|^(Example)|#$1|;
|
||||||
|
@ -171,7 +175,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
|
||||||
s|^#(LogSyslog)|$1|;
|
s|^#(LogSyslog)|$1|;
|
||||||
s|^#(DatabaseOwner) .+$|$1 clam|;
|
s|^#(DatabaseOwner) .+$|$1 clam|;
|
||||||
s|^(Checks) .+$|$1 24|;
|
s|^(Checks) .+$|$1 24|;
|
||||||
' etc/freshclam.conf
|
' etc/freshclam.conf.sample
|
||||||
|
|
||||||
%{__perl} -pi.orig -e '
|
%{__perl} -pi.orig -e '
|
||||||
s|^(Example)|#$1|;
|
s|^(Example)|#$1|;
|
||||||
|
@ -179,14 +183,14 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
|
||||||
s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|;
|
s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|;
|
||||||
s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|;
|
s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|;
|
||||||
s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|;
|
s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|;
|
||||||
' etc/clamav-milter.conf
|
' etc/clamav-milter.conf.sample
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
--program-prefix="%{?_program_prefix}" \
|
--program-prefix="%{?_program_prefix}" \
|
||||||
%{!?_without_milter:--enable-milter} \
|
%{!?_without_milter:--enable-milter} \
|
||||||
--disable-clamav \
|
--disable-clamav \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-zlib-vcheck \
|
--disable-zlib-vcheck \
|
||||||
--disable-unrar \
|
--disable-unrar \
|
||||||
--enable-id-check \
|
--enable-id-check \
|
||||||
|
@ -195,7 +199,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
|
||||||
--with-group="clam" \
|
--with-group="clam" \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-user="clam" \
|
--with-user="clam" \
|
||||||
--disable-llvm
|
--disable-llvm
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
@ -208,6 +212,9 @@ install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam
|
||||||
install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam
|
install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam
|
||||||
install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav
|
install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav
|
||||||
|
|
||||||
|
mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,}
|
||||||
|
mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,}
|
||||||
|
|
||||||
# now rewrite scripts and config files in-place
|
# now rewrite scripts and config files in-place
|
||||||
sed -i \
|
sed -i \
|
||||||
-e 's!%%{_sbindir}!%{_sbindir}!g' \
|
-e 's!%%{_sbindir}!%{_sbindir}!g' \
|
||||||
|
@ -219,6 +226,7 @@ sed -i \
|
||||||
%if %{!?_without_milter:1}0
|
%if %{!?_without_milter:1}0
|
||||||
install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter
|
install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter
|
||||||
install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter
|
install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter
|
||||||
|
mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,}
|
||||||
%else
|
%else
|
||||||
rm %{buildroot}%{_mandir}/man8/clamav-milter.8*
|
rm %{buildroot}%{_mandir}/man8/clamav-milter.8*
|
||||||
%endif
|
%endif
|
||||||
|
@ -235,6 +243,9 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/
|
||||||
install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd
|
install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd
|
||||||
install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd
|
install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd
|
||||||
|
|
||||||
|
# Clean up for later usage in documentation
|
||||||
|
for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
@ -313,14 +324,12 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root, 0755)
|
%defattr(-, root, root, 0755)
|
||||||
%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/
|
%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README
|
||||||
%doc docs/*.pdf etc/freshclam.conf
|
%doc docs/*.pdf etc/freshclam.conf
|
||||||
%doc %{_mandir}/man1/sigtool.1*
|
%doc %{_mandir}/man1/sigtool.1*
|
||||||
%doc %{_mandir}/man1/clamscan.1*
|
%doc %{_mandir}/man1/clamscan.1*
|
||||||
%doc %{_mandir}/man1/freshclam.1*
|
%doc %{_mandir}/man1/freshclam.1*
|
||||||
%doc %{_mandir}/man5/freshclam.conf.5*
|
%doc %{_mandir}/man5/freshclam.conf.5*
|
||||||
%doc %{_prefix}/share/clamav/README.clamd-wrapper
|
|
||||||
%{_prefix}/share/clamav/clamd-wrapper
|
|
||||||
%config(noreplace) %{_sysconfdir}/freshclam.conf
|
%config(noreplace) %{_sysconfdir}/freshclam.conf
|
||||||
%{_bindir}/clamscan
|
%{_bindir}/clamscan
|
||||||
%{_bindir}/freshclam
|
%{_bindir}/freshclam
|
||||||
|
@ -337,6 +346,8 @@ rm -rf %{buildroot}
|
||||||
%doc %{_mandir}/man1/clambc.1*
|
%doc %{_mandir}/man1/clambc.1*
|
||||||
%doc %{_mandir}/man5/clamd.conf.5*
|
%doc %{_mandir}/man5/clamd.conf.5*
|
||||||
%doc %{_mandir}/man8/clamd.8*
|
%doc %{_mandir}/man8/clamd.8*
|
||||||
|
%doc %{_prefix}/share/clamav/README.clamd-wrapper
|
||||||
|
%{_prefix}/share/clamav/clamd-wrapper
|
||||||
%config(noreplace) %{_sysconfdir}/clamd.conf
|
%config(noreplace) %{_sysconfdir}/clamd.conf
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/clamav
|
%config(noreplace) %{_sysconfdir}/logrotate.d/clamav
|
||||||
%{_sysconfdir}/clamd.d
|
%{_sysconfdir}/clamd.d
|
||||||
|
@ -344,6 +355,7 @@ rm -rf %{buildroot}
|
||||||
%{_sbindir}/clamd
|
%{_sbindir}/clamd
|
||||||
%{_bindir}/clamconf
|
%{_bindir}/clamconf
|
||||||
%{_bindir}/clamdscan
|
%{_bindir}/clamdscan
|
||||||
|
%{_bindir}/clamdtop
|
||||||
|
|
||||||
%defattr(0644, clam, clam, 0755)
|
%defattr(0644, clam, clam, 0755)
|
||||||
%{_localstatedir}/run/clamav/
|
%{_localstatedir}/run/clamav/
|
||||||
|
@ -383,6 +395,14 @@ rm -rf %{buildroot}
|
||||||
%exclude %{_libdir}/libclamav.la
|
%exclude %{_libdir}/libclamav.la
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Oct 06 2013 Robert Scheck <robert@fedoraproject.org> - 0.98-1
|
||||||
|
- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168)
|
||||||
|
- Fixed discrepancies between clamd initscript and clamd config
|
||||||
|
file (#960923, thanks to John Horne)
|
||||||
|
- Added build requirement to ncurses-devel for clamdtop (again)
|
||||||
|
- Moved clamd wrapper script and documentation into correct sub-
|
||||||
|
package (#782596, thanks to Philip Prindeville)
|
||||||
|
|
||||||
* Tue Apr 23 2013 Orion Poplawski <orion@cora.nwra.com> - 0.97.8-1
|
* Tue Apr 23 2013 Orion Poplawski <orion@cora.nwra.com> - 0.97.8-1
|
||||||
- Upgrade to 0.97.8
|
- Upgrade to 0.97.8
|
||||||
- Updated daily.cvd
|
- Updated daily.cvd
|
||||||
|
|
6
sources
6
sources
|
@ -1,4 +1,4 @@
|
||||||
8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz
|
500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz
|
||||||
e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2
|
e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2
|
||||||
bbe585f65fb04504544ce3d6e07d38e9 daily.cvd
|
06f660f474d1a6863de4a00eb02521e3 main-55.cvd
|
||||||
eb12490fda87d602e476d4b163f8a34b main.cvd
|
012af1d3ee7156db8bad20650c89a94d daily-17940.cvd
|
||||||
|
|
Loading…
Reference in New Issue