From c189c82d4c2f8e75f7bacca68abc6530b3ea568c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 9 Oct 2015 10:59:24 +0200 Subject: [PATCH] Current state --- .etckeeper | 7 +- .gitignore | 1 + ImageMagick-6/delegates.xml | 8 +- conf.d/pydoc-2.7 | 2 +- conf.d/pydoc-3.4 | 2 +- config-archive/etc/etckeeper/etckeeper.conf | 44 ++++++++ .../etc/etckeeper/etckeeper.conf.dist.new | 44 ++++++++ config-archive/etc/postfix/main.cf | 6 +- config-archive/etc/postfix/main.cf.1 | 31 +++++- config-archive/etc/postfix/main.cf.2 | 8 +- config-archive/etc/postfix/main.cf.3 | 4 +- config-archive/etc/postfix/main.cf.4 | 4 +- config-archive/etc/postfix/main.cf.5 | 4 +- config-archive/etc/postfix/main.cf.6 | 4 +- config-archive/etc/postfix/main.cf.7 | 4 +- config-archive/etc/postfix/main.cf.8 | 4 +- config-archive/etc/postfix/main.cf.9 | 13 ++- config-archive/etc/postfix/main.cf.dist | 4 +- cron.daily/etckeeper | 19 ++++ csh.env | 4 +- dmtab | 2 +- env.d/05binutils | 4 +- 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/x86_64-pc-linux-gnu-4.9.3 | 10 ++ etckeeper/etckeeper.conf | 2 +- init.d/device-mapper | 2 +- init.d/dmeventd | 2 +- init.d/fancontrol | 2 +- init.d/lm_sensors | 2 +- init.d/lvm | 2 +- init.d/lvm-monitoring | 2 +- init.d/lvmetad | 2 +- init.d/named | 2 +- init.d/postfix | 2 +- init.d/pydoc-2.7 | 2 +- init.d/pydoc-3.4 | 2 +- init.d/ulogd | 4 +- init.d/unbound | 2 +- ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf | 2 + lvm/lvm.conf | 104 +++++++++++++++--- 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 | 2 +- portage/package.use | 7 +- postfix/main.cf | 4 +- postfix/postfix-files | 2 + postfix/saslpass | 2 +- profile.env | 4 +- sasl2/smtpd.conf | 2 +- vhosts/webapp-config | 1 + 55 files changed, 328 insertions(+), 89 deletions(-) create mode 100644 config-archive/etc/etckeeper/etckeeper.conf create mode 100644 config-archive/etc/etckeeper/etckeeper.conf.dist.new create mode 100755 cron.daily/etckeeper 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 create mode 100644 env.d/gcc/x86_64-pc-linux-gnu-4.9.3 diff --git a/.etckeeper b/.etckeeper index 4799604..dd61256 100755 --- a/.etckeeper +++ b/.etckeeper @@ -343,6 +343,9 @@ maybe chmod 0644 'config-archive/etc/eselect/postgresql/slots/9.1/server' maybe chmod 0644 'config-archive/etc/eselect/postgresql/slots/9.1/server.1' maybe chmod 0644 'config-archive/etc/eselect/postgresql/slots/9.1/server.2' maybe chmod 0644 'config-archive/etc/eselect/postgresql/slots/9.1/server.dist' +maybe chmod 0755 'config-archive/etc/etckeeper' +maybe chmod 0644 'config-archive/etc/etckeeper/etckeeper.conf' +maybe chmod 0644 'config-archive/etc/etckeeper/etckeeper.conf.dist.new' maybe chmod 0755 'config-archive/etc/fail2ban' maybe chmod 0644 'config-archive/etc/fail2ban/fail2ban.conf' maybe chmod 0644 'config-archive/etc/fail2ban/fail2ban.conf.1' @@ -755,6 +758,7 @@ maybe chmod 0644 'cron.d/sysstat' maybe chmod 0750 'cron.daily' maybe chmod 0644 'cron.daily/.keep_sys-process_cronbase-0' maybe chmod 0755 'cron.daily/00-logwatch' +maybe chmod 0755 'cron.daily/etckeeper' maybe chmod 0755 'cron.daily/logrotate' maybe chmod 0755 'cron.daily/makewhatis' maybe chmod 0755 'cron.daily/mlocate' @@ -851,7 +855,7 @@ maybe chmod 0644 'env.d/99editor' maybe chmod 0644 'env.d/99gentoolkit-env' maybe chmod 0755 'env.d/binutils' maybe chmod 0644 'env.d/binutils/config-x86_64-pc-linux-gnu' -maybe chmod 0644 'env.d/binutils/x86_64-pc-linux-gnu-2.24' +maybe chmod 0644 'env.d/binutils/x86_64-pc-linux-gnu-2.25.1' maybe chmod 0755 'env.d/blas' maybe chmod 0755 'env.d/blas/lib64' maybe chmod 0644 'env.d/blas/lib64/config' @@ -863,6 +867,7 @@ maybe chmod 0644 'env.d/cblas/lib64/reference' maybe chmod 0755 'env.d/gcc' maybe chmod 0644 'env.d/gcc/config-x86_64-pc-linux-gnu' maybe chmod 0644 'env.d/gcc/x86_64-pc-linux-gnu-4.8.5' +maybe chmod 0644 'env.d/gcc/x86_64-pc-linux-gnu-4.9.3' maybe chmod 0755 'env.d/lapack' maybe chmod 0755 'env.d/lapack/lib64' maybe chmod 0644 'env.d/lapack/lib64/config' diff --git a/.gitignore b/.gitignore index 6f3c373..5023253 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ openvpn/openvpn-status.log DEADJOE # end section managed by etckeeper +motd 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/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/etckeeper/etckeeper.conf b/config-archive/etc/etckeeper/etckeeper.conf new file mode 100644 index 0000000..a5983d9 --- /dev/null +++ b/config-archive/etc/etckeeper/etckeeper.conf @@ -0,0 +1,44 @@ +# The VCS to use. +#VCS="hg" +VCS="git" +#VCS="bzr" +#VCS="darcs" + +# Options passed to git commit when run by etckeeper. +GIT_COMMIT_OPTIONS="" + +# Options passed to hg commit when run by etckeeper. +HG_COMMIT_OPTIONS="" + +# Options passed to bzr commit when run by etckeeper. +BZR_COMMIT_OPTIONS="" + +# Options passed to darcs record when run by etckeeper. +DARCS_COMMIT_OPTIONS="-a" + +# Uncomment to avoid etckeeper committing existing changes +# to /etc automatically once per day. +#AVOID_DAILY_AUTOCOMMITS=1 + +# Uncomment the following to avoid special file warning +# (the option is enabled automatically by cronjob regardless). +#AVOID_SPECIAL_FILE_WARNING=1 + +# Uncomment to avoid etckeeper committing existing changes to +# /etc before installation. It will cancel the installation, +# so you can commit the changes by hand. +#AVOID_COMMIT_BEFORE_INSTALL=1 + +# The high-level package manager that's being used. +# (apt, pacman-g2, yum, zypper etc) +# For gentoo this is emerge +HIGHLEVEL_PACKAGE_MANAGER=emerge + +# The low-level package manager that's being used. +# (dpkg, rpm, pacman, pacman-g2, etc) +# For gentoo this is qlist +LOWLEVEL_PACKAGE_MANAGER=qlist + +# To push each commit to a remote, put the name of the remote here. +# (eg, "origin" for git). +PUSH_REMOTE="origin" diff --git a/config-archive/etc/etckeeper/etckeeper.conf.dist.new b/config-archive/etc/etckeeper/etckeeper.conf.dist.new new file mode 100644 index 0000000..c1da4bf --- /dev/null +++ b/config-archive/etc/etckeeper/etckeeper.conf.dist.new @@ -0,0 +1,44 @@ +# The VCS to use. +#VCS="hg" +VCS="git" +#VCS="bzr" +#VCS="darcs" + +# Options passed to git commit when run by etckeeper. +GIT_COMMIT_OPTIONS="" + +# Options passed to hg commit when run by etckeeper. +HG_COMMIT_OPTIONS="" + +# Options passed to bzr commit when run by etckeeper. +BZR_COMMIT_OPTIONS="" + +# Options passed to darcs record when run by etckeeper. +DARCS_COMMIT_OPTIONS="-a" + +# Uncomment to avoid etckeeper committing existing changes +# to /etc automatically once per day. +#AVOID_DAILY_AUTOCOMMITS=1 + +# Uncomment the following to avoid special file warning +# (the option is enabled automatically by cronjob regardless). +#AVOID_SPECIAL_FILE_WARNING=1 + +# Uncomment to avoid etckeeper committing existing changes to +# /etc before installation. It will cancel the installation, +# so you can commit the changes by hand. +#AVOID_COMMIT_BEFORE_INSTALL=1 + +# The high-level package manager that's being used. +# (apt, pacman-g2, yum, zypper etc) +# For gentoo this is emerge +HIGHLEVEL_PACKAGE_MANAGER=emerge + +# The low-level package manager that's being used. +# (dpkg, rpm, pacman, pacman-g2, etc) +# For gentoo this is qlist +LOWLEVEL_PACKAGE_MANAGER=qlist + +# To push each commit to a remote, put the name of the remote here. +# (eg, "origin" for git). +PUSH_REMOTE="" diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf index 8215e27..093ecf6 100644 --- a/config-archive/etc/postfix/main.cf +++ b/config-archive/etc/postfix/main.cf @@ -660,7 +660,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.0/html +html_directory = /usr/share/doc/postfix-3.0.1-r1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -673,7 +673,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.0/readme +readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme inet_protocols = all meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} @@ -685,7 +685,7 @@ inet_protocols = all mydomain = uhu-banane.de # default: mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 [fe80::%eth0]/64 -mynetworks = 127.0.0.0/8 208.94.38.84/32 46.16.73.175/32 [::1]/128 +mynetworks = 127.0.0.0/8 208.94.38.84/32 46.16.73.175/32 162.254.26.186/32 [::1]/128 myorigin = $mydomain recipient_delimiter = + diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1 index e839789..8215e27 100644 --- a/config-archive/etc/postfix/main.cf.1 +++ b/config-archive/etc/postfix/main.cf.1 @@ -10,6 +10,26 @@ # For best results, change no more than 2-3 parameters at a time, # and test if Postfix still works after every change. +# COMPATIBILITY +# +# The compatibility_level determines what default settings Postfix +# will use for main.cf and master.cf settings. These defaults will +# change over time. +# +# To avoid breaking things, Postfix will use backwards-compatible +# default settings and log where it uses those old backwards-compatible +# default settings, until the system administrator has determined +# if any backwards-compatible default settings need to be made +# permanent in main.cf or master.cf. +# +# When this review is complete, update the compatibility_level setting +# below as recommended in the RELEASE_NOTES file. +# +# The level below is what should be used with new (not upgrade) installs. +# +#compatibility_level = 2 +compatibility_level = 2 + # SOFT BOUNCE # # The soft_bounce parameter provides a limited safety net for @@ -640,7 +660,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.11.3/html +html_directory = /usr/share/doc/postfix-3.0.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +673,10 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.11.3/readme +readme_directory = /usr/share/doc/postfix-3.0.0/readme +inet_protocols = all +meta_directory = /etc/postfix +shlib_directory = /usr/lib64/postfix/${mail_version} home_mailbox = .maildir/ broken_sasl_auth_clients = yes @@ -684,3 +707,7 @@ smtpd_tls_received_header = yes smtpd_tls_session_cache_timeout = 3600s smtpd_use_tls = yes tls_random_source = dev:/dev/urandom +append_dot_mydomain = yes +mynetworks_style = subnet +relay_domains = $mydestination +smtputf8_enable = yes diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2 index 2c7bd57..e839789 100644 --- a/config-archive/etc/postfix/main.cf.2 +++ b/config-archive/etc/postfix/main.cf.2 @@ -5,7 +5,7 @@ # For common configuration examples, see BASIC_CONFIGURATION_README # and STANDARD_CONFIGURATION_README. To find these documents, use # the command "postconf html_directory readme_directory", or go to -# http://www.postfix.org/. +# http://www.postfix.org/BASIC_CONFIGURATION_README.html etc. # # For best results, change no more than 2-3 parameters at a time, # and test if Postfix still works after every change. @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.3/html +html_directory = /usr/share/doc/postfix-2.11.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.3/readme +readme_directory = /usr/share/doc/postfix-2.11.3/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes @@ -662,7 +662,7 @@ inet_protocols = all mydomain = uhu-banane.de # default: mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 [fe80::%eth0]/64 -mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 +mynetworks = 127.0.0.0/8 208.94.38.84/32 46.16.73.175/32 [::1]/128 myorigin = $mydomain recipient_delimiter = + diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3 index b155ad2..2c7bd57 100644 --- a/config-archive/etc/postfix/main.cf.3 +++ b/config-archive/etc/postfix/main.cf.3 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.2/html +html_directory = /usr/share/doc/postfix-2.10.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.2/readme +readme_directory = /usr/share/doc/postfix-2.10.3/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4 index b47d5a0..b155ad2 100644 --- a/config-archive/etc/postfix/main.cf.4 +++ b/config-archive/etc/postfix/main.cf.4 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.1/html +html_directory = /usr/share/doc/postfix-2.10.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.1/readme +readme_directory = /usr/share/doc/postfix-2.10.2/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5 index a3de299..b47d5a0 100644 --- a/config-archive/etc/postfix/main.cf.5 +++ b/config-archive/etc/postfix/main.cf.5 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.0/html +html_directory = /usr/share/doc/postfix-2.10.1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.0/readme +readme_directory = /usr/share/doc/postfix-2.10.1/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6 index f0345ad..a3de299 100644 --- a/config-archive/etc/postfix/main.cf.6 +++ b/config-archive/etc/postfix/main.cf.6 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.5/html +html_directory = /usr/share/doc/postfix-2.10.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.5/readme +readme_directory = /usr/share/doc/postfix-2.10.0/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.7 b/config-archive/etc/postfix/main.cf.7 index d148c85..f0345ad 100644 --- a/config-archive/etc/postfix/main.cf.7 +++ b/config-archive/etc/postfix/main.cf.7 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.4/html +html_directory = /usr/share/doc/postfix-2.9.5/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.4/readme +readme_directory = /usr/share/doc/postfix-2.9.5/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.8 b/config-archive/etc/postfix/main.cf.8 index fb2117d..d148c85 100644 --- a/config-archive/etc/postfix/main.cf.8 +++ b/config-archive/etc/postfix/main.cf.8 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.3/html +html_directory = /usr/share/doc/postfix-2.9.4/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.3/readme +readme_directory = /usr/share/doc/postfix-2.9.4/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.9 b/config-archive/etc/postfix/main.cf.9 index 95061cd..fb2117d 100644 --- a/config-archive/etc/postfix/main.cf.9 +++ b/config-archive/etc/postfix/main.cf.9 @@ -39,7 +39,7 @@ command_directory = /usr/sbin # daemon programs (i.e. programs listed in the master.cf file). This # directory must be owned by root. # -daemon_directory = /usr/lib64/postfix +daemon_directory = /usr/libexec/postfix # The data_directory parameter specifies the location of Postfix-writable # data files (caches, random numbers). This directory must be owned @@ -458,7 +458,12 @@ unknown_local_recipient_reject_code = 550 # the main.cf file, otherwise the SMTP server will reject mail for # non-UNIX accounts with "User unknown in local recipient table". # -#mailbox_transport = lmtp:unix:/file/name +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. #mailbox_transport = cyrus # The fallback_transport specifies the optional transport in master.cf @@ -635,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.8.9/html +html_directory = /usr/share/doc/postfix-2.9.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -648,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.8.9/readme +readme_directory = /usr/share/doc/postfix-2.9.3/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist index b38876b..ca960fe 100644 --- a/config-archive/etc/postfix/main.cf.dist +++ b/config-archive/etc/postfix/main.cf.dist @@ -659,7 +659,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.1-r1/html +html_directory = /usr/share/doc/postfix-3.0.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -672,7 +672,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme +readme_directory = /usr/share/doc/postfix-3.0.2/readme inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/cron.daily/etckeeper b/cron.daily/etckeeper new file mode 100755 index 0000000..5255691 --- /dev/null +++ b/cron.daily/etckeeper @@ -0,0 +1,19 @@ +#!/bin/sh +set -e +if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + . /etc/etckeeper/etckeeper.conf + if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then + # avoid autocommit if an install run is in progress + lockfile=/var/cache/etckeeper/packagelist.pre-install + if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then + rm -f "$lockfile" # stale + fi + if [ ! -e "$lockfile" ]; then + AVOID_SPECIAL_FILE_WARNING=1 + export AVOID_SPECIAL_FILE_WARNING + if etckeeper unclean; then + etckeeper commit "daily autocommit" >/dev/null + fi + fi + fi +fi diff --git a/csh.env b/csh.env index 8a677e2..8145dd4 100644 --- a/csh.env +++ b/csh.env @@ -9,10 +9,10 @@ setenv EDITOR '/usr/bin/vi' setenv GCC_SPECS '' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' +setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin' 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/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/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/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..9ff4062 --- /dev/null +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 @@ -0,0 +1,10 @@ +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_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" +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" diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf index c1da4bf..a5983d9 100644 --- a/etckeeper/etckeeper.conf +++ b/etckeeper/etckeeper.conf @@ -41,4 +41,4 @@ LOWLEVEL_PACKAGE_MANAGER=qlist # To push each commit to a remote, put the name of the remote here. # (eg, "origin" for git). -PUSH_REMOTE="" +PUSH_REMOTE="origin" 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/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/named b/init.d/named index a320d34..14b5dd7 100755 --- a/init.d/named +++ b/init.d/named @@ -14,7 +14,7 @@ depend() { NAMED_CONF=${CHROOT}/etc/bind/named.conf -OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0} +OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1} MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60} _mount() { 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/ulogd b/init.d/ulogd index 38b0fa9..47a0674 100755 --- a/init.d/ulogd +++ b/init.d/ulogd @@ -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-admin/ulogd/files/ulogd.init,v 1.1 2015/05/30 09:38:29 idella4 Exp $ +# $Id$ extra_started_commands="reload reopen" @@ -10,7 +10,7 @@ extra_started_commands="reload reopen" : ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}} depend() { - before iptables ip6tables ebtables firewall + before iptables ip6tables ebtables nftables firewall after mysql postgresql } 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/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..bdfbef6 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,4 @@ +/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/32 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3 /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5 diff --git a/lvm/lvm.conf b/lvm/lvm.conf index 0679832..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,27 +734,32 @@ 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. - use_lvmetad = 0 + # and then it automatically disables use_lvmetad. + + use_lvmetad = 1 # Full path of the utility called to check that a thin metadata device # is in a state that allows it to be used. @@ -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 b296a32..1294eb2 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -76,7 +76,7 @@ I_KNOW_WHAT_I_AM_DOING=yes USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl dane \ djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp gnome-keyring \ - gnutls gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n icu idn imagemagick imap ipv6 ithreads \ + gnutls gost gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n icu idn imagemagick imap ipv6 ithreads \ jadetex java javascript jbig jpeg jpeg2k json kerberos lasi ldap libwww lua \ lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \ nis nss numpy odbc ogg openexr openldap openssl pam pch pcre pdf perl pic png php postgres postscript python rar samba sasl \ diff --git a/portage/package.use b/portage/package.use index f01ccc0..5b0f408 100644 --- a/portage/package.use +++ b/portage/package.use @@ -1,7 +1,7 @@ app-admin/rsyslog normalize omudpspoof relp rfc3195 rfc5424hmac usertools zeromq app-admin/sysstat cron app-admin/syslog-ng dbi spoof-source sql -app-admin/ulogd -doc nfacct +app-admin/ulogd -doc nfacct ulog app-admin/webalizer geoip xtended app-antivirus/clamav clamdtop @@ -96,7 +96,7 @@ dev-ruby/rubygems server dev-scheme/guile discouraged networking regex -dev-util/strace aio +dev-util/strace aio unwind dev-vcs/git highlight dev-vcs/subversion -dso extras @@ -116,7 +116,7 @@ media-fonts/corefonts tahoma media-gfx/album ffmpeg plugins themes media-gfx/exiv2 contrib xmp media-gfx/graphicsmagick fpx -media-gfx/graphviz cairo +media-gfx/graphviz cairo devil gdk-pixbuf gts media-gfx/imagemagick autotrace corefonts fftw fpx hdri mpeg pango raw webp #media-gfx/imagemagick autotrace fftw mpeg raw webp #media-gfx/imagemagick -autotrace fftw mpeg raw @@ -181,6 +181,7 @@ sci-mathematics/pari -doc sys-apps/busybox math sys-apps/dbus -doc +sys-apps/etckeeper cron sys-apps/openrc tools sys-apps/pciutils dns network-cron -zlib sys-apps/portage epydoc diff --git a/postfix/main.cf b/postfix/main.cf index 093ecf6..ef49f91 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -660,7 +660,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.1-r1/html +html_directory = /usr/share/doc/postfix-3.0.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -673,7 +673,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme +readme_directory = /usr/share/doc/postfix-3.0.2/readme inet_protocols = all meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} 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.env b/profile.env index 48afb26..e8b653e 100644 --- a/profile.env +++ b/profile.env @@ -9,10 +9,10 @@ export EDITOR='/usr/bin/vi' export GCC_SPECS='' export GUILE_LOAD_PATH='/usr/share/guile/1.8' export HG='/usr/bin/hg' -export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' +export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' -export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/lib64/subversion/bin' 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/vhosts/webapp-config b/vhosts/webapp-config index b93c314..da01bc6 100644 --- a/vhosts/webapp-config +++ b/vhosts/webapp-config @@ -69,6 +69,7 @@ vhost_hostname="localhost" # cherokee # nginx # gatling +# tracd # # you can override this setting by using the -s switch to webapp-config -- 2.39.5