From 1b188a1f3f19a9a627083b1407aa831810ad6c2f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 1 Jan 2012 16:39:31 -0600 Subject: [PATCH] Revert "Add files from bug 756854" This reverts commit 14d21bc46d3a59c90e91420a310f14102e8d859b. --- README.clamd-wrapper | 116 ----- clamav-milter.sysconfig | 8 - clamav.spec | 91 ++-- clamav.spec.orig | 1091 --------------------------------------- clamav.spec.rej | 152 ------ clamd-wrapper | 86 --- clamd.init | 18 - clamd.logrotate | 8 - clamd.sysconfig | 5 - freshclam.cron | 34 -- freshclam.logrotate | 10 - sources | 1 + 12 files changed, 59 insertions(+), 1561 deletions(-) delete mode 100644 README.clamd-wrapper delete mode 100644 clamav-milter.sysconfig delete mode 100644 clamav.spec.orig delete mode 100644 clamav.spec.rej delete mode 100644 clamd-wrapper delete mode 100644 clamd.init delete mode 100644 clamd.logrotate delete mode 100644 clamd.sysconfig delete mode 100644 freshclam.cron delete mode 100644 freshclam.logrotate diff --git a/README.clamd-wrapper b/README.clamd-wrapper deleted file mode 100644 index 5cd1b91..0000000 --- a/README.clamd-wrapper +++ /dev/null @@ -1,116 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch - | # chgrp - | # chmod 0620 - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang), the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd. - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd. on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd. -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd. - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch - | # chgrp - | # chmod 0620 - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang), the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd. - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd. on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd. -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd. - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index bd82488..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,8 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index 53db81e..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,14 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper -Source4: clamd.init -Source5: README.clamd-wrapper -Source6: clamd.sysconfig -Source7: freshclam.logrotate -Source8: freshclam.cron -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -178,6 +171,53 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf + +cat <clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF + +cat <freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +EOF + +%{__cat} <clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +EOF + %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -200,30 +240,19 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav - -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/logrotate.d/* \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif - # Install clamav-wrapper: -install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -316,6 +345,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -335,12 +366,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamav +%config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -380,10 +409,6 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Fri Nov 25 2011 Philip Prindeville - 0.97.3-2 -- Add missing clamd-wrapper supporting files -- Remove from init script the unused CLAMD_SOCKET variable - * Tue Oct 18 2011 Nick Bebout - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerelease}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerelease}.tar.gz.sig -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=] [VERSION=] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=patch&collapsed=&headers=1&format=raw -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%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-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd./clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd./clamd.pid!g' \ - -e 's!^#?(User ).*!\1!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!!scan!g;s!!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# 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 - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 000dcb8..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -[ -n "$CLAMD_SERVICE" ] || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" != "no" ] || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -[ -f "$sysconffile" ] && . "$sysconffile" -CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` - -# make sure that config file contains a PidFile setting -[ -n "$CLAMD_PIDFILE" ] || exit 6 - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - [ ! -f $lockfile ] || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.init b/clamd.init deleted file mode 100644 index cf25b46..0000000 --- a/clamd.init +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for -# - -CLAMD_SERVICE= -. /usr/share/clamav/clamd-wrapper -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for -# - -CLAMD_SERVICE= -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index b233f3a..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index e0e7714..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,5 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -#CLAMD_OPTIONS= -## the values below should only ever be specified in the above .conf file! -#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock -#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index 558a2f2..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 5a5615a..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2