saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/postfix b/init.d/postfix
index 73e34f43c5168c749a971fb9b5a62cef6ff89a90..9a1c1e21de9be16e6622c0d764552b5a1a29bad0 100755 (executable)
--- a/init.d/postfix
+++ b/init.d/postfix
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="reload abort flush"
 

diff --git a/postfix/main.cf.default b/postfix/main.cf.default
index a1db9beb07ae6759293538c430a56ab8d40106a2..23bac22eed64cab35835d99306606dc44583701b 100644 (file)
--- a/postfix/main.cf.default
+++ b/postfix/main.cf.default
@@ -321,9 +321,9 @@ local_transport_rate_delay = $default_transport_rate_delay
 luser_relay =
 mail_name = Postfix
 mail_owner = postfix
-mail_release_date = 20160828
+mail_release_date = 20170613
 mail_spool_directory = /var/mail
-mail_version = 3.1.2
+mail_version = 3.1.6
 mailbox_command =
 mailbox_command_maps =
 mailbox_delivery_lock = fcntl, dotlock

diff --git a/postfix/makedefs.out b/postfix/makedefs.out
index 3e6233b0e0e62a230bea77059622a7f5bc435295..71fe10bc8b1719fe0d39750e39dc739a908060aa 100644 (file)
--- a/postfix/makedefs.out
+++ b/postfix/makedefs.out
@@ -6,7 +6,7 @@
 # AUXLIBS_LMDB=
 # AUXLIBS_PCRE=-L/usr/lib64 -lpcre
 # AUXLIBS_SQLITE=-lsqlite3 -lpthread
-# AUXLIBS_MYSQL=-L/usr/lib64 -lmysqlclient -lpthread -lz -lm -lssl -lcrypto -ldl
+# 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
@@ -21,7 +21,7 @@ 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 -lssl -lcrypto -ldl -L/usr/lib64 -lpcre -L/usr/lib64/postgresql-9.5/lib64 -lpq -lsqlite3 -lpthread -ldb -lnsl -lresolv -ldl -L/usr/lib64 -licui18n -licuuc -licudata 
+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)
 OPT    = -O2 -pipe -Wno-comment
 DEBUG  = 
@@ -39,9 +39,9 @@ RANLIB        = :
 LIB_PREFIX = postfix-
 LIB_SUFFIX = .so
 SHLIB_CFLAGS = -fPIC
-SHLIB_DIR = /usr/lib64/postfix/3.1.2
+SHLIB_DIR = /usr/lib64/postfix/3.1.6
 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 -lssl -lcrypto -ldl -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.5/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)

diff --git a/postfix/saslpass b/postfix/saslpass
index cfa2d0525ae7bee6812c0dd090a821489d9aa25e..f9b5120d64e84c3fb4b5fd0a70f72dbe3af3e862 100644 (file)
--- a/postfix/saslpass
+++ b/postfix/saslpass
@@ -1,3 +1,2 @@
-# $Id$
 #
 # remotehost user:password

diff --git a/sasl2/smtpd.conf b/sasl2/smtpd.conf
index e29b040c18ffff48e58e4c98047ce6382f0b7d82..82f29457bc01aa4e00b681f03a989f100d6b4290 100644 (file)
--- a/sasl2/smtpd.conf
+++ b/sasl2/smtpd.conf
@@ -1,3 +1,2 @@
-# $Id$
 pwcheck_method:saslauthd
 mech_list: PLAIN