From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Wed, 21 Jan 2015 20:12:24 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=de8e0eb1753633eeb8f5189eb8e8c20e2ad2bcc0;p=config%2Fsamara%2Fetc.git

Current state
---

diff --git a/X11/xinit.d/libcanberra-gtk-module.sh b/X11/xinit.d/libcanberra-gtk-module.sh
deleted file mode 100644
index 63c16af..0000000
--- a/X11/xinit.d/libcanberra-gtk-module.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# to be sourced
-
-case "$SESSION" in
-	GNOME)
-		# Done by gnome-settings-daemon
-		;;
-	*)
-		if [ -z "$GTK_MODULES" ] ; then
-		        GTK_MODULES="canberra-gtk-module"
-		else
-	        	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-		fi
-		export GTK_MODULES
-		;;
-esac
diff --git a/X11/xinit/xinitrc.d/40-libcanberra-gtk-module b/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
new file mode 100755
index 0000000..63c16af
--- /dev/null
+++ b/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
@@ -0,0 +1,16 @@
+#!/bin/sh
+# to be sourced
+
+case "$SESSION" in
+	GNOME)
+		# Done by gnome-settings-daemon
+		;;
+	*)
+		if [ -z "$GTK_MODULES" ] ; then
+		        GTK_MODULES="canberra-gtk-module"
+		else
+	        	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+		fi
+		export GTK_MODULES
+		;;
+esac
diff --git a/X11/xinit/xinitrc.d/49-keychain b/X11/xinit/xinitrc.d/49-keychain
old mode 100644
new mode 100755
diff --git a/X11/xinit/xinitrc.d/50-ssh-agent b/X11/xinit/xinitrc.d/50-ssh-agent
old mode 100644
new mode 100755
diff --git a/config-archive/etc/logrotate.conf b/config-archive/etc/logrotate.conf
index dcefda8..70af0b6 100644
--- a/config-archive/etc/logrotate.conf
+++ b/config-archive/etc/logrotate.conf
@@ -1,34 +1,33 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
 #
-# Logrotate default configuration file for Gentoo Linux
-#
-# See "man logrotate" for details
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
 
-# rotate log files weekly
+# rotate log files weekly.
 weekly
 #daily
 
-# keep 4 weeks worth of backlogs
+# keep 4 weeks worth of backlogs.
 rotate 999
 #maxage 2y
 maxage 730
 
-# create new (empty) log files after rotating old ones
+# create new (empty) log files after rotating old ones.
 create
 
 tabooprefix	\.
 
-# use date as a suffix of the rotated file
+# use date as a suffix of the rotated file.
 dateext
 
-# uncomment this if you want your log files compressed
+# compress rotated log files.
 compress
 
 notifempty
 #nomail
 noolddir
 
-# no packages own lastlog or wtmp -- we'll rotate them here
+# no packages own wtmp and btmp -- we'll rotate them here.
 /var/log/wtmp {
     weekly
     create 0664 root utmp
@@ -46,7 +45,7 @@ noolddir
 	size 4M
 }
 
-# packages can drop log rotation information into this directory
+# packages can drop log rotation information into this directory.
 include /etc/logrotate.d
 
 # system-specific logs may be also be configured here.
diff --git a/config-archive/etc/logrotate.conf.1 b/config-archive/etc/logrotate.conf.1
new file mode 100644
index 0000000..a4e4cb5
--- /dev/null
+++ b/config-archive/etc/logrotate.conf.1
@@ -0,0 +1,54 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $
+#
+# Logrotate default configuration file for Gentoo Linux
+#
+# See "man logrotate" for details
+
+# rotate log files weekly
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs
+rotate 999
+#maxage 2y
+maxage 730
+
+# create new (empty) log files after rotating old ones
+create
+
+tabooprefix	\.
+
+# use date as a suffix of the rotated file
+dateext
+
+# uncomment this if you want your log files compressed
+compress
+
+notifempty
+#nomail
+noolddir
+
+# no packages own lastlog or wtmp -- we'll rotate them here
+/var/log/wtmp {
+    weekly
+    create 0664 root utmp
+    rotate 12
+	olddir /var/log/wtmp.d
+	size 4M
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 12
+	olddir /var/log/wtmp.d
+	size 4M
+}
+
+# packages can drop log rotation information into this directory
+include /etc/logrotate.d
+
+# system-specific logs may be also be configured here.
+
+# vim: ts=4 filetype=conf
diff --git a/config-archive/etc/logrotate.conf.2 b/config-archive/etc/logrotate.conf.2
new file mode 100644
index 0000000..dcefda8
--- /dev/null
+++ b/config-archive/etc/logrotate.conf.2
@@ -0,0 +1,54 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $
+#
+# Logrotate default configuration file for Gentoo Linux
+#
+# See "man logrotate" for details
+
+# rotate log files weekly
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs
+rotate 999
+#maxage 2y
+maxage 730
+
+# create new (empty) log files after rotating old ones
+create
+
+tabooprefix	\.
+
+# use date as a suffix of the rotated file
+dateext
+
+# uncomment this if you want your log files compressed
+compress
+
+notifempty
+#nomail
+noolddir
+
+# no packages own lastlog or wtmp -- we'll rotate them here
+/var/log/wtmp {
+    weekly
+    create 0664 root utmp
+    rotate 12
+	olddir /var/log/wtmp.d
+	size 4M
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 12
+	olddir /var/log/wtmp.d
+	size 4M
+}
+
+# packages can drop log rotation information into this directory
+include /etc/logrotate.d
+
+# system-specific logs may be also be configured here.
+
+# vim: ts=4 filetype=conf
diff --git a/config-archive/etc/logrotate.conf.dist.new b/config-archive/etc/logrotate.conf.dist.new
new file mode 100644
index 0000000..4a5184a
--- /dev/null
+++ b/config-archive/etc/logrotate.conf.dist.new
@@ -0,0 +1,43 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
+#
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
+
+# rotate log files weekly.
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs.
+rotate 4
+
+# create new (empty) log files after rotating old ones.
+create
+
+# use date as a suffix of the rotated file.
+dateext
+
+# compress rotated log files.
+compress
+
+notifempty
+nomail
+noolddir
+
+# packages can drop log rotation information into this directory.
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here.
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/cups/printers.conf b/cups/printers.conf
index bf66ec5..32ebb71 100644
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,15 +1,14 @@
-# Printer configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-10-13 17:09
+# Printer configuration file for CUPS v1.7.5
+# Written by cupsd on 2015-01-12 17:44
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dcops_printer_Dell>
 UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8
 AuthInfoRequired none
 Info Printer Dcops - Dell B2375dnf Mono MFP
 Location Dcops
-MakeModel Dell B2375dnf Mono MFP
 DeviceURI ipp://192.168.88.100/ipp/print
 State Idle
-StateTime 1413212976
+StateTime 1421081041
 Type 8392788
 Accepting Yes
 Shared No
