saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index a35e3afe5f94cac38c92f3c5b746785695552ff6..c1aebb0b4df137a7a35eaf0d2138e00ba94b4ae4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1384,6 +1384,7 @@ maybe chmod 0644 'login.defs'
 maybe chmod 0644 'logrotate.conf'
 maybe chmod 0644 'logrotate.conf.orig'
 maybe chmod 0755 'logrotate.d'
+maybe chmod 0644 'logrotate.d/._cfg0000_clamav'
 maybe chmod 0644 'logrotate.d/.keep_app-admin_logrotate-0'
 maybe chmod 0644 'logrotate.d/apache2'
 maybe chmod 0644 'logrotate.d/clamav'

diff --git a/clamd.conf b/clamd.conf
index 6e5ef32202e3c7700ad0b4ed90016fbe2cf29402..ff256215faca5d7cc31374764e95b3787047afec 100644 (file)
--- a/clamd.conf
+++ b/clamd.conf
@@ -522,6 +522,31 @@ AllowSupplementaryGroups yes
 # Default: 100
 #MaxIconsPE 200
 
+# This option sets the maximum calls to the PCRE match function during an instance of regex matching.
+# Instances using more than this limit will be terminated and alert the user but the scan will continue.
+# For more information on match_limit, see the PCRE documentation.
+# Negative values are not allowed.
+# WARNING: setting this limit too high may severely impact performance.
+# Default: 10000
+#PCREMatchLimit 20000
+
+# This option sets the maximum recursive calls to the PCRE match function during an instance of regex matching.
+# Instances using more than this limit will be terminated and alert the user but the scan will continue.
+# For more information on match_limit_recursion, see the PCRE documentation.
+# Negative values are not allowed and values > PCREMatchLimit are superfluous.
+# WARNING: setting this limit too high may severely impact performance.
+# Default: 5000
+#PCRERecMatchLimit 10000
+
+# This option sets the maximum filesize for which PCRE subsigs will be executed.
+# Files exceeding this limit will not have PCRE subsigs executed unless a subsig is encompassed to a smaller buffer.
+# Negative values are not allowed.
+# Setting this value to zero disables the limit.
+# WARNING: setting this limit too high or disabling it may severely impact performance.
+# Default: 25M
+#PCREMaxFileSize 100M
+
+
 ##
 ## On-access Scan Settings
 ##
@@ -531,6 +556,14 @@ AllowSupplementaryGroups yes
 # Default: no
 #ScanOnAccess yes
 
+# Set the  mount point to be scanned. The mount point specified, or the mount point 
+# containing the specified directory will be watched. If any directories are specified, 
+# this option will preempt the DDD system. This will notify only. It can be used multiple times.
+# (On-access scan only)
+# Default: disabled
+#OnAccessMountPath /
+#OnAccessMountPath /home/user
+
 # Don't scan files larger than OnAccessMaxFileSize
 # Value of 0 disables the limit.
 # Default: 5M
@@ -554,6 +587,23 @@ AllowSupplementaryGroups yes
 # Default: disabled
 #OnAccessExcludeUID 0
 
+# Toggles dynamic directory determination. Allows for recursively watching include paths.
+# (On-access scan only)
+# Default: no
+#OnAccessDisableDDD yes
+
+# Modifies fanotify blocking behaviour when handling permission events.
+# If off, fanotify will only notify if the file scanned is a virus,
+# and not perform any blocking.
+# (On-access scan only)
+# Default: no
+#OnAccessPrevention yes
+
+# Toggles extra scanning and notifications when a file or directory is created or moved.
+# Requires the  DDD system to kick-off extra scans.
+# (On-access scan only)
+# Default: no
+#OnAccessExtraScanning yes
 
 ##
 ## Bytecode

diff --git a/init.d/clamd b/init.d/clamd
index 276e07aa8263ad075d0a64bc0bdf022c8ecff907..ee11b392443236ae33b51785d30c7011e22b2b46 100755 (executable)
--- a/init.d/clamd
+++ b/init.d/clamd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # 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-r6,v 1.1 2013/09/27 16:04:14 eras Exp $
+# $Id$
 
 daemon_clamd="/usr/sbin/clamd"
 daemon_freshclam="/usr/bin/freshclam"

diff --git a/logrotate.d/._cfg0000_clamav b/logrotate.d/._cfg0000_clamav
new file mode 100644 (file)
index 0000000..7a81126
--- /dev/null
+++ b/logrotate.d/._cfg0000_clamav
@@ -0,0 +1,17 @@
+/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
+}