]> Frank Brehm's Git Trees - config/uhu1/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Thu, 8 Oct 2015 14:48:18 +0000 (16:48 +0200)
committerFrank Brehm <frank@brehm-online.com>
Thu, 8 Oct 2015 14:48:18 +0000 (16:48 +0200)
32 files changed:
.etckeeper
X11/xinit/xinitrc.d/40-libcanberra-gtk-module [new file with mode: 0755]
at-spi2/accessibility.conf
config-archive/etc/logrotate.d/rsyslog [new file with mode: 0644]
config-archive/etc/logrotate.d/rsyslog.dist.new [new file with mode: 0644]
config-archive/etc/rsyslog.conf [new file with mode: 0644]
config-archive/etc/rsyslog.conf.dist.new [new file with mode: 0644]
config-archive/etc/rsyslog.d/50-default.conf [new file with mode: 0644]
config-archive/etc/rsyslog.d/50-default.conf.dist.new [new file with mode: 0644]
csh.env
drirc [new file with mode: 0644]
env.d/03opengl
env.d/04gcc-x86_64-pc-linux-gnu
env.d/gcc/.NATIVE
env.d/gcc/config-x86_64-pc-linux-gnu
env.d/gcc/x86_64-pc-linux-gnu-4.8.4 [deleted file]
env.d/gcc/x86_64-pc-linux-gnu-4.8.5 [new file with mode: 0644]
init.d/courier-authlib
init.d/rsyslog
init.d/slapd
ld.so.conf
ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
portage/package.keywords
portage/package.use
profile.env
revdep-rebuild/61-icedtea-bin-7
security/capability.conf
wgetrc
xdg/autostart/gnome-keyring-gpg.desktop
xdg/autostart/gnome-keyring-pkcs11.desktop
xdg/autostart/gnome-keyring-secrets.desktop
xdg/autostart/gnome-keyring-ssh.desktop

index 246a489ea3f419811793efed7b1175323f4c08a5..4799604018a73a1551b1c7d59fceadf6ac1c4e18 100755 (executable)
@@ -27,6 +27,7 @@ mkdir -p './skel/.ssh'
 mkdir -p './ssl/CA-Brehm/certs'
 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'
@@ -53,6 +54,7 @@ maybe chmod 0644 'ImageMagick-6/type.xml'
 maybe chmod 0755 'X11'
 maybe chmod 0755 'X11/xinit'
 maybe chmod 0755 'X11/xinit/xinitrc.d'
+maybe chmod 0755 'X11/xinit/xinitrc.d/40-libcanberra-gtk-module'
 maybe chmod 0755 'X11/xinit/xinitrc.d/80-dbus'
 maybe chmod 0755 'acpi'
 maybe chmod 0755 'acpi/actions'
@@ -418,6 +420,8 @@ maybe chmod 0644 'config-archive/etc/logrotate.d/fail2ban'
 maybe chmod 0644 'config-archive/etc/logrotate.d/fail2ban.dist.new'
 maybe chmod 0644 'config-archive/etc/logrotate.d/openrc'
 maybe chmod 0644 'config-archive/etc/logrotate.d/openrc.dist'
+maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog'
+maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new'
 maybe chmod 0644 'config-archive/etc/logrotate.d/syslog-ng'
 maybe chmod 0644 'config-archive/etc/logrotate.d/syslog-ng.dist.new'
 maybe chmod 0644 'config-archive/etc/logrotate.d/ulogd'
@@ -613,6 +617,11 @@ maybe chmod 0644 'config-archive/etc/request-key.conf'
 maybe chmod 0644 'config-archive/etc/request-key.conf.dist'
 maybe chmod 0644 'config-archive/etc/rkhunter.conf'
 maybe chmod 0644 'config-archive/etc/rkhunter.conf.dist.new'