@@ -20,18 +19,17 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#FFFFFF
-Attribute marker-levels 50
+Attribute marker-levels 97
 Attribute marker-low-levels 5
 Attribute marker-high-levels 100
 Attribute marker-names Black Toner Cartridge
 Attribute marker-types toner
-Attribute marker-change-time 1413212930
+Attribute marker-change-time 1421081040
 </Printer>
 <Printer Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
 Info RI Dell 2350dn Laser Printer
 Location Office RI
-MakeModel Dell S2500 Foomatic/Postscript (recommended)
 DeviceURI socket://192.168.49.5
 State Idle
 StateTime 1371800841
@@ -54,7 +52,6 @@ Attribute marker-change-time 1371800841
 UUID urn:uuid:db2c7a55-9b98-3d65-616b-231c535768da
 AuthInfoRequired none
 Info Support Printer - Dell 2330dn
-MakeModel Dell 2330dn Laser Printer
 DeviceURI ipp://192.168.80.4/ipp
 State Idle
 StateTime 1404458435
diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 02b6f42..db02cb8 100644
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,15 +1,14 @@
-# Printer configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-10-13 17:09
+# Printer configuration file for CUPS v1.7.5
+# Written by cupsd on 2015-01-12 17:43
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dcops_printer_Dell>
 UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8
 AuthInfoRequired none
 Info Printer Dcops - Dell B2375dnf Mono MFP
 Location Dcops
-MakeModel Dell B2375dnf Mono MFP
 DeviceURI ipp://192.168.88.100/ipp/print
 State Idle
-StateTime 1413212929
+StateTime 1421081020
 Type 8392788
 Accepting Yes
 Shared No
@@ -20,18 +19,17 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#FFFFFF
-Attribute marker-levels 50
+Attribute marker-levels 98
 Attribute marker-low-levels 5
 Attribute marker-high-levels 100
 Attribute marker-names Black Toner Cartridge
 Attribute marker-types toner
-Attribute marker-change-time 1413212930
+Attribute marker-change-time 1421081020
 </Printer>
 <Printer Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
 Info RI Dell 2350dn Laser Printer
 Location Office RI
-MakeModel Dell S2500 Foomatic/Postscript (recommended)
 DeviceURI socket://192.168.49.5
 State Idle
 StateTime 1371800841
@@ -54,7 +52,6 @@ Attribute marker-change-time 1371800841
 UUID urn:uuid:db2c7a55-9b98-3d65-616b-231c535768da
 AuthInfoRequired none
 Info Support Printer - Dell 2330dn
-MakeModel Dell 2330dn Laser Printer
 DeviceURI ipp://192.168.80.4/ipp
 State Idle
 StateTime 1404458435
diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 69014f2..9fc4dfe 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
-# Subscription configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-10-14 17:09
-NextSubscriptionId 18
+# Subscription configuration file for CUPS v1.7.5
+# Written by cupsd on 2015-01-13 17:43
+NextSubscriptionId 19
diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
index f9fe84d..b262c4a 100644
--- a/cups/subscriptions.conf.O
+++ b/cups/subscriptions.conf.O
@@ -1,11 +1,11 @@
-# Subscription configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-10-13 17:09
-NextSubscriptionId 18
-<Subscription 17>
+# Subscription configuration file for CUPS v1.7.5
+# Written by cupsd on 2015-01-12 17:44
+NextSubscriptionId 19
+<Subscription 18>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
 Owner fbrehm
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1413299330
-NextEventId 20
+ExpirationTime 1421167392
+NextEventId 46
 </Subscription>
diff --git a/dbus-1/system.d/org.freedesktop.machine1.conf b/dbus-1/system.d/org.freedesktop.machine1.conf
index 3a77c70..ac1aee8 100644
--- a/dbus-1/system.d/org.freedesktop.machine1.conf
+++ b/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -42,15 +42,19 @@
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
-                       send_member="GetMachineAddresses"/>
+                       send_member="GetMachine"/>
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
-                       send_member="GetMachine"/>
+                       send_member="GetMachineByPID"/>
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
-                       send_member="GetMachineByPID"/>
+                       send_member="GetMachineAddresses"/>
+
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="GetMachineOSRelease"/>
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Machine"
@@ -58,7 +62,7 @@
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Machine"
-                       send_member="GetMachineOSRelease"/>
+                       send_member="GetOSRelease"/>
 
                 <allow receive_sender="org.freedesktop.machine1"/>
         </policy>
diff --git a/dbus-1/system.d/org.freedesktop.resolve1.conf b/dbus-1/system.d/org.freedesktop.resolve1.conf
new file mode 100644
index 0000000..25b0977
--- /dev/null
+++ b/dbus-1/system.d/org.freedesktop.resolve1.conf
@@ -0,0 +1,27 @@
+<?xml version="1.0"?> <!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<!--
+  This file is part of systemd.
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+-->
+
+<busconfig>
+
+        <policy user="systemd-resolve">
+                <allow own="org.freedesktop.resolve1"/>
+                <allow send_destination="org.freedesktop.resolve1"/>
+                <allow receive_sender="org.freedesktop.resolve1"/>
+        </policy>
+
+        <policy context="default">
+                <allow send_destination="org.freedesktop.resolve1"/>
+                <allow receive_sender="org.freedesktop.resolve1"/>
+        </policy>
+
+</busconfig>
diff --git a/dbus-1/system.d/org.freedesktop.systemd1.conf b/dbus-1/system.d/org.freedesktop.systemd1.conf
index 9dfca81..3e13825 100644
--- a/dbus-1/system.d/org.freedesktop.systemd1.conf
+++ b/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -28,6 +28,8 @@
         <policy context="default">
                 <deny send_destination="org.freedesktop.systemd1"/>
 
+                <!-- Completely open to anyone -->
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.DBus.Introspectable"/>
 
@@ -94,6 +96,112 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="GetDefaultTarget"/>
 
+                <!-- Managed via polkit or other criteria -->
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StartUnitReplace"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StopUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReloadUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="RestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="TryRestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReloadOrRestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReloadOrTryRestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="KillUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ResetFailedUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="SetUnitProperties"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StartTransientUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="CancelJob"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Reload"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Reexecute"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="EnableUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="DisableUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReenableUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="LinkUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="PresetUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="PresetUnitFilesWithMode"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="MaskUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="UnmaskUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="SetDefaultTarget"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="PresetAllUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Job"
+                       send_member="Cancel"/>
+
                 <allow receive_sender="org.freedesktop.systemd1"/>
         </policy>
 
diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links
index 867df4e..224d2e6 100644
--- a/eselect/postgresql/active.links
+++ b/eselect/postgresql/active.links
@@ -6,22 +6,16 @@ usr/include/libpq
 usr/include/postgres_ext.h
 usr/lib64/postgresql
 usr/lib64/libecpg_compat.so.3
