From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../clamav/files/clamav-0.100.0_autotools.patch | 10 -- .../files/clamav-0.99.4-fix-newer-zlib.patch | 54 --------- .../clamav-0.99.4-pcre2-compile-erroffset.patch | 11 -- .../clamav/files/clamav-milter.README.gentoo | 85 -------------- app-antivirus/clamav/files/clamav-milter.service | 12 -- .../clamav/files/clamav-milter.service-r1 | 13 --- app-antivirus/clamav/files/clamav.logrotate | 17 --- app-antivirus/clamav/files/clamd.conf | 9 -- app-antivirus/clamav/files/clamd.conf-r1 | 7 -- app-antivirus/clamav/files/clamd.initd-r6 | 128 --------------------- app-antivirus/clamav/files/clamd.service | 12 -- app-antivirus/clamav/files/clamd_at.service | 12 -- app-antivirus/clamav/files/freshclamd.service | 10 -- app-antivirus/clamav/files/tmpfiles.d/clamav.conf | 1 - 14 files changed, 381 deletions(-) delete mode 100644 app-antivirus/clamav/files/clamav-0.100.0_autotools.patch delete mode 100644 app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch delete mode 100644 app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch delete mode 100644 app-antivirus/clamav/files/clamav-milter.README.gentoo delete mode 100644 app-antivirus/clamav/files/clamav-milter.service delete mode 100644 app-antivirus/clamav/files/clamav-milter.service-r1 delete mode 100644 app-antivirus/clamav/files/clamav.logrotate delete mode 100644 app-antivirus/clamav/files/clamd.conf delete mode 100644 app-antivirus/clamav/files/clamd.conf-r1 delete mode 100644 app-antivirus/clamav/files/clamd.initd-r6 delete mode 100644 app-antivirus/clamav/files/clamd.service delete mode 100644 app-antivirus/clamav/files/clamd_at.service delete mode 100644 app-antivirus/clamav/files/freshclamd.service delete mode 100644 app-antivirus/clamav/files/tmpfiles.d/clamav.conf (limited to 'app-antivirus/clamav/files') diff --git a/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch b/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch deleted file mode 100644 index 58c3b4e324f8..000000000000 --- a/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- clamav-0.100.0/configure.ac_orig 2018-04-12 13:12:58.201729248 +0200 -+++ clamav-0.100.0/configure.ac 2018-04-12 13:23:44.982679360 +0200 -@@ -47,6 +47,7 @@ - LT_CONFIG_LTDL_DIR([libltdl]) - LT_INIT([dlopen disable-static]) - LTDL_INIT([recursive]) -+PKG_PROG_PKG_CONFIG(0.16) - - m4_include([m4/reorganization/build_tools.m4]) - m4_include([m4/reorganization/headers.m4]) diff --git a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch b/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch deleted file mode 100644 index 18673419a584..000000000000 --- a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/649516 - -Description: fix compatibility with zlib 1.2.9 and newer -Author: Marc Deslauriers -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073 - -Index: clamav-0.99.2+dfsg/libclamav/bytecode_api.c -=================================================================== ---- clamav-0.99.2+dfsg.orig/libclamav/bytecode_api.c 2017-08-08 15:20:06.651685637 -0400 -+++ clamav-0.99.2+dfsg/libclamav/bytecode_api.c 2017-08-15 15:45:14.645714766 -0400 -@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl - cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n"); - return -1; - } -- memset(&stream, 0, sizeof(stream)); -- ret = inflateInit2(&stream, windowBits); -+ -+ b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n); -+ if (!b) { -+ return -1; -+ } -+ ctx->inflates = b; -+ ctx->ninflates = n; -+ b = &b[n-1]; -+ -+ b->from = from; -+ b->to = to; -+ b->needSync = 0; -+ memset(&b->stream, 0, sizeof(stream)); -+ ret = inflateInit2(&b->stream, windowBits); - switch (ret) { - case Z_MEM_ERROR: - cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n"); -@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl - cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret); - return -1; - } -- -- b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n); -- if (!b) { -- inflateEnd(&stream); -- return -1; -- } -- ctx->inflates = b; -- ctx->ninflates = n; -- b = &b[n-1]; -- -- b->from = from; -- b->to = to; -- b->needSync = 0; -- memcpy(&b->stream, &stream, sizeof(stream)); - return n-1; - } - diff --git a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch b/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch deleted file mode 100644 index 5585ea614534..000000000000 --- a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.99.4/libclamav/regex_pcre.c_orig 2018-03-02 19:10:39.702899702 +0100 -+++ clamav-0.99.4/libclamav/regex_pcre.c 2018-03-02 19:09:27.600901912 +0100 -@@ -112,7 +112,8 @@ - #if USING_PCRE2 - int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override) - { -- int errornum, erroffset; -+ int errornum; -+ size_t erroffset; - pcre2_general_context *gctx; - pcre2_compile_context *cctx; 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 f526bd35a926..000000000000 --- a/app-antivirus/clamav/files/clamav-milter.README.gentoo +++ /dev/null @@ -1,85 +0,0 @@ -Nick Hadaway -Updated by Andrea Barisani -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 - Inform your MTA about the new milter. - - SENDMAIL - Step 3.a.1 - 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 3.a.2 - Rebuild sendmail.cf - - cd /etc/mail - m4 sendmail.mc > sendmail.cf - - - - POSTFIX - Step 3.b - Edit main.cf. - - Add unix:/var/run/clamav/clamav-milter.sock to your - smtpd_milters line. If the line doesn't exist, just - stick it at the bottom of main.cf on a new line. - - If you're appending, this is a space separated list. - If virus scanning is your most intensive test, you - may wish to put it on the end of the list so earlier, - easiser tests may punt the message before you go through the - trouble of virus scanning it. - - Only one milter example: - - # milters to run on network received mail. - smtpd_milters=unix:/var/run/clamav/clamav-milter.suck - - Multiple milters example: - - # milters to run on network received mail. - smtpd_milters=unix:/var/run/dkim-filter/dkim-filter.sock unix:/var/run/clamav/clamav-milter.sock - - -Step 5 - Adjust permissions for clamav-milter socket - - Edit /etc/clamav-milter.conf and check/change MilterSocketGroup and MilterSocketMode - e.g. for postfix it would be this (sendmail,.. should be similar): - MiltersocketGroup postfix - MilterSocketMode 660 - -Step 6 - Start clamad - - /etc/init.d/clamd start - -Step 7 - Restart your MTA - - SENDMAIL - /etc/init.d/sendmail restart - - POSTFIX - /etc/init.d/postfix restart - diff --git a/app-antivirus/clamav/files/clamav-milter.service b/app-antivirus/clamav/files/clamav-milter.service deleted file mode 100644 index 5a1a24faa27d..000000000000 --- a/app-antivirus/clamav/files/clamav-milter.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Milter module for the ClamAV scanner -After=nss-lookup.target network.target -Before=sendmail.service -Before=postfix.service - -[Service] -ExecStart=/usr/sbin/clamav-milter -c /etc/clamav-milter.conf --nofork=yes -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/app-antivirus/clamav/files/clamav-milter.service-r1 b/app-antivirus/clamav/files/clamav-milter.service-r1 deleted file mode 100644 index f0118d8346f5..000000000000 --- a/app-antivirus/clamav/files/clamav-milter.service-r1 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Milter module for the ClamAV scanner -After=nss-lookup.target network.target -Before=sendmail.service -Before=postfix.service - -[Service] -Type=forking -PIDFile=/run/clamav/clamav-milter.pid -ExecStart=/usr/sbin/clamav-milter -c /etc/clamav-milter.conf - -[Install] -WantedBy=multi-user.target diff --git a/app-antivirus/clamav/files/clamav.logrotate b/app-antivirus/clamav/files/clamav.logrotate deleted file mode 100644 index 7a811264653b..000000000000 --- a/app-antivirus/clamav/files/clamav.logrotate +++ /dev/null @@ -1,17 +0,0 @@ -/var/log/clamav/clamd.log { - su clamav clamav - 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 { - su clamav clamav - 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 ee055138074c..000000000000 --- 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.conf-r1 b/app-antivirus/clamav/files/clamd.conf-r1 deleted file mode 100644 index de95554eea7b..000000000000 --- a/app-antivirus/clamav/files/clamd.conf-r1 +++ /dev/null @@ -1,7 +0,0 @@ -# Config file for /etc/init.d/clamd - -START_CLAMD=yes -START_FRESHCLAM=yes -CLAMD_NICELEVEL=3 -FRESHCLAM_NICELEVEL=19 -IONICE_LEVEL=2 diff --git a/app-antivirus/clamav/files/clamd.initd-r6 b/app-antivirus/clamav/files/clamd.initd-r6 deleted file mode 100644 index 8cf8dd0a4bac..000000000000 --- a/app-antivirus/clamav/files/clamd.initd-r6 +++ /dev/null @@ -1,128 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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} \ - --ionice ${IONICE_LEVEL:-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} \ - --ionice ${IONICE_LEVEL:-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} \ - --ionice ${IONICE_LEVEL:-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/files/clamd.service b/app-antivirus/clamav/files/clamd.service deleted file mode 100644 index 75aa2ccb624d..000000000000 --- a/app-antivirus/clamav/files/clamd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=clamd scanner daemon -After=nss-lookup.target network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/clamd -Restart=on-failure -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/app-antivirus/clamav/files/clamd_at.service b/app-antivirus/clamav/files/clamd_at.service deleted file mode 100644 index 9008ba7e82ed..000000000000 --- a/app-antivirus/clamav/files/clamd_at.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=clamd scanner (%i) daemon -After=nss-lookup.target network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf -Restart=on-failure -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/app-antivirus/clamav/files/freshclamd.service b/app-antivirus/clamav/files/freshclamd.service deleted file mode 100644 index a0a72c2e60eb..000000000000 --- a/app-antivirus/clamav/files/freshclamd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=clamav updater - -[Service] -Type=forking -PIDFile=/run/clamav/freshclam.pid -ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid - -[Install] -WantedBy=multi-user.target diff --git a/app-antivirus/clamav/files/tmpfiles.d/clamav.conf b/app-antivirus/clamav/files/tmpfiles.d/clamav.conf deleted file mode 100644 index 1672df60eab5..000000000000 --- a/app-antivirus/clamav/files/tmpfiles.d/clamav.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/clamav 0710 clamav clamav -- cgit v1.2.3