From 6609b92fdc3fde9c229a2748cafc4d446b699f8c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sat, 10 Oct 2015 00:12:02 +0200 Subject: [PATCH] Current state --- .java/deployment/deployment.properties | 1 + ImageMagick-6/delegates.xml | 8 +- at-spi2/accessibility.conf | 3 +- bluetooth/bluetooth.conf | 3 + bluetooth/main.conf | 26 ++++- collectd.conf | 2 +- conf.d/ebtables | 11 ++ conf.d/pydoc-2.7 | 2 +- conf.d/pydoc-3.4 | 2 +- config-archive/etc/logrotate.d/rsyslog | 84 +++++++++++++++ .../etc/logrotate.d/rsyslog.dist.new | 37 +++++++ config-archive/etc/rsyslog.conf | 72 +++++++++++++ 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 ++++++++++++++++ dbus-1/system.d/bluetooth.conf | 3 + .../org.freedesktop.NetworkManager.conf | 4 + dmtab | 2 +- env.d/04gcc-x86_64-pc-linux-gnu | 8 +- env.d/05binutils | 4 +- env.d/22javacc | 1 - env.d/binutils/config-x86_64-pc-linux-gnu | 2 +- env.d/binutils/x86_64-pc-linux-gnu-2.24 | 4 - env.d/binutils/x86_64-pc-linux-gnu-2.25.1 | 3 + 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.5 | 8 -- env.d/gcc/x86_64-pc-linux-gnu-4.9.3 | 8 ++ ethertypes | 37 +++++++ gconf/gconf.xml.defaults/%gconf-tree.xml | 96 ++++++++--------- gdm/custom.conf | 4 + i3/config | 9 +- i3/config.keycodes | 7 +- init.d/NetworkManager | 2 +- init.d/bluetooth | 2 +- init.d/device-mapper | 2 +- init.d/dmeventd | 2 +- init.d/ebtables | 102 ++++++++++++++++++ init.d/fancontrol | 2 +- init.d/lm_sensors | 2 +- init.d/lvm | 2 +- init.d/lvm-monitoring | 2 +- init.d/lvmetad | 2 +- init.d/postfix | 2 +- init.d/pydoc-2.7 | 2 +- init.d/pydoc-3.4 | 2 +- init.d/rfcomm | 2 +- init.d/rsyslog | 2 +- init.d/unbound | 2 +- init.d/virtlockd | 2 +- ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf | 4 +- libvirt/libvirtd.conf | 24 +++++ logrotate.d/libvirtd.libxl | 9 ++ lvm/lvm.conf | 102 +++++++++++++++--- mc/mc.default.keymap | 1 + mc/mc.emacs.keymap | 1 + mc/mc.ext | 10 +- mc/mc.keymap | 1 + mc/mcedit.menu | 2 +- portage/make.conf | 6 +- portage/package.use | 15 +-- postfix/postfix-files | 2 + postfix/saslpass | 2 +- profile.d/vte-2.91.sh | 4 +- pulse/client.conf | 4 +- pulse/daemon.conf | 6 +- pulse/default.pa | 13 ++- pulse/system.pa | 3 +- qemu/target-x86_64.conf | 0 revdep-rebuild/61-icedtea-bin-6 | 1 + revdep-rebuild/61-icedtea-bin-7 | 1 + sandbox.d/20icedtea-bin-6 | 1 + sandbox.d/20icedtea-bin-7 | 1 + sasl2/smtpd.conf | 2 +- security/capability.conf | 2 +- security/pwquality.conf | 12 +-- wgetrc | 5 +- xdg/autostart/evolution-alarm-notify.desktop | 4 +- xdg/autostart/gnome-keyring-gpg.desktop | 2 +- xdg/autostart/gnome-keyring-pkcs11.desktop | 2 +- xdg/autostart/gnome-keyring-secrets.desktop | 2 +- xdg/autostart/gnome-keyring-ssh.desktop | 2 +- xdg/autostart/pulseaudio-kde.desktop | 12 --- xdg/autostart/pulseaudio.desktop | 1 + xdg/autostart/tracker-extract.desktop | 2 +- xdg/autostart/tracker-miner-apps.desktop | 2 +- xdg/autostart/tracker-miner-fs.desktop | 2 +- .../tracker-miner-user-guides.desktop | 2 +- xdg/autostart/tracker-store.desktop | 2 +- 89 files changed, 925 insertions(+), 184 deletions(-) create mode 100644 .java/deployment/deployment.properties create mode 100644 conf.d/ebtables 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 delete mode 100644 env.d/22javacc delete mode 100644 env.d/binutils/x86_64-pc-linux-gnu-2.24 create mode 100644 env.d/binutils/x86_64-pc-linux-gnu-2.25.1 delete mode 100644 env.d/gcc/x86_64-pc-linux-gnu-4.8.5 create mode 100644 env.d/gcc/x86_64-pc-linux-gnu-4.9.3 create mode 100644 ethertypes create mode 100755 init.d/ebtables create mode 100644 logrotate.d/libvirtd.libxl delete mode 100644 qemu/target-x86_64.conf create mode 100644 revdep-rebuild/61-icedtea-bin-6 create mode 100644 revdep-rebuild/61-icedtea-bin-7 create mode 100644 sandbox.d/20icedtea-bin-6 create mode 100644 sandbox.d/20icedtea-bin-7 delete mode 100644 xdg/autostart/pulseaudio-kde.desktop diff --git a/.java/deployment/deployment.properties b/.java/deployment/deployment.properties new file mode 100644 index 0000000..74571d7 --- /dev/null +++ b/.java/deployment/deployment.properties @@ -0,0 +1 @@ +deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml index f838a0e..ef9789c 100644 --- a/ImageMagick-6/delegates.xml +++ b/ImageMagick-6/delegates.xml @@ -95,12 +95,12 @@ - + - + @@ -113,7 +113,7 @@ - + @@ -134,5 +134,5 @@ - + 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/bluetooth/bluetooth.conf b/bluetooth/bluetooth.conf index 0ae606e..d32eea4 100644 --- a/bluetooth/bluetooth.conf +++ b/bluetooth/bluetooth.conf @@ -18,7 +18,10 @@ + + + diff --git a/bluetooth/main.conf b/bluetooth/main.conf index d4d6ab0..11db383 100644 --- a/bluetooth/main.conf +++ b/bluetooth/main.conf @@ -52,6 +52,20 @@ # Possible values: "dual", "bredr", "le" #ControllerMode = dual +# Enables Multi Profile Specification support. This allows to specify if +# system supports only Multiple Profiles Single Device (MPSD) configuration +# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple +# Devices (MPMD) configurations. +# Possible values: "off", "single", "multiple" +#MultiProfile = off + +# Permanently enables the Fast Connectable setting for adapters that +# support it. When enabled other devices can connect faster to us, +# however the tradeoff is increased power consumptions. This feature +# will fully work only on kernel version 4.1 and newer. Defaults to +# 'false'. +#FastConnectable = false + #[Policy] # # The ReconnectUUIDs defines the set of remote services that should try @@ -59,4 +73,14 @@ # timeout). The policy plugin should contain a sane set of values by # default, but this list can be overridden here. By setting the list to # empty the reconnection feature gets disabled. -#ReconnectUUIDs= +#ReconnectUUIDs=00001112-0000-1000-8000-00805f9b34fb, 0000111f-0000-1000-8000-00805f9b34fb, 0000110a-0000-1000-8000-00805f9b34fb + +# ReconnectAttempts define the number of attempts to reconnect after a link +# lost. Setting the value to 0 disables reconnecting feature. +#ReconnectAttempts=7 + +# ReconnectIntervals define the set of intervals in seconds to use in between +# attempts. +# If the number of attempts defined in ReconnectAttempts is bigger than the +# set of intervals the last interval is repeated until the last attempt. +#ReconnectIntervals=1, 2, 4, 8, 16, 32, 64 diff --git a/collectd.conf b/collectd.conf index b8735e5..34c45f2 100644 --- a/collectd.conf +++ b/collectd.conf @@ -181,7 +181,7 @@ LoadPlugin rrdtool ##LoadPlugin write_http ##LoadPlugin write_mongodb ##LoadPlugin write_redis -##LoadPlugin write_riemann +#LoadPlugin write_riemann ##LoadPlugin xmms ##LoadPlugin zfs_arc diff --git a/conf.d/ebtables b/conf.d/ebtables new file mode 100644 index 0000000..645b26e --- /dev/null +++ b/conf.d/ebtables @@ -0,0 +1,11 @@ +# /etc/conf.d/ebtables + +# Location in which ebtables initscript will save set rules on +# service shutdown +EBTABLES_SAVE="/var/lib/ebtables/rules-save" + +# Options to pass to ebtables-save and ebtables-restore +SAVE_RESTORE_OPTIONS="" + +# Save state on stopping ebtables +SAVE_ON_STOP="yes" diff --git a/conf.d/pydoc-2.7 b/conf.d/pydoc-2.7 index 50633ca..b5af52d 100644 --- a/conf.d/pydoc-2.7 +++ b/conf.d/pydoc-2.7 @@ -1,5 +1,5 @@ # /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 $ +# $Id$ # This file contains the configuration for pydoc's internal webserver. diff --git a/conf.d/pydoc-3.4 b/conf.d/pydoc-3.4 index 7beefff..e5e1149 100644 --- a/conf.d/pydoc-3.4 +++ b/conf.d/pydoc-3.4 @@ -1,5 +1,5 @@ # /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 $ +# $Id$ # This file contains the configuration for pydoc's internal webserver. diff --git a/config-archive/etc/logrotate.d/rsyslog b/config-archive/etc/logrotate.d/rsyslog new file mode 100644 index 0000000..fec0bd2 --- /dev/null +++ b/config-archive/etc/logrotate.d/rsyslog @@ -0,0 +1,84 @@ +# 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 +#} + +script syslog-reload + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null || true +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 +#} + +/var/log/messages /var/log/syslog { + daily + missingok + olddir /var/log/.old/%Y-%m + size 1024K + postrotate syslog-reload +} + +/var/log/syslog.d/*.log { + daily + missingok + olddir /var/log/syslog.d/.old/%Y-%m + size 1024K + postrotate syslog-reload + maxage 1y +} + +/var/log/debug.log /var/log/debug /var/log/all /var/log/all.log { + daily + missingok + olddir /var/log/.old/%Y-%m + 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 +#} + 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..df010df --- /dev/null +++ b/config-archive/etc/rsyslog.conf @@ -0,0 +1,72 @@ +# /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..8526133 --- /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,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,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/dbus-1/system.d/bluetooth.conf b/dbus-1/system.d/bluetooth.conf index 0ae606e..d32eea4 100644 --- a/dbus-1/system.d/bluetooth.conf +++ b/dbus-1/system.d/bluetooth.conf @@ -18,7 +18,10 @@ + + + diff --git a/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf index bdfe3e6..afbcc72 100644 --- a/dbus-1/system.d/org.freedesktop.NetworkManager.conf +++ b/dbus-1/system.d/org.freedesktop.NetworkManager.conf @@ -25,6 +25,8 @@ + + @@ -120,5 +122,7 @@ + + 1024 diff --git a/dmtab b/dmtab index 5fc1d79..0f3f05a 100644 --- a/dmtab +++ b/dmtab @@ -1,5 +1,5 @@ #/etc/dmraid: config file for adding device-mapper volumes at boot -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmtab,v 1.1 2009/04/09 23:00:10 caleb Exp $ +# $Id$ # Format: : # Example: isw0: 0 312602976 striped 2 128 /dev/sda 0 /dev/sdb 0 diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index f43f587..529faa9 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.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/05binutils b/env.d/05binutils index 6c9aa5a..04fe88f 100644 --- a/env.d/05binutils +++ b/env.d/05binutils @@ -1,2 +1,2 @@ -MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man -INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info +MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man +INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info diff --git a/env.d/22javacc b/env.d/22javacc deleted file mode 100644 index 0dfd090..0000000 --- a/env.d/22javacc +++ /dev/null @@ -1 +0,0 @@ -JAVACC_HOME=/usr/share/javacc/ diff --git a/env.d/binutils/config-x86_64-pc-linux-gnu b/env.d/binutils/config-x86_64-pc-linux-gnu index 77a1de2..41de2f3 100644 --- a/env.d/binutils/config-x86_64-pc-linux-gnu +++ b/env.d/binutils/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=2.24 +CURRENT=2.25.1 diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.24 b/env.d/binutils/x86_64-pc-linux-gnu-2.24 deleted file mode 100644 index c57d3fe..0000000 --- a/env.d/binutils/x86_64-pc-linux-gnu-2.24 +++ /dev/null @@ -1,4 +0,0 @@ -TARGET="x86_64-pc-linux-gnu" -VER="2.24" -LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.24" -FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.25.1 b/env.d/binutils/x86_64-pc-linux-gnu-2.25.1 new file mode 100644 index 0000000..97a2a18 --- /dev/null +++ b/env.d/binutils/x86_64-pc-linux-gnu-2.25.1 @@ -0,0 +1,3 @@ +TARGET="x86_64-pc-linux-gnu" +VER="2.25.1" +LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.25.1" diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE index 106fefd..0967d73 120000 --- 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 4b9db17..5ef56a3 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.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 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 new file mode 100644 index 0000000..e6e03df --- /dev/null +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 @@ -0,0 +1,8 @@ +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" +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/ethertypes b/ethertypes new file mode 100644 index 0000000..5e700f6 --- /dev/null +++ b/ethertypes @@ -0,0 +1,37 @@ +# +# Ethernet frame types +# This file describes some of the various Ethernet +# protocol types that are used on Ethernet networks. +# +# This list could be found on: +# http://www.iana.org/assignments/ethernet-numbers +# +# ... #Comment +# +IPv4 0800 ip ip4 # Internet IP (IPv4) +X25 0805 +ARP 0806 ether-arp # +FR_ARP 0808 # Frame Relay ARP [RFC1701] +BPQ 08FF # G8BPQ AX.25 Ethernet Packet +DEC 6000 # DEC Assigned proto +DNA_DL 6001 # DEC DNA Dump/Load +DNA_RC 6002 # DEC DNA Remote Console +DNA_RT 6003 # DEC DNA Routing +LAT 6004 # DEC LAT +DIAG 6005 # DEC Diagnostics +CUST 6006 # DEC Customer use +SCA 6007 # DEC Systems Comms Arch +TEB 6558 # Trans Ether Bridging [RFC1701] +RAW_FR 6559 # Raw Frame Relay [RFC1701] +AARP 80F3 # Appletalk AARP +ATALK 809B # Appletalk +802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame +IPX 8137 # Novell IPX +NetBEUI 8191 # NetBEUI +IPv6 86DD ip6 # IP version 6 +PPP 880B # PPP +ATMMPOA 884C # MultiProtocol over ATM +PPP_DISC 8863 # PPPoE discovery messages +PPP_SES 8864 # PPPoE session messages +ATMFATE 8884 # Frame-based ATM Transport over Ethernet +LOOP 9000 loopback # loop proto diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 5cefeec..ba7a250 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -20881,13 +20881,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" @@ -20895,7 +20895,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. @@ -20903,13 +20903,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" @@ -20917,7 +20917,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. @@ -20925,13 +20925,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" @@ -20939,7 +20939,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. @@ -20947,13 +20947,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" @@ -20961,7 +20961,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. @@ -20969,13 +20969,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" @@ -20983,7 +20983,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. @@ -20991,13 +20991,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" @@ -21005,7 +21005,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. @@ -21013,13 +21013,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" @@ -21027,7 +21027,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. @@ -21079,13 +21079,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" @@ -21093,7 +21093,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. @@ -22328,39 +22328,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -22373,9 +22373,9 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + diff --git a/gdm/custom.conf b/gdm/custom.conf index 36591e3..c9e2864 100644 --- a/gdm/custom.conf +++ b/gdm/custom.conf @@ -1,6 +1,8 @@ # GDM configuration storage [daemon] +# Uncoment the line below to force the login screen to use Xorg +#WaylandEnable=false [security] @@ -11,4 +13,6 @@ [chooser] [debug] +# Uncomment the line below to turn on debugging +#Enable=true diff --git a/i3/config b/i3/config index 30b3f6a..f7722d3 100644 --- a/i3/config +++ b/i3/config @@ -11,9 +11,12 @@ # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. +font pango:monospace 8 + # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). -font pango:DejaVu Sans Mono 8 +#font pango:DejaVu Sans Mono 8 + # Before i3 v4.8, we used to recommend this one as the default: # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 # The font above is very space-efficient, that is, it looks good, sharp and @@ -75,7 +78,7 @@ bindsym Mod1+h split h bindsym Mod1+v split v # enter fullscreen mode for the focused container -bindsym Mod1+f fullscreen +bindsym Mod1+f fullscreen toggle # change container layout (stacked, tabbed, toggle split) bindsym Mod1+s layout stacking @@ -166,7 +169,7 @@ bar { ####################################################################### # automatically start i3-config-wizard to offer the user to create a -# keysym-based config which used his favorite modifier (alt or windows) +# keysym-based config which used their favorite modifier (alt or windows) # # i3-config-wizard will not launch if there already is a config file # in ~/.i3/config. diff --git a/i3/config.keycodes b/i3/config.keycodes index 2739851..0c978d0 100644 --- a/i3/config.keycodes +++ b/i3/config.keycodes @@ -12,9 +12,12 @@ set $mod Mod1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. +font pango:monospace 8 + # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). -font pango:DejaVu Sans Mono 8 +#font pango:DejaVu Sans Mono 8 + # Before i3 v4.8, we used to recommend this one as the default: # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 # The font above is very space-efficient, that is, it looks good, sharp and @@ -69,7 +72,7 @@ bindcode $mod+43 split h bindcode $mod+55 split v # enter fullscreen mode for the focused container -bindcode $mod+41 fullscreen +bindcode $mod+41 fullscreen toggle # change container layout (stacked, tabbed, toggle split) bindcode $mod+39 layout stacking diff --git a/init.d/NetworkManager b/init.d/NetworkManager index 8465449..bd828b7 100755 --- a/init.d/NetworkManager +++ b/init.d/NetworkManager @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright (c) 2008 Saleem Abdulrasool # Distributed under the terms of the GNU General Purpose License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/init.d.NetworkManager,v 1.1 2013/01/28 07:05:05 tetromino Exp $ +# $Id$ description="NetworkManager daemon. The service is marked as started only \ when a network connection is established." diff --git a/init.d/bluetooth b/init.d/bluetooth index f97fdb2..3b9569e 100755 --- a/init.d/bluetooth +++ b/init.d/bluetooth @@ -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-wireless/bluez/files/bluetooth-init.d-r3,v 1.2 2014/01/09 13:24:42 joker Exp $ +# $Id$ depend() { after coldplug diff --git a/init.d/device-mapper b/init.d/device-mapper index 56e7503..5e3669d 100755 --- a/init.d/device-mapper +++ b/init.d/device-mapper @@ -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-fs/lvm2/files/device-mapper.rc-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $ +# $Id$ depend() { # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that diff --git a/init.d/dmeventd b/init.d/dmeventd index 3c2f5f3..7067391 100755 --- a/init.d/dmeventd +++ b/init.d/dmeventd @@ -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-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.3 2014/02/08 21:17:46 robbat2 Exp $ +# $Id$ PIDFILE=/run/dmeventd.pid BIN=/sbin/dmeventd diff --git a/init.d/ebtables b/init.d/ebtables new file mode 100755 index 0000000..770dd43 --- /dev/null +++ b/init.d/ebtables @@ -0,0 +1,102 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +extra_commands="save panic" +extra_started_commands="reload" + +ebtables_bin="/sbin/ebtables" +ebtables_save=${EBTABLES_SAVE} + +depend() { + before net + use logger +} + +ebtables_tables() { + for table in filter nat broute; do + if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then + echo -n "${table} " + fi + done +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + broute) chains="BROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${ebtables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkconfig() { + if [ ! -f ${ebtables_save} ] ; then + eerror "Not starting ebtables. First create some rules then run:" + eerror "/etc/init.d/ebtables save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ebtables state and starting bridge firewall" + ${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + ebegin "Stopping bridge firewall" + local a + for a in $(ebtables_tables); do + set_table_policy $a ACCEPT + + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + done + eend $? +} + +reload() { + ebegin "Flushing bridge firewall" + local a + for a in $(ebtables_tables); do + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + done + eend $? + + start +} + +save() { + ebegin "Saving ebtables state" + touch "${ebtables_save}" + chmod 0600 "${ebtables_save}" + ${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}" + eend $? +} + +panic() { + service_started ebtables && svc_stop + + local a + ebegin "Dropping all packets forwarded on bridges" + for a in $(ebtables_tables); do + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + + set_table_policy $a DROP + done + eend $? +} diff --git a/init.d/fancontrol b/init.d/fancontrol index 51857a1..0474d12 100755 --- a/init.d/fancontrol +++ b/init.d/fancontrol @@ -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/sys-apps/lm_sensors/files/fancontrol-init.d-2,v 1.1 2012/12/28 00:00:03 flameeyes Exp $ +# $Id$ CONFIG=/etc/fancontrol diff --git a/init.d/lm_sensors b/init.d/lm_sensors index 18fb353..b33814f 100755 --- a/init.d/lm_sensors +++ b/init.d/lm_sensors @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3-init.d,v 1.1 2008/03/17 07:59:28 dberkholz Exp $ +# $Id$ checkconfig() { if [ ! -f /etc/conf.d/lm_sensors ]; then diff --git a/init.d/lvm b/init.d/lvm index 7fdf50e..62ddac4 100755 --- a/init.d/lvm +++ b/init.d/lvm @@ -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-fs/lvm2/files/lvm.rc-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $ +# $Id$ depend() { before checkfs fsck diff --git a/init.d/lvm-monitoring b/init.d/lvm-monitoring index c53a604..fd76d96 100755 --- a/init.d/lvm-monitoring +++ b/init.d/lvm-monitoring @@ -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-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $ +# $Id$ # This script is based on upstream file # LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in diff --git a/init.d/lvmetad b/init.d/lvmetad index e16d55c..abeca75 100755 --- a/init.d/lvmetad +++ b/init.d/lvmetad @@ -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-fs/lvm2/files/lvmetad.initd-2.02.105-r2,v 1.2 2014/02/08 21:17:46 robbat2 Exp $ +# $Id$ pidfile="/run/lvmetad.pid" command="/sbin/lvmetad" diff --git a/init.d/postfix b/init.d/postfix index aecd8e7..d37981d 100755 --- a/init.d/postfix +++ b/init.d/postfix @@ -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/mail-mta/postfix/files/postfix.rc6.2.7,v 1.2 2012/03/07 10:27:37 eras Exp $ +# $Id$ extra_started_commands="reload abort flush" diff --git a/init.d/pydoc-2.7 b/init.d/pydoc-2.7 index 79c2374..4bc5545 100755 --- a/init.d/pydoc-2.7 +++ b/init.d/pydoc-2.7 @@ -1,7 +1,7 @@ #!/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 $ +# $Id$ start() { local pydoc_port="${PYDOC2_7_PORT-${PYDOC_PORT}}" diff --git a/init.d/pydoc-3.4 b/init.d/pydoc-3.4 index 0b51442..26f6781 100755 --- a/init.d/pydoc-3.4 +++ b/init.d/pydoc-3.4 @@ -1,7 +1,7 @@ #!/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 $ +# $Id$ start() { local pydoc_port="${PYDOC3_4_PORT-${PYDOC_PORT}}" diff --git a/init.d/rfcomm b/init.d/rfcomm index c564055..4a91916 100755 --- a/init.d/rfcomm +++ b/init.d/rfcomm @@ -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-wireless/bluez/files/rfcomm-init.d-r2,v 1.1 2014/06/26 17:18:43 alonbl Exp $ +# $Id$ depend() { need bluetooth 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/unbound b/init.d/unbound index 90deb23..f17d072 100755 --- a/init.d/unbound +++ b/init.d/unbound @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/files/unbound.initd,v 1.2 2011/09/13 15:14:49 matsuu Exp $ +# $Id$ name="unbound daemon" extra_commands="configtest" diff --git a/init.d/virtlockd b/init.d/virtlockd index bfa37a5..396ab65 100755 --- a/init.d/virtlockd +++ b/init.d/virtlockd @@ -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/libvirt/files/virtlockd.init-r1,v 1.1 2015/05/24 21:05:42 tamiko Exp $ +# $Id$ description="libvirt virtual machine lock manager" command="/usr/sbin/virtlockd" 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 0af24b8..8bf4cbe 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.5/32 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/32 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3 diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf index 069ef3a..ac06cdd 100644 --- a/libvirt/libvirtd.conf +++ b/libvirt/libvirtd.conf @@ -106,9 +106,17 @@ # control, then you may want to relax this too. #unix_sock_rw_perms = "0770" +# Set the UNIX socket permissions for the admin interface socket. +# +# Default allows only owner (root), do not change it unless you are +# sure to whom you are exposing the access to. +#unix_sock_admin_perms = "0700" + # Set the name of the directory in which sockets will be found/created. #unix_sock_dir = "/var/run/libvirt" + + ################################################################# # # Authentication. @@ -307,6 +315,16 @@ # and max_workers parameter #max_client_requests = 5 +# Same processing controls, but this time for the admin interface. +# For description of each option, be so kind to scroll few lines +# upwards. + +#admin_min_workers = 1 +#admin_max_workers = 5 +#admin_max_clients = 5 +#admin_max_queued_clients = 5 +#admin_max_client_requests = 5 + ################################################################# # # Logging controls @@ -427,3 +445,9 @@ # support keepalive protocol. Defaults to 0. # #keepalive_required = 1 + +# Keepalive settings for the admin interface +#admin_keepalive_interval = 5 +#admin_keepalive_count = 5 +# +#admin_keepalive_required = 1 diff --git a/logrotate.d/libvirtd.libxl b/logrotate.d/libvirtd.libxl new file mode 100644 index 0000000..c531513 --- /dev/null +++ b/logrotate.d/libvirtd.libxl @@ -0,0 +1,9 @@ +/var/log/libvirt/libxl/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/lvm/lvm.conf b/lvm/lvm.conf index b9041b1..7e2e648 100644 --- a/lvm/lvm.conf +++ b/lvm/lvm.conf @@ -39,6 +39,22 @@ devices { # to use with LVM2. scan = [ "/dev" ] + # Select external device information source to use for further and more + # detailed device determination. Some information may already be available + # in the system and LVM2 can use this information to determine the exact + # type or use of the device it processes. Using existing external device + # information source can speed up device processing as LVM2 does not need + # to run its own native routines to acquire this information. For example, + # such information is used to drive LVM2 filtering like MD component + # detection, multipath component detection, partition detection and others. + # Possible options are: + # "none" - No external device information source is used. + # + # "udev" - Reuse existing udev database records. Applicable + # only if LVM is compiled with udev support. + # + external_device_info_source = "none" + # If set, the cache of block device nodes with all associated symlinks # will be constructed out of the existing udev database content. # This avoids using and opening any inapplicable non-block devices or @@ -166,6 +182,14 @@ devices { # 1 enables; 0 disables. md_component_detection = 1 + # By default, LVM2 will not ignore devices used as components of + # firmware RAID devices. Set to 1 to enable this detection. + # N.B. LVM2 itself is not detecting firmware RAID - an + # external_device_info_source other than "none" must + # be used for this detection to execute. + # 1 enables; 0 disables + fw_raid_component_detection = 0 + # By default, if a PV is placed directly upon an md device, LVM2 # will align its data blocks with the md device's stripe-width. # 1 enables; 0 disables. @@ -339,6 +363,15 @@ allocation { # range from 32(kiB) to 1048576 in multiples of 32. # cache_pool_chunk_size = 64 + # Specify the default cache mode used for new cache pools. + # Possible options are: + # "writethrough" - Data blocks are immediately written from + # the cache to disk. + # "writeback" - Data blocks are written from the cache + # back to disk after some delay to improve + # performance. + # cache_pool_cachemode = "writethrough" + # Set to 1 to guarantee that thin pool metadata will always # be placed on different PVs from the pool data. thin_pool_metadata_require_separate_pvs = 0 @@ -374,6 +407,9 @@ allocation { # first use. # N.B. zeroing larger thin pool chunk size degrades performance. # thin_pool_zero = 1 + + # Default physical extent size to use for newly created VGs (in KB). + # physical_extent_size = 4096 } # This section that allows you to configure the nature of the @@ -658,6 +694,24 @@ global { # setting. raid10_segtype_default = "raid10" + # 'sparse_segtype_default' defines which segtype will be used when the + # shorthand '-V and -L' option is used for sparse volume creation. + # + # "snapshot" - The original snapshot implementation provided by LVM2/DM. + # It is using old snashot that mixes data and metadata within + # a single COW storage volume and has poor performs when + # the size of stored data passes hundereds of MB. + # + # "thin" - Newer implementation leverages thin provisioning target. + # It has bigger minimal chunk size (64KiB) and uses separate volume + # for metadata. It has better performance especially in case of + # bigger data uses. This device type has also full snapshot support. + # + # Specify the '--type ' option to override this default + # setting. + sparse_segtype_default = "thin" + + # The default format for displaying LV names in lvdisplay was changed # in version 2.02.89 to show the LV name and path separately. # Previously this was always shown as /dev/vgname/lvname even when that @@ -680,26 +734,31 @@ global { # If lvmetad has been running while use_lvmetad was 0, it MUST be stopped # before changing use_lvmetad to 1 and started again afterwards. # - # If using lvmetad, the volume activation is also switched to automatic + # If using lvmetad, volume activation is also switched to automatic # event-based mode. In this mode, the volumes are activated based on - # incoming udev events that automatically inform lvmetad about new PVs - # that appear in the system. Once the VG is complete (all the PVs are - # present), it is auto-activated. The activation/auto_activation_volume_list - # setting controls which volumes are auto-activated (all by default). - # + # incoming udev events that automatically inform lvmetad about new PVs that + # appear in the system. Once a VG is complete (all the PVs are present), it + # is auto-activated. The activation/auto_activation_volume_list setting + # controls which volumes are auto-activated (all by default). + # A note about device filtering while lvmetad is used: - # When lvmetad is updated (either automatically based on udev events - # or directly by pvscan --cache call), the devices/filter - # is ignored and all devices are scanned by default. The lvmetad always - # keeps unfiltered information which is then provided to LVM commands - # and then each LVM command does the filtering based on devices/filter - # setting itself. - # To prevent scanning devices completely, even when using lvmetad, - # the devices/global_filter must be used. + + # When lvmetad is updated (either automatically based on udev events or + # directly by a pvscan --cache call), devices/filter is ignored and + # all devices are scanned by default -- lvmetad always keeps unfiltered + # information which is then provided to LVM commands and then each LVM + # command does the filtering based on devices/filter setting itself. This + # does not apply to non-regexp filters though: component filters such as + # multipath and MD are checked at pvscan --cache time. + + # In order to completely prevent LVM from scanning a device, even when using + # lvmetad, devices/global_filter must be used. + # N.B. Don't use lvmetad with locking type 3 as lvmetad is not yet # supported in clustered environment. If use_lvmetad=1 and locking_type=3 # is set at the same time, LVM always issues a warning message about this - # and then it automatically disables lvmetad use. + # and then it automatically disables use_lvmetad. + use_lvmetad = 1 # Full path of the utility called to check that a thin metadata device @@ -747,6 +806,7 @@ global { # external_origin # metadata_resize # external_origin_extend + # error_if_no_space # # thin_disabled_features = [ "discards", "block_size" ] @@ -907,6 +967,13 @@ activation { # enables or disables this automatic setting of the flag while LVs are created. # auto_set_activation_skip = 1 + # Control error behavior when provisioned device becomes full. This + # determines the default --errorwhenfull setting of new thin pools. + # The command line option --errorwhenfull takes precedence over this + # setting. error_when_full 0 means --errorwhenfull n. + # + # error_when_full = 0 + # For RAID or 'mirror' segment types, 'raid_region_size' is the # size (in KiB) of each: # - synchronization operation when initializing @@ -1074,6 +1141,11 @@ activation { # Report settings. # # report { + # If compact output is enabled, fields which don't have value + # set for any of the rows reported are skipped on output. Compact + # output is applicable only if report is buffered (report/buffered=1). + # compact_output=0 + # Align columns on report output. # aligned=1 diff --git a/mc/mc.default.keymap b/mc/mc.default.keymap index a82756f..9698bd5 100644 --- a/mc/mc.default.keymap +++ b/mc/mc.default.keymap @@ -97,6 +97,7 @@ EditNew = f14 CopySingle = f15 MoveSingle = f16 DeleteSingle = f18 +# SelectExt = Select = alt-plus Unselect = alt-minus SelectInvert = alt-asterisk diff --git a/mc/mc.emacs.keymap b/mc/mc.emacs.keymap index 4c43c5c..cfce480 100644 --- a/mc/mc.emacs.keymap +++ b/mc/mc.emacs.keymap @@ -97,6 +97,7 @@ EditNew = f14 CopySingle = f15 MoveSingle = f16 DeleteSingle = f18 +# SelectExt = Select = alt-plus Unselect = alt-minus SelectInvert = alt-asterisk diff --git a/mc/mc.ext b/mc/mc.ext index 7a8a545..8e220b3 100644 --- a/mc/mc.ext +++ b/mc/mc.ext @@ -604,8 +604,8 @@ regex/i/\.djvu?$ regex/i/\.cb[zr]$ Open=/usr/libexec/mc/ext.d/doc.sh open comic -# Epub -shell/i/.epub +# Epub & mobi +regex/i/\.(epub|mobi)$ Open=/usr/libexec/mc/ext.d/doc.sh open epub View=%view{ascii} /usr/libexec/mc/ext.d/doc.sh view epub @@ -656,6 +656,10 @@ shell/i/.glade shell/.mo View=%view{ascii} /usr/libexec/mc/ext.d/misc.sh view mo +# po +shell/.po + Open=/usr/libexec/mc/ext.d/misc.sh open po + # lyx shell/i/.lyx Open=/usr/libexec/mc/ext.d/misc.sh open lyx @@ -691,7 +695,7 @@ type/i/^zip\ archive View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view zip # jar(zip) -type/i/^Java\ Jar\ file\ data\ \(zip\) +type/i/^Java\ (Jar\ file|archive)\ data\ \((zip|JAR)\) Open=%cd %p/uzip:// View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view zip diff --git a/mc/mc.keymap b/mc/mc.keymap index a82756f..9698bd5 100644 --- a/mc/mc.keymap +++ b/mc/mc.keymap @@ -97,6 +97,7 @@ EditNew = f14 CopySingle = f15 MoveSingle = f16 DeleteSingle = f18 +# SelectExt = Select = alt-plus Unselect = alt-minus SelectInvert = alt-asterisk diff --git a/mc/mcedit.menu b/mc/mcedit.menu index 6163c50..7800202 100644 --- a/mc/mcedit.menu +++ b/mc/mcedit.menu @@ -461,7 +461,7 @@ m view `man' MAN=%{Enter name of man:} %view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN -i Insert a out of command to cursor. +i Insert output of command to cursor CMD=%{ Enter command: } eval $CMD > %b diff --git a/portage/make.conf b/portage/make.conf index 6999de8..1be0efa 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -13,13 +13,13 @@ CHOST="x86_64-pc-linux-gnu" USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ bazaar bluray caja calendar caps cddb cdparanoia cgi cpudetection cscope \ css ctype curl curlwrappers cvs dane dbase dga djvu dv dvb dvdread \ - examples expat fastcgi fftw fits flatfile fltk fontconfig \ - foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep \ + examples expat fastcgi fftw fits flatfile flickr fltk fontconfig \ + foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep gost \ gphoto2 graphviz gsl gsm gtk3 gtkhtml handbook highlight hscolour html icu id3 \ id3tag idea idn ieee1394 imagemagick imap imlib inifile jabber jack \ java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \ kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex libav \ - libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo \ + libsamplerate libwww live lm_sensors log4j logrotate lua lz4 lzma lzo \ mate meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \ musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \ nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \ diff --git a/portage/package.use b/portage/package.use index d9c0da1..705d402 100644 --- a/portage/package.use +++ b/portage/package.use @@ -14,6 +14,7 @@ app-crypt/qca gpg openssl app-crypt/johntheripper custom-cflags # app-crypt/mit-krb5 -doc app-crypt/mit-krb5 -doc -pkinit +app-crypt/pinentry clipboard app-crypt/seahorse-plugins applet app-doc/doxygen dot @@ -23,7 +24,7 @@ app-editors/gedit -python_targets_python3_3 # app-editors/vim vim-pager vim-with-x # app-editors/gvim netbeans -app-emulation/qemu kvm vde +app-emulation/qemu kvm vde vte app-emulation/virtualbox extensions vnc app-misc/beagle chm ole thunderbird @@ -44,7 +45,7 @@ app-text/asciidoc python_single_target_python2_7 app-text/djvu doc threads app-text/docbook-sgml-utils jadetex app-text/enchant aspell -zemberek -app-text/evince djvu dvi t1lib +app-text/evince djvu dvi -nsplugin t1lib app-text/texlive context cyrillic detex dvi2tty dvipdfm epspdf extra games graphics humanities jadetex metapost music omega pdfannotextractor pstricks publishers science tex4ht texi2html xetex xindy app-text/texlive-core xetex @@ -148,7 +149,7 @@ dev-scheme/guile deprecated discouraged networking regex dev-tex/chktex -doc dev-util/gtk-doc highlight vim -dev-util/strace aio +dev-util/strace aio unwind dev-vcs/git highlight tk dev-vcs/gitg -python_targets_python3_3 python_targets_python3_4 @@ -210,7 +211,7 @@ media-gfx/dcraw gimp media-gfx/exiv2 contrib xmp media-gfx/gimp gimpprint smp media-gfx/graphicsmagick fpx -media-gfx/graphviz pango +media-gfx/graphviz devil gdk-pixbuf gts pango # media-gfx/imagemagick autotrace corefonts fpx gs hdri lqr raw webp media-gfx/imagemagick autotrace corefonts fpx gs fpx hdri lqr raw webp media-gfx/inkscape dia gs inkjar postscript @@ -247,7 +248,7 @@ media-libs/xine-lib fusion vdr xvmc media-libs/xvid pic media-plugins/audacious-plugins adplug bs2b cue fluidsynth gtk -gtk3 icecast midi projectm scrobbler tta -media-plugins/grilo-plugins tracker upnp-av +media-plugins/grilo-plugins subtitles tracker upnp-av media-plugins/gst-plugins-meta http libvisual media-plugins/gst-plugins-meta:1.0 ffmpeg http libvisual @@ -257,7 +258,7 @@ media-sound/amarok cdaudio cdda daap ifp ipod mp3tunes mp4 media-sound/audacious chardet gtk -gtk3 # media-sound/easytag wavpack media-sound/jack-audio-connection-kit jack-tmpfs netjack -media-sound/pulseaudio asyncns equalizer +media-sound/pulseaudio asyncns equalizer native-headset media-sound/sox amrnb amrwb # media-video/ffmpeg dirac faac faad frei0r gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx @@ -383,7 +384,7 @@ www-apps/bugzilla extras www-apps/syscp aps autoresponder billing bind domainkey fcgid mailquota www-client/elinks finger gopher -ruby -www-client/firefox mozdevelop system-sqlite wifi xforms +www-client/firefox egl mozdevelop system-sqlite wifi xforms www-client/opera -qt3 www-servers/apache sni suexec -threads diff --git a/postfix/postfix-files b/postfix/postfix-files index 0520ce0..e80ff60 100644 --- a/postfix/postfix-files +++ b/postfix/postfix-files @@ -264,6 +264,7 @@ $readme_directory/BACKSCATTER_README:f:root:-:644 $readme_directory/BASIC_CONFIGURATION_README:f:root:-:644 $readme_directory/BUILTIN_FILTER_README:f:root:-:644 $readme_directory/CDB_README:f:root:-:644 +$readme_directory/COMPATIBILITY_README:f:root:-:644 $readme_directory/CONNECTION_CACHE_README:f:root:-:644 $readme_directory/CONTENT_INSPECTION_README:f:root:-:644 $readme_directory/DATABASE_README:f:root:-:644 @@ -321,6 +322,7 @@ $html_directory/BACKSCATTER_README.html:f:root:-:644 $html_directory/BASIC_CONFIGURATION_README.html:f:root:-:644 $html_directory/BUILTIN_FILTER_README.html:f:root:-:644 $html_directory/CDB_README.html:f:root:-:644 +$html_directory/COMPATIBILITY_README.html:f:root:-:644 $html_directory/CONNECTION_CACHE_README.html:f:root:-:644 $html_directory/CONTENT_INSPECTION_README.html:f:root:-:644 $html_directory/CYRUS_README.html:f:root:-:644:o diff --git a/postfix/saslpass b/postfix/saslpass index 3ccf36d..cfa2d05 100644 --- a/postfix/saslpass +++ b/postfix/saslpass @@ -1,3 +1,3 @@ -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/smtp.pass,v 1.2 2004/07/18 03:26:56 dragonheart Exp $ +# $Id$ # # remotehost user:password diff --git a/profile.d/vte-2.91.sh b/profile.d/vte-2.91.sh index 95d20c7..2d211ca 100644 --- a/profile.d/vte-2.91.sh +++ b/profile.d/vte-2.91.sh @@ -46,7 +46,7 @@ __vte_ps1() { } __vte_osc7 () { - printf "\033]7;file://%s%s\a" "${HOSTNAME:-}" "$(__vte_urlencode "${PWD}")" + printf "\033]7;file://%s%s\007" "${HOSTNAME:-}" "$(__vte_urlencode "${PWD}")" } __vte_prompt_command() { @@ -57,7 +57,7 @@ __vte_prompt_command() { case "$TERM" in xterm*|vte*) - [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command" + [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command" [ -n "$ZSH_VERSION" ] && precmd_functions+=(__vte_osc7) ;; esac diff --git a/pulse/client.conf b/pulse/client.conf index 342395d..7a428f7 100644 --- a/pulse/client.conf +++ b/pulse/client.conf @@ -11,9 +11,7 @@ # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. +# along with PulseAudio; if not, see . ## Configuration file for PulseAudio clients. See pulse-client.conf(5) for ## more information. Default values are commented out. Use either ; or # for diff --git a/pulse/daemon.conf b/pulse/daemon.conf index 27d8541..c04c365 100644 --- a/pulse/daemon.conf +++ b/pulse/daemon.conf @@ -11,9 +11,7 @@ # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. +# along with PulseAudio; if not, see . ## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for ## more information. Default values are commented out. Use either ; or # for @@ -71,7 +69,7 @@ ; rlimit-msgqueue = -1 ; rlimit-nice = 31 ; rlimit-rtprio = 9 -; rlimit-rttime = 1000000 +; rlimit-rttime = 200000 ; default-sample-format = s16le ; default-sample-rate = 44100 diff --git a/pulse/default.pa b/pulse/default.pa index 46d4505..e53b568 100644 --- a/pulse/default.pa +++ b/pulse/default.pa @@ -13,8 +13,7 @@ # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# along with PulseAudio; if not, see . # This startup script is used only if PulseAudio is started per-user # (i.e. not in system mode) @@ -22,10 +21,10 @@ .nofail ### Load something into the sample cache -#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav -#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav -#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav -#load-sample-lazy pulse-access /usr/share/sounds/generic.wav +#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga +#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga +#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga +#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga .fail @@ -146,7 +145,7 @@ load-module module-filter-apply # can be shared by multiple sessions. ### Load X11 bell module -#load-module module-x11-bell sample=bell-windowing-system +#load-module module-x11-bell sample=x11-bell ### Register ourselves in the X11 session manager #load-module module-x11-xsmp diff --git a/pulse/system.pa b/pulse/system.pa index fd43f5a..903aa39 100644 --- a/pulse/system.pa +++ b/pulse/system.pa @@ -13,8 +13,7 @@ # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# along with PulseAudio; if not, see . # This startup script is used only if PulseAudio is started in system # mode. diff --git a/qemu/target-x86_64.conf b/qemu/target-x86_64.conf deleted file mode 100644 index e69de29..0000000 diff --git a/revdep-rebuild/61-icedtea-bin-6 b/revdep-rebuild/61-icedtea-bin-6 new file mode 100644 index 0000000..8634c3e --- /dev/null +++ b/revdep-rebuild/61-icedtea-bin-6 @@ -0,0 +1 @@ +SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.13.8" diff --git a/revdep-rebuild/61-icedtea-bin-7 b/revdep-rebuild/61-icedtea-bin-7 new file mode 100644 index 0000000..da9feb6 --- /dev/null +++ b/revdep-rebuild/61-icedtea-bin-7 @@ -0,0 +1 @@ +SEARCH_DIRS_MASK="/opt/icedtea-bin-7.2.6.1" diff --git a/sandbox.d/20icedtea-bin-6 b/sandbox.d/20icedtea-bin-6 new file mode 100644 index 0000000..3001f3c --- /dev/null +++ b/sandbox.d/20icedtea-bin-6 @@ -0,0 +1 @@ +SANDBOX_PREDICT="/proc/self/coredump_filter" diff --git a/sandbox.d/20icedtea-bin-7 b/sandbox.d/20icedtea-bin-7 new file mode 100644 index 0000000..3001f3c --- /dev/null +++ b/sandbox.d/20icedtea-bin-7 @@ -0,0 +1 @@ +SANDBOX_PREDICT="/proc/self/coredump_filter" diff --git a/sasl2/smtpd.conf b/sasl2/smtpd.conf index c5320e7..e29b040 100644 --- a/sasl2/smtpd.conf +++ b/sasl2/smtpd.conf @@ -1,3 +1,3 @@ -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/smtp.sasl,v 1.3 2011/05/09 12:36:20 eras Exp $ +# $Id$ pwcheck_method:saslauthd mech_list: PLAIN 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/security/pwquality.conf b/security/pwquality.conf index cec450f..75e8db8 100644 --- a/security/pwquality.conf +++ b/security/pwquality.conf @@ -3,31 +3,31 @@ # # Number of characters in the new password that must not be present in the # old password. -# difok = 5 +# difok = 1 # # Minimum acceptable size for the new password (plus one if # credits are not disabled which is the default). (See pam_cracklib manual.) # Cannot be set to lower value than 6. -# minlen = 9 +# minlen = 8 # # The maximum credit for having digits in the new password. If less than 0 # it is the minimum number of digits in the new password. -# dcredit = 1 +# dcredit = 0 # # The maximum credit for having uppercase characters in the new password. # If less than 0 it is the minimum number of uppercase characters in the new # password. -# ucredit = 1 +# ucredit = 0 # # The maximum credit for having lowercase characters in the new password. # If less than 0 it is the minimum number of lowercase characters in the new # password. -# lcredit = 1 +# lcredit = 0 # # The maximum credit for having other characters in the new password. # If less than 0 it is the minimum number of other characters in the new # password. -# ocredit = 1 +# ocredit = 0 # # The minimum number of required classes of characters for the new # password (digits, uppercase, lowercase, others). 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/evolution-alarm-notify.desktop b/xdg/autostart/evolution-alarm-notify.desktop index cbce1f0..745fd74 100644 --- a/xdg/autostart/evolution-alarm-notify.desktop +++ b/xdg/autostart/evolution-alarm-notify.desktop @@ -9,7 +9,7 @@ Comment[de]=Benachrichtigungen über Kalenderereignisse Comment[en_GB]=Calendar event notifications Comment[ru]=Уведомления о календарных событиях Icon=appointment-soon -Exec=/usr/libexec/evolution/3.12/evolution-alarm-notify +Exec=/usr/libexec/evolution/evolution-alarm-notify Terminal=false Type=Application Categories= @@ -18,4 +18,4 @@ X-Meego-Priority=Low X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=evolution X-GNOME-Bugzilla-Component=calendar -X-GNOME-Bugzilla-Version=3.12.x +X-GNOME-Bugzilla-Version=3.16.x diff --git a/xdg/autostart/gnome-keyring-gpg.desktop b/xdg/autostart/gnome-keyring-gpg.desktop index d0a746b..6e4cf4d 100644 --- a/xdg/autostart/gnome-keyring-gpg.desktop +++ b/xdg/autostart/gnome-keyring-gpg.desktop @@ -16,4 +16,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 a8cb4d0..bc34461 100644 --- a/xdg/autostart/gnome-keyring-pkcs11.desktop +++ b/xdg/autostart/gnome-keyring-pkcs11.desktop @@ -16,4 +16,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 e88f9fa..289966d 100644 --- a/xdg/autostart/gnome-keyring-secrets.desktop +++ b/xdg/autostart/gnome-keyring-secrets.desktop @@ -16,4 +16,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 b5be1e1..d0aae0e 100644 --- a/xdg/autostart/gnome-keyring-ssh.desktop +++ b/xdg/autostart/gnome-keyring-ssh.desktop @@ -16,4 +16,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/pulseaudio-kde.desktop b/xdg/autostart/pulseaudio-kde.desktop deleted file mode 100644 index 7ebbd04..0000000 --- a/xdg/autostart/pulseaudio-kde.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=PulseAudio Sound System KDE Routing Policy -Name[ru]=Звуковая система PulseAudio с маршрутизацией для KDE -Comment=Start the PulseAudio Sound System with KDE Routing Policy -Comment[ru]=Запуск звуковой системы PulseAudio с маршрутизацией для KDE -Exec=start-pulseaudio-kde -Terminal=false -Type=Application -Categories= -GenericName= -OnlyShowIn=KDE; diff --git a/xdg/autostart/pulseaudio.desktop b/xdg/autostart/pulseaudio.desktop index 2d8a79f..51eeac8 100644 --- a/xdg/autostart/pulseaudio.desktop +++ b/xdg/autostart/pulseaudio.desktop @@ -12,3 +12,4 @@ Type=Application Categories= GenericName= X-GNOME-Autostart-Phase=Initialization +X-KDE-autostart-phase=1 diff --git a/xdg/autostart/tracker-extract.desktop b/xdg/autostart/tracker-extract.desktop index bd5b5f3..6f44a06 100644 --- a/xdg/autostart/tracker-extract.desktop +++ b/xdg/autostart/tracker-extract.desktop @@ -20,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Extractor -X-GNOME-Bugzilla-Version=1.2.6 +X-GNOME-Bugzilla-Version=1.4.1 diff --git a/xdg/autostart/tracker-miner-apps.desktop b/xdg/autostart/tracker-miner-apps.desktop index af033b4..8ceb8f3 100644 --- a/xdg/autostart/tracker-miner-apps.desktop +++ b/xdg/autostart/tracker-miner-apps.desktop @@ -20,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Miners -X-GNOME-Bugzilla-Version=1.2.6 +X-GNOME-Bugzilla-Version=1.4.1 diff --git a/xdg/autostart/tracker-miner-fs.desktop b/xdg/autostart/tracker-miner-fs.desktop index 80b4f25..b5d3b05 100644 --- a/xdg/autostart/tracker-miner-fs.desktop +++ b/xdg/autostart/tracker-miner-fs.desktop @@ -22,4 +22,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Miners -X-GNOME-Bugzilla-Version=1.2.6 +X-GNOME-Bugzilla-Version=1.4.1 diff --git a/xdg/autostart/tracker-miner-user-guides.desktop b/xdg/autostart/tracker-miner-user-guides.desktop index 8d967a3..3ab7770 100644 --- a/xdg/autostart/tracker-miner-user-guides.desktop +++ b/xdg/autostart/tracker-miner-user-guides.desktop @@ -20,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Miners -X-GNOME-Bugzilla-Version=1.2.6 +X-GNOME-Bugzilla-Version=1.4.1 diff --git a/xdg/autostart/tracker-store.desktop b/xdg/autostart/tracker-store.desktop index f2c294d..43a64d9 100644 --- a/xdg/autostart/tracker-store.desktop +++ b/xdg/autostart/tracker-store.desktop @@ -21,4 +21,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Store -X-GNOME-Bugzilla-Version=1.2.6 +X-GNOME-Bugzilla-Version=1.4.1 -- 2.39.5