-usr/lib64/libpq.a
-usr/lib64/libpgport.a
 usr/lib64/libpq.so
 usr/lib64/libecpg_compat.so.3.5
 usr/lib64/libecpg_compat.so
 usr/lib64/libecpg.so.6.5
-usr/lib64/libpgtypes.a
 usr/lib64/libpgtypes.so
-usr/lib64/libpgcommon.a
 usr/lib64/libpq.so.5.6
 usr/lib64/libecpg.so
 usr/lib64/libecpg.so.6
 usr/lib64/libpq.so.5
-usr/lib64/libecpg.a
 usr/lib64/libpgtypes.so.3
-usr/lib64/libecpg_compat.a
 usr/lib64/libpgtypes.so.3.4
 usr/bin/pg_dumpall
 usr/bin/dropdb
diff --git a/eselect/postgresql/slots/9.3/base b/eselect/postgresql/slots/9.3/base
index 7d4a07f..d7f0fd8 100644
--- a/eselect/postgresql/slots/9.3/base
+++ b/eselect/postgresql/slots/9.3/base
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.3.5"
+postgres_ebuilds="${postgres_ebuilds} postgresql-9.3.5-r2"
diff --git a/fonts/conf.avail/10-no-sub-pixel.conf b/fonts/conf.avail/10-no-sub-pixel.conf
index cf12465..635847c 100644
--- a/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/fonts/conf.avail/10-no-sub-pixel.conf
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-<!--  Enable sub-pixel rendering --> 
+<!--  Disable sub-pixel rendering --> 
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf
index f25052a..08c8ba3 100644
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -2,57 +2,49 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
-	<!-- Alias similar/metric-compatible families from various sources:
-
-		PostScript fonts:
-			Helvetica
-			Times
-			Courier
-		URW fonts:
-			Nimbus Sans L
-			Nimbus Roman No9 L
-			Nimbus Mono L
-
-		Microsoft fonts:
-			Arial
-			Arial Narrow
-			Times New Roman
-			Courier New
-		Liberation fonts:
-			Liberation Sans
-			Liberation Sans Narrow
-			Liberation Serif
-			Liberation Mono
-		StarOffice fonts:
-			Albany
-			Thorndale
-			Cumberland
-		AMT fonts:
-			Albany AMT
-			Thorndale AMT
-			Cumberland AMT
-		Google CrOS Core fonts:
-			Arimo
-			Cousine
-			Tinos
-
-	     Of these, URW fonts are design compatible with PostScrict fonts,
-	     and the Liberation, StarOffice, AMT and CrOS Core ones are
-	     compatible with Microsoft fonts.
-
-	     We want for each of them to fallback to any of these
-	     available, but in an order preferring similar designs
-	     first.  We do this in three steps:
-
-		1) Alias each specific to it's generic family.
-		   eg. Liberation Sans to Arial
-
-		2) Weak alias each generic to the other generic of its family.
-		   eg. Arial to Helvetica
-
-		3) Alias each generic to its specifics.
-		   eg. Arial to Liberation Sans, Albany, and Albany AMT
-	-->
+<!--
+
+Alias similar/metric-compatible families from various sources:
+
+PostScript fonts:       URW fonts:            GUST fonts:        Windows fonts:
+======================  ====================  =================  ==================
+Helvetica               Nimbus Sans L         TeX Gyre Heros
+Helvetica Condensed                           TeX Gyre Heros Cn
+Times                   Nimbus Roman No9 L    TeX Gyre Termes
+Courier                 Nimbus Mono L         TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic L          TeX Gyre Adventor
+ITC Bookman             URW Bookman L         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       URW Chancery L        TeX Gyre Chorus
+Palatino                URW Palladio L        TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  Century Schoolbook L  TeX Gyre Schola    Century Schoolbook
+
+Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
+================  ======================  =======================  =================  ==============
+Arial             Liberation Sans         Arimo                    Albany             Albany AMT
+Arial Narrow      Liberation Sans Narrow
+Times New Roman   Liberation Serif        Tinos                    Thorndale          Thorndale AMT
+Courier New       Liberation Mono         Cousine                  Cumberland         Cumberland AMT
+Cambria                                   Caladea
+Calibri                                   Carlito
+Symbol                                    SymbolNeu
+
+Microsoft fonts:  Other fonts:
+================  ============
+Georgia           Gelasio
+
+We want for each of them to fallback to any of these available,
+but in an order preferring similar designs first.  We do this in three steps:
+
+1) Alias each specific to its generic family.
+   e.g. Liberation Sans to Arial
+
+2) Weak alias each generic to the other generic of its family.
+   e.g. Arial to Helvetica
+
+3) Alias each generic to its specifics.
+   e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
+
+-->
 
 <!-- Map specifics to generics -->
 
@@ -64,6 +56,20 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Heros</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Heros Cn</family>
+	  <default>
+	  <family>Helvetica Condensed</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Nimbus Roman No9 L</family>
 	  <default>
@@ -71,6 +77,16 @@
 	  </default>
 	</alias>
 
+<!--
+     Due to Bug#73291, commented out those lines until the broken font are fixed.
+	<alias binding="same">
+	  <family>TeX Gyre Termes</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+-->
+
 	<alias binding="same">
 	  <family>Nimbus Mono L</family>
 	  <default>
@@ -78,6 +94,125 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Cursor</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Gothic L</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Adventor</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Bookman L</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Bonum</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman Old Style</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Zapf Chancery</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Chancery L</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Chorus</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Palladio L</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Pagella</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino Linotype</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook L</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Schola</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
 
 	<!-- Microsoft -->
 	<alias binding="same">
@@ -171,10 +306,35 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Gelasio</family>
+	  <default>
+	  <family>Georgia</family>
+	  </default>
+	</alias>
 
+	<alias binding="same">
+	  <family>Caladea</family>
+	  <default>
+	  <family>Cambria</family>
+	  </default>
+	</alias>
 
-<!-- Accept the other group as fallback -->
+	<alias binding="same">
+	  <family>Carlito</family>
+	  <default>
+	  <family>Calibri</family>
+	  </default>
+	</alias>
 
+	<alias binding="same">
+	  <family>SymbolNeu</family>
+	  <default>
+	  <family>Symbol</family>
+	  </default>
+  </alias>
+
+<!-- Accept the other group as fallback -->
 
 	<!-- PostScript -->
 	<alias>
@@ -184,6 +344,13 @@
 	  </default>
 	</alias>
 
+	<alias>
+	  <family>Helvetica Condensed</family>
+	  <default>
+	  <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
 	<alias>
 	  <family>Times</family>
 	  <default>
@@ -207,6 +374,13 @@
 	  </default>
 	</alias>
 
+	<alias>
+	  <family>Arial Narrow</family>
+	  <default>
+	  <family>Helvetica Condensed</family>
+	  </default>
+	</alias>
+
 	<alias>
 	  <family>Times New Roman</family>
 	  <default>
