From 0151ba3c0d80a5362bf4ba18e995649b40226074 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 29 Dec 2016 00:10:48 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .../etc/logrotate.d/apache2.dist.new          |  3 ++-
 config-archive/etc/postfix/main.cf            |  4 +--
 config-archive/etc/postfix/main.cf.1          | 11 ++++----
 config-archive/etc/postfix/main.cf.2          |  5 ++--
 config-archive/etc/postfix/main.cf.3          |  4 +--
 config-archive/etc/postfix/main.cf.4          |  5 ++--
 config-archive/etc/postfix/main.cf.5          | 25 +++++++++++++++++--
 config-archive/etc/postfix/main.cf.6          |  6 ++---
 config-archive/etc/postfix/main.cf.7          |  4 +--
 config-archive/etc/postfix/main.cf.8          |  4 +--
 config-archive/etc/postfix/main.cf.9          |  4 +--
 config-archive/etc/postfix/main.cf.dist       |  4 +--
 portage/package.use                           |  1 +
 postfix/main.cf                               |  4 +--
 14 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/config-archive/etc/logrotate.d/apache2.dist.new b/config-archive/etc/logrotate.d/apache2.dist.new
index 9dd431c2..00a127c1 100644
--- a/config-archive/etc/logrotate.d/apache2.dist.new
+++ b/config-archive/etc/logrotate.d/apache2.dist.new
@@ -6,6 +6,7 @@
   notifempty
   sharedscripts
   postrotate
-  /etc/init.d/apache2 reload > /dev/null 2>&1 || true
+  test -e /run/openrc/softlevel && /etc/init.d/apache2 reload > /dev/null 2>&1 || true
+  test -e /run/systemd/system && systemctl reload apache2 > /dev/null 2>&1 || true
   endscript
 }
diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf
index 7329883d..1cc3c1a5 100644
--- a/config-archive/etc/postfix/main.cf
+++ b/config-archive/etc/postfix/main.cf
@@ -664,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.0/html
+html_directory = /usr/share/doc/postfix-3.1.0-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -677,7 +677,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.0/readme
+readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme
 # inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1
index 2b6cf73c..7329883d 100644
--- a/config-archive/etc/postfix/main.cf.1
+++ b/config-archive/etc/postfix/main.cf.1
@@ -157,8 +157,8 @@ inet_interfaces = 10.12.11.2, localhost
 # compatible delivery agent that lookups all recipients in /etc/passwd
 # and /etc/aliases or their equivalent.
 #
-# The default is $myhostname + localhost.$mydomain.  On a mail domain
-# gateway, you should also include $mydomain.
+# The default is $myhostname + localhost.$mydomain + localhost.  On
+# a mail domain gateway, you should also include $mydomain.
 #
 # Do not specify the names of virtual domains - those domains are
 # specified elsewhere (see VIRTUAL_README).
@@ -664,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.3-r1/html
+html_directory = /usr/share/doc/postfix-3.1.0/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -677,8 +677,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.3-r1/readme
-
+readme_directory = /usr/share/doc/postfix-3.1.0/readme
 # inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
@@ -694,7 +693,7 @@ smtpd_sasl_local_domain = $myhostname
 smtp_sasl_auth_enable = yes 
 smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth
 smtp_sasl_security_options = noanonymous
-relayhost = [mail.brehm-online.com]
+relayhost = [mail.uhu-banane.net]:submission
 #relayhost = [helga-six.brehm-online.com]
 
 smtpd_use_tls = yes
diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2
index 6b000688..2b6cf73c 100644
--- a/config-archive/etc/postfix/main.cf.2
+++ b/config-archive/etc/postfix/main.cf.2
@@ -664,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.2/html
+html_directory = /usr/share/doc/postfix-3.0.3-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -677,7 +677,8 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.2/readme
+readme_directory = /usr/share/doc/postfix-3.0.3-r1/readme
+
 # inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3
index 38714de1..6b000688 100644
--- a/config-archive/etc/postfix/main.cf.3
+++ b/config-archive/etc/postfix/main.cf.3
@@ -664,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.1-r1/html
+html_directory = /usr/share/doc/postfix-3.0.2/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -677,7 +677,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme
+readme_directory = /usr/share/doc/postfix-3.0.2/readme
 # inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4
index 2da72a08..38714de1 100644
--- a/config-archive/etc/postfix/main.cf.4
+++ b/config-archive/etc/postfix/main.cf.4
@@ -664,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.0/html
+html_directory = /usr/share/doc/postfix-3.0.1-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -677,7 +677,8 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.0/readme
+readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme
+# inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
 home_mailbox = .maildir/
diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5
index 6ffa90b0..2da72a08 100644
--- a/config-archive/etc/postfix/main.cf.5
+++ b/config-archive/etc/postfix/main.cf.5
@@ -10,6 +10,25 @@
 # For best results, change no more than 2-3 parameters at a time,
 # and test if Postfix still works after every change.
 
+# COMPATIBILITY
+#
+# The compatibility_level determines what default settings Postfix
+# will use for main.cf and master.cf settings. These defaults will
+# change over time.
+#
+# To avoid breaking things, Postfix will use backwards-compatible
+# default settings and log where it uses those old backwards-compatible
+# default settings, until the system administrator has determined
+# if any backwards-compatible default settings need to be made
+# permanent in main.cf or master.cf.
+#
+# When this review is complete, update the compatibility_level setting
+# below as recommended in the RELEASE_NOTES file.
+#
+# The level below is what should be used with new (not upgrade) installs.
+#
+#compatibility_level = 2
+
 # SOFT BOUNCE
 #
 # The soft_bounce parameter provides a limited safety net for
@@ -645,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.11.3/html
+html_directory = /usr/share/doc/postfix-3.0.0/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +677,9 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.11.3/readme
+readme_directory = /usr/share/doc/postfix-3.0.0/readme
+meta_directory = /etc/postfix
+shlib_directory = /usr/lib64/postfix/${mail_version}
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6
index 5e3d60fd..6ffa90b0 100644
--- a/config-archive/etc/postfix/main.cf.6
+++ b/config-archive/etc/postfix/main.cf.6
@@ -5,7 +5,7 @@
 # For common configuration examples, see BASIC_CONFIGURATION_README
 # and STANDARD_CONFIGURATION_README. To find these documents, use
 # the command "postconf html_directory readme_directory", or go to
-# http://www.postfix.org/.
+# http://www.postfix.org/BASIC_CONFIGURATION_README.html etc.
 #
 # For best results, change no more than 2-3 parameters at a time,
 # and test if Postfix still works after every change.
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.3/html
+html_directory = /usr/share/doc/postfix-2.11.3/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.3/readme
+readme_directory = /usr/share/doc/postfix-2.11.3/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
diff --git a/config-archive/etc/postfix/main.cf.7 b/config-archive/etc/postfix/main.cf.7
index 0436c1c4..5e3d60fd 100644
--- a/config-archive/etc/postfix/main.cf.7
+++ b/config-archive/etc/postfix/main.cf.7
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.2/html
+html_directory = /usr/share/doc/postfix-2.10.3/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.2/readme
+readme_directory = /usr/share/doc/postfix-2.10.3/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
diff --git a/config-archive/etc/postfix/main.cf.8 b/config-archive/etc/postfix/main.cf.8
index f7e2a6a6..0436c1c4 100644
--- a/config-archive/etc/postfix/main.cf.8
+++ b/config-archive/etc/postfix/main.cf.8
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.1/html
+html_directory = /usr/share/doc/postfix-2.10.2/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.1/readme
+readme_directory = /usr/share/doc/postfix-2.10.2/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
diff --git a/config-archive/etc/postfix/main.cf.9 b/config-archive/etc/postfix/main.cf.9
index 1232f478..f7e2a6a6 100644
--- a/config-archive/etc/postfix/main.cf.9
+++ b/config-archive/etc/postfix/main.cf.9
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.0/html
+html_directory = /usr/share/doc/postfix-2.10.1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.0/readme
+readme_directory = /usr/share/doc/postfix-2.10.1/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist
index 4baa94eb..00a5e742 100644
--- a/config-archive/etc/postfix/main.cf.dist
+++ b/config-archive/etc/postfix/main.cf.dist
@@ -659,7 +659,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.0-r1/html
+html_directory = /usr/share/doc/postfix-3.1.2-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -672,7 +672,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme
+readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme
 inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/portage/package.use b/portage/package.use
index d7b3145c..4351f362 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -245,6 +245,7 @@ media-libs/freetype			infinality utils
 # media-libs/gd				fontconfig
 media-libs/gegl				-ffmpeg graphviz raw
 media-libs/giflib			rle
+media-libs/libcaca			-doc
 media-libs/libgphoto2			-zeroconf
 media-libs/libmediaart			-qt5
 media-libs/libmp4v2			utils
diff --git a/postfix/main.cf b/postfix/main.cf
index 1cc3c1a5..54ce017a 100644
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -664,7 +664,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.0-r1/html
+html_directory = /usr/share/doc/postfix-3.1.2-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -677,7 +677,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme
+readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme
 # inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
-- 
2.39.5