+maybe chmod 0644 'config-archive/etc/rsyslog.conf'
+maybe chmod 0644 'config-archive/etc/rsyslog.conf.dist.new'
+maybe chmod 0755 'config-archive/etc/rsyslog.d'
+maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf'
+maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf.dist.new'
 maybe chmod 0644 'config-archive/etc/screenrc'
 maybe chmod 0644 'config-archive/etc/screenrc.dist'
 maybe chmod 0755 'config-archive/etc/skel'
@@ -799,6 +808,7 @@ maybe chmod 0644 'dnssec/root-anchors.txt'
 maybe chmod 0644 'dnssec/root-anchors.xml'
 maybe chmod 0755 'dpkg'
 maybe chmod 0755 'dpkg/dpkg.cfg.d'
+maybe chmod 0644 'drirc'
 maybe chmod 0644 'e2fsck.conf'
 maybe chmod 0755 'eclean'
 maybe chmod 0644 'eclean/distfiles.exclude'
@@ -852,7 +862,7 @@ 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.4'
+maybe chmod 0644 'env.d/gcc/x86_64-pc-linux-gnu-4.8.5'
 maybe chmod 0755 'env.d/lapack'
 maybe chmod 0755 'env.d/lapack/lib64'
 maybe chmod 0644 'env.d/lapack/lib64/config'
@@ -1906,6 +1916,7 @@ maybe chown 'stunnel' 'stunnel/stunnel.pem'
 maybe chgrp 'stunnel' 'stunnel/stunnel.pem'
 maybe chmod 0640 'stunnel/stunnel.pem'
 maybe chmod 0440 'sudoers'
+maybe chmod 0750 'sudoers.d'
 maybe chmod 0644 'sysctl.conf'
 maybe chmod 0755 'sysctl.d'
 maybe chmod 0644 'sysctl.d/README'
diff --git a/X11/xinit/xinitrc.d/40-libcanberra-gtk-module b/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
new file mode 100755 (executable)
index 0000000..63c16af
--- /dev/null
@@ -0,0 +1,16 @@
+#!/bin/sh
+# to be sourced
+
+case "$SESSION" in
+       GNOME)
+               # Done by gnome-settings-daemon
+               ;;
+       *)
+               if [ -z "$GTK_MODULES" ] ; then
+                       GTK_MODULES="canberra-gtk-module"
+               else
+                       GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+               fi
+               export GTK_MODULES
+               ;;
+esac
index b9367d01873173563ae37666c196803797cef776..fc7d0f4e9209ca20027ca779eb18bc27f2467abe 100644 (file)
@@ -3,8 +3,7 @@
 
   <type>accessibility</type>
 
-  <standard_session_servicedirs/>
-
+<servicedir>/usr/share/dbus-1/accessibility-services</servicedir>
   <auth>EXTERNAL</auth>
 
   <listen>unix:tmpdir=/tmp</listen>
