From 02af8530aadc98bed5efd5f14aba9343e54134ff Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 8 Oct 2015 16:48:18 +0200 Subject: [PATCH] Current state --- .etckeeper | 13 ++- X11/xinit/xinitrc.d/40-libcanberra-gtk-module | 16 ++++ at-spi2/accessibility.conf | 3 +- config-archive/etc/logrotate.d/rsyslog | 57 +++++++++++ .../etc/logrotate.d/rsyslog.dist.new | 37 ++++++++ config-archive/etc/rsyslog.conf | 71 ++++++++++++++ config-archive/etc/rsyslog.conf.dist.new | 61 ++++++++++++ config-archive/etc/rsyslog.d/50-default.conf | 95 +++++++++++++++++++ .../etc/rsyslog.d/50-default.conf.dist.new | 95 +++++++++++++++++++ csh.env | 8 +- drirc | 91 ++++++++++++++++++ env.d/03opengl | 2 +- env.d/04gcc-x86_64-pc-linux-gnu | 8 +- env.d/gcc/.NATIVE | 2 +- env.d/gcc/config-x86_64-pc-linux-gnu | 2 +- env.d/gcc/x86_64-pc-linux-gnu-4.8.4 | 8 -- env.d/gcc/x86_64-pc-linux-gnu-4.8.5 | 8 ++ init.d/courier-authlib | 2 +- init.d/rsyslog | 2 +- init.d/slapd | 2 +- ld.so.conf | 1 - ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf | 4 +- portage/package.keywords | 1 + portage/package.use | 2 +- profile.env | 8 +- revdep-rebuild/61-icedtea-bin-7 | 2 +- security/capability.conf | 2 +- wgetrc | 5 +- xdg/autostart/gnome-keyring-gpg.desktop | 4 +- xdg/autostart/gnome-keyring-pkcs11.desktop | 6 +- xdg/autostart/gnome-keyring-secrets.desktop | 6 +- xdg/autostart/gnome-keyring-ssh.desktop | 6 +- 32 files changed, 583 insertions(+), 47 deletions(-) create mode 100755 X11/xinit/xinitrc.d/40-libcanberra-gtk-module create mode 100644 config-archive/etc/logrotate.d/rsyslog create mode 100644 config-archive/etc/logrotate.d/rsyslog.dist.new create mode 100644 config-archive/etc/rsyslog.conf create mode 100644 config-archive/etc/rsyslog.conf.dist.new create mode 100644 config-archive/etc/rsyslog.d/50-default.conf create mode 100644 config-archive/etc/rsyslog.d/50-default.conf.dist.new create mode 100644 drirc delete mode 100644 env.d/gcc/x86_64-pc-linux-gnu-4.8.4 create mode 100644 env.d/gcc/x86_64-pc-linux-gnu-4.8.5 diff --git a/.etckeeper b/.etckeeper index 246a489..4799604 100755 --- a/.etckeeper +++ b/.etckeeper @@ -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 index 0000000..63c16af --- /dev/null +++ b/X11/xinit/xinitrc.d/40-libcanberra-gtk-module @@ -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 diff --git a/at-spi2/accessibility.conf b/at-spi2/accessibility.conf index b9367d0..fc7d0f4 100644 --- a/at-spi2/accessibility.conf +++ b/at-spi2/accessibility.conf @@ -3,8 +3,7 @@ accessibility - - +/usr/share/dbus-1/accessibility-services EXTERNAL unix:tmpdir=/tmp diff --git a/config-archive/etc/logrotate.d/rsyslog b/config-archive/etc/logrotate.d/rsyslog new file mode 100644 index 0000000..3952b76 --- /dev/null +++ b/config-archive/etc/logrotate.d/rsyslog @@ -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 index 0000000..1eae30e --- /dev/null +++ b/config-archive/etc/logrotate.d/rsyslog.dist.new @@ -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 index 0000000..a927dca --- /dev/null +++ b/config-archive/etc/rsyslog.conf @@ -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 index 0000000..da48459 --- /dev/null +++ b/config-archive/etc/rsyslog.conf.dist.new @@ -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 index 0000000..28fa0a4 --- /dev/null +++ b/config-archive/etc/rsyslog.d/50-default.conf @@ -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 index 0000000..9ae8578 --- /dev/null +++ b/config-archive/etc/rsyslog.d/50-default.conf.dist.new @@ -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 db8468a..8a677e2 100644 --- 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 index 0000000..4b9841b --- /dev/null +++ b/drirc @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/env.d/03opengl b/env.d/03opengl index d1b801b..05c9617 100644 --- a/env.d/03opengl +++ b/env.d/03opengl @@ -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" diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index 4c39595..f43f587 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/gcc/.NATIVE b/env.d/gcc/.NATIVE index cdceeda..106fefd 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 a52a537..4b9db17 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 5c741ac..0000000 --- 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 0000000..195d1d0 --- /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/init.d/courier-authlib b/init.d/courier-authlib index 10bb8b6..5edf5c6 100755 --- a/init.d/courier-authlib +++ b/init.d/courier-authlib @@ -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 diff --git a/init.d/rsyslog b/init.d/rsyslog index ec831d7..a74f218 100755 --- a/init.d/rsyslog +++ b/init.d/rsyslog @@ -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"} diff --git a/init.d/slapd b/init.d/slapd index 78a32b7..f93278a 100755 --- a/init.d/slapd +++ b/init.d/slapd @@ -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" diff --git a/ld.so.conf b/ld.so.conf index b9ce806..ba2c55d 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -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 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 68a046e..0af24b8 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/portage/package.keywords b/portage/package.keywords index 0033fbb..01f4d3f 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -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 diff --git a/portage/package.use b/portage/package.use index 4e18dd0..f01ccc0 100644 --- a/portage/package.use +++ b/portage/package.use @@ -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 diff --git a/profile.env b/profile.env index 13f6415..48afb26 100644 --- 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.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' diff --git a/revdep-rebuild/61-icedtea-bin-7 b/revdep-rebuild/61-icedtea-bin-7 index aaa54a9..da9feb6 100644 --- a/revdep-rebuild/61-icedtea-bin-7 +++ b/revdep-rebuild/61-icedtea-bin-7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/icedtea-bin-7.2.5.5" +SEARCH_DIRS_MASK="/opt/icedtea-bin-7.2.6.1" diff --git a/security/capability.conf b/security/capability.conf index dd93ea7..09517f8 100644 --- a/security/capability.conf +++ b/security/capability.conf @@ -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 bd4b6a2..9a73ada 100644 --- 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. ## @@ -122,7 +125,7 @@ #iri = off # Force the default system encoding -#locale = UTF-8 +#localencoding = UTF-8 # Force the default remote server encoding #remoteencoding = UTF-8 diff --git a/xdg/autostart/gnome-keyring-gpg.desktop b/xdg/autostart/gnome-keyring-gpg.desktop index 352f135..206c6aa 100644 --- a/xdg/autostart/gnome-keyring-gpg.desktop +++ b/xdg/autostart/gnome-keyring-gpg.desktop @@ -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 diff --git a/xdg/autostart/gnome-keyring-pkcs11.desktop b/xdg/autostart/gnome-keyring-pkcs11.desktop index c39737a..c97029d 100644 --- a/xdg/autostart/gnome-keyring-pkcs11.desktop +++ b/xdg/autostart/gnome-keyring-pkcs11.desktop @@ -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 diff --git a/xdg/autostart/gnome-keyring-secrets.desktop b/xdg/autostart/gnome-keyring-secrets.desktop index 29eb3b3..239535d 100644 --- a/xdg/autostart/gnome-keyring-secrets.desktop +++ b/xdg/autostart/gnome-keyring-secrets.desktop @@ -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 diff --git a/xdg/autostart/gnome-keyring-ssh.desktop b/xdg/autostart/gnome-keyring-ssh.desktop index bc01fa7..3b540e2 100644 --- a/xdg/autostart/gnome-keyring-ssh.desktop +++ b/xdg/autostart/gnome-keyring-ssh.desktop @@ -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 -- 2.39.5