From 59ba49a38d02fe8126b2f0f3c7382285666ce2c4 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 28 Dec 2016 12:36:45 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- courier-imap/imapd | 35 +++++++++++++++++++++++++++++++---- courier-imap/imapd-ssl | 37 ++++++++++++++++++++++++++++--------- courier-imap/pop3d | 22 +++++++++++++++++++++- courier-imap/pop3d-ssl | 33 +++++++++++++++++++++++++++------ 4 files changed, 107 insertions(+), 20 deletions(-) diff --git a/courier-imap/imapd b/courier-imap/imapd index 7c20c456..d58ca75a 100644 --- a/courier-imap/imapd +++ b/courier-imap/imapd @@ -1,11 +1,11 @@ -##VERSION: $Id: 2013-08-19 16:39:41 -0400 9c45d9ad13fdf439d44d7443ae75da15ea0223ed$ +##VERSION: $Id: 106596a150c4585c41d65f60a17e173402125332-20150610064018$ # # imapd created from imapd.dist by sysconftool # # Do not alter lines that begin with ##, they are used when upgrading # this configuration. # -# Copyright 1998 - 2008 Double Precision, Inc. See COPYING for +# Copyright 1998 - 2015 Double Precision, Inc. See COPYING for # distribution information. # # This configuration file sets various options for the Courier-IMAP server @@ -73,16 +73,22 @@ PIDFILE=/var/run/imapd.pid TCPDOPTS="-nodnslookup -noidentlookup" +##NAME: ACCESSFILE:0 +# +# IMAP access file. + +IMAPACCESSFILE=/etc/courier-imap/imapaccess + ##NAME: LOGGEROPTS:0 # -# courierlogger(1) options. +# courierlogger(1) options. # LOGGEROPTS="-name=imapd" ##NAME: DEFDOMAIN:0 # -# Optional default domain. If the username does not contain the +# Optional default domain. If the username does not contain the # first character of DEFDOMAIN, then it is appended to the username. # If DEFDOMAIN and DOMAINSEP are both set, then DEFDOMAIN is appended # only if the username does not contain any character from DOMAINSEP. @@ -347,6 +353,27 @@ IMAP_MOVE_EXPUNGE_TO_TRASH=0 # # IMAP_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: IMAPDEBUGFILE:0 # # IMAPDEBUGFILE="imaplog.dat" diff --git a/courier-imap/imapd-ssl b/courier-imap/imapd-ssl index 0811b739..47ca432b 100644 --- a/courier-imap/imapd-ssl +++ b/courier-imap/imapd-ssl @@ -1,4 +1,4 @@ -##VERSION: $Id: 2013-10-14 22:07:39 -0400 37a74ee0f736237b67330c620de7dc08232dec17$ +##VERSION: $Id: d4d0683714b8d6ec02c9db26cc7e371a1dde0269-20150609200831$ # # imapd-ssl created from imapd-ssl.dist by sysconftool # @@ -54,7 +54,7 @@ SSLPIDFILE=/var/run/imapd-ssl.pid ##NAME: SSLLOGGEROPTS:0 # -# courierlogger(1) options. +# courierlogger(1) options. # SSLLOGGEROPTS="-name=imapd-ssl" @@ -112,21 +112,40 @@ COURIERTLS=/usr/sbin/couriertls # # DEFAULT: NORMAL:-CTYPE-OPENPGP # -# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP" +# This setting is also used to select the available ciphers. +# +# The actual list of available ciphers depend on the options GnuTLS was +# compiled against. The possible ciphers are: +# +# AES256, 3DES, AES128, ARC128, ARC40, RC2, DES, NULL +# +# Also, the following aliases: +# +# HIGH -- all ciphers that use more than a 128 bit key size +# MEDIUM -- all ciphers that use a 128 bit key size +# LOW -- all ciphers that use fewer than a 128 bit key size, the NULL cipher +# is not included +# ALL -- all ciphers except the NULL cipher +# +# See GnuTLS documentation, gnutls_priority_init(3) for additional +# documentation. ##NAME: TLS_PROTOCOL:0 -# +# # TLS_PROTOCOL sets the protocol version. The possible versions are: # # OpenSSL: # # SSL3 - SSLv3 # SSL23 - all protocols (including TLS 1.x protocols) -# TLS1 - TLS1 +# TLSv1 - TLS1 # TLSv1.1 - TLS1.1 # TLSv1.2 - TLS1.2 # -# Leave it unset to use any protocol except SSL 2. +# SSL3+, TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all +# higher protocols. +# +# The default value is TLSv1+ ##NAME: TLS_CIPHER_LIST:0 # @@ -136,7 +155,7 @@ COURIERTLS=/usr/sbin/couriertls # # OpenSSL: # -# TLS_CIPHER_LIST="SSLv3:TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" +# TLS_CIPHER_LIST="TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" # # GnuTLS: # @@ -159,7 +178,7 @@ COURIERTLS=/usr/sbin/couriertls # documentation. ##NAME: TLS_STARTTLS_PROTOCOL:0 -# +# # TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS # extension, as opposed to IMAP over SSL on port 993. # @@ -173,7 +192,7 @@ COURIERTLS=/usr/sbin/couriertls # # OpenSSL: # -# TLS_CIPHER_LIST="SSLv3:TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" +# TLS_CIPHER_LIST="TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" # # diff --git a/courier-imap/pop3d b/courier-imap/pop3d index 908c5c58..812fa7ad 100644 --- 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 # diff --git a/courier-imap/pop3d-ssl b/courier-imap/pop3d-ssl index 8597a05c..7f5fc422 100644 --- a/courier-imap/pop3d-ssl +++ b/courier-imap/pop3d-ssl @@ -1,4 +1,4 @@ -##VERSION: $Id: 2013-10-14 22:07:39 -0400 37a74ee0f736237b67330c620de7dc08232dec17$ +##VERSION: $Id: d4d0683714b8d6ec02c9db26cc7e371a1dde0269-20150609200831$ # # pop3d-ssl created from pop3d-ssl.dist by sysconftool # @@ -52,7 +52,7 @@ SSLPIDFILE=/var/run/pop3d-ssl.pid ##NAME: SSLLOGGEROPTS:0 # -# courierlogger(1) options. +# courierlogger(1) options. # SSLLOGGEROPTS="-name=pop3d-ssl" @@ -96,20 +96,41 @@ COURIERTLS=/usr/sbin/couriertls # DEFAULT: NORMAL:-CTYPE-OPENPGP # # TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP" +# +# This setting is also used to select the available ciphers. +# +# The actual list of available ciphers depend on the options GnuTLS was +# compiled against. The possible ciphers are: +# +# AES256, 3DES, AES128, ARC128, ARC40, RC2, DES, NULL +# +# Also, the following aliases: +# +# HIGH -- all ciphers that use more than a 128 bit key size +# MEDIUM -- all ciphers that use a 128 bit key size +# LOW -- all ciphers that use fewer than a 128 bit key size, the NULL cipher +# is not included +# ALL -- all ciphers except the NULL cipher +# +# See GnuTLS documentation, gnutls_priority_init(3) for additional +# documentation. ##NAME: TLS_PROTOCOL:0 -# +# # TLS_PROTOCOL sets the protocol version. The possible versions are: # # OpenSSL: # # SSL3 - SSLv3 # SSL23 - all protocols (including TLS 1.x protocols) -# TLS1 - TLS1 +# TLSv11 - TLS1 # TLSv1.1 - TLS1.1 # TLSv1.2 - TLS1.2 # -# Leave it unset to use any protocol except SSL 2. +# SSL3+, TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all +# higher protocols. +# +# The default value is TLSv1+ ##NAME: TLS_CIPHER_LIST:0 # @@ -119,7 +140,7 @@ COURIERTLS=/usr/sbin/couriertls # # OpenSSL: # -# TLS_CIPHER_LIST="SSLv3:TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" +# TLS_CIPHER_LIST="TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" # # GnuTLS: # -- 2.39.5