From b98c765d05aa954ebed3c77a0b304e9935d260ef Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 28 Dec 2017 03:10:07 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- postfix/main.cf.default | 12 ++++++++---- postfix/main.cf.proto | 2 +- postfix/makedefs.out | 15 ++++++++------- postfix/master.cf | 1 + postfix/master.cf.proto | 1 + 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/postfix/main.cf.default b/postfix/main.cf.default index 23bac22e..26af850e 100644 --- a/postfix/main.cf.default +++ b/postfix/main.cf.default @@ -126,6 +126,7 @@ duplicate_filter_limit = 1000 empty_address_default_transport_maps_lookup_key = <> empty_address_recipient = MAILER-DAEMON empty_address_relayhost_maps_lookup_key = <> +enable_idna2003_compatibility = no enable_long_queue_ids = no enable_original_recipient = yes error_delivery_slot_cost = $default_delivery_slot_cost @@ -321,9 +322,9 @@ local_transport_rate_delay = $default_transport_rate_delay luser_relay = mail_name = Postfix mail_owner = postfix -mail_release_date = 20170613 +mail_release_date = 20171028 mail_spool_directory = /var/mail -mail_version = 3.1.6 +mail_version = 3.2.4 mailbox_command = mailbox_command_maps = mailbox_delivery_lock = fcntl, dotlock @@ -348,7 +349,7 @@ message_size_limit = 10240000 message_strip_characters = meta_directory = /etc/postfix milter_command_timeout = 30s -milter_connect_macros = j {daemon_name} v +milter_connect_macros = j {daemon_name} {daemon_addr} v milter_connect_timeout = 30s milter_content_timeout = 300s milter_data_macros = i @@ -611,6 +612,7 @@ smtp_sender_dependent_authentication = no smtp_skip_5xx_greeting = yes smtp_skip_quit_response = yes smtp_starttls_timeout = 300s +smtp_tcp_port = smtp smtp_tls_CAfile = smtp_tls_CApath = smtp_tls_block_early_mail_reply = no @@ -678,6 +680,7 @@ smtpd_helo_restrictions = smtpd_history_flush_threshold = 100 smtpd_junk_command_limit = ${stress?{1}:{100}} smtpd_log_access_permit_actions = +smtpd_milter_maps = smtpd_milters = smtpd_noop_commands = smtpd_null_access_lookup_key = <> @@ -732,7 +735,7 @@ smtpd_tls_dh512_param_file = smtpd_tls_dkey_file = $smtpd_tls_dcert_file smtpd_tls_eccert_file = smtpd_tls_eckey_file = $smtpd_tls_eccert_file -smtpd_tls_eecdh_grade = strong +smtpd_tls_eecdh_grade = auto smtpd_tls_exclude_ciphers = smtpd_tls_fingerprint_digest = md5 smtpd_tls_key_file = $smtpd_tls_cert_file @@ -773,6 +776,7 @@ tls_dane_digest_agility = on tls_dane_digests = sha512 sha256 tls_dane_trust_anchor_digest_enable = yes tls_disable_workarounds = +tls_eecdh_auto_curves = prime256v1 secp521r1 secp384r1 tls_eecdh_strong_curve = prime256v1 tls_eecdh_ultra_curve = secp384r1 tls_export_cipherlist = aNULL:-aNULL:HIGH:MEDIUM:LOW:EXPORT:+RC4:@STRENGTH diff --git a/postfix/main.cf.proto b/postfix/main.cf.proto index 0c36e3ac..7af8bdee 100644 --- a/postfix/main.cf.proto +++ b/postfix/main.cf.proto @@ -623,7 +623,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # diff --git a/postfix/makedefs.out b/postfix/makedefs.out index 71fe10bc..4414d4c4 100644 --- a/postfix/makedefs.out +++ b/postfix/makedefs.out @@ -1,7 +1,7 @@ # Do not edit -- this file documents how Postfix was built for your machine. #---------------------------------------------------------------- # Start of summary of user-configurable 'make makefiles' options. -# CCARGS=-DHAS_PCRE -DHAS_LDAP -DHAS_MYSQL -I/usr/include/mysql -I/usr/include/mysql/.. -DHAS_PGSQL -I/usr/include/postgresql-9.5 -DHAS_SQLITE -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +# CCARGS=-DHAS_PCRE -DHAS_LDAP -DHAS_MYSQL -I/usr/include/mysql -I/usr/include/mysql/.. -DHAS_PGSQL -I/usr/include/postgresql-9.6 -DHAS_SQLITE -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # AUXLIBS=-Wl,-O1 -Wl,--as-needed -ldl -lpam -lssl -lcrypto -lsasl2 # AUXLIBS_LMDB= # AUXLIBS_PCRE=-L/usr/lib64 -lpcre @@ -9,7 +9,7 @@ # AUXLIBS_MYSQL=-L/usr/lib64 -lmysqlclient -lpthread -lz -lm -ldl -lbfd -lssl -lcrypto # AUXLIBS_CDB= # AUXLIBS_LDAP=-lldap -llber -# AUXLIBS_PGSQL=-L/usr/lib64/postgresql-9.5/lib64 -lpq +# AUXLIBS_PGSQL=-L/usr/lib64/postgresql-9.6/lib64 -lpq # shared=yes # dynamicmaps=no # pie=yes @@ -21,13 +21,13 @@ SYSTYPE = LINUX4 _AR = x86_64-pc-linux-gnu-ar ARFL = rv _RANLIB = x86_64-pc-linux-gnu-ranlib -SYSLIBS = -pie -Wl,-O1 -Wl,--as-needed -ldl -lpam -lssl -lcrypto -lsasl2 -lldap -llber -L/usr/lib64 -lmysqlclient -lpthread -lz -lm -ldl -lbfd -lssl -lcrypto -L/usr/lib64 -lpcre -L/usr/lib64/postgresql-9.5/lib64 -lpq -lsqlite3 -lpthread -ldb -lnsl -lresolv -ldl -L/usr/lib64 -licui18n -licuuc -licudata -CC = x86_64-pc-linux-gnu-gcc -fPIC -I. -I../../include -DHAS_PCRE -DHAS_LDAP -DHAS_MYSQL -I/usr/include/mysql -I/usr/include/mysql/.. -DHAS_PGSQL -I/usr/include/postgresql-9.5 -DHAS_SQLITE -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DU_DISABLE_RENAMING=1 -I/usr/include -DHAS_DEV_URANDOM -DDEF_SHLIB_DIR=\"/usr/lib64/postfix/\$${mail_version}\" -DUSE_DYNAMIC_LIBS -UUSE_DYNAMIC_MAPS $(WARN) +SYSLIBS = -pie -Wl,-O1 -Wl,--as-needed -ldl -lpam -lssl -lcrypto -lsasl2 -lldap -llber -L/usr/lib64 -lmysqlclient -lpthread -lz -lm -ldl -lbfd -lssl -lcrypto -L/usr/lib64 -lpcre -L/usr/lib64/postgresql-9.6/lib64 -lpq -lsqlite3 -lpthread -ldb -lnsl -lresolv -ldl -L/usr/lib64 -licui18n -licuuc -licudata +CC = x86_64-pc-linux-gnu-gcc -fPIC -I. -I../../include -DHAS_PCRE -DHAS_LDAP -DHAS_MYSQL -I/usr/include/mysql -I/usr/include/mysql/.. -DHAS_PGSQL -I/usr/include/postgresql-9.6 -DHAS_SQLITE -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DU_DISABLE_RENAMING=1 -I/usr/include -DHAS_DEV_URANDOM -DDEF_SHLIB_DIR=\"/usr/lib64/postfix/\$${mail_version}\" -DUSE_DYNAMIC_LIBS -UUSE_DYNAMIC_MAPS $(WARN) OPT = -O2 -pipe -Wno-comment DEBUG = AWK = awk STRCASE = -EXPORT = CCARGS='-I. -I../../include -DHAS_PCRE -DHAS_LDAP -DHAS_MYSQL -I/usr/include/mysql -I/usr/include/mysql/.. -DHAS_PGSQL -I/usr/include/postgresql-9.5 -DHAS_SQLITE -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DU_DISABLE_RENAMING=1 -I/usr/include -DHAS_DEV_URANDOM -DDEF_SHLIB_DIR=\"/usr/lib64/postfix/\$${mail_version}\" -DUSE_DYNAMIC_LIBS -UUSE_DYNAMIC_MAPS' OPT='-O2 -pipe -Wno-comment' DEBUG='' +EXPORT = CCARGS='-I. -I../../include -DHAS_PCRE -DHAS_LDAP -DHAS_MYSQL -I/usr/include/mysql -I/usr/include/mysql/.. -DHAS_PGSQL -I/usr/include/postgresql-9.6 -DHAS_SQLITE -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DU_DISABLE_RENAMING=1 -I/usr/include -DHAS_DEV_URANDOM -DDEF_SHLIB_DIR=\"/usr/lib64/postfix/\$${mail_version}\" -DUSE_DYNAMIC_LIBS -UUSE_DYNAMIC_MAPS' OPT='-O2 -pipe -Wno-comment' DEBUG='' WARN = -Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \ -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \ -Wunused -Wno-missing-braces @@ -39,9 +39,9 @@ RANLIB = : LIB_PREFIX = postfix- LIB_SUFFIX = .so SHLIB_CFLAGS = -fPIC -SHLIB_DIR = /usr/lib64/postfix/3.1.6 +SHLIB_DIR = /usr/lib64/postfix/3.2.4 SHLIB_LD = x86_64-pc-linux-gnu-gcc -shared -Wl,-soname,${LIB} -SHLIB_SYSLIBS = -Wl,-O1 -Wl,--as-needed -ldl -lpam -lssl -lcrypto -lsasl2 -lldap -llber -L/usr/lib64 -lmysqlclient -lpthread -lz -lm -ldl -lbfd -lssl -lcrypto -L/usr/lib64 -lpcre -L/usr/lib64/postgresql-9.5/lib64 -lpq -lsqlite3 -lpthread -ldb -lnsl -lresolv -ldl -L/usr/lib64 -licui18n -licuuc -licudata +SHLIB_SYSLIBS = -Wl,-O1 -Wl,--as-needed -ldl -lpam -lssl -lcrypto -lsasl2 -lldap -llber -L/usr/lib64 -lmysqlclient -lpthread -lz -lm -ldl -lbfd -lssl -lcrypto -L/usr/lib64 -lpcre -L/usr/lib64/postgresql-9.6/lib64 -lpq -lsqlite3 -lpthread -ldb -lnsl -lresolv -ldl -L/usr/lib64 -licui18n -licuuc -licudata SHLIB_RPATH = -Wl,--enable-new-dtags -Wl,-rpath,${SHLIB_DIR} # Switch between dynamicmaps.cf plugins and hard-linked databases. NON_PLUGIN_MAP_OBJ = $(MAP_OBJ) @@ -50,4 +50,5 @@ PLUGIN_MAP_OBJ_UPDATE = PLUGIN_MAP_SO_MAKE = PLUGIN_MAP_SO_UPDATE = PLUGIN_LD = +POSTFIX_INSTALL_OPTS = # Application-specific rules. diff --git a/postfix/master.cf b/postfix/master.cf index 4a3b2f99..1663f518 100644 --- a/postfix/master.cf +++ b/postfix/master.cf @@ -18,6 +18,7 @@ smtp inet n - n - - smtpd # -o syslog_name=postfix/submission # -o smtpd_tls_security_level=encrypt # -o smtpd_sasl_auth_enable=yes +# -o smtpd_tls_auth_only=yes # -o smtpd_reject_unlisted_recipient=no # -o smtpd_client_restrictions=$mua_client_restrictions # -o smtpd_helo_restrictions=$mua_helo_restrictions diff --git a/postfix/master.cf.proto b/postfix/master.cf.proto index 4a3b2f99..1663f518 100644 --- a/postfix/master.cf.proto +++ b/postfix/master.cf.proto @@ -18,6 +18,7 @@ smtp inet n - n - - smtpd # -o syslog_name=postfix/submission # -o smtpd_tls_security_level=encrypt # -o smtpd_sasl_auth_enable=yes +# -o smtpd_tls_auth_only=yes # -o smtpd_reject_unlisted_recipient=no # -o smtpd_client_restrictions=$mua_client_restrictions # -o smtpd_helo_restrictions=$mua_helo_restrictions -- 2.39.5