Current state

diff --git a/.etckeeper b/.etckeeper
index dd61256aabb16b40167dd7a4357cd3a10cdc5176..bee768a7930d797f40a8c3a7a288a1fbbae77a17 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -29,8 +29,6 @@ mkdir -p './ssl/CA-Brehm/crl'
 mkdir -p './ssl/CA-Brehm/newcerts'
 mkdir -p './sudoers.d'
 mkdir -p './systemd/network'
-mkdir -p './texmf/dvipdfm/config'
-mkdir -p './texmf/dvips.d'
 mkdir -p './udev/hwdb.d'
 mkdir -p './unixODBC/ODBCDataSources'
 maybe chmod 0755 '.'
@@ -866,7 +864,6 @@ maybe chmod 0644 'env.d/cblas/lib64/config'
 maybe chmod 0644 'env.d/cblas/lib64/reference'
 maybe chmod 0755 'env.d/gcc'
 maybe chmod 0644 'env.d/gcc/config-x86_64-pc-linux-gnu'
-maybe chmod 0644 'env.d/gcc/x86_64-pc-linux-gnu-4.8.5'
 maybe chmod 0644 'env.d/gcc/x86_64-pc-linux-gnu-4.9.3'
 maybe chmod 0755 'env.d/lapack'
 maybe chmod 0755 'env.d/lapack/lib64'
@@ -1966,11 +1963,8 @@ maybe chmod 0644 'terminfo/x/xterm'
 maybe chmod 0644 'terminfo/x/xterm-color'
 maybe chmod 0644 'terminfo/x/xterm-xfree86'
 maybe chmod 0755 'texmf'
-maybe chmod 0755 'texmf/dvipdfm'
-maybe chmod 0755 'texmf/dvipdfm/config'
 maybe chmod 0755 'texmf/dvipdfmx.d'
 maybe chmod 0644 'texmf/dvipdfmx.d/dvipdfmx.cfg'
-maybe chmod 0755 'texmf/dvips.d'
 maybe chmod 0755 'texmf/fmtutil.d'
 maybe chmod 0644 'texmf/fmtutil.d/format.texlive-basic.cnf'
 maybe chmod 0644 'texmf/fmtutil.d/format.texlive-latex.cnf'

diff --git a/conf.d/fail2ban b/conf.d/fail2ban
index 00d19f8bb2e0f3f0a0f20bf7e924ab88bbdb5a3e..50eaf41f27e70e88044f6a0df45b53715fd982f8 100644 (file)
--- a/conf.d/fail2ban
+++ b/conf.d/fail2ban
@@ -2,7 +2,7 @@
 #
 # For information on options, see "/usr/bin/fail2ban-client -h".
 
-FAIL2BAN_OPTIONS=""
+FAIL2BAN_OPTIONS="-v"
 
 # Force execution of the server even if the socket already exists:
 #FAIL2BAN_OPTIONS="-x"

diff --git a/csh.env b/csh.env
index 8145dd4b970200eab5d35278152a9dc9011b7a41..8062b976532039cac4b36e67b084a5b3e654c4d8 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -9,15 +9,15 @@ setenv EDITOR '/usr/bin/vi'
 setenv GCC_SPECS ''
 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.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
-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.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/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.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/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 PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin'
 setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.8/html/library'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin'
 setenv XDG_CONFIG_DIRS '/etc/xdg'
 setenv XDG_DATA_DIRS '/usr/local/share:/usr/share'

diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu
index f43f587390f8523519c61f3fa968e903dcf34edb..529faa97a670fea7a5510dd2ebcedb0a2395e2fa 100644 (file)
--- 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.5"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3"
 GCC_SPECS=""
-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"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info"
 MULTIOSDIRS="../lib64:../lib32"

diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE
index 106fefd3a9e456f370055788147048b7b02f6bc5..0967d73a863cae1be6dcc4fee33bd11eeac8ac9f 120000 (symlink)
--- a/env.d/gcc/.NATIVE
+++ b/env.d/gcc/.NATIVE
@@ -1 +1 @@
-x86_64-pc-linux-gnu-4.8.5
\ No newline at end of file
+x86_64-pc-linux-gnu-4.9.3
\ 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 4b9db179bacf477f43504445d712d02822d32f5a..5ef56a33a669e993ed3ba5e46569655d55789808 100644 (file)
--- 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.5
+CURRENT=x86_64-pc-linux-gnu-4.9.3

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
deleted file mode 100644 (file)
index 195d1d0..0000000
--- a/env.d/gcc/x86_64-pc-linux-gnu-4.8.5
+++ /dev/null
@@ -1,8 +0,0 @@
-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/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 b/env.d/gcc/x86_64-pc-linux-gnu-4.9.3
index 9ff406284faebe4b33ddd34fc574cded81fa64f3..e6e03df5aef3b62daadc96cfadc7a5c2a10da19e 100644 (file)
--- a/env.d/gcc/x86_64-pc-linux-gnu-4.9.3
+++ b/env.d/gcc/x86_64-pc-linux-gnu-4.9.3
@@ -1,6 +1,3 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3"
 LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/32"
 MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man"
 INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info"
@@ -8,3 +5,4 @@ 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.9.3"

diff --git a/fail2ban/jail.conf b/fail2ban/jail.conf
index 732aeab96d4dc9812af6c4c2847c5b319f9dfe57..3c943a44c74c0b184192d81dd9fa449a54647dcd 100644 (file)
--- a/fail2ban/jail.conf
+++ b/fail2ban/jail.conf
@@ -40,6 +40,8 @@ before = paths-debian.conf
 
 [DEFAULT]
 