diff --git a/config-archive/etc/logrotate.d/rsyslog b/config-archive/etc/logrotate.d/rsyslog
new file mode 100644 (file)
index 0000000..3952b76
--- /dev/null
@@ -0,0 +1,57 @@
+
+script syslog-reload
+    test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null || true
+endscript
+
+/var/log/messages /var/log/syslog {
+    daily
+    olddir /var/log/.old/%Y-%m
+    missingok
+    size 1024K
+    postrotate syslog-reload
+}
+
+/var/log/syslog.d/* {
+    daily
+    olddir /var/log/syslog.d/.old/%Y-%m
+    missingok
+    size 1024K
+    postrotate syslog-reload
+    maxage 1y
+}
+
+/var/log/mail/*.log {
+    daily
+    olddir /var/log/mail/.old/%Y-%m
+    missingok
+    size 1024K
+    postrotate syslog-reload
+    maxage 2y
+}
+
+/var/log/debug.log /var/log/debug /var/log/all /var/log/all.log {
+    daily
+    olddir /var/log/.old/%Y-%m
+    missingok
+    size 4M
+    postrotate syslog-reload
+    maxage 6m
+}
+
+#/var/log/mail/authdaemond  /var/log/mail/amavis* /var/log/mail/imapd* /var/log/mail/pop3d* /var/log/mail/postgrey /var/log/mail/spam* {
+#    daily
+#    olddir /var/log/mail/.old/%Y-%m
+#    size 1024K
+#    postrotate syslog-reload
+#    maxage 1y
+#}
+
+#/var/log/mail/postfix/* {
+#    daily
+#    olddir /var/log/mail/.old/postfix/%Y-%m
+#    size 1024K
+#    postrotate syslog-reload
+#    maxage 1y
+#}
+
+# vim: ts=4 filetype=conf
diff --git a/config-archive/etc/logrotate.d/rsyslog.dist.new b/config-archive/etc/logrotate.d/rsyslog.dist.new
new file mode 100644 (file)
index 0000000..1eae30e
--- /dev/null
@@ -0,0 +1,37 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#      rotate 7
+#      daily
+#      missingok
+#      notifempty
+#      delaycompress
+#      compress
+#      postrotate
+#              test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#      endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+       rotate 4
+       weekly
+       missingok
+       notifempty
+       compress
+       delaycompress
+       sharedscripts
+       postrotate
+               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+       endscript
+}
diff --git a/config-archive/etc/rsyslog.conf b/config-archive/etc/rsyslog.conf
new file mode 100644 (file)
index 0000000..a927dca
--- /dev/null
@@ -0,0 +1,71 @@
+# /etc/rsyslog.conf
+# 
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+# 
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+# 
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+module(load="immark" Interval="3600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+module(load="impstats"
+       interval="43200"
+       severity="7"
+       log.syslog="off"
+       /* need to turn log stream logging off! */
+       log.file="/var/log/syslog.d/stats.log")
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+       load="builtin:omfile"
+       Template="RSYSLOG_FileFormat"
+       FileCreateMode="0644"
+       DirCreateMode="0755"
+        fileOwnerNum="0"
+        fileGroupNum="0"
+        dirOwnerNum="0"
+        dirGroupNum="0"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/config-archive/etc/rsyslog.conf.dist.new b/config-archive/etc/rsyslog.conf.dist.new
new file mode 100644 (file)
index 0000000..da48459
--- /dev/null
@@ -0,0 +1,61 @@
+# /etc/rsyslog.conf
+# 
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+# 
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+# 
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+#$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+#module(load="immark" Interval="600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+       load="builtin:omfile"
+       Template="RSYSLOG_TraditionalFileFormat"
+       FileCreateMode="0644"
+       DirCreateMode="0755"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/config-archive/etc/rsyslog.d/50-default.conf b/config-archive/etc/rsyslog.d/50-default.conf
new file mode 100644 (file)
index 0000000..28fa0a4
--- /dev/null
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+#auth,authpriv.* action(
+#      type="omfile"
+#      File="/var/log/auth.log"
+#      FileCreateMode="0600"
+#      FileOwner="root"
+#      FileGroup="adm"
+#      Sync="off"
+#)
+
+#cron.* action(
+#      type="omfile"
+#      File="/var/log/cron.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+#daemon.* action(
+#      type="omfile"
+#      File="/var/log/daemon.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+#kern.* action(
+#      type="omfile"
+#      File="/var/log/kern.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+#lpr.* action(
+#      type="omfile"
+#      File="/var/log/lpr.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+#mail.* action(
+#      type="omfile"
+#      File="/var/log/mail.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+#news.* action(
+#      type="omfile"
+#      File="/var/log/news.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+#user.* action(
+#      type="omfile"
+#      File="/var/log/user.log"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+*.=debug;auth,authpriv,news,mail.none action(
+       type="omfile"
+       File="/var/log/debug.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,lpr,mail,news.none action(
+       type="omfile"
+       File="/var/log/messages"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv,mail.none action(
+#      type="omfile"
+#      File="/var/log/syslog"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+*.emerg action(
+       type="omusrmsg"
+       Users="*"
+       action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/config-archive/etc/rsyslog.d/50-default.conf.dist.new b/config-archive/etc/rsyslog.d/50-default.conf.dist.new
new file mode 100644 (file)
index 0000000..9ae8578
--- /dev/null
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+       type="omfile"
+       File="/var/log/auth.log"
+       FileCreateMode="0600"
+       FileOwner="root"
+       FileGroup="adm"
+       Sync="off"
+)
+
+cron.* action(
+       type="omfile"
+       File="/var/log/cron.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+daemon.* action(
+       type="omfile"
+       File="/var/log/daemon.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+kern.* action(
+       type="omfile"
+       File="/var/log/kern.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+lpr.* action(
+       type="omfile"
+       File="/var/log/lpr.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+mail.* action(
+       type="omfile"
+       File="/var/log/mail.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+news.* action(
+       type="omfile"
+       File="/var/log/news.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+user.* action(
+       type="omfile"
+       File="/var/log/user.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+       type="omfile"
+       File="/var/log/debug.log"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+       type="omfile"
+       File="/var/log/messages"
+       FileOwner="root"
+       FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+#      type="omfile"
+#      File="/var/log/syslog"
+#      FileOwner="root"
+#      FileGroup="adm"
+#)
+
+*.emerg action(
+       type="omusrmsg"
+       Users="*"
+       action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/csh.env b/csh.env
index db8468ad467268af024080ea8a4ed50d063690ca..8a677e29d187a2209becf83470497d61624da598 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.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 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.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.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.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.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.4:/usr/lib64/subversion/bin'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/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.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 XDG_CONFIG_DIRS '/etc/xdg'
 setenv XDG_DATA_DIRS '/usr/local/share:/usr/share'
diff --git a/drirc b/drirc
new file mode 100644 (file)
index 0000000..4b9841b
--- /dev/null
+++ b/drirc
@@ -0,0 +1,91 @@
+<!--
+
+============================================
+Application bugs worked around in this file:
+============================================
+
+* Various Unigine products don't use the #version and #extension GLSL
+  directives, meaning they only get GLSL 1.10 and no extensions for their
+  shaders.
+  Enabling all extensions for Unigine fixes most issues, but the GLSL version
+  is still 1.10.
+
+* Unigine Heaven 3.0 with ARB_texture_multisample uses a "ivec4 * vec4"
+  expression, which is illegal in GLSL 1.10.
+  Adding "#version 130" fixes this.
+
+* Unigine Heaven 3.0 with ARB_shader_bit_encoding uses the uint keyword, which
+  is illegal in GLSL 1.10.
+  Adding "#version 130" fixes this.
+
+* Unigine Heaven 3.0 with ARB_shader_bit_encoding uses a "uint & int"
+  expression, which is illegal in any GLSL version.
+  Disabling ARB_shader_bit_encoding fixes this.
+
+* If ARB_sample_shading is supported, Unigine Heaven 4.0 and Valley 1.0 uses
+  an #extension directive in the middle of its shaders, which is illegal
+  in GLSL.
+
+TODO: document the other workarounds.
+
+-->
+
+<driconf>
+    <!-- Please always enable app-specific workarounds for all drivers and
+         screens. -->
+    <device>
+        <application name="Unigine Sanctuary" executable="Sanctuary">
+            <option name="force_glsl_extensions_warn" value="true" />
+            <option name="disable_blend_func_extended" value="true" />
+       </application>
+
+        <application name="Unigine Tropics" executable="Tropics">
+            <option name="force_glsl_extensions_warn" value="true" />
+            <option name="disable_blend_func_extended" value="true" />
+       </application>
+
+        <application name="Unigine Heaven (32-bit)" executable="heaven_x86">
+            <option name="force_glsl_extensions_warn" value="true" />
+            <option name="disable_blend_func_extended" value="true" />
+            <option name="force_glsl_version" value="130" />
+            <option name="disable_shader_bit_encoding" value="true" />
+            <option name="allow_glsl_extension_directive_midshader" value="true" />
+       </application>
+
+        <application name="Unigine Heaven (64-bit)" executable="heaven_x64">
+            <option name="force_glsl_extensions_warn" value="true" />
+            <option name="disable_blend_func_extended" value="true" />
+            <option name="force_glsl_version" value="130" />
+            <option name="disable_shader_bit_encoding" value="true" />
+            <option name="allow_glsl_extension_directive_midshader" value="true" />
+       </application>
+
+        <application name="Unigine Valley (32-bit)" executable="valley_x86">
+            <option name="allow_glsl_extension_directive_midshader" value="true" />
+       </application>
+
+        <application name="Unigine Valley (64-bit)" executable="valley_x64">
+            <option name="allow_glsl_extension_directive_midshader" value="true" />
+       </application>
+
+        <application name="Unigine OilRush (32-bit)" executable="OilRush_x86">
+            <option name="disable_blend_func_extended" value="true" />
+       </application>
+
+        <application name="Unigine OilRush (64-bit)" executable="OilRush_x64">
+            <option name="disable_blend_func_extended" value="true" />
+       </application>
+
+        <application name="Savage 2" executable="savage2.bin">
+            <option name="disable_glsl_line_continuations" value="true" />
+        </application>
+
+        <application name="Topogun (32-bit)" executable="topogun32">
+            <option name="always_have_depth_buffer" value="true" />
+        </application>
+
+        <application name="Topogun (64-bit)" executable="topogun64">
+            <option name="always_have_depth_buffer" value="true" />
+        </application>
+    </device>
+</driconf>
index d1b801ba140f0dee5c7c767bc684f6c54ae3dafa..05c9617bc0f160e350286f9aefdb66f58f7062b2 100644 (file)
@@ -1,4 +1,4 @@
 # Configuration file for eselect
 # This file has been automatically generated.
-LDPATH="/usr/lib32/opengl/xorg-x11/lib:/usr/lib64/opengl/xorg-x11/lib"
+LDPATH="/usr/lib64/opengl/xorg-x11/lib"
 OPENGL_PROFILE="xorg-x11"
index 4c3959532710c00a28d9a4cf7e396b058ed371a2..f43f587390f8523519c61f3fa968e903dcf34edb 100644 (file)
@@ -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"
index cdceeda84dccdfb1a5a97ad4c38c792e850000d6..106fefd3a9e456f370055788147048b7b02f6bc5 120000 (symlink)
@@ -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
index a52a537dc7caa827461590b37513cc4acfcc799a..4b9db179bacf477f43504445d712d02822d32f5a 100644 (file)
@@ -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 (file)
index 5c741ac..0000000
+++ /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 (file)
index 0000000..195d1d0
--- /dev/null
@@ -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"
index 10bb8b625b9ed26ee584b10c8d1521838107517c..5edf5c60cefb38a24d7b3a4ed8f359a803afbc2c 100755 (executable)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib-r1,v 1.1 2010/10/10 18:35:37 hanno Exp $
+# $Id$
 
 depend() {
        need net
index ec831d7f848c36617b3a4328285f0217bde5b442..a74f218e6a32890835d07bf48356bb97de927e99 100755 (executable)
@@ -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/app-admin/rsyslog/files/8-stable/rsyslog.initd,v 1.1 2014/09/30 13:09:39 polynomial-c Exp $
+# $Id$
 
 RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
 RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
index 78a32b7b73eee666934313712e09be3096bf3353..f93278a89cd92518b1b5309d128beed5ec0792cf 100755 (executable)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.4 2012/05/27 07:22:43 robbat2 Exp $
+# $Id$
 
 extra_commands="checkconfig"
 
index b9ce806364f3b7bebc27bcaece6b6035bbf2d75f..ba2c55dfd91175315d8b5bff3c2bca061792210e 100644 (file)
@@ -10,7 +10,6 @@
 /usr/lib
 /usr/local/lib
 include ld.so.conf.d/*.conf
-/usr/lib32/opengl/xorg-x11/lib
 /usr/lib64/opengl/xorg-x11/lib
 /usr/lib/postgresql
 /usr/lib64/postgresql
index 68a046e950a68b8241429dde4b1afc125fdd5e65..0af24b8a68429816806272cba93efd1e376dba3f 100644 (file)
@@ -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
index 0033fbb976f5a5fd7734b481594f3ee86d2595ce..01f4d3f41813a0a734459038bd343fc935b9e246 100644 (file)
@@ -341,6 +341,7 @@ app-misc/ddate
 ~dev-perl/UNIVERSAL-can-1.201.106.170
 ~dev-perl/UNIVERSAL-isa-1.201.106.140
 ~dev-perl/URI-1.670.0
+~dev-perl/URI-1.690.0
 ~dev-perl/URI-Find-20111103.0.0
 ~dev-perl/URI-ws-0.30.0
 ~dev-perl/WWW-Pastebin-PastebinCom-Create-0.4.0
index 4e18dd0675318f5e82b4dc1249448854fb1d54b9..f01ccc0cf1f5ecce5ec5c4364a63056999fa7f27 100644 (file)
@@ -56,7 +56,7 @@ dev-lang/tk                           threads
 dev-libs/cyrus-sasl                     authdaemond -java
 dev-libs/geoip                         city perl-geoipupdate static-libs
 dev-libs/gmp                           pgo
-dev-libs/libgcrypt                      idea
+dev-libs/libgcrypt                      -doc idea
 dev-libs/liblogging                    rfc3195
 dev-libs/libmemcached                  -doc tcmalloc
 dev-libs/libusb                         -doc
index 13f6415b3a0e12408592f98c66ae551ac12c32cd..48afb26485f4d94719571c1efa66bb709c2b23b4 100644 (file)
@@ -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.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 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.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.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.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.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.4:/usr/lib64/subversion/bin'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/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.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 XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share'
index aaa54a982e22cb6027c04c435178491e1946db45..da9feb6432300224311e193ee8fd01ece1bc00d1 100644 (file)
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/icedtea-bin-7.2.5.5"
+SEARCH_DIRS_MASK="/opt/icedtea-bin-7.2.6.1"
index dd93ea742f5aeadb6737c6a7f2f3a44384f62fc6..09517f8e182b5b864c2c110a58b0cae683899fe9 100644 (file)
@@ -8,7 +8,7 @@
 # and thus you'll know about Linux's capability support.
 # [If you don't know about libcap, the sources for it are here:
 #
-#   http://linux.kernel.org/pub/linux/libs/security/linux-privs/
+#   http://www.kernel.org/pub/linux/libs/security/linux-privs/
 #
 # .]
 #
diff --git a/wgetrc b/wgetrc
index bd4b6a2e80c570ae1033a73e578bdbc50b7afb74..9a73ada1987024efb6e46044fc20f2ffb88d79e0 100644 (file)
--- a/wgetrc
+++ b/wgetrc
@@ -16,6 +16,9 @@
 ## To use the settings in this file, you will have to uncomment them,
 ## as well as change them, in most cases, as the values on the
 ## commented-out lines are the default values (e.g. "off").
+##
+## Command are case-, underscore- and minus-insensitive.
+## For example ftp_proxy, ftp-proxy and ftpproxy are the same.
 
 
 ##
 #iri = off
 
 # Force the default system encoding
-#locale = UTF-8
+#localencoding = UTF-8
 
 # Force the default remote server encoding
 #remoteencoding = UTF-8
index 352f135d6cf7eabe449cf1e88d6820198ef9b792..206c6aa48a9504509ac3cb132c8300d9f6c5ed38 100644 (file)
@@ -9,7 +9,7 @@ Comment=GNOME Keyring: GPG Agent
 Comment[de]=GNOME-Schlüsselbunddienst: GPG-Agent
 Comment[en_GB]=GNOME Keyring: GPG Agent
 Comment[ru]=Связка ключей GNOME: GPG-агент
-Comment[vi]=Vòng Khoá GNOME: GPG Agent
+Comment[vi]=Chùm chìa khóa GNOME: Đại diện GPG
 Exec=/usr/bin/gnome-keyring-daemon --start --components=gpg
 OnlyShowIn=GNOME;Unity;MATE;
 X-GNOME-Autostart-Phase=Initialization
@@ -18,4 +18,4 @@ X-GNOME-Autostart-Notify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.14.0
+X-GNOME-Bugzilla-Version=3.16.0
index c39737a5979a96b05aab3c4be6413a7bff94c0c4..c97029dd0385020bdca25bad2e135d07adb3eba7 100644 (file)
@@ -4,12 +4,12 @@ Name=Certificate and Key Storage
 Name[de]=Zertifikat-/Schlüsselverwahrung
 Name[en_GB]=Certificate and Key Storage
 Name[ru]=Хранилище сертификатов и ключей
-Name[vi]=Lưu trữ Chứng nhận và Khoá
+Name[vi]=Lưu trữ Chứng nhận và khóa
 Comment=GNOME Keyring: PKCS#11 Component
 Comment[de]=GNOME-Schlüsselbunddienst: PKCS#11-Komponente
 Comment[en_GB]=GNOME Keyring: PKCS#11 Component
 Comment[ru]=Связка ключей GNOME: компонент PKCS#11
-Comment[vi]=Vòng Khoá GNOME: thành phần PKCS#11
+Comment[vi]=Chùm chìa khóa GNOME: thành phần PKCS#11
 Exec=/usr/bin/gnome-keyring-daemon --start --components=pkcs11
 OnlyShowIn=GNOME;Unity;MATE;
 X-GNOME-Autostart-Phase=Initialization
@@ -18,4 +18,4 @@ X-GNOME-Autostart-Notify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.14.0
+X-GNOME-Bugzilla-Version=3.16.0
index 29eb3b38d4a973b87fc7f987f3114666d9c80611..239535dde4dc227a9057c0246ee7de82bebc8e89 100644 (file)
@@ -4,12 +4,12 @@ Name=Secret Storage Service
 Name[de]=Sicherheitsdienst
 Name[en_GB]=Secret Storage Service
 Name[ru]=Служба безопасного хранения
-Name[vi]=Dịch vụ lưu trữ mật
+Name[vi]=Dịch vụ lưu trữ bảo mật
 Comment=GNOME Keyring: Secret Service
 Comment[de]=GNOME-Schlüsselbunddienst: Sicherheitsdienst
 Comment[en_GB]=GNOME Keyring: Secret Service
 Comment[ru]=Связка ключей GNOME: служба безопасности
-Comment[vi]=Vòng Khoá GNOME: dịch vụ mật
+Comment[vi]=Chùm chìa khóa GNOME: dịch vụ bảo mật
 Exec=/usr/bin/gnome-keyring-daemon --start --components=secrets
 OnlyShowIn=GNOME;Unity;MATE;
 X-GNOME-Autostart-Phase=Initialization
@@ -18,4 +18,4 @@ X-GNOME-Autostart-Notify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.14.0
+X-GNOME-Bugzilla-Version=3.16.0
index bc01fa7d8e1e8a7d44b00dfb0c9b45bf8802a24c..3b540e200398e5459e0dd88df7d0c4958e2c64ba 100644 (file)
@@ -4,12 +4,12 @@ Name=SSH Key Agent
 Name[de]=SSH-Schlüsselagent
 Name[en_GB]=SSH Key Agent
 Name[ru]=Агент ключей SSH
-Name[vi]=Tác nhân khoá SSH
+Name[vi]=Đại diện khóa SSH
 Comment=GNOME Keyring: SSH Agent
 Comment[de]=GNOME-Schlüsselbunddienst: SSH-Agent
 Comment[en_GB]=GNOME Keyring: SSH Agent
 Comment[ru]=Связка ключей GNOME: SSH-агент
-Comment[vi]=Vòng Khoá GNOME: SSH Agent
+Comment[vi]=Chùm chìa khóa GNOME: Đại diện SSH
 Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
 OnlyShowIn=GNOME;Unity;MATE;
 X-GNOME-Autostart-Phase=Initialization
@@ -18,4 +18,4 @@ X-GNOME-Autostart-Notify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.14.0
+X-GNOME-Bugzilla-Version=3.16.0