committing changes in /etc after emerge run

diff --git a/.etckeeper b/.etckeeper
index 246ef77541770872814a66baee2c1b490438e47f..c2160744b44addb351df0f9bc0953c9d24f20c26 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -242,7 +242,8 @@ maybe chmod 0644 'config-archive/etc/layman/layman.cfg'
 maybe chmod 0644 'config-archive/etc/layman/layman.cfg.1'
 maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist'
 maybe chmod 0644 'config-archive/etc/locale.gen'
-maybe chmod 0644 'config-archive/etc/locale.gen.dist.new'
+maybe chmod 0644 'config-archive/etc/locale.gen.1'
+maybe chmod 0644 'config-archive/etc/locale.gen.dist'
 maybe chmod 0755 'config-archive/etc/lvm'
 maybe chmod 0644 'config-archive/etc/lvm/lvm.conf'
 maybe chmod 0644 'config-archive/etc/lvm/lvm.conf.1'
@@ -298,6 +299,7 @@ maybe chmod 0440 'config-archive/etc/sudoers.dist'
 maybe chmod 0755 'config-archive/etc/syslog-ng'
 maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf'
 maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf.1'
+maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf.2'
 maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf.dist'
 maybe chmod 0755 'config-archive/etc/systemd'
 maybe chmod 0644 'config-archive/etc/systemd/system.conf'

diff --git a/config-archive/etc/locale.gen b/config-archive/etc/locale.gen
index 423dcac233e3276098633a55ee0a2f96c702a56a..b44a6ef62a6abfdb60e3ba66133852a802c51691 100644 (file)
--- a/config-archive/etc/locale.gen
+++ b/config-archive/etc/locale.gen
@@ -30,52 +30,33 @@
 #fr_FR@euro ISO-8859-15
 #it_IT ISO-8859-1
 
-en_AU
-en_AU.iso88591
-en_AU.utf8
-en_CA
-en_CA.iso88591
-en_CA.utf8
-en_GB
-en_GB.iso88591
-en_GB.utf8
-en_IE
-en_IE.iso88591
-en_IE.iso885915@euro
-en_IE.utf8
-en_IE@euro
-en_IN
-en_IN.utf8
-en_US
-en_US.iso88591
-en_US.utf8
-en_ZA
-en_ZA.iso88591
-en_ZA.utf8
-
-de_AT
-de_AT.iso88591
-de_AT.iso885915@euro
-de_AT.utf8
-de_AT@euro
-de_BE
-de_BE.iso88591
-de_BE.iso885915@euro
-de_BE.utf8
-de_BE@euro
-de_CH
-de_CH.iso88591
-de_CH.utf8
-de_DE
-de_DE.iso88591
-de_DE.iso885915@euro
-de_DE.utf8
-de_DE@euro
-de_LU
-de_LU.iso88591
-de_LU.iso885915@euro
-de_LU.utf8
-de_LU@euro
-deutsch
+en_AU.UTF-8 UTF-8
+en_AU ISO-8859-1
+en_GB.UTF-8 UTF-8
+en_GB ISO-8859-1
+en_IE.UTF-8 UTF-8
+en_IE ISO-8859-1
+en_IE@euro ISO-8859-15
+en_IN UTF-8
+en_NZ.UTF-8 UTF-8
+en_NZ ISO-8859-1
+en_US.UTF-8 UTF-8
+en_US ISO-8859-1
+en_ZA.UTF-8 UTF-8
+en_ZA ISO-8859-1
 
+de_AT.UTF-8 UTF-8
+de_AT ISO-8859-1
+de_AT@euro ISO-8859-15
+de_BE.UTF-8 UTF-8
+de_BE ISO-8859-1
+de_BE@euro ISO-8859-15
+de_CH.UTF-8 UTF-8
+de_CH ISO-8859-1
+de_DE.UTF-8 UTF-8
+de_DE ISO-8859-1
+de_DE@euro ISO-8859-15
+de_LU.UTF-8 UTF-8
+de_LU ISO-8859-1
+de_LU@euro ISO-8859-15
 

