commit: d65edf5b04fef8580dbd5cc4a379ce33e06e5817 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Apr 22 18:00:19 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Apr 22 18:00:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=d65edf5b
app-antivirus/clamav: in tree version works. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA app-antivirus/clamav/clamav-0.97.8-r99.ebuild | 124 -------------------- app-antivirus/clamav/files/clamav-0.97-nls.patch | 11 -- .../clamav/files/clamav-milter.README.gentoo | 44 ------- app-antivirus/clamav/files/clamav.logrotate | 15 --- app-antivirus/clamav/files/clamd.conf | 9 -- app-antivirus/clamav/files/clamd.initd-r5 | 126 --------------------- app-antivirus/clamav/metadata.xml | 9 -- 7 files changed, 338 deletions(-) diff --git a/app-antivirus/clamav/clamav-0.97.8-r99.ebuild b/app-antivirus/clamav/clamav-0.97.8-r99.ebuild deleted file mode 100644 index d681cac..0000000 --- a/app-antivirus/clamav/clamav-0.97.8-r99.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.1 2013/04/23 18:02:01 lordvan Exp $ - -EAPI=5 - -inherit eutils flag-o-matic user multilib - -DESCRIPTION="Clam Anti-Virus Scanner" -HOMEPAGE="http://www.clamav.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc" - -CDEPEND="bzip2? ( app-arch/bzip2 ) - clamdtop? ( sys-libs/ncurses ) - iconv? ( virtual/libiconv ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - dev-libs/libtommath - >=sys-libs/zlib-1.2.2 - sys-devel/libtool" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-clamav )" - -RESTRICT="test" - -DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.97-nls.patch -) - -pkg_setup() { - enewgroup clamav - enewuser clamav -1 -1 /dev/null clamav -} - -src_prepare() { - use ppc64 && append-flags -mminimal-toic - use uclibc && export ac_cv_type_error_t=yes -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - --disable-experimental \ - --enable-id-check \ - --with-dbdir="${EPREFIX}"/var/lib/clamav \ - --with-system-tommath \ - --with-zlib="${EPREFIX}"/usr \ - $(use_enable bzip2) \ - $(use_enable clamdtop) \ - $(use_enable ipv6) \ - $(use_enable milter) \ - $(use_enable static-libs static) \ - $(use_with iconv) -} - -src_install() { - default - - rm -rf "${ED}"/var/lib/clamav - newinitd "${FILESDIR}"/clamd.initd-r5 clamd - newconfd "${FILESDIR}"/clamd.conf clamd - - keepdir /var/lib/clamav - fowners clamav:clamav /var/lib/clamav - keepdir /var/log/clamav - fowners clamav:clamav /var/log/clamav - - dodir /etc/logrotate.d - insinto /etc/logrotate.d - newins "${FILESDIR}"/clamav.logrotate clamav - - # Modify /etc/{clamd,freshclam}.conf to be usable out of the box - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \ - -e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \ - -e "s:^\#\(LogTime\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/clamd.conf - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \ - -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ - -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/freshclam.conf - - if use milter ; then - # MilterSocket one to include ' /' because there is a 2nd line for - # inet: which we want to leave - dodoc "${FILESDIR}"/clamav-milter.README.gentoo - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \ - -e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ - "${ED}"/etc/clamav-milter.conf - cat > "${ED}"/etc/conf.d/clamd <<-EOF - MILTER_NICELEVEL=19 - START_MILTER=no - EOF - fi - - prune_libtool_files --all -} - -pkg_postinst() { - if use milter ; then - elog "For simple instructions how to setup the clamav-milter read the" - elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" - fi -} diff --git a/app-antivirus/clamav/files/clamav-0.97-nls.patch b/app-antivirus/clamav/files/clamav-0.97-nls.patch deleted file mode 100644 index 6ca0c0e..0000000 --- a/app-antivirus/clamav/files/clamav-0.97-nls.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.97/shared/output.c.orig -+++ clamav-0.97/shared/output.c -@@ -63,7 +63,7 @@ - pthread_mutex_t mdprintf_mutex = PTHREAD_MUTEX_INITIALIZER; - #endif - --#ifdef C_LINUX -+#if defined(C_LINUX) && defined(HAVE_LIBINTL_H) - #include <libintl.h> - #include <locale.h> - diff --git a/app-antivirus/clamav/files/clamav-milter.README.gentoo b/app-antivirus/clamav/files/clamav-milter.README.gentoo deleted file mode 100644 index 17e9ba6..0000000 --- a/app-antivirus/clamav/files/clamav-milter.README.gentoo +++ /dev/null @@ -1,44 +0,0 @@ -Nick Hadaway <[email protected]> -Updated by Andrea Barisani <[email protected]> -18/05/2004 - -Setting up clamav-milter on Gentoo Linux - -Step 1 - Configure clamd - -Check /etc/clamd.conf, default values should work out of the box but -read and understand all the options especially if you are going to -use it on production boxes. - -Step 2 - Tell the init script to start clamd as well as freshclam and the - milter itself. - - nano -w /etc/conf.d/clamd - - START_CLAMD=yes - START_FRESHCLAM=yes - START_MILTER=yes - -Step 3 - Edit sendmail.mc - - Add these lines to sendmail.mc before any any other - INPUT_MAIL_FILTER lines and before MAILER(local) - NOTE: ANY INPUT_MAIL_FILTER definitions put before these lines - will be discarded due to the use of confINPUT_MAIL_FILTERS - Make this your first mail filter. :) - - INPUT_MAIL_FILTER(`clmilter',`S=local:/var/run/clamav/clmilter.sock, F=, T=S:4m;R:4m')dnl - define(`confINPUT_MAIL_FILTERS', `clmilter')dnl - -Step 4 - Rebuild sendmail.cf - - cd /etc/mail - m4 sendmail.mc > sendmail.cf - -Step 5 - Start clamad - - /etc/init.d/clamd start - -Step 6 - Restart sendmail - - /etc/init.d/sendmail restart diff --git a/app-antivirus/clamav/files/clamav.logrotate b/app-antivirus/clamav/files/clamav.logrotate deleted file mode 100644 index 12c77e0..0000000 --- a/app-antivirus/clamav/files/clamav.logrotate +++ /dev/null @@ -1,15 +0,0 @@ -/var/log/clamav/clamd.log { - missingok - postrotate - /etc/init.d/clamd logfix - /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2> /dev/null` 2>/dev/null || true - endscript -} - -/var/log/clamav/freshclam.log { - missingok - postrotate - /etc/init.d/clamd logfix - /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2> /dev/null` 2>/dev/null || true - endscript -} diff --git a/app-antivirus/clamav/files/clamd.conf b/app-antivirus/clamav/files/clamd.conf deleted file mode 100644 index ee05513..0000000 --- a/app-antivirus/clamav/files/clamd.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/clamd - -# NOTICE: Since clamav-0.85-r1, only START_CLAMD and START_FRESHCLAM settings -# are used, other are silently ignored - -START_CLAMD=yes -START_FRESHCLAM=yes -CLAMD_NICELEVEL=3 -FRESHCLAM_NICELEVEL=19 diff --git a/app-antivirus/clamav/files/clamd.initd-r5 b/app-antivirus/clamav/files/clamd.initd-r5 deleted file mode 100755 index fbe2432..0000000 --- a/app-antivirus/clamav/files/clamd.initd-r5 +++ /dev/null @@ -1,126 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r5,v 1.2 2013/04/16 05:52:39 eras Exp $ - -daemon_clamd="/usr/sbin/clamd" -daemon_freshclam="/usr/bin/freshclam" -daemon_milter="/usr/sbin/clamav-milter" - -extra_commands="logfix" - -depend() { - use net - provide antivirus -} - -get_config() { - clamconf | sed 's/["=]//g' | \ - awk "{ - if(\$0==\"Config file: $1.conf\") S=1 - if(S==1&&\$0==\"\") { - print \"$3\" - exit - } - if(S==1&&\$1~\"^$2\$\") { - print \$2!=\"disabled\"?\$2:\"$3\" - exit - } - }" -} - -start() { - # populate variables and fix log file permissions - logfix - - if [ "${START_CLAMD}" = "yes" ]; then - checkpath --quiet --mode 755 \ - --owner "${clamd_user}":"${clamd_user}" \ - --directory `dirname ${clamd_socket}` - if [ -S "${clamd_socket}" ]; then - rm -f ${clamd_socket} - fi - ebegin "Starting clamd" - start-stop-daemon --start --quiet \ - --nicelevel ${CLAMD_NICELEVEL:-0} \ - --exec ${daemon_clamd} - eend $? "Failed to start clamd" - fi - - if [ "${START_FRESHCLAM}" = "yes" ]; then - checkpath --quiet --mode 755 \ - --owner "${clamd_user}":"${clamd_user}" \ - --directory `dirname ${clamd_socket}` - ebegin "Starting freshclam" - start-stop-daemon --start --quiet \ - --nicelevel ${FRESHCLAM_NICELEVEL:-0} \ - --exec ${daemon_freshclam} -- -d - retcode=$? - if [ ${retcode} = 1 ]; then - eend 0 - einfo "Virus databases are already up to date." - else - eend ${retcode} "Failed to start freshclam" - fi - fi - - if [ "${START_MILTER}" = "yes" ]; then - if [ -z "${MILTER_CONF_FILE}" ]; then - MILTER_CONF_FILE="/etc/clamav-milter.conf" - fi - - ebegin "Starting clamav-milter" - start-stop-daemon --start --quiet \ - --nicelevel ${MILTER_NICELEVEL:-0} \ - --exec ${daemon_milter} -- -c ${MILTER_CONF_FILE} - eend $? "Failed to start clamav-milter" - fi -} - -stop() { - if [ "${START_CLAMD}" = "yes" ]; then - ebegin "Stopping clamd" - start-stop-daemon --stop --quiet --name clamd - eend $? "Failed to stop clamd" - fi - if [ "${START_FRESHCLAM}" = "yes" ]; then - ebegin "Stopping freshclam" - start-stop-daemon --stop --quiet --name freshclam - eend $? "Failed to stop freshclam" - fi - if [ "${START_MILTER}" = "yes" ]; then - ebegin "Stopping clamav-milter" - start-stop-daemon --stop --quiet --name clamav-milter - eend $? "Failed to stop clamav-milter" - fi -} - -logfix() { - clamd_socket=$(get_config clamd LocalSocket /run/clamav/clamd.sock) - clamd_user=$(get_config clamd User clamav) - freshclam_user=$(get_config freshclam DatabaseOwner clamav) - - if [ "${START_CLAMD}" = "yes" ]; then - # fix clamd log permissions - # (might be clobbered by logrotate or something) - local logfile=$(get_config clamd LogFile) - if [ -n "${logfile}" ]; then - checkpath --quiet \ - --owner "${clamd_user}":"${clamd_user}" \ - --mode 640 \ - --file ${logfile} - fi - fi - - if [ "${START_FRESHCLAM}" = "yes" ]; then - # fix freshclam log permissions - # (might be clobbered by logrotate or something) - local logfile=$(get_config freshclam UpdateLogFile) - if [ -n "${logfile}" ]; then - checkpath --quiet \ - --owner "${freshclam_user}":"${freshclam_user}" \ - --mode 640 \ - --file ${logfile} - fi - fi -} diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml deleted file mode 100644 index e2cc203..0000000 --- a/app-antivirus/clamav/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>net-mail</herd> - <herd>antivirus</herd> - <use> - <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag> - </use> -</pkgmetadata>
