From: Frank Brehm Date: Thu, 3 Sep 2015 06:08:20 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=dd4ebe333df58d24349524c818221201ed0b5bfd;p=config%2Fbruni%2Fetc.git Current state --- diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index f7d9fd6c..f4ff1004 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.31/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/conf.d/git-daemon b/conf.d/git-daemon index db77de5d..69b209ff 100644 --- a/conf.d/git-daemon +++ b/conf.d/git-daemon @@ -13,7 +13,7 @@ GITDAEMON_OPTS="--syslog --base-path=/var/git" # To run an anonymous git safely, the following user should be able to only -# read your Git repositories. It should not able able to write to anywhere on +# read your Git repositories. It should not be able to write to anywhere on # your system, esp. not the repositories. GIT_USER="nobody" GIT_GROUP="nobody" diff --git a/conf.d/pydoc-3.3 b/conf.d/pydoc-3.3 deleted file mode 100644 index 26ccb549..00000000 --- a/conf.d/pydoc-3.3 +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/init.d/pydoc.conf -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.3 2011/10/27 13:56:55 neurogeek Exp $ - -# This file contains the configuration for pydoc's internal webserver. - -# Default port for Python's pydoc server. -PYDOC3_3_PORT="7464" diff --git a/config-archive/etc/logrotate.conf.dist b/config-archive/etc/logrotate.conf.dist index 9059ce9b..b6292ec1 100644 --- a/config-archive/etc/logrotate.conf.dist +++ b/config-archive/etc/logrotate.conf.dist @@ -1,40 +1,38 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $ +# $Id$ # -# 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 4 -# create new (empty) log files after rotating old ones +# create new (empty) log files after rotating old ones. create -# 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 -# packages can drop log rotation information into this directory +# packages can drop log rotation information into this directory. include /etc/logrotate.d -# no packages own wtmp and btmp -- we'll rotate them here +# no packages own wtmp and btmp -- we'll rotate them here. /var/log/wtmp { monthly create 0664 root utmp - minsize 1M + minsize 1M rotate 1 } - /var/log/btmp { missingok monthly diff --git a/config-archive/etc/logrotate.conf.dist.new b/config-archive/etc/logrotate.conf.dist.new deleted file mode 100644 index 4a5184a1..00000000 --- a/config-archive/etc/logrotate.conf.dist.new +++ /dev/null @@ -1,43 +0,0 @@ -# $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/config-archive/etc/logrotate.d/syslog-ng b/config-archive/etc/logrotate.d/syslog-ng deleted file mode 100644 index 49cc62ec..00000000 --- a/config-archive/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,35 +0,0 @@ -# $Header: /etc/logrotate.d/.rcs/syslog-ng,v 1.1 2009/01/27 21:03:59 root Exp $ -# -# Syslog-ng logrotate snippet for Gentoo Linux -# contributed by Michael Sterrett -# - -script syslog-reload - /etc/init.d/syslog-ng reload >/dev/null || true -endscript - -rotate 10 - -/var/log/messages { - daily - olddir /var/log/old/%Y-%m - size 1024K - postrotate syslog-reload -} - -/var/log/all /var/log/debug /var/log/syslog { - daily - olddir /var/log/old/%Y-%m - size 4M - maxage 6m - postrotate syslog-reload -} - -/var/log/syslog.d/* { - daily - olddir /var/log/syslog.d/old/%Y-%m - size 1024K - maxage 1y - postrotate syslog-reload -} - diff --git a/config-archive/etc/logrotate.d/syslog-ng.1 b/config-archive/etc/logrotate.d/syslog-ng.1 new file mode 100644 index 00000000..49cc62ec --- /dev/null +++ b/config-archive/etc/logrotate.d/syslog-ng.1 @@ -0,0 +1,35 @@ +# $Header: /etc/logrotate.d/.rcs/syslog-ng,v 1.1 2009/01/27 21:03:59 root Exp $ +# +# Syslog-ng logrotate snippet for Gentoo Linux +# contributed by Michael Sterrett +# + +script syslog-reload + /etc/init.d/syslog-ng reload >/dev/null || true +endscript + +rotate 10 + +/var/log/messages { + daily + olddir /var/log/old/%Y-%m + size 1024K + postrotate syslog-reload +} + +/var/log/all /var/log/debug /var/log/syslog { + daily + olddir /var/log/old/%Y-%m + size 4M + maxage 6m + postrotate syslog-reload +} + +/var/log/syslog.d/* { + daily + olddir /var/log/syslog.d/old/%Y-%m + size 1024K + maxage 1y + postrotate syslog-reload +} + diff --git a/config-archive/etc/logrotate.d/syslog-ng.dist.new b/config-archive/etc/logrotate.d/syslog-ng.dist.new new file mode 100644 index 00000000..55bc8bce --- /dev/null +++ b/config-archive/etc/logrotate.d/syslog-ng.dist.new @@ -0,0 +1,13 @@ +# $Id$ +# +# Syslog-ng logrotate snippet for Gentoo Linux +# contributed by Michael Sterrett +# + +/var/log/messages { + missingok + sharedscripts + postrotate + systemctl kill -s HUP syslog-ng > /dev/null 2>&1 || true + endscript +} diff --git a/config-archive/etc/mysql/my.cnf b/config-archive/etc/mysql/my.cnf index e199b260..70a500e8 100644 --- a/config-archive/etc/mysql/my.cnf +++ b/config-archive/etc/mysql/my.cnf @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.1 2014/10/08 16:42:41 grknight Exp $ +# $Id$ # The following options will be passed to all MySQL clients [client] @@ -101,7 +101,6 @@ innodb_additional_mem_pool_size = 2M # 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 diff --git a/config-archive/etc/mysql/my.cnf.1 b/config-archive/etc/mysql/my.cnf.1 index 3303d7e6..19c0e325 100644 --- a/config-archive/etc/mysql/my.cnf.1 +++ b/config-archive/etc/mysql/my.cnf.1 @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.4 2014/08/28 14:06:54 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.2 2015/03/15 17:31:35 grknight Exp $ # The following options will be passed to all MySQL clients [client] @@ -59,7 +59,7 @@ max_allowed_packet = 1M table_cache = 64 table_open_cache = 64 sort_buffer_size = 512K -net_buffer_length = 8K +net_buffer_length = 16K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M @@ -81,7 +81,7 @@ 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 +# 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 ;) @@ -90,11 +90,6 @@ tmpdir = /tmp/ #debug = d:t:i:o,/tmp/mysqld.trace #one-thread -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# # 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 @@ -106,7 +101,6 @@ innodb_additional_mem_pool_size = 2M # 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 @@ -150,4 +144,3 @@ write_buffer_size = 2M [mysqlhotcopy] interactive-timeout - diff --git a/config-archive/etc/mysql/my.cnf.2 b/config-archive/etc/mysql/my.cnf.2 index e054133e..e199b260 100644 --- a/config-archive/etc/mysql/my.cnf.2 +++ b/config-archive/etc/mysql/my.cnf.2 @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.1 2014/10/08 16:42:41 grknight Exp $ # The following options will be passed to all MySQL clients [client] @@ -52,19 +52,21 @@ socket = /var/run/mysqld/mysqld.sock pid-file = /var/run/mysqld/mysqld.pid log-error = /var/log/mysql/mysqld.err basedir = /usr -#datadir = /var/lib/mysql datadir = /data/mysql skip-external-locking -key_buffer = 16M +key_buffer_size = 16M max_allowed_packet = 1M table_cache = 64 table_open_cache = 64 sort_buffer_size = 512K -net_buffer_length = 8K +net_buffer_length = 16K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M -language = /usr/share/mysql/german +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 @@ -79,7 +81,7 @@ 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 +# 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 ;) @@ -88,15 +90,6 @@ tmpdir = /tmp/ #debug = d:t:i:o,/tmp/mysqld.trace #one-thread -# uncomment the following directives if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# # 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 @@ -126,6 +119,10 @@ 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 @@ -135,16 +132,16 @@ max_allowed_packet = 16M #safe-updates [isamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M read_buffer = 2M write_buffer = 2M [myisamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M +read_buffer_size = 2M +write_buffer_size = 2M [mysqlhotcopy] interactive-timeout diff --git a/config-archive/etc/mysql/my.cnf.3 b/config-archive/etc/mysql/my.cnf.3 index 775dce06..3303d7e6 100644 --- a/config-archive/etc/mysql/my.cnf.3 +++ b/config-archive/etc/mysql/my.cnf.3 @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.4 2014/08/28 14:06:54 grknight Exp $ # The following options will be passed to all MySQL clients [client] @@ -52,10 +52,9 @@ socket = /var/run/mysqld/mysqld.sock pid-file = /var/run/mysqld/mysqld.pid log-error = /var/log/mysql/mysqld.err basedir = /usr -#datadir = /var/lib/mysql datadir = /data/mysql skip-external-locking -key_buffer = 16M +key_buffer_size = 16M max_allowed_packet = 1M table_cache = 64 table_open_cache = 64 @@ -64,7 +63,10 @@ net_buffer_length = 8K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M -language = /usr/share/mysql/german +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 @@ -88,10 +90,6 @@ tmpdir = /tmp/ #debug = d:t:i:o,/tmp/mysqld.trace #one-thread -# uncomment the following directives if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - # the following is the InnoDB configuration # if you wish to disable innodb instead # uncomment just the next line @@ -126,6 +124,10 @@ 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 @@ -135,16 +137,17 @@ max_allowed_packet = 16M #safe-updates [isamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M read_buffer = 2M write_buffer = 2M [myisamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M +read_buffer_size = 2M +write_buffer_size = 2M [mysqlhotcopy] interactive-timeout + diff --git a/config-archive/etc/mysql/my.cnf.4 b/config-archive/etc/mysql/my.cnf.4 index b324ed2c..e054133e 100644 --- a/config-archive/etc/mysql/my.cnf.4 +++ b/config-archive/etc/mysql/my.cnf.4 @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ # The following options will be passed to all MySQL clients [client] @@ -58,6 +58,7 @@ skip-external-locking key_buffer = 16M max_allowed_packet = 1M table_cache = 64 +table_open_cache = 64 sort_buffer_size = 512K net_buffer_length = 8K read_buffer_size = 256K diff --git a/config-archive/etc/mysql/my.cnf.5 b/config-archive/etc/mysql/my.cnf.5 new file mode 100644 index 00000000..775dce06 --- /dev/null +++ b/config-archive/etc/mysql/my.cnf.5 @@ -0,0 +1,150 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $ + +# 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 = /var/lib/mysql +datadir = /data/mysql +skip-external-locking +key_buffer = 16M +max_allowed_packet = 1M +table_cache = 64 +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +language = /usr/share/mysql/german + +# 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 + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# 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 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/config-archive/etc/mysql/my.cnf.6 b/config-archive/etc/mysql/my.cnf.6 new file mode 100644 index 00000000..b324ed2c --- /dev/null +++ b/config-archive/etc/mysql/my.cnf.6 @@ -0,0 +1,149 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $ + +# 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 = /var/lib/mysql +datadir = /data/mysql +skip-external-locking +key_buffer = 16M +max_allowed_packet = 1M +table_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +language = /usr/share/mysql/german + +# 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 + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# 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 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/config-archive/etc/mysql/my.cnf.dist b/config-archive/etc/mysql/my.cnf.dist index 66d710b4..78846103 100644 --- a/config-archive/etc/mysql/my.cnf.dist +++ b/config-archive/etc/mysql/my.cnf.dist @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.2 2015/03/15 17:31:35 grknight Exp $ +# $Id$ # The following options will be passed to all MySQL clients [client] @@ -95,6 +95,7 @@ innodb_buffer_pool_size = 128M # 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 @@ -138,3 +139,5 @@ write_buffer_size = 2M [mysqlhotcopy] interactive-timeout + +[mariadb] diff --git a/config-archive/etc/screenrc.dist b/config-archive/etc/screenrc.dist new file mode 100644 index 00000000..11f2f551 --- /dev/null +++ b/config-archive/etc/screenrc.dist @@ -0,0 +1,356 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# /etc/screenrc +# +# This is the system wide screenrc. +# +# You can use this file to change the default behavior of screen system wide +# or copy it to ~/.screenrc and use it as a starting point for your own +# settings. +# +# Commands in this file are used to set options, bind screen functions to +# keys, redefine terminal capabilities, and to automatically establish one or +# more windows at the beginning of your screen session. +# +# This is not a comprehensive list of options, look at the screen manual for +# details on everything that you can put in this file. +# +# + +# ============================================================================== +# SCREEN SETTINGS +# ============================================================================== + +# ESCAPE - the COMMAND CHARACTER +# =============================================================== +# escape ^aa # default +# escape ^^^^ # suggested binding (Control-^) for Emacs users + + +# PASSWORD +# =============================================================== +# This commands sets the *internal* password for the screen session. +# WARNING!! If this is set then a "lock" command will only let you in to the +# session after you enter the user's account password and then *also* +# the internal password for that session. This gives additional safety but, +# if you forget the internal password then you cannot resume your session. +# Use :password to generate a password +# password ODSJQf.4IJN7E # "1234" + + +# VARIABLES +# =============================================================== +# No annoying audible bell, using "visual bell" +# vbell on # default: off +# vbell_msg " -- Bell,Bell!! -- " # default: "Wuff,Wuff!!" + +# Automatically detach on hangup. + autodetach on # default: on + +# Don't display the copyright page + startup_message off # default: on + +# Uses nethack-style messages +# nethack on # default: off + +# Affects the copying of text regions + crlf off # default: off + +# Enable/disable multiuser mode. Standard screen operation is singleuser. +# In multiuser mode the commands acladd, aclchg, aclgrp and acldel can be used +# to enable (and disable) other user accessing this screen session. +# Requires suid-root. + multiuser off + +# Change default scrollback value for new windows + defscrollback 1000 # default: 100 + +# Define the time that all windows monitored for silence should +# wait before displaying a message. Default 30 seconds. + silencewait 15 # default: 30 + +# bufferfile: The file to use for commands +# "readbuf" ('<') and "writebuf" ('>'): + bufferfile $HOME/.screen_exchange +# +# hardcopydir: The directory which contains all hardcopies. +# hardcopydir ~/.hardcopy +# hardcopydir ~/.screen +# +# shell: Default process started in screen's windows. +# Makes it possible to use a different shell inside screen +# than is set as the default login shell. +# If begins with a '-' character, the shell will be started as a login shell. +# shell zsh +# shell bash +# shell ksh + shell -$SHELL + +# shellaka '> |tcsh' +# shelltitle '$ |bash' + +# emulate .logout message + pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended." + +# caption always " %w --- %c:%s" +# caption always "%3n %t%? @%u%?%? [%h]%?%=%c" + +# advertise hardstatus support to $TERMCAP +# termcapinfo * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\' + +# set every new windows hardstatus line to somenthing descriptive +# defhstatus "screen: ^En (^Et)" + +# don't kill window after the process died +# zombie "^[" + +# ignore displays that block on output +defnonblock on + +# XTERM TWEAKS +# =============================================================== + +# xterm understands both im/ic and doesn't have a status line. +# Note: Do not specify im and ic in the real termcap/info file as +# some programs (e.g. vi) will not work anymore. + termcap xterm* hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l + terminfo xterm* hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l + +# 80/132 column switching must be enabled for ^AW to work +# change init sequence to not switch width + termcapinfo xterm* Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l + +# Make the output buffer large for (fast) xterms. +# termcapinfo xterm* OL=10000 + termcapinfo xterm* OL=100 + +# tell screen that xterm can switch to dark background and has function +# keys. + termcapinfo xterm* 'VR=\E[?5h:VN=\E[?5l' + termcapinfo xterm* 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' + termcapinfo xterm* 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' + +# special xterm hardstatus: use the window title. + termcapinfo xterm* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' + +#terminfo xterm 'vb=\E[?5h$<200/>\E[?5l' + termcapinfo xterm* 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' + +# emulate part of the 'K' charset + termcapinfo xterm* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' + +# xterm-52 tweaks: +# - uses background color for delete operations + termcapinfo xterm* be + +# Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195) + termcapinfo xterm*|xs ti@:te=\E[2J + +# WYSE TERMINALS +# =============================================================== + +#wyse-75-42 must have flow control (xo = "terminal uses xon/xoff") +#essential to have it here, as this is a slow terminal. + termcapinfo wy75-42 xo:hs@ + +# New termcap sequences for cursor application mode. + termcapinfo wy* CS=\E[?1h:CE=\E[?1l:vi=\E[?25l:ve=\E[?25h:VR=\E[?5h:VN=\E[?5l:cb=\E[1K:CD=\E[1J + + +# OTHER TERMINALS +# =============================================================== + +# make hp700 termcap/info better + termcapinfo hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@' + +# Extend the vt100 desciption by some sequences. + termcap vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC + terminfo vt100* ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC + termcapinfo linux C8 +# old rxvt versions also need this +# termcapinfo rxvt C8 + + +# KEYBINDINGS +# ============================================================== +# The "bind" command assign keys to (internal) commands +# SCREEN checks all the keys you type; you type the key +# which is known as the "command character" then SCREEN +# eats this key, too, and checks whether this key is +# "bound" to a command. If so then SCREEN will execute it. +# +# The command "bind" allows you to chose which keys +# will be assigned to the commands. +# +# Some commands are bound to several keys - +# usually to both some letter and its corresponding +# control key combination, eg the command +# "(create) screen" is bound to both 'c' and '^C'. +# +# The following list shows the default bindings: +# +# break ^B b +# clear C +# colon : +# copy ^[ [ +# detach ^D d +# digraph ^V +# displays * +# dumptermcap . +# fit F +# flow ^F f +# focus ^I +# hardcopy h +# help ? +# history { } +# info i +# kill K k +# lastmsg ^M m +# license , +# log H +# login L +# meta x +# monitor M +# next ^@ ^N sp n +# number N +# only Q +# other ^X +# pow_break B +# pow_detach D +# prev ^H ^P p ^? +# quit \ +# readbuf < +# redisplay ^L l +# remove X +# removebuf = +# reset Z +# screen ^C c +# select " ' +# silence _ +# split S +# suspend ^Z z +# time ^T t +# title A +# vbell ^G +# version v +# width W +# windows ^W w +# wrap ^R r +# writebuf > +# xoff ^S s +# xon ^Q q +# ^] paste . +# - select - +# 0 select 0 +# 1 select 1 +# 2 select 2 +# 3 select 3 +# 4 select 4 +# 5 select 5 +# 6 select 6 +# 7 select 7 +# 8 select 8 +# 9 select 9 +# I login on +# O login off +# ] paste . +# + +# And here are the default bind commands if you need them: +# +# bind A title +# bind C clear +# bind D pow_detach +# bind F fit +# bind H log +# bind I login on +# bind K kill +# bind L login +# bind M monitor +# bind N number +# bind O login off +# bind Q only +# bind S split +# bind W width +# bind X remove +# bind Z reset + +# Let's remove some dangerous key bindings ... + bind k + bind ^k +# bind . dumptermcap # default + bind . +# bind ^\ quit # default + bind ^\ +# bind \\ quit # default + bind \\ +# bind ^h ??? # default + bind ^h +# bind h hardcopy # default + bind h + +# ... and make them better. + bind 'K' kill + bind 'I' login on + bind 'O' login off + bind '}' history + +# Yet another hack: +# Prepend/append register [/] to the paste if ^a^] is pressed. +# This lets me have autoindent mode in vi. + register [ "\033:se noai\015a" + register ] "\033:se ai\015a" + bind ^] paste [.] + + +# hardstatus alwaysignore +# hardstatus alwayslastline "%Lw" + +# Resize the current region. The space will be removed from or added to +# the region below or if there's not enough space from the region above. + bind = resize = + bind + resize +3 + bind - resize -3 +# bind _ resize max +# +# attrcolor u "-u b" +# attrcolor b "R" + +# STARTUP SCREENS +# =============================================================== +# Defines the time screen delays a new message when one message +# is currently displayed. The default is 1 second. +# msgminwait 2 + +# Time a message is displayed if screen is not disturbed by +# other activity. The dafault is 5 seconds: +# msgwait 2 + +# Briefly show the version number of this starting +# screen session - but only for *one* second: +# msgwait 1 +# version + +# Welcome the user: +# echo "welcome :-)" +# echo "I love you today." + +# Uncomment one/some following lines to automatically let +# SCREEN start some programs in the given window numbers: +# screen -t MAIL 0 mutt +# screen -t EDIT 1 vim +# screen -t GOOGLE 2 links http://www.google.com +# screen -t NEWS 3 slrn +# screen -t WWW 4 links http://www.math.fu-berlin.de/~guckes/ +# screen 5 +# screen 6 + +# Set the environment variable var to value string. If only var is specified, +# you'll be prompted to enter a value. If no parameters are specified, +# you'll be prompted for both variable and value. The environment is +# inherited by all subsequently forked shells. +# setenv PROMPT_COMMAND 'echo -n -e "\033k\033\134"' + +# Don't you want to start programs which need a DISPLAY ? +# setenv DISPLAY '' diff --git a/config-archive/etc/screenrc.dist.new b/config-archive/etc/screenrc.dist.new deleted file mode 100644 index 02e63bf6..00000000 --- a/config-archive/etc/screenrc.dist.new +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# /etc/screenrc -# -# This is the system wide screenrc. -# -# You can use this file to change the default behavior of screen system wide -# or copy it to ~/.screenrc and use it as a starting point for your own -# settings. -# -# Commands in this file are used to set options, bind screen functions to -# keys, redefine terminal capabilities, and to automatically establish one or -# more windows at the beginning of your screen session. -# -# This is not a comprehensive list of options, look at the screen manual for -# details on everything that you can put in this file. -# -# - -# ============================================================================== -# SCREEN SETTINGS -# ============================================================================== - -# ESCAPE - the COMMAND CHARACTER -# =============================================================== -# escape ^aa # default -# escape ^^^^ # suggested binding (Control-^) for Emacs users - - -# PASSWORD -# =============================================================== -# This commands sets the *internal* password for the screen session. -# WARNING!! If this is set then a "lock" command will only let you in to the -# session after you enter the user's account password and then *also* -# the internal password for that session. This gives additional safety but, -# if you forget the internal password then you cannot resume your session. -# Use :password to generate a password -# password ODSJQf.4IJN7E # "1234" - - -# VARIABLES -# =============================================================== -# No annoying audible bell, using "visual bell" -# vbell on # default: off -# vbell_msg " -- Bell,Bell!! -- " # default: "Wuff,Wuff!!" - -# Automatically detach on hangup. - autodetach on # default: on - -# Don't display the copyright page - startup_message off # default: on - -# Uses nethack-style messages -# nethack on # default: off - -# Affects the copying of text regions - crlf off # default: off - -# Enable/disable multiuser mode. Standard screen operation is singleuser. -# In multiuser mode the commands acladd, aclchg, aclgrp and acldel can be used -# to enable (and disable) other user accessing this screen session. -# Requires suid-root. - multiuser off - -# Change default scrollback value for new windows - defscrollback 1000 # default: 100 - -# Define the time that all windows monitored for silence should -# wait before displaying a message. Default 30 seconds. - silencewait 15 # default: 30 - -# bufferfile: The file to use for commands -# "readbuf" ('<') and "writebuf" ('>'): - bufferfile $HOME/.screen_exchange -# -# hardcopydir: The directory which contains all hardcopies. -# hardcopydir ~/.hardcopy -# hardcopydir ~/.screen -# -# shell: Default process started in screen's windows. -# Makes it possible to use a different shell inside screen -# than is set as the default login shell. -# If begins with a '-' character, the shell will be started as a login shell. -# shell zsh -# shell bash -# shell ksh - shell -$SHELL - -# shellaka '> |tcsh' -# shelltitle '$ |bash' - -# emulate .logout message - pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended." - -# caption always " %w --- %c:%s" -# caption always "%3n %t%? @%u%?%? [%h]%?%=%c" - -# advertise hardstatus support to $TERMCAP -# termcapinfo * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\' - -# set every new windows hardstatus line to somenthing descriptive -# defhstatus "screen: ^En (^Et)" - -# don't kill window after the process died -# zombie "^[" - -# ignore displays that block on output -defnonblock on - -# XTERM TWEAKS -# =============================================================== - -# xterm understands both im/ic and doesn't have a status line. -# Note: Do not specify im and ic in the real termcap/info file as -# some programs (e.g. vi) will not work anymore. - termcap xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l - terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l - -# 80/132 column switching must be enabled for ^AW to work -# change init sequence to not switch width - termcapinfo xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l - -# Make the output buffer large for (fast) xterms. -# termcapinfo xterm* OL=10000 - termcapinfo xterm* OL=100 - -# tell screen that xterm can switch to dark background and has function -# keys. - termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l' - termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' - termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' - -# special xterm hardstatus: use the window title. - termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' - -#terminfo xterm 'vb=\E[?5h$<200/>\E[?5l' - termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' - -# emulate part of the 'K' charset - termcapinfo xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' - -# xterm-52 tweaks: -# - uses background color for delete operations - termcapinfo xterm* be - -# Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195) - termcapinfo xterm|xterms|xs ti@:te=\E[2J - -# WYSE TERMINALS -# =============================================================== - -#wyse-75-42 must have flow control (xo = "terminal uses xon/xoff") -#essential to have it here, as this is a slow terminal. - termcapinfo wy75-42 xo:hs@ - -# New termcap sequences for cursor application mode. - termcapinfo wy* CS=\E[?1h:CE=\E[?1l:vi=\E[?25l:ve=\E[?25h:VR=\E[?5h:VN=\E[?5l:cb=\E[1K:CD=\E[1J - - -# OTHER TERMINALS -# =============================================================== - -# make hp700 termcap/info better - termcapinfo hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@' - -# Extend the vt100 desciption by some sequences. - termcap vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC - terminfo vt100* ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC - termcapinfo linux C8 -# old rxvt versions also need this -# termcapinfo rxvt C8 - - -# KEYBINDINGS -# ============================================================== -# The "bind" command assign keys to (internal) commands -# SCREEN checks all the keys you type; you type the key -# which is known as the "command character" then SCREEN -# eats this key, too, and checks whether this key is -# "bound" to a command. If so then SCREEN will execute it. -# -# The command "bind" allows you to chose which keys -# will be assigned to the commands. -# -# Some commands are bound to several keys - -# usually to both some letter and its corresponding -# control key combination, eg the command -# "(create) screen" is bound to both 'c' and '^C'. -# -# The following list shows the default bindings: -# -# break ^B b -# clear C -# colon : -# copy ^[ [ -# detach ^D d -# digraph ^V -# displays * -# dumptermcap . -# fit F -# flow ^F f -# focus ^I -# hardcopy h -# help ? -# history { } -# info i -# kill K k -# lastmsg ^M m -# license , -# log H -# login L -# meta x -# monitor M -# next ^@ ^N sp n -# number N -# only Q -# other ^X -# pow_break B -# pow_detach D -# prev ^H ^P p ^? -# quit \ -# readbuf < -# redisplay ^L l -# remove X -# removebuf = -# reset Z -# screen ^C c -# select " ' -# silence _ -# split S -# suspend ^Z z -# time ^T t -# title A -# vbell ^G -# version v -# width W -# windows ^W w -# wrap ^R r -# writebuf > -# xoff ^S s -# xon ^Q q -# ^] paste . -# - select - -# 0 select 0 -# 1 select 1 -# 2 select 2 -# 3 select 3 -# 4 select 4 -# 5 select 5 -# 6 select 6 -# 7 select 7 -# 8 select 8 -# 9 select 9 -# I login on -# O login off -# ] paste . -# - -# And here are the default bind commands if you need them: -# -# bind A title -# bind C clear -# bind D pow_detach -# bind F fit -# bind H log -# bind I login on -# bind K kill -# bind L login -# bind M monitor -# bind N number -# bind O login off -# bind Q only -# bind S split -# bind W width -# bind X remove -# bind Z reset - -# Let's remove some dangerous key bindings ... - bind k - bind ^k -# bind . dumptermcap # default - bind . -# bind ^\ quit # default - bind ^\ -# bind \\ quit # default - bind \\ -# bind ^h ??? # default - bind ^h -# bind h hardcopy # default - bind h - -# ... and make them better. - bind 'K' kill - bind 'I' login on - bind 'O' login off - bind '}' history - -# Yet another hack: -# Prepend/append register [/] to the paste if ^a^] is pressed. -# This lets me have autoindent mode in vi. - register [ "\033:se noai\015a" - register ] "\033:se ai\015a" - bind ^] paste [.] - - -# hardstatus alwaysignore -# hardstatus alwayslastline "%Lw" - -# Resize the current region. The space will be removed from or added to -# the region below or if there's not enough space from the region above. - bind = resize = - bind + resize +3 - bind - resize -3 -# bind _ resize max -# -# attrcolor u "-u b" -# attrcolor b "R" - -# STARTUP SCREENS -# =============================================================== -# Defines the time screen delays a new message when one message -# is currently displayed. The default is 1 second. -# msgminwait 2 - -# Time a message is displayed if screen is not disturbed by -# other activity. The dafault is 5 seconds: -# msgwait 2 - -# Briefly show the version number of this starting -# screen session - but only for *one* second: -# msgwait 1 -# version - -# Welcome the user: -# echo "welcome :-)" -# echo "I love you today." - -# Uncomment one/some following lines to automatically let -# SCREEN start some programs in the given window numbers: -# screen -t MAIL 0 mutt -# screen -t EDIT 1 vim -# screen -t GOOGLE 2 links http://www.google.com -# screen -t NEWS 3 slrn -# screen -t WWW 4 links http://www.math.fu-berlin.de/~guckes/ -# screen 5 -# screen 6 - -# Set the environment variable var to value string. If only var is specified, -# you'll be prompted to enter a value. If no parameters are specified, -# you'll be prompted for both variable and value. The environment is -# inherited by all subsequently forked shells. -# setenv PROMPT_COMMAND 'echo -n -e "\033k\033\134"' - -# Don't you want to start programs which need a DISPLAY ? -# setenv DISPLAY '' diff --git a/config-archive/etc/smartd.conf b/config-archive/etc/smartd.conf index 80214991..806328c6 100644 --- a/config-archive/etc/smartd.conf +++ b/config-archive/etc/smartd.conf @@ -2,7 +2,7 @@ # Home page is: http://smartmontools.sourceforge.net -# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ +# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ # smartd will re-read the configuration file if it receives a HUP # signal @@ -40,6 +40,7 @@ #/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03) /dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) /dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +/dev/sdc -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) #/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) # Monitor SMART status, ATA Error Log, Self-test log, and track @@ -86,10 +87,11 @@ #/dev/twa0 -d 3ware,1 -a -s L/../../2/03 # Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which -# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays +# uses the 3w-sas driver (Linux). Start long self-tests Tuesdays # between 1-2 and 3-4 am. +# On FreeBSD /dev/tws0 should be used instead #/dev/twl0 -d 3ware,0 -a -s L/../../2/01 -#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 +#/dev/twl0 -d 3ware,1 -a -s L/../../2/03 # Same as above for Windows. Option '-d 3ware,N' is not necessary, # disk (port) number is specified in device name. diff --git a/config-archive/etc/smartd.conf.1 b/config-archive/etc/smartd.conf.1 new file mode 100644 index 00000000..80214991 --- /dev/null +++ b/config-archive/etc/smartd.conf.1 @@ -0,0 +1,147 @@ +# Sample configuration file for smartd. See man smartd.conf. + +# Home page is: http://smartmontools.sourceforge.net + +# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ + +# smartd will re-read the configuration file if it receives a HUP +# signal + +# The file gives a list of devices to monitor using smartd, with one +# device per line. Text after a hash (#) is ignored, and you may use +# spaces and tabs for white space. You may use '\' to continue lines. + +# You can usually identify which hard disks are on your system by +# looking in /proc/ide and in /proc/scsi. + +# The word DEVICESCAN will cause any remaining lines in this +# configuration file to be ignored: it tells smartd to scan for all +# ATA and SCSI devices. DEVICESCAN may be followed by any of the +# Directives listed below, which will be applied to all devices that +# are found. Most users should comment out DEVICESCAN and explicitly +# list the devices that they wish to monitor. +#DEVICESCAN + +# Alternative setting to ignore temperature and power-on hours reports +# in syslog. +#DEVICESCAN -I 194 -I 231 -I 9 + +# Alternative setting to report more useful raw temperature in syslog. +#DEVICESCAN -R 194 -R 231 -I 9 + +# Alternative setting to report raw temperature changes >= 5 Celsius +# and min/max temperatures. +#DEVICESCAN -I 194 -I 231 -I 9 -W 5 + +# First (primary) ATA/IDE hard disk. Monitor all attributes, enable +# automatic online data collection, automatic Attribute autosave, and +# start a short self-test every day between 2-3am, and a long self test +# Saturdays between 3-4am. +#/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03) +/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +/dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +#/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) + +# Monitor SMART status, ATA Error Log, Self-test log, and track +# changes in all attributes except for attribute 194 +#/dev/hdb -H -l error -l selftest -t -I 194 + +# Monitor all attributes except normalized Temperature (usually 194), +# but track Temperature changes >= 4 Celsius, report Temperatures +# >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). +# Send mail on SMART failures or when Temperature is >= 55 Celsius. +#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com + +# An ATA disk may appear as a SCSI device to the OS. If a SCSI to +# ATA Translation (SAT) layer is between the OS and the device then +# this can be flagged with the '-d sat' option. This situation may +# become common with SATA disks in SAS and FC environments. +# /dev/sda -a -d sat + +# A very silent check. Only report SMART health status if it fails +# But send an email in this case +#/dev/hdc -H -C 0 -U 0 -m admin@example.com + +# First two SCSI disks. This will monitor everything that smartd can +# monitor. Start extended self-tests Wednesdays between 6-7pm and +# Sundays between 1-2 am +#/dev/sda -d scsi -s L/../../3/18 +#/dev/sdb -d scsi -s L/../../7/01 + +# Monitor 4 ATA disks connected to a 3ware 6/7/8000 controller which uses +# the 3w-xxxx driver. Start long self-tests Sundays between 1-2, 2-3, 3-4, +# and 4-5 am. +# NOTE: starting with the Linux 2.6 kernel series, the /dev/sdX interface +# is DEPRECATED. Use the /dev/tweN character device interface instead. +# For example /dev/twe0, /dev/twe1, and so on. +#/dev/sdc -d 3ware,0 -a -s L/../../7/01 +#/dev/sdc -d 3ware,1 -a -s L/../../7/02 +#/dev/sdc -d 3ware,2 -a -s L/../../7/03 +#/dev/sdc -d 3ware,3 -a -s L/../../7/04 + +# Monitor 2 ATA disks connected to a 3ware 9000 controller which +# uses the 3w-9xxx driver (Linux, FreeBSD). Start long self-tests Tuesdays +# between 1-2 and 3-4 am. +#/dev/twa0 -d 3ware,0 -a -s L/../../2/01 +#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 + +# Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which +# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays +# between 1-2 and 3-4 am. +#/dev/twl0 -d 3ware,0 -a -s L/../../2/01 +#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 + +# Same as above for Windows. Option '-d 3ware,N' is not necessary, +# disk (port) number is specified in device name. +# NOTE: On Windows, DEVICESCAN works also for 3ware controllers. +#/dev/hdc,0 -a -s L/../../2/01 +#/dev/hdc,1 -a -s L/../../2/03 + +# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long +# self-tests Sundays between 1-2, 2-3, and 3-4 am. +#/dev/sdd -d hpt,1/1 -a -s L/../../7/01 +#/dev/sdd -d hpt,1/2 -a -s L/../../7/02 +#/dev/sdd -d hpt,1/3 -a -s L/../../7/03 + +# Monitor 2 ATA disks connected to the same PMPort which connected to the +# HighPoint RocketRAID. Start long self-tests Tuesdays between 1-2 and 3-4 am +#/dev/sdd -d hpt,1/4/1 -a -s L/../../2/01 +#/dev/sdd -d hpt,1/4/2 -a -s L/../../2/03 + +# HERE IS A LIST OF DIRECTIVES FOR THIS CONFIGURATION FILE. +# PLEASE SEE THE smartd.conf MAN PAGE FOR DETAILS +# +# -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N, hpt,L/M/N +# -T TYPE set the tolerance to one of: normal, permissive +# -o VAL Enable/disable automatic offline tests (on/off) +# -S VAL Enable/disable attribute autosave (on/off) +# -n MODE No check. MODE is one of: never, sleep, standby, idle +# -H Monitor SMART Health Status, report if failed +# -l TYPE Monitor SMART log. Type is one of: error, selftest +# -f Monitor for failure of any 'Usage' Attributes +# -m ADD Send warning email to ADD for -H, -l error, -l selftest, and -f +# -M TYPE Modify email warning behavior (see man page) +# -s REGE Start self-test when type/date matches regular expression (see man page) +# -p Report changes in 'Prefailure' Normalized Attributes +# -u Report changes in 'Usage' Normalized Attributes +# -t Equivalent to -p and -u Directives +# -r ID Also report Raw values of Attribute ID with -p, -u or -t +# -R ID Track changes in Attribute ID Raw value with -p, -u or -t +# -i ID Ignore Attribute ID for -f Directive +# -I ID Ignore Attribute ID for -p, -u or -t Directive +# -C ID Report if Current Pending Sector count non-zero +# -U ID Report if Offline Uncorrectable count non-zero +# -W D,I,C Monitor Temperature D)ifference, I)nformal limit, C)ritical limit +# -v N,ST Modifies labeling of Attribute N (see man page) +# -a Default: equivalent to -H -f -t -l error -l selftest -C 197 -U 198 +# -F TYPE Use firmware bug workaround. Type is one of: none, samsung +# -P TYPE Drive-specific presets: use, ignore, show, showall +# # Comment: text after a hash sign is ignored +# \ Line continuation character +# Attribute ID is a decimal integer 1 <= ID <= 255 +# except for -C and -U, where ID = 0 turns them off. +# All but -d, -m and -M Directives are only implemented for ATA devices +# +# If the test string DEVICESCAN is the first uncommented text +# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z] +# DEVICESCAN may be followed by any desired Directives. diff --git a/config-archive/etc/smartd.conf.dist b/config-archive/etc/smartd.conf.dist index 5ef85b1b..40fa10ec 100644 --- a/config-archive/etc/smartd.conf.dist +++ b/config-archive/etc/smartd.conf.dist @@ -2,7 +2,7 @@ # Home page is: http://smartmontools.sourceforge.net -# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ +# $Id: smartd.conf 4047 2015-03-22 16:16:24Z chrfranke $ # smartd will re-read the configuration file if it receives a HUP # signal @@ -33,21 +33,21 @@ DEVICESCAN # and min/max temperatures. #DEVICESCAN -I 194 -I 231 -I 9 -W 5 -# First (primary) ATA/IDE hard disk. Monitor all attributes, enable +# First ATA/SATA or SCSI/SAS disk. Monitor all attributes, enable # automatic online data collection, automatic Attribute autosave, and # start a short self-test every day between 2-3am, and a long self test # Saturdays between 3-4am. -#/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03) +#/dev/sda -a -o on -S on -s (S/../.././02|L/../../6/03) # Monitor SMART status, ATA Error Log, Self-test log, and track # changes in all attributes except for attribute 194 -#/dev/hdb -H -l error -l selftest -t -I 194 +#/dev/sdb -H -l error -l selftest -t -I 194 # Monitor all attributes except normalized Temperature (usually 194), # but track Temperature changes >= 4 Celsius, report Temperatures # >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). # Send mail on SMART failures or when Temperature is >= 55 Celsius. -#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com +#/dev/sdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com # An ATA disk may appear as a SCSI device to the OS. If a SCSI to # ATA Translation (SAT) layer is between the OS and the device then @@ -57,7 +57,7 @@ DEVICESCAN # A very silent check. Only report SMART health status if it fails # But send an email in this case -#/dev/hdc -H -C 0 -U 0 -m admin@example.com +#/dev/sdc -H -C 0 -U 0 -m admin@example.com # First two SCSI disks. This will monitor everything that smartd can # monitor. Start extended self-tests Wednesdays between 6-7pm and @@ -141,5 +141,5 @@ DEVICESCAN # All but -d, -m and -M Directives are only implemented for ATA devices # # If the test string DEVICESCAN is the first uncommented text -# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z] +# then smartd will scan for devices. # DEVICESCAN may be followed by any desired Directives. diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf b/config-archive/etc/syslog-ng/syslog-ng.conf index 7bdc55cd..0f1001a0 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf +++ b/config-archive/etc/syslog-ng/syslog-ng.conf @@ -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.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1 index 20e93366..7bdc55cd 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.1 +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.1 @@ -1,10 +1,13 @@ -@version: 3.2 -# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $ +@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 { - long_hostnames(off); + threaded(yes); chain_hostnames(no); flush_lines(0); @@ -25,6 +28,7 @@ options { source src { unix-stream("/dev/log" max-connections(256)); + system(); internal(); file("/proc/kmsg"); #udp(); diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.2 b/config-archive/etc/syslog-ng/syslog-ng.conf.2 index 45827938..20e93366 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.2 +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.2 @@ -18,20 +18,23 @@ options { # 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); + + frac_digits(3); + ts_format(iso); }; source src { unix-stream("/dev/log" max-connections(256)); internal(); file("/proc/kmsg"); - udp(); + #udp(); }; ######################################################### # Logging-Ziele destination d_syslog { file("/var/log/syslog"); }; -destination d_fac { file("/var/log/facility/$FACILITY"); }; +destination d_fac { file("/var/log/syslog.d/$FACILITY"); }; destination d_debug { file("/var/log/debug"); }; destination d_all { file("/var/log/all"); }; destination d_messages { file("/var/log/messages"); }; @@ -50,6 +53,13 @@ destination d_console_12 { file("/dev/tty12"); }; #destination d_xconsole { pipe("/dev/xconsole"); }; destination d_xconsole { pipe("/dev/console"); }; +# 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"); }; + ######################################################### # Filter-Definitionen @@ -83,12 +93,5 @@ log { source(src); filter(f_syslog); destination(d_syslog); }; log { source(src); filter(f_debug); destination(d_debug); }; log { source(src); destination(d_all); }; -# 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.3 b/config-archive/etc/syslog-ng/syslog-ng.conf.3 new file mode 100644 index 00000000..45827938 --- /dev/null +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.3 @@ -0,0 +1,94 @@ +@version: 3.2 +# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $ +# +# Syslog-ng default configuration file for Gentoo Linux + +options { + long_hostnames(off); + chain_hostnames(no); + flush_lines(0); + + # 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 { + unix-stream("/dev/log" max-connections(256)); + internal(); + file("/proc/kmsg"); + udp(); +}; + +######################################################### +# Logging-Ziele + +destination d_syslog { file("/var/log/syslog"); }; +destination d_fac { file("/var/log/facility/$FACILITY"); }; +destination d_debug { file("/var/log/debug"); }; +destination d_all { file("/var/log/all"); }; +destination d_messages { file("/var/log/messages"); }; + +destination d_console { usertty("root"); }; +destination d_console_all { usertty("*"); }; +#destination loghost { udp("loghost" port(999)); }; + +# By default messages are logged to tty12... +destination d_console_12 { 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"); }; + +#destination d_xconsole { pipe("/dev/xconsole"); }; +destination d_xconsole { pipe("/dev/console"); }; + +######################################################### +# Filter-Definitionen + +filter f_syslog { not facility(authpriv, mail); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..emerg) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_warnings { level(warn..emerg) + and not facility( mail, news); }; + +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_alarm { level(crit, alert); }; + +######################################################## +# Log-Definitionen + +log { source(src); destination(d_fac); }; + +log { source(src); filter(f_messages); destination(d_messages); }; +#log { source(src); filter(f_messages); destination(d_xconsole); }; +log { source(src); filter(f_warnings); destination(d_console_12); }; +log { source(src); filter(f_alarm); destination(d_console); }; +log { source(src); filter(f_emergency); destination(d_console_all); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); destination(d_all); }; + +# 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 fed10b1b..77dacb88 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.dist +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.dist @@ -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/csh.env b/csh.env index 8076e5b7..94f2e1a4 100644 --- a/csh.env +++ b/csh.env @@ -12,7 +12,7 @@ setenv GCC_SPECS '' setenv GSETTINGS_BACKEND 'dconf' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' +setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' setenv JAVACC_HOME '/usr/share/javacc/' setenv LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -30,17 +30,16 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' -setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin:/usr/games/bin' +setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin:/usr/games/bin' setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so:/usr/bin/evolution' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.8/html/library' -setenv PYTHONDOCS_3_3 '/usr/share/doc/python-docs-3.3.2/html/library' setenv QT_GRAPHICSSYSTEM 'raster' setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins' -setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin' +setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin' setenv R_HOME '/usr/lib64/R' setenv VBOX_APP_HOME '/usr/lib64/virtualbox' setenv XDG_CONFIG_DIRS '/etc/xdg' diff --git a/cups/printers.conf b/cups/printers.conf index 1a39f866..0a2ae666 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v2.0.3 -# Written by cupsd on 2015-08-26 08:21 +# Written by cupsd on 2015-09-01 20:18 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 83ae345f..54b3506b 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ # Subscription configuration file for CUPS v2.0.3 -# Written by cupsd on 2015-08-29 18:42 -NextSubscriptionId 224 +# Written by cupsd on 2015-09-02 20:18 +NextSubscriptionId 225 diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index 4c395953..f43f5873 100644 --- a/env.d/04gcc-x86_64-pc-linux-gnu +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -1,6 +1,6 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4" +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5" GCC_SPECS="" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info" MULTIOSDIRS="../lib64:../lib32" diff --git a/env.d/60python-docs-3.3 b/env.d/60python-docs-3.3 deleted file mode 100644 index a868263f..00000000 --- a/env.d/60python-docs-3.3 +++ /dev/null @@ -1 +0,0 @@ -PYTHONDOCS_3_3="/usr/share/doc/python-docs-3.3.2/html/library" diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE index cdceeda8..106fefd3 120000 --- a/env.d/gcc/.NATIVE +++ b/env.d/gcc/.NATIVE @@ -1 +1 @@ -x86_64-pc-linux-gnu-4.8.4 \ No newline at end of file +x86_64-pc-linux-gnu-4.8.5 \ No newline at end of file diff --git a/env.d/gcc/config-x86_64-pc-linux-gnu b/env.d/gcc/config-x86_64-pc-linux-gnu index a52a537d..4b9db179 100644 --- a/env.d/gcc/config-x86_64-pc-linux-gnu +++ b/env.d/gcc/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=x86_64-pc-linux-gnu-4.8.4 +CURRENT=x86_64-pc-linux-gnu-4.8.5 diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.8.4 b/env.d/gcc/x86_64-pc-linux-gnu-4.8.4 deleted file mode 100644 index 5c741acb..00000000 --- a/env.d/gcc/x86_64-pc-linux-gnu-4.8.4 +++ /dev/null @@ -1,8 +0,0 @@ -LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4:/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/32" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info" -STDCXX_INCDIR="g++-v4" -CTARGET="x86_64-pc-linux-gnu" -GCC_SPECS="" -MULTIOSDIRS="../lib64:../lib32" -GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4" diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.8.5 b/env.d/gcc/x86_64-pc-linux-gnu-4.8.5 new file mode 100644 index 00000000..195d1d04 --- /dev/null +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.8.5 @@ -0,0 +1,8 @@ +LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5:/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5/32" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info" +STDCXX_INCDIR="g++-v4" +CTARGET="x86_64-pc-linux-gnu" +GCC_SPECS="" +MULTIOSDIRS="../lib64:../lib32" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 504c40de..8554247b 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2950,39 +2950,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3055,9 +3055,9 @@ - - - + + + @@ -20303,13 +20303,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20317,7 +20317,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -20325,13 +20325,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20339,7 +20339,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -20347,13 +20347,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20361,7 +20361,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -20369,13 +20369,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20383,7 +20383,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -20391,13 +20391,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20405,7 +20405,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -20413,13 +20413,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20427,7 +20427,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -20435,13 +20435,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20449,7 +20449,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20735,13 +20735,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20749,7 +20749,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. diff --git a/init.d/cpupower b/init.d/cpupower index 789945b0..e209c05e 100755 --- a/init.d/cpupower +++ b/init.d/cpupower @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/files/init.d-r4,v 1.1 2013/12/25 11:46:32 ssuominen Exp $ +# $Id$ CPUFREQ_SYSFS=/sys/devices/system/cpu/cpufreq diff --git a/init.d/git-daemon b/init.d/git-daemon index ee9a64e3..b6ecfd9c 100755 --- a/init.d/git-daemon +++ b/init.d/git-daemon @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.4 2014/03/03 19:21:29 polynomial-c Exp $ +# $Id$ pidfile="/var/run/git-daemon.pid" command="/usr/bin/git" diff --git a/init.d/ip6tables b/init.d/ip6tables index a63d0768..440e840c 100755 --- a/init.d/ip6tables +++ b/init.d/ip6tables @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $ +# $Id$ extra_commands="check save panic" extra_started_commands="reload" diff --git a/init.d/iptables b/init.d/iptables index a63d0768..440e840c 100755 --- a/init.d/iptables +++ b/init.d/iptables @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $ +# $Id$ extra_commands="check save panic" extra_started_commands="reload" diff --git a/init.d/kmod-static-nodes b/init.d/kmod-static-nodes index dcbf6793..379cbb13 100755 --- a/init.d/kmod-static-nodes +++ b/init.d/kmod-static-nodes @@ -1,14 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/kmod-static-nodes-r1,v 1.1 2014/07/11 12:28:07 ssuominen Exp $ +# $Id$ description="Create list of required static device nodes for the current kernel" depend() { after dev-mount before tmpfiles.dev dev - keyword -lxc + keyword -lxc -systemd-nspawn } start() { diff --git a/init.d/lxc b/init.d/lxc index e1ae34be..c9ef9991 100755 --- a/init.d/lxc +++ b/init.d/lxc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.3 2015/06/13 11:54:25 hwoarang Exp $ +# $Id$ CONTAINER=${SVCNAME#*.} diff --git a/init.d/named b/init.d/named index 7f495532..a320d34f 100755 --- a/init.d/named +++ b/init.d/named @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r13,v 1.1 2014/01/31 21:24:49 idl0r Exp $ +# $Id$ extra_commands="checkconfig checkzones" extra_started_commands="reload" diff --git a/init.d/pciparm b/init.d/pciparm index 705b647e..d7973bf8 100755 --- a/init.d/pciparm +++ b/init.d/pciparm @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.3 2008/10/11 02:47:50 robbat2 Exp $ +# $Id$ depend() { before bootmisc hdparm diff --git a/init.d/pydoc-3.3 b/init.d/pydoc-3.3 deleted file mode 100755 index 95c40e50..00000000 --- a/init.d/pydoc-3.3 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public Licence v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.5 2014/10/12 12:37:07 djc Exp $ - -start() { - local pydoc_port="${PYDOC3_3_PORT-${PYDOC_PORT}}" - - if [ -z "${pydoc_port}" ]; then - eerror "Port not set" - return 1 - fi - - ebegin "Starting pydoc server on port ${pydoc_port}" - start-stop-daemon --start --background --make-pidfile \ - --pidfile /var/run/pydoc3.3.pid \ - --exec /usr/bin/pydoc3.3 -- -p "${pydoc_port}" - eend $? -} - -stop() { - ebegin "Stopping pydoc server" - start-stop-daemon --stop --quiet --pidfile /var/run/pydoc3.3.pid - eend $? -} diff --git a/init.d/smartd b/init.d/smartd index d6273e6b..336bc4ea 100755 --- a/init.d/smartd +++ b/init.d/smartd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd-r1.rc,v 1.1 2014/08/09 09:36:30 polynomial-c Exp $ +# $Id$ pidfile="/run/smartd.pid" command="/usr/sbin/smartd" diff --git a/init.d/sshd b/init.d/sshd index 80f1b7ee..34e19706 100755 --- a/init.d/sshd +++ b/init.d/sshd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.5 2015/05/04 02:56:25 vapier Exp $ +# $Id$ extra_commands="checkconfig" extra_started_commands="reload" diff --git a/init.d/svnserve b/init.d/svnserve index 2a4fd4b0..1236cf56 100755 --- a/init.d/svnserve +++ b/init.d/svnserve @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $ +# $Id$ description="svn server" pidfile="/var/run/svnserve.pid" diff --git a/init.d/syslog-ng b/init.d/syslog-ng index 8242c2bc..88ca55f6 100755 --- a/init.d/syslog-ng +++ b/init.d/syslog-ng @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.2 2014/12/18 19:51:36 mr_bones_ Exp $ +# $Id$ SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} @@ -42,7 +42,7 @@ start_pre() { checkpath \ -d \ --mode 0700 \ - --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \ + --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \ "${SYSLOG_NG_STATEFILE_DIR}" } diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf index 68a046e9..0af24b8a 100644 --- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf +++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf @@ -1,2 +1,2 @@ -/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/32 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5/32 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5 diff --git a/libnl/pktloc b/libnl/pktloc index 505c44e6..8559161b 100644 --- a/libnl/pktloc +++ b/libnl/pktloc @@ -58,7 +58,7 @@ tcp.flag.urg u8 tcp+13 0x20 5 tcp.flag.ack u8 tcp+13 0x10 4 tcp.flag.psh u8 tcp+13 0x08 3 tcp.flag.rst u8 tcp+13 0x04 2 -tpc.flag.syn u8 tcp+13 0x02 1 +tcp.flag.syn u8 tcp+13 0x02 1 tcp.flag.fin u8 tcp+13 0x01 tcp.win u16 tcp+14 diff --git a/logrotate.conf b/logrotate.conf index b6b141a4..dae12730 100644 --- a/logrotate.conf +++ b/logrotate.conf @@ -1,10 +1,9 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $ +# $Id$ # -# 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 @@ -12,12 +11,12 @@ weekly rotate 10 maxage 2y -# 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 # do not rotate, if the file is empty @@ -32,17 +31,16 @@ missingok #nomail noolddir -# packages can drop log rotation information into this directory +# packages can drop log rotation information into this directory. include /etc/logrotate.d -# no packages own wtmp and btmp -- we'll rotate them here +# no packages own wtmp and btmp -- we'll rotate them here. /var/log/wtmp { monthly create 0664 root utmp rotate 12 size=4096K } - /var/log/btmp { missingok monthly diff --git a/mysql/my.cnf b/mysql/my.cnf index 19c0e325..f20db312 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.2 2015/03/15 17:31:35 grknight Exp $ +# $Id$ # The following options will be passed to all MySQL clients [client] @@ -101,6 +101,7 @@ innodb_additional_mem_pool_size = 2M # 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 @@ -144,3 +145,5 @@ write_buffer_size = 2M [mysqlhotcopy] interactive-timeout + +[mariadb] diff --git a/php/apache2-php5.6/php.ini b/php/apache2-php5.6/php.ini index 20bc8469..28ab2a78 100644 --- a/php/apache2-php5.6/php.ini +++ b/php/apache2-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/cgi-php5.6/php.ini b/php/cgi-php5.6/php.ini index 20bc8469..28ab2a78 100644 --- a/php/cgi-php5.6/php.ini +++ b/php/cgi-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/cli-php5.6/php.ini b/php/cli-php5.6/php.ini index 20bc8469..28ab2a78 100644 --- a/php/cli-php5.6/php.ini +++ b/php/cli-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/embed-php5.6/php.ini b/php/embed-php5.6/php.ini index 20bc8469..28ab2a78 100644 --- a/php/embed-php5.6/php.ini +++ b/php/embed-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/fpm-php5.6/php.ini b/php/fpm-php5.6/php.ini index 20bc8469..28ab2a78 100644 --- a/php/fpm-php5.6/php.ini +++ b/php/fpm-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/portage/make.conf b/portage/make.conf index e0eb1a1c..bb0008b8 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -84,7 +84,7 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real - rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp smtp + rdesktop rle samba sasl sctp sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp smtp sndfile snmp soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff tools truetype twolame udev unicode usb v4l v4l2 vala vcd vidix video vim-syntax vorbis wav wavpack @@ -131,9 +131,11 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ #CURL_SSL="nss" PHP_TARGETS="php5-3 php5-5" -PYTHON_TARGETS="python2_7 python3_3 python3_4" +PYTHON_TARGETS="python2_7 python3_4" PYTHON_SINGLE_TARGET="python3_4" +RUBY_TARGETS="ruby19 ruby21" + CPU_FLAGS_X86="3dnow 3dnowext mmx mmxext popcnt sse sse2 sse3 sse4a" source /var/lib/layman/make.conf diff --git a/portage/package.keywords b/portage/package.keywords index d02ff72f..00d01827 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -233,6 +233,7 @@ mail-client/thunderbird ~media-libs/gexiv2-0.6.0 ~media-libs/libsidplayfp-1.1.0 +~media-libs/libpng-1.6.18 ~media-libs/mesa-10.3.4 ~media-libs/xine-lib-1.2.6 diff --git a/portage/package.use b/portage/package.use index e153b633..0802829e 100644 --- a/portage/package.use +++ b/portage/package.use @@ -71,6 +71,7 @@ dev-java/ant-tasks javamail dev-java/commons-logging log4j dev-java/jdbc-mysql c3p0 dev-java/log4j javamail +dev-java/oracle-jdk-bin -doc -examples javafx dev-java/sun-jdk -doc jce dev-lang/perl ithreads perlsuid @@ -236,7 +237,7 @@ media-sound/pulseaudio asyncns equalizer media-sound/sox amrnb amrwb media-video/dvdrip subtitles -media-video/ffmpeg aac aacplus amr ass dirac faac faad gsm hardcoded-tables network opencore-amr openssl rtmp schroedinger vaapi vhook vpx +media-video/ffmpeg aac aacplus amr ass dirac faac faad gsm hardcoded-tables librtmp network opencore-amr openssl rtmp schroedinger vaapi vhook vpx media-video/kino gpac media-video/libav bs2b vaapi media-video/mjpegtools yv12 @@ -289,7 +290,7 @@ net-misc/iputils caps gnutls net-misc/networkmanager -dhclient dhcpcd nss net-misc/ntp parse-clocks -zeroconf net-misc/openssh -X509 sftplogging -net-misc/openvpn down-root eurephia iproute2 passwordsave +net-misc/openvpn down-root eurephia iproute2 passwordsave socks net-misc/rdesktop rdpusb net-misc/spice-gtk -pulseaudio usbredir # net-misc/vnc server @@ -315,7 +316,7 @@ sys-apps/busybox math -pam savedconfig static # sys-apps/coreutils xattr sys-apps/openrc audit sys-apps/paludis glsa inquisitio qa visibility -sys-apps/pciutils network-cron -zlib +sys-apps/pciutils dns network-cron -zlib sys-apps/portage epydoc python3 sys-apps/usbutils network-cron sys-apps/util-linux ddate loop-aes tty-helpers @@ -329,6 +330,8 @@ sys-devel/gcc libffi mudflap objc objc-gc objc++ sys-devel/libperl ithreads sys-devel/llvm clang +sys-firmware/ipxe lkrn + sys-fs/udev devfs-compat edd extras hwdb sys-kernel/gentoo-sources -doc diff --git a/profile.env b/profile.env index 86765002..cd9eb9b1 100644 --- a/profile.env +++ b/profile.env @@ -12,7 +12,7 @@ export GCC_SPECS='' export GSETTINGS_BACKEND='dconf' export GUILE_LOAD_PATH='/usr/share/guile/1.8' export HG='/usr/bin/hg' -export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' +export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' export JAVACC_HOME='/usr/share/javacc/' export LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' @@ -30,17 +30,16 @@ export LC_TIME='de_DE.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar' -export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' -export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin:/usr/games/bin' +export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin:/usr/games/bin' export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so:/usr/bin/evolution' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library' -export PYTHONDOCS_3_3='/usr/share/doc/python-docs-3.3.2/html/library' export QT_GRAPHICSSYSTEM='raster' export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins' -export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin' +export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin' export R_HOME='/usr/lib64/R' export VBOX_APP_HOME='/usr/lib64/virtualbox' export XDG_CONFIG_DIRS='/etc/xdg' diff --git a/revdep-rebuild/61-oracle-jdk-bin-1.8 b/revdep-rebuild/61-oracle-jdk-bin-1.8 index 300fadab..4debbf32 100644 --- a/revdep-rebuild/61-oracle-jdk-bin-1.8 +++ b/revdep-rebuild/61-oracle-jdk-bin-1.8 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.8.0.45" +SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.8.0.51" diff --git a/screenrc b/screenrc index 256203ee..c3ce5225 100644 --- a/screenrc +++ b/screenrc @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # /etc/screenrc @@ -64,7 +64,7 @@ multiuser off # Change default scrollback value for new windows - defscrollback 10000 # default: 100 + defscrollback 50000 # default: 100 # Define the time that all windows monitored for silence should # wait before displaying a message. Default 30 seconds. @@ -115,12 +115,12 @@ defnonblock on # xterm understands both im/ic and doesn't have a status line. # Note: Do not specify im and ic in the real termcap/info file as # some programs (e.g. vi) will not work anymore. - termcap xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l - terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l + termcap xterm* hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l + terminfo xterm* hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l # 80/132 column switching must be enabled for ^AW to work # change init sequence to not switch width - termcapinfo xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l + termcapinfo xterm* Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l # Make the output buffer large for (fast) xterms. # termcapinfo xterm* OL=10000 @@ -128,25 +128,25 @@ defnonblock on # tell screen that xterm can switch to dark background and has function # keys. - termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l' - termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' - termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' + termcapinfo xterm* 'VR=\E[?5h:VN=\E[?5l' + termcapinfo xterm* 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' + termcapinfo xterm* 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' # special xterm hardstatus: use the window title. - termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' + termcapinfo xterm* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' #terminfo xterm 'vb=\E[?5h$<200/>\E[?5l' - termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' + termcapinfo xterm* 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' # emulate part of the 'K' charset - termcapinfo xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' + termcapinfo xterm* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' # xterm-52 tweaks: # - uses background color for delete operations termcapinfo xterm* be # Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195) - termcapinfo xterm|xterms|xs ti@:te=\E[2J + termcapinfo xterm*|xs ti@:te=\E[2J # WYSE TERMINALS # =============================================================== diff --git a/smartd.conf b/smartd.conf index 806328c6..1a6e8155 100644 --- a/smartd.conf +++ b/smartd.conf @@ -2,7 +2,7 @@ # Home page is: http://smartmontools.sourceforge.net -# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ +# $Id: smartd.conf 4047 2015-03-22 16:16:24Z chrfranke $ # smartd will re-read the configuration file if it receives a HUP # signal @@ -33,7 +33,7 @@ # and min/max temperatures. #DEVICESCAN -I 194 -I 231 -I 9 -W 5 -# First (primary) ATA/IDE hard disk. Monitor all attributes, enable +# First ATA/SATA or SCSI/SAS disk. Monitor all attributes, enable # automatic online data collection, automatic Attribute autosave, and # start a short self-test every day between 2-3am, and a long self test # Saturdays between 3-4am. @@ -41,17 +41,17 @@ /dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) /dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) /dev/sdc -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) -#/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +#/dev/sda -a -o on -S on -s (S/../.././02|L/../../6/03) # Monitor SMART status, ATA Error Log, Self-test log, and track # changes in all attributes except for attribute 194 -#/dev/hdb -H -l error -l selftest -t -I 194 +#/dev/sdb -H -l error -l selftest -t -I 194 # Monitor all attributes except normalized Temperature (usually 194), # but track Temperature changes >= 4 Celsius, report Temperatures # >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). # Send mail on SMART failures or when Temperature is >= 55 Celsius. -#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com +#/dev/sdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com # An ATA disk may appear as a SCSI device to the OS. If a SCSI to # ATA Translation (SAT) layer is between the OS and the device then @@ -61,7 +61,7 @@ # A very silent check. Only report SMART health status if it fails # But send an email in this case -#/dev/hdc -H -C 0 -U 0 -m admin@example.com +#/dev/sdc -H -C 0 -U 0 -m admin@example.com # First two SCSI disks. This will monitor everything that smartd can # monitor. Start extended self-tests Wednesdays between 6-7pm and @@ -145,5 +145,5 @@ # All but -d, -m and -M Directives are only implemented for ATA devices # # If the test string DEVICESCAN is the first uncommented text -# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z] +# then smartd will scan for devices. # DEVICESCAN may be followed by any desired Directives. diff --git a/smartd_warning.sh b/smartd_warning.sh index 6a1df141..361dc976 100755 --- a/smartd_warning.sh +++ b/smartd_warning.sh @@ -19,7 +19,7 @@ set -e # Set by config.status PACKAGE="smartmontools" -VERSION="6.3" +VERSION="6.4" prefix="/usr" sysconfdir="/etc" smartdscriptdir="${sysconfdir}" diff --git a/ssl/openssl.cnf b/ssl/openssl.cnf index 18760c6e..1eb86c40 100644 --- a/ssl/openssl.cnf +++ b/ssl/openssl.cnf @@ -103,7 +103,7 @@ emailAddress = optional #################################################################### [ req ] -default_bits = 1024 +default_bits = 2048 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes diff --git a/syslog-ng/scl.conf b/syslog-ng/scl.conf index 2de7fec4..c3729ce2 100644 --- a/syslog-ng/scl.conf +++ b/syslog-ng/scl.conf @@ -28,4 +28,4 @@ @define scl-root "`syslog-ng-data`/include/scl" @define include-path "`include-path`:`syslog-ng-data`/include" -@include 'scl/*/plugin.conf' +@include 'scl/*/*.conf' diff --git a/syslog-ng/syslog-ng.conf b/syslog-ng/syslog-ng.conf index 0f1001a0..e884810f 100644 --- a/syslog-ng/syslog-ng.conf +++ b/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/texmf/ls-R b/texmf/ls-R index 1bdbd5b5..0f060e60 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -1,10 +1,8 @@ % ls-R -- filename database for kpathsea; do not change this line. ./: .: -dvipdfm dvipdfmx.d dvips -dvips.d fmtutil.d language.dat.d language.dat.lua.d @@ -17,11 +15,6 @@ web2c web2c.d xdvi -./dvipdfm: -config - -./dvipdfm/config: - ./dvipdfmx.d: dvipdfmx.cfg @@ -31,8 +24,6 @@ omega.d ./dvips/omega.d: omega.cfg -./dvips.d: - ./fmtutil.d: format.jadetex.cnf format.texlive-basic.cnf diff --git a/tmpfiles.d/screen.conf b/tmpfiles.d/screen.conf new file mode 100644 index 00000000..75ed095b --- /dev/null +++ b/tmpfiles.d/screen.conf @@ -0,0 +1 @@ +d /tmp/screen 0775 root utmp diff --git a/vim/gvimrc b/vim/gvimrc index b1c2ff1c..8dc461a6 100644 --- a/vim/gvimrc +++ b/vim/gvimrc @@ -2,7 +2,7 @@ scriptencoding utf-8 " ^^ Please leave the above line at the start of the file. " Default configuration file for gvim -" $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/files/gvimrc-r1,v 1.2 2010/04/15 19:49:14 darkside Exp $ +" $Id$ " " Written by Aron Griffis " diff --git a/vim/vimrc b/vim/vimrc index 45750175..255ab3fb 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -2,7 +2,7 @@ scriptencoding utf-8 " ^^ Please leave the above line at the start of the file. " Default configuration file for Vim -" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.3 2010/04/15 19:30:32 darkside Exp $ +" $Id$ " Written by Aron Griffis " Modified by Ryan Phillips