diff --git a/config-archive/etc/locale.gen.1 b/config-archive/etc/locale.gen.1
new file mode 100644 (file)
index 0000000..423dcac
--- /dev/null
+++ b/config-archive/etc/locale.gen.1
@@ -0,0 +1,81 @@
+# /etc/locale.gen: list all of the locales you want to have on your system
+#
+# The format of each line:
+# <locale> <charmap>
+#
+# Where <locale> is a locale located in /usr/share/i18n/locales/ and
+# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
+#
+# All blank lines and lines starting with # are ignored.
+#
+# For the default list of supported combinations, see the file:
+# /usr/share/i18n/SUPPORTED
+#
+# Whenever glibc is emerged, the locales listed here will be automatically
+# rebuilt for you.  After updating this file, you can simply run `locale-gen`
+# yourself instead of re-emerging glibc.
+
+#en_US ISO-8859-1
+#en_US.UTF-8 UTF-8
+#ja_JP.EUC-JP EUC-JP
+#ja_JP.UTF-8 UTF-8
+#ja_JP EUC-JP
+#en_HK ISO-8859-1
+#en_PH ISO-8859-1
+#de_DE ISO-8859-1
+#de_DE@euro ISO-8859-15
+#es_MX ISO-8859-1
+#fa_IR UTF-8
+#fr_FR ISO-8859-1
+#fr_FR@euro ISO-8859-15
+#it_IT ISO-8859-1
+
+en_AU
+en_AU.iso88591
+en_AU.utf8
+en_CA
+en_CA.iso88591
+en_CA.utf8
+en_GB
+en_GB.iso88591
+en_GB.utf8
+en_IE
+en_IE.iso88591
+en_IE.iso885915@euro
+en_IE.utf8
+en_IE@euro
+en_IN
+en_IN.utf8
+en_US
+en_US.iso88591
+en_US.utf8
+en_ZA
+en_ZA.iso88591
+en_ZA.utf8
+
+de_AT
+de_AT.iso88591
+de_AT.iso885915@euro
+de_AT.utf8
+de_AT@euro
+de_BE
+de_BE.iso88591
+de_BE.iso885915@euro
+de_BE.utf8
+de_BE@euro
+de_CH
+de_CH.iso88591
+de_CH.utf8
+de_DE
+de_DE.iso88591
+de_DE.iso885915@euro
+de_DE.utf8
+de_DE@euro
+de_LU
+de_LU.iso88591
+de_LU.iso885915@euro
+de_LU.utf8
+de_LU@euro
+deutsch
+
+

diff --git a/config-archive/etc/locale.gen.dist b/config-archive/etc/locale.gen.dist
new file mode 100644 (file)
index 0000000..0786f17
--- /dev/null
+++ b/config-archive/etc/locale.gen.dist
@@ -0,0 +1,36 @@
+# /etc/locale.gen: list all of the locales you want to have on your system.
+# See the locale.gen(5) man page for more details.
+#
+# The format of each line:
+# <locale name> <charset>
+#
+# Where <locale name> starts with a name as found in /usr/share/i18n/locales/.
+# It must be unique in the file as it is used as the key to locale variables.
+# For non-default encodings, the <charset> is typically appended.
+#
+# Where <charset> is a charset located in /usr/share/i18n/charmaps/ (sans any
+# suffix like ".gz").
+#
+# All blank lines and lines starting with # are ignored.
+#
+# For the default list of supported combinations, see the file:
+# /usr/share/i18n/SUPPORTED
+#
+# Whenever glibc is emerged, the locales listed here will be automatically
+# rebuilt for you.  After updating this file, you can simply run `locale-gen`
+# yourself instead of re-emerging glibc.
+
+#en_US ISO-8859-1
+#en_US.UTF-8 UTF-8
+#ja_JP.EUC-JP EUC-JP
+#ja_JP.UTF-8 UTF-8
+#ja_JP EUC-JP
+#en_HK ISO-8859-1
+#en_PH ISO-8859-1
+#de_DE ISO-8859-1
+#de_DE@euro ISO-8859-15
+#es_MX ISO-8859-1
+#fa_IR UTF-8
+#fr_FR ISO-8859-1
+#fr_FR@euro ISO-8859-15
+#it_IT ISO-8859-1

diff --git a/config-archive/etc/locale.gen.dist.new b/config-archive/etc/locale.gen.dist.new
deleted file mode 100644 (file)
index 09ee60e..0000000
--- a/config-archive/etc/locale.gen.dist.new
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/locale.gen: list all of the locales you want to have on your system
-#
-# The format of each line:
-# <locale> <charmap>
-#
-# Where <locale> is a locale located in /usr/share/i18n/locales/ and
-# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
-#
-# All blank lines and lines starting with # are ignored.
-#
-# For the default list of supported combinations, see the file:
-# /usr/share/i18n/SUPPORTED
-#
-# Whenever glibc is emerged, the locales listed here will be automatically
-# rebuilt for you.  After updating this file, you can simply run `locale-gen`
-# yourself instead of re-emerging glibc.
-
-#en_US ISO-8859-1
-#en_US.UTF-8 UTF-8
-#ja_JP.EUC-JP EUC-JP
-#ja_JP.UTF-8 UTF-8
-#ja_JP EUC-JP
-#en_HK ISO-8859-1
-#en_PH ISO-8859-1
-#de_DE ISO-8859-1
-#de_DE@euro ISO-8859-15
-#es_MX ISO-8859-1
-#fa_IR UTF-8
-#fr_FR ISO-8859-1
-#fr_FR@euro ISO-8859-15
-#it_IT ISO-8859-1

diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf b/config-archive/etc/syslog-ng/syslog-ng.conf
index 3658890d22ca7754b00d524cee9090340eda6c7e..df8063566554146da2a7c3b9165018719540a291 100644 (file)
--- a/config-archive/etc/syslog-ng/syslog-ng.conf
+++ b/config-archive/etc/syslog-ng/syslog-ng.conf
@@ -1,5 +1,5 @@
 @version: 3.6
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
+# $Id$
 #
 # Syslog-ng default configuration file for Gentoo Linux
 

diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1
index fc91239fcb544c37ae9bdf30556c43a56fd06d8e..3658890d22ca7754b00d524cee9090340eda6c7e 100644 (file)
--- a/config-archive/etc/syslog-ng/syslog-ng.conf.1
+++ b/config-archive/etc/syslog-ng/syslog-ng.conf.1
@@ -1,5 +1,5 @@
-@version: 3.4
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
+@version: 3.6
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
 #
 # Syslog-ng default configuration file for Gentoo Linux
 

diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.2 b/config-archive/etc/syslog-ng/syslog-ng.conf.2
new file mode 100644 (file)
index 0000000..fc91239
--- /dev/null
+++ b/config-archive/etc/syslog-ng/syslog-ng.conf.2
@@ -0,0 +1,41 @@
+@version: 3.4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options { 
+       threaded(yes);
+       chain_hostnames(no); 
+
+       # The default action of syslog-ng is to log a STATS line
+       # to the file every 10 minutes.  That's pretty ugly after a while.
+       # Change it to every 12 hours so you get a nice daily update of
+       # how many messages syslog-ng missed (0).
+       stats_freq(43200); 
+       # The default action of syslog-ng is to log a MARK line
+       # to the file every 20 minutes.  That's seems high for most
+       # people so turn it down to once an hour.  Set it to zero
+       # if you don't want the functionality at all.
+       mark_freq(3600); 
+};
+
+source src {
+       system();
+       unix-stream("/dev/log");
+       internal();
+};
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };

diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist b/config-archive/etc/syslog-ng/syslog-ng.conf.dist
index 77dacb882b5e2b4b25362737478199477b73c252..d8601270312eeb21185f377376895840064f134a 100644 (file)
--- a/config-archive/etc/syslog-ng/syslog-ng.conf.dist
+++ b/config-archive/etc/syslog-ng/syslog-ng.conf.dist
@@ -1,4 +1,4 @@
-@version: 3.6
+@version: 3.7
 # $Id$
 #
 # Syslog-ng default configuration file for Gentoo Linux

diff --git a/locale.gen b/locale.gen
index b44a6ef62a6abfdb60e3ba66133852a802c51691..7b0625194d777cc6ef6061096fdf77fb76ad3286 100644 (file)
--- a/locale.gen
+++ b/locale.gen
@@ -1,10 +1,15 @@
-# /etc/locale.gen: list all of the locales you want to have on your system
+# /etc/locale.gen: list all of the locales you want to have on your system.
+# See the locale.gen(5) man page for more details.
 #
 # The format of each line:
-# <locale> <charmap>
+# <locale name> <charset>
 #
-# Where <locale> is a locale located in /usr/share/i18n/locales/ and
-# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
+# Where <locale name> starts with a name as found in /usr/share/i18n/locales/.
+# It must be unique in the file as it is used as the key to locale variables.
+# For non-default encodings, the <charset> is typically appended.
+#
+# Where <charset> is a charset located in /usr/share/i18n/charmaps/ (sans any
+# suffix like ".gz").
 #
 # All blank lines and lines starting with # are ignored.
 #

diff --git a/syslog-ng/syslog-ng.conf b/syslog-ng/syslog-ng.conf
index df8063566554146da2a7c3b9165018719540a291..afd39b29d7ad67c212a5e9902bf6cbe19ab9fb4a 100644 (file)
--- a/syslog-ng/syslog-ng.conf
+++ b/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.6
+@version: 3.7
 # $Id$
 #
 # Syslog-ng default configuration file for Gentoo Linux