@@ -225,18 +399,29 @@
 
 <!-- Map generics to specifics -->
 
-
 	<!-- PostScript -->
 	<alias binding="same">
 	  <family>Helvetica</family>
 	  <accept>
+	  <family>TeX Gyre Heros</family>
 	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Helvetica Condensed</family>
+	  <accept>
+	  <family>TeX Gyre Heros Cn</family>
+	  </accept>
+	</alias>
+
 	<alias binding="same">
 	  <family>Times</family>
 	  <accept>
+<!--
+     Due to Bug#73291, commented out this line until the broken font are fixed.
+	  <family>TeX Gyre Termes</family>
+-->
 	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
@@ -244,10 +429,53 @@
 	<alias binding="same">
 	  <family>Courier</family>
 	  <accept>
+	  <family>TeX Gyre Cursor</family>
 	  <family>Nimbus Mono L</family>
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>ITC Avant Garde Gothic</family>
+	  <accept>
+	  <family>TeX Gyre Adventor</family>
+	  <family>URW Gothic L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Bookman</family>
+	  <accept>
+	  <family>Bookman Old Style</family>
+	  <family>TeX Gyre Bonum</family>
+	  <family>URW Bookman L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Zapf Chancery</family>
+	  <accept>
+	  <family>TeX Gyre Chorus</family>
+	  <family>URW Chancery L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept>
+	  <family>Palatino Linotype</family>
+	  <family>TeX Gyre Pagella</family>
+	  <family>URW Palladio L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept>
+	  <family>Century Schoolbook</family>
+	  <family>TeX Gyre Schola</family>
+	  <family>Century Schoolbook L</family>
+	  </accept>
+	</alias>
 
 	<!-- Microsoft -->
 	<alias binding="same">
@@ -287,5 +515,32 @@
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Georgia</family>
+	  <accept>
+	    <family>Gelasio</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cambria</family>
+	  <accept>
+	    <family>Caladea</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Calibri</family>
+	  <accept>
+	    <family>Carlito</family>
+	  </accept>
+  </alias>
+
+	<alias binding="same">
+	  <family>Symbol</family>
+	  <accept>
+	    <family>SymbolNeu</family>
+	  </accept>
+  </alias>
 
 </fontconfig>
diff --git a/fonts/conf.avail/30-urw-aliases.conf b/fonts/conf.avail/30-urw-aliases.conf
index aae06ac..e0d45da 100644
--- a/fonts/conf.avail/30-urw-aliases.conf
+++ b/fonts/conf.avail/30-urw-aliases.conf
@@ -3,30 +3,14 @@
 <fontconfig>
 <!--
   URW provides metric and shape compatible fonts for some Adobe families.
-  Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
+  Most of these are handled in 30-metric-aliases.conf.
   -->
 	<alias binding="same">
-	  <family>Avant Garde</family>
-	  <accept><family>URW Gothic L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Bookman</family>
-	  <accept><family>URW Bookman L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>New Century Schoolbook</family>
-	  <accept><family>Century Schoolbook L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Palatino</family>
-	  <accept><family>URW Palladio L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Zapf Chancery</family>
-	  <accept><family>URW Chancery L</family></accept>
+	  <family>Zapf Dingbats</family>
+	  <accept><family>Dingbats</family></accept>
 	</alias>
 	<alias binding="same">
-	  <family>Zapf Dingbats</family>
+	  <family>ITC Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
 	<match target="pattern">
diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf
index 09fd526..aa62ed4 100644
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -45,6 +45,22 @@
 		<family>Thorndale</family>
 		<default><family>serif</family></default>
 	</alias>
+	<alias>
+		<family>Georgia</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Garamond</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Palatino Linotype</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Trebuchet MS</family>
+		<default><family>serif</family></default>
+	</alias>
 <!--
   Sans-serif faces
  -->
diff --git a/fonts/conf.d/10-scale-bitmap-fonts.conf b/fonts/conf.d/10-scale-bitmap-fonts.conf
index 56049bc..c3ca696 120000
--- a/fonts/conf.d/10-scale-bitmap-fonts.conf
+++ b/fonts/conf.d/10-scale-bitmap-fonts.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file
+../conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file
diff --git a/fonts/conf.d/README b/fonts/conf.d/README
index c2fb52c..6a774c5 100644
--- a/fonts/conf.d/README
+++ b/fonts/conf.d/README
@@ -2,9 +2,9 @@ conf.d/README
 
 Each file in this directory is a fontconfig configuration file.  Fontconfig
 scans this directory, loading all files of the form [0-9][0-9]*.conf.
-These files are normally installed in ../conf.avail and then symlinked here,
-allowing them to be easily installed and then enabled/disabled by adjusting
-the symlinks.
+These files are normally installed in /usr/share/fontconfig/conf.avail
+and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks.
 
 The files are loaded in numeric order, the structure of the configuration
 has led to the following conventions in usage:
diff --git a/fonts/fonts.conf b/fonts/fonts.conf
index e2d5567..2530eef 100644
--- a/fonts/fonts.conf
+++ b/fonts/fonts.conf
@@ -68,7 +68,7 @@
 <!--
   Load local system customization file
 -->
-	<include ignore_missing="yes">/etc/fonts/conf.d</include>
+	<include ignore_missing="yes">conf.d</include>
 
 <!-- Font cache directory list -->
 
diff --git a/group b/group
index 96b7602..4012ff4 100644
--- a/group
+++ b/group
@@ -76,3 +76,6 @@ systemd-bus-proxy:x:974:
 systemd-network:x:973:
 systemd-resolve:x:972:
 systemd-timesync:x:971:
+systemd-journal-gateway:x:970:
+systemd-journal-remote:x:969:
+systemd-journal-upload:x:968:
diff --git a/group- b/group-
index 61c7721..215656d 100644
--- a/group-
+++ b/group-
@@ -75,3 +75,6 @@ input:x:975:
 systemd-bus-proxy:x:974:
 systemd-network:x:973:
 systemd-resolve:x:972:
+systemd-timesync:x:971:
+systemd-journal-gateway:x:970:
+systemd-journal-remote:x:969:
diff --git a/gshadow b/gshadow
index 5fe0740..2e7126c 100644
--- a/gshadow
+++ b/gshadow
@@ -76,3 +76,6 @@ systemd-bus-proxy:!::
 systemd-network:!::
 systemd-resolve:!::
 systemd-timesync:!::
+systemd-journal-gateway:!::
+systemd-journal-remote:!::
+systemd-journal-upload:!::
diff --git a/gshadow- b/gshadow-
index f7e33b2..87a00a1 100644
--- a/gshadow-
+++ b/gshadow-
@@ -75,3 +75,6 @@ input:!::
 systemd-bus-proxy:!::
 systemd-network:!::
 systemd-resolve:!::
