saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index c97833ca9b31c97d7ff70fbf88fef4624cb0a8bf..2a3d5043fdb49f9a1cb5595fca907262ceba5281 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1,6 +1,7 @@
 # Generated by etckeeper.  Do not edit.
 
 mkdir -p './ca-certificates/update.d'
+mkdir -p './courier-imap/imapaccess'
 mkdir -p './courier-imap/shared'
 mkdir -p './courier-imap/shared.tmp'
 mkdir -p './dpkg/dpkg.cfg.d'
@@ -1077,6 +1078,7 @@ maybe chmod 0400 'courier-imap/.rcs/pop3d,v'
 maybe chmod 0400 'courier-imap/.rcs/pop3d-ssl,v'
 maybe chmod 0400 'courier-imap/.rcs/pop3d.cnf,v'
 maybe chmod 0444 'courier-imap/.rcs/quotawarnmsg,v'
+maybe chmod 0755 'courier-imap/imapaccess'
 maybe chmod 0600 'courier-imap/imapd'
 maybe chmod 0600 'courier-imap/imapd-ssl'
 maybe chmod 0600 'courier-imap/imapd-ssl.orig'

diff --git a/courier-imap/pop3d b/courier-imap/pop3d
index 908c5c5820383a382f797c13ab680bea3b1e5367..812fa7ad8dd5b6d56b2f63bbb26a4a9e7b67bfdf 100644 (file)
--- a/courier-imap/pop3d
+++ b/courier-imap/pop3d
@@ -1,4 +1,4 @@
-##VERSION: $Id: 2013-08-19 16:39:41 -0400 9c45d9ad13fdf439d44d7443ae75da15ea0223ed$
+##VERSION: $Id: 106596a150c4585c41d65f60a17e173402125332-20150610064018$
 #
 # pop3d created from pop3d.dist by sysconftool
 #
@@ -155,6 +155,26 @@ POP3DSTART=NO
 #
 # POP3_LOG_DELETIONS=1
 
+##NAME: AUTH_MKHOMEDIR_SKEL:0
+#
+# Uncomment this setting to automatically create a home directory on first
+# login. if the AUTH_MKHOMEDIR_SKEL environment variable is set, and the
+# home directory does not exist, the home directory gets created, with its
+# initial contents copied from AUTH_MKHOMEDIR_SKEL which must be a directory,
+# typically /etc/skel.
+#
+# Note that this must be a complete home directory structure, including
+# the maildir. Typically:
+#
+# mkdir /etc/skel
+# chmod 700 /etc/skel
+# maildirmak /etc/skel/Maildir
+#
+# This directory gets copied as is, preserving each file/subdirectory's
+# permissions, with only userid/groupid changed to match the account's.
+#
+#
+# AUTH_MKHOMEDIR_SKEL=/etc/skel
 
 ##NAME: MAILDIRPATH:0
 #