+sshd_log = /var/log/syslog.d/authpriv.log
+
 #
 # MISCELLANEOUS OPTIONS
 #
@@ -211,7 +213,7 @@ action = %(action_)s
 [sshd]
 
 port    = ssh
-logpath = %(sshd_log)s
+logpath = /var/log/syslog.d/authpriv.log
 
 
 [sshd-ddos]
@@ -219,7 +221,7 @@ logpath = %(sshd_log)s
 # The mail-whois action send a notification e-mail with a whois request
 # in the body.
 port    = ssh
-logpath = %(sshd_log)s
+logpath = /var/log/syslog.d/authpriv.log
 
 
 [dropbear]

diff --git a/fail2ban/jail.d/sshd.conf b/fail2ban/jail.d/sshd.conf
index 0f835f7cea3ac56304f8ad8603548960d88df4ba..84b4b4dfce4c8501195fd9d7cb607eef6e76a570 100644 (file)
--- a/fail2ban/jail.d/sshd.conf
+++ b/fail2ban/jail.d/sshd.conf
@@ -6,7 +6,7 @@ enabled  = true
 filter   = sshd
 action   = iptables[name=SSH, port=ssh, protocol=tcp]
            sendmail-whois[name=SSH, dest=frank@brehm-online.com, sender=fail2ban@brehm-online.com, sendername="Fail2Ban"]
-logpath  = /var/log/syslog
+logpath  = /var/log/syslog.d/authpriv.log
 maxretry = 5
 
 
@@ -15,7 +15,7 @@ maxretry = 5
 enabled  = false
 filter   = sshd-ddos
 action   = iptables[name=SSHDDOS, port=ssh, protocol=tcp]
-logpath  = /var/log/syslog
+logpath  = /var/log/syslog.d/authpriv.log
 maxretry = 3
 
 

diff --git a/fail2ban/paths-debian.conf b/fail2ban/paths-debian.conf
index eff4fdae345db7c9d534dff27b693e1e60f69e4e..7a0198e303c2d3f5dd49793d60cf93d9e31eba1c 100644 (file)
--- a/fail2ban/paths-debian.conf
+++ b/fail2ban/paths-debian.conf
@@ -9,21 +9,21 @@ after  = paths-overrides.local
 
 [DEFAULT]
 
-syslog_mail = /var/log/mail.log
+syslog_mail = /var/log/syslog.d/mail.log
 
-syslog_mail_warn = /var/log/mail.warn
+syslog_mail_warn = /var/log/mail/mail.warn.log
 
-syslog_authpriv = /var/log/auth.log
+syslog_authpriv = /var/log/syslog.d/authpriv.log
 
-# syslog_auth = /var/log/auth.log
-#
-syslog_user  =  /var/log/user.log
+syslog_auth = /var/log/syslog.d/auth.log
+
+syslog_user  =  /var/log/syslog.d/user.log
 
 syslog_ftp = /var/log/syslog
 
-syslog_daemon =  /var/log/daemon.log
+syslog_daemon =  /var/log/syslog.d/daemon.log
 
-syslog_local0 =  /var/log/messages
+syslog_local0 =  /var/log/syslog.d/local0.log
 
 
 apache_error_log = /var/log/apache2/*error.log

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 bdfbef6f5ace38139cf2bd833643255781b42d36..8bf4cbe048aff4dd5cad169562913522ba07953d 100644 (file)
--- 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,4 +1,2 @@
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/32
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3
-/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/profile.env b/profile.env
index e8b653eaad39a41318b5c5e15d8053c179035ba7..8468ad026f76b08d56f1d60433729606129fd202 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -9,15 +9,15 @@ export EDITOR='/usr/bin/vi'
 export GCC_SPECS=''
 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.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
-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.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/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.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/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 PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin'
 export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin'
 export XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share'

diff --git a/rsyslog.d/60-fb.conf b/rsyslog.d/60-fb.conf
index acef03b465175959437c2b65b5c7399adb520d23..d18f780046abea6687dd41172408ffb092755567 100644 (file)
--- a/rsyslog.d/60-fb.conf
+++ b/rsyslog.d/60-fb.conf
@@ -29,6 +29,21 @@ mail.* action(
        FileGroup="adm"
 )
 
+template (
+       name="mail_warn"
+       type="string"
+       string="/var/log/mail/mail.warn.log"
+)
+
+mail.warn action(
+       type="omfile"
+       DynaFile="mail_warn"
+       DirCreateMode="0755"
+       FileCreateMode="0644"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
 *.* action(
        type="omfile"
        File="/var/log/all.log"

diff --git a/texmf/ls-R b/texmf/ls-R
index f26f872825149a3daa1a77e0cb24ca45e6696d98..4ecadab28e6b40d7aa762249b553176fb45f4df3 100644 (file)
--- a/texmf/ls-R
+++ b/texmf/ls-R
@@ -1,9 +1,7 @@
 % ls-R -- filename database for kpathsea; do not change this line.
 ./:
 .:
-dvipdfm
 dvipdfmx.d
-dvips.d
 fmtutil.d
 language.dat.d
 language.dat.lua.d
@@ -15,16 +13,9 @@ updmap.d
 web2c
 web2c.d
 
-./dvipdfm:
-config
-
-./dvipdfm/config:
-
 ./dvipdfmx.d:
 dvipdfmx.cfg
 
-./dvips.d:
-
 ./fmtutil.d:
 format.texlive-basic.cnf
 format.texlive-latex.cnf