saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index d50db51db82b5e6ae313de5de51a874b0a230207..1c4e033a5cfaedff552bf4f4bc48b282b71d2bce 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-03-24 19:51
+# Written by cupsd on 2017-03-25 08:12
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 2321584cac6e2b99354c90f7c1b32c45f81e096b..c1e472606b5e6378a5cb291be7698f3d3ec76ee2 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,29 +1,20 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-03-24 19:51
-NextSubscriptionId 379
-<Subscription 376>
-Events all
-Owner anonymous
-Recipient dbus://
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1490386899
-NextEventId 2
-</Subscription>
-<Subscription 377>
+# Written by cupsd on 2017-03-25 08:12
+NextSubscriptionId 381
+<Subscription 379>
 Events printer-changed
 Owner root
 LeaseDuration 86400
 Interval 60
-ExpirationTime 1490467853
+ExpirationTime 1490512333
 NextEventId 1
 </Subscription>
-<Subscription 378>
+<Subscription 380>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1490467853
+ExpirationTime 1490512333
 NextEventId 1
 </Subscription>

diff --git a/mysql/conf.d/mariadb.cnf b/mysql/conf.d/mariadb.cnf
new file mode 100644 (file)
index 0000000..b3b4fa6
--- /dev/null
+++ b/mysql/conf.d/mariadb.cnf
@@ -0,0 +1,19 @@
+# MariaDB-specific config file.
+# Read by /etc/mysql/my.cnf
+
+[client]
+# Default is Latin1, if you need UTF-8 set this (also in server section)
+#default-character-set = utf8 
+
+[mysqld]
+#
+# * Character sets
+# 
+# Default is Latin1, if you need UTF-8 set all this (also in client section)
+#
+#character-set-server  = utf8 
+#collation-server      = utf8_general_ci 
+#character_set_server   = utf8 
+#collation_server       = utf8_general_ci 
+
+# vim: filetype=dosini

diff --git a/mysql/conf.d/mysqld_safe_syslog.cnf b/mysql/conf.d/mysqld_safe_syslog.cnf
new file mode 100644 (file)
index 0000000..f49b15c
--- /dev/null
+++ b/mysql/conf.d/mysqld_safe_syslog.cnf
@@ -0,0 +1,5 @@
+[mysqld_safe]
+#skip_log_error
+#syslog
+
+# vim: filetype=dosini

diff --git a/mysql/conf.d/tokudb.cnf b/mysql/conf.d/tokudb.cnf
new file mode 100644 (file)
index 0000000..4febc7c
--- /dev/null
+++ b/mysql/conf.d/tokudb.cnf
@@ -0,0 +1,10 @@
+[mariadb]
+# See https://mariadb.com/kb/en/how-to-enable-tokudb-in-mariadb/
+# for instructions how to enable TokuDB
+#
+# See https://mariadb.com/kb/en/tokudb-differences/ for differences
+# between TokuDB in MariaDB and TokuDB from http://www.tokutek.com/
+
+plugin-load-add=ha_tokudb.so
+
+# vim: filetype=dosini

diff --git a/mysql/my.cnf b/mysql/my.cnf
deleted file mode 100644 (file)
index e33f5f2..0000000
--- a/mysql/my.cnf
+++ /dev/null
@@ -1,148 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password                                      = your_password
-port                                           = 3306
-socket                                         = /var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-prompt                                          = MySQL \u@\h:\d >\_
-
-[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log                                                = /var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server           = utf8
-default-character-set          = utf8
-user                                           = mysql
-port                                           = 3306
-socket                                                 = /var/run/mysqld/mysqld.sock
-pid-file                                       = /var/run/mysqld/mysqld.pid
-log-error                                      = /var/log/mysql/mysqld.err
-basedir                                        = /usr
-datadir                                        = /data/mysql
-skip-external-locking
-key_buffer_size                                        = 16M
-max_allowed_packet                     = 1M
-table_cache                            = 64
-table_open_cache                       = 64
-sort_buffer_size                       = 512K
-net_buffer_length                      = 16K
-read_buffer_size                       = 256K
-read_rnd_buffer_size           = 512K
-myisam_sort_buffer_size        = 8M
-lc_messages_dir                        = /usr/share/mysql
-#Set this to your desired error message language
-#lc_messages                   = en_US
-lc_messages                    = de_DE
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-#bind-address                          = 127.0.0.1
-
-log-bin
-server-id                                      = 1
-
-# point the following paths to different dedicated disks
-tmpdir                                                 = /tmp/
-#log-update                            = /path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log                                           = /tmp/mysqld.sql
-#gdb
-#debug                                         = d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir          = /var/lib/mysql/
-#innodb_log_arch_dir           = /var/lib/mysql/
-#innodb_log_group_home_dir     = /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-#loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet                     = 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size                                = 20M
-sort_buffer_size                       = 20M
-read_buffer                            = 2M
-write_buffer                           = 2M
-
-[myisamchk]
-key_buffer_size                                = 20M
-sort_buffer_size                       = 20M
-read_buffer_size                       = 2M
-write_buffer_size                      = 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-[mariadb]