From 6b24670e58019274a1f2ba1717207e319e599583 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 10 Nov 2014 11:33:53 +0100 Subject: [PATCH] Current state --- .etckeeper | 57 ++----- bash/bashrc | 2 +- conf.d/postgrey | 2 +- conf.d/pydoc-3.4 | 7 + config-archive/etc/bash/bashrc | 6 +- config-archive/etc/bash/bashrc.1 | 21 ++- config-archive/etc/bash/bashrc.2 | 152 ++++++++++++++++++ config-archive/etc/bash/bashrc.dist | 2 +- config-archive/etc/default/grub | 47 ++++++ config-archive/etc/default/grub.dist | 56 +++++++ dbus-1/session.conf | 4 +- default/grub | 27 +++- dhcpcd.conf | 3 + eselect/postgresql/slots/9.3/base | 2 +- eselect/postgresql/slots/9.3/docs | 2 +- eselect/postgresql/slots/9.3/server | 2 +- grub.d/00_header | 50 ++++-- grub.d/10_linux | 24 ++- grub.d/20_linux_xen | 32 ++-- grub.d/30_os-prober | 43 ++++- init.d/iperf | 26 ++- init.d/postgresql-9.3 | 4 +- init.d/postgrey | 14 +- init.d/pydoc-3.4 | 25 +++ init.d/stunnel | 2 +- nagios/cgi.cfg | 9 +- nagios/nagios.cfg | 30 +++- nagios/objects/commands.cfg | 2 +- nagios/resource.cfg | 2 +- php/apache2-php5.3/ext-active/apc.ini | 1 - php/apache2-php5.3/ext-active/crack.ini | 1 - php/apache2-php5.3/ext-active/http.ini | 1 - php/apache2-php5.3/ext-active/imagick.ini | 1 - php/apache2-php5.3/ext-active/uuid.ini | 1 - php/apache2-php5.3/ext/apc.ini | 1 - php/apache2-php5.3/ext/crack.ini | 1 - php/apache2-php5.3/ext/http.ini | 22 --- php/apache2-php5.3/ext/uuid.ini | 1 - php/apache2-php5.5/ext-active/imagick.ini | 1 + .../ext/imagick.ini | 0 php/cgi-php5.3/ext-active/apc.ini | 1 - php/cgi-php5.3/ext-active/crack.ini | 1 - php/cgi-php5.3/ext-active/http.ini | 1 - php/cgi-php5.3/ext-active/imagick.ini | 1 - php/cgi-php5.3/ext-active/uuid.ini | 1 - php/cgi-php5.3/ext/apc.ini | 1 - php/cgi-php5.3/ext/crack.ini | 1 - php/cgi-php5.3/ext/http.ini | 22 --- php/cgi-php5.3/ext/uuid.ini | 1 - php/cgi-php5.5/ext-active/imagick.ini | 1 + .../ext/imagick.ini | 0 php/cli-php5.3/ext-active/apc.ini | 1 - php/cli-php5.3/ext-active/crack.ini | 1 - php/cli-php5.3/ext-active/http.ini | 1 - php/cli-php5.3/ext-active/imagick.ini | 1 - php/cli-php5.3/ext-active/uuid.ini | 1 - php/cli-php5.3/ext/apc.ini | 1 - php/cli-php5.3/ext/crack.ini | 1 - php/cli-php5.3/ext/http.ini | 22 --- php/cli-php5.3/ext/uuid.ini | 1 - php/cli-php5.5/ext-active/imagick.ini | 1 + .../ext/imagick.ini | 0 php/embed-php5.3/ext-active/crack.ini | 1 - php/embed-php5.3/ext-active/http.ini | 1 - php/embed-php5.3/ext-active/imagick.ini | 1 - php/embed-php5.3/ext-active/uuid.ini | 1 - php/embed-php5.3/ext/crack.ini | 1 - php/embed-php5.3/ext/http.ini | 22 --- php/embed-php5.3/ext/uuid.ini | 1 - php/embed-php5.5/ext-active/imagick.ini | 1 + .../ext/imagick.ini | 0 php/fpm-php5.3/ext-active/apc.ini | 1 - php/fpm-php5.3/ext-active/crack.ini | 1 - php/fpm-php5.3/ext-active/http.ini | 1 - php/fpm-php5.3/ext-active/imagick.ini | 1 - php/fpm-php5.3/ext-active/uuid.ini | 1 - php/fpm-php5.3/ext/apc.ini | 1 - php/fpm-php5.3/ext/crack.ini | 1 - php/fpm-php5.3/ext/http.ini | 22 --- php/fpm-php5.3/ext/uuid.ini | 1 - php/fpm-php5.5/ext-active/imagick.ini | 1 + .../ext/imagick.ini | 0 portage/make.conf | 3 +- portage/package.use | 1 + sysstat | 8 +- .../spamassassin.service.d/00gentoo.conf | 10 ++ udev/hwdb.bin | Bin 6021271 -> 6021271 bytes udev/udev.conf | 2 +- 88 files changed, 534 insertions(+), 298 deletions(-) create mode 100644 conf.d/pydoc-3.4 create mode 100644 config-archive/etc/bash/bashrc.2 create mode 100644 config-archive/etc/default/grub create mode 100644 config-archive/etc/default/grub.dist create mode 100755 init.d/pydoc-3.4 delete mode 120000 php/apache2-php5.3/ext-active/apc.ini delete mode 120000 php/apache2-php5.3/ext-active/crack.ini delete mode 120000 php/apache2-php5.3/ext-active/http.ini delete mode 120000 php/apache2-php5.3/ext-active/imagick.ini delete mode 120000 php/apache2-php5.3/ext-active/uuid.ini delete mode 100644 php/apache2-php5.3/ext/apc.ini delete mode 100644 php/apache2-php5.3/ext/crack.ini delete mode 100644 php/apache2-php5.3/ext/http.ini delete mode 100644 php/apache2-php5.3/ext/uuid.ini create mode 120000 php/apache2-php5.5/ext-active/imagick.ini rename php/{apache2-php5.3 => apache2-php5.5}/ext/imagick.ini (100%) delete mode 120000 php/cgi-php5.3/ext-active/apc.ini delete mode 120000 php/cgi-php5.3/ext-active/crack.ini delete mode 120000 php/cgi-php5.3/ext-active/http.ini delete mode 120000 php/cgi-php5.3/ext-active/imagick.ini delete mode 120000 php/cgi-php5.3/ext-active/uuid.ini delete mode 100644 php/cgi-php5.3/ext/apc.ini delete mode 100644 php/cgi-php5.3/ext/crack.ini delete mode 100644 php/cgi-php5.3/ext/http.ini delete mode 100644 php/cgi-php5.3/ext/uuid.ini create mode 120000 php/cgi-php5.5/ext-active/imagick.ini rename php/{cgi-php5.3 => cgi-php5.5}/ext/imagick.ini (100%) delete mode 120000 php/cli-php5.3/ext-active/apc.ini delete mode 120000 php/cli-php5.3/ext-active/crack.ini delete mode 120000 php/cli-php5.3/ext-active/http.ini delete mode 120000 php/cli-php5.3/ext-active/imagick.ini delete mode 120000 php/cli-php5.3/ext-active/uuid.ini delete mode 100644 php/cli-php5.3/ext/apc.ini delete mode 100644 php/cli-php5.3/ext/crack.ini delete mode 100644 php/cli-php5.3/ext/http.ini delete mode 100644 php/cli-php5.3/ext/uuid.ini create mode 120000 php/cli-php5.5/ext-active/imagick.ini rename php/{cli-php5.3 => cli-php5.5}/ext/imagick.ini (100%) delete mode 120000 php/embed-php5.3/ext-active/crack.ini delete mode 120000 php/embed-php5.3/ext-active/http.ini delete mode 120000 php/embed-php5.3/ext-active/imagick.ini delete mode 120000 php/embed-php5.3/ext-active/uuid.ini delete mode 100644 php/embed-php5.3/ext/crack.ini delete mode 100644 php/embed-php5.3/ext/http.ini delete mode 100644 php/embed-php5.3/ext/uuid.ini create mode 120000 php/embed-php5.5/ext-active/imagick.ini rename php/{embed-php5.3 => embed-php5.5}/ext/imagick.ini (100%) delete mode 120000 php/fpm-php5.3/ext-active/apc.ini delete mode 120000 php/fpm-php5.3/ext-active/crack.ini delete mode 120000 php/fpm-php5.3/ext-active/http.ini delete mode 120000 php/fpm-php5.3/ext-active/imagick.ini delete mode 120000 php/fpm-php5.3/ext-active/uuid.ini delete mode 100644 php/fpm-php5.3/ext/apc.ini delete mode 100644 php/fpm-php5.3/ext/crack.ini delete mode 100644 php/fpm-php5.3/ext/http.ini delete mode 100644 php/fpm-php5.3/ext/uuid.ini create mode 120000 php/fpm-php5.5/ext-active/imagick.ini rename php/{fpm-php5.3 => fpm-php5.5}/ext/imagick.ini (100%) create mode 100644 systemd/system/spamassassin.service.d/00gentoo.conf diff --git a/.etckeeper b/.etckeeper index 815620d..660d73e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -6,16 +6,6 @@ mkdir -p './courier-imap/shared.tmp' mkdir -p './dpkg/dpkg.cfg.d' mkdir -p './gtk-2.0/x86_64-pc-linux-gnu' mkdir -p './lvm/cache' -mkdir -p './php/apache2-php5.5/ext' -mkdir -p './php/apache2-php5.5/ext-active' -mkdir -p './php/cgi-php5.5/ext' -mkdir -p './php/cgi-php5.5/ext-active' -mkdir -p './php/cli-php5.5/ext' -mkdir -p './php/cli-php5.5/ext-active' -mkdir -p './php/embed-php5.5/ext' -mkdir -p './php/embed-php5.5/ext-active' -mkdir -p './php/fpm-php5.5/ext' -mkdir -p './php/fpm-php5.5/ext-active' mkdir -p './salt/pki/minions_pre' mkdir -p './salt/pki/minions_rejected' mkdir -p './security/limits.d' @@ -199,6 +189,7 @@ maybe chmod 0644 'conf.d/postgresql-9.3' maybe chmod 0640 'conf.d/postgrey' maybe chmod 0644 'conf.d/pydoc-2.7' maybe chmod 0644 'conf.d/pydoc-3.3' +maybe chmod 0644 'conf.d/pydoc-3.4' maybe chmod 0644 'conf.d/quota' maybe chmod 0644 'conf.d/rsyncd' maybe chmod 0644 'conf.d/salt' @@ -253,6 +244,7 @@ maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/00_default_ssl_vhost.conf. maybe chmod 0755 'config-archive/etc/bash' maybe chmod 0644 'config-archive/etc/bash/bashrc' maybe chmod 0644 'config-archive/etc/bash/bashrc.1' +maybe chmod 0644 'config-archive/etc/bash/bashrc.2' maybe chmod 0644 'config-archive/etc/bash/bashrc.dist' maybe chmod 0755 'config-archive/etc/bind' maybe chmod 0640 'config-archive/etc/bind/bind.keys' @@ -298,6 +290,9 @@ maybe chmod 0640 'config-archive/etc/cups/cupsd.conf.default.dist' maybe chmod 0640 'config-archive/etc/cups/cupsd.conf.dist' maybe chmod 0640 'config-archive/etc/cups/snmp.conf' maybe chmod 0640 'config-archive/etc/cups/snmp.conf.dist' +maybe chmod 0755 'config-archive/etc/default' +maybe chmod 0644 'config-archive/etc/default/grub' +maybe chmod 0644 'config-archive/etc/default/grub.dist' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist.new' maybe chmod 0755 'config-archive/etc/eselect' @@ -1019,6 +1014,7 @@ maybe chmod 0755 'init.d/proftpd' maybe chmod 0755 'init.d/pwcheck' maybe chmod 0755 'init.d/pydoc-2.7' maybe chmod 0755 'init.d/pydoc-3.3' +maybe chmod 0755 'init.d/pydoc-3.4' maybe chmod 0755 'init.d/quota' maybe chmod 0755 'init.d/reboot.sh' maybe chmod 0755 'init.d/root' @@ -1372,69 +1368,40 @@ maybe chmod 0600 'passwd-' maybe chmod 0644 'pear.conf' maybe chmod 0755 'php' maybe chmod 0755 'php/apache2-php5.3' -maybe chmod 0755 'php/apache2-php5.3/ext' -maybe chmod 0755 'php/apache2-php5.3/ext-active' -maybe chmod 0644 'php/apache2-php5.3/ext/apc.ini' -maybe chmod 0644 'php/apache2-php5.3/ext/crack.ini' -maybe chmod 0644 'php/apache2-php5.3/ext/http.ini' -maybe chmod 0644 'php/apache2-php5.3/ext/imagick.ini' -maybe chmod 0644 'php/apache2-php5.3/ext/uuid.ini' maybe chmod 0644 'php/apache2-php5.3/php.ini' maybe chmod 0755 'php/apache2-php5.5' maybe chmod 0755 'php/apache2-php5.5/ext' maybe chmod 0755 'php/apache2-php5.5/ext-active' +maybe chmod 0644 'php/apache2-php5.5/ext/imagick.ini' maybe chmod 0644 'php/apache2-php5.5/php.ini' maybe chmod 0755 'php/cgi-php5.3' -maybe chmod 0755 'php/cgi-php5.3/ext' -maybe chmod 0755 'php/cgi-php5.3/ext-active' -maybe chmod 0644 'php/cgi-php5.3/ext/apc.ini' -maybe chmod 0644 'php/cgi-php5.3/ext/crack.ini' -maybe chmod 0644 'php/cgi-php5.3/ext/http.ini' -maybe chmod 0644 'php/cgi-php5.3/ext/imagick.ini' -maybe chmod 0644 'php/cgi-php5.3/ext/uuid.ini' maybe chmod 0644 'php/cgi-php5.3/php.ini' maybe chmod 0755 'php/cgi-php5.5' maybe chmod 0755 'php/cgi-php5.5/ext' maybe chmod 0755 'php/cgi-php5.5/ext-active' +maybe chmod 0644 'php/cgi-php5.5/ext/imagick.ini' maybe chmod 0644 'php/cgi-php5.5/php.ini' maybe chmod 0755 'php/cli-php5.3' -maybe chmod 0755 'php/cli-php5.3/ext' -maybe chmod 0755 'php/cli-php5.3/ext-active' -maybe chmod 0644 'php/cli-php5.3/ext/apc.ini' -maybe chmod 0644 'php/cli-php5.3/ext/crack.ini' -maybe chmod 0644 'php/cli-php5.3/ext/http.ini' -maybe chmod 0644 'php/cli-php5.3/ext/imagick.ini' -maybe chmod 0644 'php/cli-php5.3/ext/uuid.ini' maybe chmod 0644 'php/cli-php5.3/php.ini' maybe chmod 0755 'php/cli-php5.5' maybe chmod 0755 'php/cli-php5.5/ext' maybe chmod 0755 'php/cli-php5.5/ext-active' +maybe chmod 0644 'php/cli-php5.5/ext/imagick.ini' maybe chmod 0644 'php/cli-php5.5/php.ini' maybe chmod 0755 'php/embed-php5.3' -maybe chmod 0755 'php/embed-php5.3/ext' -maybe chmod 0755 'php/embed-php5.3/ext-active' -maybe chmod 0644 'php/embed-php5.3/ext/crack.ini' -maybe chmod 0644 'php/embed-php5.3/ext/http.ini' -maybe chmod 0644 'php/embed-php5.3/ext/imagick.ini' -maybe chmod 0644 'php/embed-php5.3/ext/uuid.ini' maybe chmod 0644 'php/embed-php5.3/php.ini' maybe chmod 0755 'php/embed-php5.5' maybe chmod 0755 'php/embed-php5.5/ext' maybe chmod 0755 'php/embed-php5.5/ext-active' +maybe chmod 0644 'php/embed-php5.5/ext/imagick.ini' maybe chmod 0644 'php/embed-php5.5/php.ini' maybe chmod 0755 'php/fpm-php5.3' -maybe chmod 0755 'php/fpm-php5.3/ext' -maybe chmod 0755 'php/fpm-php5.3/ext-active' -maybe chmod 0644 'php/fpm-php5.3/ext/apc.ini' -maybe chmod 0644 'php/fpm-php5.3/ext/crack.ini' -maybe chmod 0644 'php/fpm-php5.3/ext/http.ini' -maybe chmod 0644 'php/fpm-php5.3/ext/imagick.ini' -maybe chmod 0644 'php/fpm-php5.3/ext/uuid.ini' maybe chmod 0644 'php/fpm-php5.3/php-fpm.conf' maybe chmod 0644 'php/fpm-php5.3/php.ini' maybe chmod 0755 'php/fpm-php5.5' maybe chmod 0755 'php/fpm-php5.5/ext' maybe chmod 0755 'php/fpm-php5.5/ext-active' +maybe chmod 0644 'php/fpm-php5.5/ext/imagick.ini' maybe chmod 0644 'php/fpm-php5.5/php-fpm.conf' maybe chmod 0644 'php/fpm-php5.5/php.ini' maybe chmod 0755 'pkcs11' @@ -1708,6 +1675,8 @@ maybe chmod 0755 'systemd/system/slapd.service.d' maybe chmod 0644 'systemd/system/slapd.service.d/00gentoo.conf' maybe chmod 0755 'systemd/system/sntp.service.d' maybe chmod 0644 'systemd/system/sntp.service.d/00gentoo.conf' +maybe chmod 0755 'systemd/system/spamassassin.service.d' +maybe chmod 0644 'systemd/system/spamassassin.service.d/00gentoo.conf' maybe chmod 0755 't1lib' maybe chmod 0644 't1lib/t1lib.config' maybe chmod 0755 'terminfo' diff --git a/bash/bashrc b/bash/bashrc index c5f19a6..71fa4c5 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -25,7 +25,7 @@ shopt -s histappend # Change the window title of X terminals case ${TERM} in - xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix) + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' ;; screen*) diff --git a/conf.d/postgrey b/conf.d/postgrey index 7a6deb5..58db734 100644 --- a/conf.d/postgrey +++ b/conf.d/postgrey @@ -2,7 +2,7 @@ # LISTEN TYPE # Set to 'inet' if you want to use a TCP socket. -# Set to 'unix' if you want to use an UNIX socket. +# Set to 'unix' if you want to use a UNIX socket. POSTGREY_TYPE="inet" # HOST diff --git a/conf.d/pydoc-3.4 b/conf.d/pydoc-3.4 new file mode 100644 index 0000000..7beefff --- /dev/null +++ b/conf.d/pydoc-3.4 @@ -0,0 +1,7 @@ +# /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 $ + +# This file contains the configuration for pydoc's internal webserver. + +# Default port for Python's pydoc server. +PYDOC3_4_PORT="7464" diff --git a/config-archive/etc/bash/bashrc b/config-archive/etc/bash/bashrc index b0904ff..c5f19a6 100644 --- a/config-archive/etc/bash/bashrc +++ b/config-archive/etc/bash/bashrc @@ -25,10 +25,10 @@ shopt -s histappend # Change the window title of X terminals case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix) + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix) PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' ;; - screen) + screen*) PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"' ;; esac @@ -69,6 +69,8 @@ if ${use_color} ; then alias ls='ls --color=auto' alias grep='grep --colour=auto' + alias egrep='egrep --colour=auto' + alias fgrep='fgrep --colour=auto' else if [[ ${EUID} == 0 ]] ; then # show root@ when we don't have colors diff --git a/config-archive/etc/bash/bashrc.1 b/config-archive/etc/bash/bashrc.1 index cb99ed9..b0904ff 100644 --- a/config-archive/etc/bash/bashrc.1 +++ b/config-archive/etc/bash/bashrc.1 @@ -91,9 +91,21 @@ if [ -d $HOME/bin ] ; then export PATH fi -if [ -d $HOME/lib ] ; then - PERL5LIB=$HOME/lib - export PERL5LIB +if [ -d "$HOME/lib" ] ; then + if [ -d "$HOME/lib/perl" ] ; then + if [ -z "${PERL5LIB}" ] ; then + export PERL5LIB="$HOME/lib/perl" + else + export PERL5LIB="$HOME/lib/perl:${PERL5LIB}" + fi + fi + if [ -d "$HOME/lib/python" ] ; then + if [ -z "${PYTHONPATH}" ] ; then + export PYTHONPATH="$HOME/lib/python" + else + export PYTHONPATH="$HOME/lib/python:${PYTHONPATH}" + fi + fi fi #if [[ ${EUID} == 0 ]] ; then @@ -139,8 +151,7 @@ if [ -f /usr/share/mc/mc.gentoo ]; then . /usr/share/mc/mc.gentoo fi -if [ -f /etc/profile.d/bash-completion ]; then - . /etc/profile.d/bash-completion +if [ -e /etc/bash_completion.d/git ] ; then if [[ ${EUID} == 0 ]] ; then PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' else diff --git a/config-archive/etc/bash/bashrc.2 b/config-archive/etc/bash/bashrc.2 new file mode 100644 index 0000000..cb99ed9 --- /dev/null +++ b/config-archive/etc/bash/bashrc.2 @@ -0,0 +1,152 @@ +# /etc/bash/bashrc +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + +# Bash won't get SIGWINCH if another process is in the foreground. +# Enable checkwinsize so that bash will check the terminal size when +# it regains control. #65623 +# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) +shopt -s checkwinsize + +# Enable history appending instead of overwriting. #139609 +shopt -s histappend + +# Change the window title of X terminals +case ${TERM} in + xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' + ;; + screen) + PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"' + ;; +esac + +use_color=false + +# Set colorful PS1 only on colorful terminals. +# dircolors --print-database uses its own built-in database +# instead of using /etc/DIR_COLORS. Try to use the external file +# first to take advantage of user additions. Use internal bash +# globbing instead of external grep binary. +safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM +match_lhs="" +[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" +[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ + && match_lhs=$(dircolors --print-database) +[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true + +if ${use_color} ; then + # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 + if type -P dircolors >/dev/null ; then + if [[ -f ~/.dir_colors ]] ; then + eval $(dircolors -b ~/.dir_colors) + elif [[ -f /etc/DIR_COLORS ]] ; then + eval $(dircolors -b /etc/DIR_COLORS) + fi + fi + + if [[ ${EUID} == 0 ]] ; then + #PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' + PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w \$ \[\033[00m\]' + else + #PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' + PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w > \[\033[00m\]' + fi + + alias ls='ls --color=auto' + alias grep='grep --colour=auto' +else + if [[ ${EUID} == 0 ]] ; then + # show root@ when we don't have colors + PS1='\u@\h \W \$ ' + else + PS1='\u@\h \w \$ ' + fi +fi + +# Try to keep environment pollution down, EPA loves us. +unset use_color safe_term match_lhs + +if [ -d /usr/scripts ] ; then + PATH=/usr/scripts:$PATH + export PATH +fi + +if [ -d $HOME/bin ] ; then + PATH=$PATH:$HOME/bin + export PATH +fi + +if [ -d $HOME/lib ] ; then + PERL5LIB=$HOME/lib + export PERL5LIB +fi + +#if [[ ${EUID} == 0 ]] ; then +# alias ll="ls -lA" +#else +# alias ll="ls -l" +#fi +alias l="ls -l" +alias ll="ls -lA" +alias la="ls -la" +alias md=mkdir +alias rd=rmdir +alias ..='cd ..' +alias ...='cd ../..' +alias cd..='cd ..' +alias cd...='cd ../..' +alias pl="ps -fu $(whoami)" + +lcd() { + cd $( perl -e ' +use strict; +use Cwd; +my $new = shift; +my $cwd = Cwd::abs_path(getcwd()); +my $newa = $cwd; +if ($new){ + $newa = Cwd::abs_path($new); + $newa = $cwd unless $newa; +}; +printf("%s\n", $newa); +' $1 ) +} + +export LESS="-R -M -I --shift 5" +export LESSCHARSET="utf-8" + +HISTCONTROL=ignoreboth +HISTSIZE=50000 +HISTFILESIZE=50000 +HISTTIMEFORMAT='%Y-%m-%d %H:%M:%S ' + +if [ -f /usr/share/mc/mc.gentoo ]; then + . /usr/share/mc/mc.gentoo +fi + +if [ -f /etc/profile.d/bash-completion ]; then + . /etc/profile.d/bash-completion + if [[ ${EUID} == 0 ]] ; then + PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' + else + PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]' + fi +fi + + +# vim: ts=4 expandtab diff --git a/config-archive/etc/bash/bashrc.dist b/config-archive/etc/bash/bashrc.dist index 3067022..3a8095c 100644 --- a/config-archive/etc/bash/bashrc.dist +++ b/config-archive/etc/bash/bashrc.dist @@ -25,7 +25,7 @@ shopt -s histappend # Change the window title of X terminals case ${TERM} in - xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix) + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' ;; screen*) diff --git a/config-archive/etc/default/grub b/config-archive/etc/default/grub new file mode 100644 index 0000000..1ea8691 --- /dev/null +++ b/config-archive/etc/default/grub @@ -0,0 +1,47 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ +# +# To populate all changes in this file you need to regenerate your +# grub configuration file afterwards: +# 'grub2-mkconfig -o /boot/grub/grub.cfg' +# +# See the grub info page for documentation on possible variables and +# their associated values. + +GRUB_DISTRIBUTOR="Gentoo" + +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=5 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 + +# Append parameters to the linux kernel command line +# GRUB_CMDLINE_LINUX="" + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal. +# Note that you can use only modes which your graphic card supports via VBE. +# You can see them in real GRUB with the command `vbeinfo'. +#GRUB_GFXMODE=640x480 +GRUB_GFXMODE=800x600 + +# Path to theme spec txt file. +# The starfield is by default provided with use truetype. +# NOTE: when enabling custom theme, ensure you have required font/etc. +#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#GRUB_BACKGROUND="/boot/grub/mybackground.png" + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel +GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_RECOVERY=true diff --git a/config-archive/etc/default/grub.dist b/config-archive/etc/default/grub.dist new file mode 100644 index 0000000..8f0549d --- /dev/null +++ b/config-archive/etc/default/grub.dist @@ -0,0 +1,56 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.3 2014/09/10 14:38:39 floppym Exp $ +# +# To populate all changes in this file you need to regenerate your +# grub configuration file afterwards: +# 'grub2-mkconfig -o /boot/grub/grub.cfg' +# +# See the grub info page for documentation on possible variables and +# their associated values. + +GRUB_DISTRIBUTOR="Gentoo" + +# Default menu entry +#GRUB_DEFAULT=0 + +# Boot the default entry this many seconds after the menu is displayed +#GRUB_TIMEOUT=5 +#GRUB_TIMEOUT_STYLE=menu + +# Append parameters to the linux kernel command line +#GRUB_CMDLINE_LINUX="" +# +# Examples: +# +# Boot with network interface renaming disabled +# GRUB_CMDLINE_LINUX="net.ifnames=0" +# +# Boot with systemd instead of sysvinit (openrc) +# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd" + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal. +# Note that you can use only modes which your graphic card supports via VBE. +# You can see them in real GRUB with the command `vbeinfo'. +#GRUB_GFXMODE=640x480 + +# Path to theme spec txt file. +# The starfield is by default provided with use truetype. +# NOTE: when enabling custom theme, ensure you have required font/etc. +#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#GRUB_BACKGROUND="/boot/grub/mybackground.png" + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_RECOVERY=true diff --git a/dbus-1/session.conf b/dbus-1/session.conf index 66d46b8..5d93be7 100644 --- a/dbus-1/session.conf +++ b/dbus-1/session.conf @@ -49,9 +49,11 @@ 1000000000 250000000 1000000000 - 1024 + 120000 240000 + 150000 100000 10000 100000 diff --git a/default/grub b/default/grub index 1ea8691..16776f5 100644 --- a/default/grub +++ b/default/grub @@ -1,23 +1,36 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.3 2014/09/10 14:38:39 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: # 'grub2-mkconfig -o /boot/grub/grub.cfg' # # See the grub info page for documentation on possible variables and -# their associated values. +# their associated values. GRUB_DISTRIBUTOR="Gentoo" -GRUB_DEFAULT=0 -GRUB_HIDDEN_TIMEOUT=5 -GRUB_HIDDEN_TIMEOUT_QUIET=true +# Default menu entry +#GRUB_DEFAULT=0 + +# Boot the default entry this many seconds after the menu is displayed +#GRUB_HIDDEN_TIMEOUT=5 +#GRUB_HIDDEN_TIMEOUT_QUIET=true +#GRUB_TIMEOUT=5 GRUB_TIMEOUT=10 +#GRUB_TIMEOUT_STYLE=menu # Append parameters to the linux kernel command line -# GRUB_CMDLINE_LINUX="" +#GRUB_CMDLINE_LINUX="" +# +# Examples: +# +# Boot with network interface renaming disabled +# GRUB_CMDLINE_LINUX="net.ifnames=0" +# +# Boot with systemd instead of sysvinit (openrc) +# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd" # Append parameters to the linux kernel command line for non-recovery entries #GRUB_CMDLINE_LINUX_DEFAULT="" diff --git a/dhcpcd.conf b/dhcpcd.conf index 2ecbe74..e905b34 100644 --- a/dhcpcd.conf +++ b/dhcpcd.conf @@ -1,6 +1,9 @@ # A sample configuration for dhcpcd. # See dhcpcd.conf(5) for details. +# Allow users of this group to interact with dhcpcd via the control socket. +#controlgroup wheel + # Inform the DHCP server of our hostname for DDNS. hostname diff --git a/eselect/postgresql/slots/9.3/base b/eselect/postgresql/slots/9.3/base index bd422ab..7d4a07f 100644 --- a/eselect/postgresql/slots/9.3/base +++ b/eselect/postgresql/slots/9.3/base @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.3.3" +postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.3.5" diff --git a/eselect/postgresql/slots/9.3/docs b/eselect/postgresql/slots/9.3/docs index 4eda6eb..41c7233 100644 --- a/eselect/postgresql/slots/9.3/docs +++ b/eselect/postgresql/slots/9.3/docs @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.3.3" +postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.3.5" diff --git a/eselect/postgresql/slots/9.3/server b/eselect/postgresql/slots/9.3/server index a71d49e..c2a9ed2 100644 --- a/eselect/postgresql/slots/9.3/server +++ b/eselect/postgresql/slots/9.3/server @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.3.3" +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.3.5" diff --git a/grub.d/00_header b/grub.d/00_header index 3c6370d..fb9b859 100755 --- a/grub.d/00_header +++ b/grub.d/00_header @@ -18,8 +18,8 @@ set -e # along with GRUB. If not, see . prefix="/usr" -exec_prefix="${prefix}" -datarootdir="${prefix}/share" +exec_prefix="/usr" +datarootdir="/usr/share" grub_lang=`echo $LANG | cut -d . -f 1` export TEXTDOMAIN=grub @@ -191,7 +191,7 @@ EOF EOF # Gettext variables and module -if [ "x${LANG}" != "xC" ] ; then +if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "x" ]; then cat << EOF set locale_dir=\$prefix/locale set lang=${grub_lang} @@ -282,34 +282,62 @@ fi make_timeout () { - if [ "x${1}" != "x" ] ; then + if [ "x${3}" != "x" ] ; then + timeout="${2}" + style="${3}" + elif [ "x${1}" != "x" -a "x${1}" != "x0" ] ; then + # Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme. + timeout="${1}" + if [ "x${2}" != "x0" ] ; then + grub_warn "$(gettext "Setting GRUB_TIMEOUT to a non-zero value when GRUB_HIDDEN_TIMEOUT is set is no longer supported.")" + fi if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then + style="hidden" verbose= else + style="countdown" verbose=" --verbose" fi + else + # No hidden timeout, so treat as GRUB_TIMEOUT_STYLE=menu + timeout="${2}" + style="menu" + fi + cat << EOF +if [ x\$feature_timeout_style = xy ] ; then + set timeout_style=${style} + set timeout=${timeout} +EOF + if [ "x${style}" = "xmenu" ] ; then cat << EOF -if sleep$verbose --interruptible ${1} ; then - set timeout=${2} -fi +# Fallback normal timeout code in case the timeout_style feature is +# unavailable. +else + set timeout=${timeout} EOF else cat << EOF -set timeout=${2} +# Fallback hidden-timeout code in case the timeout_style feature is +# unavailable. +elif sleep${verbose} --interruptible ${timeout} ; then + set timeout=0 EOF fi + cat << EOF +fi +EOF } if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then cat <. prefix="/usr" -exec_prefix="${prefix}" -datarootdir="${prefix}/share" +exec_prefix="/usr" +datarootdir="/usr/share" . "/usr/share/grub/grub-mkconfig_lib" @@ -32,7 +32,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else OS="${GRUB_DISTRIBUTOR} GNU/Linux" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi # loop-AES arranges things so that /dev/loop/X can be our root device, but @@ -51,13 +51,7 @@ else LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} fi -GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" - -if [ x"$GRUBFS" = x ]; then - GRUBFS="$(stat -f --printf=%T / || true)" -fi - -case x"$GRUBFS" in +case x"$GRUB_FS" in xbtrfs) rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="${rootsubvol#/}" @@ -179,7 +173,7 @@ title_correction_code= # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). submenu_indentation="" -is_first_entry=true +is_top_level=true while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` gettext_printf "Found linux image: %s\n" "$linux" >&2 @@ -226,7 +220,7 @@ while [ "x$list" != "x" ] ; do linux_root_device_thisversion=${GRUB_DEVICE} fi - if [ "x$is_first_entry" = xtrue ]; then + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" @@ -237,6 +231,7 @@ while [ "x$list" != "x" ] ; do fi # TRANSLATORS: %s is replaced with an OS name echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + is_top_level=false fi linux_entry "${OS}" "${version}" advanced \ @@ -246,13 +241,12 @@ while [ "x$list" != "x" ] ; do "single ${GRUB_CMDLINE_LINUX}" fi - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` - is_first_entry=false + list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` done # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. -if [ x"$is_first_entry" != xtrue ]; then +if [ x"$is_top_level" != xtrue ]; then echo '}' fi diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen index dbd8891..bf48f2b 100755 --- a/grub.d/20_linux_xen +++ b/grub.d/20_linux_xen @@ -18,8 +18,8 @@ set -e # along with GRUB. If not, see . prefix="/usr" -exec_prefix="${prefix}" -datarootdir="${prefix}/share" +exec_prefix="/usr" +datarootdir="/usr/share" . "/usr/share/grub/grub-mkconfig_lib" @@ -32,7 +32,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else OS="${GRUB_DISTRIBUTOR} GNU/Linux" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi # loop-AES arranges things so that /dev/loop/X can be our root device, but @@ -59,13 +59,7 @@ if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" fi -GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" - -if [ x"$GRUBFS" = x ]; then - GRUBFS="$(stat -f --printf=%T /)" -fi - -case x"$GRUBFS" in +case x"$GRUB_FS" in xbtrfs) rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="${rootsubvol#/}" @@ -135,7 +129,7 @@ EOF message="$(gettext_printf "Loading initial ramdisk ...")" sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' - module ${rel_dirname}/${initrd} + module --nounzip ${rel_dirname}/${initrd} EOF fi sed "s/^/$submenu_indentation/" << EOF @@ -193,7 +187,7 @@ esac # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). submenu_indentation="" -is_first_entry=true +is_top_level=true while [ "x${xen_list}" != "x" ] ; do list="${linux_list}" @@ -205,7 +199,7 @@ while [ "x${xen_list}" != "x" ] ; do if [ -z "$boot_device_id" ]; then boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" fi - if [ "x$is_first_entry" != xtrue ]; then + if [ "x$is_top_level" != xtrue ]; then echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" fi while [ "x$list" != "x" ] ; do @@ -239,7 +233,7 @@ while [ "x${xen_list}" != "x" ] ; do linux_root_device_thisversion=${GRUB_DEVICE} fi - if [ "x$is_first_entry" = xtrue ]; then + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then linux_entry "${OS}" "${version}" "${xen_version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" @@ -251,8 +245,8 @@ while [ "x${xen_list}" != "x" ] ; do # TRANSLATORS: %s is replaced with an OS name echo "submenu '$(gettext_printf "Advanced options for %s (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" + is_top_level=false fi - is_first_entry=false linux_entry "${OS}" "${version}" "${xen_version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" @@ -261,17 +255,17 @@ while [ "x${xen_list}" != "x" ] ; do "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" fi - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` + list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` done - if [ x"$is_first_entry" != xtrue ]; then + if [ x"$is_top_level" != xtrue ]; then echo ' }' fi - xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '` + xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '` done # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. -if [ x"$is_first_entry" != xtrue ]; then +if [ x"$is_top_level" != xtrue ]; then echo '}' fi diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober index 4af65f2..4c1b457 100755 --- a/grub.d/30_os-prober +++ b/grub.d/30_os-prober @@ -18,8 +18,8 @@ set -e # along with GRUB. If not, see . prefix="/usr" -exec_prefix="${prefix}" -datarootdir="${prefix}/share" +exec_prefix="/usr" +datarootdir="/usr/share" export TEXTDOMAIN=grub export TEXTDOMAINDIR="${datarootdir}/locale" @@ -112,6 +112,18 @@ for OS in ${OSPROBED} ; do LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`" LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`" BOOT="`echo ${OS} | cut -d ':' -f 4`" + UUID="`${grub_probe} --target=fs_uuid --device ${DEVICE%@*}`" + EXPUUID="$UUID" + + if [ x"${DEVICE#*@}" != x ] ; then + EXPUUID="${EXPUUID}@${DEVICE#*@}" + fi + + if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" -a "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then + echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2 + continue + fi + BTRFS="`echo ${OS} | cut -d ':' -f 5`" if [ "x$BTRFS" = "xbtrfs" ]; then BTRFSuuid="`echo ${OS} | cut -d ':' -f 6`" @@ -134,6 +146,12 @@ EOF save_default_entry | grub_add_tab prepare_grub_to_access_device ${DEVICE} | grub_add_tab + if [ x"`${grub_probe} --device ${DEVICE} --target=partmap`" = xmsdos ]; then + cat << EOF + parttool \${root} hidden- +EOF + fi + case ${LONGNAME} in Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*) ;; @@ -173,7 +191,7 @@ EOF fi prepare_boot_cache= boot_device_id= - is_first_entry=true + is_top_level=true title_correction_code= OS="${LONGNAME}" @@ -209,7 +227,7 @@ EOF prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)" fi - if [ "x$is_first_entry" = xtrue ]; then + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then cat << EOF menuentry '$(echo "$OS $onstr" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' { EOF @@ -227,7 +245,7 @@ EOF } EOF echo "submenu '$(gettext_printf "Advanced options for %s" "${OS} $onstr" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_device_id' {" - is_first_entry=false + is_top_level=false fi title="${LLABEL} $onstr" cat << EOF @@ -253,13 +271,13 @@ EOF grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" fi done - if [ x"$is_first_entry" != xtrue ]; then + if [ x"$is_top_level" != xtrue ]; then echo '}' fi echo "$title_correction_code" ;; macosx) - OSXUUID="`${grub_probe} --target=fs_uuid --device ${DEVICE} 2> /dev/null`" + OSXUUID="${UUID}" osx_entry xnu_kernel 32 osx_entry xnu_kernel64 64 ;; @@ -287,6 +305,17 @@ EOF '\$(task-create)' '\$(task-resume)' module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' } +EOF + ;; + minix) + cat << EOF +menuentry "${LONGNAME} (on ${DEVICE}, Multiboot)" { +EOF + save_default_entry | sed -e "s/^/\t/" + prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" + cat << EOF + multiboot /boot/image_latest +} EOF ;; *) diff --git a/init.d/iperf b/init.d/iperf index 968257c..fad9965 100755 --- a/init.d/iperf +++ b/init.d/iperf @@ -1,21 +1,15 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.2 2005/01/23 10:52:13 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd-r1,v 1.2 2014/07/19 13:45:42 jer Exp $ -depend() { - need net -} +description="IP bandwidth measurement server" +command="/usr/bin/iperf" -start() { - ebegin "Starting iperf server" - start-stop-daemon --start --quiet \ - --exec /usr/bin/iperf -- -s -D ${IPERF_OPTS} &>/dev/null - eend $? -} +command_background="yes" +pidfile="/run/${SVCNAME}.pid" +command_args="-s ${IPERF_OPTS}" -stop() { - ebegin "Shutting down iperf server" - start-stop-daemon --stop --quiet --exec /usr/bin/iperf - eend $? -} +# note: iperf has a -D/--daemon flag but we seem to hit a bug +# where it starts to eat all CPU after client disconnect, +# see bug #344875 diff --git a/init.d/postgresql-9.3 b/init.d/postgresql-9.3 index b82cc3b..2706e7f 100755 --- a/init.d/postgresql-9.3 +++ b/init.d/postgresql-9.3 @@ -89,7 +89,7 @@ start() { --env "PGPORT=${configured_port}" \ ${extraenv} \ --pidfile ${DATA_DIR%/}/postmaster.pid \ - --exec /usr/lib/postgresql-9.3/bin/pg_ctl \ + --exec /usr/lib64/postgresql-9.3/bin/pg_ctl \ -- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \ -D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}" local retval=$? @@ -124,7 +124,7 @@ stop() { # Loops through nice, rude, and force quit in one go. start-stop-daemon --stop \ - --exec /usr/lib/postgresql-9.3/bin/postgres \ + --exec /usr/lib64/postgresql-9.3/bin/postgres \ --retry ${retries} \ --pidfile ${DATA_DIR%/}/postmaster.pid diff --git a/init.d/postgrey b/init.d/postgrey index 7920eb4..4a4626e 100755 --- a/init.d/postgrey +++ b/init.d/postgrey @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new,v 1.11 2011/11/30 08:40:51 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey-1.34-r3.rc.new,v 1.1 2014/08/13 14:10:06 hasufell Exp $ conf="/etc/conf.d/postgrey" @@ -56,12 +56,12 @@ fi start() { checkconfig || return 1 ebegin "Starting Postgrey" - + # HACK -- start a subshell and corrects perms on the socket... - ( if [ "x${POSTGREY_TYPE}" = "xunix" ]; then - rm -f ${POSTGREY_SOCKET}; - while ! test -S ${POSTGREY_SOCKET}; do sleep 1; done; - chmod a+rw,a-x ${POSTGREY_SOCKET}; fi ) & + if [ "x${POSTGREY_TYPE}" = "xunix" ]; then + rm -f ${POSTGREY_SOCKET} + ( while ! test -S ${POSTGREY_SOCKET}; do sleep 1; done; chmod a+rw,a-x ${POSTGREY_SOCKET} ) & + fi if [ -z ${POSTGREY_DELAY} ] ; then POSTGREY_DELAY_ARG="" diff --git a/init.d/pydoc-3.4 b/init.d/pydoc-3.4 new file mode 100755 index 0000000..0b51442 --- /dev/null +++ b/init.d/pydoc-3.4 @@ -0,0 +1,25 @@ +#!/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 $ + +start() { + local pydoc_port="${PYDOC3_4_PORT-${PYDOC_PORT}}" + + if [ -z "${pydoc_port}" ]; then + eerror "Port not set" + return 1 + fi + + ebegin "Starting pydoc server on port ${pydoc_port}" + start-stop-daemon --start --background --make-pidfile \ + --pidfile /var/run/pydoc3.4.pid \ + --exec /usr/bin/pydoc3.4 -- -p "${pydoc_port}" + eend $? +} + +stop() { + ebegin "Stopping pydoc server" + start-stop-daemon --stop --quiet --pidfile /var/run/pydoc3.4.pid + eend $? +} diff --git a/init.d/stunnel b/init.d/stunnel index 531f244..db0e1fd 100755 --- a/init.d/stunnel +++ b/init.d/stunnel @@ -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-misc/stunnel/files/stunnel.rc7,v 1.1 2014/06/10 11:39:33 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel,v 1.1 2014/08/08 12:20:25 blueness Exp $ SERVICENAME=${SVCNAME#*.} SERVICENAME=${SERVICENAME:-stunnel} diff --git a/nagios/cgi.cfg b/nagios/cgi.cfg index cc19172..5e17934 100644 --- a/nagios/cgi.cfg +++ b/nagios/cgi.cfg @@ -1,6 +1,6 @@ ################################################################# # -# CGI.CFG - Sample CGI Configuration File for Nagios 3.3.1 +# CGI.CFG - Sample CGI Configuration File for Nagios 3.5.1 # # Last Modified: 06-17-2009 # @@ -274,6 +274,13 @@ ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$ refresh_rate=90 +# DEFAULT PAGE LIMIT +# This option allows you to specify the default number of results +# displayed on the status.cgi. This number can be adjusted from +# within the UI after the initial page load. Setting this to 0 +# will show all results. + +result_limit=100 # ESCAPE HTML TAGS diff --git a/nagios/nagios.cfg b/nagios/nagios.cfg index 683e00c..6016c25 100644 --- a/nagios/nagios.cfg +++ b/nagios/nagios.cfg @@ -1,6 +1,6 @@ ############################################################################## # -# NAGIOS.CFG - Sample Main Config File for Nagios 3.3.1 +# NAGIOS.CFG - Sample Main Config File for Nagios 3.5.1 # # Read the documentation for more information on this configuration # file. I've provided some comments here, but things may not be so @@ -901,6 +901,18 @@ process_performance_data=0 +# HOST AND SERVICE PERFORMANCE DATA PROCESS EMPTY RESULTS +# THese options determine wether the core will process empty perfdata +# results or not. This is needed for distributed monitoring, and intentionally +# turned on by default. +# If you don't require empty perfdata - saving some cpu cycles +# on unwanted macro calculation - you can turn that off. Be careful! +# Values: 1 = enable, 0 = disable + +#host_perfdata_process_empty_results=1 +#service_perfdata_process_empty_results=1 + + # OBSESS OVER SERVICE CHECKS OPTION # This determines whether or not Nagios will obsess over service # checks and run the ocsp_command defined below. Unless you're @@ -1016,6 +1028,22 @@ service_freshness_check_interval=60 +# SERVICE CHECK TIMEOUT STATE +# This setting determines the state Nagios will report when a +# service check times out - that is does not respond within +# service_check_timeout seconds. This can be useful if a +# machine is running at too high a load and you do not want +# to consider a failed service check to be critical (the default). +# Valid settings are: +# c - Critical (default) +# u - Unknown +# w - Warning +# o - OK + +service_check_timeout_state=c + + + # HOST FRESHNESS CHECK OPTION # This option determines whether or not Nagios will periodically # check the "freshness" of host results. Enabling this option diff --git a/nagios/objects/commands.cfg b/nagios/objects/commands.cfg index a9d8ff1..9a5f8bd 100644 --- a/nagios/objects/commands.cfg +++ b/nagios/objects/commands.cfg @@ -1,5 +1,5 @@ ############################################################################### -# COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS 3.3.1 +# COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS 3.5.1 # # Last Modified: 05-31-2007 # diff --git a/nagios/resource.cfg b/nagios/resource.cfg index edb5a51..2e41e99 100644 --- a/nagios/resource.cfg +++ b/nagios/resource.cfg @@ -1,6 +1,6 @@ ########################################################################### # -# RESOURCE.CFG - Sample Resource File for Nagios 3.3.1 +# RESOURCE.CFG - Sample Resource File for Nagios 3.5.1 # # Last Modified: 09-10-2003 # diff --git a/php/apache2-php5.3/ext-active/apc.ini b/php/apache2-php5.3/ext-active/apc.ini deleted file mode 120000 index 3c72dfd..0000000 --- a/php/apache2-php5.3/ext-active/apc.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/apache2-php5.3/ext/apc.ini \ No newline at end of file diff --git a/php/apache2-php5.3/ext-active/crack.ini b/php/apache2-php5.3/ext-active/crack.ini deleted file mode 120000 index 053593d..0000000 --- a/php/apache2-php5.3/ext-active/crack.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/apache2-php5.3/ext/crack.ini \ No newline at end of file diff --git a/php/apache2-php5.3/ext-active/http.ini b/php/apache2-php5.3/ext-active/http.ini deleted file mode 120000 index d227e2a..0000000 --- a/php/apache2-php5.3/ext-active/http.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/apache2-php5.3/ext/http.ini \ No newline at end of file diff --git a/php/apache2-php5.3/ext-active/imagick.ini b/php/apache2-php5.3/ext-active/imagick.ini deleted file mode 120000 index b23ce76..0000000 --- a/php/apache2-php5.3/ext-active/imagick.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/apache2-php5.3/ext/imagick.ini \ No newline at end of file diff --git a/php/apache2-php5.3/ext-active/uuid.ini b/php/apache2-php5.3/ext-active/uuid.ini deleted file mode 120000 index f851904..0000000 --- a/php/apache2-php5.3/ext-active/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/apache2-php5.3/ext/uuid.ini \ No newline at end of file diff --git a/php/apache2-php5.3/ext/apc.ini b/php/apache2-php5.3/ext/apc.ini deleted file mode 100644 index a56eab8..0000000 --- a/php/apache2-php5.3/ext/apc.ini +++ /dev/null @@ -1 +0,0 @@ -extension=apc.so diff --git a/php/apache2-php5.3/ext/crack.ini b/php/apache2-php5.3/ext/crack.ini deleted file mode 100644 index 25bab90..0000000 --- a/php/apache2-php5.3/ext/crack.ini +++ /dev/null @@ -1 +0,0 @@ -extension=crack.so diff --git a/php/apache2-php5.3/ext/http.ini b/php/apache2-php5.3/ext/http.ini deleted file mode 100644 index 7c994f1..0000000 --- a/php/apache2-php5.3/ext/http.ini +++ /dev/null @@ -1,22 +0,0 @@ -extension=http.so -http.etag.mode=MD5 -http.force_exit=1 -http.log.allowed_methods= -http.log.cache= -http.log.composite= -http.log.not_found= -http.log.redirect= -http.only_exceptions=0 -http.persistent.handles.ident=GLOBAL -http.persistent.handles.limit=-1 -http.request.datashare.connect=0 -http.request.datashare.cookie=0 -http.request.datashare.dns=1 -http.request.datashare.ssl=0 -http.request.methods.allowed= -http.request.methods.custom= -http.send.inflate.start_auto=0 -http.send.inflate.start_flags=0 -http.send.deflate.start_auto=0 -http.send.deflate.start_flags=0 -http.send.not_found_404=1 diff --git a/php/apache2-php5.3/ext/uuid.ini b/php/apache2-php5.3/ext/uuid.ini deleted file mode 100644 index 3d84187..0000000 --- a/php/apache2-php5.3/ext/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -extension=uuid.so diff --git a/php/apache2-php5.5/ext-active/imagick.ini b/php/apache2-php5.5/ext-active/imagick.ini new file mode 120000 index 0000000..51ba241 --- /dev/null +++ b/php/apache2-php5.5/ext-active/imagick.ini @@ -0,0 +1 @@ +/etc/php/apache2-php5.5/ext/imagick.ini \ No newline at end of file diff --git a/php/apache2-php5.3/ext/imagick.ini b/php/apache2-php5.5/ext/imagick.ini similarity index 100% rename from php/apache2-php5.3/ext/imagick.ini rename to php/apache2-php5.5/ext/imagick.ini diff --git a/php/cgi-php5.3/ext-active/apc.ini b/php/cgi-php5.3/ext-active/apc.ini deleted file mode 120000 index 4a1574c..0000000 --- a/php/cgi-php5.3/ext-active/apc.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cgi-php5.3/ext/apc.ini \ No newline at end of file diff --git a/php/cgi-php5.3/ext-active/crack.ini b/php/cgi-php5.3/ext-active/crack.ini deleted file mode 120000 index 0365d7b..0000000 --- a/php/cgi-php5.3/ext-active/crack.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cgi-php5.3/ext/crack.ini \ No newline at end of file diff --git a/php/cgi-php5.3/ext-active/http.ini b/php/cgi-php5.3/ext-active/http.ini deleted file mode 120000 index e6bfd70..0000000 --- a/php/cgi-php5.3/ext-active/http.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cgi-php5.3/ext/http.ini \ No newline at end of file diff --git a/php/cgi-php5.3/ext-active/imagick.ini b/php/cgi-php5.3/ext-active/imagick.ini deleted file mode 120000 index 1b595f8..0000000 --- a/php/cgi-php5.3/ext-active/imagick.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cgi-php5.3/ext/imagick.ini \ No newline at end of file diff --git a/php/cgi-php5.3/ext-active/uuid.ini b/php/cgi-php5.3/ext-active/uuid.ini deleted file mode 120000 index 4c2ce79..0000000 --- a/php/cgi-php5.3/ext-active/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cgi-php5.3/ext/uuid.ini \ No newline at end of file diff --git a/php/cgi-php5.3/ext/apc.ini b/php/cgi-php5.3/ext/apc.ini deleted file mode 100644 index a56eab8..0000000 --- a/php/cgi-php5.3/ext/apc.ini +++ /dev/null @@ -1 +0,0 @@ -extension=apc.so diff --git a/php/cgi-php5.3/ext/crack.ini b/php/cgi-php5.3/ext/crack.ini deleted file mode 100644 index 25bab90..0000000 --- a/php/cgi-php5.3/ext/crack.ini +++ /dev/null @@ -1 +0,0 @@ -extension=crack.so diff --git a/php/cgi-php5.3/ext/http.ini b/php/cgi-php5.3/ext/http.ini deleted file mode 100644 index 7c994f1..0000000 --- a/php/cgi-php5.3/ext/http.ini +++ /dev/null @@ -1,22 +0,0 @@ -extension=http.so -http.etag.mode=MD5 -http.force_exit=1 -http.log.allowed_methods= -http.log.cache= -http.log.composite= -http.log.not_found= -http.log.redirect= -http.only_exceptions=0 -http.persistent.handles.ident=GLOBAL -http.persistent.handles.limit=-1 -http.request.datashare.connect=0 -http.request.datashare.cookie=0 -http.request.datashare.dns=1 -http.request.datashare.ssl=0 -http.request.methods.allowed= -http.request.methods.custom= -http.send.inflate.start_auto=0 -http.send.inflate.start_flags=0 -http.send.deflate.start_auto=0 -http.send.deflate.start_flags=0 -http.send.not_found_404=1 diff --git a/php/cgi-php5.3/ext/uuid.ini b/php/cgi-php5.3/ext/uuid.ini deleted file mode 100644 index 3d84187..0000000 --- a/php/cgi-php5.3/ext/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -extension=uuid.so diff --git a/php/cgi-php5.5/ext-active/imagick.ini b/php/cgi-php5.5/ext-active/imagick.ini new file mode 120000 index 0000000..d83fcab --- /dev/null +++ b/php/cgi-php5.5/ext-active/imagick.ini @@ -0,0 +1 @@ +/etc/php/cgi-php5.5/ext/imagick.ini \ No newline at end of file diff --git a/php/cgi-php5.3/ext/imagick.ini b/php/cgi-php5.5/ext/imagick.ini similarity index 100% rename from php/cgi-php5.3/ext/imagick.ini rename to php/cgi-php5.5/ext/imagick.ini diff --git a/php/cli-php5.3/ext-active/apc.ini b/php/cli-php5.3/ext-active/apc.ini deleted file mode 120000 index 56e9bdf..0000000 --- a/php/cli-php5.3/ext-active/apc.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cli-php5.3/ext/apc.ini \ No newline at end of file diff --git a/php/cli-php5.3/ext-active/crack.ini b/php/cli-php5.3/ext-active/crack.ini deleted file mode 120000 index 8166a50..0000000 --- a/php/cli-php5.3/ext-active/crack.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cli-php5.3/ext/crack.ini \ No newline at end of file diff --git a/php/cli-php5.3/ext-active/http.ini b/php/cli-php5.3/ext-active/http.ini deleted file mode 120000 index a18f900..0000000 --- a/php/cli-php5.3/ext-active/http.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cli-php5.3/ext/http.ini \ No newline at end of file diff --git a/php/cli-php5.3/ext-active/imagick.ini b/php/cli-php5.3/ext-active/imagick.ini deleted file mode 120000 index f0f5017..0000000 --- a/php/cli-php5.3/ext-active/imagick.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cli-php5.3/ext/imagick.ini \ No newline at end of file diff --git a/php/cli-php5.3/ext-active/uuid.ini b/php/cli-php5.3/ext-active/uuid.ini deleted file mode 120000 index 0c39d67..0000000 --- a/php/cli-php5.3/ext-active/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/cli-php5.3/ext/uuid.ini \ No newline at end of file diff --git a/php/cli-php5.3/ext/apc.ini b/php/cli-php5.3/ext/apc.ini deleted file mode 100644 index a56eab8..0000000 --- a/php/cli-php5.3/ext/apc.ini +++ /dev/null @@ -1 +0,0 @@ -extension=apc.so diff --git a/php/cli-php5.3/ext/crack.ini b/php/cli-php5.3/ext/crack.ini deleted file mode 100644 index 25bab90..0000000 --- a/php/cli-php5.3/ext/crack.ini +++ /dev/null @@ -1 +0,0 @@ -extension=crack.so diff --git a/php/cli-php5.3/ext/http.ini b/php/cli-php5.3/ext/http.ini deleted file mode 100644 index 7c994f1..0000000 --- a/php/cli-php5.3/ext/http.ini +++ /dev/null @@ -1,22 +0,0 @@ -extension=http.so -http.etag.mode=MD5 -http.force_exit=1 -http.log.allowed_methods= -http.log.cache= -http.log.composite= -http.log.not_found= -http.log.redirect= -http.only_exceptions=0 -http.persistent.handles.ident=GLOBAL -http.persistent.handles.limit=-1 -http.request.datashare.connect=0 -http.request.datashare.cookie=0 -http.request.datashare.dns=1 -http.request.datashare.ssl=0 -http.request.methods.allowed= -http.request.methods.custom= -http.send.inflate.start_auto=0 -http.send.inflate.start_flags=0 -http.send.deflate.start_auto=0 -http.send.deflate.start_flags=0 -http.send.not_found_404=1 diff --git a/php/cli-php5.3/ext/uuid.ini b/php/cli-php5.3/ext/uuid.ini deleted file mode 100644 index 3d84187..0000000 --- a/php/cli-php5.3/ext/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -extension=uuid.so diff --git a/php/cli-php5.5/ext-active/imagick.ini b/php/cli-php5.5/ext-active/imagick.ini new file mode 120000 index 0000000..465ada0 --- /dev/null +++ b/php/cli-php5.5/ext-active/imagick.ini @@ -0,0 +1 @@ +/etc/php/cli-php5.5/ext/imagick.ini \ No newline at end of file diff --git a/php/cli-php5.3/ext/imagick.ini b/php/cli-php5.5/ext/imagick.ini similarity index 100% rename from php/cli-php5.3/ext/imagick.ini rename to php/cli-php5.5/ext/imagick.ini diff --git a/php/embed-php5.3/ext-active/crack.ini b/php/embed-php5.3/ext-active/crack.ini deleted file mode 120000 index 62a4b64..0000000 --- a/php/embed-php5.3/ext-active/crack.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/embed-php5.3/ext/crack.ini \ No newline at end of file diff --git a/php/embed-php5.3/ext-active/http.ini b/php/embed-php5.3/ext-active/http.ini deleted file mode 120000 index d81990c..0000000 --- a/php/embed-php5.3/ext-active/http.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/embed-php5.3/ext/http.ini \ No newline at end of file diff --git a/php/embed-php5.3/ext-active/imagick.ini b/php/embed-php5.3/ext-active/imagick.ini deleted file mode 120000 index 70c17ad..0000000 --- a/php/embed-php5.3/ext-active/imagick.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/embed-php5.3/ext/imagick.ini \ No newline at end of file diff --git a/php/embed-php5.3/ext-active/uuid.ini b/php/embed-php5.3/ext-active/uuid.ini deleted file mode 120000 index ae123ac..0000000 --- a/php/embed-php5.3/ext-active/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/embed-php5.3/ext/uuid.ini \ No newline at end of file diff --git a/php/embed-php5.3/ext/crack.ini b/php/embed-php5.3/ext/crack.ini deleted file mode 100644 index 25bab90..0000000 --- a/php/embed-php5.3/ext/crack.ini +++ /dev/null @@ -1 +0,0 @@ -extension=crack.so diff --git a/php/embed-php5.3/ext/http.ini b/php/embed-php5.3/ext/http.ini deleted file mode 100644 index 7c994f1..0000000 --- a/php/embed-php5.3/ext/http.ini +++ /dev/null @@ -1,22 +0,0 @@ -extension=http.so -http.etag.mode=MD5 -http.force_exit=1 -http.log.allowed_methods= -http.log.cache= -http.log.composite= -http.log.not_found= -http.log.redirect= -http.only_exceptions=0 -http.persistent.handles.ident=GLOBAL -http.persistent.handles.limit=-1 -http.request.datashare.connect=0 -http.request.datashare.cookie=0 -http.request.datashare.dns=1 -http.request.datashare.ssl=0 -http.request.methods.allowed= -http.request.methods.custom= -http.send.inflate.start_auto=0 -http.send.inflate.start_flags=0 -http.send.deflate.start_auto=0 -http.send.deflate.start_flags=0 -http.send.not_found_404=1 diff --git a/php/embed-php5.3/ext/uuid.ini b/php/embed-php5.3/ext/uuid.ini deleted file mode 100644 index 3d84187..0000000 --- a/php/embed-php5.3/ext/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -extension=uuid.so diff --git a/php/embed-php5.5/ext-active/imagick.ini b/php/embed-php5.5/ext-active/imagick.ini new file mode 120000 index 0000000..458bec6 --- /dev/null +++ b/php/embed-php5.5/ext-active/imagick.ini @@ -0,0 +1 @@ +/etc/php/embed-php5.5/ext/imagick.ini \ No newline at end of file diff --git a/php/embed-php5.3/ext/imagick.ini b/php/embed-php5.5/ext/imagick.ini similarity index 100% rename from php/embed-php5.3/ext/imagick.ini rename to php/embed-php5.5/ext/imagick.ini diff --git a/php/fpm-php5.3/ext-active/apc.ini b/php/fpm-php5.3/ext-active/apc.ini deleted file mode 120000 index 50d4b8c..0000000 --- a/php/fpm-php5.3/ext-active/apc.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/fpm-php5.3/ext/apc.ini \ No newline at end of file diff --git a/php/fpm-php5.3/ext-active/crack.ini b/php/fpm-php5.3/ext-active/crack.ini deleted file mode 120000 index c7ef564..0000000 --- a/php/fpm-php5.3/ext-active/crack.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/fpm-php5.3/ext/crack.ini \ No newline at end of file diff --git a/php/fpm-php5.3/ext-active/http.ini b/php/fpm-php5.3/ext-active/http.ini deleted file mode 120000 index 189df42..0000000 --- a/php/fpm-php5.3/ext-active/http.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/fpm-php5.3/ext/http.ini \ No newline at end of file diff --git a/php/fpm-php5.3/ext-active/imagick.ini b/php/fpm-php5.3/ext-active/imagick.ini deleted file mode 120000 index daba6db..0000000 --- a/php/fpm-php5.3/ext-active/imagick.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/fpm-php5.3/ext/imagick.ini \ No newline at end of file diff --git a/php/fpm-php5.3/ext-active/uuid.ini b/php/fpm-php5.3/ext-active/uuid.ini deleted file mode 120000 index f081ab1..0000000 --- a/php/fpm-php5.3/ext-active/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -/etc/php/fpm-php5.3/ext/uuid.ini \ No newline at end of file diff --git a/php/fpm-php5.3/ext/apc.ini b/php/fpm-php5.3/ext/apc.ini deleted file mode 100644 index a56eab8..0000000 --- a/php/fpm-php5.3/ext/apc.ini +++ /dev/null @@ -1 +0,0 @@ -extension=apc.so diff --git a/php/fpm-php5.3/ext/crack.ini b/php/fpm-php5.3/ext/crack.ini deleted file mode 100644 index 25bab90..0000000 --- a/php/fpm-php5.3/ext/crack.ini +++ /dev/null @@ -1 +0,0 @@ -extension=crack.so diff --git a/php/fpm-php5.3/ext/http.ini b/php/fpm-php5.3/ext/http.ini deleted file mode 100644 index 7c994f1..0000000 --- a/php/fpm-php5.3/ext/http.ini +++ /dev/null @@ -1,22 +0,0 @@ -extension=http.so -http.etag.mode=MD5 -http.force_exit=1 -http.log.allowed_methods= -http.log.cache= -http.log.composite= -http.log.not_found= -http.log.redirect= -http.only_exceptions=0 -http.persistent.handles.ident=GLOBAL -http.persistent.handles.limit=-1 -http.request.datashare.connect=0 -http.request.datashare.cookie=0 -http.request.datashare.dns=1 -http.request.datashare.ssl=0 -http.request.methods.allowed= -http.request.methods.custom= -http.send.inflate.start_auto=0 -http.send.inflate.start_flags=0 -http.send.deflate.start_auto=0 -http.send.deflate.start_flags=0 -http.send.not_found_404=1 diff --git a/php/fpm-php5.3/ext/uuid.ini b/php/fpm-php5.3/ext/uuid.ini deleted file mode 100644 index 3d84187..0000000 --- a/php/fpm-php5.3/ext/uuid.ini +++ /dev/null @@ -1 +0,0 @@ -extension=uuid.so diff --git a/php/fpm-php5.5/ext-active/imagick.ini b/php/fpm-php5.5/ext-active/imagick.ini new file mode 120000 index 0000000..cd3f49b --- /dev/null +++ b/php/fpm-php5.5/ext-active/imagick.ini @@ -0,0 +1 @@ +/etc/php/fpm-php5.5/ext/imagick.ini \ No newline at end of file diff --git a/php/fpm-php5.3/ext/imagick.ini b/php/fpm-php5.5/ext/imagick.ini similarity index 100% rename from php/fpm-php5.3/ext/imagick.ini rename to php/fpm-php5.5/ext/imagick.ini diff --git a/portage/make.conf b/portage/make.conf index e736933..2824a11 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -59,7 +59,8 @@ ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hoo GRUB_PLATFORMS="coreboot emu multiboot pc qemu" -PHP_TARGETS="php5-3" +#PHP_TARGETS="php5-3" +PHP_TARGETS="php5-3 php5-5" RUBY_TARGETS="ruby19" I_KNOW_WHAT_I_AM_DOING=yes diff --git a/portage/package.use b/portage/package.use index 4c3f8a9..3c98bf7 100644 --- a/portage/package.use +++ b/portage/package.use @@ -56,6 +56,7 @@ dev-libs/libmemcached -doc tcmalloc dev-libs/libusb -doc dev-libs/nss utils dev-libs/openssl -kerberos rfc3779 +dev-libs/ossp-uuid -php dev-libs/yaz icu dev-perl/Catalyst-Action-REST php xml config-general data-taxi freezethaw json diff --git a/sysstat b/sysstat index 8694e31..a39172c 100644 --- a/sysstat +++ b/sysstat @@ -1,4 +1,4 @@ -# sysstat-10.2.1 configuration file. +# sysstat-11.0.0 configuration file. # How long to keep log files (in days). # If value is greater than 28, then log files are kept in @@ -12,3 +12,9 @@ COMPRESSAFTER=10 # which are used for the generation of log files. SADC_OPTIONS="" +# Directory where sa and sar files are saved. +SA_DIR=/var/log/sa + +# Compression program to use. +ZIP="bzip2" + diff --git a/systemd/system/spamassassin.service.d/00gentoo.conf b/systemd/system/spamassassin.service.d/00gentoo.conf new file mode 100644 index 0000000..9fc1f62 --- /dev/null +++ b/systemd/system/spamassassin.service.d/00gentoo.conf @@ -0,0 +1,10 @@ +# Here you can append some options to spamd process, please +# double check that you make needed changes in service file if +# you use options requiring it +# Some options: +# +# -c to create a per user configuration file +# -H [dir] to switch home dirs for helper apps, dir optional + +[Service] +Environment="SPAMD_OPTS= -c -H" diff --git a/udev/hwdb.bin b/udev/hwdb.bin index cf4a478fd6c40059f161d5d600bc51092ade20c7..40aa5116addaf49d419f3ce7f0ffa18a8a591d50 100644 GIT binary patch delta 295 zcmWN`Njic70D$2~hJ40IGAmQ&kRfx%eu^ezPGj+HZ99nrxP_$~xI!)7)!X>_4>ejS z)QaUGs0P2ENSlPDT{@&wx+E;!(yAWml|Jd00U4Bt49T!WWkg~!DsdT;ahZ@wnUZOl zky%MdQs!h{7GzPDBqhtTBCE0{>#`x6l9nymmL18+uI$Oa97t9U_4>ejS z)QaUGs0P2ENSlPDT{@&wx+E;!(yAWml|Jd00U4Bt49T!WWkg~!DsdT;ahZ@wnUZOl zky%MdQs!h{7GzPDBqhtTBCE0{>#`x6l9nymmL18+uI$Oa97t9U