saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index a947605a298421c3870e6babc5886cc321f6968a..571409c4bdab4419a74697c938b115a3219051d4 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-08-06 10:59
+# Written by cupsd on 2017-08-07 10:53
 NextSubscriptionId 470
 <Subscription 469>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1502096042
+ExpirationTime 1502182382
 NextEventId 1
 </Subscription>

diff --git a/libvirt/qemu/Vera.xml b/libvirt/qemu/Vera.xml
index 4ce49d84e50e0d2b2e099567c1aa1ab781169e9e..442fd545c037d7dbb550c3b2f5624e58f9df2368 100644 (file)
--- a/libvirt/qemu/Vera.xml
+++ b/libvirt/qemu/Vera.xml
@@ -93,6 +93,10 @@ or other application using the libvirt API.
       <target type='virtio' name='com.redhat.spice.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
+    <channel type='unix'>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
     <input type='tablet' bus='usb'>
       <address type='usb' bus='0' port='1'/>
     </input>

diff --git a/libvirt/qemu/lena.xml b/libvirt/qemu/lena.xml
index 409fa11bf0d5c138a0b8faa994655e9f4f3b4654..bc5ccf6a0d78c9a8d721853ae8d6ac5d2fb483dc 100644 (file)
--- a/libvirt/qemu/lena.xml
+++ b/libvirt/qemu/lena.xml
@@ -98,6 +98,10 @@ or other application using the libvirt API.
       <target type='virtio' name='com.redhat.spice.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
+    <channel type='unix'>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='yes'>

diff --git a/portage/make.conf b/portage/make.conf
index 1e858cceeba092e0497861d35eced4f505fd0603..906a7d63e2534948418d7638c8b4928d6ad9c617 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -135,8 +135,12 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \
 #CURL_SSL="nss"
 
 PHP_TARGETS="php5-6 php7-0"
-PYTHON_TARGETS="python2_7 python3_4"
+
+#USE_PYTHON='2.7 3.4 3.5'
+#PYTHON_TARGETS="python2_7 python3_4"
+#PYTHON_TARGETS="python2_7 python3_4 python3_5"
 PYTHON_SINGLE_TARGET="python3_4"
+
 CURL_SSL="nss"
 
 # RUBY_TARGETS="ruby21 ruby22"

diff --git a/portage/package.accept_keywords/python b/portage/package.accept_keywords/python
new file mode 100644 (file)
index 0000000..fbc7daf
--- /dev/null
+++ b/portage/package.accept_keywords/python
@@ -0,0 +1,5 @@
+
+~dev-lang/python-3.5.3
+
+~dev-python/setuptools-36.0.1
+

diff --git a/postfix/main.cf b/postfix/main.cf
index 7293b3bbb3af48d2fbd72ae0c911427b4f15e79d..8b6c955d068c0781a7c03712f0dad9fe1b68b0c4 100644 (file)
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -717,3 +717,4 @@ smtp_tls_enforce_peername = no
 #debug_peer_list = 217.237.40.156
 
 inet_protocols = all
+virtual_alias_maps = hash:/etc/postfix/virtual

diff --git a/postfix/virtual b/postfix/virtual
new file mode 100644 (file)
index 0000000..39fb2b3
--- /dev/null
+++ b/postfix/virtual
@@ -0,0 +1,21 @@
+################################################################################
+#
+# Virtual user mapping
+# /etc/postfix/virtual
+#
+# See 'man -s 5 virtual' for a description of the format
+#
+# Note, that the target addresses must be valid e-mail-addresses
+#
+################################################################################
+
+root@karla.home.brehm-online.com       frank@brehm-online.com
+@karla.home.brehm-online.com           frank@brehm-online.com
+
+root@lena.home.brehm-online.com                frank@brehm-online.com
+@lena.home.brehm-online.com            frank@brehm-online.com
+
+root@vera.home.brehm-online.com                frank@brehm-online.com
+@vera.home.brehm-online.com            frank@brehm-online.com
+
+# vim: filetype=conf ts=8 list

diff --git a/postfix/virtual.db b/postfix/virtual.db
new file mode 100644 (file)
index 0000000..25739eb
Binary files /dev/null and b/postfix/virtual.db differ