saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 16179cdd501bb31d384f44745d8c07f0bf2fec3b..d2cb76e368ad5ec0da02e9166d1117cc4abbab39 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1629,6 +1629,7 @@ maybe chmod 0644 'idnalias.conf'
 maybe chmod 0644 'idnalias.conf.sample'
 maybe chmod 0755 'init.d'
 maybe chmod 0755 'init.d/amavisd'
+maybe chmod 0755 'init.d/amavisd-snmp'
 maybe chmod 0755 'init.d/apache2'
 maybe chmod 0755 'init.d/atd'
 maybe chmod 0755 'init.d/auditd'
@@ -2046,7 +2047,8 @@ maybe chmod 0644 'openldap/schema/samba.schema'
 maybe chmod 0644 'openldap/schema/sudo.schema'
 maybe chgrp 'ldap' 'openldap/slapd.conf'
 maybe chmod 0640 'openldap/slapd.conf'
-maybe chmod 0600 'openldap/slapd.conf.default'
+maybe chgrp 'ldap' 'openldap/slapd.conf.default'
+maybe chmod 0640 'openldap/slapd.conf.default'
 maybe chmod 0600 'openldap/slapd.ldif'
 maybe chmod 0600 'openldap/slapd.ldif.default'
 maybe chmod 0755 'openldap/ssl'

diff --git a/init.d/amavisd b/init.d/amavisd
index c456ff44643665034a4cdff87f7c7aebd283f005..a81cc23b8d4be54a63ab3c454500fc946333f00e 100755 (executable)
--- a/init.d/amavisd
+++ b/init.d/amavisd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd-r1,v 1.1 2012/11/07 12:55:15 eras Exp $
+# $Id$
 
 extra_started_commands="reload"
 extra_commands="debug debug_sa"

diff --git a/init.d/amavisd-snmp b/init.d/amavisd-snmp
new file mode 100755 (executable)
index 0000000..fca5f12
--- /dev/null
+++ b/init.d/amavisd-snmp
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+name="amavisd-snmp"
+pidfile="/run/amavis/${name}.pid"
+command="/usr/sbin/${name}-subagent"
+command_args="${amavis_snmp_args} -P ${pidfile}"
+start_stop_daemon_args="--interpreted"
+
+update_command() {
+       if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then
+               command="${command}-zmq"
+       elif [[ $amavisd_snmp_command ]]; then
+               command="$amavisd_snmp_command"
+       fi
+}
+
+depend() {
+       use logger
+       before amavisd-new snmpd
+       update_command
+       if [[ ${command##*-} == "zmq" ]]; then
+               need amavis-mc
+       fi
+}
+
+start_pre() {
+       update_command
+       checkpath -d -o amavis /run/amavis
+}

diff --git a/openldap/schema/amavisd-new.schema b/openldap/schema/amavisd-new.schema
index 4d97d3c4dce7f134e00ad01c15e126fa0c6490b1..d34b1525ea0a88563dff07a989e13557f20834a4 100644 (file)
--- a/openldap/schema/amavisd-new.schema
+++ b/openldap/schema/amavisd-new.schema
@@ -520,6 +520,17 @@ attributetype ( 1.3.6.1.4.1.15312.2.2.1.46
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
   SINGLE-VALUE )
 
+#dn: cn=schema
+#changetype: modify
+#add: attributetypes
+attributetype ( 1.3.6.1.4.1.15312.2.2.1.47
+  NAME 'amavisDisclaimerOptions'
+  DESC 'Altermime disclaimer map data'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE )
+
 
 # Classes
 #---------
@@ -557,7 +568,7 @@ objectclass ( 1.3.6.1.4.1.15312.2.2.2.1
         amavisSpamTag3Level $ amavisSpamSubjectTag3 $
         amavisUncheckedQuarantineTo $ amavisCleanQuarantineTo $
         amavisUncheckedLover $ amavisForwardMethod $
-        amavisSaUserConf $ amavisSaUserName $
+        amavisSaUserConf $ amavisSaUserName $ amavisDisclaimerOptions $
         cn $ description ) )
 
 #--------------------------------------------------------------------------