From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Mon, 11 Feb 2013 08:48:51 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=333ac2305ccd68e2a541ab9386b02b224d4e9c27;p=config%2Fsamara%2Fetc.git

Current state
---

diff --git a/.etckeeper b/.etckeeper
index 96a2713..b2f664d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -879,7 +879,6 @@ maybe chmod 0644 './env.d/cblas/lib64/config'
 maybe chmod 0644 './env.d/cblas/lib64/gsl'
 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.5.4'
 maybe chmod 0644 './env.d/gcc/x86_64-pc-linux-gnu-4.6.3'
 maybe chmod 0755 './env.d/python'
 maybe chmod 0644 './env.d/python/.keep_app-admin_eselect-python-0'
diff --git a/bash_completion.d/ack b/bash_completion.d/ack
new file mode 120000
index 0000000..df89c5f
--- /dev/null
+++ b/bash_completion.d/ack
@@ -0,0 +1 @@
+../../usr/share/bash-completion/ack
\ No newline at end of file
diff --git a/bash_completion.d/bind-utils b/bash_completion.d/bind-utils
new file mode 120000
index 0000000..39eddb3
--- /dev/null
+++ b/bash_completion.d/bind-utils
@@ -0,0 +1 @@
+../../usr/share/bash-completion/bind-utils
\ No newline at end of file
diff --git a/bash_completion.d/gpg b/bash_completion.d/gpg
new file mode 120000
index 0000000..92096b8
--- /dev/null
+++ b/bash_completion.d/gpg
@@ -0,0 +1 @@
+../../usr/share/bash-completion/gpg
\ No newline at end of file
diff --git a/bash_completion.d/lftp b/bash_completion.d/lftp
new file mode 120000
index 0000000..3cb1406
--- /dev/null
+++ b/bash_completion.d/lftp
@@ -0,0 +1 @@
+../../usr/share/bash-completion/lftp
\ No newline at end of file
diff --git a/bash_completion.d/links b/bash_completion.d/links
new file mode 120000
index 0000000..4d74019
--- /dev/null
+++ b/bash_completion.d/links
@@ -0,0 +1 @@
+../../usr/share/bash-completion/links
\ No newline at end of file
diff --git a/bash_completion.d/lsof b/bash_completion.d/lsof
new file mode 120000
index 0000000..977735e
--- /dev/null
+++ b/bash_completion.d/lsof
@@ -0,0 +1 @@
+../../usr/share/bash-completion/lsof
\ No newline at end of file
diff --git a/bash_completion.d/lzma b/bash_completion.d/lzma
new file mode 120000
index 0000000..50049ba
--- /dev/null
+++ b/bash_completion.d/lzma
@@ -0,0 +1 @@
+../../usr/share/bash-completion/lzma
\ No newline at end of file
diff --git a/bash_completion.d/net-tools b/bash_completion.d/net-tools
new file mode 120000
index 0000000..8a73a24
--- /dev/null
+++ b/bash_completion.d/net-tools
@@ -0,0 +1 @@
+../../usr/share/bash-completion/net-tools
\ No newline at end of file
diff --git a/bash_completion.d/openssl b/bash_completion.d/openssl
new file mode 120000
index 0000000..ff76adf
--- /dev/null
+++ b/bash_completion.d/openssl
@@ -0,0 +1 @@
+../../usr/share/bash-completion/openssl
\ No newline at end of file
diff --git a/bash_completion.d/perl b/bash_completion.d/perl
new file mode 120000
index 0000000..2fadcc9
--- /dev/null
+++ b/bash_completion.d/perl
@@ -0,0 +1 @@
+../../usr/share/bash-completion/perl
\ No newline at end of file
diff --git a/bash_completion.d/python b/bash_completion.d/python
new file mode 120000
index 0000000..3e18e2a
--- /dev/null
+++ b/bash_completion.d/python
@@ -0,0 +1 @@
+../../usr/share/bash-completion/python
\ No newline at end of file
diff --git a/bash_completion.d/rrdtool b/bash_completion.d/rrdtool
new file mode 120000
index 0000000..d9169fd
--- /dev/null
+++ b/bash_completion.d/rrdtool
@@ -0,0 +1 @@
+../../usr/share/bash-completion/rrdtool
\ No newline at end of file
diff --git a/bash_completion.d/strace b/bash_completion.d/strace
new file mode 120000
index 0000000..b76dd13
--- /dev/null
+++ b/bash_completion.d/strace
@@ -0,0 +1 @@
+../../usr/share/bash-completion/strace
\ No newline at end of file
diff --git a/bash_completion.d/tcpdump b/bash_completion.d/tcpdump
new file mode 120000
index 0000000..480050e
--- /dev/null
+++ b/bash_completion.d/tcpdump
@@ -0,0 +1 @@
+../../usr/share/bash-completion/tcpdump
\ No newline at end of file
diff --git a/bash_completion.d/util-linux b/bash_completion.d/util-linux
new file mode 120000
index 0000000..5e4c72e
--- /dev/null
+++ b/bash_completion.d/util-linux
@@ -0,0 +1 @@
+../../usr/share/bash-completion/util-linux
\ No newline at end of file
diff --git a/bash_completion.d/vim b/bash_completion.d/vim
new file mode 120000
index 0000000..a077149
--- /dev/null
+++ b/bash_completion.d/vim
@@ -0,0 +1 @@
+../../usr/share/bash-completion/vim
\ No newline at end of file
diff --git a/bash_completion.d/xxd b/bash_completion.d/xxd
new file mode 120000
index 0000000..fd6b14a
--- /dev/null
+++ b/bash_completion.d/xxd
@@ -0,0 +1 @@
+../../usr/share/bash-completion/xxd
\ No newline at end of file
diff --git a/bash_completion.d/xz b/bash_completion.d/xz
new file mode 120000
index 0000000..666c981
--- /dev/null
+++ b/bash_completion.d/xz
@@ -0,0 +1 @@
+../../usr/share/bash-completion/xz
\ No newline at end of file
diff --git a/csh.env b/csh.env
index 31d630a..6b59b2a 100644
--- a/csh.env
+++ b/csh.env
@@ -11,7 +11,7 @@ setenv GCC_SPECS ''
 setenv GDK_USE_XFT '1'
 setenv GSETTINGS_BACKEND 'dconf'
 setenv HG '/usr/bin/hg'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
 setenv JAVACC_HOME '/usr/share/javacc/'
 setenv LANG 'de_DE.UTF-8'
 setenv LC_ADDRESS 'de_DE.utf8'