+systemd-timesync:!::
+systemd-journal-gateway:!::
+systemd-journal-remote:!::
diff --git a/hp/hplip.conf b/hp/hplip.conf
index 1327044..126e7d8 100644
--- a/hp/hplip.conf
+++ b/hp/hplip.conf
@@ -1,15 +1,15 @@
 # hplip.conf.  Generated from hplip.conf.in by configure.
 
 [hplip]
-version=3.14.1
+version=3.14.10
 
 [dirs]
 home=/usr/share/hplip
 run=/var/run
 ppd=/usr/share/ppd/HP
 ppdbase=/usr/share/ppd
-doc=/usr/share/doc/hplip-3.14.1
-html=/usr/share/doc/hplip-3.14.1/html
+doc=/usr/share/doc/hplip-3.14.10
+html=/usr/share/doc/hplip-3.14.10/html
 icon=/usr/share/applications
 cupsbackend=/usr/libexec/cups/backend
 cupsfilter=/usr/libexec/cups/filter
@@ -35,14 +35,13 @@ foomatic-rip-hplip-install=no
 hpcups-install=yes
 cups-drv-install=yes
 cups-ppd-install=no
-internal-tag=3.14.1
+internal-tag=3.14.10
 restricted-build=no
 ui-toolkit=qt4
 qt3=no
 qt4=yes
 policy-kit=yes
 lite-build=no
-udev-acl-rules=no
 udev_sysfs_rules=no
 hpcups-only-build=no
 hpijs-only-build=no
diff --git a/i3/config b/i3/config
index de7e1fe..30b3f6a 100644
--- a/i3/config
+++ b/i3/config
@@ -10,13 +10,23 @@
 #
 
 # Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below. ISO 10646 = Unicode
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# is used in the bar {} block below.
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+font pango:DejaVu Sans Mono 8
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, if you need a lot of unicode glyphs or
-# right-to-left text rendering, you should instead use pango for rendering and
-# chose a FreeType font, such as:
-# font pango:DejaVu Sans Mono 10
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# use these keys for focus, movement, and resize directions when reaching for
+# the arrows is not convenient
+set $up l
+set $down k
+set $left j
+set $right semicolon
 
 # use Mouse+Mod1 to drag floating windows to their wanted position
 floating_modifier Mod1
@@ -35,10 +45,10 @@ bindsym Mod1+d exec dmenu_run
 # bindsym Mod1+d exec --no-startup-id i3-dmenu-desktop
 
 # change focus
-bindsym Mod1+j focus left
-bindsym Mod1+k focus down
-bindsym Mod1+l focus up
-bindsym Mod1+semicolon focus right
+bindsym Mod1+$left focus left
+bindsym Mod1+$down focus down
+bindsym Mod1+$up focus up
+bindsym Mod1+$right focus right
 
 # alternatively, you can use the cursor keys:
 bindsym Mod1+Left focus left
@@ -47,10 +57,10 @@ bindsym Mod1+Up focus up
 bindsym Mod1+Right focus right
 
 # move focused window
-bindsym Mod1+Shift+j move left
-bindsym Mod1+Shift+k move down
-bindsym Mod1+Shift+l move up
-bindsym Mod1+Shift+semicolon move right
+bindsym Mod1+Shift+$left move left
+bindsym Mod1+Shift+$down move down
+bindsym Mod1+Shift+$up move up
+bindsym Mod1+Shift+$right move right
 
 # alternatively, you can use the cursor keys:
 bindsym Mod1+Shift+Left move left