@@ -29,17 +29,17 @@ 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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv OPENGL_PROFILE 'xorg-x11'
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin:/usr/games/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.2/html/library'
 setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.2/html/library'
 setenv PYTHONPATH '/usr/lib/portage/pym'
 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.5.4:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin'
 setenv RUBYOPT '-rauto_gem'
 setenv R_HOME '/usr/lib64/R'
 setenv VBOX_APP_HOME '/usr/lib64/virtualbox'
diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu
index 476e7c4..2106f84 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.5.4"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4"
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
 GCC_SPECS=""
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info"
 MULTIOSDIRS="../lib64:../lib32"
diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE
index e8dfd92..99ba904 120000
--- a/env.d/gcc/.NATIVE
+++ b/env.d/gcc/.NATIVE
@@ -1 +1 @@
-x86_64-pc-linux-gnu-4.5.4
\ No newline at end of file
+x86_64-pc-linux-gnu-4.6.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 0954b8b..63f79f2 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.5.4
+CURRENT=x86_64-pc-linux-gnu-4.6.3
diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 b/env.d/gcc/x86_64-pc-linux-gnu-4.5.4
deleted file mode 100644
index d6e7ec1..0000000
--- a/env.d/gcc/x86_64-pc-linux-gnu-4.5.4
+++ /dev/null
@@ -1,8 +0,0 @@
-LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32"
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.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.5.4"
diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 b/env.d/gcc/x86_64-pc-linux-gnu-4.6.3
index c2da4f8..1f63693 100644
--- a/env.d/gcc/x86_64-pc-linux-gnu-4.6.3
+++ b/env.d/gcc/x86_64-pc-linux-gnu-4.6.3
@@ -1,6 +1,3 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
 LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32"
 MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man"
 INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.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.6.3"
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 e853b9d..62d62a0 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,4 +1,2 @@
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4
diff --git a/profile.env b/profile.env
index 8d8cd87..881dcaa 100644
--- a/profile.env
+++ b/profile.env
@@ -11,7 +11,7 @@ export GCC_SPECS=''
 export GDK_USE_XFT='1'
 export GSETTINGS_BACKEND='dconf'
 export HG='/usr/bin/hg'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
 export JAVACC_HOME='/usr/share/javacc/'
 export LANG='de_DE.UTF-8'
 export LC_ADDRESS='de_DE.utf8'
@@ -29,17 +29,17 @@ 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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin:/usr/games/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.2/html/library'
 export PYTHONDOCS_3_2='/usr/share/doc/python-docs-3.2.2/html/library'
 export PYTHONPATH='/usr/lib/portage/pym'
 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.5.4:/usr/lib64/subversion/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin'
 export RUBYOPT='-rauto_gem'
 export R_HOME='/usr/lib64/R'
 export VBOX_APP_HOME='/usr/lib64/virtualbox'
diff --git a/resolv.conf b/resolv.conf
index d0004dc..e52ae1b 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,6 +1,5 @@
 # Generated by net-scripts for interface eth0
-domain pb.local
-#search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de
-search pb.local ri.pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net uhu-banane.de
+domain profitbricks.localdomain
+search pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de
 nameserver 192.168.178.30
 nameserver 192.168.178.89