@@ -130,10 +140,10 @@ mode "resize" {
         # Pressing right will grow the window’s width.
         # Pressing up will shrink the window’s height.
         # Pressing down will grow the window’s height.
-        bindsym j           resize shrink width 10 px or 10 ppt
-        bindsym k           resize grow height 10 px or 10 ppt
-        bindsym l           resize shrink height 10 px or 10 ppt
-        bindsym semicolon   resize grow width 10 px or 10 ppt
+        bindsym $left       resize shrink width 10 px or 10 ppt
+        bindsym $down       resize grow height 10 px or 10 ppt
+        bindsym $up         resize shrink height 10 px or 10 ppt
+        bindsym $right      resize grow width 10 px or 10 ppt
 
         # same bindings, but for the arrow keys
         bindsym Left        resize shrink width 10 px or 10 ppt
diff --git a/i3/config.keycodes b/i3/config.keycodes
index 0da3d77..2739851 100644
--- a/i3/config.keycodes
+++ b/i3/config.keycodes
@@ -11,13 +11,16 @@
 set $mod Mod1
 
 # Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below. ISO 10646 = Unicode
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# is used in the bar {} block below.
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+font pango:DejaVu Sans Mono 8
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, if you need a lot of unicode glyphs or
-# right-to-left text rendering, you should instead use pango for rendering and
-# chose a FreeType font, such as:
-# font pango:DejaVu Sans Mono 10
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
diff --git a/init.d/ntpd b/init.d/ntpd
index a5bd1ff..1a34bb2 100755
--- a/init.d/ntpd
+++ b/init.d/ntpd
@@ -1,36 +1,23 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.24 2010/07/18 21:53:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc-r1,v 1.2 2014/12/23 17:43:25 floppym Exp $
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
 
 depend() {
 	use net dns logger
 	after ntp-client
 }
 
-checkconfig() {
+start_pre() {
 	if [ ! -f /etc/ntp.conf ] ; then
 		eerror "Please create /etc/ntp.conf"
-		eerror "Sample conf: /usr/share/ntp/ntp.conf"
 		return 1
 	fi
 	return 0
 }
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting ntpd"
-	start-stop-daemon --start --exec /usr/sbin/ntpd \
-	    --pidfile /var/run/ntpd.pid \
-	    -- -p /var/run/ntpd.pid ${NTPD_OPTS}
-	eend $? "Failed to start ntpd"
-}
-
-stop() {
-	ebegin "Stopping ntpd"
-	start-stop-daemon --stop \
-		--pidfile /var/run/ntpd.pid \
-		--exec /usr/sbin/ntpd
-	eend $? "Failed to stop ntpd"
-}
diff --git a/init.d/pktcdvd b/init.d/pktcdvd
new file mode 100755
index 0000000..e5418f4
--- /dev/null
+++ b/init.d/pktcdvd
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/files/pktcdvd.init,v 1.2 2008/10/31 20:07:41 dsd Exp $
+
+depend() {
+	need localmount modules
+}
+
+checkconfig() {
+	if ! [ -e /dev/pktcdvd/control ]; then
+		eerror "Could not find packet-writing control device at /dev/pktcdvd/control"
+		eerror "Please ensure that your kernel includes packet writing support,"
+		eerror "and if modular, ensure that the module is loaded."
+		return 1
+	fi
+}
+
+get_rw_devices() {
+	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
+	count=0
+	for i in $devices_raw; do
+		eval "devices_$count=\"\$i\""
+		count=$(( $count + 1 ))
+	done
+	devs=""
+
+	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
+
+	count=0
+	for i in $cdrw_caps; do
+		[ "$i" -eq 1 ] && eval "devs=\"\$devs \$devices_$count\""
+		count=$(( $count + 1 ))
+	done
+
+	echo ${devs}
+}
+
+start() {
+	checkconfig || return 1
+
+	for i in $(get_rw_devices)
+	do
+		devnode="/dev/${i}"
+		[ -e "${devnode}" ] || continue
+
+		/usr/bin/pktsetup "${i}" "${devnode}" > /dev/null
+		[ -e "/dev/pktcdvd/${i}" ] || continue
+		chmod 660 "/dev/pktcdvd/${i}"
+		chgrp cdrw "/dev/pktcdvd/${i}"
+	done
+}
+
+stop() {
+	checkconfig || return 1
+	
+	for i in $(get_rw_devices)
+	do
+		/usr/bin/pktsetup -d "${i}" > /dev/null
+	done
+}
+
diff --git a/logrotate.conf b/logrotate.conf
index a4e4cb5..70af0b6 100644
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -1,34 +1,33 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
 #
-# Logrotate default configuration file for Gentoo Linux
-#
-# See "man logrotate" for details
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
 
-# rotate log files weekly
+# rotate log files weekly.
 weekly
 #daily
 
-# keep 4 weeks worth of backlogs
+# keep 4 weeks worth of backlogs.
 rotate 999
 #maxage 2y
 maxage 730
 
-# create new (empty) log files after rotating old ones
+# create new (empty) log files after rotating old ones.
 create
 
 tabooprefix	\.
 
-# use date as a suffix of the rotated file
+# use date as a suffix of the rotated file.
 dateext
 
-# uncomment this if you want your log files compressed
+# compress rotated log files.
 compress
 
 notifempty
 #nomail
 noolddir
 
-# no packages own lastlog or wtmp -- we'll rotate them here
+# no packages own wtmp and btmp -- we'll rotate them here.
 /var/log/wtmp {
     weekly
     create 0664 root utmp
@@ -46,7 +45,7 @@ noolddir
 	size 4M
 }
 
-# packages can drop log rotation information into this directory
+# packages can drop log rotation information into this directory.
 include /etc/logrotate.d
 
 # system-specific logs may be also be configured here.
diff --git a/logrotate.conf.orig b/logrotate.conf.orig
new file mode 100644
index 0000000..4a5184a
--- /dev/null
+++ b/logrotate.conf.orig
@@ -0,0 +1,43 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
+#
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
+
+# rotate log files weekly.
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs.
+rotate 4
+
+# create new (empty) log files after rotating old ones.
+create
+
+# use date as a suffix of the rotated file.
+dateext
+
+# compress rotated log files.
+compress
+
+notifempty
+nomail
+noolddir
+
+# packages can drop log rotation information into this directory.
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here.
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/mc/mc.default.keymap b/mc/mc.default.keymap
index f627fad..a82756f 100644
--- a/mc/mc.default.keymap
+++ b/mc/mc.default.keymap
@@ -38,6 +38,7 @@ Unselect = kpminus
 SelectInvert = kpasterisk
 ScreenList = alt-prime
 # OptionsLayout =
+# OptionsAppearance =
 # OptionsPanel =
 # OptionsConfirm =
 # OptionsDisplayBits =
diff --git a/mc/mc.emacs.keymap b/mc/mc.emacs.keymap
index 1f89773..4c43c5c 100644
--- a/mc/mc.emacs.keymap
+++ b/mc/mc.emacs.keymap
@@ -38,6 +38,7 @@ Unselect = kpminus
 SelectInvert = kpasterisk
 ScreenList = alt-prime
 # OptionsLayout =
+# OptionsAppearance =
 # OptionsPanel =
 # OptionsConfirm =
 # OptionsDisplayBits =
diff --git a/mc/mc.ext b/mc/mc.ext
index 9a4afa7..7a8a545 100644
--- a/mc/mc.ext
+++ b/mc/mc.ext
@@ -680,6 +680,11 @@ shell/i/.arc
 	Extract=arc x %f '*'
 	Extract (with flags)=I=%{Enter any Arc flags:}; if test -n "$I"; then arc x $I %f; fi
 
+# zip
+shell/i/.zip
+	Open=%cd %p/uzip://
+	View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view zip
+
 # zip
 type/i/^zip\ archive
 	Open=%cd %p/uzip://
diff --git a/mc/mc.keymap b/mc/mc.keymap
index f627fad..a82756f 100644
--- a/mc/mc.keymap
+++ b/mc/mc.keymap
@@ -38,6 +38,7 @@ Unselect = kpminus
 SelectInvert = kpasterisk
 ScreenList = alt-prime
 # OptionsLayout =
+# OptionsAppearance =
 # OptionsPanel =
 # OptionsConfirm =
 # OptionsDisplayBits =
diff --git a/mc/mc.menu b/mc/mc.menu
index 577f927..5ec140c 100644
--- a/mc/mc.menu
+++ b/mc/mc.menu
@@ -21,7 +21,7 @@ shell_patterns=0
 
 =+ f \.1$ | f \.3$ | f \.4$ | f \.5$ | f \.6$ | f \.7$ | f \.8$ | f \.man$ & t r
 1       Display the file with roff -man
-	nroff -man %f | less
+	%view{ascii,nroff} roff -c -Tlatin1 -mandoc %f
 
 2       Call the info hypertext browser
         info
@@ -121,7 +121,7 @@ D       Delete tagged files if a copy exists in the other directory.
 
 m       View manual page
 	MAN=%{Enter manual name}
-	%view man -P cat $MAN
+	%view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 = f \.gz$ & t r
 + ! t t
diff --git a/mc/mc.menu.sr b/mc/mc.menu.sr
index 6a505f4..bb8b316 100644
--- a/mc/mc.menu.sr
+++ b/mc/mc.menu.sr
@@ -102,7 +102,7 @@ D       Обриши означене датотеке ако постоји к
 
 m       Погледај страницу упутства
 	MAN=%{Унесите назив упутства}
-	%view man -P cat $MAN
+	%view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 = f \.gz$ & t r
 + ! t t
diff --git a/mc/mcedit.menu b/mc/mcedit.menu
index 3d11d96..6163c50 100644
--- a/mc/mcedit.menu
+++ b/mc/mcedit.menu
@@ -459,10 +459,7 @@ s       Invoke `shell'
 
 m       view `man'
         MAN=%{Enter name of man:}
-        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/mcview.$MAN.XXXXXX` || exit 1
-        man -Pcat $MAN >$TMPFILE
-        mcview $TMPFILE
-        rm -f $TMPFILE
+        %view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 i       Insert a out of command to cursor.
         CMD=%{ Enter command: }
diff --git a/pam.d/systemd-user b/pam.d/systemd-user
index 7b57dbf..8112d74 100644
--- a/pam.d/systemd-user
+++ b/pam.d/systemd-user
@@ -1,8 +1,6 @@
-#%PAM-1.0
+# This file is part of systemd.
+#
+# Used by systemd --user instances.
 
-# Used by systemd when launching systemd user instances.
-
-account include system-auth
-session include system-auth
-auth required pam_deny.so
-password required pam_deny.so
+account  include system-auth
+session  include system-auth
diff --git a/passwd b/passwd
index d7c19f4..0ffa796 100644
--- a/passwd
+++ b/passwd
@@ -52,3 +52,6 @@ systemd-bus-proxy:x:120:974:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-network:x:121:973:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-resolve:x:122:972:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-timesync:x:124:971:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-gateway:x:125:970:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-remote:x:126:969:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-upload:x:127:968:added by portage for systemd:/dev/null:/sbin/nologin
diff --git a/passwd- b/passwd-
index 42b2c59..17604a7 100644
--- a/passwd-
+++ b/passwd-
@@ -51,3 +51,6 @@ geoclue:x:119:977:added by portage for geoclue:/var/lib/geoclue:/sbin/nologin
 systemd-bus-proxy:x:120:974:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-network:x:121:973:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-resolve:x:122:972:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-timesync:x:124:971:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-gateway:x:125:970:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-remote:x:126:969:added by portage for systemd:/dev/null:/sbin/nologin
diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index e872dab..e3e7f57 100644
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -121,6 +121,7 @@ mail-client/thunderbird
 ~perl-core/Perl-OSType-1.3.0
 
 ~sys-apps/etckeeper-0.58
+~sys-apps/ipmitool-1.8.14
 ~sys-apps/ppd-9999
 
 ~sys-block/btrace-1.0.3
diff --git a/portage/package.use b/portage/package.use
index b7c3dfd..589d250 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -50,6 +50,7 @@ dev-cpp/gtkmm				accessibility
 dev-db/libdbi				-doc
 dev-db/libdbi-drivers			-doc
 dev-db/mysql				cluster extraengine profiling xtradb
+dev-db/postgresql			-server uuid xml
 dev-db/sqlite				extensions fts3 secure-delete soundex unlock-notify
 dev-db/unixODBC				odbcmanual
 
@@ -71,6 +72,7 @@ dev-libs/libgcrypt			idea static-libs
 dev-libs/libpeas			-python_targets_python3_3
 dev-libs/libusb				-doc
 dev-libs/openssl			rfc3779
+dev-libs/ossp-uuid			-php
 dev-libs/STLport			boost
 
 dev-perl/Catalyst-Action-REST		php xml config-general data-taxi freezethaw json
@@ -288,7 +290,7 @@ net-misc/ntp                            parse-clocks -zeroconf
 net-misc/openssh                        -X509 sctp sftplogging
 net-misc/openvpn                        down-root eurephia iproute2 passwordsave
 net-misc/rdesktop                       rdpusb
-net-misc/spice-gtk			gtk3 -pulseaudio
+net-misc/spice-gtk			gtk3 -pulseaudio usbredir
 # net-misc/vnc                          server
 net-misc/vpnc                           hybrid-auth
 
@@ -321,6 +323,7 @@ sys-auth/pambase                        mktemp pam_krb5 pam_ssh systemd
 sys-block/lsitools			doc
 sys-block/megacli			doc
 sys-block/parted                        device-mapper
+sys-block/storcli			doc
 
 sys-devel/gcc                           libffi mudflap objc objc-gc objc++
 sys-devel/libperl                       ithreads
diff --git a/postgresql-9.3/.keep_dev-db_postgresql-base-9.3 b/postgresql-9.3/.keep_dev-db_postgresql-base-9.3
deleted file mode 100644
index e69de29..0000000
diff --git a/postgresql-9.3/psqlrc b/postgresql-9.3/psqlrc
new file mode 100644
index 0000000..8152cac
--- /dev/null
+++ b/postgresql-9.3/psqlrc
@@ -0,0 +1,8 @@
+--
+--	system-wide psql configuration file
+--
+--  This file is read before the .psqlrc file in the user's home directory.
+--
+--  Copy this to your installation's sysconf directory and rename it psqlrc.
+--  The sysconf directory can be identified via "pg_config --sysconfdir".
+--
diff --git a/shadow b/shadow
index af706b8..49fdfe8 100644
--- a/shadow
+++ b/shadow
@@ -51,3 +51,6 @@ systemd-bus-proxy:!:16399::::::
 systemd-network:!:16399::::::
 systemd-resolve:!:16399::::::
 systemd-timesync:!:16399::::::
+systemd-journal-gateway:!:16441::::::
+systemd-journal-remote:!:16441::::::
+systemd-journal-upload:!:16441::::::
diff --git a/shadow- b/shadow-
index 1fe7027..2e43346 100644
--- a/shadow-
+++ b/shadow-
@@ -50,3 +50,6 @@ geoclue:!:16146::::::
 systemd-bus-proxy:!:16399::::::
 systemd-network:!:16399::::::
 systemd-resolve:!:16399::::::
+systemd-timesync:!:16399::::::
+systemd-journal-gateway:!:16441::::::
+systemd-journal-remote:!:16441::::::
diff --git a/ssl/certs/200d1bf9.0 b/ssl/certs/200d1bf9.0
new file mode 120000
index 0000000..4f658e9
--- /dev/null
+++ b/ssl/certs/200d1bf9.0
@@ -0,0 +1 @@
+ProfitBricks_Root_CA_2015_v2.pem
\ No newline at end of file
diff --git a/ssl/certs/ProfitBricks_Root_CA_2015_v2.pem b/ssl/certs/ProfitBricks_Root_CA_2015_v2.pem
new file mode 120000
index 0000000..cddbff5
--- /dev/null
+++ b/ssl/certs/ProfitBricks_Root_CA_2015_v2.pem
@@ -0,0 +1 @@
+../../../usr/local/share/ca-certificates/profitbricks/ProfitBricks_Root_CA_2015_v2.crt
\ No newline at end of file
diff --git a/ssl/certs/ca-certificates.crt b/ssl/certs/ca-certificates.crt
index acb4a64..45f7c40 100644
--- a/ssl/certs/ca-certificates.crt
+++ b/ssl/certs/ca-certificates.crt
@@ -4213,3 +4213,39 @@ T7jYhkalMwIsJWE3KpLIrIF0aGOHM3a9BX9e1dUCbb2v/ypaqknsmHlHU5H2DjRa
 yaXG67Ljxay2oHA1u8hRadDytaIybrw/oDc5fHE2pgXfDBLkFqfF1stjo5VwP+YE
 o2A=
 -----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGRDCCBCygAwIBAgIJAJ9cJ4mbBdArMA0GCSqGSIb3DQEBDQUAMIGxMQswCQYD
+VQQGEwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xGjAYBgNV
+BAoMEVByb2ZpdEJyaWNrcyBHbWJIMRYwFAYDVQQLDA1EQyBPcGVyYXRpb25zMSUw
+IwYDVQQDDBxQcm9maXRCcmlja3MgUm9vdCBDQSAyMDE1IHYyMSUwIwYJKoZIhvcN
+AQkBFhZkY29wc0Bwcm9maXRicmlja3MuY29tMB4XDTE1MDEwOTE1MDMwMFoXDTI1
+MDEwODE1MDMwMFowgbExCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzAN
+BgNVBAcMBkJlcmxpbjEaMBgGA1UECgwRUHJvZml0QnJpY2tzIEdtYkgxFjAUBgNV
+BAsMDURDIE9wZXJhdGlvbnMxJTAjBgNVBAMMHFByb2ZpdEJyaWNrcyBSb290IENB
+IDIwMTUgdjIxJTAjBgkqhkiG9w0BCQEWFmRjb3BzQHByb2ZpdGJyaWNrcy5jb20w
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYkrGG142bQ1hKLKWvy3LF
+3GixA3R1Dz3OpcMlrMv7MajnuKsFiYyGQ0z1cvzw1eEx/LrcXHm88yOLMCYslEgN
+PrXVKo9gEOA4KG+r3EaZ1920x/dDp1/aF6Lx32q7R/CfqiO3OTc65SB+Rrwluu0s
+oIwN79hALUUionOqXKZJtmG6p8zE0pivOY7LHRVSxNRn/UJ1vvdv+JtAz9yTlEWN
+LctzVgfzvC3Z+sHWa8GUEF/DBKYPhSUlrDGc5WwYPW4zwMkyH8/afh2wqugGpaKx
+Qkig35vhNfMplijgH4BOdPMc27uAOgK0gLc09Jnyx6wbGS+7aGut7MT5nobRG4lm
+2QjDQJN0mxoy3RT2XaqjMP3yGdJ63UMPFMajNYIS7N1vYNrmQ2wmKhTWoKCJECS1
+6/dgTtnaEb+u7jdR4kvP8KxXOcM1KRxwvwBMrsGF9KuoldIjFB/xd06wW6RZXArV
+qQMExzbnIL4h7DNgEMNkcxpC9XEfyA5cVFNsF/OFIhWzkqKubizUOQIHvKyFdDaZ
+ZhFicHxgU6upjvYSzI8JvAnknde7ahdhrvC/bBteH5O+IHtVMaxRaPP51/ory2I1
+awin8QJ/80ZfuKV8iIuBdMXK3i6/+WTsF00YU9rz++mdDaq1y+3nWHq/qul+T5Kk
+tgRit/CAH5GYzv3r14cMkwIDAQABo10wWzAdBgNVHQ4EFgQU80RAcFzazqNsNkSl
+T/ZItHz53OAwHwYDVR0jBBgwFoAU80RAcFzazqNsNkSlT/ZItHz53OAwDAYDVR0T
+BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAFT+tscXpXbB
+zIBYOl0S3tTLdVgSrdqAhHUJ+O79P/9hM0Dp8UKqUF+CYYqMIQyGwdlY6cIaFKh1
+3Ukm5KNAZCWV2UZKHvDat/wA3oIM8v1ETeF546jF9k9rVjrAYLP8pjeZvflj7z24
+Q4NCV9KPj9GGWIH9H5rsXaEXrVKMpvw0sNqLLHIYUuDccE+vLhsgMpkfUGmGyMr4
+xzHn2ba9/KdXn2dgoMLHkGw92BNCuXx6KBmIf+hcCrjSpmBt2WB/2Rnvzw8xSnAI
+Wj7drX9YGv2hYoMUoYAuopFBfAv8Kjh1pIdHrSBqiRycVrBPY/l3fMQ5CQMTsXSq
+zR950SRBAhexrilViaRrTHlJYvLQou4PU7/kuDW4qb0gh+yFDEJVWDuECLy8/l6T
+6MP/7pwZzlPQrnUzJXDmHtjTaRdFQpx91RNZh4MFfgcQf8xzH5xw7LDIWQ07Jkdc
+QdbwOFLyKn21A1NZIi3I3LUfwhXqWGQRGQavLaCRMXcp1c3VtGoWN1Ih88fADq07
+fPtPrax+gozi26qKSlfZAj2NZnFafYH4y8PPNbzrMuUU4xPQmcvA6PCkboYj2Pmc
+OWbvTFy6yheF0qRGJraOTfwhD72KRyUPEmNclq7XNsczgZQvEwFEpBnxS0j1umCb
+NyEPz6NC8DXUHKcOotwq1oeuFWyFeVkD
+-----END CERTIFICATE-----
diff --git a/systemd/journal-upload.conf b/systemd/journal-upload.conf
new file mode 100644
index 0000000..d261027
--- /dev/null
+++ b/systemd/journal-upload.conf
@@ -0,0 +1,5 @@
+[Upload]
+# URL=
+# ServerKeyFile=/etc/ssl/private/journal-upload.pem
+# ServerCertificateFile=/etc/ssl/certs/journal-upload.pem
+# TrustedCertificateFile=/etc/ssl/ca/trusted.pem
diff --git a/systemd/journald.conf b/systemd/journald.conf
index cded4a9..2073f1b 100644
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -23,7 +23,7 @@
 #RuntimeMaxFileSize=
 #MaxRetentionSec=
 #MaxFileSec=1month
-#ForwardToSyslog=yes
+#ForwardToSyslog=no
 #ForwardToKMsg=no
 #ForwardToConsole=no
 #ForwardToWall=yes
diff --git a/systemd/resolved.conf b/systemd/resolved.conf
index e316598..0b2e0f2 100644
--- a/systemd/resolved.conf
+++ b/systemd/resolved.conf
@@ -8,4 +8,6 @@
 # See resolved.conf(5) for details
 
 [Resolve]
-#DNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
+#DNS=
+#FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
+#LLMNR=yes
diff --git a/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/systemd/system/sysinit.target.wants/systemd-timesyncd.service
new file mode 120000
index 0000000..f10f26e
--- /dev/null
+++ b/systemd/system/sysinit.target.wants/systemd-timesyncd.service
@@ -0,0 +1 @@
+../../../../usr/lib/systemd/system/systemd-timesyncd.service
\ No newline at end of file
diff --git a/systemd/timesyncd.conf b/systemd/timesyncd.conf
index 6e9ed9e..d2130f9 100644
--- a/systemd/timesyncd.conf
+++ b/systemd/timesyncd.conf
@@ -8,4 +8,5 @@
 # See timesyncd.conf(5) for details
 
 [Time]
-#Servers=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org
+#NTP=
+#FallbackNTP=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org
diff --git a/udev/udev.conf b/udev/udev.conf
index f39253e..47d1433 100644
--- a/udev/udev.conf
+++ b/udev/udev.conf
@@ -1,3 +1,3 @@
-# see udev(7) for details
+# see udev.conf(5) for details
 
 #udev_log="info"