]> Frank Brehm's Git Trees - config/helga/etc.git/commitdiff
New state
authorFrank Brehm <frank@brehm-online.com>
Thu, 16 Feb 2012 08:17:37 +0000 (09:17 +0100)
committerFrank Brehm <frank@brehm-online.com>
Thu, 16 Feb 2012 08:17:37 +0000 (09:17 +0100)
466 files changed:
DIR_COLORS
ImageMagick/delegates.xml
ImageMagick/policy.xml
ImageMagick/sRGB.icc [new file with mode: 0644]
ImageMagick/sRGB.icm [deleted file]
bind/named-acl.conf
bind/named.conf
conf.d/fsck
conf.d/mysql.default [new file with mode: 0644]
conf.d/net.example
conf.d/udev
conf.d/urandom
conf.d/wireless.example
config-archive/etc/DIR_COLORS,v
config-archive/etc/ImageMagick/delegates.xml,v [new file with mode: 0644]
config-archive/etc/ImageMagick/policy.xml,v [new file with mode: 0644]
config-archive/etc/conf.d/fsck,v [new file with mode: 0644]
config-archive/etc/conf.d/mysql,v [new file with mode: 0644]
config-archive/etc/conf.d/mysql.dist.new [new file with mode: 0644]
config-archive/etc/conf.d/udev,v
config-archive/etc/conf.d/urandom,v
config-archive/etc/init.d/atd,v [new file with mode: 0755]
config-archive/etc/init.d/net.lo,v [new file with mode: 0755]
config-archive/etc/init.d/sysfs,v [new file with mode: 0755]
config-archive/etc/init.d/ulogd,v [new file with mode: 0755]
config-archive/etc/ldap.conf.sudo,v [new file with mode: 0644]
config-archive/etc/logrotate.d/mysql,v [new file with mode: 0644]
config-archive/etc/lvm/lvm.conf,v
config-archive/etc/man.conf,v
config-archive/etc/mc/filehighlight.ini,v [new file with mode: 0644]
config-archive/etc/mc/mc.ext,v
config-archive/etc/mc/mc.keymap,v
config-archive/etc/mc/mc.keymap.default,v
config-archive/etc/mc/mc.keymap.emacs,v
config-archive/etc/mc/mc.menu,v [new file with mode: 0644]
config-archive/etc/mysql/my.cnf,v
config-archive/etc/mysql/my.cnf.dist.new
config-archive/etc/pam.d/system-login,v
config-archive/etc/php/apache2-php5.3/ext/apc.ini,v [new file with mode: 0644]
config-archive/etc/php/apache2-php5.3/php.ini,v
config-archive/etc/php/cgi-php5.3/ext/apc.ini,v [new file with mode: 0644]
config-archive/etc/php/cgi-php5.3/php.ini,v
config-archive/etc/php/cli-php5.3/ext/apc.ini,v [new file with mode: 0644]
config-archive/etc/php/cli-php5.3/php.ini,v
config-archive/etc/php/embed-php5.3/php.ini,v
config-archive/etc/php/fpm-php5.3/ext/apc.ini,v [new file with mode: 0644]
config-archive/etc/php/fpm-php5.3/php.ini,v
config-archive/etc/rc.conf,v
config-archive/etc/sensors3.conf,v
config-archive/etc/ssl/openssl.cnf,v
config-archive/etc/ssl/openssl.cnf.dist.new
cron.monthly/update-usbids [new file with mode: 0755]
csh.env
env.d/50gconf [new file with mode: 0644]
foomatic/filter.conf [new file with mode: 0644]
foomatic/filter.conf.sample [new file with mode: 0644]
gconf/2/evoldap.conf [new file with mode: 0644]
gconf/2/path [new file with mode: 0644]
init.d/atd
init.d/bootmisc
init.d/consolefont
init.d/cupsd
init.d/fsck
init.d/hwclock
init.d/keymaps
init.d/modules
init.d/mysql
init.d/mysqlmanager [deleted file]
init.d/net.lo
init.d/network
init.d/numlock
init.d/php-fpm
init.d/staticroute
init.d/svnserve
init.d/sysfs
init.d/termencoding
init.d/udev
init.d/udev-dev-tarball [deleted file]
init.d/udev-mount
init.d/udev-postmount
init.d/ulogd
init.d/urandom
kernel-config/config-3.2.1-gentoo-r2-00 [new file with mode: 0644]
ld.so.cache
ldap.conf.sudo
logrotate.d/mysql
lvm/cache/.cache [deleted file]
lvm/lvm.conf
make.conf
man.conf
mc/cedit.menu [deleted file]
mc/filehighlight.ini
mc/mc.ext
mc/mc.keymap
mc/mc.keymap.default
mc/mc.keymap.emacs
mc/mc.menu
mc/mcedit.menu [new file with mode: 0644]
mtab
mysql/my.cnf.orig
openvpn/pb/sample-server.cfg [new file with mode: 0644]
openvpn/pb/vpn1.conf [new file with mode: 0644]
pam.d/system-login
php/apache2-php5.3/ext-active/bcmath.ini [deleted symlink]
php/apache2-php5.3/ext-active/bz2.ini [deleted symlink]
php/apache2-php5.3/ext-active/calendar.ini [deleted symlink]
php/apache2-php5.3/ext-active/curl.ini [deleted symlink]
php/apache2-php5.3/ext-active/dba.ini [deleted symlink]
php/apache2-php5.3/ext-active/enchant.ini [deleted symlink]
php/apache2-php5.3/ext-active/exif.ini [deleted symlink]
php/apache2-php5.3/ext-active/ftp.ini [deleted symlink]
php/apache2-php5.3/ext-active/gd.ini [deleted symlink]
php/apache2-php5.3/ext-active/gettext.ini [deleted symlink]
php/apache2-php5.3/ext-active/gmp.ini [deleted symlink]
php/apache2-php5.3/ext-active/imap.ini [deleted symlink]
php/apache2-php5.3/ext-active/intl.ini [deleted symlink]
php/apache2-php5.3/ext-active/ldap.ini [deleted symlink]
php/apache2-php5.3/ext-active/mbstring.ini [deleted symlink]
php/apache2-php5.3/ext-active/mcrypt.ini [deleted symlink]
php/apache2-php5.3/ext-active/mysql.ini [deleted symlink]
php/apache2-php5.3/ext-active/mysqli.ini [deleted symlink]
php/apache2-php5.3/ext-active/odbc.ini [deleted symlink]
php/apache2-php5.3/ext-active/pcntl.ini [deleted symlink]
php/apache2-php5.3/ext-active/pspell.ini [deleted symlink]
php/apache2-php5.3/ext-active/snmp.ini [deleted symlink]
php/apache2-php5.3/ext-active/soap.ini [deleted symlink]
php/apache2-php5.3/ext-active/sockets.ini [deleted symlink]
php/apache2-php5.3/ext-active/sysvmsg.ini [deleted symlink]
php/apache2-php5.3/ext-active/sysvsem.ini [deleted symlink]
php/apache2-php5.3/ext-active/sysvshm.ini [deleted symlink]
php/apache2-php5.3/ext-active/tidy.ini [deleted symlink]
php/apache2-php5.3/ext-active/wddx.ini [deleted symlink]
php/apache2-php5.3/ext-active/xmlrpc.ini [deleted symlink]
php/apache2-php5.3/ext-active/xsl.ini [deleted symlink]
php/apache2-php5.3/ext-active/zip.ini [deleted symlink]
php/apache2-php5.3/ext-active/zlib.ini [deleted symlink]
php/apache2-php5.3/ext/apc.ini
php/apache2-php5.3/ext/bcmath.ini [deleted file]
php/apache2-php5.3/ext/bz2.ini [deleted file]
php/apache2-php5.3/ext/calendar.ini [deleted file]
php/apache2-php5.3/ext/curl.ini [deleted file]
php/apache2-php5.3/ext/dba.ini [deleted file]
php/apache2-php5.3/ext/enchant.ini [deleted file]
php/apache2-php5.3/ext/exif.ini [deleted file]
php/apache2-php5.3/ext/ftp.ini [deleted file]
php/apache2-php5.3/ext/gd.ini [deleted file]
php/apache2-php5.3/ext/gettext.ini [deleted file]
php/apache2-php5.3/ext/gmp.ini [deleted file]
php/apache2-php5.3/ext/imap.ini [deleted file]
php/apache2-php5.3/ext/intl.ini [deleted file]
php/apache2-php5.3/ext/ldap.ini [deleted file]
php/apache2-php5.3/ext/mbstring.ini [deleted file]
php/apache2-php5.3/ext/mcrypt.ini [deleted file]
php/apache2-php5.3/ext/mysql.ini [deleted file]
php/apache2-php5.3/ext/mysqli.ini [deleted file]
php/apache2-php5.3/ext/odbc.ini [deleted file]
php/apache2-php5.3/ext/pcntl.ini [deleted file]
php/apache2-php5.3/ext/pspell.ini [deleted file]
php/apache2-php5.3/ext/snmp.ini [deleted file]
php/apache2-php5.3/ext/soap.ini [deleted file]
php/apache2-php5.3/ext/sockets.ini [deleted file]
php/apache2-php5.3/ext/sysvmsg.ini [deleted file]
php/apache2-php5.3/ext/sysvsem.ini [deleted file]
php/apache2-php5.3/ext/sysvshm.ini [deleted file]
php/apache2-php5.3/ext/tidy.ini [deleted file]
php/apache2-php5.3/ext/wddx.ini [deleted file]
php/apache2-php5.3/ext/xmlrpc.ini [deleted file]
php/apache2-php5.3/ext/xsl.ini [deleted file]
php/apache2-php5.3/ext/zip.ini [deleted file]
php/apache2-php5.3/ext/zlib.ini [deleted file]
php/apache2-php5.3/php.ini
php/cgi-php5.3/ext-active/bcmath.ini [deleted symlink]
php/cgi-php5.3/ext-active/bz2.ini [deleted symlink]
php/cgi-php5.3/ext-active/calendar.ini [deleted symlink]
php/cgi-php5.3/ext-active/curl.ini [deleted symlink]
php/cgi-php5.3/ext-active/dba.ini [deleted symlink]
php/cgi-php5.3/ext-active/enchant.ini [deleted symlink]
php/cgi-php5.3/ext-active/exif.ini [deleted symlink]
php/cgi-php5.3/ext-active/ftp.ini [deleted symlink]
php/cgi-php5.3/ext-active/gd.ini [deleted symlink]
php/cgi-php5.3/ext-active/gettext.ini [deleted symlink]
php/cgi-php5.3/ext-active/gmp.ini [deleted symlink]
php/cgi-php5.3/ext-active/imap.ini [deleted symlink]
php/cgi-php5.3/ext-active/intl.ini [deleted symlink]
php/cgi-php5.3/ext-active/ldap.ini [deleted symlink]
php/cgi-php5.3/ext-active/mbstring.ini [deleted symlink]
php/cgi-php5.3/ext-active/mcrypt.ini [deleted symlink]
php/cgi-php5.3/ext-active/mysql.ini [deleted symlink]
php/cgi-php5.3/ext-active/mysqli.ini [deleted symlink]
php/cgi-php5.3/ext-active/odbc.ini [deleted symlink]
php/cgi-php5.3/ext-active/pcntl.ini [deleted symlink]
php/cgi-php5.3/ext-active/pspell.ini [deleted symlink]
php/cgi-php5.3/ext-active/snmp.ini [deleted symlink]
php/cgi-php5.3/ext-active/soap.ini [deleted symlink]
php/cgi-php5.3/ext-active/sockets.ini [deleted symlink]
php/cgi-php5.3/ext-active/sysvmsg.ini [deleted symlink]
php/cgi-php5.3/ext-active/sysvsem.ini [deleted symlink]
php/cgi-php5.3/ext-active/sysvshm.ini [deleted symlink]
php/cgi-php5.3/ext-active/tidy.ini [deleted symlink]
php/cgi-php5.3/ext-active/wddx.ini [deleted symlink]
php/cgi-php5.3/ext-active/xmlrpc.ini [deleted symlink]
php/cgi-php5.3/ext-active/xsl.ini [deleted symlink]
php/cgi-php5.3/ext-active/zip.ini [deleted symlink]
php/cgi-php5.3/ext-active/zlib.ini [deleted symlink]
php/cgi-php5.3/ext/apc.ini
php/cgi-php5.3/ext/bcmath.ini [deleted file]
php/cgi-php5.3/ext/bz2.ini [deleted file]
php/cgi-php5.3/ext/calendar.ini [deleted file]
php/cgi-php5.3/ext/curl.ini [deleted file]
php/cgi-php5.3/ext/dba.ini [deleted file]
php/cgi-php5.3/ext/enchant.ini [deleted file]
php/cgi-php5.3/ext/exif.ini [deleted file]
php/cgi-php5.3/ext/ftp.ini [deleted file]
php/cgi-php5.3/ext/gd.ini [deleted file]
php/cgi-php5.3/ext/gettext.ini [deleted file]
php/cgi-php5.3/ext/gmp.ini [deleted file]
php/cgi-php5.3/ext/imap.ini [deleted file]
php/cgi-php5.3/ext/intl.ini [deleted file]
php/cgi-php5.3/ext/ldap.ini [deleted file]
php/cgi-php5.3/ext/mbstring.ini [deleted file]
php/cgi-php5.3/ext/mcrypt.ini [deleted file]
php/cgi-php5.3/ext/mysql.ini [deleted file]
php/cgi-php5.3/ext/mysqli.ini [deleted file]
php/cgi-php5.3/ext/odbc.ini [deleted file]
php/cgi-php5.3/ext/pcntl.ini [deleted file]
php/cgi-php5.3/ext/pspell.ini [deleted file]
php/cgi-php5.3/ext/snmp.ini [deleted file]
php/cgi-php5.3/ext/soap.ini [deleted file]
php/cgi-php5.3/ext/sockets.ini [deleted file]
php/cgi-php5.3/ext/sysvmsg.ini [deleted file]
php/cgi-php5.3/ext/sysvsem.ini [deleted file]
php/cgi-php5.3/ext/sysvshm.ini [deleted file]
php/cgi-php5.3/ext/tidy.ini [deleted file]
php/cgi-php5.3/ext/wddx.ini [deleted file]
php/cgi-php5.3/ext/xmlrpc.ini [deleted file]
php/cgi-php5.3/ext/xsl.ini [deleted file]
php/cgi-php5.3/ext/zip.ini [deleted file]
php/cgi-php5.3/ext/zlib.ini [deleted file]
php/cgi-php5.3/php.ini
php/cli-php5.3/ext-active/bcmath.ini [deleted symlink]
php/cli-php5.3/ext-active/bz2.ini [deleted symlink]
php/cli-php5.3/ext-active/calendar.ini [deleted symlink]
php/cli-php5.3/ext-active/curl.ini [deleted symlink]
php/cli-php5.3/ext-active/dba.ini [deleted symlink]
php/cli-php5.3/ext-active/enchant.ini [deleted symlink]
php/cli-php5.3/ext-active/exif.ini [deleted symlink]
php/cli-php5.3/ext-active/ftp.ini [deleted symlink]
php/cli-php5.3/ext-active/gd.ini [deleted symlink]
php/cli-php5.3/ext-active/gettext.ini [deleted symlink]
php/cli-php5.3/ext-active/gmp.ini [deleted symlink]
php/cli-php5.3/ext-active/imap.ini [deleted symlink]
php/cli-php5.3/ext-active/intl.ini [deleted symlink]
php/cli-php5.3/ext-active/ldap.ini [deleted symlink]
php/cli-php5.3/ext-active/mbstring.ini [deleted symlink]
php/cli-php5.3/ext-active/mcrypt.ini [deleted symlink]
php/cli-php5.3/ext-active/mysql.ini [deleted symlink]
php/cli-php5.3/ext-active/mysqli.ini [deleted symlink]
php/cli-php5.3/ext-active/odbc.ini [deleted symlink]
php/cli-php5.3/ext-active/pcntl.ini [deleted symlink]
php/cli-php5.3/ext-active/pspell.ini [deleted symlink]
php/cli-php5.3/ext-active/snmp.ini [deleted symlink]
php/cli-php5.3/ext-active/soap.ini [deleted symlink]
php/cli-php5.3/ext-active/sockets.ini [deleted symlink]
php/cli-php5.3/ext-active/sysvmsg.ini [deleted symlink]
php/cli-php5.3/ext-active/sysvsem.ini [deleted symlink]
php/cli-php5.3/ext-active/sysvshm.ini [deleted symlink]
php/cli-php5.3/ext-active/tidy.ini [deleted symlink]
php/cli-php5.3/ext-active/wddx.ini [deleted symlink]
php/cli-php5.3/ext-active/xmlrpc.ini [deleted symlink]
php/cli-php5.3/ext-active/xsl.ini [deleted symlink]
php/cli-php5.3/ext-active/zip.ini [deleted symlink]
php/cli-php5.3/ext-active/zlib.ini [deleted symlink]
php/cli-php5.3/ext/apc.ini
php/cli-php5.3/ext/bcmath.ini [deleted file]
php/cli-php5.3/ext/bz2.ini [deleted file]
php/cli-php5.3/ext/calendar.ini [deleted file]
php/cli-php5.3/ext/curl.ini [deleted file]
php/cli-php5.3/ext/dba.ini [deleted file]
php/cli-php5.3/ext/enchant.ini [deleted file]
php/cli-php5.3/ext/exif.ini [deleted file]
php/cli-php5.3/ext/ftp.ini [deleted file]
php/cli-php5.3/ext/gd.ini [deleted file]
php/cli-php5.3/ext/gettext.ini [deleted file]
php/cli-php5.3/ext/gmp.ini [deleted file]
php/cli-php5.3/ext/imap.ini [deleted file]
php/cli-php5.3/ext/intl.ini [deleted file]
php/cli-php5.3/ext/ldap.ini [deleted file]
php/cli-php5.3/ext/mbstring.ini [deleted file]
php/cli-php5.3/ext/mcrypt.ini [deleted file]
php/cli-php5.3/ext/mysql.ini [deleted file]
php/cli-php5.3/ext/mysqli.ini [deleted file]
php/cli-php5.3/ext/odbc.ini [deleted file]
php/cli-php5.3/ext/pcntl.ini [deleted file]
php/cli-php5.3/ext/pspell.ini [deleted file]
php/cli-php5.3/ext/snmp.ini [deleted file]
php/cli-php5.3/ext/soap.ini [deleted file]
php/cli-php5.3/ext/sockets.ini [deleted file]
php/cli-php5.3/ext/sysvmsg.ini [deleted file]
php/cli-php5.3/ext/sysvsem.ini [deleted file]
php/cli-php5.3/ext/sysvshm.ini [deleted file]
php/cli-php5.3/ext/tidy.ini [deleted file]
php/cli-php5.3/ext/wddx.ini [deleted file]
php/cli-php5.3/ext/xmlrpc.ini [deleted file]
php/cli-php5.3/ext/xsl.ini [deleted file]
php/cli-php5.3/ext/zip.ini [deleted file]
php/cli-php5.3/ext/zlib.ini [deleted file]
php/cli-php5.3/php.ini
php/embed-php5.3/ext-active/bcmath.ini [deleted symlink]
php/embed-php5.3/ext-active/bz2.ini [deleted symlink]
php/embed-php5.3/ext-active/calendar.ini [deleted symlink]
php/embed-php5.3/ext-active/curl.ini [deleted symlink]
php/embed-php5.3/ext-active/dba.ini [deleted symlink]
php/embed-php5.3/ext-active/enchant.ini [deleted symlink]
php/embed-php5.3/ext-active/exif.ini [deleted symlink]
php/embed-php5.3/ext-active/ftp.ini [deleted symlink]
php/embed-php5.3/ext-active/gd.ini [deleted symlink]
php/embed-php5.3/ext-active/gettext.ini [deleted symlink]
php/embed-php5.3/ext-active/gmp.ini [deleted symlink]
php/embed-php5.3/ext-active/imap.ini [deleted symlink]
php/embed-php5.3/ext-active/intl.ini [deleted symlink]
php/embed-php5.3/ext-active/ldap.ini [deleted symlink]
php/embed-php5.3/ext-active/mbstring.ini [deleted symlink]
php/embed-php5.3/ext-active/mcrypt.ini [deleted symlink]
php/embed-php5.3/ext-active/mysql.ini [deleted symlink]
php/embed-php5.3/ext-active/mysqli.ini [deleted symlink]
php/embed-php5.3/ext-active/odbc.ini [deleted symlink]
php/embed-php5.3/ext-active/pcntl.ini [deleted symlink]
php/embed-php5.3/ext-active/pspell.ini [deleted symlink]
php/embed-php5.3/ext-active/snmp.ini [deleted symlink]
php/embed-php5.3/ext-active/soap.ini [deleted symlink]
php/embed-php5.3/ext-active/sockets.ini [deleted symlink]
php/embed-php5.3/ext-active/sysvmsg.ini [deleted symlink]
php/embed-php5.3/ext-active/sysvsem.ini [deleted symlink]
php/embed-php5.3/ext-active/sysvshm.ini [deleted symlink]
php/embed-php5.3/ext-active/tidy.ini [deleted symlink]
php/embed-php5.3/ext-active/wddx.ini [deleted symlink]
php/embed-php5.3/ext-active/xmlrpc.ini [deleted symlink]
php/embed-php5.3/ext-active/xsl.ini [deleted symlink]
php/embed-php5.3/ext-active/zip.ini [deleted symlink]
php/embed-php5.3/ext-active/zlib.ini [deleted symlink]
php/embed-php5.3/ext/bcmath.ini [deleted file]
php/embed-php5.3/ext/bz2.ini [deleted file]
php/embed-php5.3/ext/calendar.ini [deleted file]
php/embed-php5.3/ext/curl.ini [deleted file]
php/embed-php5.3/ext/dba.ini [deleted file]
php/embed-php5.3/ext/enchant.ini [deleted file]
php/embed-php5.3/ext/exif.ini [deleted file]
php/embed-php5.3/ext/ftp.ini [deleted file]
php/embed-php5.3/ext/gd.ini [deleted file]
php/embed-php5.3/ext/gettext.ini [deleted file]
php/embed-php5.3/ext/gmp.ini [deleted file]
php/embed-php5.3/ext/imap.ini [deleted file]
php/embed-php5.3/ext/intl.ini [deleted file]
php/embed-php5.3/ext/ldap.ini [deleted file]
php/embed-php5.3/ext/mbstring.ini [deleted file]
php/embed-php5.3/ext/mcrypt.ini [deleted file]
php/embed-php5.3/ext/mysql.ini [deleted file]
php/embed-php5.3/ext/mysqli.ini [deleted file]
php/embed-php5.3/ext/odbc.ini [deleted file]
php/embed-php5.3/ext/pcntl.ini [deleted file]
php/embed-php5.3/ext/pspell.ini [deleted file]
php/embed-php5.3/ext/snmp.ini [deleted file]
php/embed-php5.3/ext/soap.ini [deleted file]
php/embed-php5.3/ext/sockets.ini [deleted file]
php/embed-php5.3/ext/sysvmsg.ini [deleted file]
php/embed-php5.3/ext/sysvsem.ini [deleted file]
php/embed-php5.3/ext/sysvshm.ini [deleted file]
php/embed-php5.3/ext/tidy.ini [deleted file]
php/embed-php5.3/ext/wddx.ini [deleted file]
php/embed-php5.3/ext/xmlrpc.ini [deleted file]
php/embed-php5.3/ext/xsl.ini [deleted file]
php/embed-php5.3/ext/zip.ini [deleted file]
php/embed-php5.3/ext/zlib.ini [deleted file]
php/embed-php5.3/php.ini
php/fpm-php5.3/ext-active/bcmath.ini [deleted symlink]
php/fpm-php5.3/ext-active/bz2.ini [deleted symlink]
php/fpm-php5.3/ext-active/calendar.ini [deleted symlink]
php/fpm-php5.3/ext-active/curl.ini [deleted symlink]
php/fpm-php5.3/ext-active/dba.ini [deleted symlink]
php/fpm-php5.3/ext-active/enchant.ini [deleted symlink]
php/fpm-php5.3/ext-active/exif.ini [deleted symlink]
php/fpm-php5.3/ext-active/ftp.ini [deleted symlink]
php/fpm-php5.3/ext-active/gd.ini [deleted symlink]
php/fpm-php5.3/ext-active/gettext.ini [deleted symlink]
php/fpm-php5.3/ext-active/gmp.ini [deleted symlink]
php/fpm-php5.3/ext-active/imap.ini [deleted symlink]
php/fpm-php5.3/ext-active/intl.ini [deleted symlink]
php/fpm-php5.3/ext-active/ldap.ini [deleted symlink]
php/fpm-php5.3/ext-active/mbstring.ini [deleted symlink]
php/fpm-php5.3/ext-active/mcrypt.ini [deleted symlink]
php/fpm-php5.3/ext-active/mysql.ini [deleted symlink]
php/fpm-php5.3/ext-active/mysqli.ini [deleted symlink]
php/fpm-php5.3/ext-active/odbc.ini [deleted symlink]
php/fpm-php5.3/ext-active/pcntl.ini [deleted symlink]
php/fpm-php5.3/ext-active/pspell.ini [deleted symlink]
php/fpm-php5.3/ext-active/snmp.ini [deleted symlink]
php/fpm-php5.3/ext-active/soap.ini [deleted symlink]
php/fpm-php5.3/ext-active/sockets.ini [deleted symlink]
php/fpm-php5.3/ext-active/sysvmsg.ini [deleted symlink]
php/fpm-php5.3/ext-active/sysvsem.ini [deleted symlink]
php/fpm-php5.3/ext-active/sysvshm.ini [deleted symlink]
php/fpm-php5.3/ext-active/tidy.ini [deleted symlink]
php/fpm-php5.3/ext-active/wddx.ini [deleted symlink]
php/fpm-php5.3/ext-active/xmlrpc.ini [deleted symlink]
php/fpm-php5.3/ext-active/xsl.ini [deleted symlink]
php/fpm-php5.3/ext-active/zip.ini [deleted symlink]
php/fpm-php5.3/ext-active/zlib.ini [deleted symlink]
php/fpm-php5.3/ext/apc.ini
php/fpm-php5.3/ext/bcmath.ini [deleted file]
php/fpm-php5.3/ext/bz2.ini [deleted file]
php/fpm-php5.3/ext/calendar.ini [deleted file]
php/fpm-php5.3/ext/curl.ini [deleted file]
php/fpm-php5.3/ext/dba.ini [deleted file]
php/fpm-php5.3/ext/enchant.ini [deleted file]
php/fpm-php5.3/ext/exif.ini [deleted file]
php/fpm-php5.3/ext/ftp.ini [deleted file]
php/fpm-php5.3/ext/gd.ini [deleted file]
php/fpm-php5.3/ext/gettext.ini [deleted file]
php/fpm-php5.3/ext/gmp.ini [deleted file]
php/fpm-php5.3/ext/imap.ini [deleted file]
php/fpm-php5.3/ext/intl.ini [deleted file]
php/fpm-php5.3/ext/ldap.ini [deleted file]
php/fpm-php5.3/ext/mbstring.ini [deleted file]
php/fpm-php5.3/ext/mcrypt.ini [deleted file]
php/fpm-php5.3/ext/mysql.ini [deleted file]
php/fpm-php5.3/ext/mysqli.ini [deleted file]
php/fpm-php5.3/ext/odbc.ini [deleted file]
php/fpm-php5.3/ext/pcntl.ini [deleted file]
php/fpm-php5.3/ext/pspell.ini [deleted file]
php/fpm-php5.3/ext/snmp.ini [deleted file]
php/fpm-php5.3/ext/soap.ini [deleted file]
php/fpm-php5.3/ext/sockets.ini [deleted file]
php/fpm-php5.3/ext/sysvmsg.ini [deleted file]
php/fpm-php5.3/ext/sysvsem.ini [deleted file]
php/fpm-php5.3/ext/sysvshm.ini [deleted file]
php/fpm-php5.3/ext/tidy.ini [deleted file]
php/fpm-php5.3/ext/wddx.ini [deleted file]
php/fpm-php5.3/ext/xmlrpc.ini [deleted file]
php/fpm-php5.3/ext/xsl.ini [deleted file]
php/fpm-php5.3/ext/zip.ini [deleted file]
php/fpm-php5.3/ext/zlib.ini [deleted file]
php/fpm-php5.3/php.ini
portage
postfix/header_checks
postfix/header_checks.2011-12-27_11:47:25 [new file with mode: 0644]
postfix/header_checks.2012-01-28_15:45:56 [new file with mode: 0644]
profile.env
rc.conf
sensors3.conf
ssl/CA-Brehm/stunnel/mkcert [new file with mode: 0755]
ssl/CA-Brehm/stunnel/stunnel-cert.cnf [new file with mode: 0644]
ssl/CA-Brehm/stunnel/stunnel.rand [new file with mode: 0644]
ssl/openssl.cnf
ssl/openssl.cnf.orig
texmf/ls-R
texmf/texdoc.d/texdoc.cnf [deleted file]
texmf/updmap.d/00updmap.cfg
texmf/updmap.d/texlive-fontsrecommended.cfg
texmf/web2c.d/fmtutil-hdr.cnf [new file with mode: 0644]
texmf/web2c.d/updmap-hdr.cfg [new file with mode: 0644]
texmf/web2c/updmap.cfg
xdg/autostart/gnome-keyring-gpg.desktop [new file with mode: 0644]
xdg/autostart/gnome-keyring-pkcs11.desktop [new file with mode: 0644]
xdg/autostart/gnome-keyring-secrets.desktop [new file with mode: 0644]
xdg/autostart/gnome-keyring-ssh.desktop [new file with mode: 0644]
xdg/autostart/gsettings-data-convert.desktop [new file with mode: 0644]

index 985fcae5d0f209bae0c58d320ac2e64dd1653edb..3314f90849e22536428ab491d6cd37b9ed3523b4 100644 (file)
@@ -1,7 +1,7 @@
 # Configuration file for dircolors, a utility to help you set the
 # LS_COLORS environment variable used by GNU ls with the --color option.
 
-# Copyright (C) 1996, 1999-2010 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1999-2011 Free Software Foundation, Inc.
 # Copying and distribution of this file, with or without modification,
 # are permitted provided the copyright notice and this notice are preserved.
 
@@ -52,6 +52,7 @@ TERM screen-256color
 TERM screen-256color-bce
 TERM screen-bce
 TERM screen-w
+TERM screen.Eterm
 TERM screen.rxvt
 TERM screen.linux
 TERM terminator
@@ -134,6 +135,9 @@ EXEC 01;32
 .deb 01;31
 .rpm 01;31
 .jar 01;31
+.war 01;31
+.ear 01;31
+.sar 01;31
 .rar 01;31
 .ace 01;31
 .zoo 01;31
@@ -164,6 +168,7 @@ EXEC 01;32
 .mpeg 01;35
 .m2v 01;35
 .mkv 01;35
+.webm 01;35
 .ogm 01;35
 .mp4 01;35
 .m4v 01;35
index f671293dcc01c29259a61e543a14227837e0ee73..b186532abe1af10aea48ec70a5effc44bb2b16cb 100644 (file)
   <delegate decode="ilbm" command="&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="man" command="&quot;groff&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="mpeg:decode" command="&quot;ffmpeg&quot; -v -1 -vframes %S -i &quot;%i&quot; -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%Z&quot;"/>
-  <delegate encode="mpeg:encode" stealth="True" command="&quot;ffmpeg&quot; -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -pass 1/2 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%Z&quot;"/>
+  <delegate encode="mpeg:encode" stealth="True" command="&quot;ffmpeg&quot; -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%Z&quot;"/>
   <delegate decode="sid" command="&quot;mrsidgeodecode&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
   <delegate decode="pcl:color" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
-  <delegate decode="png" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
+  <delegate decode="tiff" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
   <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="pov" command="&quot;povray&quot; &quot;+i%i&quot; -D0 +o&quot;%o&quot; +fn%q +w%w +h%h +a -q9 -kfi&quot;%s&quot; -kff&quot;%n&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="ps" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="rgba" encode="rle" mode="encode" command="&quot;rawtorle&quot; -o &quot;%o&quot; -v &quot;%i&quot;"/>
   <delegate decode="scan" command="&quot;scanimage&quot; -d &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="scanx" command="&quot;scanimage&quot; &gt; &quot;%o&quot;"/>
-  <delegate decode="png" encode="show" spawn="True" command="&quot;/usr/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="miff" encode="show" spawn="True" command="&quot;/usr/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="shtml" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="svg" command="&quot;rsvg&quot; &quot;%i&quot; &quot;%o&quot;"/>
   <delegate decode="txt" encode="ps" mode="bi" command="&quot;enscript&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
-  <delegate decode="png" encode="win" stealth="True" spawn="True" command="&quot;/usr/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;/usr/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="wmf" command="&quot;wmf2eps&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="xps:color" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="xps:cmyk" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
index 28eda17864032a02d27c73b27aa2cd51d40d4792..19e979620ed29ae6fdd66b8448e338e925064cbc 100644 (file)
@@ -37,7 +37,7 @@
 
   Any large image is cached to disk rather than memory:
 
-    <policy domain="resource" name="area" value="1gb"/>
+    <policy domain="resource" name="area" value="1GB"/>
 
   Note, resource policies are maximums for each instance of ImageMagick (e.g.
   policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit
@@ -48,8 +48,8 @@
   <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
   <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
   <!-- <policy domain="resource" name="map" value="4GiB"/> -->
-  <!-- <policy domain="resource" name="area" value="1gb"/> -->
-  <!-- <policy domain="resource" name="disk" value="16eb"/> -->
+  <!-- <policy domain="resource" name="area" value="1GB"/> -->
+  <!-- <policy domain="resource" name="disk" value="16EB"/> -->
   <!-- <policy domain="resource" name="file" value="768"/> -->
   <!-- <policy domain="resource" name="thread" value="4"/> -->
   <!-- <policy domain="resource" name="throttle" value="0"/> -->
diff --git a/ImageMagick/sRGB.icc b/ImageMagick/sRGB.icc
new file mode 100644 (file)
index 0000000..6f3efbf
Binary files /dev/null and b/ImageMagick/sRGB.icc differ
diff --git a/ImageMagick/sRGB.icm b/ImageMagick/sRGB.icm
deleted file mode 100644 (file)
index 7f9d18d..0000000
Binary files a/ImageMagick/sRGB.icm and /dev/null differ
index 9902fb6b124a2644ecaa94c4b926862463a8c0ae..de512c85365b05646191aaf79ccab1dec714cdde 100644 (file)
 //# Access-Control-Listen
 
 acl common-allow-transfer {
-    213.20.92.7;
-    80.154.16.7;
-    85.199.64.7;
-    85.214.43.33;
-    85.214.134.152;
+       213.20.92.7;
+       80.154.16.7;
+       85.199.64.7;
+       46.16.73.175;
+       85.214.43.33;
+       85.214.134.152;
        85.214.147.150;
        195.50.185.7;
        2a01:238:4239:8a00:d4da:215d:3d01:f9b9;
@@ -32,8 +33,9 @@ acl common-allow-transfer {
 };
 
 acl allow-dyn-update {
-    127.0.0.1;
-    85.214.134.152;
+       127.0.0.1;
+       85.214.134.152;
+       46.16.73.175;
 };
 
 
index 0717c2a22fddcdf08b63a12bea6ff64d8a3877f8..a545669be25c965e746a2a4d26295d1e3d05f24c 100644 (file)
@@ -2,8 +2,6 @@
 //# Bind9-Konfigurationsdatei
 //# /etc/bind/named.conf
 //#
-//# $Header: /etc/bind/.rcs/named.conf,v 1.10 2011/02/09 13:58:03 root Exp $
-//#
 //# Host Helga
 //#
 //# Generiert am: 26.05.2010
@@ -43,6 +41,7 @@ options {
        allow-notify {
         85.214.147.150;
         85.214.134.152;
+               46.16.73.175;
                127.0.0.1/8;
                ::1;
                2a01:238:4225:6e00:8f8c:808a:7fb8:88df;
index 5d42c9d0657bd401aefd4f2eb913d336345b3c15..16aa57523055565f4a3ee3f795f56d5755248558 100644 (file)
 #fsck_passno=">1"
 #fsck_passno="<2"
 
+# If passno is not enough granularity, you can also specify mountpoints to
+# check. This should NOT be used for the default non-multiplexed fsck, or your
+# system might not be checked. Additionally, it is mutually exclusive with
+# the fsck_passno setting.
+#fsck_mnt=""
+#fsck_mnt="/home"
+
 # Most modern fs's don't require a full fsck on boot, but for those that do
 # it may be advisable to skip this when running on battery.
 # WARNING: Do not turn this off if you have any JFS partitions.
diff --git a/conf.d/mysql.default b/conf.d/mysql.default
new file mode 100644 (file)
index 0000000..df4c3a4
--- /dev/null
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $
+
+# If you want a non-stock location for the config file, uncomment or update
+# either of these as needed. If you do use it, you must make sure that none of
+# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB
+# files collide with each other.
+MY_CNF="/etc/mysql/my.cnf"
+#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}"
+
+# Place any additional arguments here that you might need
+# Common/useful options:
+# --skip-slave-start=1 - For bringing up replication initially
+# --server-id=NNN - Server ID for replication
+# --skip-networking - lock it down to UNIX sockets only
+MY_ARGS=""
+
+# This setting (in seconds) should be high enough to allow InnoDB to do a full
+# checkpoint recovery. 900 is the default used in the upstream RPM startup
+# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB
+# database. After the core startup is done, we wait this long for the UNIX
+# socket to appear.
+STARTUP_TIMEOUT="900"
+
+# This is how long, in milliseconds, we wait for pidfile to be created, early
+# in the startup.
+STARTUP_EARLY_TIMEOUT="1000"
+
+# How long (in seconds) should we wait for shutdown?
+STOP_TIMEOUT=120
+
+# integer [-20 .. 19 ] default 0
+# change the priority of the server -20 (high) to 19 (low)
+# see nice(1) for description
+#NICE=0
+
+# See start-stop-daemon(8) for possible settings
+#IONICE=2
+
+# If defined, --verbose gets passed to S-S-D
+#DEBUG=1
+
+# Depending on your usage of MySQL, you may also wish to start it after some
+# other services are up. Uncomment the lines below as needed. If these aren't
+# enough for you, we encourage you to file a bug, and help us understand how
+# you are using MySQL.
+
+# Do your MySQL ACLs refer to hostnames not in your /etc/hosts?
+# If so, you need DNS before you can accept connections.
+# Avoid dependency circular loops if you use MySQL to power a local DNS server.
+#rc_use="dns"
+#rc_after="dns"
+
+# Does your MySQL bind to an IP on an interface other than net.lo?
+# Alternatively you might wish to specify the exact interface here.
+#rc_use="net"
+#rc_after="net"
+
+# Do you store your MySQL files on a SAN or other network filesystem, that is
+# provided by the netmount init script?
+#rc_need="netmount"
+
+# Or from NFS? P.S. This is not a good idea in most cases, but does have some
+# valid usage cases, so we provide the option.
+#rc_need="nfsmount"
+
+# Should any one of the instances satisfy the requirement for MySQL coming up?
+# By default, we say no.
+[ "${SVCNAME}" != mysql ] && rc_provide="!mysql"
+# But uncomment this next instead if you think it should.
+#rc_provide="mysql"
+
+# The conditional above has a false-positive "failure" return value as a
+# side-effect, and since it's the last statement, without the next line, this
+# script returns failure.
+return 0
+# vim: ft=gentoo-conf-d et ts=4 sw=4:
index e60b10c6cc96bf11c05457ab29caf028d84cea10..736497fadc661b51731418050b1621409709cbc8 100644 (file)
@@ -4,6 +4,10 @@
 
 # This file is obsolete.
 
+# This file is obsolete.
+
+# This file is obsolete.
+
 ##############################################################################
 # QUICK-START
 #
index 6fd14702884bac1f6f69c98cc08a6bbbfcb24d33..12c2afa1c8de12e6ac823a97c4fc046dce58a67e 100644 (file)
@@ -11,15 +11,6 @@ persistent_net_disable="no"
 # as /dev/{cdrom,cdrw,dvd,dvdrw}
 persistent_cd_disable="no"
 
-# Set to "yes" if you want to save /dev to a tarball on shutdown
-# and restore it on startup.  This is useful if you have a lot of
-# custom device nodes that udev does not handle/know about.
-#
-# As this option is fragile, we recommend you
-# to create your devices in /lib64/udev/devices.
-# These will be copied to /dev on boot.
-#rc_device_tarball="NO"
-
 # udev can trigger coldplug events which cause services to start and
 # kernel modules to be loaded.
 # Services are deferred to start in the boot runlevel.
@@ -36,9 +27,6 @@ persistent_cd_disable="no"
 
 # Expert options:
 
-# Disable warning about unreliable kernel/udev combination
-#unreliable_kernel_warning="no"
-
 # Timeout in seconds to wait for processing of uevents at boot.
 # There should be no need to change this.
 #udev_settle_timeout="60"
@@ -47,12 +35,12 @@ persistent_cd_disable="no"
 # udevd --help for possible values
 #udev_opts=""
 
-# Run udevd --debug and write output to /dev/.udev/udev.log
+# Run udevd --debug and write output to $RUNDIR/udev.log
 # Should not be kept on as it fills diskspace slowly
 #udev_debug="YES"
 
 # Run udevadmin monitor to get a log of all events
-# in /dev/.udev/udevmonitor.log
+# in $RUNDIR/udevmonitor.log
 #udev_monitor="YES"
 
 # Keep udevmonitor running after populating /dev.
index fbaf4e8106a3eb0a6aec52d15fbb0c894c3426e6..f721a249193a61e1e1246bf6f105cc21398fa39a 100644 (file)
@@ -2,4 +2,4 @@
 # (say for crypt swap), so you will need to customize this
 # behavior.  If you have /var on a separate partition, then
 # make sure this path lives on your root device somewhere.
-urandom_seed="/var/run/random-seed"
+urandom_seed="/var/lib/misc/random-seed"
index 92506f6488f064a32b8480e4d72edd1f58737a7d..167dcf52981fc7beef78ab815864778db4a13466 100644 (file)
@@ -4,6 +4,10 @@
 
 # This file is obsolete.
 
+# This file is obsolete.
+
+# This file is obsolete.
+
 # /etc/conf.d/wireless:
 # Global wireless config file for net.* rc-scripts
 
index d43152c2d151af824a6ca60643df24499a2876cb..c0d8d728a2adeadfcafae527a61e194256ef1494 100644 (file)
@@ -1,4 +1,4 @@
-head   1.2;
+head   1.3;
 access;
 symbols;
 locks; strict;
@@ -6,6 +6,11 @@ comment        @# @;
 expand @o@;
 
 
+1.3
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
+next   1.2;
+
 1.2
 date   2011.01.09.10.16.07;    author root;    state Exp;
 branches;
@@ -25,6 +30,11 @@ next 1.1.1.2;
 1.1.1.2
 date   2011.01.09.10.16.08;    author root;    state Exp;
 branches;
+next   1.1.1.3;
+
+1.1.1.3
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -33,7 +43,7 @@ desc
 @
 
 
-1.2
+1.3
 log
 @dispatch-conf update.
 @
@@ -85,13 +95,16 @@ TERM rxvt-256color
 TERM rxvt-cygwin
 TERM rxvt-cygwin-native
 TERM rxvt-unicode
+TERM rxvt-unicode-256color
 TERM rxvt-unicode256
 TERM screen
 TERM screen-256color
 TERM screen-256color-bce
 TERM screen-bce
 TERM screen-w
+TERM screen.rxvt
 TERM screen.linux
+TERM terminator
 TERM vt100
 TERM xterm
 TERM xterm-16color
@@ -261,6 +274,17 @@ EXEC 01;32
 @
 
 
+1.2
+log
+@dispatch-conf update.
+@
+text
+@d48 1
+d55 1
+d57 1
+@
+
+
 1.1
 log
 @dispatch-conf update.
@@ -295,3 +319,22 @@ TERM screen.rxvt
 a54 1
 TERM terminator
 @
+
+
+1.1.1.3
+log
+@dispatch-conf update.
+@
+text
+@d4 1
+a4 1
+# Copyright (C) 1996, 1999-2011 Free Software Foundation, Inc.
+a54 1
+TERM screen.Eterm
+a136 3
+.war 01;31
+.ear 01;31
+.sar 01;31
+a166 1
+.webm 01;35
+@
diff --git a/config-archive/etc/ImageMagick/delegates.xml,v b/config-archive/etc/ImageMagick/delegates.xml,v
new file mode 100644 (file)
index 0000000..8a32579
--- /dev/null
@@ -0,0 +1,165 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.05;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.11.11;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE delegatemap [
+<!ELEMENT delegatemap (delegate)+>
+<!ELEMENT delegate (#PCDATA)>
+<!ATTLIST delegate decode CDATA #IMPLIED>
+<!ATTLIST delegate encode CDATA #IMPLIED>
+<!ATTLIST delegate mode CDATA #IMPLIED>
+<!ATTLIST delegate spawn CDATA #IMPLIED>
+<!ATTLIST delegate stealth CDATA #IMPLIED>
+<!ATTLIST delegate thread-support CDATA #IMPLIED>
+<!ATTLIST delegate command CDATA #REQUIRED>
+]>
+<!--
+  Delegate command file.
+
+  Commands which specify
+
+    decode="in_format" encode="out_format"
+
+  specify the rules for converting from in_format to out_format These
+  rules may be used to translate directly between formats.
+
+  Commands which specify only
+
+    decode="in_format"
+
+  specify the rules for converting from in_format to some format that
+  ImageMagick will automatically recognize. These rules are used to
+  decode formats.
+
+  Commands which specify only
+
+   encode="out_format"
+
+  specify the rules for an "encoder" which may accept any input format.
+
+  For delegates other than ps:*, pcl:*, and mpeg:* the substitution rules are
+  as follows:
+
+    %i  input image filename
+    %o  output image filename
+    %u  unique temporary filename
+    %Z  unique temporary filename
+    %#  input image signature
+    %b  image file size
+    %c  input image comment
+    %g  image geometry
+    %h  image rows (height)
+    %k  input image number colors
+    %l  image label
+    %m  input image format
+    %p  page number
+    %q  input image depth
+    %s  scene number
+    %w  image columns (width)
+    %x  input image x resolution
+    %y  input image y resolution
+
+  Set option delegate:bimodal=true to process bimodal delegates otherwise they
+  are ignored.
+-->
+<delegatemap>
+  <delegate decode="autotrace" stealth="True" command="&quot;convert&quot; &quot;%i&quot; &quot;pnm:%u&quot;\n&quot;autotrace&quot; -input-format pnm -output-format svg -output-file &quot;%o&quot; &quot;%u&quot;"/>
+  <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
+  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/"/>
+  <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
+  <delegate decode="cgm" thread-support="False" command="&quot;ralcgm&quot; -d ps -oC &lt; &quot;%i&quot; &gt; &quot;%o&quot; 2&gt; &quot;%Z&quot;"/>
+  <delegate decode="dvi" command="&quot;dvips&quot; -q -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="dng:decode" command="&quot;/usr/bin/ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
+  <delegate decode="edit" stealth="True" command="&quot;xterm&quot; -title &quot;Edit Image Comment&quot; -e vi &quot;%o&quot;"/>
+  <delegate decode="eps" encode="pdf" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 &quot;-sDEVICE=pdfwrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="eps" encode="ps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="fig" command="&quot;fig2dev&quot; -L ps &quot;%i&quot; &quot;%o&quot;"/>
+  <delegate decode="plt" command="&quot;echo&quot; &quot;set size 1.25,0.62; set terminal postscript portrait color solid; set output \'%o\'; load \'%i\'&quot; &gt; &quot;%u&quot;;&quot;gnuplot&quot; &quot;%u&quot;"/>
+  <delegate decode="hpg" command="&quot;hp2xx&quot; -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;;     mv -f `basename &quot;%o&quot;` &quot;%o&quot;"/>
+  <delegate decode="hpgl" command="if [ -e hp2xx -o -e /usr/bin/hp2xx ]; then     hp2xx -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;;     mv -f `basename &quot;%o&quot;` &quot;%o&quot;;   else     echo &quot;You need to install hp2xx to use HPGL files with ImageMagick.&quot;;     exit 1;   fi"/>
+  <delegate decode="htm" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="html" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="https" command="&quot;curl&quot; -s -k -o &quot;%o&quot; &quot;https:%M&quot;"/>
+  <delegate decode="ilbm" command="&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
+  <delegate decode="man" command="&quot;groff&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;"/>
+  <delegate decode="mpeg:decode" command="&quot;ffmpeg&quot; -v -1 -vframes %S -i &quot;%i&quot; -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%Z&quot;"/>
+  <delegate encode="mpeg:encode" stealth="True" command="&quot;ffmpeg&quot; -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -pass 1/2 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%Z&quot;"/>
+  <delegate decode="sid" command="&quot;mrsidgeodecode&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
+  <delegate decode="pcl:color" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="png" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
+  <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>
+  <delegate decode="pov" command="&quot;povray&quot; &quot;+i%i&quot; -D0 +o&quot;%o&quot; +fn%q +w%w +h%h +a -q9 -kfi&quot;%s&quot; -kff&quot;%n&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
+  <delegate decode="ps" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="ps" encode="pdf" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pdfwrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="ps" encode="print" mode="encode" command="lpr &quot;%i&quot;"/>
+  <delegate decode="ps:alpha" stealth="True" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pngalpha&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
+  <delegate decode="ps:cmyk" stealth="True" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pam&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
+  <delegate decode="ps:color" stealth="True" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pnmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
+  <delegate decode="ps:mono" stealth="True" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
+  <delegate decode="rgba" encode="rle" mode="encode" command="&quot;rawtorle&quot; -o &quot;%o&quot; -v &quot;%i&quot;"/>
+  <delegate decode="scan" command="&quot;scanimage&quot; -d &quot;%i&quot; &gt; &quot;%o&quot;"/>
+  <delegate decode="scanx" command="&quot;scanimage&quot; &gt; &quot;%o&quot;"/>
+  <delegate decode="png" encode="show" spawn="True" command="&quot;/usr/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="shtml" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="svg" command="&quot;rsvg&quot; &quot;%i&quot; &quot;%o&quot;"/>
+  <delegate decode="txt" encode="ps" mode="bi" command="&quot;enscript&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="png" encode="win" stealth="True" spawn="True" command="&quot;/usr/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="wmf" command="&quot;wmf2eps&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="xps:color" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="xps:cmyk" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="xps:mono" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+</delegatemap>
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d83 1
+a83 1
+  <delegate encode="mpeg:encode" stealth="True" command="&quot;ffmpeg&quot; -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%Z&quot;"/>
+d86 1
+a86 1
+  <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+d90 1
+a90 1
+  <delegate decode="tiff" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
+d103 1
+a103 1
+  <delegate decode="miff" encode="show" spawn="True" command="&quot;/usr/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+d107 1
+a107 1
+  <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;/usr/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+@
diff --git a/config-archive/etc/ImageMagick/policy.xml,v b/config-archive/etc/ImageMagick/policy.xml,v
new file mode 100644 (file)
index 0000000..8550d3c
--- /dev/null
@@ -0,0 +1,102 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.11.15;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policymap [
+<!ELEMENT policymap (policy)+>
+<!ELEMENT policy (#PCDATA)>
+<!ATTLIST policy domain (delegate|coder|filter|path|resource) #IMPLIED>
+<!ATTLIST policy name CDATA #IMPLIED>
+<!ATTLIST policy rights CDATA #IMPLIED>
+<!ATTLIST policy pattern CDATA #IMPLIED>
+<!ATTLIST policy value CDATA #IMPLIED>
+]>
+<!--
+  Configure ImageMagick policies.
+
+  Domains include system, delegate, coder, filter, path, or resource.
+
+  Rights include none, read, write, and execute.  Use | to combine them,
+  for example: "read | write" to permit read from, or write to, a path.
+
+  Use a glob expression as a pattern.
+
+  Suppose we do not want users to process MPEG video images:
+
+    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
+
+  Here we do not want users reading images from HTTP:
+
+    <policy domain="coder" rights="none" pattern="HTTP" />
+
+  Lets prevent users from executing any image filters:
+
+    <policy domain="filter" rights="none" pattern="*" />
+
+  The /repository file system is restricted to read only.  We use a glob
+  expression to match all paths that start with /repository:
+  
+    <policy domain="path" rights="read" pattern="/repository/*" />
+
+  Any large image is cached to disk rather than memory:
+
+    <policy domain="resource" name="area" value="1gb"/>
+
+  Note, resource policies are maximums for each instance of ImageMagick (e.g.
+  policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit
+  is 1GB).
+-->
+<policymap>
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
+  <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
+  <!-- <policy domain="resource" name="map" value="4GiB"/> -->
+  <!-- <policy domain="resource" name="area" value="1gb"/> -->
+  <!-- <policy domain="resource" name="disk" value="16eb"/> -->
+  <!-- <policy domain="resource" name="file" value="768"/> -->
+  <!-- <policy domain="resource" name="thread" value="4"/> -->
+  <!-- <policy domain="resource" name="throttle" value="0"/> -->
+  <!-- <policy domain="resource" name="time" value="3600"/> -->
+</policymap>
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d40 1
+a40 1
+    <policy domain="resource" name="area" value="1GB"/>
+d51 2
+a52 2
+  <!-- <policy domain="resource" name="area" value="1GB"/> -->
+  <!-- <policy domain="resource" name="disk" value="16EB"/> -->
+@
diff --git a/config-archive/etc/conf.d/fsck,v b/config-archive/etc/conf.d/fsck,v
new file mode 100644 (file)
index 0000000..51dae51
--- /dev/null
@@ -0,0 +1,73 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@# Pass any arguments to fsck.
+# By default we preen.
+# Linux systems also force -C0 and -T.
+# If fsck_args is not specified then Linux systems also use -A
+# (and -R if / is rw)
+#fsck_args="-p"
+
+# We can also specify the passno in /etc/fstab to check
+# If you multiplex fsck (ie ln -s fsck /etc/init.d/fsck.late) then you can
+# do an fsck outside of the normal scope, say for /home.
+# Here are some exampes:-
+#fsck_passno="=1 =2"
+#fsck_passno=">1"
+#fsck_passno="<2"
+
+# Most modern fs's don't require a full fsck on boot, but for those that do
+# it may be advisable to skip this when running on battery.
+# WARNING: Do not turn this off if you have any JFS partitions.
+fsck_on_battery="YES"
+
+# fsck_shutdown causes fsck to trigger during shutdown as well as startup.
+# The end result of this is that if any periodic non-root filesystem checks are
+# scheduled, under normal circumstances the actual check will happen during
+# shutdown rather than at next boot.
+# This is useful when periodic filesystem checks are causing undesirable
+# delays at startup, but such delays at shutdown are acceptable.
+fsck_shutdown="NO"
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@a15 7
+# If passno is not enough granularity, you can also specify mountpoints to
+# check. This should NOT be used for the default non-multiplexed fsck, or your
+# system might not be checked. Additionally, it is mutually exclusive with
+# the fsck_passno setting.
+#fsck_mnt=""
+#fsck_mnt="/home"
+
+@
diff --git a/config-archive/etc/conf.d/mysql,v b/config-archive/etc/conf.d/mysql,v
new file mode 100644 (file)
index 0000000..e225c16
--- /dev/null
@@ -0,0 +1,104 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@#  Here is where we define which server(s) to start.
+#  Additional parameters to be passed to mysqld at startup may be added here,
+#  which will override the ones in "my.cnf".
+#
+#  Below are described some suggested parameters to use.
+#  The parameters not recognized will be passed through to the mysqld daemon
+#  directly!
+#  To avoid starting a server just comment it's definition.
+#
+#  Last but not least, SPACES are NOT allowed inside the parameters!
+#
+#  Parameter      : description
+# ----------------+-----------------------------------------------------------
+# nice            : integer [-20 .. 19 ] default 0
+#                 : change the priority of the server -20 (high) to 19 (low)
+#                 : see "man nice 1" for description
+# ----------------+-----------------------------------------------------------
+# mycnf           : string [full path to my.cnf]
+#                 : specify the path to my.cnf file to be used
+# ----------------+-----------------------------------------------------------
+# startup_timeout : integer [seconds] default 15
+#                 : time to wait for mysqld up and running, after this it's
+#                 : marked as failed
+# ----------------+-----------------------------------------------------------
+#
+#  Additional parameters
+#  Parameter      : description
+# ----------------+-----------------------------------------------------------
+# server-id       : integer [1 .. 255]
+#                 : Uniquely identifies the server instance in the community
+#                 : of replication partners.
+# ----------------+-----------------------------------------------------------
+# port            : integer [1025 .. 65535] default 3306
+#                 : Port number to use for connection.
+#                 : Looses any meaning if skip-networking is set.
+# ----------------+-----------------------------------------------------------
+# skip-networking : NULL
+#                 : Don't allow connection through TCP/IP.
+# ----------------+-----------------------------------------------------------
+# log-bin         : string [name of the binlog files]
+#                 : Log update queries in binary format. Optional (but
+#                 : strongly recommended to avoid replication problems if
+#                 : server's hostname changes) argument should be the chosen
+#                 : location for the binary log files.
+# ----------------+-----------------------------------------------------------
+# Additionally the following variables are recognized:
+#
+# Be more verbose, accepts values from 1 to 4
+#DEBUG=4
+#
+# The default location for the "master" pid file
+#MYSQL_GLOB_PID_FILE="/var/run/svc-started-mysqld"
+#
+# The timeout for a failed attempt to stop a server
+#STOPTIMEOUT=120
+#
+
+# The parameters are passed in a bash array variable,
+# the variable name is mysql_slot_0_[server-num]
+# "server-num" is an optional number used to start multiple servers
+#
+# Examples:
+#
+# start a default server with default options:
+#mysql_slot_0=()
+#
+# start MySQL reniced, overriding some start parameters
+#mysql_slot_0=(
+#   "nice=-5"
+#   "server-id=123"
+#   "log-bin="myhost"
+#   "port=3307"
+#)
+#
+# start another server, different my.cnf
+#mysql_slot_0_1=(
+#   "mycnf=/home/test/my.cnf"
+#   "server-id=124"
+#)
+#
+@
diff --git a/config-archive/etc/conf.d/mysql.dist.new b/config-archive/etc/conf.d/mysql.dist.new
new file mode 100644 (file)
index 0000000..df4c3a4
--- /dev/null
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $
+
+# If you want a non-stock location for the config file, uncomment or update
+# either of these as needed. If you do use it, you must make sure that none of
+# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB
+# files collide with each other.
+MY_CNF="/etc/mysql/my.cnf"
+#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}"
+
+# Place any additional arguments here that you might need
+# Common/useful options:
+# --skip-slave-start=1 - For bringing up replication initially
+# --server-id=NNN - Server ID for replication
+# --skip-networking - lock it down to UNIX sockets only
+MY_ARGS=""
+
+# This setting (in seconds) should be high enough to allow InnoDB to do a full
+# checkpoint recovery. 900 is the default used in the upstream RPM startup
+# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB
+# database. After the core startup is done, we wait this long for the UNIX
+# socket to appear.
+STARTUP_TIMEOUT="900"
+
+# This is how long, in milliseconds, we wait for pidfile to be created, early
+# in the startup.
+STARTUP_EARLY_TIMEOUT="1000"
+
+# How long (in seconds) should we wait for shutdown?
+STOP_TIMEOUT=120
+
+# integer [-20 .. 19 ] default 0
+# change the priority of the server -20 (high) to 19 (low)
+# see nice(1) for description
+#NICE=0
+
+# See start-stop-daemon(8) for possible settings
+#IONICE=2
+
+# If defined, --verbose gets passed to S-S-D
+#DEBUG=1
+
+# Depending on your usage of MySQL, you may also wish to start it after some
+# other services are up. Uncomment the lines below as needed. If these aren't
+# enough for you, we encourage you to file a bug, and help us understand how
+# you are using MySQL.
+
+# Do your MySQL ACLs refer to hostnames not in your /etc/hosts?
+# If so, you need DNS before you can accept connections.
+# Avoid dependency circular loops if you use MySQL to power a local DNS server.
+#rc_use="dns"
+#rc_after="dns"
+
+# Does your MySQL bind to an IP on an interface other than net.lo?
+# Alternatively you might wish to specify the exact interface here.
+#rc_use="net"
+#rc_after="net"
+
+# Do you store your MySQL files on a SAN or other network filesystem, that is
+# provided by the netmount init script?
+#rc_need="netmount"
+
+# Or from NFS? P.S. This is not a good idea in most cases, but does have some
+# valid usage cases, so we provide the option.
+#rc_need="nfsmount"
+
+# Should any one of the instances satisfy the requirement for MySQL coming up?
+# By default, we say no.
+[ "${SVCNAME}" != mysql ] && rc_provide="!mysql"
+# But uncomment this next instead if you think it should.
+#rc_provide="mysql"
+
+# The conditional above has a false-positive "failure" return value as a
+# side-effect, and since it's the last statement, without the next line, this
+# script returns failure.
+return 0
+# vim: ft=gentoo-conf-d et ts=4 sw=4:
index 6d7707ddc77688b16b52046ea26f74d50cd9eeb9..54404419922bd333ee1e262d17de8c0772297520 100644 (file)
@@ -1,4 +1,4 @@
-head   1.2;
+head   1.3;
 access;
 symbols;
 locks; strict;
@@ -6,6 +6,11 @@ comment        @# @;
 expand @o@;
 
 
+1.3
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
+next   1.2;
+
 1.2
 date   2011.06.22.12.00.56;    author root;    state Exp;
 branches;
@@ -25,6 +30,11 @@ next 1.1.1.2;
 1.1.1.2
 date   2011.06.22.12.00.57;    author root;    state Exp;
 branches;
+next   1.1.1.3;
+
+1.1.1.3
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -33,7 +43,7 @@ desc
 @
 
 
-1.2
+1.3
 log
 @dispatch-conf update.
 @
@@ -83,8 +93,9 @@ persistent_cd_disable="no"
 # There should be no need to change this.
 #udev_settle_timeout="60"
 
-# Run udevd so that all events are serialized, read more in man udevd at --debug-trace
-#udev_trace="YES"
+# Add extra command line options to udevd, use with care
+# udevd --help for possible values
+#udev_opts=""
 
 # Run udevd --debug and write output to /dev/.udev/udev.log
 # Should not be kept on as it fills diskspace slowly
@@ -104,6 +115,18 @@ persistent_cd_disable="no"
 @
 
 
+1.2
+log
+@dispatch-conf update.
+@
+text
+@d46 3
+a48 2
+# Run udevd so that all events are serialized, read more in man udevd at --debug-trace
+#udev_trace="YES"
+@
+
+
 1.1
 log
 @dispatch-conf update.
@@ -140,3 +163,19 @@ a47 3
 # udevd --help for possible values
 #udev_opts=""
 @
+
+
+1.1.1.3
+log
+@dispatch-conf update.
+@
+text
+@d14 9
+d39 3
+d50 1
+a50 1
+# Run udevd --debug and write output to $RUNDIR/udev.log
+d55 1
+a55 1
+# in $RUNDIR/udevmonitor.log
+@
index 61c8facd85f26c06b287fa792522a463244cac51..962ba11c41061464605efe6b00613e0e2f40dd9c 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.06.07.07.29.31;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.06.07.07.39.42;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,17 +33,29 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
 text
-@# /etc/conf.d/urandom
-
-# Sometimes you want to have urandom start before "localmount"
+@# Sometimes you want to have urandom start before "localmount"
 # (say for crypt swap), so you will need to customize this
 # behavior.  If you have /var on a separate partition, then
 # make sure this path lives on your root device somewhere.
+urandom_seed="/var/run/random-seed"
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@a0 2
+# /etc/conf.d/urandom
+
+d5 1
+a5 2
 
 URANDOM_SEED="/var/run/random-seed"
 @
@@ -48,3 +71,14 @@ d7 2
 a8 1
 urandom_seed="/var/run/random-seed"
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@d5 1
+a5 1
+urandom_seed="/var/lib/misc/random-seed"
+@
diff --git a/config-archive/etc/init.d/atd,v b/config-archive/etc/init.d/atd,v
new file mode 100755 (executable)
index 0000000..09ca964
--- /dev/null
@@ -0,0 +1,68 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.01.30.06.24.12;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.01.30.06.24.23;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.1 2005/03/03 17:40:23 ciaranm Exp $
+
+depend() {
+       need clock logger
+}
+
+start() {
+       ebegin "Starting atd"
+       start-stop-daemon --start --quiet --pidfile /var/run/atd.pid \
+               --startas /usr/sbin/atd
+       eend $?
+}
+
+stop() {
+       ebegin "Shutting down atd"
+       start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid
+       eend $?
+}
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 1
+a2 1
+# Copyright 1999-2011 Gentoo Foundation
+d4 1
+a4 1
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.3 2011/09/23 12:04:44 polynomial-c Exp $
+d13 1
+a13 1
+               --exec /usr/sbin/atd -- ${ATD_OPTS}
+@
diff --git a/config-archive/etc/init.d/net.lo,v b/config-archive/etc/init.d/net.lo,v
new file mode 100755 (executable)
index 0000000..61654ea
--- /dev/null
@@ -0,0 +1,806 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.11.37;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@#!/sbin/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@@marples.name>
+# Released under the 2-clause BSD license.
+
+MODULESDIR="${RC_LIBEXECDIR}/net"
+MODULESLIST="${RC_SVCDIR}/nettree"
+_config_vars="config routes"
+
+[ -z "${IN_BACKGROUND}" ] && IN_BACKGROUND="NO"
+
+description="Configures network interfaces."
+
+# Handy var so we don't have to embed new lines everywhere for array splitting
+__IFS="
+"
+depend()
+{
+       local IFACE=${RC_SVCNAME#*.}
+       local IFVAR=$(shell_var "${IFACE}")
+
+       need localmount
+       after bootmisc
+       provide net
+       keyword -shutdown -jail -prefix -vserver
+
+       case "${IFACE}" in
+               lo|lo0);;
+               *) after net.lo net.lo0 dbus;;
+       esac
+
+       if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then
+               depend_${IFVAR}
+       fi
+
+       local dep= prov=
+       for dep in need use before after provide keyword; do
+               eval prov=\$rc_${dep}_${IFVAR}
+               if [ -n "${prov}" ]; then
+                       ${dep} ${prov}
+               fi
+       done
+}
+
+# Support bash arrays - sigh
+_array_helper()
+{
+       local _a=
+
+       eval _a=\$$1
+       _a=$(echo "${_a}" | sed -e 's:^[[:space:]]*::' -e 's:[[:space:]]*$::' -e '/^$/d' -e 's:[[:space:]]\{1,\}: :g')
+
+       [ -n "${_a}" ] && printf "%s\n" "${_a}"
+}
+
+_get_array()
+{
+       local _a=
+       if [ -n "${BASH}" ]; then
+               case "$(declare -p "$1" 2>/dev/null)" in
+                       "declare -a "*)
+                               ewarn "You are using a bash array for $1."
+                               ewarn "This feature will be removed in the future."
+                               ewarn "Please see net.example for the correct format for $1."
+                               eval "set -- \"\${$1[@@]}\""
+                               for _a; do
+                                       printf "%s\n" "${_a}"
+                               done
+                               return 0
+                               ;;
+               esac
+       fi
+
+       _array_helper $1
+}
+
+# Flatten bash arrays to simple strings
+_flatten_array()
+{
+       if [ -n "${BASH}" ]; then
+               case "$(declare -p "$1" 2>/dev/null)" in
+                       "declare -a "*)
+                               ewarn "You are using a bash array for $1."
+                               ewarn "This feature will be removed in the future."
+                               ewarn "Please see net.example for the correct format for $1."
+                               eval "set -- \"\${$1[@@]}\""
+                               for x; do
+                                       printf "'%s' " "$(printf "$x" | sed "s:':'\\\'':g")"
+                               done
+                               return 0
+                               ;;
+               esac
+       fi
+
+       _array_helper $1
+}
+
+_wait_for_carrier()
+{
+       local timeout= efunc=einfon
+
+       _has_carrier  && return 0
+
+       eval timeout=\$carrier_timeout_${IFVAR}
+       timeout=${timeout:-${carrier_timeout:-5}}
+
+       # Incase users don't want this nice feature ...
+       [ ${timeout} -le 0 ] && return 0
+
+       yesno ${RC_PARALLEL} && efunc=einfo
+       ${efunc} "Waiting for carrier (${timeout} seconds) "
+       while [ ${timeout} -gt 0 ]; do
+               sleep 1
+               if _has_carrier; then
+                       [ "${efunc}" = "einfon" ] && echo
+                       eend 0
+                       return 0
+               fi
+               : $(( timeout -= 1 ))
+               [ "${efunc}" = "einfon" ] && printf "."
+       done
+
+       [ "${efunc}" = "einfon" ] && echo
+       eend 1
+       return 1
+}
+
+_netmask2cidr()
+{
+       # Some shells cannot handle hex arithmetic, so we massage it slightly
+       # Buggy shells include FreeBSD sh, dash and busybox.
+       # bash and NetBSD sh don't need this.
+       case $1 in
+               0x*)
+               local hex=${1#0x*} quad=
+               while [ -n "${hex}" ]; do
+                       local lastbut2=${hex#??*}
+                       quad=${quad}${quad:+.}0x${hex%${lastbut2}*}
+                       hex=${lastbut2}
+               done
+               set -- ${quad}
+               ;;
+       esac
+
+       local i= len=
+       local IFS=.
+       for i in $1; do
+               while [ ${i} -ne 0 ]; do
+                       : $(( len += i % 2 ))
+                       : $(( i >>= 1 ))
+               done
+       done
+
+       echo "${len}"
+}
+
+_configure_variables()
+{
+       local var= v= t=
+
+       for var in ${_config_vars}; do
+               local v=
+               for t; do
+                       eval v=\$${var}_${t}
+                       if [ -n "${v}" ]; then
+                               eval ${var}_${IFVAR}=\$${var}_${t}
+                               continue 2
+                       fi
+               done
+       done
+}
+
+_which()
+{
+       local i OIFS
+       # Empty
+       [ -z "$1" ] && return
+       # check paths
+       OIFS="$IFS"
+       IFS=:
+       for i in $PATH ; do
+               [ -x $i/$1 ] && echo $i/$1 && break
+       done
+       IFS=$OIFS
+}
+
+# Like _which, but also consider shell builtins, and multiple alternatives
+_program_available()
+{
+       [ -z "$1" ] && return 0
+       local x=
+       for x; do
+               case "${x}" in
+                       /*) [ -x "${x}" ] && break;;
+                       *) type "${x}" >/dev/null 2>&1 && break;;
+               esac
+               unset x
+       done
+       [ -n "${x}" ] && echo $x && return 0
+       return 1
+}
+
+_show_address()
+{
+       einfo "received address $(_get_inet_address "${IFACE}")"
+}
+
+# Basically sorts our modules into order and saves the list
+_gen_module_list()
+{
+       local x= f= force=$1
+       if ! ${force} && [ -s "${MODULESLIST}" -a "${MODULESLIST}" -nt "${MODULESDIR}" ]; then
+               local update=false
+               for x in "${MODULESDIR}"/*.sh; do
+                       [ -e "${x}" ] || continue
+                       if [ "${x}" -nt "${MODULESLIST}" ]; then
+                               update=true
+                               break
+                       fi
+               done
+               ${update} || return 0
+       fi
+
+       einfo "Caching network module dependencies"
+       # Run in a subshell to protect the main script
+       (
+       after() {
+               eval ${MODULE}_after="\"\${${MODULE}_after}\${${MODULE}_after:+ }$*\""
+       }
+
+       before() {
+               local mod=${MODULE}
+               local MODULE=
+               for MODULE; do
+                       after "${mod}"
+               done
+       }
+
+       program() {
+               if [ "$1" = "start" -o "$1" = "stop" ]; then
+                       local s="$1"
+                       shift
+                       eval ${MODULE}_program_${s}="\"\${${MODULE}_program_${s}}\${${MODULE}_program_${s}:+ }$*\""
+               else
+                       eval ${MODULE}_program="\"\${${MODULE}_program}\${${MODULE}_program:+ }$*\""
+               fi
+       }
+
+       provide() {
+               eval ${MODULE}_provide="\"\${${MODULE}_provide}\${${MODULE}_provide:+ }$*\""
+               local x
+               for x in $*; do
+                       eval ${x}_providedby="\"\${${MODULE}_providedby}\${${MODULE}_providedby:+ }${MODULE}\""
+               done
+       }
+
+       for MODULE in "${MODULESDIR}"/*.sh; do
+               sh -n "${MODULE}" || continue
+               . "${MODULE}" || continue
+               MODULE=${MODULE#${MODULESDIR}/}
+               MODULE=${MODULE%.sh}
+               eval ${MODULE}_depend
+               MODULES="${MODULES} ${MODULE}"
+       done
+
+       VISITED=
+       SORTED=
+       visit() {
+               case " ${VISITED} " in
+                       *" $1 "*) return;;
+               esac
+               VISITED="${VISITED} $1"
+
+               eval AFTER=\$${1}_after
+               for MODULE in ${AFTER}; do
+                       eval PROVIDEDBY=\$${MODULE}_providedby
+                       if [ -n "${PROVIDEDBY}" ]; then
+                               for MODULE in ${PROVIDEDBY}; do
+                                       visit "${MODULE}"
+                               done
+                       else
+                               visit "${MODULE}"
+                       fi
+               done
+
+               eval PROVIDE=\$${1}_provide
+               for MODULE in ${PROVIDE}; do
+                       visit "${MODULE}"
+               done
+
+               eval PROVIDEDBY=\$${1}_providedby
+               [ -z "${PROVIDEDBY}" ] && SORTED="${SORTED} $1"
+       }
+
+       for MODULE in ${MODULES}; do
+               visit "${MODULE}"
+       done
+
+       printf "" > "${MODULESLIST}"
+       i=0
+       for MODULE in ${SORTED}; do
+               eval PROGRAM=\$${MODULE}_program
+               eval PROGRAM_START=\$${MODULE}_program_start
+               eval PROGRAM_STOP=\$${MODULE}_program_stop
+               eval PROVIDE=\$${MODULE}_provide
+               echo "module_${i}='${MODULE}'" >> "${MODULESLIST}"
+               echo "module_${i}_program='${PROGRAM}'" >> "${MODULESLIST}"
+               echo "module_${i}_program_start='${PROGRAM_START}'" >> "${MODULESLIST}"
+               echo "module_${i}_program_stop='${PROGRAM_STOP}'" >> "${MODULESLIST}"
+               echo "module_${i}_provide='${PROVIDE}'" >> "${MODULESLIST}"
+               : $(( i += 1 ))
+       done
+       echo "module_${i}=" >> "${MODULESLIST}"
+       )
+
+       return 0
+}
+
+_load_modules()
+{
+       local starting=$1 mymods=
+
+       # Ensure our list is up to date
+       _gen_module_list false
+       if ! . "${MODULESLIST}"; then
+               _gen_module_list true
+               . "${MODULESLIST}"
+       fi
+
+       MODULES=
+       if [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
+               eval mymods=\$modules_${IFVAR}
+               [ -z "${mymods}" ] && mymods=${modules}
+       fi
+
+       local i=-1 x= mod= f= provides=
+       while true; do
+               : $(( i += 1 ))
+               eval mod=\$module_${i}
+               [ -z "${mod}" ] && break
+               [ -e "${MODULESDIR}/${mod}.sh" ] || continue
+
+               eval set -- \$module_${i}_program
+               if [ -n "$1" ]; then
+                       if ! _program_available "$@@" >/dev/null; then
+                               vewarn "Skipping module $mod due to missing program: $@@"
+                               continue
+                       fi
+               fi
+               if ${starting}; then
+                       eval set -- \$module_${i}_program_start
+               else
+                       eval set -- \$module_${i}_program_stop
+               fi
+               if [ -n "$1" ]; then
+                       if ! _program_available "$@@" >/dev/null; then
+                               vewarn "Skipping module $mod due to missing program: $@@"
+                               continue
+                       fi
+               fi
+
+               eval provides=\$module_${i}_provide
+               if ${starting}; then
+                       case " ${mymods} " in
+                               *" !${mod} "*) continue;;
+                               *" !${provides} "*) [ -n "${provides}" ] && continue;;
+                       esac
+               fi
+               MODULES="${MODULES}${MODULES:+ }${mod}"
+
+               # Now load and wrap our functions
+               if ! . "${MODULESDIR}/${mod}.sh"; then
+                       eend 1 "${RC_SVCNAME}: error loading module \`${mod}'"
+                       exit 1
+               fi
+
+               [ -z "${provides}" ] && continue
+
+               # Wrap our provides
+               local f=
+               for f in pre_start start post_start; do
+                       eval "${provides}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@@\"; }"
+               done
+
+               eval module_${mod}_provides="${provides}"
+               eval module_${provides}_providedby="${mod}"
+       done
+
+       # Wrap our preferred modules
+       for mod in ${mymods}; do
+               case " ${MODULES} " in
+                       *" ${mod} "*)
+                       eval x=\$module_${mod}_provides
+                       [ -z "${x}" ] && continue
+                       for f in pre_start start post_start; do
+                               eval "${x}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@@\"; }"
+                       done
+                       eval module_${x}_providedby="${mod}"
+                       ;;
+               esac
+       done
+
+       # Finally remove any duplicated provides from our list if we're starting
+       # Otherwise reverse the list
+       local LIST="${MODULES}" p=
+       MODULES=
+       if ${starting}; then
+               for mod in ${LIST}; do
+                       eval x=\$module_${mod}_provides
+                       if [ -n "${x}" ]; then
+                               eval p=\$module_${x}_providedby
+                               [ "${mod}" != "${p}" ] && continue
+                       fi
+                       MODULES="${MODULES}${MODULES:+ }${mod}"
+               done
+       else
+               for mod in ${LIST}; do
+                       MODULES="${mod}${MODULES:+ }${MODULES}"
+               done
+       fi
+
+       veinfo "Loaded modules: ${MODULES}"
+}
+
+_load_config()
+{
+       local config="$(_get_array "config_${IFVAR}")"
+       local fallback="$(_get_array fallback_${IFVAR})"
+
+       config_index=0
+       local IFS="$__IFS"
+       set -- ${config}
+
+       # We should support a space separated array for cidr configs
+       # But only as long as they do not contain other parameters for the address
+       if [ $# = 1 ]; then
+               unset IFS
+               set -- ${config}
+               # Of course, we may have a single address added old style.
+               # If the NEXT argument is a v4 or v6 address, it's the next config.
+               # Otherwise, it's arguments to the first config...
+               if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
+                       # Not an IPv4/IPv6
+                       local IFS="$__IFS"
+                       set -- ${config}
+               fi
+       fi
+
+       # Ensure that loopback has the correct address
+       if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
+               if [ "$1" != "null" ]; then
+                       config_0="127.0.0.1/8"
+                       config_index=1
+               fi
+       else
+               if [ -z "$1" ]; then
+                       ewarn "No configuration specified; defaulting to DHCP"
+                       config_0="dhcp"
+                       config_index=1
+               fi
+       fi
+
+
+       # We store our config in an array like vars
+       # so modules can influence it
+       for cmd; do
+               eval config_${config_index}="'${cmd}'"
+               : $(( config_index += 1 ))
+       done
+       # Terminate the list
+       eval config_${config_index}=
+
+       config_index=0
+       for cmd in ${fallback}; do
+               eval fallback_${config_index}="'${cmd}'"
+               : $(( config_index += 1 ))
+       done
+       # Terminate the list
+       eval fallback_${config_index}=
+
+       # Don't set to zero, so any net modules don't have to do anything extra
+       config_index=-1
+}
+
+# Support functions
+_run_if()
+{
+       local cmd=$1 iface=$2 ifr=${IFACE} ifv=${IFVAR}
+       # Ensure that we don't stamp on real values
+       local IFACE= IFVAR=
+       shift
+       if [ -n "${iface}" ]; then
+               IFACE="${iface}"
+               [ "${iface}" != "${ifr}" ] && IFVAR=$(shell_var "${IFACE}")
+       else
+               IFACE=${ifr}
+               IFVAR=${ifv}
+       fi
+       ${cmd}
+}
+interface_exists()
+{
+       _run_if _exists "$@@"
+}
+interface_up()
+{
+       _run_if _up "$@@"
+}
+interface_down()
+{
+       _run_if _down "$@@"
+}
+
+start()
+{
+       local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
+       local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
+       local metric=0 _up_before_preup
+       eval _up_before_preup="\$up_before_preup_${IFVAR}"
+       [ -z "${_up_before_preup}" ] && _up_before_preup=$up_before_preup
+
+       einfo "Bringing up interface ${IFACE}"
+       eindent
+
+       if [ -z "${MODULES}" ]; then
+               local MODULES=
+               _load_modules true
+       fi
+
+       # We up the iface twice if we have a preup to ensure it's up if
+       # available in preup and afterwards incase the user inadvertently
+       # brings it down
+       if [ "$(command -v preup)" = "preup" ]; then
+               yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
+               ebegin "Running preup"
+               eindent
+               preup || return 1
+               eoutdent
+       fi
+
+       _up 2>/dev/null
+
+       for module in ${MODULES}; do
+               if [ "$(command -v "${module}_pre_start")" = "${module}_pre_start" ]; then
+                       ${module}_pre_start || exit $?
+               fi
+       done
+
+       if ! _exists; then
+               eerror "ERROR: interface ${IFACE} does not exist"
+               eerror "Ensure that you have loaded the correct kernel module for your hardware"
+               return 1
+       fi
+
+       if ! _wait_for_carrier; then
+               if service_started devd; then
+                       ewarn "no carrier, but devd will start us when we have one"
+                       mark_service_inactive "${RC_SVCNAME}"
+               else
+                       eerror "no carrier"
+               fi
+               return 1
+       fi
+
+       local config= config_index=
+       _load_config
+       config_index=0
+
+       eval our_metric=\$metric_${IFVAR}
+       if [ -n "${our_metric}" ]; then
+               metric=${our_metric}
+       elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
+               : $(( metric += $(_ifindex) ))
+       fi
+
+       while true; do
+               eval config=\$config_${config_index}
+               [ -z "${config}" ] && break
+
+               set -- ${config}
+               if [ "$1" != "null" -a "$1" != "noop" ]; then
+                       ebegin "$1"
+               fi
+               eindent
+               case "$1" in
+                       noop)
+                               if [ -n "$(_get_inet_address)" ]; then
+                                       oneworked=true
+                                       break
+                               fi
+                               ;;
+                       null) :;;
+                       [0-9]*|*:*) _add_address ${config};;
+                       *)
+                               if [ "$(command -v "${config}_start")" = "${config}_start" ]; then
+                                       "${config}"_start
+                               else
+                                       eerror "nothing provides \`${config}'"
+                               fi
+                               ;;
+               esac
+               if eend $?; then
+                       oneworked=true
+               else
+                       eval config=\$fallback_${config_index}
+                       if [ -n "${config}" ]; then
+                               fallback=true
+                               eoutdent
+                               ewarn "Trying fallback configuration ${config}"
+                               eindent
+                               eval config_${config_index}=\$config
+                               unset fallback_${config_index}
+                               : $(( config_index -= 1 ))
+                       fi
+               fi
+               eoutdent
+               : $(( config_index += 1 ))
+       done
+
+       if ! ${oneworked}; then
+               if [ "$(command -v failup)" = "failup" ]; then
+                       ebegin "Running failup"
+                       eindent
+                       failup
+                       eoutdent
+               fi
+               return 1
+       fi
+
+       local hidefirstroute=false first=true routes=
+       if ${fallback}; then
+               routes="$(_get_array "fallback_routes_${IFVAR}")"
+       fi
+       if [ -z "${routes}" ]; then
+               routes="$(_get_array "routes_${IFVAR}")"
+       fi
+       if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
+               if [ "${config_0}" != "null" ]; then
+                       routes="127.0.0.0/8 via 127.0.0.1
+${routes}"
+                       hidefirstroute=true
+               fi
+       fi
+
+       local OIFS="${IFS}" SIFS="${IFS-y}"
+       local IFS="$__IFS"
+       for cmd in ${routes}; do
+               unset IFS
+               if ${first}; then
+                       first=false
+                       einfo "Adding routes"
+               fi
+               eindent
+               ebegin ${cmd}
+               # Work out if we're a host or a net if not told
+               case ${cmd} in
+                       -net" "*|-host" "*);;
+                       *" "netmask" "*)                   cmd="-net ${cmd}";;
+                       *.*.*.*/32*)                       cmd="-host ${cmd}";;
+                       *.*.*.*/*|0.0.0.0|0.0.0.0" "*)     cmd="-net ${cmd}";;
+                       default|default" "*)               cmd="-net ${cmd}";;
+                       *)                                 cmd="-host ${cmd}";;
+               esac
+               if ${hidefirstroute}; then
+                       _add_route ${cmd} >/dev/null 2>&1
+                       hidefirstroute=false
+               else
+                       _add_route ${cmd} >/dev/null
+               fi
+               eend $?
+               eoutdent
+       done
+       if [ "${SIFS}" = "y" ]; then
+               unset IFS
+       else
+               IFS="${OIFS}"
+       fi
+
+       for module in ${MODULES}; do
+               if [ "$(command -v "${module}_post_start")" = "${module}_post_start" ]; then
+                       ${module}_post_start || exit $?
+               fi
+       done
+
+       if [ "$(command -v postup)" = "postup" ]; then
+               ebegin "Running postup"
+               eindent
+               postup
+               eoutdent
+       fi
+
+       return 0
+}
+
+stop()
+{
+       local IFACE=${RC_SVCNAME#*.} module=
+       local IFVAR=$(shell_var "${IFACE}") opts=
+
+       einfo "Bringing down interface ${IFACE}"
+       eindent
+
+       if [ -z "${MODULES}" ]; then
+               local MODULES=
+               _load_modules false
+       fi
+
+       if [ "$(command -v predown)" = "predown" ]; then
+               ebegin "Running predown"
+               eindent
+               predown || return 1
+               eoutdent
+       else
+               if is_net_fs /; then
+                       eerror "root filesystem is network mounted -- can't stop ${IFACE}"
+                       return 1
+               fi
+       fi
+
+       for module in ${MODULES}; do
+               if [ "$(command -v "${module}_pre_stop")" = "${module}_pre_stop" ]; then
+                       ${module}_pre_stop || exit $?
+               fi
+       done
+
+       for module in ${MODULES}; do
+               if [ "$(command -v "${module}_stop")" = "${module}_stop" ]; then
+                       ${module}_stop
+               fi
+       done
+
+       # Only delete addresses for interfaces that exist
+       if _exists; then
+               # PPP can manage it's own addresses when IN_BACKGROUND
+               # Important in case "demand" set on the ppp link
+               if ! (yesno ${IN_BACKGROUND} && is_ppp) ; then
+                       _delete_addresses "${IFACE}"
+               fi
+       fi
+
+       for module in ${MODULES}; do
+               if [ "$(command -v "${module}_post_stop")" = "${module}_post_stop" ]; then
+                       ${module}_post_stop
+               fi
+       done
+
+       # If not in background, and not loopback then bring the interface down
+       # unless overridden.
+       if ! yesno ${IN_BACKGROUND} && \
+       [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
+               eval module=\$ifdown_${IFVAR}
+               module=${module:-${ifdown:-YES}}
+               yesno ${module} && _down 2>/dev/null
+       fi
+
+       type resolvconf >/dev/null 2>&1 && resolvconf -d "${IFACE}" 2>/dev/null
+
+       if [ "$(command -v "postdown")" = "postdown" ]; then
+               ebegin "Running postdown"
+               eindent
+               postdown
+               eoutdent
+       fi
+
+       return 0
+}
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d24 1
+a24 1
+       keyword -jail -prefix -vserver
+@
diff --git a/config-archive/etc/init.d/sysfs,v b/config-archive/etc/init.d/sysfs,v
new file mode 100755 (executable)
index 0000000..7f1e7f7
--- /dev/null
@@ -0,0 +1,151 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.11.51;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@#!/sbin/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@@marples.name>
+# Released under the 2-clause BSD license.
+
+description="Mount the sys filesystem."
+
+depend()
+{
+       keyword -prefix -vserver
+}
+
+mount_sys()
+{
+       grep -Eq "[[:space:]]+sysfs$" /proc/filesystems || return 1
+       mountinfo -q /sys && return 0
+
+       if [ ! -d /sys ]; then
+               if ! mkdir -m 0755 /sys; then
+                       ewarn "Could not create /sys!"
+                       return 1
+               fi
+       fi
+
+       ebegin "Mounting /sys"
+       if ! fstabinfo --mount /sys; then
+               mount -n -t sysfs -o noexec,nosuid,nodev sysfs /sys
+       fi
+       eend $?
+}
+
+mount_misc()
+{
+       # Setup Kernel Support for securityfs
+       if [ -d /sys/kernel/security ] && \
+               ! mountinfo -q /sys/kernel/security; then
+               if grep -qs securityfs /proc/filesystems; then
+                       ebegin "Mounting security filesystem"
+                       mount -n -t securityfs -o nodev,noexec,nosuid \
+                               securityfs /sys/kernel/security
+                       eend $?
+               fi
+       fi
+
+       # Setup Kernel Support for debugfs
+       if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug; then
+               if grep -qs debugfs /proc/filesystems; then
+                       ebegin "Mounting debug filesystem"
+                       mount -n -t debugfs -o nodev,noexec,nosuid \
+                               debugfs /sys/kernel/debug
+                       eend $?
+               fi
+       fi
+
+       # Setup Kernel Support for configfs
+       if [ -d /sys/kernel/config ] && ! mountinfo -q /sys/kernel/config; then
+               if grep -qs configfs /proc/filesystems; then
+                       ebegin "Mounting config filesystem"
+                       mount -n -t configfs -o  nodev,noexec,nosuid \
+                               configfs /sys/kernel/config
+                       eend $?
+               fi
+       fi
+
+       # set up kernel support for cgroups
+       if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+               if grep -qs cgroup /proc/filesystems; then
+                       ebegin "Mounting cgroup filesystem"
+                       local opts="nodev,noexec,nosuid,mode=755,size=${rc_cgroupsize:-10m}"
+                       mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+                       eend $?
+               fi
+       fi
+}
+
+mount_cgroups()
+{
+       yesno ${rc_cgroups:-YES} || return 0
+       if [ ! -e /proc/cgroups ]; then
+               return 0
+       fi
+
+       while read name hier groups enabled rest; do
+               case "${enabled}" in
+                       1)      mkdir /sys/fs/cgroup/${name}
+                               mount -t cgroup -o nodev,noexec,nosuid,${name} \
+                                       ${name} /sys/fs/cgroup/${name}
+                               ;;
+               esac
+       done < /proc/cgroups
+}
+
+start()
+{
+       local retval
+       mount_sys
+       retval=$?
+       if [ $retval -eq 0 ]; then
+               mount_misc
+               retval=$?
+       fi
+       if [ $retval -eq 0 ]; then
+               mount_cgroups
+               retval=$?
+       fi
+       return $retval
+}
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d77 4
+a80 2
+       yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
+               mountinfo -q /sys/fs/cgroup || return 0
+d85 1
+a85 1
+                               mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
+@
diff --git a/config-archive/etc/init.d/ulogd,v b/config-archive/etc/init.d/ulogd,v
new file mode 100755 (executable)
index 0000000..628f350
--- /dev/null
@@ -0,0 +1,92 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.01.30.06.26.47;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.01.30.06.27.01;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.3 2009/08/10 06:01:18 wormo Exp $
+
+opts="reload"
+
+depend() {
+       need net
+}
+
+checkconfig() {
+       if [ ! -e /etc/ulogd.conf ]; then
+               eerror "You need /etc/ulogd.conf"
+               return 1
+       fi
+}
+
+start() {
+       checkconfig || return 1
+       ebegin "Starting ulogd"
+       start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -u ulogd -d >/dev/null 2>&1
+       eend $?
+}      
+
+stop() {
+       ebegin "Stopping ulogd"
+       start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
+       eend $?
+}      
+
+reload() {
+       ebegin "Reloading ulogd.conf file"
+       killall -HUP ulogd &>/dev/null
+       eend $?
+}      
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 1
+a2 1
+# Copyright 1999-2012 Gentoo Foundation
+d4 1
+a4 1
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.5 2012/01/01 01:01:06 idl0r Exp $
+d6 1
+a6 1
+extra_started_commands="reload"
+d24 1
+a24 1
+}
+d30 1
+a30 1
+}
+d36 1
+a36 1
+}
+@
diff --git a/config-archive/etc/ldap.conf.sudo,v b/config-archive/etc/ldap.conf.sudo,v
new file mode 100644 (file)
index 0000000..25ee550
--- /dev/null
@@ -0,0 +1,50 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.05;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.11.05;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@# See ldap.conf(5) and README.LDAP for details\n"
+# This file should only be readable by root\n\n"
+# supported directives: host, port, ssl, ldap_version\n"
+# uri, binddn, bindpw, sudoers_base, sudoers_debug\n"
+# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d1 4
+a4 5
+# See ldap.conf(5) and README.LDAP for details
+# This file should only be readable by root
+
+# supported directives: host, port, ssl, ldap_version
+# uri, binddn, bindpw, sudoers_base, sudoers_debug
+@
diff --git a/config-archive/etc/logrotate.d/mysql,v b/config-archive/etc/logrotate.d/mysql,v
new file mode 100644 (file)
index 0000000..807b21a
--- /dev/null
@@ -0,0 +1,65 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.01.29.08.28.12;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /etc/logrotate.d/.rcs/mysql,v 1.2 2010/12/02 12:03:24 root Exp $
+
+/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
+monthly
+create 660 mysql mysql
+notifempty
+size 5M
+sharedscripts
+missingok
+postrotate
+/bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
+endscript
+}
+
+# vim: ts=4 filetype=conf
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d1 1
+a1 1
+# Copyright 1999-2011 Gentoo Foundation
+d3 1
+a3 1
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/logrotate.mysql,v 1.2 2011/01/13 20:06:06 robbat2 Exp $
+d13 1
+a13 1
+[ -f /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
+d16 2
+@
index d815b9ad91203c2989a0fa714da0f2ff732ed747..c6ccd85e17a66de54f460d235cd5edfb4619aa7b 100644 (file)
@@ -1,4 +1,4 @@
-head   1.2;
+head   1.3;
 access;
 symbols;
 locks; strict;
@@ -6,6 +6,11 @@ comment        @# @;
 expand @o@;
 
 
+1.3
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.2;
+
 1.2
 date   2010.09.08.19.40.05;    author root;    state Exp;
 branches;
@@ -25,6 +30,11 @@ next 1.1.1.2;
 1.1.1.2
 date   2010.09.08.19.40.05;    author root;    state Exp;
 branches;
+next   1.1.1.3;
+
+1.1.1.3
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -33,7 +43,7 @@ desc
 @
 
 
-1.2
+1.3
 log
 @dispatch-conf update.
 @
@@ -155,7 +165,7 @@ devices {
     # Alignment (in KB) of start of data area when creating a new PV.
     # If a PV is placed directly upon an md device and md_chunk_alignment or
     # data_alignment_detection is enabled this parameter is ignored.
-    # Set to 0 for the default alignment of 64KB or page size, if larger.
+    # Set to 0 for the default alignment of 1MB or page size, if larger.
     data_alignment = 0
 
     # By default, the start of the PV's aligned data area will be shifted by
@@ -172,6 +182,9 @@ devices {
     # Set this to 1 to skip such devices.  This should only be needed
     # in recovery situations.
     ignore_suspended_devices = 0
+
+    # Allow use of pvcreate --uuid without requiring --restorefile.
+    require_restorefile_with_uuid = 1
 }
 
 # This section that allows you to configure the nature of the
@@ -500,6 +513,19 @@ metadata {
     # Gentoo: enable for data safety, but PV resize is then disabled.
     #pvmetadatacopies = 2
 
+    # Default number of copies of metadata to maintain for each VG.
+    # If set to a non-zero value, LVM automatically chooses which of
+    # the available metadata areas to use to achieve the requested
+    # number of copies of the VG metadata.  If you set a value larger
+    # than the the total number of metadata areas available then
+    # metadata is stored in them all.
+    # The default value of 0 ("unmanaged") disables this automatic
+    # management and allows you to control which metadata areas
+    # are used at the individual PV level using 'pvchange
+    # --metadataignore y/n'.
+
+    # vgmetadatacopies = 0
+
     # Approximate default size of on-disk metadata areas in sectors.
     # You should increase this if you have large volume groups or
     # you want to retain a large on-disk history of your metadata changes.
@@ -537,15 +563,38 @@ dmeventd {
     # snapshot_library is the library used when monitoring a snapshot device.
     #
     # "libdevmapper-event-lvm2snapshot.so" monitors the filling of
-    # snapshots and emits a warning through syslog, when the use of
-    # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
-    # 95% of the snapshot are filled.
+    # snapshots and emits a warning through syslog when the use of
+    # the snapshot exceeds 80%. The warning is repeated when 85%, 90% and
+    # 95% of the snapshot is filled.
 
     snapshot_library = "libdevmapper-event-lvm2snapshot.so"
+
+    # Full path of the dmeventd binary.
+    #
+    # executable = "/sbin/dmeventd"
 }
 @
 
 
+1.2
+log
+@dispatch-conf update.
+@
+text
+@d118 1
+a118 1
+    # Set to 0 for the default alignment of 64KB or page size, if larger.
+d135 3
+d466 13
+d516 3
+a518 3
+    # snapshots and emits a warning through syslog, when the use of
+    # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
+    # 95% of the snapshot are filled.
+d521 4
+@
+
+
 1.1
 log
 @dispatch-conf update.
@@ -653,3 +702,168 @@ a504 4
     #
     # executable = "/sbin/dmeventd"
 @
+
+
+1.1.1.3
+log
+@dispatch-conf update.
+@
+text
+@a8 3
+#
+# N.B. Take care that each setting only appears once if uncommenting
+# example settings in this file.
+a21 10
+    # 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
+    # subdirectories found in the device directory. This setting is applied
+    # to udev-managed device directory only, other directories will be scanned
+    # fully. LVM2 needs to be compiled with udev support for this setting to
+    # take effect. N.B. Any device node or symlink not managed by udev in
+    # udev directory will be ignored with this setting on.
+    obtain_device_list_from_udev = 1
+
+a102 4
+    # Default alignment of the start of a data area in MB.  If set to 0,
+    # a value of 64KB will be used.  Set to 1 for 1MiB, 2 for 2MiB, etc.
+    # default_data_alignment = 1
+
+d116 3
+a118 3
+    # md_chunk_alignment and data_alignment_detection are disabled if set.
+    # Set to 0 for the default alignment (see: data_alignment_default)
+    # or page size, if larger.
+a126 1
+    # But note that pvcreate --dataalignmentoffset will skip this detection.
+a135 6
+    # During each LVM operation errors received from each device are counted.
+    # If the counter of a particular device exceeds the limit set here, no
+    # further I/O is sent to that device for the remainder of the respective
+    # operation. Setting the parameter to 0 disables the counters altogether.
+    disable_after_error_count = 0
+
+a137 22
+
+    # Minimum size (in KB) of block devices which can be used as PVs.
+    # In a clustered environment all nodes must use the same value.
+    # Any value smaller than 512KB is ignored.
+
+    # Ignore devices smaller than 2MB such as floppy drives.
+    pv_min_size = 2048
+
+    # The original built-in setting was 512 up to and including version 2.02.84.
+    # pv_min_size = 512
+
+    # Issue discards to a logical volumes's underlying physical volume(s) when
+    # the logical volume is no longer using the physical volumes' space (e.g.
+    # lvremove, lvreduce, etc).  Discards inform the storage that a region is
+    # no longer in use.  Storage that supports discards advertise the protocol
+    # specific way discards should be issued by the kernel (TRIM, UNMAP, or
+    # WRITE SAME with UNMAP bit set).  Not all storage will support or benefit
+    # from discards but SSDs and thinly provisioned LUNs generally do.  If set
+    # to 1, discards will only be issued if both the storage and kernel provide
+    # support.
+    # 1 enables; 0 disables.
+    issue_discards = 0
+a139 32
+# This section allows you to configure the way in which LVM selects
+# free space for its Logical Volumes.
+#allocation {
+#    When searching for free space to extend an LV, the "cling"
+#    allocation policy will choose space on the same PVs as the last
+#    segment of the existing LV.  If there is insufficient space and a
+#    list of tags is defined here, it will check whether any of them are
+#    attached to the PVs concerned and then seek to match those PV tags
+#    between existing extents and new extents.
+#    Use the special tag "@@*" as a wildcard to match any PV tag.
+#    
+#    Example: LVs are mirrored between two sites within a single VG.
+#    PVs are tagged with either @@site1 or @@site2 to indicate where
+#    they are situated.
+#
+#    cling_tag_list = [ "@@site1", "@@site2" ]
+#    cling_tag_list = [ "@@*" ]
+#
+#    Changes made in version 2.02.85 extended the reach of the 'cling'
+#    policies to detect more situations where data can be grouped
+#    onto the same disks.  Set this to 0 to revert to the previous
+#    algorithm.
+#
+#    maximise_cling = 1
+#
+#    Set to 1 to guarantee that mirror logs will always be placed on 
+#    different PVs from the mirror images.  This was the default
+#    until version 2.02.85.
+#
+#    mirror_logs_require_separate_pvs = 0
+#}
+
+a329 32
+
+    # Check whether CRC is matching when parsed VG is used multiple times.
+    # This is useful to catch unexpected internal cached volume group
+    # structure modification. Please only enable for debugging.
+    detect_internal_vg_cache_corruption = 0
+
+    # If set to 1, no operations that change on-disk metadata will be permitted.
+    # Additionally, read-only commands that encounter metadata in need of repair
+    # will still be allowed to proceed exactly as if the repair had been 
+    # performed (except for the unchanged vg_seqno).
+    # Inappropriate use could mess up your system, so seek advice first!
+    metadata_read_only = 0
+
+    # 'mirror_segtype_default' defines which segtype will be used when the
+    # shorthand '-m' option is used for mirroring.  The possible options are:
+    #
+    # "mirror" - The original RAID1 implementation provided by LVM2/DM.  It is
+    #           characterized by a flexible log solution (core, disk, mirrored)
+    #           and by the necessity to block I/O while reconfiguring in the
+    #           event of a failure.  Snapshots of this type of RAID1 can be
+    #           problematic.
+    #
+    # "raid1"  - This implementation leverages MD's RAID1 personality through
+    #           device-mapper.  It is characterized by a lack of log options.
+    #           (A log is always allocated for every device and they are placed
+    #           on the same device as the image - no separate devices are
+    #           required.)  This mirror implementation does not require I/O
+    #           to be blocked in the kernel in the event of a failure.
+    #
+    # Specify the '--type <mirror|raid1>' option to override this default
+    # setting.
+    mirror_segtype_default = "mirror"
+a332 6
+    # Set to 1 to perform internal checks on the operations issued to
+    # libdevmapper.  Useful for debugging problems with activation.
+    # Some of the checks may be expensive, so it's best to use this
+    # only when there seems to be a problem.
+    checks = 0
+
+a349 6
+    # Set to 1 for LVM2 to verify operations performed by udev. This turns on
+    # additional checks (and if necessary, repairs) on entries in the device
+    # directory after udev has completed processing its events. 
+    # Useful for diagnosing problems with LVM2/udev interactions.
+    verify_udev_operations = 0
+
+a422 19
+
+    # 'snapshot_autoextend_threshold' and 'snapshot_autoextend_percent' define
+    # how to handle automatic snapshot extension. The former defines when the
+    # snapshot should be extended: when its space usage exceeds this many
+    # percent. The latter defines how much extra space should be allocated for
+    # the snapshot, in percent of its current size.
+    #
+    # For example, if you set snapshot_autoextend_threshold to 70 and
+    # snapshot_autoextend_percent to 20, whenever a snapshot exceeds 70% usage,
+    # it will be extended by another 20%. For a 1G snapshot, using up 700M will
+    # trigger a resize to 1.2G. When the usage exceeds 840M, the snapshot will
+    # be extended to 1.44G, and so on.
+    #
+    # Setting snapshot_autoextend_threshold to 100 disables automatic
+    # extensions. The minimum value is 50 (A setting below 50 will be treated
+    # as 50).
+
+    snapshot_autoextend_threshold = 100
+    snapshot_autoextend_percent = 20
+@
index b7cba8a5d81d2d2341c71ab4756c0edafcb49af3..b601b47a1822e32237d69a1836ec7e5237f511f5 100644 (file)
@@ -35,6 +35,11 @@ next 1.1.1.3;
 1.1.1.3
 date   2010.11.30.22.11.02;    author root;    state Exp;
 branches;
+next   1.1.1.4;
+
+1.1.1.4
+date   2012.01.29.08.25.54;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -284,3 +289,28 @@ d143 1
 a143 1
 .F             
 @
+
+
+1.1.1.4
+log
+@dispatch-conf update.
+@
+text
+@d5 1
+a5 1
+# man.conf from man-1.6g
+a42 1
+MANPATH        /usr/man
+a43 1
+MANPATH        /usr/local/man
+d46 2
+d126 1
+a126 1
+MANSECT                1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
+d140 1
+d143 1
+a143 1
+.F             /usr/bin/fcat
+a144 1
+.xz            /usr/bin/unxz -c
+@
diff --git a/config-archive/etc/mc/filehighlight.ini,v b/config-archive/etc/mc/filehighlight.ini,v
new file mode 100644 (file)
index 0000000..475e33b
--- /dev/null
@@ -0,0 +1,97 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.11.58;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@[executable]
+    type=FILE_EXE
+
+[directory]
+    type=DIR
+
+
+[device]
+    type=DEVICE
+
+[special]
+    type=SPECIAL
+
+[stalelink]
+    type=STALE_LINK
+
+[symlink]
+    type=SYMLINK
+
+[core]
+    regexp=^core\\.*\\d*$
+
+[temp]
+    extensions=tmp;$$$;~;bak
+    extensions_case=false
+    regexp=(^#.*|.*~$)
+
+[archive]
+    extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;
+
+[doc]
+    extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm
+
+[source]
+    extensions=c;h;cc;hh;cpp;cxx;hpp;asm;py;pl;pm;inc;cgi;php;phps;js;java;jav;jasm;sh;bash;diff;patch;pas;tcl;tk;awk;m4;st;mak;sl;ada;caml;ml;mli;mly;mll;mlp;sas;prg;hs;hi;erl
+
+[media]
+    extensions=mp2;mp3;mpg;ogg;mpeg;wav;avi;asf;mov;mol;mpl;xm;mod;it;med;mid;midi;s3m;umx;vob;mkv;flv;mp4;m3u
+
+[graph]
+    extensions=jpg;jpeg;gif;png;tif;pcx;bmp;xpm;xbm;eps;pic;rle;ico;wmf;omf;ai;cdr
+
+[database]
+    extensions=dbf;mdn;db;mdb;dat;fox;dbx;mdx;sql;mssql;msql;ssql;pgsql;xls;cdx;dbi
+
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d7 1
+a19 3
+[hardlink]
+    type=HARDLINK
+
+d29 1
+a29 1
+    extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z;ace
+d32 1
+a32 1
+    extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm;docx;docm;xlsx;xlsm;pptx;pptm
+d38 1
+a38 1
+    extensions=mp2;mp3;mpg;ogg;mpeg;wav;avi;asf;mov;mol;mpl;xm;mod;it;med;mid;midi;s3m;umx;vob;mkv;flv;mp4;m3u;flac;ape;wma;wmv;3gp
+@
index c6832694f782108c63c5cdcde97875ea965da6fd..61e90267416c8b06c8f4d86ea5937ad9163385c4 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.08.09.19.10.50;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.08.09.19.11.04;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -71,7 +82,7 @@ text
 # %% -> % character
 # %p -> name of the current file (without path, but pwd is its path)
 # %f -> name of the current file. Unlike %p, if file is located on a
-#      non-local virtual filesystem, i.e. either tarfs, mcfs or ftpfs,
+#      non-local virtual filesystem, i.e. either tarfs or ftpfs,
 #      then the file will be temporarily copied into a local directory
 #      and %f will be the full path to this local temporal file.
 #      If you don't want to get a local copy and want to get the
@@ -110,8 +121,8 @@ text
 # the second entry will be used. default should catch all the actions.
 #
 # Any new entries you develop for you are always welcome if they are
-# useful on more than one system.  You can send your modifications
-# by e-mail to mc-devel@@gnome.org
+# useful on more than one system.  You can post your modifications
+# as tickets at www.midnight-commander.org
 
 
 ### Changes ###
@@ -237,7 +248,7 @@ regex/\.(diff|patch)$
 regex/\.s?a$
        Open=%cd %p#uar
        #Open=%view{ascii} ar tv %f
-       View=%view{ascii} file %f && nm %f
+       View=%view{ascii} file %f && nm -C %f
 
 # trpm
 regex/\.trpm$
@@ -268,7 +279,7 @@ shell/.deba
         View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
 
 # ISO9660
-regex/\.iso$
+regex/\.([iI][sS][oO])$
        Open=%cd %p#iso9660
        View=%view{ascii} isoinfo -l -i %f
 
@@ -296,11 +307,6 @@ shell/.f
 regex/\.(h|hpp)$
        Open=%var{EDITOR:vi} %f
 
-# Object
-type/^ELF
-       #Open=%var{PAGER:more} %f
-       View=%view{ascii} file %f && nm %f
-
 # Asm
 shell/.s
        Open=%var{EDITOR:vi} %f
@@ -309,6 +315,14 @@ shell/.s
 regex/\.(C|cc|cpp)$
        Open=%var{EDITOR:vi} %f
 
+# .so libraries
+regex/\.(so|so\.[0-9\.]*)$
+       View=%view{ascii} file %f && nm -C -D %f
+
+# Object
+type/^ELF
+       #Open=%var{PAGER:more} %f
+       View=%view{ascii} file %f && nm -C %f
 
 ### Documentation ###
 
@@ -323,10 +337,6 @@ shell/.info
        Open=info -f %f
 
 # Manual page
-# Exception - .so libraries are not manual pages
-regex/\.(so|so\.[0-9\.]*)$
-       View=%view{ascii} file %f && nm %f
-
 regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
        Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) { zsoelim %f 2>/dev/null || cat %f; } | nroff -c -Tlatin1 -mandoc ;; esac | %var{PAGER:more}
        View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) cat %f ;; *) { zsoelim %f 2>/dev/null || cat %f; } | nroff -c -Tlatin1 -mandoc ;; esac
@@ -651,7 +661,7 @@ type/^gzip
        Open=gzip -dc %f | %var{PAGER:more}
        View=%view{ascii} gzip -dc %f 2>/dev/null
 
-regex/\.(gz|Z)?$
+regex/\.(gz|Z)$
        View=%view{ascii} gzip -dc %f 2>/dev/null
 
 # bzip2
@@ -695,6 +705,42 @@ default/*
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d45 1
+a45 1
+#      non-local virtual filesystem, i.e. either tarfs, mcfs or ftpfs,
+d84 2
+a85 2
+# useful on more than one system.  You can send your modifications
+# by e-mail to mc-devel@@gnome.org
+d211 1
+a211 1
+       View=%view{ascii} file %f && nm %f
+d242 1
+a242 1
+regex/\.iso$
+a269 5
+# Object
+type/^ELF
+       #Open=%var{PAGER:more} %f
+       View=%view{ascii} file %f && nm %f
+
+d278 8
+a299 4
+# Exception - .so libraries are not manual pages
+regex/\.(so|so\.[0-9\.]*)$
+       View=%view{ascii} file %f && nm %f
+
+d624 1
+a624 1
+regex/\.(gz|Z)?$
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -728,3 +774,161 @@ d625 1
 a625 1
 regex/\.(gz|Z)$
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a106 6
+### GIT Repo ###
+# gitfs changeset
+regex/^\[git\]
+       Open=%cd %p/changesetfs://
+       View=%cd %p/patchsetfs://
+
+d111 1
+a111 1
+       Open=%cd %p/utar://
+d115 1
+a115 1
+       # Open=%cd %p/utar://
+d119 1
+a119 1
+       Open=%cd %p/utar://
+d124 1
+a124 1
+       Open=%cd %p/utar://
+d129 1
+a129 1
+       Open=%cd %p/utar://
+d134 1
+a134 1
+       # Open=%cd %p/utar://
+d139 1
+a139 1
+       Open=%cd %p/utar://
+d144 1
+a144 1
+       Open=%cd %p/utar://
+d149 1
+a149 1
+       Open=%cd %p/ulha://
+d154 1
+a154 1
+       Open=%cd %p/uarj://
+d159 1
+a159 1
+       Open=%cd %p/ucab://
+d164 1
+a164 1
+       Open=%cd %p/uha://
+d169 1
+a169 1
+       Open=%cd %p/urar://
+d174 1
+a174 1
+       Open=%cd %p/ualz://
+d179 1
+a179 1
+       Open=%cd %p/ucpio://
+d183 1
+a183 1
+       Open=%cd %p/ucpio://
+d187 1
+a187 1
+       Open=%cd %p/ucpio://
+d192 1
+a192 1
+       Open=%cd %p/lslR://
+d196 1
+a196 1
+       Open=%cd %p/patchfs://
+d200 1
+a200 1
+       Open=%cd %p/patchfs://
+d204 1
+a204 1
+       Open=%cd %p/patchfs://
+d209 1
+a209 1
+       Open=%cd %p/uar://
+d215 1
+a215 1
+       Open=%cd %p/trpm://
+d220 1
+a220 1
+       Open=%cd %p/rpm://
+d224 1
+a224 1
+       Open=%cd %p/rpm://
+d229 1
+a229 1
+       Open=%cd %p/deb://
+d234 1
+a234 1
+        Open=%cd %p/debd://
+d238 1
+a238 1
+        Open=%cd %p/deba://
+d243 1
+a243 1
+       Open=%cd %p/iso9660://
+d248 1
+a248 1
+       Open=%cd %p/u7z://
+d253 1
+a253 1
+       Open=%cd %p/mailfs://
+d260 1
+a260 1
+       Include=editor
+d264 1
+a264 1
+       Include=editor
+d268 1
+a268 1
+       Include=editor
+d272 1
+a272 1
+       Include=editor
+a275 3
+       Include=editor
+
+include/editor
+a298 4
+# Exception: .3gp are video files not manual pages
+regex/\.(3[gG][pP])$
+       Include=video
+
+a454 4
+# MPEG-2 TS container + H.264 codec
+regex/\.([mM][tT][sS])$
+       Include=video
+
+d546 1
+a546 1
+       Include=editor
+d577 1
+a577 1
+       Open=%cd %p/uc1541://
+a593 4
+# torrent
+regex/\.([tT][oO][rR][rR][eE][nN][tT])$
+       View=%view{ascii} ctorrent -x %f 2>/dev/null
+
+d598 1
+a598 1
+       Open=%cd %p/uace://
+d604 1
+a604 1
+       Open=%cd %p/uarc://
+d611 1
+a611 1
+       Open=%cd %p/uzip://
+d616 1
+a616 1
+       Open=%cd %p/uzoo://
+d654 1
+@
index 2aded36addd63846168bc98d53f99de9110bf5ae..4e7b59928b75f3b9ad221a04a4e3c386a9e6fbd3 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.08.09.19.10.50;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.08.09.19.11.14;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -42,12 +53,12 @@ EditUp = up
 EditDown = down
 EditEnter = enter
 EditReturn = shift-enter
-EditBackSpace = backspace
-EditDelete = delete
+EditBackSpace = backspace; ctrl-h
+EditDelete = delete; ctrl-d
 EditPageUp = pgup
 EditPageDown = pgdn
-EditWordLeft = ctrl-left
-EditWordRight = ctrl-right
+EditWordLeft = ctrl-left; ctrl-z
+EditWordRight = ctrl-right; ctrl-x
 EditHome = home
 EditEnd = end
 EditTab = tab
@@ -73,6 +84,8 @@ EditRemove = f8
 EditMarkAll =
 EditUnmark =
 EditFind = f7
+EditMarkLine =
+EditMarkWord =
 
 EditShiftBlockLeft =
 EditShiftBlockRight =
@@ -140,7 +153,7 @@ EditRefresh = ctrl-l
 EditGoto = alt-l
 EditManPage =
 EditSort = alt-t
-EditMail =
+EditMail = alt-m
 EditCancel =
 EditComplete =
 
@@ -180,6 +193,7 @@ EditDeleteMacro =
 EditToggleLineState = alt-n
 EditToggleTabTWS = alt-underline
 EditToggleSyntax = ctrl-s
+EditToggleShowMargin =
 
 EditFindDefinition = alt-enter
 EditLoadPrevFile = alt-minus
@@ -190,7 +204,7 @@ SelectCodepage = alt-e
 [viewer]
 ViewHelp = f1
 ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
+ViewQuit = f3; f10; q; esc
 ViewToggleHexMode = f4
 ViewGoto = f5
 ViewSearch = f7; question; slash
@@ -201,12 +215,16 @@ ViewMoveToBol = ctrl-a
 ViewMoveToEol = ctrl-e
 ViewMoveLeft = h; left
 ViewMoveRight = l; right
-ViewMoveUp = k; y; insert; up
-ViewMoveDown = j; e; delete; down; enter
-ViewMovePgDn = f; space; pgdn
-ViewMovePgUp = b; pgup
+ViewMoveLeft10 = ctrl-left
+ViewMoveRight10 = ctrl-right
+ViewMoveUp = k; y; insert; up; ctrl-p
+ViewMoveDown = j; e; delete; down; enter; ctrl-n
+ViewMovePgDn = f; space; pgdn; ctrl-v
+ViewMovePgUp = b; pgup; alt-v; backspace
 ViewMoveHalfPgDn = d
 ViewMoveHalfPgUp = u
+ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 ViewGotoBookmark = m
 ViewNewBookmark = r
 ViewNextFile = ctrl-f
@@ -218,7 +236,7 @@ ViewToggleRuler = alt-r
 [viewer:hex]
 ViewHelp = f1
 ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
+ViewQuit = f3; f10; q; esc
 ViewToggleHexMode = f4
 ViewGoto = f5
 ViewHexEditSave = f6
@@ -232,6 +250,10 @@ ViewMoveLeft = b; left
 ViewMoveRight = f; right
 ViewMoveUp = k; y; up
 ViewMoveDown = j; delete; down
+ViewMovePgDn = pgdn; ctrl-v
+ViewMovePgUp = pgup; alt-v
+ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [main]
 CmdHelp = f1
@@ -239,6 +261,7 @@ CmdUserMenu = f2
 CmdView = f3
 CmdViewFile = f13
 CmdEdit = f4
+CmdEditForceInternal =
 CmdCopy = f5
 CmdRename = f6
 CmdMkdir = f7
@@ -255,8 +278,10 @@ CmdSingleDirsize = ctrl-space
 CmdSuspend = ctrl-z
 CmdSwapPanel = ctrl-u
 CmdHistory = alt-h
+CmdListing =
 CmdToggleListing = alt-t
 CmdToggleShowHidden = alt-dot
+CmdTogglePanelsSplit = alt-comma
 ShowCommandLine = ctrl-o
 CmdCopyCurrentPathname = alt-a
 CmdCopyOtherPathname = alt-shift-a
@@ -264,6 +289,7 @@ CmdFilteredView = alt-exclamation
 CmdSelect = kpplus
 CmdUnselect = kpminus
 CmdReverseSelection = kpasterisk
+CmdDialogList = alt-prime
 ExtMap1 = ctrl-x
 
 [main:xmap]
@@ -273,6 +299,7 @@ CmdCompareDirs = d
 CmdEditSymlink = ctrl-s
 CmdLink = l
 CmdSymlink = s
+CmdRelativeSymlink = v
 CmdInfo = i
 CmdQuickView = q
 CmdExternalPanelize = exclamation
@@ -282,10 +309,13 @@ CmdCopyCurrentPathname = p
 CmdCopyOtherPathname = ctrl-p
 CmdCopyCurrentTagged = t
 CmdCopyOtherTagged = ctrl-t
+CmdDiffView = ctrl-d
 
 [panel]
 PanelStartSearch = ctrl-s; alt-s
 PanelMarkFile = insert; ctrl-t
+PanelMarkFileUp = shift-up
+PanelMarkFileDown = shift-down
 PanelMoveDown = down; ctrl-n
 PanelMoveUp = up; ctrl-p
 PanelMoveLeft = left
@@ -303,8 +333,8 @@ PanelDeleteLocal = F18
 PanelReverseSelection = alt-asterisk
 PanelSelect = alt-plus
 PanelUnselect = alt-minus
-PanelCtrlNextPage = ctrl-pgdn
-PanelCtrlPrevPage = ctrl-pgup
+PanelGotoChildDir = ctrl-pgdn
+PanelGotoParentDir = ctrl-pgup
 PanelDirectoryHistoryList = alt-shift-h
 PanelDirectoryHistoryNext = alt-u
 PanelDirectoryHistoryPrev = alt-y
@@ -313,8 +343,8 @@ PanelGotoMiddleFile = alt-r
 PanelSyncOtherPanel = alt-i
 PanelGotoTopFile = alt-g
 PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home
-PanelMoveEnd = alt-gt; end
+PanelMoveHome = alt-lt; home; a1
+PanelMoveEnd = alt-gt; end; c1
 PanelSelectSortOrder=
 PanelToggleSortOrderPrev=
 PanelToggleSortOrderNext=
@@ -323,12 +353,11 @@ PanelSortOrderByName=
 PanelSortOrderByExt=
 PanelSortOrderBySize=
 PanelSortOrderByMTime=
-
-[panel:xmap]
+PanelSmartGotoParentDir=
 
 [input]
-InputBol = ctrl-a; alt-lt; home
-InputEol = ctrl-e; alt-gt; end
+InputBol = ctrl-a; alt-lt; home; a1
+InputEol = ctrl-e; alt-gt; end; c1
 InputMoveLeft = left; alt-left
 InputWordLeft = ctrl-left
 InputBackwardChar = ctrl-b
@@ -337,12 +366,13 @@ InputMoveRight = right; alt-right
 InputWordRight = ctrl-right
 InputForwardChar = ctrl-f
 InputForwardWord = alt-f
-InputBackwardDelete = backspace
-InputDeleteChar = delete
+InputBackwardDelete = backspace; ctrl-h
+InputDeleteChar = delete; ctrl-d
 InputKillWord = alt-d
 InputBackwardKillWord = alt-backspace
 InputSetMark =
 InputKillRegion = ctrl-w
+InputXCut =
 InputXStore = alt-w
 InputXPaste =
 InputYank = ctrl-y
@@ -352,6 +382,22 @@ InputHistoryNext = alt-n; ctrl-up
 InputHistoryShow = alt-h
 InputComplete = alt-tab
 InputClearLine =
+InputLeftHighlight = shift-left
+InputRightHighlight = shift-right
+InputWordLeftHighlight = ctrl-shift-left
+InputWordRightHighlight = ctrl-shift-right
+InputBolHighlight = shift-home
+InputEolHighlight = shift-end
+
+[listbox]
+ListboxMoveUp = up; ctrl-p
+ListboxMoveDown = down; ctrl-n
+ListboxMoveHome = home; alt-lt; a1
+ListboxMoveEnd = end; alt-gt; c1
+ListboxMovePgUp = pgup; alt-v
+ListboxMovePgDn = pgdn; ctrl-v
+ListboxDeleteItem = delete; d
+ListboxDeleteAll = shift-delete; shift-d
 
 [tree]
 TreeHelp = f1
@@ -363,8 +409,8 @@ TreeMoveUp = up; ctrl-p
 TreeMoveDown = down; ctrl-n
 TreeMoveLeft = left
 TreeMoveRight = right
-TreeMoveHome = home; alt-lt
-TreeMoveEnd = end; alt-gt
+TreeMoveHome = home; alt-lt; a1
+TreeMoveEnd = end; alt-gt; c1
 TreeMovePgUp = pgup; alt-v
 TreeMovePgDn = pgdn; ctrl-v
 TreeOpen = enter
@@ -376,14 +422,147 @@ TreeRemove = f8; delete
 HelpHelp = f1
 HelpIndex = f2; c
 HelpBack = f3; left; l
-HelpQuit = f10; esc; ctrl-g
-HelpMoveUp = up
-HelpMoveDown = down
+HelpQuit = f10; esc
+HelpMoveUp = up; ctrl-p
+HelpMoveDown = down; ctrl-n
+HelpMovePgDn = f; space; pgdn; ctrl-v
+HelpMovePgUp = b; pgup; alt-v; backspace
+HelpMoveHalfPgDn = d
+HelpMoveHalfPgUp = u
+HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 HelpSelectLink = right; enter
 HelpNextLink = tab
 HelpPrevLink = alt-tab
 HelpNextNode = n
 HelpPrevNode = p
+
+[dialog]
+DialogOK = enter
+DialogCancel = f10; esc; ctrl-g
+DialogPrevItem = left; up
+DialogNextItem = right; down
+DialogHelp = f1
+DialogSuspend = ctrl-z
+DialogRefresh = ctrl-l
+CmdDialogList = alt-prime
+CmdDialogNext = alt-rbrace
+CmdDialogPrev = alt-lbrace
+
+
+[diffviewer]
+DiffDisplaySymbols = alt-s; s
+DiffDisplayNumbers = alt-n; l
+DiffFull = f
+DiffEqual = equal
+DiffSplitMore = gt
+DiffSplitLess = lt
+DiffSetTab2 = 2
+DiffSetTab3 = 3
+DiffSetTab4 = 4
+DiffSetTab8 = 8
+DiffSwapPanel = ctrl-u
+DiffRedo = ctrl-r
+DiffNextHunk = n; enter; space
+DiffPrevHunk = p; backspace
+DiffGoto = g; shift-g
+DiffSave = f2
+DiffEditCurrent = f4
+DiffEditOther = f14
+DiffMergeCurrentHunk = f5
+DiffSearch = f7
+DiffContinueSearch = f17
+DiffOptions = f9
+DiffBOF = ctrl-home
+DiffEOF = ctrl-end
+DiffDown = down
+DiffUp = up
+DiffQuickLeft = ctrl-left
+DiffQuickRight = ctrl-right
+DiffLeft = left
+DiffRight = right
+DiffPageDown = pgdn
+DiffPageUp = pgup
+DiffHome = home
+DiffEnd = end
+DiffHelp = f1
+DiffQuit = f10; q; shift-q; esc
+ShowCommandLine = ctrl-o
+SelectCodepage = alt-e
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d16 2
+a17 2
+EditBackSpace = backspace
+EditDelete = delete
+d20 2
+a21 2
+EditWordLeft = ctrl-left
+EditWordRight = ctrl-right
+d47 2
+d116 1
+a116 1
+EditMail =
+d156 1
+d167 1
+a167 1
+ViewQuit = f3; f10; q; esc; ctrl-g
+d178 6
+a183 4
+ViewMoveUp = k; y; insert; up
+ViewMoveDown = j; e; delete; down; enter
+ViewMovePgDn = f; space; pgdn
+ViewMovePgUp = b; pgup
+d186 2
+d199 1
+a199 1
+ViewQuit = f3; f10; q; esc; ctrl-g
+d213 4
+d224 1
+d241 1
+d244 1
+d252 1
+d262 1
+d272 1
+d277 2
+d296 2
+a297 2
+PanelCtrlNextPage = ctrl-pgdn
+PanelCtrlPrevPage = ctrl-pgup
+d306 2
+a307 2
+PanelMoveHome = alt-lt; home
+PanelMoveEnd = alt-gt; end
+d316 1
+a316 2
+
+[panel:xmap]
+d319 2
+a320 2
+InputBol = ctrl-a; alt-lt; home
+InputEol = ctrl-e; alt-gt; end
+d329 2
+a330 2
+InputBackwardDelete = backspace
+InputDeleteChar = delete
+d335 1
+d345 16
+d372 2
+a373 2
+TreeMoveHome = home; alt-lt
+TreeMoveEnd = end; alt-gt
+d385 9
+a393 3
+HelpQuit = f10; esc; ctrl-g
+HelpMoveUp = up
+HelpMoveDown = down
+d399 53
 @
 
 
@@ -553,3 +732,443 @@ DiffQuit = f10; q; shift-q; esc
 ShowCommandLine = ctrl-o
 SelectCodepage = alt-e
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@d1 217
+d219 35
+a253 50
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
+d256 17
+a272 20
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative = v
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
+d275 42
+a316 59
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+MarkLeft =
+MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+CdParentSmart =
+Panelize =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
+
+[dialog]
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
+d319 32
+a350 28
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace; ctrl-h
+Delete = delete; ctrl-d
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkToHome = shift-home
+MarkToEnd = shift-end
+d353 8
+a360 8
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
+d363 17
+a379 17
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
+d382 17
+a398 17
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
+d400 11
+a410 122
+[editor]
+Store = ctrl-insert
+Paste = shift-insert
+Cut = shift-delete
+Up = up
+Down = down
+Left = left
+Right = right
+WordLeft = ctrl-left; ctrl-z
+WordRight = ctrl-right; ctrl-x
+Enter = enter
+Return = shift-enter
+BackSpace = backspace; ctrl-h
+Delete = delete; ctrl-d
+PageUp = pgup
+PageDown = pgdn
+Home = home
+End = end
+Tab = tab
+Undo = ctrl-u
+Redo = alt-r
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+EditNew = ctrl-n
+SaveAs = f12; ctrl-f2
+Mark = f3
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin  = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave = ctrl-f
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail = alt-m
+ParagraphFormat = alt-p
+MatchBracket = alt-b
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark = alt-k
+BookmarkFlush = alt-o
+BookmarkNext = alt-j
+BookmarkPrev = alt-i
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
+SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap =
+a411 54
+[viewer]
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
+SelectCodepage = alt-e
+Shell = ctrl-o
+Ruler = alt-r
+
+[viewer:hex]
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+d414 37
+a450 37
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
+@
index 1fff4bf210e5b58403c530a4d03376045fca03b6..313b1c78561ac711b2445ddc4845d8544ea49112 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.08.09.19.10.51;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.08.09.19.11.21;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -42,12 +53,12 @@ EditUp = up
 EditDown = down
 EditEnter = enter
 EditReturn = shift-enter
-EditBackSpace = backspace
-EditDelete = delete
+EditBackSpace = backspace; ctrl-h
+EditDelete = delete; ctrl-d
 EditPageUp = pgup
 EditPageDown = pgdn
-EditWordLeft = ctrl-left
-EditWordRight = ctrl-right
+EditWordLeft = ctrl-left; ctrl-z
+EditWordRight = ctrl-right; ctrl-x
 EditHome = home
 EditEnd = end
 EditTab = tab
@@ -73,6 +84,8 @@ EditRemove = f8
 EditMarkAll =
 EditUnmark =
 EditFind = f7
+EditMarkLine =
+EditMarkWord =
 
 EditShiftBlockLeft =
 EditShiftBlockRight =
@@ -140,7 +153,7 @@ EditRefresh = ctrl-l
 EditGoto = alt-l
 EditManPage =
 EditSort = alt-t
-EditMail =
+EditMail = alt-m
 EditCancel =
 EditComplete =
 
@@ -180,6 +193,7 @@ EditDeleteMacro =
 EditToggleLineState = alt-n
 EditToggleTabTWS = alt-underline
 EditToggleSyntax = ctrl-s
+EditToggleShowMargin =
 
 EditFindDefinition = alt-enter
 EditLoadPrevFile = alt-minus
@@ -190,7 +204,7 @@ SelectCodepage = alt-e
 [viewer]
 ViewHelp = f1
 ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
+ViewQuit = f3; f10; q; esc
 ViewToggleHexMode = f4
 ViewGoto = f5
 ViewSearch = f7; question; slash
@@ -201,12 +215,16 @@ ViewMoveToBol = ctrl-a
 ViewMoveToEol = ctrl-e
 ViewMoveLeft = h; left
 ViewMoveRight = l; right
-ViewMoveUp = k; y; insert; up
-ViewMoveDown = j; e; delete; down; enter
-ViewMovePgDn = f; space; pgdn
-ViewMovePgUp = b; pgup
+ViewMoveLeft10 = ctrl-left
+ViewMoveRight10 = ctrl-right
+ViewMoveUp = k; y; insert; up; ctrl-p
+ViewMoveDown = j; e; delete; down; enter; ctrl-n
+ViewMovePgDn = f; space; pgdn; ctrl-v
+ViewMovePgUp = b; pgup; alt-v; backspace
 ViewMoveHalfPgDn = d
 ViewMoveHalfPgUp = u
+ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 ViewGotoBookmark = m
 ViewNewBookmark = r
 ViewNextFile = ctrl-f
@@ -218,7 +236,7 @@ ViewToggleRuler = alt-r
 [viewer:hex]
 ViewHelp = f1
 ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
+ViewQuit = f3; f10; q; esc
 ViewToggleHexMode = f4
 ViewGoto = f5
 ViewHexEditSave = f6
@@ -232,6 +250,10 @@ ViewMoveLeft = b; left
 ViewMoveRight = f; right
 ViewMoveUp = k; y; up
 ViewMoveDown = j; delete; down
+ViewMovePgDn = pgdn; ctrl-v
+ViewMovePgUp = pgup; alt-v
+ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [main]
 CmdHelp = f1
@@ -239,6 +261,7 @@ CmdUserMenu = f2
 CmdView = f3
 CmdViewFile = f13
 CmdEdit = f4
+CmdEditForceInternal =
 CmdCopy = f5
 CmdRename = f6
 CmdMkdir = f7
@@ -255,8 +278,10 @@ CmdSingleDirsize = ctrl-space
 CmdSuspend = ctrl-z
 CmdSwapPanel = ctrl-u
 CmdHistory = alt-h
+CmdListing =
 CmdToggleListing = alt-t
 CmdToggleShowHidden = alt-dot
+CmdTogglePanelsSplit = alt-comma
 ShowCommandLine = ctrl-o
 CmdCopyCurrentPathname = alt-a
 CmdCopyOtherPathname = alt-shift-a
@@ -264,6 +289,7 @@ CmdFilteredView = alt-exclamation
 CmdSelect = kpplus
 CmdUnselect = kpminus
 CmdReverseSelection = kpasterisk
+CmdDialogList = alt-prime
 ExtMap1 = ctrl-x
 
 [main:xmap]
@@ -273,6 +299,7 @@ CmdCompareDirs = d
 CmdEditSymlink = ctrl-s
 CmdLink = l
 CmdSymlink = s
+CmdRelativeSymlink = v
 CmdInfo = i
 CmdQuickView = q
 CmdExternalPanelize = exclamation
@@ -282,10 +309,13 @@ CmdCopyCurrentPathname = p
 CmdCopyOtherPathname = ctrl-p
 CmdCopyCurrentTagged = t
 CmdCopyOtherTagged = ctrl-t
+CmdDiffView = ctrl-d
 
 [panel]
 PanelStartSearch = ctrl-s; alt-s
 PanelMarkFile = insert; ctrl-t
+PanelMarkFileUp = shift-up
+PanelMarkFileDown = shift-down
 PanelMoveDown = down; ctrl-n
 PanelMoveUp = up; ctrl-p
 PanelMoveLeft = left
@@ -303,8 +333,8 @@ PanelDeleteLocal = F18
 PanelReverseSelection = alt-asterisk
 PanelSelect = alt-plus
 PanelUnselect = alt-minus
-PanelCtrlNextPage = ctrl-pgdn
-PanelCtrlPrevPage = ctrl-pgup
+PanelGotoChildDir = ctrl-pgdn
+PanelGotoParentDir = ctrl-pgup
 PanelDirectoryHistoryList = alt-shift-h
 PanelDirectoryHistoryNext = alt-u
 PanelDirectoryHistoryPrev = alt-y
@@ -313,8 +343,8 @@ PanelGotoMiddleFile = alt-r
 PanelSyncOtherPanel = alt-i
 PanelGotoTopFile = alt-g
 PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home
-PanelMoveEnd = alt-gt; end
+PanelMoveHome = alt-lt; home; a1
+PanelMoveEnd = alt-gt; end; c1
 PanelSelectSortOrder=
 PanelToggleSortOrderPrev=
 PanelToggleSortOrderNext=
@@ -323,12 +353,11 @@ PanelSortOrderByName=
 PanelSortOrderByExt=
 PanelSortOrderBySize=
 PanelSortOrderByMTime=
-
-[panel:xmap]
+PanelSmartGotoParentDir=
 
 [input]
-InputBol = ctrl-a; alt-lt; home
-InputEol = ctrl-e; alt-gt; end
+InputBol = ctrl-a; alt-lt; home; a1
+InputEol = ctrl-e; alt-gt; end; c1
 InputMoveLeft = left; alt-left
 InputWordLeft = ctrl-left
 InputBackwardChar = ctrl-b
@@ -337,12 +366,13 @@ InputMoveRight = right; alt-right
 InputWordRight = ctrl-right
 InputForwardChar = ctrl-f
 InputForwardWord = alt-f
-InputBackwardDelete = backspace
-InputDeleteChar = delete
+InputBackwardDelete = backspace; ctrl-h
+InputDeleteChar = delete; ctrl-d
 InputKillWord = alt-d
 InputBackwardKillWord = alt-backspace
 InputSetMark =
 InputKillRegion = ctrl-w
+InputXCut =
 InputXStore = alt-w
 InputXPaste =
 InputYank = ctrl-y
@@ -352,6 +382,22 @@ InputHistoryNext = alt-n; ctrl-up
 InputHistoryShow = alt-h
 InputComplete = alt-tab
 InputClearLine =
+InputLeftHighlight = shift-left
+InputRightHighlight = shift-right
+InputWordLeftHighlight = ctrl-shift-left
+InputWordRightHighlight = ctrl-shift-right
+InputBolHighlight = shift-home
+InputEolHighlight = shift-end
+
+[listbox]
+ListboxMoveUp = up; ctrl-p
+ListboxMoveDown = down; ctrl-n
+ListboxMoveHome = home; alt-lt; a1
+ListboxMoveEnd = end; alt-gt; c1
+ListboxMovePgUp = pgup; alt-v
+ListboxMovePgDn = pgdn; ctrl-v
+ListboxDeleteItem = delete; d
+ListboxDeleteAll = shift-delete; shift-d
 
 [tree]
 TreeHelp = f1
@@ -363,8 +409,8 @@ TreeMoveUp = up; ctrl-p
 TreeMoveDown = down; ctrl-n
 TreeMoveLeft = left
 TreeMoveRight = right
-TreeMoveHome = home; alt-lt
-TreeMoveEnd = end; alt-gt
+TreeMoveHome = home; alt-lt; a1
+TreeMoveEnd = end; alt-gt; c1
 TreeMovePgUp = pgup; alt-v
 TreeMovePgDn = pgdn; ctrl-v
 TreeOpen = enter
@@ -376,14 +422,147 @@ TreeRemove = f8; delete
 HelpHelp = f1
 HelpIndex = f2; c
 HelpBack = f3; left; l
-HelpQuit = f10; esc; ctrl-g
-HelpMoveUp = up
-HelpMoveDown = down
+HelpQuit = f10; esc
+HelpMoveUp = up; ctrl-p
+HelpMoveDown = down; ctrl-n
+HelpMovePgDn = f; space; pgdn; ctrl-v
+HelpMovePgUp = b; pgup; alt-v; backspace
+HelpMoveHalfPgDn = d
+HelpMoveHalfPgUp = u
+HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 HelpSelectLink = right; enter
 HelpNextLink = tab
 HelpPrevLink = alt-tab
 HelpNextNode = n
 HelpPrevNode = p
+
+[dialog]
+DialogOK = enter
+DialogCancel = f10; esc; ctrl-g
+DialogPrevItem = left; up
+DialogNextItem = right; down
+DialogHelp = f1
+DialogSuspend = ctrl-z
+DialogRefresh = ctrl-l
+CmdDialogList = alt-prime
+CmdDialogNext = alt-rbrace
+CmdDialogPrev = alt-lbrace
+
+
+[diffviewer]
+DiffDisplaySymbols = alt-s; s
+DiffDisplayNumbers = alt-n; l
+DiffFull = f
+DiffEqual = equal
+DiffSplitMore = gt
+DiffSplitLess = lt
+DiffSetTab2 = 2
+DiffSetTab3 = 3
+DiffSetTab4 = 4
+DiffSetTab8 = 8
+DiffSwapPanel = ctrl-u
+DiffRedo = ctrl-r
+DiffNextHunk = n; enter; space
+DiffPrevHunk = p; backspace
+DiffGoto = g; shift-g
+DiffSave = f2
+DiffEditCurrent = f4
+DiffEditOther = f14
+DiffMergeCurrentHunk = f5
+DiffSearch = f7
+DiffContinueSearch = f17
+DiffOptions = f9
+DiffBOF = ctrl-home
+DiffEOF = ctrl-end
+DiffDown = down
+DiffUp = up
+DiffQuickLeft = ctrl-left
+DiffQuickRight = ctrl-right
+DiffLeft = left
+DiffRight = right
+DiffPageDown = pgdn
+DiffPageUp = pgup
+DiffHome = home
+DiffEnd = end
+DiffHelp = f1
+DiffQuit = f10; q; shift-q; esc
+ShowCommandLine = ctrl-o
+SelectCodepage = alt-e
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d16 2
+a17 2
+EditBackSpace = backspace
+EditDelete = delete
+d20 2
+a21 2
+EditWordLeft = ctrl-left
+EditWordRight = ctrl-right
+d47 2
+d116 1
+a116 1
+EditMail =
+d156 1
+d167 1
+a167 1
+ViewQuit = f3; f10; q; esc; ctrl-g
+d178 6
+a183 4
+ViewMoveUp = k; y; insert; up
+ViewMoveDown = j; e; delete; down; enter
+ViewMovePgDn = f; space; pgdn
+ViewMovePgUp = b; pgup
+d186 2
+d199 1
+a199 1
+ViewQuit = f3; f10; q; esc; ctrl-g
+d213 4
+d224 1
+d241 1
+d244 1
+d252 1
+d262 1
+d272 1
+d277 2
+d296 2
+a297 2
+PanelCtrlNextPage = ctrl-pgdn
+PanelCtrlPrevPage = ctrl-pgup
+d306 2
+a307 2
+PanelMoveHome = alt-lt; home
+PanelMoveEnd = alt-gt; end
+d316 1
+a316 2
+
+[panel:xmap]
+d319 2
+a320 2
+InputBol = ctrl-a; alt-lt; home
+InputEol = ctrl-e; alt-gt; end
+d329 2
+a330 2
+InputBackwardDelete = backspace
+InputDeleteChar = delete
+d335 1
+d345 16
+d372 2
+a373 2
+TreeMoveHome = home; alt-lt
+TreeMoveEnd = end; alt-gt
+d385 9
+a393 3
+HelpQuit = f10; esc; ctrl-g
+HelpMoveUp = up
+HelpMoveDown = down
+d399 53
 @
 
 
@@ -553,3 +732,443 @@ DiffQuit = f10; q; shift-q; esc
 ShowCommandLine = ctrl-o
 SelectCodepage = alt-e
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@d1 217
+d219 35
+a253 50
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
+d256 17
+a272 20
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative = v
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
+d275 42
+a316 59
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+MarkLeft =
+MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+CdParentSmart =
+Panelize =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
+
+[dialog]
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
+d319 32
+a350 28
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace; ctrl-h
+Delete = delete; ctrl-d
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkToHome = shift-home
+MarkToEnd = shift-end
+d353 8
+a360 8
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
+d363 17
+a379 17
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
+d382 17
+a398 17
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
+d400 11
+a410 122
+[editor]
+Store = ctrl-insert
+Paste = shift-insert
+Cut = shift-delete
+Up = up
+Down = down
+Left = left
+Right = right
+WordLeft = ctrl-left; ctrl-z
+WordRight = ctrl-right; ctrl-x
+Enter = enter
+Return = shift-enter
+BackSpace = backspace; ctrl-h
+Delete = delete; ctrl-d
+PageUp = pgup
+PageDown = pgdn
+Home = home
+End = end
+Tab = tab
+Undo = ctrl-u
+Redo = alt-r
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+EditNew = ctrl-n
+SaveAs = f12; ctrl-f2
+Mark = f3
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin  = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave = ctrl-f
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail = alt-m
+ParagraphFormat = alt-p
+MatchBracket = alt-b
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark = alt-k
+BookmarkFlush = alt-o
+BookmarkNext = alt-j
+BookmarkPrev = alt-i
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
+SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap =
+a411 54
+[viewer]
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
+SelectCodepage = alt-e
+Shell = ctrl-o
+Ruler = alt-r
+
+[viewer:hex]
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+d414 37
+a450 37
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
+@
index 22051e004c4839300227ae3cbdfc15d48e33ff42..326bf81d08f9bfea38593115241d638f5a45e7fb 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.08.09.19.10.51;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.08.09.19.11.26;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,13 +33,13 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
 text
 @[editor]
-EditXStore = meta-w
+EditXStore = alt-w
 EditXPaste = ctrl-y
 EditXCut = ctrl-w
 
@@ -36,20 +47,20 @@ EditDeleteLine = ctrl-y
 EditDeleteToLineEnd = ctrl-k
 EditDeleteToLineBegin =
 
-EditLeft = left
-EditRight = right
-EditUp = up
-EditDown = down
+EditLeft = left; ctrl-b
+EditRight = right; ctrl-f
+EditUp = up; ctrl-p
+EditDown = down; ctrl-n
 EditEnter = enter
 EditReturn = shift-enter
 EditBackSpace = backspace
 EditDelete = delete
-EditPageUp = pgup
-EditPageDown = pgdn
-EditWordLeft = ctrl-left
-EditWordRight = ctrl-right
-EditHome = home
-EditEnd = end
+EditPageUp = pgup; alt-v
+EditPageDown = pgdn; ctrl-v
+EditWordLeft = ctrl-left; alt-b
+EditWordRight = ctrl-right; alt-f
+EditHome = home; ctrl-a
+EditEnd = end; ctrl-e
 EditTab = tab
 EditUndo = ctrl-u
 EditBeginningOfText = ctrl-home; alt-lt
@@ -65,13 +76,15 @@ EditParagraphDown =
 EditSave = f2
 EditLoad =
 EditSaveas = f12
-EditMark = f3
+EditMark = f3; ctrl-at
 EditCopy = f5
 EditMove = f6
 EditRemove = f8
 EditMarkAll =
 EditUnmark =
-EditFind = f7
+EditFind = f7; ctrl-s
+EditMarkLine =
+EditMarkWord =
 
 EditShiftBlockLeft =
 EditShiftBlockRight =
@@ -148,7 +161,7 @@ EditUtil =
 EditTypeLoadPython =
 EditFindFile =
 EditCtags =
-EditMatchBracket = alt-b
+EditMatchBracket =
 EditTerminal =
 EditTerminalApp =
 EditExtCmd = alt-u
@@ -178,6 +191,7 @@ EditDeleteMacro =
 EditToggleLineState = alt-n
 EditToggleTabTWS = alt-underline
 EditToggleSyntax = ctrl-s
+EditToggleShowMargin =
 
 EditFindDefinition = alt-enter
 EditLoadPrevFile = alt-minus
@@ -194,7 +208,7 @@ EditExecuteMacro = e
 [viewer]
 ViewHelp = f1
 ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
+ViewQuit = f3; f10; q; esc
 ViewToggleHexMode = f4
 ViewGoto = f5
 ViewSearch = f7; question; slash
@@ -205,12 +219,16 @@ ViewMoveToBol = ctrl-a
 ViewMoveToEol = ctrl-e
 ViewMoveLeft = h; left
 ViewMoveRight = l; right
-ViewMoveUp = k; y; insert; up
-ViewMoveDown = j; e; delete; down; enter
-ViewMovePgDn = f; space; pgdn
-ViewMovePgUp = b; pgup
+ViewMoveLeft10 = ctrl-left
+ViewMoveRight10 = ctrl-right
+ViewMoveUp = k; y; insert; up; ctrl-p
+ViewMoveDown = j; e; delete; down; enter; ctrl-n
+ViewMovePgDn = f; space; pgdn; ctrl-v
+ViewMovePgUp = b; pgup; alt-v; backspace
 ViewMoveHalfPgDn = d
 ViewMoveHalfPgUp = u
+ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 ViewGotoBookmark = m
 ViewNewBookmark = r
 ViewNextFile = ctrl-f
@@ -222,7 +240,7 @@ ViewToggleRuler = alt-r
 [viewer:hex]
 ViewHelp = f1
 ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
+ViewQuit = f3; f10; q; esc
 ViewToggleHexMode = f4
 ViewGoto = f5
 ViewHexEditSave = f6
@@ -236,6 +254,10 @@ ViewMoveLeft = b; left
 ViewMoveRight = f; right
 ViewMoveUp = k; y; up
 ViewMoveDown = j; delete; down
+ViewMovePgDn = pgdn; ctrl-v
+ViewMovePgUp = pgup; alt-v
+ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [main]
 CmdHelp = f1
@@ -243,6 +265,7 @@ CmdUserMenu = f2
 CmdView = f3
 CmdViewFile = f13
 CmdEdit = f4
+CmdEditForceInternal =
 CmdCopy = f5
 CmdRename = f6
 CmdMkdir = f7
@@ -259,8 +282,10 @@ CmdSingleDirsize = ctrl-space
 CmdSuspend = ctrl-z
 CmdSwapPanel = ctrl-u
 CmdHistory = alt-h
+CmdListing =
 CmdToggleListing = alt-t
 CmdToggleShowHidden = alt-dot
+CmdTogglePanelsSplit = alt-comma
 ShowCommandLine = ctrl-o
 CmdCopyCurrentPathname = alt-a
 CmdCopyOtherPathname = alt-shift-a
@@ -268,6 +293,7 @@ CmdFilteredView = alt-exclamation
 CmdSelect = kpplus
 CmdUnselect = kpminus
 CmdReverseSelection = kpasterisk
+CmdDialogList = alt-prime
 ExtMap1 = ctrl-x
 
 [main:xmap]
@@ -277,6 +303,7 @@ CmdCompareDirs = d
 CmdEditSymlink = ctrl-s
 CmdLink = l
 CmdSymlink = s
+CmdRelativeSymlink = v
 CmdInfo = i
 CmdQuickView = q
 CmdExternalPanelize = exclamation
@@ -286,10 +313,13 @@ CmdCopyCurrentPathname = p
 CmdCopyOtherPathname = ctrl-p
 CmdCopyCurrentTagged = t
 CmdCopyOtherTagged = ctrl-t
+CmdDiffView = ctrl-d
 
 [panel]
 PanelStartSearch = ctrl-s; alt-s
 PanelMarkFile = insert; ctrl-t
+PanelMarkFileUp = shift-up
+PanelMarkFileDown = shift-down
 PanelMoveDown = down; ctrl-n
 PanelMoveUp = up; ctrl-p
 PanelMoveLeft = left
@@ -307,8 +337,8 @@ PanelDeleteLocal = F18
 PanelReverseSelection = alt-asterisk
 PanelSelect = alt-plus
 PanelUnselect = alt-minus
-PanelCtrlNextPage = ctrl-pgdn
-PanelCtrlPrevPage = ctrl-pgup
+PanelGotoChildDir = ctrl-pgdn
+PanelGotoParentDir = ctrl-pgup
 PanelDirectoryHistoryList = alt-shift-h
 PanelDirectoryHistoryNext = alt-u
 PanelDirectoryHistoryPrev = alt-y
@@ -317,8 +347,8 @@ PanelGotoMiddleFile = alt-r
 PanelSyncOtherPanel = alt-i
 PanelGotoTopFile = alt-g
 PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home
-PanelMoveEnd = alt-gt; end
+PanelMoveHome = alt-lt; home; a1
+PanelMoveEnd = alt-gt; end; c1
 PanelSelectSortOrder=
 PanelToggleSortOrderPrev=
 PanelToggleSortOrderNext=
@@ -327,12 +357,11 @@ PanelSortOrderByName=
 PanelSortOrderByExt=
 PanelSortOrderBySize=
 PanelSortOrderByMTime=
-
-[panel:xmap]
+PanelSmartGotoParentDir=
 
 [input]
-InputBol = ctrl-a; alt-lt; home
-InputEol = ctrl-e; alt-gt; end
+InputBol = ctrl-a; alt-lt; home; a1
+InputEol = ctrl-e; alt-gt; end; c1
 InputMoveLeft = left; alt-left
 InputWordLeft = ctrl-left
 InputBackwardChar = ctrl-b
@@ -347,6 +376,7 @@ InputKillWord = alt-d
 InputBackwardKillWord = alt-backspace
 InputSetMark =
 InputKillRegion = ctrl-w
+InputXCut =
 InputXStore = alt-w
 InputXPaste =
 InputYank = ctrl-y
@@ -356,6 +386,22 @@ InputHistoryNext = alt-n; ctrl-up
 InputHistoryShow = alt-h
 InputComplete = alt-tab
 InputClearLine =
+InputLeftHighlight =
+InputRightHighlight =
+InputWordLeftHighlight =
+InputWordRightHighlight =
+InputBolHighlight =
+InputEolHighlight =
+
+[listbox]
+ListboxMoveUp = up; ctrl-p
+ListboxMoveDown = down; ctrl-n
+ListboxMoveHome = home; alt-lt; a1
+ListboxMoveEnd = end; alt-gt; c1
+ListboxMovePgUp = pgup; alt-v
+ListboxMovePgDn = pgdn; ctrl-v
+ListboxDeleteItem = delete; d
+ListboxDeleteAll = shift-delete; shift-d
 
 [tree]
 TreeHelp = f1
@@ -367,8 +413,8 @@ TreeMoveUp = up; ctrl-p
 TreeMoveDown = down; ctrl-n
 TreeMoveLeft = left
 TreeMoveRight = right
-TreeMoveHome = home; alt-lt
-TreeMoveEnd = end; alt-gt
+TreeMoveHome = home; alt-lt; a1
+TreeMoveEnd = end; alt-gt; c1
 TreeMovePgUp = pgup; alt-v
 TreeMovePgDn = pgdn; ctrl-v
 TreeOpen = enter
@@ -380,14 +426,157 @@ TreeRemove = f8; delete
 HelpHelp = f1
 HelpIndex = f2; c
 HelpBack = f3; left; l
-HelpQuit = f10; esc; ctrl-g
-HelpMoveUp = up
-HelpMoveDown = down
+HelpQuit = f10; esc
+HelpMoveUp = up; ctrl-p
+HelpMoveDown = down; ctrl-n
+HelpMovePgDn = f; space; pgdn; ctrl-v
+HelpMovePgUp = b; pgup; alt-v; backspace
+HelpMoveHalfPgDn = d
+HelpMoveHalfPgUp = u
+HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 HelpSelectLink = right; enter
 HelpNextLink = tab
 HelpPrevLink = alt-tab
 HelpNextNode = n
 HelpPrevNode = p
+
+[dialog]
+DialogOK = enter
+DialogCancel = f10; esc; ctrl-g
+DialogPrevItem = left; up
+DialogNextItem = right; down
+DialogHelp = f1
+DialogSuspend = ctrl-z
+DialogRefresh = ctrl-l
+CmdDialogList = alt-prime
+CmdDialogNext = alt-rbrace
+CmdDialogPrev = alt-lbrace
+
+
+[diffviewer]
+DiffDisplaySymbols = alt-s; s
+DiffDisplayNumbers = alt-n; l
+DiffFull = f
+DiffEqual = equal
+DiffSplitMore = gt
+DiffSplitLess = lt
+DiffSetTab2 = 2
+DiffSetTab3 = 3
+DiffSetTab4 = 4
+DiffSetTab8 = 8
+DiffSwapPanel = ctrl-u
+DiffRedo = ctrl-r
+DiffNextHunk = n; enter; space
+DiffPrevHunk = p; backspace
+DiffGoto = g; shift-g
+DiffSave = f2
+DiffEditCurrent = f4
+DiffEditOther = f14
+DiffMergeCurrentHunk = f5
+DiffSearch = f7
+DiffContinueSearch = f17
+DiffOptions = f9
+DiffBOF = ctrl-home
+DiffEOF = ctrl-end
+DiffDown = down
+DiffUp = up
+DiffQuickLeft = ctrl-left
+DiffQuickRight = ctrl-right
+DiffLeft = left
+DiffRight = right
+DiffPageDown = pgdn
+DiffPageUp = pgup
+DiffHome = home
+DiffEnd = end
+DiffHelp = f1
+DiffQuit = f10; q; shift-q; esc
+ShowCommandLine = ctrl-o
+SelectCodepage = alt-e
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 1
+a2 1
+EditXStore = meta-w
+d10 4
+a13 4
+EditLeft = left
+EditRight = right
+EditUp = up
+EditDown = down
+d18 6
+a23 6
+EditPageUp = pgup
+EditPageDown = pgdn
+EditWordLeft = ctrl-left
+EditWordRight = ctrl-right
+EditHome = home
+EditEnd = end
+d39 1
+a39 1
+EditMark = f3
+d45 3
+a47 1
+EditFind = f7
+d124 1
+a124 1
+EditMatchBracket = alt-b
+d154 1
+d171 1
+a171 1
+ViewQuit = f3; f10; q; esc; ctrl-g
+d182 6
+a187 4
+ViewMoveUp = k; y; insert; up
+ViewMoveDown = j; e; delete; down; enter
+ViewMovePgDn = f; space; pgdn
+ViewMovePgUp = b; pgup
+d190 2
+d203 1
+a203 1
+ViewQuit = f3; f10; q; esc; ctrl-g
+d217 4
+d228 1
+d245 1
+d248 1
+d256 1
+d266 1
+d276 1
+d281 2
+d300 2
+a301 2
+PanelCtrlNextPage = ctrl-pgdn
+PanelCtrlPrevPage = ctrl-pgup
+d310 2
+a311 2
+PanelMoveHome = alt-lt; home
+PanelMoveEnd = alt-gt; end
+d320 1
+a320 2
+
+[panel:xmap]
+d323 2
+a324 2
+InputBol = ctrl-a; alt-lt; home
+InputEol = ctrl-e; alt-gt; end
+d339 1
+d349 16
+d376 2
+a377 2
+TreeMoveHome = home; alt-lt
+TreeMoveEnd = end; alt-gt
+d389 9
+a397 3
+HelpQuit = f10; esc; ctrl-g
+HelpMoveUp = up
+HelpMoveDown = down
+d403 53
 @
 
 
@@ -567,3 +756,446 @@ DiffQuit = f10; q; shift-q; esc
 ShowCommandLine = ctrl-o
 SelectCodepage = alt-e
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@d1 221
+d223 35
+a257 51
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+Options =
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
+d260 17
+a276 20
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
+d279 42
+a320 59
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+MarkLeft =
+MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+Panelize =
+CdParentSmart =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
+
+[dialog]
+Ok = enter
+Cancel = f10; esc
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
+d323 32
+a354 28
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace
+Delete = delete
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft =
+MarkRight =
+MarkToWordBegin =
+MarkToWordEnd =
+MarkToHome =
+MarkToEnd =
+d357 8
+a364 8
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
+d367 17
+a383 17
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
+d386 17
+a402 17
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc; ctrl-g
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
+d404 11
+a414 121
+[editor]
+Store = alt-w
+Paste = ctrl-y
+Cut = ctrl-w
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left; ctrl-b
+Right = right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Enter = enter
+Return = shift-enter
+BackSpace = backspace
+Delete = delete
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Home = home; ctrl-a
+End = end; ctrl-e
+Tab = tab
+Undo = ctrl-u
+Redo =
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+SaveAs = f12; ctrl-f2
+Mark = f3; ctrl-at
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7; ctrl-s
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave =
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail =
+ParagraphFormat = alt-p
+MatchBracket =
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark =
+BookmarkFlush =
+BookmarkNext =
+BookmarkPrev =
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
+SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap = ctrl-x
+a415 57
+[editor:xmap]
+EditNew = k
+
+[viewer]
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+MagicMode = f8
+NroffMode = f9
+SearchContinue = ctrl-r; ctrl-s; f17; n
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick= ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
+SelectCodepage = alt-e
+Shell = ctrl-o
+Ruler = alt-r
+
+[viewer:hex]
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+d418 37
+a454 37
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
+@
diff --git a/config-archive/etc/mc/mc.menu,v b/config-archive/etc/mc/mc.menu,v
new file mode 100644 (file)
index 0000000..5ef3547
--- /dev/null
@@ -0,0 +1,424 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.12.04;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@shell_patterns=0
++ ! t t
+@@       Do something on the current file
+       CMD=%{Enter command}
+       $CMD %f
+
++ t t
+@@       Do something on the tagged files
+       set %t; CMD=%{Enter command}
+       while [ -n "$1" ]; do
+         $CMD "$1"
+         shift
+       done
+       
+
+0       Edit a bug report and send it to root
+       I=`mktemp "${MC_TMPDIR:-/tmp}/mail.XXXXXX"` || exit 1
+       ${EDITOR-vi} "$I"
+       test -r $I && mail root < $I
+       rm -f "$I"
+
+=+ f \.1$ | f \.3$ | f \.4$ | f \.5$ | f \.6$ | f \.7$ | f \.8$ | f \.man$ & t r
+1       Display the file with roff -man
+       nroff -man %f | less
+
+2       Call the info hypertext browser
+        info
+
+= t d
+3       Compress the current subdirectory (tar.gz)
+       Pwd=`basename %d /`
+       echo -n "Name of the compressed file (without extension) [$Pwd]: "
+       read tar
+        if [ "$tar"x = x ]; then tar="$Pwd"; fi
+       cd .. && \
+       tar cf - "$Pwd" | gzip -f9 > "$tar.tar.gz" && \
+       echo "../$tar.tar.gz created."
+
+4       Compress the current subdirectory (tar.bz2)
+       Pwd=`basename %d /`
+       echo -n "Name of the compressed file (without extension) [$Pwd]: "
+       read tar
+        if [ "$tar"x = x ]; then tar="$Pwd"; fi
+       cd .. && \
+       tar cf - "$Pwd" | bzip2 -f > "$tar.tar.bz2" && \
+       echo "../$tar.tar.bz2 created."
+
+5       Compress the current subdirectory (tar.p7)
+       Pwd=`basename %d /`
+       echo -n "Name of the compressed file (without extension) [$Pwd]: "
+       read tar
+        if [ "$tar"x = x ]; then tar="$Pwd"; fi
+       cd .. && \
+       tar cf - "$Pwd" | 7za a -si "$tar.tar.7z" && \
+       echo "../$tar.tar.7z created."
+
+6       Compress the current subdirectory (tar.lzma)
+       Pwd=`basename %d /`
+       echo -n "Name of the compressed file (without extension) [$Pwd]: "
+       read tar
+        if [ "$tar"x = x ]; then tar="$Pwd"; fi
+       cd .. && \
+       tar cf - "$Pwd" | lzma -f > "$tar.tar.lzma" && \
+       echo "../$tar.tar.lzma created."
+
+7       Compress the current subdirectory (tar.lz)
+       Pwd=`basename %d /`
+       echo -n "Name of the compressed file (without extension) [$Pwd]: "
+       read tar
+        if [ "$tar"x = x ]; then tar="$Pwd"; fi
+       cd .. && \
+       tar cf - "$Pwd" | lzip -f > "$tar.tar.lz" && \
+       echo "../$tar.tar.lz created."
+
+8       Compress the current subdirectory (tar.xz)
+       Pwd=`basename %d /`
+       echo -n "Name of the compressed file (without extension) [$Pwd]: "
+       read tar
+        if [ "$tar"x = x ]; then tar="$Pwd"; fi
+       cd .. && \
+       tar cf - "$Pwd" | xz -f > "$tar.tar.xz" && \
+       echo "../$tar.tar.xz created."
+
+= f \.c$ & t r
++ f \.c$ & t r & ! t t
+        Compile and link current .c file
+        make `basename %f .c` 2>/dev/null || cc -O -o `basename %f .c` %f
+
++ t r & ! t t
+a       Append file to opposite
+       cat %f >> %D/%f
+
++ t t
+A       Append files to opposite files
+       set %t
+       while [ -n "$1" ]; do
+         cat "$1" >> "%D/$1"
+         shift
+       done
+
++ t r & ! t t
+d       Delete file if a copy exists in the other directory.
+       if [ "%d" = "%D" ]; then
+         echo "The two directories must be different."
+         exit 1
+       fi
+       if [ -f %D/%f ]; then        # if two of them, then
+          if cmp -s %D/%f %f; then
+            rm %f && echo "%f: DELETED."
+          else
+            echo "%f and %D/%f differ: NOT deleted."
+            echo -n "Press RETURN "
+            read key
+          fi
+       else
+         echo "%f: No copy in %D/%f: NOT deleted."
+        fi
+
++ t t
+D       Delete tagged files if a copy exists in the other directory.
+       if [ "%d" = "%D" ]; then
+         echo "The two directores must be different."
+         exit 1
+       fi
+        for i in %t
+        do
+          if [ -f "%D/$i" ]; then
+            SUM1="`sum $i`"
+            SUM2="`sum %D/$i`"
+            if [ "$SUM1" = "$SUM2" ]; then
+             rm "$i" && echo "${i}: DELETED."
+           else
+             echo "$i and %D/$i differ: NOT deleted."
+           fi
+         else
+           echo "%f has no copy in %D/%f: NOT deleted."
+          fi
+        done
+
+m       View manual page
+       MAN=%{Enter manual name}
+       %view man -P cat $MAN
+
+= f \.gz$ & t r
++ ! t t
+n       Inspect gzip'ed newsbatch file
+        dd if=%f bs=1 skip=12|zcat|${PAGER-more}
+        # assuming the cunbatch header is 12 bytes long.
+
+= t r &
++ ! t t
+h       Strip headers from current newsarticle
+       CHECK=`awk '{print $1 ; exit}' %f` 2>/dev/null
+       case "$CHECK" in
+         Newsgroups:|Path:)
+             I=`mktemp "${MC_TMPDIR:-/tmp}/news.XXXXXX"` || exit 1
+             cp %f "$I" && sed '/^'"$CHECK"' /,/^$/d' "$I" > %f
+              [ "$?" = "0" ] && rm "$I"
+             echo "%f: header removed."
+               ;;
+         *)
+             echo "%f is not a news article."
+               ;;
+       esac
+
++ t t
+H       Strip headers from the marked newsarticles
+       set %t
+       while [ -n "$1" ]; do
+         CHECK=`awk '{print $1 ; exit}' $1` 2>/dev/null
+         WFILE=`mktemp "${MC_TMPDIR:-/tmp}/news.XXXXXX"` || exit 1
+         case "$CHECK" in
+           Newsgroups:|Path:)
+             cp "$1" "$WFILE" && sed '/^'"$CHECK"' /,/^$/d' "$WFILE" > "$1"
+              if [ "$?" = "0" ]; then
+               rm "$WFILE"; echo "$1 header removed. OK."
+             else
+               echo "Oops! Please check $1 against $WFILE."
+             fi
+               ;;
+           *)
+             echo "$1 skipped: Not a news article."
+               ;;
+         esac
+         shift
+       done
+
+= t r
++ ! t t
+r       Copy file to remote host
+       echo -n "To which host?: "
+        read Host
+        echo -n "To which directory on $Host?: "
+        read Dir
+        rcp -p %f "${Host}:$Dir"
+
++ t t
+R       Copy files to remote host (no error checking)
+       echo -n "Copy files to which host?: "
+        read Host
+        echo -n "To which directory on $Host? :"
+        read Dir
+        rcp -pr %u "${Host}:$Dir"
+
+= f \.tex$ & t r
++ f \.tex$ & t r & ! t t
+t       Run latex on file and show it with xdvi
+        latex %f && xdvi `basename %f .tex`.dvi
+
+=+ f ^part | f ^Part | f uue & t r
++ t t
+U       Uudecode marked news articles (needs work)
+       set %t
+        (
+       while [ -n "$1" ]; do # strip headers
+         FIRST=`awk '{print $1 ; exit}' "$1"`
+         cat "$1" | sed '/^'"$FIRST"' /,/^$/d'; shift
+       done
+       ) |sed '/^$/d' |sed -n '/^begin 6/,/^end$/p' | uudecode
+       if [ "$?" != "0" ]; then
+         echo "Cannot decode %t."
+       fi
+       echo "Please test the output file before deleting anything."
+
+=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lzma$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.Z$ | f \.tar\.bz2$ & t r
+x       Extract the contents of a compressed tar file
+       unset PRG
+       case %f in
+           *.tar.bz2)
+               PRG="bunzip2 -c"
+               ;;
+           *.tar.gz|*.tar.z|*.tgz|*.tpz|*.tar.Z)
+               PRG="gzip -dc"
+               ;;
+           *.tar.lzma)
+               PRG="lzma -dc"
+               ;;
+           *.tar.lz)
+               PRG="lzip -dc"
+               ;;
+           *.tar.xz)
+               PRG="xz -dc"
+               ;;
+           *.tar.7z)
+               PRG="7za e -so"
+               ;;
+           *)
+               exit 1
+               ;;
+       esac
+       $PRG %f | tar xvf -
+
+= t r
++ ! t t
+y       Gzip or gunzip current file
+        unset DECOMP
+       case %f in
+           *.gz) DECOMP=-d;;
+           *.[zZ]) DECOMP=-d;;
+       esac
+        gzip $DECOMP -v %f
+
++ t t
+Y       Gzip or gunzip tagged files
+        for i in %t
+        do
+          unset DECOMP
+         case "$i" in
+           *.gz) DECOMP=-d;;
+           *.[zZ]) DECOMP=-d;;
+         esac
+          gzip $DECOMP -v "$i"
+        done
+
++ ! t t
+b       Bzip2 or bunzip2 current file
+        unset DECOMP
+       case %f in
+           *.bz2) DECOMP=-d;;
+       esac
+        bzip2 $DECOMP -v %f
+
++ t t
+B       Bzip2 or bunzip2 tagged files
+        for i in %t
+        do
+          unset DECOMP
+         case "$i" in
+           *.bz2) DECOMP=-d;;
+         esac
+          bzip2 $DECOMP -v "$i"
+        done
+
++ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t
+z       Extract compressed tar file to subdirectory
+       unset D
+       set gzip -cd
+       case %f in
+         *.tar.gz) D="`basename %f .tar.gz`";;
+         *.tgz)    D="`basename %f .tgz`";;
+         *.tpz)    D="`basename %f .tpz`";;
+         *.tar.Z)  D="`basename %f .tar.Z`";;
+         *.tar.z)  D="`basename %f .tar.z`";;
+         *.tar.bz2) D="`basename %f .tar.bz2`"; set bunzip2 -c ;;
+         *.tar.F) D="`basename %f .tar.F`"; set freeze -dc;
+       esac
+       mkdir "$D"; cd "$D" && ("$1" "$2" ../%f | tar xvf -)
+
++ t t
+Z       Extract compressed tar files to subdirectories
+       for i in %t
+        do
+         set gzip -dc
+          unset D
+         case "$i" in
+           *.tar.gz)  D="`basename $i .tar.gz`";;
+           *.tgz)     D="`basename $i .tgz`";;
+           *.tpz)     D="`basename $i .tpz`";;
+           *.tar.Z)   D="`basename $i .tar.Z`";;
+           *.tar.z)   D="`basename $i .tar.z`";;
+           *.tar.F)   D="`basename $i .tar.F`"; set freeze -dc;;
+           *.tar.bz2) D="`basename $i .tar.bz2`"; set bunzip2 -c;;
+          esac
+         mkdir "$D"; (cd "$D" && "$1" "$2" "../$i" | tar xvf -)
+        done
+
++ f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t
+c       Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2
+       unset D
+       unset EXT
+       case %f in
+           *.tgz)      EXT=tgz;;
+           *.tpz)      EXT=tpz;;
+           *.Z)        EXT=Z;;
+           *.z)        EXT=z;;
+           *.gz)       EXT=gz;;
+           *.bz2)      EXT=bz2;;
+       esac
+        case $EXT in
+         tgz|tpz)      D="`basename %f .$EXT`.tar";;
+         gz|Z|z)       D="`basename %f .$EXT`";;
+         bz2)          D="`basename %f .bz2`";;
+        esac
+        if [ "$EXT" = "bz2" ]; then
+           bunzip2 -v %f ; gzip -f9 -v "$D"
+       else
+           gunzip -v %f ; bzip2 -v "$D"
+       fi
+
++ t t
+C       Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2
+       set %t
+       while [ -n "$1" ]
+        do
+         unset D
+         unset EXT
+         case "$1" in
+           *.tgz)      EXT=tgz;;
+           *.tpz)      EXT=tpz;;
+           *.Z)        EXT=Z;;
+           *.z)        EXT=z;;
+           *.gz)       EXT=gz;;
+           *.bz2)      EXT=bz2;;
+         esac
+         case $EXT in
+             tgz)    D="`basename $1 .tgz`.tar";;
+              tpz)    D="`basename $1 .tpz`.tar";;
+             gz|Z|z) D="`basename $1 .$EXT`";;
+             bz2)    D="`basename $1 .bz2`";;
+         esac
+         if [ "$EXT" = "bz2" ]; then
+           bunzip2 -v "$1"
+           gzip -f9 -v "$D"
+         else
+           gunzip -v "$1"
+           bzip2 -v "$D"
+         fi
+         shift
+        done
+
++ x /usr/bin/open | x /usr/local/bin/open & x /bin/sh
+o       Open next a free console
+        open -s -- sh
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d86 1
+a86 1
+с       Compile and link current .c file
+@
index af746112ec86ee62d024bc426312bd18210468ec..0c09078213adb5736537c479a8e554c2ecfa4c14 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2010.12.01.06.12.02;    author root;    state Exp;
 branches;
@@ -16,13 +22,13 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
 text
 @# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /etc/mysql/my.cnf,v 1.4 2010/11/30 08:26:18 root Exp $
+# $Header: /etc/mysql/.rcs/my.cnf,v 1.5 2010/11/30 08:33:13 root Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -182,3 +188,14 @@ write_buffer                               = 4M
 [mysqlhotcopy]
 interactive-timeout
 @
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 1
+a2 1
+# $Header: /etc/mysql/my.cnf,v 1.4 2010/11/30 08:26:18 root Exp $
+@
index 458e10d684adae781593f82a7008bfb57210637a..50a3c2e4f8dff51a710f62005d29f2154787a770 100644 (file)
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -54,7 +54,7 @@ datadir                                       = /var/lib/mysql
 skip-external-locking
 key_buffer                                     = 16M
 max_allowed_packet                     = 1M
-table_cache                            = 64
+table_open_cache                       = 64
 sort_buffer_size                       = 512K
 net_buffer_length                      = 8K
 read_buffer_size                       = 256K
index 6b6386f9368653f3e3fba2d4cfe40d933c5d7ae4..3a9b0b949aced19bc1a1e7b8bcda2bbb13b972e3 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2010.11.19.09.21.53;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2010.11.19.09.23.41;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,12 +33,12 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
 text
-@auth          required        pam_tally.so onerr=succeed
+@auth          required        pam_tally2.so onerr=succeed
 auth           required        pam_shells.so 
 auth           required        pam_nologin.so 
 auth           include         system-auth
@@ -35,10 +46,11 @@ auth                include         system-auth
 account                required        pam_access.so 
 account                required        pam_nologin.so 
 account                include         system-auth
-account                required        pam_tally.so onerr=succeed 
+account                required        pam_tally2.so onerr=succeed 
  
 password       include         system-auth
  
+session         optional        pam_loginuid.so
 session                required        pam_env.so 
 session                optional        pam_lastlog.so 
 session                include         system-auth
@@ -48,6 +60,21 @@ session              optional        pam_mail.so
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d1 1
+a1 1
+auth           required        pam_tally.so onerr=succeed
+d9 1
+a9 1
+account                required        pam_tally.so onerr=succeed 
+d13 1
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -62,3 +89,17 @@ account              required        pam_tally2.so onerr=succeed
 a12 1
 session         optional        pam_loginuid.so
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a4 1
+auth           optional        pam_gnome_keyring.so
+a11 1
+password       optional        pam_gnome_keyring.so
+a16 1
+session                optional        pam_gnome_keyring.so auto_start
+@
diff --git a/config-archive/etc/php/apache2-php5.3/ext/apc.ini,v b/config-archive/etc/php/apache2-php5.3/ext/apc.ini,v
new file mode 100644 (file)
index 0000000..1c756b0
--- /dev/null
@@ -0,0 +1,66 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+expand @o@;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.13.50;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@extension=apc.so
+apc.enabled="1"
+apc.shm_segments="1"
+apc.shm_size="30M"
+apc.num_files_hint="1024"
+apc.ttl="7200"
+apc.user_ttl="7200"
+apc.gc_ttl="3600"
+apc.cache_by_default="1"
+;apc.filters=""
+apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
+apc.slam_defense="0"
+apc.file_update_protection="2"
+apc.enable_cli="0"
+apc.max_file_size="1M"
+apc.stat="1"
+apc.write_lock="1"
+apc.report_autofilter="0"
+apc.include_once_override="0"
+apc.rfc1867="0"
+apc.rfc1867_prefix="upload_"
+apc.rfc1867_name="APC_UPLOAD_PROGRESS"
+apc.rfc1867_freq="0"
+apc.localcache="0"
+apc.localcache.size="512"
+apc.coredump_unmap="0"
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 25
+@
index 3a2461f3f60c4b76e3db63683865bdea9a63777e..6b24cda8389c1736e6b22575c60340595d81d6c0 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.05.03.05.05.33;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.05.03.05.12.03;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.31.09;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -652,13 +663,13 @@ html_errors = On
 ; this setting blank.
 ; http://php.net/error-prepend-string
 ; Example:
-;error_prepend_string = "<font color=#ff0000>"
+;error_prepend_string = "<span style='color: #ff0000'>"
 
 ; String to output after an error message. PHP's default behavior is to leave
 ; this setting blank.
 ; http://php.net/error-append-string
 ; Example:
-;error_append_string = "</font>"
+;error_append_string = "</span>"
 
 ; Log errors to specified file. PHP's default behavior is to leave this value
 ; empty.
@@ -1005,7 +1016,11 @@ default_socket_timeout = 60
 ;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
+
+; The MIBS data available in the PHP distribution must be installed. 
+; See http://www.php.net/manual/en/snmp.installation.php 
 ;extension=php_snmp.dll
+
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
@@ -1924,6 +1939,22 @@ ldap.max_links = -1
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d626 1
+a626 1
+;error_prepend_string = "<font color=#ff0000>"
+d632 1
+a632 1
+;error_append_string = "</font>"
+d979 3
+d983 1
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -1967,3 +1998,65 @@ d1489 1
 a1489 1
 session.name = PHPSESSID
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a421 4
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+d431 1
+a431 1
+expose_php = On
+a455 3
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+a639 5
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+d890 1
+a890 1
+allow_url_fopen = On
+d962 1
+a962 1
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+d972 1
+a1250 8
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+d1291 1
+a1291 1
+; Enable / Disable collection of general statistics by mysqlnd which can be
+d1296 1
+a1296 1
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+d1363 1
+a1363 1
+[PostgreSQL]
+d1595 1
+d1699 1
+a1699 1
+; If empty or not set the client charset from freetds.conf is used
+a1890 6
+
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+@
diff --git a/config-archive/etc/php/cgi-php5.3/ext/apc.ini,v b/config-archive/etc/php/cgi-php5.3/ext/apc.ini,v
new file mode 100644 (file)
index 0000000..f3fe72c
--- /dev/null
@@ -0,0 +1,66 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+expand @o@;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.13.56;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@extension=apc.so
+apc.enabled="1"
+apc.shm_segments="1"
+apc.shm_size="30M"
+apc.num_files_hint="1024"
+apc.ttl="7200"
+apc.user_ttl="7200"
+apc.gc_ttl="3600"
+apc.cache_by_default="1"
+;apc.filters=""
+;apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
+apc.slam_defense="0"
+apc.file_update_protection="2"
+apc.enable_cli="0"
+apc.max_file_size="1M"
+apc.stat="1"
+apc.write_lock="1"
+apc.report_autofilter="0"
+apc.include_once_override="0"
+apc.rfc1867="0"
+apc.rfc1867_prefix="upload_"
+apc.rfc1867_name="APC_UPLOAD_PROGRESS"
+apc.rfc1867_freq="0"
+apc.localcache="0"
+apc.localcache.size="512"
+apc.coredump_unmap="0"
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 25
+@
index e07193f4a0ee7de609a6869e495ce1cfd69d7efc..a25119bd2000e3d72ec4e77a33bd4031a89b3710 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.05.03.05.05.33;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.05.03.05.12.15;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -346,7 +357,7 @@ unserialize_callback_func =
 ; When floats & doubles are serialized store serialize_precision significant
 ; digits after the floating point. The default value ensures that when floats
 ; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
+serialize_precision = 17
 
 ; This directive allows you to enable and disable warnings which PHP will issue
 ; if you pass a value by reference at function call time. Passing values by
@@ -650,13 +661,13 @@ html_errors = On
 ; this setting blank.
 ; http://php.net/error-prepend-string
 ; Example:
-;error_prepend_string = "<font color=#ff0000>"
+;error_prepend_string = "<span style='color: #ff0000'>"
 
 ; String to output after an error message. PHP's default behavior is to leave
 ; this setting blank.
 ; http://php.net/error-append-string
 ; Example:
-;error_append_string = "</font>"
+;error_append_string = "</span>"
 
 ; Log errors to specified file. PHP's default behavior is to leave this value
 ; empty.
@@ -1001,7 +1012,11 @@ default_socket_timeout = 60
 ;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
+
+; The MIBS data available in the PHP distribution must be installed. 
+; See http://www.php.net/manual/en/snmp.installation.php 
 ;extension=php_snmp.dll
+
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
@@ -1920,6 +1935,25 @@ ldap.max_links = -1
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d320 1
+a320 1
+serialize_precision = 100
+d624 1
+a624 1
+;error_prepend_string = "<font color=#ff0000>"
+d630 1
+a630 1
+;error_append_string = "</font>"
+d975 3
+d979 1
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -1941,3 +1975,65 @@ a974 3
 a975 1
 
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a421 4
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+d431 1
+a431 1
+expose_php = On
+a455 3
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+a639 5
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+d890 1
+a890 1
+allow_url_fopen = On
+d962 1
+a962 1
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+d972 1
+a1250 8
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+d1291 1
+a1291 1
+; Enable / Disable collection of general statistics by mysqlnd which can be
+d1296 1
+a1296 1
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+d1363 1
+a1363 1
+[PostgreSQL]
+d1595 1
+d1699 1
+a1699 1
+; If empty or not set the client charset from freetds.conf is used
+a1890 6
+
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+@
diff --git a/config-archive/etc/php/cli-php5.3/ext/apc.ini,v b/config-archive/etc/php/cli-php5.3/ext/apc.ini,v
new file mode 100644 (file)
index 0000000..f3fe72c
--- /dev/null
@@ -0,0 +1,66 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+expand @o@;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.13.56;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@extension=apc.so
+apc.enabled="1"
+apc.shm_segments="1"
+apc.shm_size="30M"
+apc.num_files_hint="1024"
+apc.ttl="7200"
+apc.user_ttl="7200"
+apc.gc_ttl="3600"
+apc.cache_by_default="1"
+;apc.filters=""
+;apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
+apc.slam_defense="0"
+apc.file_update_protection="2"
+apc.enable_cli="0"
+apc.max_file_size="1M"
+apc.stat="1"
+apc.write_lock="1"
+apc.report_autofilter="0"
+apc.include_once_override="0"
+apc.rfc1867="0"
+apc.rfc1867_prefix="upload_"
+apc.rfc1867_name="APC_UPLOAD_PROGRESS"
+apc.rfc1867_freq="0"
+apc.localcache="0"
+apc.localcache.size="512"
+apc.coredump_unmap="0"
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 25
+@
index 2c926aee252ddbce88a76a4a5c927557ebe1febb..1305d6da49972696a44e43b87f5581ee95a7f961 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.05.03.05.05.33;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.05.03.05.13.14;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.32.02;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -652,13 +663,13 @@ html_errors = On
 ; this setting blank.
 ; http://php.net/error-prepend-string
 ; Example:
-;error_prepend_string = "<font color=#ff0000>"
+;error_prepend_string = "<span style='color: #ff0000'>"
 
 ; String to output after an error message. PHP's default behavior is to leave
 ; this setting blank.
 ; http://php.net/error-append-string
 ; Example:
-;error_append_string = "</font>"
+;error_append_string = "</span>"
 
 ; Log errors to specified file. PHP's default behavior is to leave this value
 ; empty.
@@ -1004,7 +1015,11 @@ default_socket_timeout = 60
 ;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
+
+; The MIBS data available in the PHP distribution must be installed. 
+; See http://www.php.net/manual/en/snmp.installation.php 
 ;extension=php_snmp.dll
+
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
@@ -1923,6 +1938,22 @@ ldap.max_links = -1
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d626 1
+a626 1
+;error_prepend_string = "<font color=#ff0000>"
+d632 1
+a632 1
+;error_append_string = "</font>"
+d978 3
+d982 1
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -1978,3 +2009,65 @@ d1488 1
 a1488 1
 session.name = PHPSESSID
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a421 4
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+d431 1
+a431 1
+expose_php = On
+a455 3
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+a639 5
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+d890 1
+a890 1
+allow_url_fopen = On
+d962 1
+a962 1
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+d972 1
+a1250 8
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+d1291 1
+a1291 1
+; Enable / Disable collection of general statistics by mysqlnd which can be
+d1296 1
+a1296 1
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+d1363 1
+a1363 1
+[PostgreSQL]
+d1595 1
+d1699 1
+a1699 1
+; If empty or not set the client charset from freetds.conf is used
+a1890 6
+
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+@
index ba680c6a9bc2a32f41339565129cfad298a5f372..e930a53ee468481c70f6297b7b69f8d12704d7ec 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.05.03.05.05.33;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.05.03.05.13.18;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -346,7 +357,7 @@ unserialize_callback_func =
 ; When floats & doubles are serialized store serialize_precision significant
 ; digits after the floating point. The default value ensures that when floats
 ; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
+serialize_precision = 17
 
 ; This directive allows you to enable and disable warnings which PHP will issue
 ; if you pass a value by reference at function call time. Passing values by
@@ -650,13 +661,13 @@ html_errors = On
 ; this setting blank.
 ; http://php.net/error-prepend-string
 ; Example:
-;error_prepend_string = "<font color=#ff0000>"
+;error_prepend_string = "<span style='color: #ff0000'>"
 
 ; String to output after an error message. PHP's default behavior is to leave
 ; this setting blank.
 ; http://php.net/error-append-string
 ; Example:
-;error_append_string = "</font>"
+;error_append_string = "</span>"
 
 ; Log errors to specified file. PHP's default behavior is to leave this value
 ; empty.
@@ -1001,7 +1012,11 @@ default_socket_timeout = 60
 ;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
+
+; The MIBS data available in the PHP distribution must be installed. 
+; See http://www.php.net/manual/en/snmp.installation.php 
 ;extension=php_snmp.dll
+
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
@@ -1920,6 +1935,25 @@ ldap.max_links = -1
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d320 1
+a320 1
+serialize_precision = 100
+d624 1
+a624 1
+;error_prepend_string = "<font color=#ff0000>"
+d630 1
+a630 1
+;error_append_string = "</font>"
+d975 3
+d979 1
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -1941,3 +1975,65 @@ a974 3
 a975 1
 
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a421 4
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+d431 1
+a431 1
+expose_php = On
+a455 3
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+a639 5
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+d890 1
+a890 1
+allow_url_fopen = On
+d962 1
+a962 1
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+d972 1
+a1250 8
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+d1291 1
+a1291 1
+; Enable / Disable collection of general statistics by mysqlnd which can be
+d1296 1
+a1296 1
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+d1363 1
+a1363 1
+[PostgreSQL]
+d1595 1
+d1699 1
+a1699 1
+; If empty or not set the client charset from freetds.conf is used
+a1890 6
+
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+@
diff --git a/config-archive/etc/php/fpm-php5.3/ext/apc.ini,v b/config-archive/etc/php/fpm-php5.3/ext/apc.ini,v
new file mode 100644 (file)
index 0000000..c79ebf5
--- /dev/null
@@ -0,0 +1,66 @@
+head   1.1;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+expand @o@;
+
+
+1.1
+date   2012.02.16.08.11.06;    author root;    state Exp;
+branches
+       1.1.1.1;
+next   ;
+
+1.1.1.1
+date   2012.02.16.08.13.57;    author root;    state Exp;
+branches;
+next   ;
+
+
+desc
+@Archived config file.
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@extension=apc.so
+apc.enabled="1"
+apc.shm_segments="1"
+apc.shm_size="30M"
+apc.num_files_hint="1024"
+apc.ttl="7200"
+apc.user_ttl="7200"
+apc.gc_ttl="3600"
+apc.cache_by_default="1"
+;apc.filters=""
+;apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
+apc.slam_defense="0"
+apc.file_update_protection="2"
+apc.enable_cli="0"
+apc.max_file_size="1M"
+apc.stat="1"
+apc.write_lock="1"
+apc.report_autofilter="0"
+apc.include_once_override="0"
+apc.rfc1867="0"
+apc.rfc1867_prefix="upload_"
+apc.rfc1867_name="APC_UPLOAD_PROGRESS"
+apc.rfc1867_freq="0"
+apc.localcache="0"
+apc.localcache.size="512"
+apc.coredump_unmap="0"
+@
+
+
+1.1.1.1
+log
+@dispatch-conf update.
+@
+text
+@d2 25
+@
index d2ed825a76d48d85900fd8bd5297034723fa39d2..e788c332d0e7839c975beb3fd6873d4616a31aa7 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2011.05.03.05.05.33;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2011.05.03.05.13.22;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -346,7 +357,7 @@ unserialize_callback_func =
 ; When floats & doubles are serialized store serialize_precision significant
 ; digits after the floating point. The default value ensures that when floats
 ; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
+serialize_precision = 17
 
 ; This directive allows you to enable and disable warnings which PHP will issue
 ; if you pass a value by reference at function call time. Passing values by
@@ -650,13 +661,13 @@ html_errors = On
 ; this setting blank.
 ; http://php.net/error-prepend-string
 ; Example:
-;error_prepend_string = "<font color=#ff0000>"
+;error_prepend_string = "<span style='color: #ff0000'>"
 
 ; String to output after an error message. PHP's default behavior is to leave
 ; this setting blank.
 ; http://php.net/error-append-string
 ; Example:
-;error_append_string = "</font>"
+;error_append_string = "</span>"
 
 ; Log errors to specified file. PHP's default behavior is to leave this value
 ; empty.
@@ -1001,7 +1012,11 @@ default_socket_timeout = 60
 ;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
+
+; The MIBS data available in the PHP distribution must be installed. 
+; See http://www.php.net/manual/en/snmp.installation.php 
 ;extension=php_snmp.dll
+
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
@@ -1920,6 +1935,25 @@ ldap.max_links = -1
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d320 1
+a320 1
+serialize_precision = 100
+d624 1
+a624 1
+;error_prepend_string = "<font color=#ff0000>"
+d630 1
+a630 1
+;error_append_string = "</font>"
+d975 3
+d979 1
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -1941,3 +1975,65 @@ a974 3
 a975 1
 
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a421 4
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+d431 1
+a431 1
+expose_php = On
+a455 3
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+a639 5
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+d890 1
+a890 1
+allow_url_fopen = On
+d962 1
+a962 1
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+d972 1
+a1250 8
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+d1291 1
+a1291 1
+; Enable / Disable collection of general statistics by mysqlnd which can be
+d1296 1
+a1296 1
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+d1363 1
+a1363 1
+[PostgreSQL]
+d1595 1
+d1699 1
+a1699 1
+; If empty or not set the client charset from freetds.conf is used
+a1890 6
+
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+@
index c8b28fd34baf7141f760c9733c5aa762d81eefea..6dc96eaf1b297b3d39aae211e3e77ca9a53c74cb 100644 (file)
@@ -1,4 +1,4 @@
-head   1.4;
+head   1.5;
 access;
 symbols;
 locks; strict;
@@ -6,6 +6,11 @@ comment        @# @;
 expand @o@;
 
 
+1.5
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
+next   1.4;
+
 1.4
 date   2011.12.08.22.41.52;    author root;    state Exp;
 branches;
@@ -45,6 +50,11 @@ next 1.1.1.4;
 1.1.1.4
 date   2011.12.08.22.41.52;    author root;    state Exp;
 branches;
+next   1.1.1.5;
+
+1.1.1.5
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -53,7 +63,7 @@ desc
 @
 
 
-1.4
+1.5
 log
 @dispatch-conf update.
 @
@@ -107,6 +117,10 @@ rc_shell=/sbin/sulogin
 # logging can take place and as such cannot log the sysinit runlevel.
 #rc_logger="YES"
 
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
 # By default we filter the environment for our running scripts. To allow other
 # variables through, add them here. Use a * to allow all variables through.
 #rc_env_allow="VAR1 VAR2"
@@ -203,6 +217,15 @@ rc_tty_number=12
 @
 
 
+1.4
+log
+@dispatch-conf update.
+@
+text
+@d50 4
+@
+
+
 1.3
 log
 @dispatch-conf update.
@@ -469,3 +492,16 @@ text
 #rc_log_path="/var/log/rc.log"
 
 @
+
+
+1.1.1.5
+log
+@dispatch-conf update.
+@
+text
+@d3 9
+d14 2
+a15 1
+# this feature.
+d146 1
+@
index b4ad1f9e1bdc9bbaec715ee5b05f83e3b2209da2..04f075b6f28eb1354825bf226324b73133bf124f 100644 (file)
@@ -1,10 +1,16 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
 comment        @# @;
+expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2010.12.07.06.31.14;    author root;    state Exp;
 branches
@@ -14,6 +20,11 @@ next ;
 1.1.1.1
 date   2010.12.07.06.31.29;    author root;    state Exp;
 branches;
+next   1.1.1.2;
+
+1.1.1.2
+date   2012.01.29.08.25.31;    author root;    state Exp;
+branches;
 next   ;
 
 
@@ -22,7 +33,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -295,11 +306,11 @@ chip "adm1030-*" "adm1031-*"
     label temp1 "M/B Temp"
 
 
-chip "w83627ehf-*" "w83627dhg-*"
+chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*"
 
     label in0 "Vcore"
     label in2 "AVCC"
-    label in3 "VCC"
+    label in3 "+3.3V"
     label in7 "3VSB"
     label in8 "Vbat"
 
@@ -464,6 +475,20 @@ chip "adt7476-*" "adt7490-*"
 @
 
 
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d269 1
+a269 1
+chip "w83627ehf-*" "w83627dhg-*"
+d273 1
+a273 1
+    label in3 "VCC"
+@
+
+
 1.1.1.1
 log
 @dispatch-conf update.
@@ -476,3 +501,112 @@ d273 1
 a273 1
     label in3 "+3.3V"
 @
+
+
+1.1.1.2
+log
+@dispatch-conf update.
+@
+text
+@a51 14
+chip "w83795g-*" "w83795adg-*"
+
+    label in12 "+3.3V"
+    label in13 "3VSB"
+    label in14 "Vbat"
+
+    set in12_min  3.3 * 0.90
+    set in12_max  3.3 * 1.10
+    set in13_min  3.3 * 0.90
+    set in13_max  3.3 * 1.10
+    set in14_min  3.0 * 0.90
+    set in14_max  3.3 * 1.10
+
+
+d212 1
+a212 2
+chip "lm85-*" "lm85b-*" "lm85c-*" "adm1027-*" "adt7463-*" "adt7468-*" \
+     "emc6d100-*" "emc6d102-*" "emc6d103-*" "emc6d103s-*" 
+a230 8
+chip "emc6w201-*"
+
+    label in2 "+3.3V"
+    label in3 "+5V"
+
+    label temp6 "M/B Temp"
+
+
+d269 1
+a269 20
+chip "w83627thf-*"
+
+    label in3 "+5V"
+    label in7 "5VSB"
+    label in8 "Vbat"
+
+    # Internal resistors
+    compute in3  @@ * (1 + 34/51), @@ / (1 + 34/51)
+    compute in7  @@ * (1 + 34/51), @@ / (1 + 34/51)
+
+    set in3_min  5.0 * 0.90
+    set in3_max  5.0 * 1.10
+    set in7_min  5.0 * 0.90
+    set in7_max  5.0 * 1.10
+# The battery voltage may or may not be monitored.
+#    set in8_min  3.0 * 0.90
+#    set in8_max  3.0 * 1.10
+
+
+chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" "nct6775-*" "nct6776-*"
+a286 17
+chip "w83627uhg-*"
+
+    label in2 "AVCC"
+    label in3 "+5V"
+    label in7 "5VSB"
+    label in8 "Vbat"
+
+    set in2_min  5.0 * 0.90
+    set in2_max  5.0 * 1.10
+    set in3_min  5.0 * 0.90
+    set in3_max  5.0 * 1.10
+    set in7_min  5.0 * 0.90
+    set in7_max  5.0 * 1.10
+    set in8_min  3.0 * 0.90
+    set in8_max  3.0 * 1.10
+
+
+d386 1
+a386 16
+chip "sch5127-*"
+
+    label in2 "+3.3V"
+    label in5 "3VSB"
+    label in6 "Vbat"
+
+    set in2_min  3.3 * 0.90
+    set in2_max  3.3 * 1.10
+    set in5_min  3.3 * 0.90
+    set in5_max  3.3 * 1.10
+    set in6_min  3.0 * 0.90
+    set in6_max  3.0 * 1.10
+
+
+chip "f71808e-*" "f71808a-*" "f71862fg-*" "f71869-*" "f71869a-*" "f71882fg-*" \
+     "f71889fg-*" "f71889ed-*" "f71889a-*"
+d397 1
+a397 1
+chip "f71858fg-*" "f8000-*"
+a405 11
+
+
+chip "f81865f-*"
+
+    label in0 "+3.3V"
+    label in5 "3VSB"
+    label in6 "Vbat"
+
+    compute in0  @@*2, @@/2
+    compute in5  @@*2, @@/2
+    compute in6  @@*2, @@/2
+@
index 21a579b2ac3c794e14b3f2fd9c6808de49389029..7b5a8714d471122418f907a9cc5979826f19ce1f 100644 (file)
@@ -1,4 +1,4 @@
-head   1.1;
+head   1.2;
 access;
 symbols;
 locks; strict;
@@ -6,6 +6,11 @@ comment        @# @;
 expand @o@;
 
 
+1.2
+date   2012.01.29.08.25.32;    author root;    state Exp;
+branches;
+next   1.1;
+
 1.1
 date   2010.10.04.20.57.59;    author root;    state Exp;
 branches;
@@ -17,7 +22,7 @@ desc
 @
 
 
-1.1
+1.2
 log
 @dispatch-conf update.
 @
@@ -45,12 +50,17 @@ oid_section         = new_oids
 
 [ new_oids ]
 
-# We can add new OIDs in here for use by 'ca' and 'req'.
+# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
 # Add a simple OID like this:
 # testoid1=1.2.3.4
 # Or use config file substitution like this:
 # testoid2=${testoid1}.5.6
 
+# Policies used by the TSA examples.
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+
 ####################################################################
 [ ca ]
 default_ca     = CA_default            # The default ca section
@@ -59,6 +69,7 @@ default_ca    = CA_default            # The default ca section
 [ CA_default ]
 
 dir            = /etc/ssl/CA-Brehm             # Where everything is kept
+
 certs          = $dir/certs                    # Where the issued certs are kept
 crl_dir                = $dir/crl                      # Where the issued crl are kept
 database       = $dir/index.txt                # database index file.
@@ -91,7 +102,7 @@ cert_opt     = ca_default                    # Certificate field options
 
 default_days   = 1875                  # how long to certify for
 default_crl_days= 30                   # how long before next CRL
-default_md     = sha1                  # which md to use.
+default_md     = default               # use public key default MD
 preserve       = no                    # keep passed DN ordering
 
 # A few difference way of specifying how similar the request should look
@@ -335,4 +346,51 @@ authorityKeyIdentifier=keyid,issuer:always
 
 # This really needs to be in place for it to be a proxy certificate.
 proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+
+####################################################################
+[ tsa ]
+
+default_tsa = tsa_config1      # the default TSA section
+
+[ tsa_config1 ]
+
+# These are used by the TSA reply generation only.
+dir            = ./demoCA              # TSA root directory
+serial         = $dir/tsaserial        # The current serial number (mandatory)
+crypto_device  = builtin               # OpenSSL engine to use for signing
+signer_cert    = $dir/tsacert.pem      # The TSA signing certificate
+                                       # (optional)
+certs          = $dir/cacert.pem       # Certificate chain to include in reply
+                                       # (optional)
+signer_key     = $dir/private/tsakey.pem # The TSA private key (optional)
+
+default_policy = tsa_policy1           # Policy if request did not specify it
+                                       # (optional)
+other_policies = tsa_policy2, tsa_policy3      # acceptable policies (optional)
+digests                = md5, sha1             # Acceptable message digests (mandatory)
+accuracy       = secs:1, millisecs:500, microsecs:100  # (optional)
+clock_precision_digits  = 0    # number of digits after dot. (optional)
+ordering               = yes   # Is ordering defined for timestamps?
+                               # (optional, default: no)
+tsa_name               = yes   # Must the TSA name be included in the reply?
+                               # (optional, default: no)
+ess_cert_id_chain      = no    # Must the ESS cert id chain be included?
+                               # (optional, default: no)
+@
+
+
+1.1
+log
+@dispatch-conf update.
+@
+text
+@d24 1
+a24 1
+# We can add new OIDs in here for use by 'ca' and 'req'.
+d30 5
+d43 1
+d76 1
+a76 1
+default_md     = sha1                  # which md to use.
+d320 30
 @
index 9d2cd5bfa52f3121b08b494a0ea4bbfbba32ea31..18760c6e673d76ea7d83995e7b6dc5ec48839adb 100644 (file)
@@ -145,7 +145,7 @@ localityName                        = Locality Name (eg, city)
 organizationalUnitName         = Organizational Unit Name (eg, section)
 #organizationalUnitName_default        =
 
-commonName                     = Common Name (eg, YOUR name)
+commonName                     = Common Name (e.g. server FQDN or YOUR name)
 commonName_max                 = 64
 
 emailAddress                   = Email Address
diff --git a/cron.monthly/update-usbids b/cron.monthly/update-usbids
new file mode 100755 (executable)
index 0000000..1018546
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/sbin/update-usbids -q
diff --git a/csh.env b/csh.env
index de20cf36705d715bca19e2709f0fbda29274fead..a31bc2051bb3916efad9771be3fc9ed1f429d153 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -3,10 +3,11 @@
 # GO INTO /etc/csh.cshrc NOT /etc/csh.env
 
 setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt /usr/share/openvpn/easy-rsa'
-setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 setenv EDITOR '/usr/bin/vim'
 setenv GCC_SPECS ''
 setenv GDK_USE_XFT '1'
+setenv GSETTINGS_BACKEND 'gconf'
 setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
 setenv HG '/usr/bin/hg'
 setenv INFOPATH '/usr/share/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info'
diff --git a/env.d/50gconf b/env.d/50gconf
new file mode 100644 (file)
index 0000000..3ee3da3
--- /dev/null
@@ -0,0 +1,2 @@
+CONFIG_PROTECT_MASK="/etc/gconf"
+GSETTINGS_BACKEND="gconf"
diff --git a/foomatic/filter.conf b/foomatic/filter.conf
new file mode 100644 (file)
index 0000000..05fbed1
--- /dev/null
@@ -0,0 +1,47 @@
+# This file allows you to configure the "foomatic-rip" filter.
+
+# Uncomment the lines where you want to do a change and enter the
+# desired value.
+
+# Enter here your personal command for converting non-PostScript files
+# (especially text) to PostScript. Supported commands are "a2ps",
+# "enscript" or "mpage". Command line options will be automatically
+# set by "foomatic-rip".
+
+# textfilter: a2ps
+
+# Set debug to 1 to enable the debug logfile for "foomatic-rip"; it
+# will appear as /tmp/foomatic-rip.log It will contain status info of
+# the filtering process and the renderer's (usually GhostScript's)
+# stderr output. 
+
+# WARNING: This logfile is a security hole; do not use in production.
+
+# debug: 0
+
+### CUPS only:
+
+# Set to 0 to suppress inserting postscript code for accounting.
+
+# ps_accounting: 1
+
+### General Configuration
+
+# Set echo to the path to an echo program that uses echo -n
+
+# echo: /bin/echo
+
+# set gspath to the GhostScript to be used by foomatic
+# gspath: gs
+
+# Set the PATH value to be used by foomatic-rip:
+# execpath: /usr/local/bin:/usr/bin:/bin
+
+# Set the directories in which foomatic-rip should search for CUPS filters:
+# cupsfilterpath: /usr/local/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter
+
+# Set the preferred shell to use when executing FoomaticRIPCommandLine and
+# friends.  Several PPD files use shell constructs that require a more
+# modern shell like bash, zsh, or ksh.
+
+# preferred_shell: /bin/bash
diff --git a/foomatic/filter.conf.sample b/foomatic/filter.conf.sample
new file mode 100644 (file)
index 0000000..05fbed1
--- /dev/null
@@ -0,0 +1,47 @@
+# This file allows you to configure the "foomatic-rip" filter.
+
+# Uncomment the lines where you want to do a change and enter the
+# desired value.
+
+# Enter here your personal command for converting non-PostScript files
+# (especially text) to PostScript. Supported commands are "a2ps",
+# "enscript" or "mpage". Command line options will be automatically
+# set by "foomatic-rip".
+
+# textfilter: a2ps
+
+# Set debug to 1 to enable the debug logfile for "foomatic-rip"; it
+# will appear as /tmp/foomatic-rip.log It will contain status info of
+# the filtering process and the renderer's (usually GhostScript's)
+# stderr output. 
+
+# WARNING: This logfile is a security hole; do not use in production.
+
+# debug: 0
+
+### CUPS only:
+
+# Set to 0 to suppress inserting postscript code for accounting.
+
+# ps_accounting: 1
+
+### General Configuration
+
+# Set echo to the path to an echo program that uses echo -n
+
+# echo: /bin/echo
+
+# set gspath to the GhostScript to be used by foomatic
+# gspath: gs
+
+# Set the PATH value to be used by foomatic-rip:
+# execpath: /usr/local/bin:/usr/bin:/bin
+
+# Set the directories in which foomatic-rip should search for CUPS filters:
+# cupsfilterpath: /usr/local/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter
+
+# Set the preferred shell to use when executing FoomaticRIPCommandLine and
+# friends.  Several PPD files use shell constructs that require a more
+# modern shell like bash, zsh, or ksh.
+
+# preferred_shell: /bin/bash
diff --git a/gconf/2/evoldap.conf b/gconf/2/evoldap.conf
new file mode 100644 (file)
index 0000000..41b2950
--- /dev/null
@@ -0,0 +1,87 @@
+<evoldap>
+  <server>
+    <host></host> <!-- e.g. ldap.blaa.com -->
+    <port></port> <!-- defaults to 389 -->
+    <base_dn></base_dn> <!-- e.g. ou=people,dc=blaa,dc=com -->
+  </server>
+
+  <!--
+     The values of the following keys:
+       - /apps/evolution/mail/accounts
+       - /apps/evolution/addressbook/sources
+       - /apps/evolution/calendar/sources
+       - /apps/evolution/tasks/sources
+     will be constructed by applying each LDAP entry which matches
+     the "filter" attribute on the <template> tag to the template
+     template corresponding to the key.
+
+     If the filter returns multiple values, the value of the GConf
+     key will be a multiple element list.
+
+     Valid variables:
+       1) $(USER) - the username
+       2) $(EVOLUTION_UID) - mystical magical per-account UID string
+       3) $(LDAP_ATTR_foo) - the value of the "foo" attribute on the
+                             LDAP entry which matches the filter
+    -->
+
+  <template filter="(&amp;(uid=$(USER))(objectClass=inetOrgPerson)(objectClass=evolutionMailAccount)(objectClass=evolutionAddressbookSource)(objectClass=evolutionCalendarSource)(objectClass=evolutionTasksSource))">
+
+    <!-- /apps/evolution/mail/accounts -->
+    <account_template>
+      <account name="$(LDAP_ATTR_mail)" uid="$(EVOLUTION_UID)" enabled="true">
+        <identity>
+          <name>$(LDAP_ATTR_cn)</name>
+          <addr-spec>$(LDAP_ATTR_mail)</addr-spec>
+          <reply-to></reply-to>
+          <organization></organization>
+          <signature uid=""/>
+        </identity>
+        <source save-passwd="false" keep-on-server="false" auto-check="false" auto-check-timeout="10">
+          <url>$(LDAP_ATTR_evolutionMailSourceURI)</url>
+        </source>
+        <transport save-passwd="false">
+          <url>$(LDAP_ATTR_evolutionMailTransportURI)</url>
+        </transport>
+        <drafts-folder></drafts-folder>
+        <sent-folder></sent-folder>
+        <auto-cc always="false">
+          <recipients></recipients>
+        </auto-cc>
+        <auto-bcc always="false">
+          <recipients></recipients>
+        </auto-bcc>
+        <pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false">
+          <key-id></key-id>
+        </pgp>
+        <smime sign-default="false" encrypt-default="false" encrypt-to-self="false">
+          <sign-key-id></sign-key-id>
+          <encrypt-key-id></encrypt-key-id>
+        </smime>
+      </account>
+    </account_template>
+
+    <!-- /apps/evolution/addressbook/sources -->
+    <addressbook_template>
+      <group uid="$(EVOLUTION_UID)" name="Addressbook" base_uri="" readonly="no">
+        <source uid="$(EVOLUTION_UID)" name="Addressbook" relative_uri="" uri="$(LDAP_ATTR_evolutionAddressbookURI)"/>
+      </group>
+    </addressbook_template>
+
+    <!-- /apps/evolution/calendar/sources -->
+    <calendar_template> 
+      <group uid="$(EVOLUTION_UID)" name="Calendar" base_uri="" readonly="no">
+        <source uid="$(EVOLUTION_UID)" name="Calendar" relative_uri="" uri="$(LDAP_ATTR_evolutionCalendarURI)"/>
+      </group>p
+    </calendar_template>
+
+   <!-- /apps/evolution/tasks/sources -->
+   <tasks_template>
+      <group uid="$(EVOLUTION_UID)" name="Tasks" base_uri="" readonly="no">
+        <source uid="$(EVOLUTION_UID)" name="Tasks" relative_uri="" uri="$(LDAP_ATTR_evolutionTasksURI)"/>
+      </group>
+    </tasks_template>
+
+  </template>
+
+</evoldap>
diff --git a/gconf/2/path b/gconf/2/path
new file mode 100644 (file)
index 0000000..1601065
--- /dev/null
@@ -0,0 +1,35 @@
+# This file stores the addresses of config sources for GConf
+# When a value is stored or requested, the sources are scanned from top to 
+# bottom, and the first one to have a value for the key (or the first one 
+# to be writeable) is used to load/store the data.
+
+# See the GConf manual for details
+
+# Look first in systemwide mandatory settings directory
+xml:readonly:/etc/gconf/gconf.xml.mandatory
+
+# To read in any mandatory settings that the Sys Admin may have created
+# prior to a desktop system upgrade. The SysAdmin can stick read-only system
+# wide sources in this file.
+include /etc/gconf/2/local-mandatory.path
+
+# Now see where users want us to look - basically the user can stick arbitrary 
+# sources in a ~/.gconf.path file and they're inserted here
+include "$(HOME)/.gconf.path"
+
+# Give users a default storage location, ~/.gconf
+xml:readwrite:$(HOME)/.gconf
+
+# Location for system-wide settings that are set by the defaults mechanism
+xml:readonly:/etc/gconf/gconf.xml.system
+
+# To read in any defaults settings that the Sys Admin may have created
+# prior to a desktop system upgrade. The SysAdmin can stick default values
+# system-wide in this file.
+include /etc/gconf/2/local-defaults.path
+
+# Finally, look at the systemwide defaults
+xml:readonly:/etc/gconf/gconf.xml.defaults
+
+
+
index da022b0b769f7163294905ee322a1846b19acee8..8c89ad5335e4e2ff23e6e71fe925af1cd06b8de4 100755 (executable)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.1 2005/03/03 17:40:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.3 2011/09/23 12:04:44 polynomial-c Exp $
 
 depend() {
        need clock logger
@@ -10,7 +10,7 @@ depend() {
 start() {
        ebegin "Starting atd"
        start-stop-daemon --start --quiet --pidfile /var/run/atd.pid \
-               --startas /usr/sbin/atd
+               --exec /usr/sbin/atd -- ${ATD_OPTS}
        eend $?
 }
 
index 35af097526216c16f4abea7d4e03d1408bd3fd9f..0e03938f717c32e7338115b141a75d5ea5f35ba4 100755 (executable)
@@ -10,7 +10,7 @@ depend()
        keyword -prefix -timeout
 }
 
-dir_writeable()
+dir_writable()
 {
        mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }
@@ -25,7 +25,7 @@ cleanup_tmp_dir()
        if ! [ -d "$dir" ]; then
                mkdir -p "$dir" || return $?
        fi
-       dir_writeable "$dir" || return 1
+       dir_writable "$dir" || return 1
        chmod a+rwt "$dir" 2> /dev/null
        cd "$dir" || return 1
        if yesno $wipe_tmp; then
@@ -72,6 +72,26 @@ mkutmp()
        chmod 0664 "$1"
 }
 
+migrate_to_run()
+{
+       src="$1"
+       dst="$2"
+       if [ -L $src -a "$(readlink -f $src)" != $dst ]; then
+               ewarn "$src does not point to $dst."
+               ewarn "Setting $src to point to $dst."
+               rm $src
+       elif [ ! -L $src -a -d $src ]; then
+               ebegin "Migrating $src to $dst"
+               cp -a $src/* $dst/
+               rm -rf $src
+               eend $?
+       fi
+       # If $src doesn't exist at all, just run this
+       if [ ! -e $src ]; then
+               ln -s $dst $src
+       fi
+}
+
 start()
 {
        # Remove any added console dirs
@@ -79,8 +99,16 @@ start()
 
        local logw=false runw=false extra=
        # Ensure that our basic dirs exist
-       [ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
-       for x in /var/log /var/run /tmp $extra; do
+       if [ "$RC_UNAME" = Linux ]; then
+               # Satisfy Linux FHS
+               extra=/var/lib/misc
+               if [ ! -d /run ]; then
+                       extra="/var/run $extra"
+               fi
+       else
+               extra=/var/run
+       fi
+       for x in /var/log /tmp $extra; do
                if ! [ -d $x ]; then
                        if ! mkdir -p $x; then
                                eend 1 "failed to create needed directory $x"
@@ -89,7 +117,12 @@ start()
                fi
        done
 
-       if dir_writeable /var/run; then
+       if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
+               migrate_to_run  /var/lock /run/lock
+               migrate_to_run  /var/run /run
+       fi
+
+       if dir_writable /var/run; then
                ebegin "Creating user login records"
                local xtra=
                [ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -131,7 +164,7 @@ start()
                cleanup_tmp_dir "$tmp"
        done
 
-       if dir_writeable /tmp; then
+       if dir_writable /tmp; then
                # Make sure our X11 stuff have the correct permissions
                # Omit the chown as bootmisc is run before network is up
                # and users may be using lame LDAP auth #139411
@@ -144,7 +177,7 @@ start()
        fi
 
        if yesno $log_dmesg; then
-               if $logw || dir_writeable /var/log; then
+               if $logw || dir_writable /var/log; then
                        # Create an 'after-boot' dmesg log
                        if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
                                dmesg > /var/log/dmesg
index ca9ee31156002ddaba195bde23a9f4ef3315fe82..f989d2d2211e7f1817a55ee02e4136a1424d7f00 100755 (executable)
@@ -49,7 +49,7 @@ start()
                        retval=1
                        break
                fi
-               x=$(($x + 1))
+               : $(( x += 1 ))
        done
        eend $retval
 
index f59e27b4c4b43a72a172d07c6e9848f6897aaf83..e912038bb3957bc6b747bcf061dd62262e2fb537 100755 (executable)
@@ -9,6 +9,8 @@ depend() {
 
 start() {
        ebegin "Starting cupsd"
+       checkpath -q -d -m 0755 -o root:lp /var/run/cups
+       checkpath -q -d -m 0511 -o lp:lpadmin /var/run/cups/certs
        start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
        eend $?
 }
index 3960553d1fa3ce82b86b395c08e425120a0a31e4..9cf35b864fb638126d42379f9c4216dfd1acb381 100755 (executable)
@@ -48,8 +48,13 @@ start()
 
        if [ -n "$fsck_passno" ]; then
                check_extra="[passno $fsck_passno] $check_extra"
+               if [ -n "$fsck_mnt" ]; then
+                       eerror "Only 1 of fsck_passno and fsck_mnt must be set!"
+                       return 1
+               fi
        fi
        ebegin "Checking local filesystems $check_extra"
+       # Append passno mounts
        for p in $fsck_passno; do
                local IFS="$_IFS"
                case "$p" in
@@ -58,10 +63,16 @@ start()
                set -- "$@" $(fstabinfo --passno "$p")
                unset IFS
        done
+       # Append custom mounts
+       for m in $fsck_mnt ; do
+               local IFS="$_IFS"
+               set -- "$@" "$m"
+               unset IFS
+       done
 
        if [ "$RC_UNAME" = Linux ]; then
                fsck_opts="$fsck_opts -C0 -T"
-               if [ -z "$fsck_passno" ]; then
+               if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
                        fsck_args=${fsck_args--A -p}
                        if echo 2>/dev/null >/.test.$$; then
                                rm -f /.test.$$
@@ -91,7 +102,7 @@ start()
                        _reboot
                fi;;
        8)      ewend 1 "Operational error"; return 0;;
-       12)     ewend 1 "fsck interupted";;
+       12)     ewend 1 "fsck interrupted";;
        *)      eend 2 "Filesystems couldn't be fixed";;
        esac
        _abort || return 1
index 20a98591ee90558729029adf716192131f794640..28d675a8a25fffb6a91d6f3d7e013264f6991d1f 100755 (executable)
@@ -85,7 +85,7 @@ start()
 
        if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
                _hwclock --adjust $utc_cmd
-               retval=$(($retval + $?))
+               : $(( retval += $? ))
        fi
 
        # If setting UTC, don't bother to run hwclock when first booting
@@ -99,7 +99,7 @@ start()
                else
                        _hwclock --systz $utc_cmd $clock_args
                fi
-               retval=$(($retval + $?))
+               : $(( retval += $? ))
        fi
 
        eend $retval "Failed to set the system clock"
index 8ab72fd170c79757843d032ef8b8260054428c09..211fdd36501aa44bbb1da0b4c208efcf6761fce1 100755 (executable)
@@ -47,7 +47,7 @@ start()
        n=1
        while [ $n -le $ttyn ]; do
                kbd_mode $kmode -C $ttydev$n
-               n=$(($n + 1))
+               : $(( n += 1 ))
        done
        eend 0
 
index 3fa586749741718291169a552d31b1482bdeb2f3..17f60ce87ae9dd5aa5a53f2b4884623eef61a118 100755 (executable)
@@ -57,7 +57,7 @@ start()
                [ -z "$args" ] && eval args=\$module_${aa}_args
                [ -z "$args" ] && eval args=\$module_${xx}_args
                eval modprobe -q "$mpargs" "$x" "$args"
-               eend $? "Failed to load $x" && cnt=$(($cnt + 1))
+               eend $? "Failed to load $x" && : $(( cnt += 1 ))
        done
        einfo "Autoloaded $cnt module(s)"
 }
index e67c2ca1d13e46c1205859be01dcd2580e5a10c7..d824b6ae650ebce6f21b2de3bb32df22508bfcd0 100755 (executable)
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql.rc6,v 1.2 2007/03/04 15:47:03 vivo Exp $
-
-# external binaries used: which, sed, tac
-
-# int in_list(char * elem, char * list)
-function in_list() {
-       local elem=${1:-"none"}
-       local list=${2:-","}
-
-       [[ "${list}" == "${list/,${elem},/}" ]] \
-       && return 1 \
-       || return 0
-}
-
-function wdebug() {
-       if [[ "${DEBUG}" -ge "${1}" ]] ; then
-               shift
-               echo "dbg:  ${@}"
-       fi
-}
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d,v 1.1 2011/01/13 20:06:06 robbat2 Exp $
 
 depend() {
-       use dns net localmount netmount nfsmount
+       use net.lo
+       # localmount needed for $basedir
+       need localmount
 }
 
-do_escape() {
-       # Ihatethisreallyverymuch
-       #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|"
-       echo "$1"
+get_config() {
+       my_print_defaults --config-file="$1" mysqld |
+       sed -n -e "s/^--$2=//p"
 }
 
-# int get_slot_config(srv_slot=0, srv_num)
-get_slot_config() {
-       wdebug 4 ">>> get_slot_config()"
-
-       local srv srv_slot srv_num
-       srv_slot="${1:-"0"}"
-       srv_num="${2}"
-       MY_SUFFIX="-${srv_slot}"
-       # srv=array(0 => [srv_slot], 1 => [srv_num] )
-       srv=( ${srv_slot} ${srv_num} )
-
-       local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
-       local conf_d_parameters="${!tmp_eval}"
-       if [[ "${srv_slot}" == "0" ]] ; then
-               MY_SUFFIX=''
-               # try some other default for the default server
-               [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]}
-       fi
-       [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( )
-       basedir="" datadir="" pidfile="" socket=""
-       CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120
-
-       wdebug 3 "srv                ${srv[@]}"
-       wdebug 3 "srv_slot           ${srv_slot}"
-       wdebug 3 "srv_num            ${srv_num}"
-       wdebug 3 "tmp_eval           ${tmp_eval}"
-       wdebug 3 "conf_d_parameters  ${conf_d_parameters[@]}"
-       wdebug 3 "MY_SUFFIX          ${MY_SUFFIX}"
-
-       local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
-       local conf_d_parameters="${!tmp_eval}"
-       # collations need to be defined *after* the character sets,
-       # so we will duplicate them
-       local collations=""
-       [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
-
-       MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
-       # summa of unmanaged parameters
-       # some parameters may be present multiple times
-       unmanagedparams=""
-
-       # grab the parameters from conf.d/mysql definition
-       for my_default in ${conf_d_parameters[*]} ; do
-               case "${my_default}" in
-                       nice=*)
-                               NICE="${my_default#nice=}"
-                               nice -n $NICE ls /tmp &>/dev/null || NICE=""
-                               ;;
-                       mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
-                       startup_timeout=*)
-                               STARTUPTIMEOUT="${my_default#startup_timeout=}" ;;
-                       basedir=*) basedir="${my_default#basedir=}" ;;
-                       datadir=*) datadir="${my_default#datadir=}" ;;
-                       pid-file=*) pidfile="${my_default#pid-file=}" ;;
-                       socket=*) socket="${my_default#socket=}" ;;
-                       *collation*=)
-                               collations="${collations} --$( do_escape "${my_default}" )"
-                               ;;
-                       *=*)
-                               # list of parameters we already have
-                               # prepend "--" because my_print_defaults do it
-                               unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )"
-                               ;;
-                       *)
-                               unmanagedparams="${unmanagedparams} --${my_default}"
-                               ;;
-               esac
-       done
+mysql_svcname() {
+       local ebextra=
+       case "${SVCNAME}" in
+               mysql*) ;;
+               *) ebextra=" (mysql)" ;;
+       esac
+       echo "${SVCNAME}${ebextra}"
+}
 
-       if [[ ! -r "${MY_CNF}" ]] ; then
-               ewarn "Cannot access ${MY_CNF} !"
-               MY_CNF=""
-               my_defaults=""
-       else
-               local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)"
-               if [[ ! -x "${my_print_defaults}" ]] ; then
-                       eerror "my_print_defaults NOT found or not executable"
-                       my_defaults=""
-               else
-                       my_defaults=$( ${my_print_defaults} \
-                       --loose-verbose \
-                       --config-file="${MY_CNF}" \
-                       mysqld server )
-               fi
+start() {
+       # Check for old conf.d variables that mean migration was not yet done.
+       local varlist="${!mysql_slot_*} ${!MYSQL_BLOG_PID_FILE*} ${!STOPTIMEOUT*}"
+       varlist="${varlist// /}"
+       # Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+       # It does have a use in testing, as it is possible to build a config file
+       # that works with both the old and new init scripts simulateously.
+       if [ -n "${varlist}" -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+               eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+               eerror "Not proceeding because it may be dangerous."
+               return 1
        fi
 
-       # grab needed parameters from my.cnf, don't override the ones from
-       # conf.d/mysql
-       for my_default in ${my_defaults} ; do
-               case "${my_default}" in
-                       --basedir=*)
-                               [[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;;
-                       --datadir=*)
-                               [[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;;
-                       --pid-file=*)
-                               [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
-                       --socket=*)
-                               [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;;
-                       --*collation*=)
-                               # the order is inversed because we want the conf.d ones overriden
-                               collations="$( do_escape "${my_default}" ) ${collations}"
-                               ;;
-               esac
-       done
-
-       # some parameters
-       basedir="${basedir:-"/usr"}"
-       datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}"
-       pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}"
-       socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}"
-       unmanagedparams="${unmanagedparams} ${collations}"
+       # Now we can startup
+       ebegin "Starting $(mysql_svcname)"
 
-       wdebug 3 "chroot dir => ${CHROOT}"
-       wdebug 3 "niceness   => ${NICE}"
-       wdebug 3 "basedir    => ${basedir}"
-       wdebug 3 "datadir    => ${datadir}"
-       wdebug 3 "pidfile    => ${pidfile}"
-       wdebug 3 "socket     => ${socket}"
-       wdebug 3 "Unamanged  => ${unmanagedparams}"
+       MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
 
-       # extension for sleep tenth of seconds, not very portable so check it before
-       if sleep 0.01 ; then
-               STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 ))
-               STOPTIMEOUT=$(( STOPTIMEOUT * 10 ))
-               TIMEUNIT=0.1
-       else
-               TIMEUNIT=1
+       if [ ! -r "${MY_CNF}" ] ; then
+               eerror "Cannot read the configuration file \`${MY_CNF}'"
+               return 1
        fi
 
-       # push these out to the script
-       export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT
-       export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT
-       wdebug 4 "<<< get_slot_config() ok"
-       return 0
-}
-
-checkconfig() {
-       wdebug 4 ">>> checkconfig(\"${1}\")"
-       local datadir="${1}" pidfile="${2}" socket="${3}"
+       # tail -n1 is critical as these we only want the last instance of the option
+       local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+       local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+       local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
+       local socket=$(get_config "${MY_CNF}" socket | tail -n1)
 
-       if [[ -n "${NOCHECK}" ]] ; then
-               rm -f "${pidfile}" "${socket}"
-               return 0
-       fi
-
-       if [[ ! -d "${datadir}" ]] ; then
-               eerror "MySQL datadir is empty or invalid"
-               eerror "Please check your my.cnf : ${MY_CNF}"
-               wdebug 4 "<<< checkconfig() KO"
+       if [ ! -d "${datadir}" ] ; then
+               eerror "MySQL datadir \`${datadir}' is empty or invalid"
+               eerror "Please check your config file \`${MY_CNF}'"
                return 1
        fi
 
-       if [[ ! -d "${datadir}/mysql" ]] ; then
+       if [ ! -d "${datadir}"/mysql ] ; then
                eerror "You don't appear to have the mysql database installed yet."
                eerror "Please run /usr/bin/mysql_install_db to have this done..."
-               wdebug 4 "<<< checkconfig() KO"
                return 1
        fi
 
-       if [[ -f "${pidfile}" ]] ; then
-               kill -15 $(< ${pidfile}) 2>/dev/null
-               if [[ $? -eq 0 ]] ; then
-                       # the process exist, we have a problem
-                       eerror "\"${pidfile}\" is still present and the process is running."
-                       eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?"
-                       wdebug 4 "<<< checkconfig() KO"
+       local piddir="${pidfile%/*}"
+       if [ ! -d "$piddir" ] ; then
+               mkdir "$piddir" && \
+               chown mysql "$piddir"
+               rc=$?
+               if [ $rc -ne 0 ]; then
+                       eerror "Directory $piddir for pidfile does not exist and cannot be created"
                        return 1
-               else
-                       rm -f "${pidfile}"
                fi
        fi
 
-       if [[ -S "${socket}" ]] ; then
-               ewarn "Strange, the socket file already exist in \"${socket}\""
-               ewarn "it will be removed now and re-created by the MySQL server"
-               ewarn "BUT please make your checks."
-               rm -f "${socket}"
+       local startup_timeout=${STARTUP_TIMEOUT:-900}
+       local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+       local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+       local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+       start-stop-daemon \
+               ${DEBUG/*/"--verbose"} \
+               --start \
+               --exec "${basedir}"/sbin/mysqld \
+               --pidfile "${pidfile}" \
+               --background \
+               --wait ${startup_early_timeout} \
+               ${tmpnice} \
+               ${tmpionice} \
+               -- --defaults-file="${MY_CNF}" ${MY_ARGS}
+       local ret=$?
+       if [ ${ret} -ne 0 ] ; then
+               eend ${ret}
+               return ${ret}
        fi
 
-       wdebug 4 "<<< checkconfig() ok"
-       return 0
-}
+       ewaitfile ${startup_timeout} "${socket}"
+       eend $? || return 1
 
-start() {
-       wdebug 4 ">>> start()"
-
-       MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"}
-       # servers are defined in /etc/conf.d/mysql
-       local serverlist=${!mysql_slot_*}
-       # provide default for empty conf.d/mysql
-       if [[ -z "${serverlist}" ]] ; then
-               serverlist=0
-               export mysql_slot_0=( )
-       fi
-       local retstatus timeout
-       local globretstatus=1
-       local srv_slot srv_num
-       # server MUST NOT share same location for these
-       local pidfilelist=',' datadirlist=',' socketlist=','
-       local ssd_thing=1
-       local mysqld_thing tmpnice
-
-       ebegin "Starting ${myservice}"
-       # try to start each server
-       for srv in ${serverlist[*]} ; do
-
-               srv_slot="${srv#mysql_slot_}"
-               if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then
-                       srv_num=''
-               else
-                       srv_num="${srv_slot#*_}"
-               fi
-               srv_slot="${srv_slot%%_*}"
-
-               retstatus=0
-               get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
-
-               # checks
-               if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then
-                       retstatus=2 ; continue
-               fi
-               if in_list "${pidfile}" "${pidfilelist}" ; then
-                       eerror "Sorry, won't start with same pid-file: ${pidfile}"
-                       retstatus=3 ; continue
-               fi
-               if in_list "${datadir}" "${datadirlist}" ; then
-                       eerror "Sorry, won't start with same datadir: ${datadir}"
-                       retstatus=4 ; continue
-               fi
-               if in_list "${socket}" "${socketlist}" ; then
-                       eerror "Sorry, won't start with same socket: ${socket}"
-                       retstatus=5 ; continue
-               fi
-
-               einfo "Starting ${myservice} (${MY_CNF})"
-
-               mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}"
-               mysqld_thing="${mysqld_thing} ${unmanagedparams}"
-               mysqld_thing="${mysqld_thing} --basedir=${basedir}"
-               mysqld_thing="${mysqld_thing} --datadir=${datadir}"
-               mysqld_thing="${mysqld_thing} --pid-file=${pidfile}"
-               mysqld_thing="${mysqld_thing} --socket=${socket}"
-
-               wdebug 2 "starting mysqld with: ${mysqld_thing}"
-
-               if [[ ${ssd_thing} -eq 1 ]] ; then
-                       tmpnice="${NICE:+"--nicelevel "}${NICE}"
-                       start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \
-                       --background ${tmpnice} --pidfile ${pidfile} \
-                       --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} \
-                       && sleep ${TIMEUNIT}
-                       retstatus=$?
-               else
-                       tmpnice="${NICE:+"nice -n "}${NICE}"
-                       ${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} &
-                       retstatus=0
-               fi
-
-               # only the first run is done by start-stop-daemon
-               ssd_thing=""
-
-               # wait for socket creation
-               wdebug 1
-               while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do
-                       STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 ))
-                       [[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT},"
-                       sleep ${TIMEUNIT}
-               done
-               wdebug 1 ""
-               if [[ ! -S "${socket}" ]] ; then
-                       eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})"
-                       retstatus=1
-               else
-                       globretstatus=0
-                       pidfilelist="${pidfilelist}${pidfile},"
-                       datadirlist="${datadirlist}${datadir},"
-                       socketlist="${socketlist}${socket},"
-                       echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
-               fi
-       done
-       # successfull if at least one mysqld started
-       wdebug 4 "<<< start()"
-       eend $globretstatus
+       save_options pidfile "${pidfile}"
+       save_options basedir "${basedir}"
 }
 
 stop() {
-       get_slot_config &> /dev/null
-       MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"}
-       local runwhat pidfile shutdown_elem
-       local PID cnt timeout=${STOPTIMEOUT:-"120"}
-       local retstatus=0
-       local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
-
-       ebegin "Stopping ${myservice}"
-       wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
-       wdebug 5 "shutdown_list: ${shutdown_list}"
-       for shutdown_elem in ${shutdown_list} ; do
-               runwhat=${shutdown_elem%%=*}
-               pidfile=${shutdown_elem#*=}
-               timeout=${STOPTIMEOUT:-"120"}
-               PID=$(< "${pidfile}" )
-               wdebug 3 "runwhat            ${runwhat}"
-               wdebug 3 "pidfile            ${pidfile}"
-               wdebug 3 "timeout            ${timeout}"
-               wdebug 3 "PID                ${PID}"
-
-               einfo "Stopping mysqld (${runwhat})"
-
-               start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" &
-               wdebug 1 ""
-               while [[ -n "$PID" ]] \
-                       && $( ps -Ao pid | grep -q "^ *$PID$" ) \
-                       && [[ "${timeout}" -ge 1 ]]
-               do
-                       timeout=$(($timeout - 1))
-                       [[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout )),"
-                       sleep ${TIMEUNIT}
-               done
-               [[ "${timeout}" -lt 1 ]] && retstatus=1
-       done
-       sleep ${TIMEUNIT}
-       [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
-       eend ${retstatus}
+       ebegin "Stopping $(mysql_svcname)"
+
+       local pidfile="$(get_options pidfile)"
+       local basedir="$(get_options basedir)"
+       local stop_timeout=${STOP_TIMEOUT:-120}
+
+       start-stop-daemon \
+               ${DEBUG/*/"--verbose"} \
+               --stop \
+               --exec "${basedir}"/sbin/mysqld \
+               --pidfile "${pidfile}" \
+               --retry ${stop_timeout}
+       eend $?
 }
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/init.d/mysqlmanager b/init.d/mysqlmanager
deleted file mode 100755 (executable)
index dd8b703..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysqlmanager.rc6,v 1.1 2007/01/12 16:54:20 chtekk Exp $
-
-# external binaries used: which, sed, tac
-
-depend() {
-       use dns net localmount netmount nfsmount
-       #provide mysql
-}
-
-# int in_list(char * elem, char * list)
-function in_list() {
-       local elem=${1:-"none"}
-       local list=${2:-","}
-
-       [[ "${list}" == "${list/,${elem},/}" ]] \
-       && return 1 \
-       || return 0
-}
-
-do_escape() {
-       # Ihatethisreallyverymuch
-       #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|"
-       echo "$1"
-}
-
-# int get_slot_config(srv_slot=0, srv_num)
-get_slot_config() {
-       [[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")"
-
-       srv_slot="${1:-"0"}"
-       srv_num="${2}"
-       MY_SUFFIX="-${srv_slot}"
-       [[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX=''
-
-       basedir="" pidfile="" socket=""
-
-       local tmp_eval="mysqlmanager_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
-       local conf_d_parameters="${!tmp_eval}"
-       [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
-
-       MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
-       # summa of unmanaged parameters
-       # some parameters may be present multiple times
-       unmanagedparams=""
-
-       # grab the parameters from conf.d/mysql definition
-       for my_default in ${conf_d_parameters[*]} ; do
-               case "${my_default}" in
-                       mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
-                       basedir=*) basedir="${my_default#basedir=}" ;;
-                       pid-file=*) pidfile="${my_default#pid-file=}" ;;
-                       socket=*) socket="${my_default#socket=}" ;;
-                       *=*)
-                               # list of parameters we already have
-                               # prepend "--" because my_print_defaults do it
-                               unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )"
-                               ;;
-                       *)
-                               unmanagedparams="${unmanagedparams} --${my_default}"
-                               ;;
-               esac
-       done
-
-       if [[ ! -r "${MY_CNF}" ]] ; then
-               ewarn "Cannot access ${MY_CNF} !"
-               MY_CNF=""
-               my_defaults=""
-       else
-               local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)"
-               if [[ ! -x "${my_print_defaults}" ]] ; then
-                       eerror "my_print_defaults NOT found or not executable"
-                       my_defaults=""
-               else
-                       my_defaults=$( ${my_print_defaults} \
-                       --loose-verbose \
-                       --config-file="${MY_CNF}" \
-                       manager )
-               fi
-       fi
-
-       # grab needed parameters from my.cnf, don't override the ones from
-       # conf.d/mysql
-       for my_default in ${my_defaults} ; do
-               case "${my_default}" in
-                       --pid-file=*)
-                               [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
-                       --socket=*)
-                               [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;;
-               esac
-       done
-
-       # still empty, I'm in doubt if assign a default or break, will see
-       basedir="${basedir:-"/usr"}"
-       pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}"
-       socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}"
-
-       if [[ ${DEBUG} -ge 3 ]] ; then
-               einfo "basedir    => ${basedir}"
-               einfo "pidfile    => ${pidfile}"
-               einfo "socket     => ${socket}"
-               einfo "Unamanged  => ${unmanagedparams}"
-       fi
-
-       # push these out to the script
-       export MY_SUFFIX MY_CNF pidfile basedir socket
-       export unmanagedparams
-       [[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok"
-       return 0
-}
-
-start() {
-       [[ ${DEBUG} -ge 4 ]] && einfo ">>> start()"
-       MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"}
-       # servers are defined in /etc/conf.d/mysql
-       local serverlist=${!mysqlmanager_slot_*}
-       # provide default for empty conf.d/mysql
-       if [[ -z "${serverlist}" ]] ; then
-               serverlist=0
-               export mysqlmanager_slot_0=()
-       fi
-       local retstatus timeout
-       local globretstatus=1
-       local srv_slot srv_num
-       # server MUST NOT share same location for these
-       local pidfilelist=',' socketlist=','
-
-       # additional security
-       rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}"
-       if [[ $? -ne 0 ]] ; then
-               eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
-               [[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO"
-               return 1
-       fi
-
-       ebegin
-       # try to start each server
-       for srv in ${serverlist[*]} ; do
-               einfo "working on ${srv}"
-
-               srv_slot="${srv#mysqlmanager_slot_}"
-               if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then
-                       srv_num=''
-               else
-                       srv_num="${srv_slot#*_}"
-               fi
-               srv_slot="${srv_slot%%_*}"
-
-               retstatus=0
-               get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
-
-               # timeout (seconds) before declaring the startup failed
-
-               # pre_run checks
-               if [[ "$retstatus" -eq 0 ]] ; then
-                       if in_list "${pidfile}" "${pidfilelist}" ; then
-                               retstatus=3
-                               eerror "Sorry, won't start with same pid-file: ${pidfile}"
-                       fi
-                       if in_list "${socket}" "${socketlist}" ; then
-                               retstatus=5
-                               eerror "Sorry, won't start with same socket: ${socket}"
-                       fi
-               fi
-
-               if [[ $retstatus -eq 0 ]] ; then
-                       # additional security
-                       rm -f ${pidfile} ${socket}
-                       einfo "Starting mysqlmanager${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})"
-
-                       [[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket}
-
-                       start-stop-daemon --quiet --start --background \
-                               --pidfile "${pidfile}" \
-                               --exec ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \
-                               -- \
-                                       ${MY_CNF:+"--defaults-file="}${MY_CNF} \
-                                       ${unmanagedparams} \
-                                       --pid-file=${pidfile} \
-                                       --socket=${socket}
-
-                       retstatus=$?
-
-                       if [[ "${retstatus}" -eq 0 ]] ; then
-                               pidfilelist="${pidfilelist}${pidfile},"
-                               socketlist="${socketlist}${socket},"
-                               globretstatus=0
-                               echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
-                       fi
-               fi
-       done
-       # successfull if at least one mysqlmanager started
-       [[ ${DEBUG} -ge 4 ]] && einfo "<<< start()"
-       eend $globretstatus
-}
-
-stop () {
-       MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"}
-       local runwhat pidfile shutdown_elem
-       local PID cnt timeout
-       local retstatus=0
-       local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
-
-       # shutdown in reverse order
-       ebegin
-       for shutdown_elem in $shutdown_list; do
-               runwhat=${shutdown_elem%%=*}
-               pidfile=${shutdown_elem#*=}
-               timeout=${STOPTIMEOUT:-"10"}
-
-               einfo "Stopping mysqlmanager (${runwhat})"
-
-               PID=$(cat "${pidfile}" 2>/dev/null)
-               start-stop-daemon --stop --quiet --pidfile="${pidfile}"
-               [[ ${DEBUG} -ge 1 ]] && echo ""
-               while [[ -n "$PID" && $( kill -0 $PID 2>/dev/null ) && "${timeout}" -ge 1 ]] ; do
-                       timeout=$(($timeout - 1))
-                       [[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout ))
-                       sleep 1
-               done
-               if [[ "${timeout}" -lt 1 ]] ; then
-                       retstatus=$(( $retstatus + 1 ))
-               fi
-       done
-
-       [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
-       eend $retstatus
-}
index 6f8b5b10c5c1db3e21e7759957b28fd6599c660e..a9040a38a29473e0ee7848664b4c3c913183045b 100755 (executable)
@@ -25,7 +25,7 @@ depend()
 
        case "${IFACE}" in
                lo|lo0);;
-               *) after net.lo net.lo0;;
+               *) after net.lo net.lo0 dbus;;
        esac
 
        if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then
@@ -115,7 +115,7 @@ _wait_for_carrier()
                        eend 0
                        return 0
                fi
-               timeout=$((${timeout} - 1))
+               : $(( timeout -= 1 ))
                [ "${efunc}" = "einfon" ] && printf "."
        done
 
@@ -144,9 +144,9 @@ _netmask2cidr()
        local i= len=
        local IFS=.
        for i in $1; do
-               while [ ${i} != "0" ]; do
-                       len=$((${len} + ${i} % 2))
-                       i=$((${i} >> 1))
+               while [ ${i} -ne 0 ]; do
+                       : $(( len += i % 2 ))
+                       : $(( i >>= 1 ))
                done
        done
 
@@ -169,6 +169,36 @@ _configure_variables()
        done
 }
 
+_which()
+{
+       local i OIFS
+       # Empty
+       [ -z "$1" ] && return
+       # check paths
+       OIFS="$IFS"
+       IFS=:
+       for i in $PATH ; do
+               [ -x $i/$1 ] && echo $i/$1 && break
+       done
+       IFS=$OIFS
+}
+
+# Like _which, but also consider shell builtins, and multiple alternatives
+_program_available()
+{
+       [ -z "$1" ] && return 0
+       local x=
+       for x; do
+               case "${x}" in
+                       /*) [ -x "${x}" ] && break;;
+                       *) type "${x}" >/dev/null 2>&1 && break;;
+               esac
+               unset x
+       done
+       [ -n "${x}" ] && echo $x && return 0
+       return 1
+}
+
 _show_address()
 {
        einfo "received address $(_get_inet_address "${IFACE}")"
@@ -277,7 +307,7 @@ _gen_module_list()
                echo "module_${i}_program_start='${PROGRAM_START}'" >> "${MODULESLIST}"
                echo "module_${i}_program_stop='${PROGRAM_STOP}'" >> "${MODULESLIST}"
                echo "module_${i}_provide='${PROVIDE}'" >> "${MODULESLIST}"
-               i=$((${i} + 1))
+               : $(( i += 1 ))
        done
        echo "module_${i}=" >> "${MODULESLIST}"
        )
@@ -304,18 +334,17 @@ _load_modules()
 
        local i=-1 x= mod= f= provides=
        while true; do
-               i=$((${i} + 1))
+               : $(( i += 1 ))
                eval mod=\$module_${i}
                [ -z "${mod}" ] && break
                [ -e "${MODULESDIR}/${mod}.sh" ] || continue
 
                eval set -- \$module_${i}_program
                if [ -n "$1" ]; then
-                       x=
-                       for x; do
-                               [ -x "${x}" ] && break
-                       done
-                       [ -x "${x}" ] || continue
+                       if ! _program_available "$@" >/dev/null; then
+                               vewarn "Skipping module $mod due to missing program: $@"
+                               continue
+                       fi
                fi
                if ${starting}; then
                        eval set -- \$module_${i}_program_start
@@ -323,15 +352,10 @@ _load_modules()
                        eval set -- \$module_${i}_program_stop
                fi
                if [ -n "$1" ]; then
-                       x=
-                       for x; do
-                               case "${x}" in
-                                       /*) [ -x "${x}" ] && break;;
-                                       *) type "${x}" >/dev/null 2>&1 && break;;
-                               esac
-                               unset x
-                       done
-                       [ -n "${x}" ] || continue
+                       if ! _program_available "$@" >/dev/null; then
+                               vewarn "Skipping module $mod due to missing program: $@"
+                               continue
+                       fi
                fi
 
                eval provides=\$module_${i}_provide
@@ -407,16 +431,18 @@ _load_config()
        set -- ${config}
 
        # We should support a space separated array for cidr configs
+       # But only as long as they do not contain other parameters for the address
        if [ $# = 1 ]; then
                unset IFS
                set -- ${config}
                # Of course, we may have a single address added old style.
-               case "$2" in
-                       netmask|broadcast|brd|brd+|peer|pointopoint)
-                               local IFS="$__IFS"
-                               set -- ${config}
-                               ;;
-               esac
+               # If the NEXT argument is a v4 or v6 address, it's the next config.
+               # Otherwise, it's arguments to the first config...
+               if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
+                       # Not an IPv4/IPv6
+                       local IFS="$__IFS"
+                       set -- ${config}
+               fi
        fi
 
        # Ensure that loopback has the correct address
@@ -438,7 +464,7 @@ _load_config()
        # so modules can influence it
        for cmd; do
                eval config_${config_index}="'${cmd}'"
-               config_index=$((${config_index} + 1))
+               : $(( config_index += 1 ))
        done
        # Terminate the list
        eval config_${config_index}=
@@ -446,7 +472,7 @@ _load_config()
        config_index=0
        for cmd in ${fallback}; do
                eval fallback_${config_index}="'${cmd}'"
-               config_index=$((${config_index} + 1))
+               : $(( config_index += 1 ))
        done
        # Terminate the list
        eval fallback_${config_index}=
@@ -488,7 +514,9 @@ start()
 {
        local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
        local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
-       local metric=0
+       local metric=0 _up_before_preup
+       eval _up_before_preup="\$up_before_preup_${IFVAR}"
+       [ -z "${_up_before_preup}" ] && _up_before_preup=$up_before_preup
 
        einfo "Bringing up interface ${IFACE}"
        eindent
@@ -502,7 +530,7 @@ start()
        # available in preup and afterwards incase the user inadvertently
        # brings it down
        if [ "$(command -v preup)" = "preup" ]; then
-               _up 2>/dev/null
+               yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
                ebegin "Running preup"
                eindent
                preup || return 1
@@ -541,7 +569,7 @@ start()
        if [ -n "${our_metric}" ]; then
                metric=${our_metric}
        elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-               metric=$((${metric} + $(_ifindex)))
+               : $(( metric += $(_ifindex) ))
        fi
 
        while true; do
@@ -581,11 +609,11 @@ start()
                                eindent
                                eval config_${config_index}=\$config
                                unset fallback_${config_index}
-                               config_index=$((${config_index} - 1))
+                               : $(( config_index -= 1 ))
                        fi
                fi
                eoutdent
-               config_index=$((${config_index} + 1))
+               : $(( config_index += 1 ))
        done
 
        if ! ${oneworked}; then
index 9f8ac7135c229d9a30ce134cab822d279c2a8beb..7ba4f48c1ab5d65aa2403b0534a8552c4dfc7843 100755 (executable)
@@ -219,6 +219,12 @@ start()
                eend $?
        fi
 
+       ewarn
+       ewarn "The $RC_SVCNAME script is deprecated and will be"
+       ewarn "removed in the future."
+       ewarn "Please use the net.* scripts to manage your network interfaces."
+       ewarn
+
        einfo "Starting network"
        routeflush
        if [ "$RC_UNAME" = "Linux" ]; then
@@ -281,7 +287,7 @@ start()
                tentative || break
                [ $r = 5 ] && vebegin "Waiting for tentative addresses"
                sleep 1
-               r=$(($r - 1))
+               : $(( r -= 1 ))
        done
        if [ $r != 5 ]; then
                [ $r != 0 ]
index bfa6add0f9dd607426246078bb8cc7673e6d9250..e354dfd19d9aadd6e8a4afab843d359cc9c07a9e 100755 (executable)
@@ -21,7 +21,7 @@ _setleds()
 
        while [ $i -le $ttyn ]; do
                setleds -D "$1"num < $dev$i || retval=1
-               i=$(($i + 1))
+               : $(( i += 1 ))
        done
 
        return $retval
index 249df0f880a4067271ddbd754e22be1b3c93c76f..a186d83478c54341feb45e5f3f936b1ca200d013 100755 (executable)
@@ -1,12 +1,15 @@
 #!/sbin/runscript
 
-PHPSLOT="php5.3"
+set_phpvars() {
+       PHPSLOT=${SVCNAME#php-fpm-}
+       [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
 
-PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-
-PHP_FPM_PID="/var/run/php-fpm.pid"
+       PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+       PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+}
 
-opts="depend start stop reload"
+extra_commands="depend"
+extra_started_commands="reload"
 
 depend() {
        need net
@@ -15,8 +18,9 @@ depend() {
 
 start() {
         ebegin "Starting PHP FastCGI Process Manager"
+       set_phpvars
         start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
-            /usr/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
         local i=0
         local timeout=5
         while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
@@ -30,12 +34,14 @@ start() {
 
 stop() {
         ebegin "Stopping PHP FastCGI Process Manager"
-        start-stop-daemon --signal QUIT --stop --exec /usr/bin/php-fpm --pidfile ${PHP_FPM_PID}
+       set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
         eend $?
 }
 
 reload() {
     ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
     [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
     eend $?
 }
index 558d57e590182d37bb4ab4fdd7aaaccb43454e87..3a5d326a59af554734802c0853ccb9327b38210c 100755 (executable)
@@ -93,6 +93,11 @@ do_routes()
 
 start()
 {
+       ewarn
+       ewarn "The $RC_SVCNAME script is deprecated and will be"
+       ewarn "removed in the future."
+       ewarn "Please use the net.* scripts to manage your network interfaces."
+       ewarn
        do_routes "Adding" "add"
 }
 
index 186d6f93ceb19f27cff4354200414020730b6cc3..605a4e530832cbd22b768006a4cceaa2eb4f2c0a 100755 (executable)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 2004-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd2,v 1.1 2011/08/18 09:51:23 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd2,v 1.2 2012/01/14 19:46:34 tommy Exp $
 
 depend() {
        need net
@@ -14,7 +14,7 @@ start() {
        cd /
        start-stop-daemon --start --quiet --background --make-pidfile \
                --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
-               --user ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
+               --user ${SVNSERVE_USER:-apache} --group ${SVNSERVE_GROUP:-apache} -- \
                --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
        eend $?
 }
index 2433d8479f8c1b7f29b6a3d3cabb9eee220366be..50c98a9848560a23fb38623cb209800b2f242dff 100755 (executable)
@@ -50,6 +50,41 @@ mount_misc()
                        eend $?
                fi
        fi
+
+       # Setup Kernel Support for configfs
+       if [ -d /sys/kernel/config ] && ! mountinfo -q /sys/kernel/config; then
+               if grep -qs configfs /proc/filesystems; then
+                       ebegin "Mounting config filesystem"
+                       mount -n -t configfs -o  nodev,noexec,nosuid \
+                               configfs /sys/kernel/config
+                       eend $?
+               fi
+       fi
+
+       # set up kernel support for cgroups
+       if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+               if grep -qs cgroup /proc/filesystems; then
+                       ebegin "Mounting cgroup filesystem"
+                       local opts="nodev,noexec,nosuid,mode=755,size=${rc_cgroupsize:-10m}"
+                       mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+                       eend $?
+               fi
+       fi
+}
+
+mount_cgroups()
+{
+       yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
+               mountinfo -q /sys/fs/cgroup || return 0
+
+       while read name hier groups enabled rest; do
+               case "${enabled}" in
+                       1)      mkdir /sys/fs/cgroup/${name}
+                               mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
+                                       ${name} /sys/fs/cgroup/${name}
+                               ;;
+               esac
+       done < /proc/cgroups
 }
 
 start()
@@ -59,6 +94,11 @@ start()
        retval=$?
        if [ $retval -eq 0 ]; then
                mount_misc
+               retval=$?
+       fi
+       if [ $retval -eq 0 ]; then
+               mount_cgroups
+               retval=$?
        fi
        return $retval
 }
index 2c2e6b0920aa81532719f18f26878e0f189fdd29..d7951d1e27480ce3374fe7487b59a013d1dabfee 100755 (executable)
@@ -31,7 +31,7 @@ start()
        n=1
        while [ ${n} -le "$ttyn" ]; do
                printf "\033%s" "$termencoding" >$ttydev$n
-               n=$(($n + 1))
+               : $(( n += 1 ))
        done
 
        # Save the encoding for use immediately at boot
index 833cca0c25a34a579932962fc372aa3b9806d498..1912c8be6f60a2e279bcffdff11139393beacfb7 100755 (executable)
@@ -2,48 +2,83 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+command=/sbin/udevd
+command_args="--daemon ${udev_opts}"
 description="Run udevd and create the device-nodes"
 
-[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-
+persistent_cd_disable="${persistent_cd_disable:-no}"
+persistent_net_disable="${persistent_net_disable:-no}"
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
+udev_debug="${udev_debug:-no}"
+udev_monitor="${udev_monitor:-no}"
+udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
+udev_settle_timeout="${udev_settle_timeout:-60}"
+kv_min="${kb_min:-2.6.32}"
 
 depend()
 {
-       if [ -f /etc/init.d/sysfs ]; then
-               # require new enough openrc with sysinit being extra runlevel
-               # on linux we just check if sysfs init-script exists
-               # this is to silence out ugly warnings about not-existing sysfs script
-               provide dev
-               if yesno "${rc_device_tarball:-no}"; then
-                       need sysfs udev-mount udev-dev-tarball
-               else
-                       need sysfs udev-mount
-               fi
-               before checkfs fsck
+       provide dev
+       need sysfs udev-mount
+       before checkfs fsck
 
-               # udev does not work inside vservers
-               keyword novserver nolxc
-       fi
+       # udev does not work inside vservers
+       keyword -vserver -lxc
 }
 
-cleanup()
+KV_to_int()
 {
-       # fail more gracely and not leave udevd running
-       start-stop-daemon --stop --exec /sbin/udevd
-       exit 1
+       [ -z $1 ] && return 1
+
+       local x=${1%%[!0-9.]*} y= z=
+       local KV_MAJOR=${x%%.*}
+       y=${x#*.}
+       [ "$x" = "$y" ] && y=0.0
+       local KV_MINOR=${y%%.*}
+       z=${y#*.}
+       [ "$y" = "$z" ] && z=0
+       local KV_MICRO=${z%%.*}
+       local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
+
+       # We make version 2.2.0 the minimum version we will handle as
+       # a sanity check ... if its less, we fail ...
+       [ "${KV_int}" -lt 131584 ] && return 1
+       
+       echo "${KV_int}"
 }
 
-disable_hotplug_agent()
+_RC_GET_KV_CACHE=""
+get_KV()
 {
-       if [ -e /proc/sys/kernel/hotplug ]; then
-               echo "" >/proc/sys/kernel/hotplug
+       if [ -z "${_RC_GET_KV_CACHE}" ] ; then
+               _RC_GET_KV_CACHE="$(uname -r)"
        fi
+       echo "$(KV_to_int "${_RC_GET_KV_CACHE}")"
+       return $?
 }
 
-root_link()
+# FIXME
+# Instead of this script testing kernel version, udev itself should
+# Maybe something like udevd --test || exit $?
+check_kernel()
 {
-       /lib64/udev/write_root_link_rule
+       if [ $(get_KV) -lt $(KV_to_int ${kv_min}) ]; then
+               eerror "Your kernel is too old to work with this version of udev."
+               eerror "Current udev only supports Linux kernel ${kv_min} and newer."
+               return 1
+       fi
+       return 0
+}
+
+get_rundir()
+{
+       echo $(udevadm info --run)
+}
+
+cleanup()
+{
+       # fail more gracely and not leave udevd running
+       start-stop-daemon --stop --exec /sbin/udevd
+       exit 1
 }
 
 rules_disable_switch()
@@ -51,7 +86,7 @@ rules_disable_switch()
        # this function disables rules files
        # by creating new files with the same name
        # in a temp rules directory with higher priority
-       local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2"
+       local f=$(get_rundir)/rules.d/"$1" bname="$1" onoff="$2"
 
        if yesno "${onoff}"; then
                echo "# This file disables ${bname} due to /etc/conf.d/udev" \
@@ -61,8 +96,8 @@ rules_disable_switch()
        fi
 }
 
-# only called on openrc
-is_service_enabled() {
+is_service_enabled()
+{
        local svc="$1"
 
        [ ! -e "/etc/init.d/${svc}" ] && return 1
@@ -72,35 +107,59 @@ is_service_enabled() {
        return 1
 }
 
-check_openrc_net()
+start_pre()
 {
-       local f=/dev/.udev/rules.d/90-network.rules
-       is_service_enabled network || return 0
+       if [ -d /run ]; then
+               checkpath -d -m 0755 -o root:root -q /run/udev
+       fi
 
-       # disable network hotplugging
-       echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}"
-       echo "# as we use new-style network init script /etc/init.d/network" >> "${f}"
-}
+       if is_service_enabled network; then
+               # disable network hotplugging
+               local f="$(get_rundir)/rules.d/90-network.rules"
+               echo "# This file disables network hotplug events calling" >> "${f}"
+               echo "# old-style openrc net scripts" >> "${f}"
+               echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
+       fi
+
+       if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
+               ewarn "You should add udev-postmount service to your default runlevel."
+       fi
+
+       /lib/udev/write_root_link_rule
+
+       rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable}"
+       rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable}
+       
+       if [ -e /proc/sys/kernel/hotplug ]; then
+               echo "" >/proc/sys/kernel/hotplug
+       fi
 
-start_udevd()
-{
        # load unix domain sockets if built as module, Bug #221253
-       if [ -e /proc/modules ] ; then
-               modprobe -q unix 2>/dev/null
+       # and not yet loaded, Bug #363549
+       if [ ! -e /proc/net/unix ]; then
+               if ! modprobe unix; then
+                       eerror "Cannot load the unix domain socket module"
+               fi
        fi
-       local opts="${udev_opts}"
 
-       ebegin "Starting udevd"
-       if yesno "${udev_debug:-no}"; then
-               /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log
-       else
-               start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts}
+       if yesno "${udev_debug}"; then
+               command_args="${command_args} --debug 2> $(get_rundir)/udev.log"
        fi
+}
 
-       eend $?
+start_udevmonitor()
+{
+       yesno "${udev_monitor}" || return 0
+
+       udevmonitor_log="$(get_rundir)/udevmonitor.log"
+       udevmonitor_pid="$(get_rundir)/udevmonitor.pid"
+
+       einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
+       start-stop-daemon --start --stdout "${udevmonitor_log}" \
+               --make-pidfile --pidfile "${udevmonitor_pid}" \
+               --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
 }
 
-# populate /dev with devices already found by the kernel
 populate_dev()
 {
        if get_bootparam "nocoldplug" ; then
@@ -109,71 +168,27 @@ populate_dev()
        fi
 
        ebegin "Populating /dev with existing devices through uevents"
-       udevadm control --property=STARTUP=1
-       if yesno "${rc_coldplug}"; then
-               udevadm trigger --action="add"
-       else
+       if ! yesno "${rc_coldplug}"; then
                # Do not run any init-scripts, Bug #206518
                udevadm control --property=do_not_run_plug_service=1
-
-               # only create device nodes
-               udevadm trigger --action="add" --attr-match=dev
-
-               # run persistent-net stuff, bug 191466
-               udevadm trigger --action="add" --subsystem-match=net
        fi
+       udevadm trigger --type=subsystems --action=add
+       udevadm trigger --type=devices --action=add
        eend $?
 
        # we can speed up booting under these conditions:
        #  * using devtmpfs so kernel creates device nodes for us
-       #  * only using kernel created device nodes at boot (in /etc/fstab and elsewhere)
+       #  * only using kernel created device nodes at boot
+       # (in /etc/fstab and elsewhere)
        #
        ebegin "Waiting for uevents to be processed"
-       udevadm settle --timeout=${udev_settle_timeout:-60}
+       udevadm settle --timeout=${udev_settle_timeout}
        eend $?
 
        udevadm control --property=do_not_run_plug_service=
-       udevadm control --property=STARTUP=
        return 0
 }
 
-# for debugging
-start_udevmonitor()
-{
-       yesno "${udev_monitor:-no}" || return 0
-
-       udevmonitor_log=/dev/.udev/udevmonitor.log
-       udevmonitor_pid=/dev/.udev/udevmonitor.pid
-
-       einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events"
-       start-stop-daemon --start --stdout "${udevmonitor_log}" \
-               --make-pidfile --pidfile "${udevmonitor_pid}" \
-               --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
-}
-
-stop_udevmonitor()
-{
-       yesno "${udev_monitor:-no}" || return 0
-
-       if yesno "${udev_monitor_keep_running:-no}"; then
-               ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
-       else
-               einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
-               start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
-       fi
-}
-
-display_hotplugged_services() {
-       local svcfile= svc= services=
-       for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
-               svc="${svcfile##*/}"
-               [ -x "${svcfile}" ] || continue
-
-               services="${services} ${svc}"
-       done
-       [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
-}
-
 check_persistent_net()
 {
        # check if there are problems with persistent-net
@@ -196,7 +211,7 @@ check_persistent_net()
        # is installed into /usr/bin and not available at boot.
        dups=$(
        RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
-       . /lib64/udev/rule_generator.functions
+       . /lib/udev/rule_generator.functions
        find_all_rules 'NAME=' '.*' | \
        tr ' ' '\n' | \
        sort | \
@@ -224,49 +239,37 @@ check_udev_works()
        return 0
 }
 
-start()
+stop_udevmonitor()
 {
-       # do not run this on old baselayout where udev-addon gets loaded
-       if [ ! -f /etc/init.d/sysfs ]; then
-               eerror "The $SVCNAME init-script is written for baselayout-2!"
-               eerror "Please do not use it with baselayout-1!".
-               return 1
+       yesno "${udev_monitor}" || return 0
+
+       if yesno "${udev_monitor_keep_running}"; then
+               ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
+       else
+               einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
+               start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
        fi
+}
 
-       check_openrc_net
-       _start
-       
-       display_hotplugged_services
+display_hotplugged_services()
+{
+       local svcfile= svc= services=
+       for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
+               svc="${svcfile##*/}"
+               [ -x "${svcfile}" ] || continue
 
-       return 0
+               services="${services} ${svc}"
+       done
+       [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
 }
 
-_start()
+start_post()
 {
-       if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
-               ewarn "You should add udev-postmount service to your default runlevel."
-       fi
-
-       root_link
-       rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}"
-       rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no}
-       
-       disable_hotplug_agent
-       start_udevd || cleanup
        start_udevmonitor
-       populate_dev || cleanup
-
+       populate_dev
        check_persistent_net
-
        check_udev_works || cleanup
        stop_udevmonitor
-
+       display_hotplugged_services
        return 0
 }
-
-stop() {
-       ebegin "Stopping udevd"
-       start-stop-daemon --stop --exec /sbin/udevd
-       eend $?
-}
-
diff --git a/init.d/udev-dev-tarball b/init.d/udev-dev-tarball
deleted file mode 100755 (executable)
index d32c7b2..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Maintain a tarball of not udev managed device nodes"
-[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
-
-rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}}
-device_tarball=/lib64/udev/state/devices.tar.bz2
-
-depend() {
-       if [ -f /etc/init.d/sysfs ]; then
-               need udev-mount
-       fi
-}
-
-start()
-{
-       _start
-}
-
-_start() {
-       if yesno "${rc_device_tarball}" && \
-               [ -s "${device_tarball}" ]
-       then
-               ebegin "Populating /dev with saved device nodes"
-               tar -jxpf "${device_tarball}" -C /dev
-               eend $?
-       fi
-}
-
-stop() {
-       if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \
-               ! yesno "${rc_device_tarball}" || \
-               ! touch "${device_tarball}" 2>/dev/null
-       then
-               return 0
-       fi
-
-       ebegin "Saving device nodes"
-       # Handle our temp files
-       save_tmp_base=/tmp/udev.savedevices."$$"
-       devices_udev="${save_tmp_base}"/devices.udev
-       devices_real="${save_tmp_base}"/devices.real
-       devices_totar="${save_tmp_base}"/devices.totar
-       device_tmp_tarball="${save_tmp_base}"/devices
-
-       rm -rf "${save_tmp_base}"
-       mkdir "${save_tmp_base}"
-       touch "${devices_udev}" "${devices_real}" \
-               "${devices_totar}" "${device_tmp_tarball}"
-
-       if [ -f "${devices_udev}" -a -f "${devices_real}" -a \
-               -f "${devices_totar}" -a -f "${device_tmp_tarball}" ]
-       then
-               cd /dev
-               # Find all devices, but ignore .udev directory
-               find . -xdev -type b -or -type c -or -type l | \
-               cut -d/ -f2- | \
-               grep -v ^\\.udev >"${devices_real}"
-
-               # Figure out what udev created
-               udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}"
-               # These ones we also do not want in there
-               for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do
-                       echo "${x}" >> "${devices_udev}"
-               done
-               if [ -d /lib64/udev/devices ]; then
-                       cd /lib64/udev/devices
-                       find . -xdev -type b -or -type c -or -type l | \
-                       cut -d/ -f2- >> "${devices_udev}"
-                       cd /dev
-               fi
-
-               fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}"
-
-               # Now only tarball those not created by udev if we have any
-               if [ -s "${devices_totar}" ]; then
-                       # we dont want to descend into mounted filesystems (e.g. devpts)
-                       # looking up username may involve NIS/network
-                       # and net may be down
-                       tar --one-file-system --numeric-owner \
-                               -jcpf "${device_tmp_tarball}" -T "${devices_totar}"
-                       mv -f "${device_tmp_tarball}" "${device_tarball}"
-               else
-                       rm -f "${device_tarball}"
-               fi
-               eend 0
-       else
-               eend 1 "Could not create temporary files!"
-       fi
-
-       rm -rf "${save_tmp_base}"
-}
-
index 52cf26b72b7c5ee9abcd4d56982471e6928f3fbe..62742bd644bc1e7ce48a925ff8392852dc92f6a5 100755 (executable)
@@ -2,32 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-description="Mount tmpfs on /dev"
-[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
+description="mount devtmpfs or tmpfs on /dev"
 
-# get_KV and KV_to_int
-. /lib64/udev/shell-compat-KV.sh
-
-# FIXME
-# Instead of this script testing kernel version, udev itself should
-# Maybe something like udevd --test || exit $?
-check_kernel()
+depend()
 {
-       if [ $(get_KV) -lt $(KV_to_int '2.6.25') ]; then
-               eerror "Your kernel is too old to work with this version of udev."
-               eerror "Current udev only supports Linux kernel 2.6.25 and newer."
-               return 1
-       fi
-
-       yesno "${unreliable_kernel_warning:-yes}" || return 0
-
-       if [ $(get_KV) -lt $(KV_to_int '2.6.27') ]; then
-               ewarn "You need at least Linux kernel 2.6.27 for reliable operation of udev."
-       fi
-       return 0
+       keyword -vserver -lxc
 }
 
-
 mount_dev_directory()
 {
        if mountinfo -q /dev; then
@@ -72,22 +53,8 @@ seed_dev()
        return 0
 }
 
-
 start()
 {
-       # do not run this on too old baselayout - udev-addon is already loaded!
-       if [ ! -f /etc/init.d/sysfs ]; then
-               eerror "The $SVCNAME init-script is written for baselayout-2!"
-               eerror "Please do not use it with baselayout-1!".
-               return 1
-       fi
-
-       _start
-}
-
-_start()
-{
-       check_kernel || return 1
        mount_dev_directory || return 1
 
        # Selinux lovin; /selinux should be mounted by selinux-patched init
@@ -98,10 +65,6 @@ _start()
                HAVE_SELINUX=false
        fi
 
-       # make sure it exists
-       mkdir -p /dev/.udev /dev/.udev/rules.d
-       
        seed_dev
-
        return 0
 }
index 12a30f669a683036bec49a459878e8f7eb2f903a..d689681fbb4c9b54f3046b6fcf455042616b64b9 100755 (executable)
@@ -1,11 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/164/udev-postmount.initd,v 1.1 2010/10/30 13:53:54 zzam Exp $
 
-depend() {
+udev_version()
+{
+       echo $(udevadm --version)
+}
+
+depend()
+{
        need localmount
-       after dbus # for trigger failed
+       if [ $(udev_version) -lt 175 ]; then
+               after dbus # for trigger failed
+       fi
+       keyword -vserver -lxc
 }
 
 dir_writeable()
@@ -15,12 +23,13 @@ dir_writeable()
 
 # store persistent-rules that got created while booting
 # when / was still read-only
-store_persistent_rules() {
+store_persistent_rules()
+{
        # only continue if rules-directory is writable
        dir_writeable /etc/udev/rules.d || return 0
 
        local file dest
-       for file in /dev/.udev/tmp-rules--*; do
+       for file in "${RUNDIR}"/tmp-rules--*; do
                dest=${file##*tmp-rules--}
                [ "$dest" = '*' ] && break
                type=${dest##70-persistent-}
@@ -31,23 +40,27 @@ store_persistent_rules() {
        done
 }
 
-
-start() {
+start()
+{
+       RUNDIR=$(udevadm info --run)
        # check if this system uses udev
-       [ -d /dev/.udev/ ] || return 0
+       [ -d "${RUNDIR}" ] || return 0
 
        einfo "Doing udev cleanups"
 
-       # Run the events that failed at first udev trigger
-       udevadm trigger --type=failed -v
+       if [ $(udev_version) -lt 175 ]; then
+               # Run the events that failed at first udev trigger
+               udevadm trigger --type=failed -v
+       fi
 
        # store persistent-rules that got created while booting
        # when / was still read-only
        store_persistent_rules
 }
 
-stop() {
-       :
+stop()
+{
+       return 0
 }
 
 # vim:ts=4
index 7d05fe8fd28d0cc5cda9011b5212d6e2be8670c6..e2f76a1b78422ddbd3da51b0cff29a6a24b0bf4b 100755 (executable)
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.3 2009/08/10 06:01:18 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.5 2012/01/01 01:01:06 idl0r Exp $
 
-opts="reload"
+extra_started_commands="reload"
 
 depend() {
        need net
@@ -21,16 +21,16 @@ start() {
        ebegin "Starting ulogd"
        start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -u ulogd -d >/dev/null 2>&1
        eend $?
-}      
+}
 
 stop() {
        ebegin "Stopping ulogd"
        start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
        eend $?
-}      
+}
 
 reload() {
        ebegin "Reloading ulogd.conf file"
        killall -HUP ulogd &>/dev/null
        eend $?
-}      
+}
index 99e11274f1f1bc14b2dd45dbd025c6739e0f23e9..20e4325c068e1658384ee55e938a94ef9a8da922 100755 (executable)
@@ -2,7 +2,7 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-: ${urandom_seed:=${URANDOM_SEED:-/var/run/random-seed}}
+: ${urandom_seed:=${URANDOM_SEED:-/var/lib/misc/random-seed}}
 description="Initializes the random number generator."
 
 depend()
@@ -16,7 +16,7 @@ save_seed()
        local psz=1
 
        if [ -e /proc/sys/kernel/random/poolsize ]; then
-               psz=$(($(cat /proc/sys/kernel/random/poolsize) / 4096))
+               : $(( psz = $(cat /proc/sys/kernel/random/poolsize) / 4096 ))
        fi
 
        (       # sub shell to prevent umask pollution
diff --git a/kernel-config/config-3.2.1-gentoo-r2-00 b/kernel-config/config-3.2.1-gentoo-r2-00
new file mode 100644 (file)
index 0000000..d88c030
--- /dev/null
@@ -0,0 +1,2898 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 3.2.1-gentoo-r2 Kernel Configuration
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="helga"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_FHANDLE=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=64
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=21
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_BLK_CGROUP=m
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# CONFIG_OPROFILE is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+# CONFIG_JUMP_LABEL is not set
+CONFIG_OPTPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_SMP=y
+# CONFIG_X86_X2APIC is not set
+CONFIG_X86_MPPARSE=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_VSMP is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=7
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=64
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+# CONFIG_I8K is not set
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CLEANCACHE=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_NUMA=y
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_APEI=y
+# CONFIG_ACPI_APEI_GHES is not set
+# CONFIG_ACPI_APEI_PCIEAER is not set
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+# CONFIG_SFI is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+
+#
+# shared options
+#
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_INTEL_IDLE is not set
+
+#
+# Memory power savings
+#
+# CONFIG_I7300_IDLE is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=m
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_NET_DCCPPROBE is not set
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_ADVANCED=y
+CONFIG_TIPC_PORTS=8191
+CONFIG_TIPC_LOG=0
+# CONFIG_TIPC_DEBUG is not set
+# CONFIG_ATM is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+# CONFIG_L2TP_V3 is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+# CONFIG_GACT_PROB is not set
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_HAVE_BPF_JIT=y
+# CONFIG_BPF_JIT is not set
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_FIB_RULES=y
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+# CONFIG_NFC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+CONFIG_DEBUG_DEVRES=y
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_OSD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_VMWARE_BALLOON is not set
+# CONFIG_BMP085 is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI_DH=m
+# CONFIG_SCSI_DH_RDAC is not set
+# CONFIG_SCSI_DH_HP_SW is not set
+# CONFIG_SCSI_DH_EMC is not set
+# CONFIG_SCSI_DH_ALUA is not set
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+CONFIG_PATA_AMD=y
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+CONFIG_PATA_OLDPIIX=y
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SC1200 is not set
+CONFIG_PATA_SCH=y
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_PATA_ACPI is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_DEBUG_SPACE_MAPS=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=y
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_UEVENT is not set
+CONFIG_DM_FLAKEY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_ISCSI_TARGET=m
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+# CONFIG_I2O_SCSI is not set
+CONFIG_I2O_PROC=m
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_FC is not set
+CONFIG_MII=y
+CONFIG_IFB=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_NETCONSOLE=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+
+#
+# CAIF transport drivers
+#
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_HP=y
+# CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_ZNET=m
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+# CONFIG_SKGE_GENESIS is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_SEEQ8005=m
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_DEBUG_FS=y
+CONFIG_STMMAC_DA=y
+CONFIG_STMMAC_RING=y
+# CONFIG_STMMAC_CHAINED is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=m
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_TR is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_ROCKETPORT is not set
+# CONFIG_CYCLADES is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_SYNCLINK is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_SYNCLINK_GT is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_ISI is not set
+# CONFIG_N_HDLC is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVKMEM=y
+# CONFIG_STALDRV is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MFD_HSU is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+# CONFIG_HPET_MMAP is not set
+# CONFIG_HANGCHECK_TIMER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+# CONFIG_RAMOOPS is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_MUX_PCA9541 is not set
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_XILINX is not set
+CONFIG_I2C_EG20T=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ20Z75 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83795_FANCTRL=y
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+# CONFIG_HPWDT_NMI_DECODING is not set
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+# CONFIG_SSB_B43_PCI_BRIDGE is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_CS5535 is not set
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_DRM is not set
+CONFIG_STUB_POULSBO=m
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=m
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_LOGO is not set
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_INTEL_SS4200 is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+# CONFIG_RTC_DRV_M41T80_WDT is not set
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+# CONFIG_INTEL_IOATDMA is not set
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_STAGING=y
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_ECHO is not set
+# CONFIG_COMEDI is not set
+# CONFIG_RTS_PSTOR is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+CONFIG_XVMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_ZCACHE=m
+# CONFIG_FB_SM7XX is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+CONFIG_INTEL_MEI=m
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACERHDF is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_HP_ACCEL is not set
+# CONFIG_MSI_LAPTOP is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+CONFIG_SENSORS_HDAPS=m
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_ACPI_WMI is not set
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_INTEL_IPS is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_XO15_EBOOK is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_SAMSUNG_Q10 is not set
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_STATS=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_HYPERV is not set
+# CONFIG_PM_DEVFREQ is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=y
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
+CONFIG_JBD_DEBUG=y
+CONFIG_JBD2=y
+CONFIG_JBD2_DEBUG=y
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_QUOTA_DEBUG=y
+CONFIG_QUOTA_TREE=m
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_FSCACHE_OBJECT_LIST=y
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_EXOFS_FS is not set
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_FSCACHE is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_KMEMCHECK is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+CONFIG_DEBUG_NX_TEST=m
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+CONFIG_DEBUG_BOOT_PARAMS=y
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITYFS is not set
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+CONFIG_INTEGRITY=y
+# CONFIG_IMA is not set
+CONFIG_EVM=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_DEFAULT_SECURITY="selinux"
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_PADLOCK is not set
+CONFIG_HAVE_KVM=y
+# CONFIG_VIRTUALIZATION is not set
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
index a743599398775f3b109259e26d1f37cd09939e67..b74966fe8bd85c6728f69ae91ec5afce59d1f5bf 100644 (file)
Binary files a/ld.so.cache and b/ld.so.cache differ
index 934f1b9918a63f92862ecdb25e7e7b9f4c3833d7..c5d51f95f053ab52e482a5ba14a57dc3a897be83 100644 (file)
@@ -1,5 +1,6 @@
-# See ldap.conf(5) and README.LDAP for details\n"
-# This file should only be readable by root\n\n"
-# supported directives: host, port, ssl, ldap_version\n"
-# uri, binddn, bindpw, sudoers_base, sudoers_debug\n"
+# See ldap.conf(5) and README.LDAP for details
+# This file should only be readable by root
+
+# supported directives: host, port, ssl, ldap_version
+# uri, binddn, bindpw, sudoers_base, sudoers_debug
 # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
index 14ecda4e35f071502019e2b779409508cee116f3..955f53858a0255fb5bc67f9ede445ff549dc9227 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /etc/logrotate.d/.rcs/mysql,v 1.2 2010/12/02 12:03:24 root Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/logrotate.mysql,v 1.2 2011/01/13 20:06:06 robbat2 Exp $
 
 /var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
 monthly
@@ -10,7 +10,7 @@ size 5M
 sharedscripts
 missingok
 postrotate
-/bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
+[ -f /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
 endscript
 }
 
diff --git a/lvm/cache/.cache b/lvm/cache/.cache
deleted file mode 100644 (file)
index f9a8c07..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# This file is automatically maintained by lvm.
-
-persistent_filter_cache {
-       valid_devices=[
-               "/dev/block/1:13",
-               "/dev/block/1:14",
-               "/dev/disk/by-uuid/016e320e-adc4-49e2-bbef-3bbfcca3e061",
-               "/dev/disk/by-uuid/2ef3f905-85fb-449d-a475-cc7b155859e9",
-               "/dev/md5",
-               "/dev/dm-6",
-               "/dev/ram11",
-               "/dev/disk/by-uuid/4529fd4e-3f6a-4f93-97f6-13b239e290d0",
-               "/dev/mapper/vg0-opt",
-               "/dev/mapper/vg0-var_tmp",
-               "/dev/disk/by-uuid/ef01531f-1d0b-4017-9a0a-fe283b0b4002",
-               "/dev/block/253:2",
-               "/dev/block/253:8",
-               "/dev/mapper/vg0-tmp",
-               "/dev/disk/by-id/dm-name-vg0-portage",
-               "/dev/block/1:12",
-               "/dev/vg0/home",
-               "/dev/md/4_0",
-               "/dev/dm-5",
-               "/dev/vg0/distfiles",
-               "/dev/ram10",
-               "/dev/disk/by-id/md-uuid-d40fb806:936051ce:2bb44714:c9ba289e",
-               "/dev/mapper/vg0-backup",
-               "/dev/disk/by-id/md-uuid-e14ce422:f5403896:2bb44714:c9ba289e",
-               "/dev/block/253:3",
-               "/dev/block/253:4",
-               "/dev/block/253:7",
-               "/dev/disk/by-id/dm-name-vg0-usr",
-               "/dev/block/1:10",
-               "/dev/vg0/portage",
-               "/dev/ram12",
-               "/dev/vg0/opt",
-               "/dev/block/1:6",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhRTdfBJrROm3zaoFAjG5iQTkBPEdJ43zh",
-               "/dev/disk/by-id/dm-name-vg0-var",
-               "/dev/ram6",
-               "/dev/block/253:1",
-               "/dev/mapper/vg0-portage",
-               "/dev/disk/by-id/md-uuid-e646515a:d67b7d90:2bb44714:c9ba289e",
-               "/dev/disk/by-uuid/195667d8-27ba-43d7-8f7c-4e1adec2480e",
-               "/dev/block/1:11",
-               "/dev/block/9:5",
-               "/dev/ram13",
-               "/dev/ram14",
-               "/dev/block/1:5",
-               "/dev/disk/by-uuid/6c4afd3c-e823-4b2f-8bf9-379dad03656a",
-               "/dev/vg0/tmp",
-               "/dev/mapper/vg0-distfiles",
-               "/dev/ram5",
-               "/dev/block/253:0",
-               "/dev/vg0/backup",
-               "/dev/block/1:15",
-               "/dev/dm-2",
-               "/dev/md3",
-               "/dev/md4",
-               "/dev/dm-8",
-               "/dev/block/1:1",
-               "/dev/mapper/vg0-home",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhMvBpISWHWzHpzVgTfIyexqOdbk9gLkL8",
-               "/dev/ram1",
-               "/dev/disk/by-uuid/45140c03-809b-4343-8c8a-c424786ed86b",
-               "/dev/block/253:6",
-               "/dev/mapper/vg0-usr",
-               "/dev/md2",
-               "/dev/dm-3",
-               "/dev/dm-4",
-               "/dev/dm-7",
-               "/dev/block/1:0",
-               "/dev/mapper/vg0-var",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhQdCiqcWAxVqFyC808HtdytxdEfQbfzv2",
-               "/dev/disk/by-id/dm-name-vg0-var_tmp",
-               "/dev/disk/by-id/dm-name-vg0-distfiles",
-               "/dev/ram0",
-               "/dev/disk/by-id/dm-name-vg0-home",
-               "/dev/vg0/var_tmp",
-               "/dev/block/253:5",
-               "/dev/disk/by-uuid/3d73e83f-56d2-4d34-a881-0db5edb71ca2",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilh7RV5kq43EpeJil3RScIQj5RjzpCtLxfY",
-               "/dev/block/9:2",
-               "/dev/dm-1",
-               "/dev/root",
-               "/dev/disk/by-uuid/8313d568-2a70-4cf9-a608-7a82bf9e12a5",
-               "/dev/disk/by-id/dm-name-vg0-tmp",
-               "/dev/block/1:2",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhoU4b0re0QhRsUgn0m0JAx2T3isUOXV7W",
-               "/dev/block/1:8",
-               "/dev/block/1:9",
-               "/dev/md/2_0",
-               "/dev/disk/by-id/dm-name-vg0-backup",
-               "/dev/ram2",
-               "/dev/ram8",
-               "/dev/ram9",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhvNtxlo1SGLLRmW6RcjK2lvSsWWMj76sq",
-               "/dev/md/3_0",
-               "/dev/md/5_0",
-               "/dev/disk/by-id/md-uuid-dd2865af:1aa294d4:2bb44714:c9ba289e",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilh1bbUbKjKNYdbqmU0T0OKffh5EdNtK8fh",
-               "/dev/block/9:3",
-               "/dev/block/9:4",
-               "/dev/dm-0",
-               "/dev/disk/by-uuid/95d9c65b-c487-4045-bfb8-017cdeb21a0f",
-               "/dev/vg0/var",
-               "/dev/ram15",
-               "/dev/block/1:3",
-               "/dev/block/1:4",
-               "/dev/block/1:7",
-               "/dev/disk/by-uuid/093cbf96-5d04-479b-a77f-4abcb88ebe6c",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhjQqaJPSu48lBZzoVduHNru6m3LzXLgiz",
-               "/dev/vg0/usr",
-               "/dev/disk/by-id/dm-uuid-LVM-UflbwMFGlwqFqq1b6TUw2GAAdYM94ilhnz4D5cTcAHO0iDRSs70CjgrDSA399f3S",
-               "/dev/disk/by-id/dm-name-vg0-opt",
-               "/dev/disk/by-uuid/e346fd9e-67df-446e-8295-631e2846089b",
-               "/dev/ram3",
-               "/dev/ram4",
-               "/dev/ram7"
-       ]
-}
index 567144ba14cd69e8de8bc60d4638c8bfd66b392b..cec2578230eab1490b8896ea86f26d4eb3484f03 100644 (file)
@@ -6,6 +6,9 @@
 #
 # To put this file in a different directory and override /etc/lvm set
 # the environment variable LVM_SYSTEM_DIR before running the tools.
+#
+# N.B. Take care that each setting only appears once if uncommenting
+# example settings in this file.
 
 
 # This section allows you to configure which block devices should
@@ -19,6 +22,16 @@ devices {
     # to use with LVM2.
     scan = [ "/dev" ]
 
+    # 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
+    # subdirectories found in the device directory. This setting is applied
+    # to udev-managed device directory only, other directories will be scanned
+    # fully. LVM2 needs to be compiled with udev support for this setting to
+    # take effect. N.B. Any device node or symlink not managed by udev in
+    # udev directory will be ignored with this setting on.
+    obtain_device_list_from_udev = 1
+
     # If several entries in the scanned directories correspond to the
     # same block device and the tools need to display a name for device,
     # all the pathnames are matched against each item in the following
@@ -100,6 +113,10 @@ devices {
     # 1 enables; 0 disables.
     md_chunk_alignment = 1
 
+    # Default alignment of the start of a data area in MB.  If set to 0,
+    # a value of 64KB will be used.  Set to 1 for 1MiB, 2 for 2MiB, etc.
+    # default_data_alignment = 1
+
     # By default, the start of a PV's data area will be a multiple of
     # the 'minimum_io_size' or 'optimal_io_size' exposed in sysfs.
     # - minimum_io_size - the smallest request the device can perform
@@ -113,9 +130,9 @@ devices {
     data_alignment_detection = 1
 
     # Alignment (in KB) of start of data area when creating a new PV.
-    # If a PV is placed directly upon an md device and md_chunk_alignment or
-    # data_alignment_detection is enabled this parameter is ignored.
-    # Set to 0 for the default alignment of 1MB or page size, if larger.
+    # md_chunk_alignment and data_alignment_detection are disabled if set.
+    # Set to 0 for the default alignment (see: data_alignment_default)
+    # or page size, if larger.
     data_alignment = 0
 
     # By default, the start of the PV's aligned data area will be shifted by
@@ -124,6 +141,7 @@ devices {
     # windows partitioning will have an alignment_offset of 3584 bytes
     # (sector 7 is the lowest aligned logical block, the 4KB sectors start
     # at LBA -1, and consequently sector 63 is aligned on a 4KB boundary).
+    # But note that pvcreate --dataalignmentoffset will skip this detection.
     # 1 enables; 0 disables.
     data_alignment_offset_detection = 1
 
@@ -133,10 +151,70 @@ devices {
     # in recovery situations.
     ignore_suspended_devices = 0
 
+    # During each LVM operation errors received from each device are counted.
+    # If the counter of a particular device exceeds the limit set here, no
+    # further I/O is sent to that device for the remainder of the respective
+    # operation. Setting the parameter to 0 disables the counters altogether.
+    disable_after_error_count = 0
+
     # Allow use of pvcreate --uuid without requiring --restorefile.
     require_restorefile_with_uuid = 1
+
+    # Minimum size (in KB) of block devices which can be used as PVs.
+    # In a clustered environment all nodes must use the same value.
+    # Any value smaller than 512KB is ignored.
+
+    # Ignore devices smaller than 2MB such as floppy drives.
+    pv_min_size = 2048
+
+    # The original built-in setting was 512 up to and including version 2.02.84.
+    # pv_min_size = 512
+
+    # Issue discards to a logical volumes's underlying physical volume(s) when
+    # the logical volume is no longer using the physical volumes' space (e.g.
+    # lvremove, lvreduce, etc).  Discards inform the storage that a region is
+    # no longer in use.  Storage that supports discards advertise the protocol
+    # specific way discards should be issued by the kernel (TRIM, UNMAP, or
+    # WRITE SAME with UNMAP bit set).  Not all storage will support or benefit
+    # from discards but SSDs and thinly provisioned LUNs generally do.  If set
+    # to 1, discards will only be issued if both the storage and kernel provide
+    # support.
+    # 1 enables; 0 disables.
+    issue_discards = 0
 }
 
+# This section allows you to configure the way in which LVM selects
+# free space for its Logical Volumes.
+#allocation {
+#    When searching for free space to extend an LV, the "cling"
+#    allocation policy will choose space on the same PVs as the last
+#    segment of the existing LV.  If there is insufficient space and a
+#    list of tags is defined here, it will check whether any of them are
+#    attached to the PVs concerned and then seek to match those PV tags
+#    between existing extents and new extents.
+#    Use the special tag "@*" as a wildcard to match any PV tag.
+#    
+#    Example: LVs are mirrored between two sites within a single VG.
+#    PVs are tagged with either @site1 or @site2 to indicate where
+#    they are situated.
+#
+#    cling_tag_list = [ "@site1", "@site2" ]
+#    cling_tag_list = [ "@*" ]
+#
+#    Changes made in version 2.02.85 extended the reach of the 'cling'
+#    policies to detect more situations where data can be grouped
+#    onto the same disks.  Set this to 0 to revert to the previous
+#    algorithm.
+#
+#    maximise_cling = 1
+#
+#    Set to 1 to guarantee that mirror logs will always be placed on 
+#    different PVs from the mirror images.  This was the default
+#    until version 2.02.85.
+#
+#    mirror_logs_require_separate_pvs = 0
+#}
+
 # This section that allows you to configure the nature of the
 # information that LVM2 reports.
 log {
@@ -327,9 +405,47 @@ global {
     # Treat any internal errors as fatal errors, aborting the process that
     # encountered the internal error. Please only enable for debugging.
     abort_on_internal_errors = 0
+
+    # Check whether CRC is matching when parsed VG is used multiple times.
+    # This is useful to catch unexpected internal cached volume group
+    # structure modification. Please only enable for debugging.
+    detect_internal_vg_cache_corruption = 0
+
+    # If set to 1, no operations that change on-disk metadata will be permitted.
+    # Additionally, read-only commands that encounter metadata in need of repair
+    # will still be allowed to proceed exactly as if the repair had been 
+    # performed (except for the unchanged vg_seqno).
+    # Inappropriate use could mess up your system, so seek advice first!
+    metadata_read_only = 0
+
+    # 'mirror_segtype_default' defines which segtype will be used when the
+    # shorthand '-m' option is used for mirroring.  The possible options are:
+    #
+    # "mirror" - The original RAID1 implementation provided by LVM2/DM.  It is
+    #           characterized by a flexible log solution (core, disk, mirrored)
+    #           and by the necessity to block I/O while reconfiguring in the
+    #           event of a failure.  Snapshots of this type of RAID1 can be
+    #           problematic.
+    #
+    # "raid1"  - This implementation leverages MD's RAID1 personality through
+    #           device-mapper.  It is characterized by a lack of log options.
+    #           (A log is always allocated for every device and they are placed
+    #           on the same device as the image - no separate devices are
+    #           required.)  This mirror implementation does not require I/O
+    #           to be blocked in the kernel in the event of a failure.
+    #
+    # Specify the '--type <mirror|raid1>' option to override this default
+    # setting.
+    mirror_segtype_default = "mirror"
 }
 
 activation {
+    # Set to 1 to perform internal checks on the operations issued to
+    # libdevmapper.  Useful for debugging problems with activation.
+    # Some of the checks may be expensive, so it's best to use this
+    # only when there seems to be a problem.
+    checks = 0
+
     # Set to 0 to disable udev synchronisation (if compiled into the binaries).
     # Processes will not wait for notification from udev.
     # They will continue irrespective of any possible udev processing
@@ -347,6 +463,12 @@ activation {
     # while any logical volumes are active.
     udev_rules = 1
 
+    # Set to 1 for LVM2 to verify operations performed by udev. This turns on
+    # additional checks (and if necessary, repairs) on entries in the device
+    # directory after udev has completed processing its events. 
+    # Useful for diagnosing problems with LVM2/udev interactions.
+    verify_udev_operations = 0
+
     # How to fill in missing stripes if activating an incomplete volume.
     # Using "error" will make inaccessible parts of the device return
     # I/O errors on access.  You can instead use a device path, in which 
@@ -421,6 +543,25 @@ activation {
     mirror_log_fault_policy = "allocate"
     mirror_image_fault_policy = "remove"
 
+    # 'snapshot_autoextend_threshold' and 'snapshot_autoextend_percent' define
+    # how to handle automatic snapshot extension. The former defines when the
+    # snapshot should be extended: when its space usage exceeds this many
+    # percent. The latter defines how much extra space should be allocated for
+    # the snapshot, in percent of its current size.
+    #
+    # For example, if you set snapshot_autoextend_threshold to 70 and
+    # snapshot_autoextend_percent to 20, whenever a snapshot exceeds 70% usage,
+    # it will be extended by another 20%. For a 1G snapshot, using up 700M will
+    # trigger a resize to 1.2G. When the usage exceeds 840M, the snapshot will
+    # be extended to 1.44G, and so on.
+    #
+    # Setting snapshot_autoextend_threshold to 100 disables automatic
+    # extensions. The minimum value is 50 (A setting below 50 will be treated
+    # as 50).
+
+    snapshot_autoextend_threshold = 100
+    snapshot_autoextend_percent = 20
+
     # While activating devices, I/O to devices being (re)configured is
     # suspended, and as a precaution against deadlocks, LVM2 needs to pin
     # any memory it is using so it is not paged out.  Groups of pages that
index 9f6d78d380f489af7abbc82b37b9ece20d3dd35b..44ff79ca789df33aa53192d456ef2e842faa412a 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -49,7 +49,7 @@ CONFIG_PROTECT="/var/www/ldap/htdocs/config \
                 /var/www/myadmin/htdocs/config.inc.php \
                 /var/www/webmail/htdocs/horde/config \
                "
-CONFIG_PROTECT_MASK="/etc/init.d"
+#CONFIG_PROTECT_MASK="/etc/init.d"
 
 PORTAGE_NICENESS=3
 
@@ -62,7 +62,7 @@ PORTDIR_OVERLAY="/usr/local/portage"
 
 FEATURES="parallel-fetch"
 #MAKEOPTS="-j3"
-EMERGE_DEFAULT_OPTS="--with-bdeps y "
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=6"
 
 LINGUAS="de de_AT de_BE de_CH de_DE de_LU en en_AG en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_ZA en_ZW en_US ru_RU ru_UA"
 
index eb8ddd38b5b6e0bc914454a092f1f07c87e2e7c7..a4e02fa707cd3cfd52fee36bb9502cd059303a19 100644 (file)
--- a/man.conf
+++ b/man.conf
@@ -2,7 +2,7 @@
 # Generated automatically from man.conf.in by the
 # configure script.
 #
-# man.conf from man-1.6f
+# man.conf from man-1.6g
 #
 # For more information about this file, see the man pages man(1)
 # and man.conf(5).
@@ -40,11 +40,11 @@ FHS
 #
 # Every automatically generated MANPATH includes these fields
 #
+MANPATH        /usr/man
 MANPATH        /usr/share/man
+MANPATH        /usr/local/man
 MANPATH        /usr/local/share/man
 MANPATH        /usr/X11R6/man
-MANPATH        /usr/local/man
-MANPATH        /usr/man
 #
 # Uncomment if you want to include one of these by default
 #
@@ -123,7 +123,7 @@ COMPRESS_EXT        .bz2
 # Default manual sections (and order) to search if -S is not specified
 # and the MANSECT environment variable is not set.
 #
-MANSECT                1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o:1x:2x:3x:4x:5x:6x:7x:8x
+MANSECT                1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
 #
 # Default options to use when man is invoked without options
 # This is mainly for the benefit of those that think -a should be the default
@@ -137,8 +137,8 @@ MANSECT             1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o:1x:2x:3x:4x:5x:6x:7x:8x
 .gz            /bin/gunzip -c
 .bz2           /bin/bzip2 -c -d
 .lzma          /usr/bin/unlzma -c -d
-.xz            /usr/bin/unxz -c -d
 .z             
 .Z             /bin/zcat
-.F             
+.F             /usr/bin/fcat
 .Y             
+.xz            /usr/bin/unxz -c
diff --git a/mc/cedit.menu b/mc/cedit.menu
deleted file mode 100644 (file)
index c2dfe29..0000000
+++ /dev/null
@@ -1,468 +0,0 @@
-shell_patterns=0    # expression type
-
-# The macros are:
-#
-# %c The cursor column position number. For edit menu only.
-# %i The indent of blank space, equal the cursor column 
-#    position. For edit menu only.
-# %y The syntax type of current file. For edit menu only.
-# %b The block file name.
-# %f The current file name.
-# %n Only the current file name without extension.
-# %x The extension of current file name.
-# %d The current directory name.
-# %F The current file in the unselected panel.
-# %D The directory name of the unselected panel.
-# %t The currently tagged files.
-# %T The tagged files in the unselected panel.
-# %u and %U Similar to the %t and %T macros, but in
-#    addition the files are untagged. You can use this macro
-#    only once per menu file entry or extension file entry,
-#    because next time there will be no tagged files.
-# %s and %S The selected files: The tagged files if
-#    there are any. Otherwise the current file.
-# 
-# %% The % character
-#
-# %{some text} Prompt for the substitution. An input box
-#    is shown and the text inside the braces is used as a
-#    prompt. The macro is substituted by the text typed by the
-#    user. The user can press ESC or F10 to cancel. This macro
-#    doesn't work on the command line yet.
-
-#----------------------- Begin [perl] language template -----------------------
-+ y Perl\ Program | f \.pl$
-1       Author description header
-        unset LANG
-       unset LANGUAGE
-       LC_ALL=
-       MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
-       AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
-        cat >>%b <<EOF
-        #----------------------------------------------------------------------
-        # Description:
-        # Author: $AUTHOR <$REPLYTO>
-        # Created at: `date`
-        # Computer: `uname -n` 
-        # System: `uname -sr` on `uname -m`
-        #    
-        # Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
-        #
-        #----------------------------------------------------------------------
-        # Configure section:
-        
-        #----------------------------------------------------------------------
-        #
-        # main()
-        
-        EOF
-
-+ y Perl\ Program | f \.pl$
-2       while ()
-        cat <<EOF > %b
-        %iwhile() {
-        %i}
-        EOF
-
-+ y Perl\ Program | f \.pl$
-3       for ()
-        cat <<EOF > %b
-        %ifor ($i =  ; $i <  ; $i++) {
-        %i}
-        EOF
-
-+ y Perl\ Program | f \.pl$
-4       foreach ()
-        cat <<EOF > %b
-        %iforeach ($ ) {
-        %i}
-        EOF
-
-+ y Perl\ Program | f \.pl$
-5       if ()
-        cat <<EOF > %b
-        %iif () {
-        %i}
-        EOF
-                
-+ y Perl\ Program | f \.pl$
-6       if () else
-        cat <<EOF > %b
-        %iif () {
-        %i} else {
-        %i}
-        EOF
-
-+ y Perl\ Program | f \.pl$
-7       if () elsif ()
-        cat <<EOF > %b
-        %iif () {
-        %i} elsif () {
-        %i}
-        EOF
-
-+ y Perl\ Program | f \.pl$
-8       substr ()
-        echo "%i$ = substr(\$str, \$off, \$cnt);" >%b
-
-+ y Perl\ Program | f \.pl$
-9       opendir ()
-        cat <<EOF > %b
-        %iopendir(DIR, \$dir) || die("\$0: can't open \$dir\n");
-        EOF
-
-+ y Perl\ Program | f \.pl$
-a       sub ()
-        NAME=%{ Enter name of subroutine: }
-        cat <<EOF > %b
-        sub
-        $NAME ()
-        {
-        } # end of $NAME()        
-        EOF
-#----------------------- End [perl] language template -------------------------
-
-#---------------------- Begin [shell] language template -----------------------
-+ y Shell\ Script | f \.sh$
-1       Author description header
-        unset LANG
-       unset LANGUAGE
-       LC_ALL=
-       MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
-       AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
-        cat >>%b <<EOF
-        #----------------------------------------------------------------------
-        # Description:
-        # Author: $AUTHOR <$REPLYTO>
-        # Created at: `date`
-        # Computer: `uname -n`
-        # System: `uname -sr` on `uname -m`
-        #    
-        # Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
-        #
-        #----------------------------------------------------------------------
-        # Configure section:
-        
-        #----------------------------------------------------------------------
-        #
-        # main()
-        
-        EOF
-
-+ y Shell\ Script | f \.sh$
-3       for
-        cat <<EOF > %b
-        %ifor i in \$
-        %ido
-        %idone
-        EOF
-
-+ y Shell\ Script | f \.sh$
-4       while
-        cat <<EOF > %b
-        %iwhile
-        %ido
-        %idone
-        EOF
-
-+ y Shell\ Script | f \.sh$
-5       if [] then else
-        cat <<EOF >> %b
-        %iif [ ];then
-        %ielse
-        %ifi
-        EOF
-
-+ y Shell\ Script | f \.sh$
-6       case
-        NUMBER=%{ Enter number elements of case:}
-        cat <<EOF > %b
-        %icase "\$" in
-        EOF
-        while [ "$NUMBER" -gt 0 ]
-        do
-        cat <<EOF >> %b
-        %i)
-       %i    ;;
-        EOF
-        let NUMBER=$NUMBER-1    
-        done
-        cat <<EOF >> %b
-        %i*)
-        %iesac
-        EOF
-
-+ y Shell\ Script | f \.sh$
-7       function
-        NAME=%{ Enter name of function:}
-        cat <<EOF >> %b
-        $NAME() {
-        } # end of $NAME()
-        EOF
-                
-+ y Shell\ Script | f \.sh$
-8       select of bash
-        cat <<EOF >> %b
-        %iselect i in \$l
-        %ido
-        %i    if [ -n "\$i" ];then
-       %i       break
-        %i    else
-       %i       continue
-        %i    fi       
-        %idone
-        EOF
-        
-#----------------------- End [shell] language template ------------------------
-
-#------------------------- Begin [c] language template ------------------------
-+ f \.h$ | f \.c$ | f \.cc$
-1       Author description header
-        unset LANG
-       unset LANGUAGE
-       LC_ALL=
-       MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
-       AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
-        cat >> %b <<EOF
-        /********************************************************************
-        * Description:
-        * Author: $AUTHOR <$REPLYTO>
-        * Created at: `date`
-        * Computer: `uname -n` 
-        * System: `uname -sr` on `uname -m`
-        *    
-        * Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
-        *
-        ********************************************************************/
-        EOF
-
-+ f \.h$ | f \.c$ | f \.cc$
-2       GPL description header
-        cat >>%b <<EOF
-        /*
-        * This program is free software; you can redistribute it and/or modify
-        * it under the terms of the GNU General Public License as published by
-        * the Free Software Foundation; either version 2 of the License, or
-        * (at your option) any later version.
-        *
-        * This program is distributed in the hope that it will be useful,
-        * but WITHOUT ANY WARRANTY; without even the implied warranty of
-        * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        * GNU General Public License for more details.
-        *
-        * You should have received a copy of the GNU General Public License
-        * along with this program; if not, write to the Free Software
-        * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-        */
-        EOF
-
-+ f \.c$ | f \.cc$
-3       if ()
-        cat <<EOF > %b
-        %iif () {
-        %i}
-        EOF
-                
-+ f \.c$ | f \.cc$
-4       if () else
-        cat <<EOF > %b
-        %iif () {
-        %i} else {
-        %i}
-        EOF
-
-+ f \.c$ | f \.cc$
-5       if () else if ()
-        cat <<EOF > %b
-        %iif ( ) {
-        %i} else if ( ) {
-        %i}
-        EOF
-
-+ f \.c$ | f \.cc$
-6       switch ()
-        NUMBER=%{ Enter number elements of switch:}
-        echo "%iswitch () {" >%b
-        while [ "$NUMBER" -gt 0 ]
-        do
-            echo "%icase '':" >>%b
-            echo "%i      break;" >>%b
-            let NUMBER=$NUMBER-1    
-        done
-        echo "%i      default:" >>%b
-        echo "%i}" >>%b
-        
-+ f \.c$ | f \.cc$
-7       for ()
-        cat <<EOF > %b
-        %ifor (i =  ; i <  ; i++) {
-        %i}
-        EOF
-        
-+ f \.c$ | f \.cc$
-8       while ()               
-        cat <<EOF > %b
-        %iwhile () {
-        %i}
-        EOF
-
-+ f \.c$ | f \.cc$
-9       do {} while ()               
-        cat <<EOF > %b
-        %ido {
-        %i} while ()
-        EOF
-        
-+ f \.c$ | f \.cc$
-a       array
-        cat <<EOF > %b
-        %ichar const x[] = {
-        %i, ,
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-b       enum
-        cat <<EOF > %b
-        %ienum x {
-        %i, ,
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-c       struct
-        cat <<EOF > %b
-        %istruct ? {
-        %i;
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-d       union
-        cat <<EOF > %b
-        %iunion ? {
-        %i;
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-e       typedef struct
-        cat <<EOF > %b
-        %itypedef struct {
-        %i;
-        %i} ?;
-        EOF
-
-+ f \.c$ | f \.cc$
-f       function
-        NAME=%{ Enter name of function:}
-        cat <<EOF >> %b
-        $NAME()
-        {
-        } /* end of $NAME() */
-        EOF
-
-+ f \.c$ | f \.h$ | f \.cc$
-g       #include
-        INC=%{ Enter include name: }
-        if [ -r "$INC" ];then
-            echo \#include \"$INC\" >%b
-        else
-            echo \#include \<$INC\> >%b
-        fi
-
-+ f \.c$ | f \.h$ | f \.cc$
-d       #define
-        echo "#define " >%b
-
-+ f \.c$ | f \.h$ | f \.cc$
-d       #ifdef
-        cat <<EOF > %b
-        #ifdef
-        #else
-        #endif
-        EOF
-
-+ f \.c$ | f \.h$ | f \.cc$
-...............................................................................
-
-+ f \.c$ | f \.h$ | f \.cc$
-h       View all *.h into current directory
-       cat *.h |less
-
-+ f \.c$ | f \.cc$
-d       Run gdb for current file
-        [ -x "./%n" ] && gdb ./%n
-
-= f \.c$ | f \.cc$
-+ f \.c$ | f \.cc$
-c       Compile, link and run the current .c file
-        export CFLAGS="-g -Wall -O2"
-        make || make %n || cc $CFLAGS -o %n %f
-        [ -r "%n" ] && (echo "*** press any key for run... ***"; read)
-        [ -x "%n" ] && ./%n
-        (echo -ne "\n--- Press any key for return to edit. ---"; read)
-
-+ f \.c$ | f \.h$
-t       Indent `C' formatter
-       indent -kr -pcs %b 1>/dev/null 2> %e
-
-#--------------------- End [c/c++] language template --------------------------
-
-#------------------------- Begin unknown template -----------------------------
-+ y unknown & t r
-s       #! /bin/sh
-        echo "#! /bin/sh" >%b
-
-+ y unknown & t r
-p       #! /usr/bin/perl
-        echo "#! /usr/bin/perl" >%b
-
-+ y unknown & t r
-a       Author description header
-        unset LANG
-       unset LANGUAGE
-       LC_ALL=
-       MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
-       AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
-        cat >>%b <<EOF
-        ----------------------------------------------------------------------
-        Description:
-        Author: $AUTHOR <$REPLYTO>
-        Created at: `date`
-        Computer: `uname -n` 
-        System: `uname -sr` on `uname -m`
-        
-        Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
-        ----------------------------------------------------------------------
-                
-        EOF
-#--------------------------- End unknown template -----------------------------
-
--------------------------------------------------------------------------------
-
-#----------------------- Begin common section ---------------------------------
-I       Insert `Changelog' string
-        DATE="`date +%%Y-%%m-%%d`"
-       MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
-       AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
-        EMAIL="<$REPLYTO>"
-        echo "$DATE  $AUTHOR  $EMAIL" >%b
-
-s       Invoke `shell'
-       sh
-
-m       view `man'
-        MAN=%{Enter name of man:}
-        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/mcview.$MAN.XXXXXX` || exit 1
-        man -Pcat $MAN >$TMPFILE
-        mcview $TMPFILE
-        rm -f $TMPFILE
-                
-i       Insert a out of command to cursor.
-        CMD=%{ Enter command: }
-       eval $CMD > %b
-
-o       Open bash to next free console
-        open -s -- /bin/bash
-#-------------------------- End of common section -----------------------------
index cca5499d17c0dc3fcf210dac5ecff71ac6441188..50490d8cab58ffdf9e04ab08af8b97d62b84aa69 100644 (file)
@@ -4,7 +4,6 @@
 [directory]
     type=DIR
 
-
 [device]
     type=DEVICE
 
@@ -17,6 +16,9 @@
 [symlink]
     type=SYMLINK
 
+[hardlink]
+    type=HARDLINK
+
 [core]
     regexp=^core\\.*\\d*$
 
     regexp=(^#.*|.*~$)
 
 [archive]
-    extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;
+    extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z;ace
 
 [doc]
-    extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm
+    extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm;docx;docm;xlsx;xlsm;pptx;pptm
 
 [source]
     extensions=c;h;cc;hh;cpp;cxx;hpp;asm;py;pl;pm;inc;cgi;php;phps;js;java;jav;jasm;sh;bash;diff;patch;pas;tcl;tk;awk;m4;st;mak;sl;ada;caml;ml;mli;mly;mll;mlp;sas;prg;hs;hi;erl
 
 [media]
-    extensions=mp2;mp3;mpg;ogg;mpeg;wav;avi;asf;mov;mol;mpl;xm;mod;it;med;mid;midi;s3m;umx;vob;mkv;flv;mp4;m3u
+    extensions=mp2;mp3;mpg;ogg;mpeg;wav;avi;asf;mov;mol;mpl;xm;mod;it;med;mid;midi;s3m;umx;vob;mkv;flv;mp4;m3u;flac;ape;wma;wmv;3gp
 
 [graph]
     extensions=jpg;jpeg;gif;png;tif;pcx;bmp;xpm;xbm;eps;pic;rle;ico;wmf;omf;ai;cdr
index 7d97ed743a1abc1bd4d567cdc1f60252e3c30565..204d1a5f6268b522ce28855f6c362886edb0235e 100644 (file)
--- a/mc/mc.ext
+++ b/mc/mc.ext
 # Maybe:       Open/XOpen/GOpen/KOpen/... for Console/X/GNOME/KDE/etc.
 
 
+### GIT Repo ###
+# gitfs changeset
+regex/^\[git\]
+       Open=%cd %p/changesetfs://
+       View=%cd %p/patchsetfs://
+
 ### Archives ###
 
 # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk
 regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk$
-       Open=%cd %p#utar
+       Open=%cd %p/utar://
        View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
 
 regex/\.tar\.bz$
-       # Open=%cd %p#utar
+       # Open=%cd %p/utar://
        View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
 
 regex/\.t(ar\.bz2|bz2?|b2)$
-       Open=%cd %p#utar
+       Open=%cd %p/utar://
        View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
 
 # .tar.lzma, .tlz
 regex/\.t(ar\.lzma|lz)$
-       Open=%cd %p#utar
+       Open=%cd %p/utar://
        View=%view{ascii} lzma -dc %f 2>/dev/null | tar tvvf -
 
 # .tar.xz, .txz
 regex/\.t(ar\.xz|xz)$
-       Open=%cd %p#utar
+       Open=%cd %p/utar://
        View=%view{ascii} xz -dc %f 2>/dev/null | tar tvvf -
 
 # .tar.F - used in QNX
 regex/\.tar\.F$
-       # Open=%cd %p#utar
+       # Open=%cd %p/utar://
        View=%view{ascii} freeze -dc %f 2>/dev/null | tar tvvf -
 
 # .qpr/.qpk - QNX Neutrino package installer files
 regex/\.(qp[rk])$
-       Open=%cd %p#utar
+       Open=%cd %p/utar://
        View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
 
 # tar
 regex/\.(tar|TAR)$
-       Open=%cd %p#utar
+       Open=%cd %p/utar://
        View=%view{ascii} tar tvvf - < %f
 
 # lha
 type/^LHa\ .*archive
-       Open=%cd %p#ulha
+       Open=%cd %p/ulha://
        View=%view{ascii} lha l %f
 
 # arj
 regex/\.a(rj|[0-9][0-9])$
-       Open=%cd %p#uarj
+       Open=%cd %p/uarj://
        View=%view{ascii} unarj l %f
 
 # cab
 regex/\.([cC][aA][bB])$
-       Open=%cd %p#ucab
+       Open=%cd %p/ucab://
        View=%view{ascii} cabextract -l %f
 
 # ha
 regex/\.([Hh][Aa])$
-       Open=%cd %p#uha
+       Open=%cd %p/uha://
        View=%view{ascii} ha lf %f
 
 # rar
 regex/\.[rR]([aA][rR]|[0-9][0-9])$
-       Open=%cd %p#urar
+       Open=%cd %p/urar://
        View=%view{ascii} rar v -c- %f
 
 # ALZip
 regex/\.(alz|ALZ)$
-       Open=%cd %p#ualz
+       Open=%cd %p/ualz://
        View=%view{ascii} unalz -l %f
 
 # cpio
 shell/.cpio.Z
-       Open=%cd %p#ucpio
+       Open=%cd %p/ucpio://
        View=%view{ascii} gzip -dc %f | cpio -itv 2>/dev/null
 
 shell/.cpio.gz
-       Open=%cd %p#ucpio
+       Open=%cd %p/ucpio://
        View=%view{ascii} gzip -dc %f | cpio -itv 2>/dev/null
 
 shell/.cpio
-       Open=%cd %p#ucpio
+       Open=%cd %p/ucpio://
        View=%view{ascii} cpio -itv < %f 2>/dev/null
 
 # ls-lR
 regex/(^|\.)ls-?lR(\.gz|Z|bz2)$
-       Open=%cd %p#lslR
+       Open=%cd %p/lslR://
 
 # patch
 regex/\.(diff|patch)(\.bz2)$
-       Open=%cd %p#patchfs
+       Open=%cd %p/patchfs://
        View=%view{ascii} bzip2 -dc %f 2>/dev/null
 
 regex/\.(diff|patch)(\.(gz|Z))$
-       Open=%cd %p#patchfs
+       Open=%cd %p/patchfs://
        View=%view{ascii} gzip -dc %f 2>/dev/null
 
 regex/\.(diff|patch)$
-       Open=%cd %p#patchfs
+       Open=%cd %p/patchfs://
        View=%view{ascii} /bin/cat %f 2>/dev/null
 
 # ar library
 regex/\.s?a$
-       Open=%cd %p#uar
+       Open=%cd %p/uar://
        #Open=%view{ascii} ar tv %f
        View=%view{ascii} file %f && nm -C %f
 
 # trpm
 regex/\.trpm$
-       Open=%cd %p#trpm
+       Open=%cd %p/trpm://
        View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
 
 # RPM packages (SuSE uses *.spm for source packages)
 regex/\.(src\.rpm|spm)$
-       Open=%cd %p#rpm
+       Open=%cd %p/rpm://
        View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
 
 regex/\.rpm$
-       Open=%cd %p#rpm
+       Open=%cd %p/rpm://
        View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
 
 # deb
 regex/\.u?deb$
-       Open=%cd %p#deb
+       Open=%cd %p/deb://
        View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
 
 # dpkg
 shell/.debd
-        Open=%cd %p#debd
+        Open=%cd %p/debd://
         View=%view{ascii} dpkg -s `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
 # apt
 shell/.deba
-        Open=%cd %p#deba
+        Open=%cd %p/deba://
         View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
 
 # ISO9660
 regex/\.([iI][sS][oO])$
-       Open=%cd %p#iso9660
+       Open=%cd %p/iso9660://
        View=%view{ascii} isoinfo -l -i %f
 
 # 7zip archives (they are not man pages)
 regex/\.(7z|7Z)$
-       Open=%cd %p#u7z
+       Open=%cd %p/u7z://
        View=%view{ascii} 7za l %f 2>/dev/null
 
 # Mailboxes
 type/^ASCII\ mail\ text
-       Open=%cd %p#mailfs
+       Open=%cd %p/mailfs://
 
 
 ### Sources ###
 
 # C
 shell/.c
-       Open=%var{EDITOR:vi} %f
+       Include=editor
 
 # Fortran
 shell/.f
-       Open=%var{EDITOR:vi} %f
+       Include=editor
 
 # Header
 regex/\.(h|hpp)$
-       Open=%var{EDITOR:vi} %f
+       Include=editor
 
 # Asm
 shell/.s
-       Open=%var{EDITOR:vi} %f
+       Include=editor
 
 # C++
 regex/\.(C|cc|cpp)$
+       Include=editor
+
+include/editor
        Open=%var{EDITOR:vi} %f
 
 # .so libraries
@@ -296,6 +305,10 @@ type/^Info\ text
 shell/.info
        Open=info -f %f
 
+# Exception: .3gp are video files not manual pages
+regex/\.(3[gG][pP])$
+       Include=video
+
 # Manual page
 regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
        Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) { zsoelim %f 2>/dev/null || cat %f; } | nroff -c -Tlatin1 -mandoc ;; esac | %var{PAGER:more}
@@ -452,6 +465,10 @@ regex/\.([mM][oO][vV]|[qQ][tT])$
 regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
        Include=video
 
+# MPEG-2 TS container + H.264 codec
+regex/\.([mM][tT][sS])$
+       Include=video
+
 regex/\.([vV][oO][bB])$
        Include=video
 
@@ -543,7 +560,7 @@ regex/\.([dD][vV][iI])$
 
 # TeX
 regex/\.([Tt][Ee][Xx])$
-       Open=%var{EDITOR:vi} %f
+       Include=editor
 
 # DjVu
 regex/\.(djvu|DJVU)$
@@ -574,7 +591,7 @@ regex/\.(rexx?|cmd)$
 
 # Disk images for Commodore computers (VIC20, C64, C128)
 regex/\.(d64|D64)$
-       Open=%cd %p#uc1541
+       Open=%cd %p/uc1541://
        View=%view{ascii} c1541 %f -list
        Extract=c1541 %f -extract
 
@@ -591,29 +608,33 @@ regex/\.(lyx|LYX)$
        Open=lyx %f
        View=%view{ascii} lyxcat %f
 
+# torrent
+regex/\.([tT][oO][rR][rR][eE][nN][tT])$
+       View=%view{ascii} ctorrent -x %f 2>/dev/null
+
 ### Plain compressed files ###
 
 # ace
 regex/\.(ace|ACE)$
-       Open=%cd %p#uace
+       Open=%cd %p/uace://
        View=%view{ascii} unace l %f
        Extract=unace x %f
 
 # arc
 regex/\.(arc|ARC)$
-       Open=%cd %p#uarc
+       Open=%cd %p/uarc://
        View=%view{ascii} arc l %f
        Extract=arc x %f '*'
        Extract (with flags)=I=%{Enter any Arc flags:}; if test -n "$I"; then arc x $I %f; fi
 
 # zip
 type/^([Zz][Ii][Pp])\ archive
-       Open=%cd %p#uzip
+       Open=%cd %p/uzip://
        View=%view{ascii} unzip -v %f
 
 # zoo
 regex/\.([Zz][Oo][Oo])$
-       Open=%cd %p#uzoo
+       Open=%cd %p/uzoo://
        View=%view{ascii} zoo l %f
 
 # gzip
@@ -652,7 +673,6 @@ regex/\.xz$
        Open=xz -dc %f | %var{PAGER:more}
        View=%view{ascii} xz -dc %f 2>/dev/null
 
-
 ### Default ###
 
 # Default target for anything not described above
index 07b1c8576b1bea8441f6474b9f7791922b42e6fb..2432ce86ee38b68cd7425adad01cd90f91752abd 100644 (file)
-[editor]
-EditXStore = ctrl-insert
-EditXPaste = shift-insert
-EditXCut = shift-delete
-
-EditDeleteLine = ctrl-y
-EditDeleteToLineEnd = ctrl-k
-EditDeleteToLineBegin =
-
-EditLeft = left
-EditRight = right
-EditUp = up
-EditDown = down
-EditEnter = enter
-EditReturn = shift-enter
-EditBackSpace = backspace; ctrl-h
-EditDelete = delete; ctrl-d
-EditPageUp = pgup
-EditPageDown = pgdn
-EditWordLeft = ctrl-left; ctrl-z
-EditWordRight = ctrl-right; ctrl-x
-EditHome = home
-EditEnd = end
-EditTab = tab
-EditUndo = ctrl-u
-EditBeginningOfText = ctrl-home; alt-lt
-EditEndOfText = ctrl-end; alt-gt
-EditScrollUp = ctrl-up
-EditScrollDown = ctrl-down
-EditBeginPage = ctrl-pgup
-EditEndPage = ctrl-pgdn
-EditDeleteWordLeft = alt-backspace
-EditDeleteWordRight = alt-d
-EditParagraphUp =
-EditParagraphDown =
-EditSave = f2
-EditLoad =
-EditNew = ctrl-n
-EditSaveas = f12
-EditMark = f3
-EditCopy = f5
-EditMove = f6
-EditRemove = f8
-EditMarkAll =
-EditUnmark =
-EditFind = f7
-EditMarkLine =
-EditMarkWord =
-
-EditShiftBlockLeft =
-EditShiftBlockRight =
-
-EditPageUpHighlight = shift-pgup
-EditPageDownHighlight = shift-pgdn
-EditLeftHighlight = shift-left
-EditRightHighlight = shift-right
-EditWordLeftHighlight = ctrl-shift-left
-EditWordRightHighlight = ctrl-shift-right
-EditUpHighlight = shift-up
-EditDownHighlight = shift-down
-EditHomeHighlight = shift-home
-EditEndHighlight = shift-end
-EditBeginningOfTextHighlight = ctrl-shift-home
-EditEndOfTextHighlight  = ctrl-shift-end
-EditBeginPageHighlight  = ctrl-shift-pgup
-EditEndPageHighlight = ctrl-shift-pgdn
-EditScrollUpHighlight = ctrl-shift-up
-EditScrollDownHighlight = ctrl-shift-down
-EditParagraphUpHighlight =
-EditParagraphDownHighlight =
-
-EditPageUpAltHighlight = alt-pgup
-EditPageDownAltHighlight = alt-pgdn
-EditLeftAltHighlight = alt-left
-EditRightAltHighlight = alt-right
-EditWordLeftAltHighlight = ctrl-alt-left
-EditWordRightAltHighlight = ctrl-alt-right
-EditUpAltHighlight = alt-up
-EditDownAltHighlight = alt-down
-EditHomeAltHighlight = alt-home
-EditEndAltHighlight = alt-end
-EditBeginningOfTextAltHighlight = ctrl-alt-home
-EditEndOfTextHighlight  = ctrl-alt-end
-EditBeginPageHighlight  = ctrl-alt-pgup
-EditEndPageAltHighlight = ctrl-alt-pgdn
-EditScrollUpAltHighlight =
-EditScrollDownAltHighlight =
-EditParagraphUpAltHighlight =
-EditParagraphDownAltHighlight =
-
-EditSaveBlock = ctrl-f
-EditColumnMark = f13
-EditFindAgain = f17
-EditReplace = f4
-EditReplaceAgain = f14
-EditCompleteWord = alt-tab
-EditDebugStart =
-EditDebugStop =
-EditDebugToggleBreak =
-EditDebugClear =
-EditDebugNext =
-EditDebugStep =
-EditDebugBackTrace =
-EditDebugContinue =
-EditDebugEnterCommand =
-EditDebugUntilCurser =
-EditInsertFile = f15
-EditQuit = f10
-EditToggleInsert = insert
-EditHelp = f1
-EditDate =
-EditRefresh = ctrl-l
-EditGoto = alt-l
-EditManPage =
-EditSort = alt-t
-EditMail = alt-m
-EditCancel =
-EditComplete =
-
-EditParagraphFormat = alt-p
-EditUtil =
-EditTypeLoadPython =
-EditFindFile =
-EditCtags =
-EditMatchBracket = alt-b
-EditTerminal =
-EditTerminalApp =
-EditExtCmd = alt-u
-EditUserMenu = f11
-EditSaveDesktop =
-EditNewWindow =
-EditCycle =
-EditMenu = f9
-EditSaveAndQuit =
-EditRunAnother =
-EditCheckSaveAndQuit =
-EditMaximize =
-EditToggleBookmark = alt-k
-EditFlushBookmarks = alt-o
-EditNextBookmark = alt-j
-EditPrevBookmark = alt-i
-
-EditSelectionHistory =
-EditShell = ctrl-o
-EditInsertLiteral = ctrl-q
-
-EditBeginRecordMacro =
-EditEndRecordMacro =
-EditBeginOrEndMacro = ctrl-r
-EditExecuteMacro = ctrl-a
-EditDeleteMacro =
-
-EditToggleLineState = alt-n
-EditToggleTabTWS = alt-underline
-EditToggleSyntax = ctrl-s
-EditToggleShowMargin =
-
-EditFindDefinition = alt-enter
-EditLoadPrevFile = alt-minus
-EditLoadNextFile = alt-plus
-
-SelectCodepage = alt-e
-
-[viewer]
-ViewHelp = f1
-ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewContinueSearch = ctrl-r; ctrl-s; f17; n
-ViewMoveToBol = ctrl-a
-ViewMoveToEol = ctrl-e
-ViewMoveLeft = h; left
-ViewMoveRight = l; right
-ViewMoveLeft10 = ctrl-left
-ViewMoveRight10 = ctrl-right
-ViewMoveUp = k; y; insert; up; ctrl-p
-ViewMoveDown = j; e; delete; down; enter; ctrl-n
-ViewMovePgDn = f; space; pgdn; ctrl-v
-ViewMovePgUp = b; pgup; alt-v; backspace
-ViewMoveHalfPgDn = d
-ViewMoveHalfPgUp = u
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-ViewGotoBookmark = m
-ViewNewBookmark = r
-ViewNextFile = ctrl-f
-ViewPrevFile = ctrl-b
-SelectCodepage = alt-e
-ShowCommandLine = ctrl-o
-ViewToggleRuler = alt-r
-
-[viewer:hex]
-ViewHelp = f1
-ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewHexEditSave = f6
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewToggleHexNavMode = tab
-ViewMoveToBol = ctrl-a; home
-ViewMoveToEol = ctrl-e; end
-ViewMoveLeft = b; left
-ViewMoveRight = f; right
-ViewMoveUp = k; y; up
-ViewMoveDown = j; delete; down
-ViewMovePgDn = pgdn; ctrl-v
-ViewMovePgUp = pgup; alt-v
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-
 [main]
-CmdHelp = f1
-CmdUserMenu = f2
-CmdView = f3
-CmdViewFile = f13
-CmdEdit = f4
-CmdEditForceInternal =
-CmdCopy = f5
-CmdRename = f6
-CmdMkdir = f7
-CmdDelete = f8
-CmdMenu = f9
-CmdQuit = f10
-CmdMenuLastSelected = f19
-CmdQuietQuit = f20
-CmdFind = alt-question
-CmdQuickCd = alt-c
-CmdQuickChdir = ctrl-backslash
-CmdReread = ctrl-r
-CmdSingleDirsize = ctrl-space
-CmdSuspend = ctrl-z
-CmdSwapPanel = ctrl-u
-CmdHistory = alt-h
-CmdListing =
-CmdToggleListing = alt-t
-CmdToggleShowHidden = alt-dot
-CmdTogglePanelsSplit = alt-comma
-ShowCommandLine = ctrl-o
-CmdCopyCurrentPathname = alt-a
-CmdCopyOtherPathname = alt-shift-a
-CmdFilteredView = alt-exclamation
-CmdSelect = kpplus
-CmdUnselect = kpminus
-CmdReverseSelection = kpasterisk
-CmdDialogList = alt-prime
-ExtMap1 = ctrl-x
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
 
 [main:xmap]
-CmdChmod = c
-CmdChown = o
-CmdCompareDirs = d
-CmdEditSymlink = ctrl-s
-CmdLink = l
-CmdSymlink = s
-CmdRelativeSymlink = v
-CmdInfo = i
-CmdQuickView = q
-CmdExternalPanelize = exclamation
-CmdReselectVfs = a
-CmdJobs = j
-CmdCopyCurrentPathname = p
-CmdCopyOtherPathname = ctrl-p
-CmdCopyCurrentTagged = t
-CmdCopyOtherTagged = ctrl-t
-CmdDiffView = ctrl-d
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative = v
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
 
 [panel]
-PanelStartSearch = ctrl-s; alt-s
-PanelMarkFile = insert; ctrl-t
-PanelMarkFileUp = shift-up
-PanelMarkFileDown = shift-down
-PanelMoveDown = down; ctrl-n
-PanelMoveUp = up; ctrl-p
-PanelMoveLeft = left
-PanelMoveRight = right
-PanelPrevPage = pgup; alt-v
-PanelNextPage = pgdn; ctrl-v
-PanelDoEnter = enter
-PanelChdirOtherPanel = alt-o
-PanelChdirToReadlink = alt-l
-PanelViewSimple = F13
-PanelEditNew = F14
-PanelCopyLocal = F15
-PanelRenameLocal = F16
-PanelDeleteLocal = F18
-PanelReverseSelection = alt-asterisk
-PanelSelect = alt-plus
-PanelUnselect = alt-minus
-PanelGotoChildDir = ctrl-pgdn
-PanelGotoParentDir = ctrl-pgup
-PanelDirectoryHistoryList = alt-shift-h
-PanelDirectoryHistoryNext = alt-u
-PanelDirectoryHistoryPrev = alt-y
-PanelGotoBottomFile = alt-j
-PanelGotoMiddleFile = alt-r
-PanelSyncOtherPanel = alt-i
-PanelGotoTopFile = alt-g
-PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home; a1
-PanelMoveEnd = alt-gt; end; c1
-PanelSelectSortOrder=
-PanelToggleSortOrderPrev=
-PanelToggleSortOrderNext=
-PanelReverseSort=
-PanelSortOrderByName=
-PanelSortOrderByExt=
-PanelSortOrderBySize=
-PanelSortOrderByMTime=
-PanelSmartGotoParentDir=
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+MarkLeft =
+MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+CdParentSmart =
+Panelize =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
+
+[dialog]
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
 
 [input]
-InputBol = ctrl-a; alt-lt; home; a1
-InputEol = ctrl-e; alt-gt; end; c1
-InputMoveLeft = left; alt-left
-InputWordLeft = ctrl-left
-InputBackwardChar = ctrl-b
-InputBackwardWord = alt-b
-InputMoveRight = right; alt-right
-InputWordRight = ctrl-right
-InputForwardChar = ctrl-f
-InputForwardWord = alt-f
-InputBackwardDelete = backspace; ctrl-h
-InputDeleteChar = delete; ctrl-d
-InputKillWord = alt-d
-InputBackwardKillWord = alt-backspace
-InputSetMark =
-InputKillRegion = ctrl-w
-InputXCut =
-InputXStore = alt-w
-InputXPaste =
-InputYank = ctrl-y
-InputKillLine = ctrl-k
-InputHistoryPrev = alt-p; ctrl-down
-InputHistoryNext = alt-n; ctrl-up
-InputHistoryShow = alt-h
-InputComplete = alt-tab
-InputClearLine =
-InputLeftHighlight = shift-left
-InputRightHighlight = shift-right
-InputWordLeftHighlight = ctrl-shift-left
-InputWordRightHighlight = ctrl-shift-right
-InputBolHighlight = shift-home
-InputEolHighlight = shift-end
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace; ctrl-h
+Delete = delete; ctrl-d
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkToHome = shift-home
+MarkToEnd = shift-end
 
 [listbox]
-ListboxMoveUp = up; ctrl-p
-ListboxMoveDown = down; ctrl-n
-ListboxMoveHome = home; alt-lt; a1
-ListboxMoveEnd = end; alt-gt; c1
-ListboxMovePgUp = pgup; alt-v
-ListboxMovePgDn = pgdn; ctrl-v
-ListboxDeleteItem = delete; d
-ListboxDeleteAll = shift-delete; shift-d
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
 
 [tree]
-TreeHelp = f1
-TreeForget = f3
-TreeToggleNav = f4
-TreeCopy = f5
-TreeMove = f6
-TreeMoveUp = up; ctrl-p
-TreeMoveDown = down; ctrl-n
-TreeMoveLeft = left
-TreeMoveRight = right
-TreeMoveHome = home; alt-lt; a1
-TreeMoveEnd = end; alt-gt; c1
-TreeMovePgUp = pgup; alt-v
-TreeMovePgDn = pgdn; ctrl-v
-TreeOpen = enter
-TreeRescan = f2; ctrl-r
-TreeStartSearch = ctrl-s; alt-s
-TreeRemove = f8; delete
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
 
 [help]
-HelpHelp = f1
-HelpIndex = f2; c
-HelpBack = f3; left; l
-HelpQuit = f10; esc
-HelpMoveUp = up; ctrl-p
-HelpMoveDown = down; ctrl-n
-HelpMovePgDn = f; space; pgdn; ctrl-v
-HelpMovePgUp = b; pgup; alt-v; backspace
-HelpMoveHalfPgDn = d
-HelpMoveHalfPgUp = u
-HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-HelpSelectLink = right; enter
-HelpNextLink = tab
-HelpPrevLink = alt-tab
-HelpNextNode = n
-HelpPrevNode = p
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
 
-[dialog]
-DialogOK = enter
-DialogCancel = f10; esc; ctrl-g
-DialogPrevItem = left; up
-DialogNextItem = right; down
-DialogHelp = f1
-DialogSuspend = ctrl-z
-DialogRefresh = ctrl-l
-CmdDialogList = alt-prime
-CmdDialogNext = alt-rbrace
-CmdDialogPrev = alt-lbrace
+[editor]
+Store = ctrl-insert
+Paste = shift-insert
+Cut = shift-delete
+Up = up
+Down = down
+Left = left
+Right = right
+WordLeft = ctrl-left; ctrl-z
+WordRight = ctrl-right; ctrl-x
+Enter = enter
+Return = shift-enter
+BackSpace = backspace; ctrl-h
+Delete = delete; ctrl-d
+PageUp = pgup
+PageDown = pgdn
+Home = home
+End = end
+Tab = tab
+Undo = ctrl-u
+Redo = alt-r
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+EditNew = ctrl-n
+SaveAs = f12; ctrl-f2
+Mark = f3
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin  = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave = ctrl-f
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail = alt-m
+ParagraphFormat = alt-p
+MatchBracket = alt-b
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark = alt-k
+BookmarkFlush = alt-o
+BookmarkNext = alt-j
+BookmarkPrev = alt-i
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
+SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap =
 
+[viewer]
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
+SelectCodepage = alt-e
+Shell = ctrl-o
+Ruler = alt-r
+
+[viewer:hex]
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [diffviewer]
-DiffDisplaySymbols = alt-s; s
-DiffDisplayNumbers = alt-n; l
-DiffFull = f
-DiffEqual = equal
-DiffSplitMore = gt
-DiffSplitLess = lt
-DiffSetTab2 = 2
-DiffSetTab3 = 3
-DiffSetTab4 = 4
-DiffSetTab8 = 8
-DiffSwapPanel = ctrl-u
-DiffRedo = ctrl-r
-DiffNextHunk = n; enter; space
-DiffPrevHunk = p; backspace
-DiffGoto = g; shift-g
-DiffSave = f2
-DiffEditCurrent = f4
-DiffEditOther = f14
-DiffMergeCurrentHunk = f5
-DiffSearch = f7
-DiffContinueSearch = f17
-DiffOptions = f9
-DiffBOF = ctrl-home
-DiffEOF = ctrl-end
-DiffDown = down
-DiffUp = up
-DiffQuickLeft = ctrl-left
-DiffQuickRight = ctrl-right
-DiffLeft = left
-DiffRight = right
-DiffPageDown = pgdn
-DiffPageUp = pgup
-DiffHome = home
-DiffEnd = end
-DiffHelp = f1
-DiffQuit = f10; q; shift-q; esc
-ShowCommandLine = ctrl-o
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
 SelectCodepage = alt-e
index 07b1c8576b1bea8441f6474b9f7791922b42e6fb..2432ce86ee38b68cd7425adad01cd90f91752abd 100644 (file)
-[editor]
-EditXStore = ctrl-insert
-EditXPaste = shift-insert
-EditXCut = shift-delete
-
-EditDeleteLine = ctrl-y
-EditDeleteToLineEnd = ctrl-k
-EditDeleteToLineBegin =
-
-EditLeft = left
-EditRight = right
-EditUp = up
-EditDown = down
-EditEnter = enter
-EditReturn = shift-enter
-EditBackSpace = backspace; ctrl-h
-EditDelete = delete; ctrl-d
-EditPageUp = pgup
-EditPageDown = pgdn
-EditWordLeft = ctrl-left; ctrl-z
-EditWordRight = ctrl-right; ctrl-x
-EditHome = home
-EditEnd = end
-EditTab = tab
-EditUndo = ctrl-u
-EditBeginningOfText = ctrl-home; alt-lt
-EditEndOfText = ctrl-end; alt-gt
-EditScrollUp = ctrl-up
-EditScrollDown = ctrl-down
-EditBeginPage = ctrl-pgup
-EditEndPage = ctrl-pgdn
-EditDeleteWordLeft = alt-backspace
-EditDeleteWordRight = alt-d
-EditParagraphUp =
-EditParagraphDown =
-EditSave = f2
-EditLoad =
-EditNew = ctrl-n
-EditSaveas = f12
-EditMark = f3
-EditCopy = f5
-EditMove = f6
-EditRemove = f8
-EditMarkAll =
-EditUnmark =
-EditFind = f7
-EditMarkLine =
-EditMarkWord =
-
-EditShiftBlockLeft =
-EditShiftBlockRight =
-
-EditPageUpHighlight = shift-pgup
-EditPageDownHighlight = shift-pgdn
-EditLeftHighlight = shift-left
-EditRightHighlight = shift-right
-EditWordLeftHighlight = ctrl-shift-left
-EditWordRightHighlight = ctrl-shift-right
-EditUpHighlight = shift-up
-EditDownHighlight = shift-down
-EditHomeHighlight = shift-home
-EditEndHighlight = shift-end
-EditBeginningOfTextHighlight = ctrl-shift-home
-EditEndOfTextHighlight  = ctrl-shift-end
-EditBeginPageHighlight  = ctrl-shift-pgup
-EditEndPageHighlight = ctrl-shift-pgdn
-EditScrollUpHighlight = ctrl-shift-up
-EditScrollDownHighlight = ctrl-shift-down
-EditParagraphUpHighlight =
-EditParagraphDownHighlight =
-
-EditPageUpAltHighlight = alt-pgup
-EditPageDownAltHighlight = alt-pgdn
-EditLeftAltHighlight = alt-left
-EditRightAltHighlight = alt-right
-EditWordLeftAltHighlight = ctrl-alt-left
-EditWordRightAltHighlight = ctrl-alt-right
-EditUpAltHighlight = alt-up
-EditDownAltHighlight = alt-down
-EditHomeAltHighlight = alt-home
-EditEndAltHighlight = alt-end
-EditBeginningOfTextAltHighlight = ctrl-alt-home
-EditEndOfTextHighlight  = ctrl-alt-end
-EditBeginPageHighlight  = ctrl-alt-pgup
-EditEndPageAltHighlight = ctrl-alt-pgdn
-EditScrollUpAltHighlight =
-EditScrollDownAltHighlight =
-EditParagraphUpAltHighlight =
-EditParagraphDownAltHighlight =
-
-EditSaveBlock = ctrl-f
-EditColumnMark = f13
-EditFindAgain = f17
-EditReplace = f4
-EditReplaceAgain = f14
-EditCompleteWord = alt-tab
-EditDebugStart =
-EditDebugStop =
-EditDebugToggleBreak =
-EditDebugClear =
-EditDebugNext =
-EditDebugStep =
-EditDebugBackTrace =
-EditDebugContinue =
-EditDebugEnterCommand =
-EditDebugUntilCurser =
-EditInsertFile = f15
-EditQuit = f10
-EditToggleInsert = insert
-EditHelp = f1
-EditDate =
-EditRefresh = ctrl-l
-EditGoto = alt-l
-EditManPage =
-EditSort = alt-t
-EditMail = alt-m
-EditCancel =
-EditComplete =
-
-EditParagraphFormat = alt-p
-EditUtil =
-EditTypeLoadPython =
-EditFindFile =
-EditCtags =
-EditMatchBracket = alt-b
-EditTerminal =
-EditTerminalApp =
-EditExtCmd = alt-u
-EditUserMenu = f11
-EditSaveDesktop =
-EditNewWindow =
-EditCycle =
-EditMenu = f9
-EditSaveAndQuit =
-EditRunAnother =
-EditCheckSaveAndQuit =
-EditMaximize =
-EditToggleBookmark = alt-k
-EditFlushBookmarks = alt-o
-EditNextBookmark = alt-j
-EditPrevBookmark = alt-i
-
-EditSelectionHistory =
-EditShell = ctrl-o
-EditInsertLiteral = ctrl-q
-
-EditBeginRecordMacro =
-EditEndRecordMacro =
-EditBeginOrEndMacro = ctrl-r
-EditExecuteMacro = ctrl-a
-EditDeleteMacro =
-
-EditToggleLineState = alt-n
-EditToggleTabTWS = alt-underline
-EditToggleSyntax = ctrl-s
-EditToggleShowMargin =
-
-EditFindDefinition = alt-enter
-EditLoadPrevFile = alt-minus
-EditLoadNextFile = alt-plus
-
-SelectCodepage = alt-e
-
-[viewer]
-ViewHelp = f1
-ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewContinueSearch = ctrl-r; ctrl-s; f17; n
-ViewMoveToBol = ctrl-a
-ViewMoveToEol = ctrl-e
-ViewMoveLeft = h; left
-ViewMoveRight = l; right
-ViewMoveLeft10 = ctrl-left
-ViewMoveRight10 = ctrl-right
-ViewMoveUp = k; y; insert; up; ctrl-p
-ViewMoveDown = j; e; delete; down; enter; ctrl-n
-ViewMovePgDn = f; space; pgdn; ctrl-v
-ViewMovePgUp = b; pgup; alt-v; backspace
-ViewMoveHalfPgDn = d
-ViewMoveHalfPgUp = u
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-ViewGotoBookmark = m
-ViewNewBookmark = r
-ViewNextFile = ctrl-f
-ViewPrevFile = ctrl-b
-SelectCodepage = alt-e
-ShowCommandLine = ctrl-o
-ViewToggleRuler = alt-r
-
-[viewer:hex]
-ViewHelp = f1
-ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewHexEditSave = f6
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewToggleHexNavMode = tab
-ViewMoveToBol = ctrl-a; home
-ViewMoveToEol = ctrl-e; end
-ViewMoveLeft = b; left
-ViewMoveRight = f; right
-ViewMoveUp = k; y; up
-ViewMoveDown = j; delete; down
-ViewMovePgDn = pgdn; ctrl-v
-ViewMovePgUp = pgup; alt-v
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-
 [main]
-CmdHelp = f1
-CmdUserMenu = f2
-CmdView = f3
-CmdViewFile = f13
-CmdEdit = f4
-CmdEditForceInternal =
-CmdCopy = f5
-CmdRename = f6
-CmdMkdir = f7
-CmdDelete = f8
-CmdMenu = f9
-CmdQuit = f10
-CmdMenuLastSelected = f19
-CmdQuietQuit = f20
-CmdFind = alt-question
-CmdQuickCd = alt-c
-CmdQuickChdir = ctrl-backslash
-CmdReread = ctrl-r
-CmdSingleDirsize = ctrl-space
-CmdSuspend = ctrl-z
-CmdSwapPanel = ctrl-u
-CmdHistory = alt-h
-CmdListing =
-CmdToggleListing = alt-t
-CmdToggleShowHidden = alt-dot
-CmdTogglePanelsSplit = alt-comma
-ShowCommandLine = ctrl-o
-CmdCopyCurrentPathname = alt-a
-CmdCopyOtherPathname = alt-shift-a
-CmdFilteredView = alt-exclamation
-CmdSelect = kpplus
-CmdUnselect = kpminus
-CmdReverseSelection = kpasterisk
-CmdDialogList = alt-prime
-ExtMap1 = ctrl-x
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
 
 [main:xmap]
-CmdChmod = c
-CmdChown = o
-CmdCompareDirs = d
-CmdEditSymlink = ctrl-s
-CmdLink = l
-CmdSymlink = s
-CmdRelativeSymlink = v
-CmdInfo = i
-CmdQuickView = q
-CmdExternalPanelize = exclamation
-CmdReselectVfs = a
-CmdJobs = j
-CmdCopyCurrentPathname = p
-CmdCopyOtherPathname = ctrl-p
-CmdCopyCurrentTagged = t
-CmdCopyOtherTagged = ctrl-t
-CmdDiffView = ctrl-d
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative = v
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
 
 [panel]
-PanelStartSearch = ctrl-s; alt-s
-PanelMarkFile = insert; ctrl-t
-PanelMarkFileUp = shift-up
-PanelMarkFileDown = shift-down
-PanelMoveDown = down; ctrl-n
-PanelMoveUp = up; ctrl-p
-PanelMoveLeft = left
-PanelMoveRight = right
-PanelPrevPage = pgup; alt-v
-PanelNextPage = pgdn; ctrl-v
-PanelDoEnter = enter
-PanelChdirOtherPanel = alt-o
-PanelChdirToReadlink = alt-l
-PanelViewSimple = F13
-PanelEditNew = F14
-PanelCopyLocal = F15
-PanelRenameLocal = F16
-PanelDeleteLocal = F18
-PanelReverseSelection = alt-asterisk
-PanelSelect = alt-plus
-PanelUnselect = alt-minus
-PanelGotoChildDir = ctrl-pgdn
-PanelGotoParentDir = ctrl-pgup
-PanelDirectoryHistoryList = alt-shift-h
-PanelDirectoryHistoryNext = alt-u
-PanelDirectoryHistoryPrev = alt-y
-PanelGotoBottomFile = alt-j
-PanelGotoMiddleFile = alt-r
-PanelSyncOtherPanel = alt-i
-PanelGotoTopFile = alt-g
-PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home; a1
-PanelMoveEnd = alt-gt; end; c1
-PanelSelectSortOrder=
-PanelToggleSortOrderPrev=
-PanelToggleSortOrderNext=
-PanelReverseSort=
-PanelSortOrderByName=
-PanelSortOrderByExt=
-PanelSortOrderBySize=
-PanelSortOrderByMTime=
-PanelSmartGotoParentDir=
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+MarkLeft =
+MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+CdParentSmart =
+Panelize =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
+
+[dialog]
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
 
 [input]
-InputBol = ctrl-a; alt-lt; home; a1
-InputEol = ctrl-e; alt-gt; end; c1
-InputMoveLeft = left; alt-left
-InputWordLeft = ctrl-left
-InputBackwardChar = ctrl-b
-InputBackwardWord = alt-b
-InputMoveRight = right; alt-right
-InputWordRight = ctrl-right
-InputForwardChar = ctrl-f
-InputForwardWord = alt-f
-InputBackwardDelete = backspace; ctrl-h
-InputDeleteChar = delete; ctrl-d
-InputKillWord = alt-d
-InputBackwardKillWord = alt-backspace
-InputSetMark =
-InputKillRegion = ctrl-w
-InputXCut =
-InputXStore = alt-w
-InputXPaste =
-InputYank = ctrl-y
-InputKillLine = ctrl-k
-InputHistoryPrev = alt-p; ctrl-down
-InputHistoryNext = alt-n; ctrl-up
-InputHistoryShow = alt-h
-InputComplete = alt-tab
-InputClearLine =
-InputLeftHighlight = shift-left
-InputRightHighlight = shift-right
-InputWordLeftHighlight = ctrl-shift-left
-InputWordRightHighlight = ctrl-shift-right
-InputBolHighlight = shift-home
-InputEolHighlight = shift-end
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace; ctrl-h
+Delete = delete; ctrl-d
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkToHome = shift-home
+MarkToEnd = shift-end
 
 [listbox]
-ListboxMoveUp = up; ctrl-p
-ListboxMoveDown = down; ctrl-n
-ListboxMoveHome = home; alt-lt; a1
-ListboxMoveEnd = end; alt-gt; c1
-ListboxMovePgUp = pgup; alt-v
-ListboxMovePgDn = pgdn; ctrl-v
-ListboxDeleteItem = delete; d
-ListboxDeleteAll = shift-delete; shift-d
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
 
 [tree]
-TreeHelp = f1
-TreeForget = f3
-TreeToggleNav = f4
-TreeCopy = f5
-TreeMove = f6
-TreeMoveUp = up; ctrl-p
-TreeMoveDown = down; ctrl-n
-TreeMoveLeft = left
-TreeMoveRight = right
-TreeMoveHome = home; alt-lt; a1
-TreeMoveEnd = end; alt-gt; c1
-TreeMovePgUp = pgup; alt-v
-TreeMovePgDn = pgdn; ctrl-v
-TreeOpen = enter
-TreeRescan = f2; ctrl-r
-TreeStartSearch = ctrl-s; alt-s
-TreeRemove = f8; delete
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
 
 [help]
-HelpHelp = f1
-HelpIndex = f2; c
-HelpBack = f3; left; l
-HelpQuit = f10; esc
-HelpMoveUp = up; ctrl-p
-HelpMoveDown = down; ctrl-n
-HelpMovePgDn = f; space; pgdn; ctrl-v
-HelpMovePgUp = b; pgup; alt-v; backspace
-HelpMoveHalfPgDn = d
-HelpMoveHalfPgUp = u
-HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-HelpSelectLink = right; enter
-HelpNextLink = tab
-HelpPrevLink = alt-tab
-HelpNextNode = n
-HelpPrevNode = p
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
 
-[dialog]
-DialogOK = enter
-DialogCancel = f10; esc; ctrl-g
-DialogPrevItem = left; up
-DialogNextItem = right; down
-DialogHelp = f1
-DialogSuspend = ctrl-z
-DialogRefresh = ctrl-l
-CmdDialogList = alt-prime
-CmdDialogNext = alt-rbrace
-CmdDialogPrev = alt-lbrace
+[editor]
+Store = ctrl-insert
+Paste = shift-insert
+Cut = shift-delete
+Up = up
+Down = down
+Left = left
+Right = right
+WordLeft = ctrl-left; ctrl-z
+WordRight = ctrl-right; ctrl-x
+Enter = enter
+Return = shift-enter
+BackSpace = backspace; ctrl-h
+Delete = delete; ctrl-d
+PageUp = pgup
+PageDown = pgdn
+Home = home
+End = end
+Tab = tab
+Undo = ctrl-u
+Redo = alt-r
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+EditNew = ctrl-n
+SaveAs = f12; ctrl-f2
+Mark = f3
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin  = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave = ctrl-f
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail = alt-m
+ParagraphFormat = alt-p
+MatchBracket = alt-b
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark = alt-k
+BookmarkFlush = alt-o
+BookmarkNext = alt-j
+BookmarkPrev = alt-i
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
+SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap =
 
+[viewer]
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
+SelectCodepage = alt-e
+Shell = ctrl-o
+Ruler = alt-r
+
+[viewer:hex]
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [diffviewer]
-DiffDisplaySymbols = alt-s; s
-DiffDisplayNumbers = alt-n; l
-DiffFull = f
-DiffEqual = equal
-DiffSplitMore = gt
-DiffSplitLess = lt
-DiffSetTab2 = 2
-DiffSetTab3 = 3
-DiffSetTab4 = 4
-DiffSetTab8 = 8
-DiffSwapPanel = ctrl-u
-DiffRedo = ctrl-r
-DiffNextHunk = n; enter; space
-DiffPrevHunk = p; backspace
-DiffGoto = g; shift-g
-DiffSave = f2
-DiffEditCurrent = f4
-DiffEditOther = f14
-DiffMergeCurrentHunk = f5
-DiffSearch = f7
-DiffContinueSearch = f17
-DiffOptions = f9
-DiffBOF = ctrl-home
-DiffEOF = ctrl-end
-DiffDown = down
-DiffUp = up
-DiffQuickLeft = ctrl-left
-DiffQuickRight = ctrl-right
-DiffLeft = left
-DiffRight = right
-DiffPageDown = pgdn
-DiffPageUp = pgup
-DiffHome = home
-DiffEnd = end
-DiffHelp = f1
-DiffQuit = f10; q; shift-q; esc
-ShowCommandLine = ctrl-o
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
 SelectCodepage = alt-e
index 0f381886d8ae2d83d788f289dad093c7258a848d..fb6f6231cb8475446df6a290e117f5355946041f 100644 (file)
-[editor]
-EditXStore = alt-w
-EditXPaste = ctrl-y
-EditXCut = ctrl-w
-
-EditDeleteLine = ctrl-y
-EditDeleteToLineEnd = ctrl-k
-EditDeleteToLineBegin =
-
-EditLeft = left; ctrl-b
-EditRight = right; ctrl-f
-EditUp = up; ctrl-p
-EditDown = down; ctrl-n
-EditEnter = enter
-EditReturn = shift-enter
-EditBackSpace = backspace
-EditDelete = delete
-EditPageUp = pgup; alt-v
-EditPageDown = pgdn; ctrl-v
-EditWordLeft = ctrl-left; alt-b
-EditWordRight = ctrl-right; alt-f
-EditHome = home; ctrl-a
-EditEnd = end; ctrl-e
-EditTab = tab
-EditUndo = ctrl-u
-EditBeginningOfText = ctrl-home; alt-lt
-EditEndOfText = ctrl-end; alt-gt
-EditScrollUp = ctrl-up
-EditScrollDown = ctrl-down
-EditBeginPage = ctrl-pgup
-EditEndPage = ctrl-pgdn
-EditDeleteWordLeft = alt-backspace
-EditDeleteWordRight = alt-d
-EditParagraphUp =
-EditParagraphDown =
-EditSave = f2
-EditLoad =
-EditSaveas = f12
-EditMark = f3; ctrl-at
-EditCopy = f5
-EditMove = f6
-EditRemove = f8
-EditMarkAll =
-EditUnmark =
-EditFind = f7; ctrl-s
-EditMarkLine =
-EditMarkWord =
-
-EditShiftBlockLeft =
-EditShiftBlockRight =
-
-EditPageUpHighlight = shift-pgup
-EditPageDownHighlight = shift-pgdn
-EditLeftHighlight = shift-left
-EditRightHighlight = shift-right
-EditWordLeftHighlight = ctrl-shift-left
-EditWordRightHighlight = ctrl-shift-right
-EditUpHighlight = shift-up
-EditDownHighlight = shift-down
-EditHomeHighlight = shift-home
-EditEndHighlight = shift-end
-EditBeginningOfTextHighlight = ctrl-shift-home
-EditEndOfTextHighlight  = ctrl-shift-end
-EditBeginPageHighlight  = ctrl-shift-pgup
-EditEndPageHighlight = ctrl-shift-pgdn
-EditScrollUpHighlight = ctrl-shift-up
-EditScrollDownHighlight = ctrl-shift-down
-EditParagraphUpHighlight =
-EditParagraphDownHighlight =
+[main]
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+Options =
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
 
-EditPageUpAltHighlight = alt-pgup
-EditPageDownAltHighlight = alt-pgdn
-EditLeftAltHighlight = alt-left
-EditRightAltHighlight = alt-right
-EditWordLeftAltHighlight = ctrl-alt-left
-EditWordRightAltHighlight = ctrl-alt-right
-EditUpAltHighlight = alt-up
-EditDownAltHighlight = alt-down
-EditHomeAltHighlight = alt-home
-EditEndAltHighlight = alt-end
-EditBeginningOfTextAltHighlight = ctrl-alt-home
-EditEndOfTextHighlight  = ctrl-alt-end
-EditBeginPageHighlight  = ctrl-alt-pgup
-EditEndPageAltHighlight = ctrl-alt-pgdn
-EditScrollUpAltHighlight =
-EditScrollDownAltHighlight =
-EditParagraphUpAltHighlight =
-EditParagraphDownAltHighlight =
+[main:xmap]
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
 
-EditSaveBlock =
-EditColumnMark = f13
-EditFindAgain = f17
-EditReplace = f4
-EditReplaceAgain = f14
-EditCompleteWord = alt-tab
-EditDebugStart =
-EditDebugStop =
-EditDebugToggleBreak =
-EditDebugClear =
-EditDebugNext =
-EditDebugStep =
-EditDebugBackTrace =
-EditDebugContinue =
-EditDebugEnterCommand =
-EditDebugUntilCurser =
-EditInsertFile = f15
-EditQuit = f10
-EditToggleInsert = insert
-EditHelp = f1
-EditDate =
-EditRefresh = ctrl-l
-EditGoto = alt-l
-EditManPage =
-EditSort = alt-t
-EditMail =
-EditCancel =
-EditComplete =
+[panel]
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+MarkLeft =
+MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+Panelize =
+CdParentSmart =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
 
-EditParagraphFormat = alt-p
-EditUtil =
-EditTypeLoadPython =
-EditFindFile =
-EditCtags =
-EditMatchBracket =
-EditTerminal =
-EditTerminalApp =
-EditExtCmd = alt-u
-EditUserMenu = f11
-EditSaveDesktop =
-EditNewWindow =
-EditCycle =
-EditMenu = f9
-EditSaveAndQuit =
-EditRunAnother =
-EditCheckSaveAndQuit =
-EditMaximize =
-EditToggleBookmark =
-EditFlushBookmarks =
-EditNextBookmark =
-EditPrevBookmark =
+[dialog]
+Ok = enter
+Cancel = f10; esc
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
 
-EditSelectionHistory =
-EditShell = ctrl-o
-EditInsertLiteral = ctrl-q
+[input]
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace
+Delete = delete
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft =
+MarkRight =
+MarkToWordBegin =
+MarkToWordEnd =
+MarkToHome =
+MarkToEnd =
 
-EditBeginRecordMacro =
-EditEndRecordMacro =
-EditBeginOrEndMacro = ctrl-r
-EditDeleteMacro =
+[listbox]
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
 
-EditToggleLineState = alt-n
-EditToggleTabTWS = alt-underline
-EditToggleSyntax = ctrl-s
-EditToggleShowMargin =
+[tree]
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
 
-EditFindDefinition = alt-enter
-EditLoadPrevFile = alt-minus
-EditLoadNextFile = alt-plus
+[help]
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc; ctrl-g
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
 
+[editor]
+Store = alt-w
+Paste = ctrl-y
+Cut = ctrl-w
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left; ctrl-b
+Right = right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Enter = enter
+Return = shift-enter
+BackSpace = backspace
+Delete = delete
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Home = home; ctrl-a
+End = end; ctrl-e
+Tab = tab
+Undo = ctrl-u
+Redo =
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+SaveAs = f12; ctrl-f2
+Mark = f3; ctrl-at
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7; ctrl-s
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave =
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail =
+ParagraphFormat = alt-p
+MatchBracket =
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark =
+BookmarkFlush =
+BookmarkNext =
+BookmarkPrev =
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
 SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap = ctrl-x
 
-EditExtMode = ctrl-x
-
-[edit:xmap]
+[editor:xmap]
 EditNew = k
-EditExecuteMacro = e
 
 [viewer]
-ViewHelp = f1
-ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewContinueSearch = ctrl-r; ctrl-s; f17; n
-ViewMoveToBol = ctrl-a
-ViewMoveToEol = ctrl-e
-ViewMoveLeft = h; left
-ViewMoveRight = l; right
-ViewMoveLeft10 = ctrl-left
-ViewMoveRight10 = ctrl-right
-ViewMoveUp = k; y; insert; up; ctrl-p
-ViewMoveDown = j; e; delete; down; enter; ctrl-n
-ViewMovePgDn = f; space; pgdn; ctrl-v
-ViewMovePgUp = b; pgup; alt-v; backspace
-ViewMoveHalfPgDn = d
-ViewMoveHalfPgUp = u
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-ViewGotoBookmark = m
-ViewNewBookmark = r
-ViewNextFile = ctrl-f
-ViewPrevFile = ctrl-b
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+MagicMode = f8
+NroffMode = f9
+SearchContinue = ctrl-r; ctrl-s; f17; n
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick= ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
 SelectCodepage = alt-e
-ShowCommandLine = ctrl-o
-ViewToggleRuler = alt-r
+Shell = ctrl-o
+Ruler = alt-r
 
 [viewer:hex]
-ViewHelp = f1
-ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewHexEditSave = f6
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewToggleHexNavMode = tab
-ViewMoveToBol = ctrl-a; home
-ViewMoveToEol = ctrl-e; end
-ViewMoveLeft = b; left
-ViewMoveRight = f; right
-ViewMoveUp = k; y; up
-ViewMoveDown = j; delete; down
-ViewMovePgDn = pgdn; ctrl-v
-ViewMovePgUp = pgup; alt-v
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-
-[main]
-CmdHelp = f1
-CmdUserMenu = f2
-CmdView = f3
-CmdViewFile = f13
-CmdEdit = f4
-CmdEditForceInternal =
-CmdCopy = f5
-CmdRename = f6
-CmdMkdir = f7
-CmdDelete = f8
-CmdMenu = f9
-CmdQuit = f10
-CmdMenuLastSelected = f19
-CmdQuietQuit = f20
-CmdFind = alt-question
-CmdQuickCd = alt-c
-CmdQuickChdir = ctrl-backslash
-CmdReread = ctrl-r
-CmdSingleDirsize = ctrl-space
-CmdSuspend = ctrl-z
-CmdSwapPanel = ctrl-u
-CmdHistory = alt-h
-CmdListing =
-CmdToggleListing = alt-t
-CmdToggleShowHidden = alt-dot
-CmdTogglePanelsSplit = alt-comma
-ShowCommandLine = ctrl-o
-CmdCopyCurrentPathname = alt-a
-CmdCopyOtherPathname = alt-shift-a
-CmdFilteredView = alt-exclamation
-CmdSelect = kpplus
-CmdUnselect = kpminus
-CmdReverseSelection = kpasterisk
-CmdDialogList = alt-prime
-ExtMap1 = ctrl-x
-
-[main:xmap]
-CmdChmod = c
-CmdChown = o
-CmdCompareDirs = d
-CmdEditSymlink = ctrl-s
-CmdLink = l
-CmdSymlink = s
-CmdRelativeSymlink = v
-CmdInfo = i
-CmdQuickView = q
-CmdExternalPanelize = exclamation
-CmdReselectVfs = a
-CmdJobs = j
-CmdCopyCurrentPathname = p
-CmdCopyOtherPathname = ctrl-p
-CmdCopyCurrentTagged = t
-CmdCopyOtherTagged = ctrl-t
-CmdDiffView = ctrl-d
-
-[panel]
-PanelStartSearch = ctrl-s; alt-s
-PanelMarkFile = insert; ctrl-t
-PanelMarkFileUp = shift-up
-PanelMarkFileDown = shift-down
-PanelMoveDown = down; ctrl-n
-PanelMoveUp = up; ctrl-p
-PanelMoveLeft = left
-PanelMoveRight = right
-PanelPrevPage = pgup; alt-v
-PanelNextPage = pgdn; ctrl-v
-PanelDoEnter = enter
-PanelChdirOtherPanel = alt-o
-PanelChdirToReadlink = alt-l
-PanelViewSimple = F13
-PanelEditNew = F14
-PanelCopyLocal = F15
-PanelRenameLocal = F16
-PanelDeleteLocal = F18
-PanelReverseSelection = alt-asterisk
-PanelSelect = alt-plus
-PanelUnselect = alt-minus
-PanelGotoChildDir = ctrl-pgdn
-PanelGotoParentDir = ctrl-pgup
-PanelDirectoryHistoryList = alt-shift-h
-PanelDirectoryHistoryNext = alt-u
-PanelDirectoryHistoryPrev = alt-y
-PanelGotoBottomFile = alt-j
-PanelGotoMiddleFile = alt-r
-PanelSyncOtherPanel = alt-i
-PanelGotoTopFile = alt-g
-PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home; a1
-PanelMoveEnd = alt-gt; end; c1
-PanelSelectSortOrder=
-PanelToggleSortOrderPrev=
-PanelToggleSortOrderNext=
-PanelReverseSort=
-PanelSortOrderByName=
-PanelSortOrderByExt=
-PanelSortOrderBySize=
-PanelSortOrderByMTime=
-PanelSmartGotoParentDir=
-
-[input]
-InputBol = ctrl-a; alt-lt; home; a1
-InputEol = ctrl-e; alt-gt; end; c1
-InputMoveLeft = left; alt-left
-InputWordLeft = ctrl-left
-InputBackwardChar = ctrl-b
-InputBackwardWord = alt-b
-InputMoveRight = right; alt-right
-InputWordRight = ctrl-right
-InputForwardChar = ctrl-f
-InputForwardWord = alt-f
-InputBackwardDelete = backspace
-InputDeleteChar = delete
-InputKillWord = alt-d
-InputBackwardKillWord = alt-backspace
-InputSetMark =
-InputKillRegion = ctrl-w
-InputXCut =
-InputXStore = alt-w
-InputXPaste =
-InputYank = ctrl-y
-InputKillLine = ctrl-k
-InputHistoryPrev = alt-p; ctrl-down
-InputHistoryNext = alt-n; ctrl-up
-InputHistoryShow = alt-h
-InputComplete = alt-tab
-InputClearLine =
-InputLeftHighlight =
-InputRightHighlight =
-InputWordLeftHighlight =
-InputWordRightHighlight =
-InputBolHighlight =
-InputEolHighlight =
-
-[listbox]
-ListboxMoveUp = up; ctrl-p
-ListboxMoveDown = down; ctrl-n
-ListboxMoveHome = home; alt-lt; a1
-ListboxMoveEnd = end; alt-gt; c1
-ListboxMovePgUp = pgup; alt-v
-ListboxMovePgDn = pgdn; ctrl-v
-ListboxDeleteItem = delete; d
-ListboxDeleteAll = shift-delete; shift-d
-
-[tree]
-TreeHelp = f1
-TreeForget = f3
-TreeToggleNav = f4
-TreeCopy = f5
-TreeMove = f6
-TreeMoveUp = up; ctrl-p
-TreeMoveDown = down; ctrl-n
-TreeMoveLeft = left
-TreeMoveRight = right
-TreeMoveHome = home; alt-lt; a1
-TreeMoveEnd = end; alt-gt; c1
-TreeMovePgUp = pgup; alt-v
-TreeMovePgDn = pgdn; ctrl-v
-TreeOpen = enter
-TreeRescan = f2; ctrl-r
-TreeStartSearch = ctrl-s; alt-s
-TreeRemove = f8; delete
-
-[help]
-HelpHelp = f1
-HelpIndex = f2; c
-HelpBack = f3; left; l
-HelpQuit = f10; esc
-HelpMoveUp = up; ctrl-p
-HelpMoveDown = down; ctrl-n
-HelpMovePgDn = f; space; pgdn; ctrl-v
-HelpMovePgUp = b; pgup; alt-v; backspace
-HelpMoveHalfPgDn = d
-HelpMoveHalfPgUp = u
-HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-HelpSelectLink = right; enter
-HelpNextLink = tab
-HelpPrevLink = alt-tab
-HelpNextNode = n
-HelpPrevNode = p
-
-[dialog]
-DialogOK = enter
-DialogCancel = f10; esc; ctrl-g
-DialogPrevItem = left; up
-DialogNextItem = right; down
-DialogHelp = f1
-DialogSuspend = ctrl-z
-DialogRefresh = ctrl-l
-CmdDialogList = alt-prime
-CmdDialogNext = alt-rbrace
-CmdDialogPrev = alt-lbrace
-
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [diffviewer]
-DiffDisplaySymbols = alt-s; s
-DiffDisplayNumbers = alt-n; l
-DiffFull = f
-DiffEqual = equal
-DiffSplitMore = gt
-DiffSplitLess = lt
-DiffSetTab2 = 2
-DiffSetTab3 = 3
-DiffSetTab4 = 4
-DiffSetTab8 = 8
-DiffSwapPanel = ctrl-u
-DiffRedo = ctrl-r
-DiffNextHunk = n; enter; space
-DiffPrevHunk = p; backspace
-DiffGoto = g; shift-g
-DiffSave = f2
-DiffEditCurrent = f4
-DiffEditOther = f14
-DiffMergeCurrentHunk = f5
-DiffSearch = f7
-DiffContinueSearch = f17
-DiffOptions = f9
-DiffBOF = ctrl-home
-DiffEOF = ctrl-end
-DiffDown = down
-DiffUp = up
-DiffQuickLeft = ctrl-left
-DiffQuickRight = ctrl-right
-DiffLeft = left
-DiffRight = right
-DiffPageDown = pgdn
-DiffPageUp = pgup
-DiffHome = home
-DiffEnd = end
-DiffHelp = f1
-DiffQuit = f10; q; shift-q; esc
-ShowCommandLine = ctrl-o
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
 SelectCodepage = alt-e
index 929776f4c7317f5a597f29f551cbc8abb3176c76..6aa01aa71f8107db471e00f1ee4ceb4cd42d185a 100644 (file)
@@ -83,7 +83,7 @@ shell_patterns=0
 
 = f \.c$ & t r
 + f \.c$ & t r & ! t t
-        Compile and link current .c file
+с       Compile and link current .c file
         make `basename %f .c` 2>/dev/null || cc -O -o `basename %f .c` %f
 
 + t r & ! t t
diff --git a/mc/mcedit.menu b/mc/mcedit.menu
new file mode 100644 (file)
index 0000000..3d11d96
--- /dev/null
@@ -0,0 +1,486 @@
+shell_patterns=0    # expression type
+
+# The macros are:
+#
+# %c The cursor column position number. For edit menu only.
+# %i The indent of blank space, equal the cursor column 
+#    position. For edit menu only.
+# %y The syntax type of current file. For edit menu only.
+# %b The block file name.
+# %f The current file name.
+# %n Only the current file name without extension.
+# %x The extension of current file name.
+# %d The current directory name.
+# %F The current file in the unselected panel.
+# %D The directory name of the unselected panel.
+# %t The currently tagged files.
+# %T The tagged files in the unselected panel.
+# %u and %U Similar to the %t and %T macros, but in
+#    addition the files are untagged. You can use this macro
+#    only once per menu file entry or extension file entry,
+#    because next time there will be no tagged files.
+# %s and %S The selected files: The tagged files if
+#    there are any. Otherwise the current file.
+#
+# %% The % character
+#
+# %{some text} Prompt for the substitution. An input box
+#    is shown and the text inside the braces is used as a
+#    prompt. The macro is substituted by the text typed by the
+#    user. The user can press ESC or F10 to cancel. This macro
+#    doesn't work on the command line yet.
+
+#----------------------- Begin [perl] language template -----------------------
++ y Perl\ Program | f \.pl$
+1       Author description header
+        unset LANG
+        unset LANGUAGE
+        LC_ALL=
+        MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+        AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
+        cat >>%b <<EOF
+        #----------------------------------------------------------------------
+        # Description:
+        # Author: $AUTHOR <$REPLYTO>
+        # Created at: `date`
+        # Computer: `uname -n` 
+        # System: `uname -sr` on `uname -m`
+        #
+        # Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
+        #
+        #----------------------------------------------------------------------
+        # Configure section:
+
+        #----------------------------------------------------------------------
+        #
+        # main()
+
+        EOF
+
++ y Perl\ Program | f \.pl$
+2       while ()
+        cat <<EOF > %b
+        %iwhile() {
+        %i}
+        EOF
+
++ y Perl\ Program | f \.pl$
+3       for ()
+        cat <<EOF > %b
+        %ifor ($i =  ; $i <  ; $i++) {
+        %i}
+        EOF
+
++ y Perl\ Program | f \.pl$
+4       foreach ()
+        cat <<EOF > %b
+        %iforeach ($ ) {
+        %i}
+        EOF
+
++ y Perl\ Program | f \.pl$
+5       if ()
+        cat <<EOF > %b
+        %iif () {
+        %i}
+        EOF
+
++ y Perl\ Program | f \.pl$
+6       if () else
+        cat <<EOF > %b
+        %iif () {
+        %i} else {
+        %i}
+        EOF
+
++ y Perl\ Program | f \.pl$
+7       if () elsif ()
+        cat <<EOF > %b
+        %iif () {
+        %i} elsif () {
+        %i}
+        EOF
+
++ y Perl\ Program | f \.pl$
+8       substr ()
+        echo "%i$ = substr(\$str, \$off, \$cnt);" >%b
+
++ y Perl\ Program | f \.pl$
+9       opendir ()
+        cat <<EOF > %b
+        %iopendir(DIR, \$dir) || die("\$0: can't open \$dir\n");
+        EOF
+
++ y Perl\ Program | f \.pl$
+a       sub ()
+        NAME=%{ Enter name of subroutine: }
+        cat <<EOF > %b
+        sub
+        $NAME ()
+        {
+        } # end of $NAME()
+        EOF
+#----------------------- End [perl] language template -------------------------
+
+#---------------------- Begin [shell] language template -----------------------
++ y Shell\ Script | f \.sh$
+1       Author description header
+        unset LANG
+        unset LANGUAGE
+        LC_ALL=
+        MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+        AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
+        cat >>%b <<EOF
+        #----------------------------------------------------------------------
+        # Description:
+        # Author: $AUTHOR <$REPLYTO>
+        # Created at: `date`
+        # Computer: `uname -n`
+        # System: `uname -sr` on `uname -m`
+        #
+        # Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
+        #
+        #----------------------------------------------------------------------
+        # Configure section:
+
+        #----------------------------------------------------------------------
+        #
+        # main()
+
+        EOF
+
++ y Shell\ Script | f \.sh$
+3       for
+        cat <<EOF > %b
+        %ifor i in \$
+        %ido
+        %idone
+        EOF
+
++ y Shell\ Script | f \.sh$
+4       while
+        cat <<EOF > %b
+        %iwhile
+        %ido
+        %idone
+        EOF
+
++ y Shell\ Script | f \.sh$
+5       if [] then else
+        cat <<EOF >> %b
+        %iif [ ];then
+        %ielse
+        %ifi
+        EOF
+
++ y Shell\ Script | f \.sh$
+6       case
+        NUMBER=%{ Enter number elements of case:}
+        cat <<EOF > %b
+        %icase "\$" in
+        EOF
+        while [ "$NUMBER" -gt 0 ]
+        do
+        cat <<EOF >> %b
+        %i)
+        %i    ;;
+        EOF
+        let NUMBER=$NUMBER-1
+        done
+        cat <<EOF >> %b
+        %i*)
+        %iesac
+        EOF
+
++ y Shell\ Script | f \.sh$
+7       function
+        NAME=%{ Enter name of function:}
+        cat <<EOF >> %b
+        $NAME() {
+        } # end of $NAME()
+        EOF
+
++ y Shell\ Script | f \.sh$
+8       select of bash
+        cat <<EOF >> %b
+        %iselect i in \$l
+        %ido
+        %i    if [ -n "\$i" ];then
+        %i       break
+        %i    else
+        %i       continue
+        %i    fi
+        %idone
+        EOF
+
+#----------------------- End [shell] language template ------------------------
+
+#------------------------- Begin [c] language template ------------------------
++ f \.h$ | f \.c$ | f \.cc$
+1       Author description header
+        unset LANG
+        unset LANGUAGE
+        LC_ALL=
+        MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+        AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
+        cat >> %b <<EOF
+        /********************************************************************
+        * Description:
+        * Author: $AUTHOR <$REPLYTO>
+        * Created at: `date`
+        * Computer: `uname -n`
+        * System: `uname -sr` on `uname -m`
+        *
+        * Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
+        *
+        ********************************************************************/
+        EOF
+
++ f \.h$ | f \.c$ | f \.cc$
+2       GPL description header
+        cat >>%b <<EOF
+        /*
+        *  This program is free software: you can redistribute it and/or modify
+        *  it under the terms of the GNU General Public License as published by
+        *  the Free Software Foundation, either version 3 of the License, or
+        *  (at your option) any later version.
+        *
+        *  This program is distributed in the hope that it will be useful,
+        *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+        *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        *  GNU General Public License for more details.
+        *
+        *  You should have received a copy of the GNU General Public License
+        *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+        */
+        EOF
+
++ f \.c$ | f \.cc$
+3       if ()
+        cat <<EOF > %b
+        %iif () {
+        %i}
+        EOF
+
++ f \.c$ | f \.cc$
+4       if () else
+        cat <<EOF > %b
+        %iif () {
+        %i} else {
+        %i}
+        EOF
+
++ f \.c$ | f \.cc$
+5       if () else if ()
+        cat <<EOF > %b
+        %iif ( ) {
+        %i} else if ( ) {
+        %i}
+        EOF
+
++ f \.c$ | f \.cc$
+6       switch ()
+        NUMBER=%{ Enter number elements of switch:}
+        echo "%iswitch () {" >%b
+        while [ "$NUMBER" -gt 0 ]
+        do
+            echo "%icase '':" >>%b
+            echo "%i      break;" >>%b
+            let NUMBER=$NUMBER-1
+        done
+        echo "%i      default:" >>%b
+        echo "%i}" >>%b
+
++ f \.c$ | f \.cc$
+7       for ()
+        cat <<EOF > %b
+        %ifor (i =  ; i <  ; i++) {
+        %i}
+        EOF
+
++ f \.c$ | f \.cc$
+8       while ()
+        cat <<EOF > %b
+        %iwhile () {
+        %i}
+        EOF
+
++ f \.c$ | f \.cc$
+9       do {} while ()
+        cat <<EOF > %b
+        %ido {
+        %i} while ()
+        EOF
+
++ f \.c$ | f \.cc$
+a       array
+        cat <<EOF > %b
+        %ichar const x[] = {
+        %i, ,
+        %i};
+        EOF
+        
++ f \.c$ | f \.cc$
+b       enum
+        cat <<EOF > %b
+        %ienum x {
+        %i, ,
+        %i};
+        EOF
+        
++ f \.c$ | f \.cc$
+c       struct
+        cat <<EOF > %b
+        %istruct ? {
+        %i;
+        %i};
+        EOF
+
++ f \.c$ | f \.cc$
+d       union
+        cat <<EOF > %b
+        %iunion ? {
+        %i;
+        %i};
+        EOF
+
++ f \.c$ | f \.cc$
+e       typedef struct
+        cat <<EOF > %b
+        %itypedef struct {
+        %i;
+        %i} ?;
+        EOF
+
++ f \.c$ | f \.cc$
+f       function
+        NAME=%{ Enter name of function:}
+        cat <<EOF >> %b
+        $NAME()
+        {
+        } /* end of $NAME() */
+        EOF
+
++ f \.c$ | f \.h$ | f \.cc$
+g       #include
+        INC=%{ Enter include name: }
+        if [ -r "$INC" ];then
+            echo \#include \"$INC\" >%b
+        else
+            echo \#include \<$INC\> >%b
+        fi
+
++ f \.c$ | f \.h$ | f \.cc$
+d       #define
+        echo "#define " >%b
+
++ f \.c$ | f \.h$ | f \.cc$
+d       #ifdef
+        cat <<EOF > %b
+        #ifdef
+        #else
+        #endif
+        EOF
+
++ f \.c$ | f \.h$ | f \.cc$
+...............................................................................
+
++ f \.c$ | f \.h$ | f \.cc$
+h       View all *.h into current directory
+        cat *.h |less
+
++ f \.c$ | f \.cc$
+d       Run gdb for current file
+        [ -x "./%n" ] && gdb ./%n
+
+= f \.c$ | f \.cc$
++ f \.c$ | f \.cc$
+c       Compile, link and run the current .c file
+        export CFLAGS="-g -Wall -O2"
+        make || make %n || cc $CFLAGS -o %n %f
+        [ -r "%n" ] && (echo "*** press any key for run... ***"; read)
+        [ -x "%n" ] && ./%n
+        (echo -ne "\n--- Press any key for return to edit. ---"; read)
+
++ f \.c$ | f \.h$
+t       Indent `C' formatter
+        indent -kr -pcs %b 1>/dev/null 2> %e
+
+#--------------------- End [c/c++] language template --------------------------
+
+#------------------------- Begin unknown template -----------------------------
++ y unknown & t r
+s       #! /bin/sh
+        echo "#! /bin/sh" >%b
+
++ y unknown & t r
+p       #! /usr/bin/perl
+        echo "#! /usr/bin/perl" >%b
+
++ y unknown & t r
+a       Author description header
+        unset LANG
+        unset LANGUAGE
+        LC_ALL=
+        MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+        AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
+        cat >>%b <<EOF
+        ----------------------------------------------------------------------
+        Description:
+        Author: $AUTHOR <$REPLYTO>
+        Created at: `date`
+        Computer: `uname -n` 
+        System: `uname -sr` on `uname -m`
+
+        Copyright (c) `date +%%Y` $AUTHOR  All rights reserved.
+        ----------------------------------------------------------------------
+
+        EOF
+#--------------------------- End unknown template -----------------------------
+
+-------------------------------------------------------------------------------
+
+#----------------------- Begin common section ---------------------------------
+S       Sort selection
+        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/up.XXXXXX` || exit 1
+        cat %b > $TMPFILE
+        cat $TMPFILE| sort >%b
+        rm -f $TMPFILE
+
+I       Insert `Changelog' string
+        DATE="`date +%%Y-%%m-%%d`"
+        MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+        AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
+        EMAIL="<$REPLYTO>"
+        echo "$DATE  $AUTHOR  $EMAIL" >%b
+
+s       Invoke `shell'
+        sh
+
+m       view `man'
+        MAN=%{Enter name of man:}
+        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/mcview.$MAN.XXXXXX` || exit 1
+        man -Pcat $MAN >$TMPFILE
+        mcview $TMPFILE
+        rm -f $TMPFILE
+
+i       Insert a out of command to cursor.
+        CMD=%{ Enter command: }
+        eval $CMD > %b
+
+o       Open bash to next free console
+        open -s -- /bin/bash
+
+u       Upper case selection
+        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/up.XXXXXX` || exit 1
+        cat %b > $TMPFILE
+        cat $TMPFILE| sed 's/\(.*\)/\U\1/' >%b
+        rm -f $TMPFILE
+
+l       Lower case selection
+        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/up.XXXXXX` || exit 1
+        cat %b > $TMPFILE
+        cat $TMPFILE| sed 's/\(.*\)/\U\1/' >%b
+        rm -f $TMPFILE
+
+#-------------------------- End of common section -----------------------------
diff --git a/mtab b/mtab
index b40eecf983cf3724392681bd9cd135568bc28296..6af4511a7aed42d79cb613e5c4175f8842e721ed 100644 (file)
--- a/mtab
+++ b/mtab
@@ -1,9 +1,14 @@
 rootfs / rootfs rw 0 0
-/dev/root / ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=writeback 0 0
+/dev/root / ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=1,data=writeback 0 0
 proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
 rc-svcdir /lib64/rc/init.d tmpfs rw,nosuid,nodev,noexec,relatime,size=1024k,mode=755 0 0
 sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
 debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
+cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
+cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
+cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
+cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
+freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
 udev /dev tmpfs rw,nosuid,relatime,size=10240k,mode=755 0 0
 devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620 0 0
 shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
@@ -19,3 +24,4 @@ shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
 /dev/mapper/vg0-portage /usr/portage ext4 rw,noatime 0 0
 /dev/mapper/vg0-distfiles /usr/portage/distfiles ext4 rw,noatime 0 0
 binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,noexec,nosuid,nodev 0 0
+/dev/md2 /boot ext3 rw,noatime 0 0
index ac235e302452567f14ece1cb58298a6e5b51cb3c..50a3c2e4f8dff51a710f62005d29f2154787a770 100644 (file)
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /etc/mysql/.rcs/my.cnf.orig,v 1.1 2010/11/30 08:22:44 root Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -54,7 +54,7 @@ datadir                                       = /var/lib/mysql
 skip-external-locking
 key_buffer                                     = 16M
 max_allowed_packet                     = 1M
-table_cache                            = 64
+table_open_cache                       = 64
 sort_buffer_size                       = 512K
 net_buffer_length                      = 8K
 read_buffer_size                       = 256K
diff --git a/openvpn/pb/sample-server.cfg b/openvpn/pb/sample-server.cfg
new file mode 100644 (file)
index 0000000..4b39fe4
--- /dev/null
@@ -0,0 +1,93 @@
+# Port
+port 443
+
+# TCP oder UDP?
+proto udp
+
+# tun oder tap?
+# Das tun Device erstellt einen IP Tunnel,
+# während das tap Device einen Ethernet Tunnel erstellt.
+dev tun
+
+# Die ermittelte mtu für das tun Interface.
+# Wir fügen die Optionen fragment und
+# mssfix hinzu, um ein Aushandeln der
+# Paketgroessen zu ermoeglichen
+
+tun-mtu 1492
+fragment 1300
+mssfix
+
+# Die Pfade zu den Keys und Zertifikaten.
+# Ich kopiere die Pärchen später in das
+# openvpn Verzeichnis, um Wirrwarr vorzubeugen.
+ca /usr/local/etc/openvpn/vpn-ca.pem
+cert /usr/local/etc/openvpn/servercert.pem
+key /usr/local/etc/openvpn/serverkey.pem
+
+# der Pfad zu den Diffie-Hellmann Parametern.
+# Auch diese werde ich später ins openvpn
+# Verzeichnis kopieren.
+dh /usr/local/etc/openvpn/dh1024.pem
+
+# Durch die Angabe von server veranlassen
+# wir openvpn im Servermodus zu lauern.
+# Hier übergeben wir auch den Adressbereich
+# und die Netzwerkmaske für das virtuelle
+# Netzwerk. Der Server wird automatisch
+#auf der ersten IP lauschen - also 10.8.0.1
+server 10.8.0.0 255.255.255.0
+
+# Wir können einen Pool für die Virtuellen
+# Adressen angeben. Falls ein Client die
+# Verbindung beendet, bekommt er bei der
+# nächsten Verbindung automatisch die selbe
+# IP zugewiesen.
+ifconfig-pool-persist ipp.txt
+
+# Mit dem push Befehl können wir die
+# Clients veranlassen ihre Routing Tabellen
+# automatisch beim Verbindungsaufbau neu
+# zu schreiben. Wir veranlassen also die Clients
+# die Route in den Adressbereich
+# 192.168.0.0 automatisch über vpn zu routen
+push "route 192.168.0.0 255.255.255.0"
+
+# Mit keepalive können wir uns
+# informieren, ob die Gegenstelle noch
+# erreichbar ist. Wir setzen alle 10 Sekunden
+# ein ping ähnliches Paket ab und gehen
+# davon aus, dass die Gegenstelle weg ist,
+# wenn nach 120 Sekunden keine Antwort kommt.
+keepalive 10 120
+
+# Unsere Authentifizierungsmethode
+auth SHA1
+
+# Unsere Verschlüsselungsmethode
+cipher AES-256-CBC
+
+# Wir wollen komprimierten Datenverkehr
+comp-lzo
+
+# Wir reduzieren die Rechte, mit dem der
+# Server läuft nach dem Verbindungsaufbau.
+# Dies wird allerdings zur Folge haben, dass er keine Berechtigung mehr hat die
+# Routing Tabelle in den ursprünglichen
+# Zustand zu versetzen, was hier aber kein
+# Problem darstellt.
+user nobody
+group nobody
+
+# Die persist Optionen werden die Keys
+# und Zertifikate im Speicher behalten,
+# so dass sie auch noch gelesen werden
+# können nachdem Gruppe und User
+# gewechselt wurden.
+persist-key
+persist-tun
+
+# Für unsere Versuche setzen wir die Geschwätzigkeit
+# auf Level 3
+verb 3
+
diff --git a/openvpn/pb/vpn1.conf b/openvpn/pb/vpn1.conf
new file mode 100644 (file)
index 0000000..ba3bbe2
--- /dev/null
@@ -0,0 +1,25 @@
+client
+dev tun
+proto udp
+remote vpn.profitbricks.com 1194
+resolv-retry infinite
+nobind
+persist-tun
+route 192.168.0.0 255.255.0.0 vpn_gateway
+ca /etc/openvpn/keys/ca.crt
+cert /etc/openvpn/keys/pb-2-office.crt
+key /etc/openvpn/keys/pb-2-office.key
+ns-cert-type server
+comp-lzo
+script-security 2
+status /tmp/openvpn.status
+mssfix 1200
+tls-client
+reneg-sec 86400
+verb 3
+link-mtu 1500
+
+#for Debian-Linux uncomment:
+#up /etc/openvpn/profitbricks/update-resolv-conf
+#down /etc/openvpn/profitbricks/update-resolv-conf
+
index a20e8f9d5ee5a342f83ec23771e47783ab1b088d..27fa05a23b838e6042aac9d6b3d474f57dda82e4 100644 (file)
@@ -2,6 +2,7 @@ auth            required        pam_tally2.so onerr=succeed
 auth           required        pam_shells.so 
 auth           required        pam_nologin.so 
 auth           include         system-auth
+auth           optional        pam_gnome_keyring.so
                                
 account                required        pam_access.so 
 account                required        pam_nologin.so 
@@ -9,11 +10,13 @@ account              include         system-auth
 account                required        pam_tally2.so onerr=succeed 
  
 password       include         system-auth
+password       optional        pam_gnome_keyring.so
  
 session         optional        pam_loginuid.so
 session                required        pam_env.so 
 session                optional        pam_lastlog.so 
 session                include         system-auth
+session                optional        pam_gnome_keyring.so auto_start
 session                optional        pam_motd.so motd=/etc/motd
 session                optional        pam_mail.so
   
diff --git a/php/apache2-php5.3/ext-active/bcmath.ini b/php/apache2-php5.3/ext-active/bcmath.ini
deleted file mode 120000 (symlink)
index 0836843..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/bcmath.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/bz2.ini b/php/apache2-php5.3/ext-active/bz2.ini
deleted file mode 120000 (symlink)
index 93621af..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/bz2.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/calendar.ini b/php/apache2-php5.3/ext-active/calendar.ini
deleted file mode 120000 (symlink)
index 248e0d7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/calendar.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/curl.ini b/php/apache2-php5.3/ext-active/curl.ini
deleted file mode 120000 (symlink)
index ffe30f7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/curl.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/dba.ini b/php/apache2-php5.3/ext-active/dba.ini
deleted file mode 120000 (symlink)
index ca34cb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/dba.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/enchant.ini b/php/apache2-php5.3/ext-active/enchant.ini
deleted file mode 120000 (symlink)
index 8b23bb2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/enchant.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/exif.ini b/php/apache2-php5.3/ext-active/exif.ini
deleted file mode 120000 (symlink)
index 9d71ca8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/exif.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/ftp.ini b/php/apache2-php5.3/ext-active/ftp.ini
deleted file mode 120000 (symlink)
index 14abd12..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/ftp.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/gd.ini b/php/apache2-php5.3/ext-active/gd.ini
deleted file mode 120000 (symlink)
index 4f5ef54..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/gd.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/gettext.ini b/php/apache2-php5.3/ext-active/gettext.ini
deleted file mode 120000 (symlink)
index f3444bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/gettext.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/gmp.ini b/php/apache2-php5.3/ext-active/gmp.ini
deleted file mode 120000 (symlink)
index 26aa0c1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/gmp.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/imap.ini b/php/apache2-php5.3/ext-active/imap.ini
deleted file mode 120000 (symlink)
index 5f59b3e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/imap.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/intl.ini b/php/apache2-php5.3/ext-active/intl.ini
deleted file mode 120000 (symlink)
index b68d7c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/intl.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/ldap.ini b/php/apache2-php5.3/ext-active/ldap.ini
deleted file mode 120000 (symlink)
index ddc1074..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/ldap.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/mbstring.ini b/php/apache2-php5.3/ext-active/mbstring.ini
deleted file mode 120000 (symlink)
index a9afaa0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/mbstring.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/mcrypt.ini b/php/apache2-php5.3/ext-active/mcrypt.ini
deleted file mode 120000 (symlink)
index fdab9c7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/mcrypt.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/mysql.ini b/php/apache2-php5.3/ext-active/mysql.ini
deleted file mode 120000 (symlink)
index 6ac65a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/mysql.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/mysqli.ini b/php/apache2-php5.3/ext-active/mysqli.ini
deleted file mode 120000 (symlink)
index dd21899..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/mysqli.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/odbc.ini b/php/apache2-php5.3/ext-active/odbc.ini
deleted file mode 120000 (symlink)
index b77e96d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/odbc.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/pcntl.ini b/php/apache2-php5.3/ext-active/pcntl.ini
deleted file mode 120000 (symlink)
index fe1f813..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/pcntl.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/pspell.ini b/php/apache2-php5.3/ext-active/pspell.ini
deleted file mode 120000 (symlink)
index 7d0dd91..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/pspell.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/snmp.ini b/php/apache2-php5.3/ext-active/snmp.ini
deleted file mode 120000 (symlink)
index 21b868d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/snmp.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/soap.ini b/php/apache2-php5.3/ext-active/soap.ini
deleted file mode 120000 (symlink)
index 54fe260..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/soap.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/sockets.ini b/php/apache2-php5.3/ext-active/sockets.ini
deleted file mode 120000 (symlink)
index 976c36b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/sockets.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/sysvmsg.ini b/php/apache2-php5.3/ext-active/sysvmsg.ini
deleted file mode 120000 (symlink)
index 05cd9aa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/sysvmsg.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/sysvsem.ini b/php/apache2-php5.3/ext-active/sysvsem.ini
deleted file mode 120000 (symlink)
index 97698c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/sysvsem.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/sysvshm.ini b/php/apache2-php5.3/ext-active/sysvshm.ini
deleted file mode 120000 (symlink)
index cf63cfa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/sysvshm.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/tidy.ini b/php/apache2-php5.3/ext-active/tidy.ini
deleted file mode 120000 (symlink)
index b8ef64f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/tidy.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/wddx.ini b/php/apache2-php5.3/ext-active/wddx.ini
deleted file mode 120000 (symlink)
index c851489..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/wddx.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/xmlrpc.ini b/php/apache2-php5.3/ext-active/xmlrpc.ini
deleted file mode 120000 (symlink)
index 94cc8ea..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/xmlrpc.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/xsl.ini b/php/apache2-php5.3/ext-active/xsl.ini
deleted file mode 120000 (symlink)
index 26780c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/xsl.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/zip.ini b/php/apache2-php5.3/ext-active/zip.ini
deleted file mode 120000 (symlink)
index ea03892..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/zip.ini
\ No newline at end of file
diff --git a/php/apache2-php5.3/ext-active/zlib.ini b/php/apache2-php5.3/ext-active/zlib.ini
deleted file mode 120000 (symlink)
index 23c1e3a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/zlib.ini
\ No newline at end of file
index 5ec2d6e567b58615a2b1d786b6fa42b1c52f229a..a56eab82a9d0b419e93ec47631374426e58119b1 100644 (file)
@@ -1,26 +1 @@
 extension=apc.so
-apc.enabled="1"
-apc.shm_segments="1"
-apc.shm_size="30M"
-apc.num_files_hint="1024"
-apc.ttl="7200"
-apc.user_ttl="7200"
-apc.gc_ttl="3600"
-apc.cache_by_default="1"
-;apc.filters=""
-apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
-apc.slam_defense="0"
-apc.file_update_protection="2"
-apc.enable_cli="0"
-apc.max_file_size="1M"
-apc.stat="1"
-apc.write_lock="1"
-apc.report_autofilter="0"
-apc.include_once_override="0"
-apc.rfc1867="0"
-apc.rfc1867_prefix="upload_"
-apc.rfc1867_name="APC_UPLOAD_PROGRESS"
-apc.rfc1867_freq="0"
-apc.localcache="0"
-apc.localcache.size="512"
-apc.coredump_unmap="0"
diff --git a/php/apache2-php5.3/ext/bcmath.ini b/php/apache2-php5.3/ext/bcmath.ini
deleted file mode 100644 (file)
index 7e0ae9a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bcmath.so
diff --git a/php/apache2-php5.3/ext/bz2.ini b/php/apache2-php5.3/ext/bz2.ini
deleted file mode 100644 (file)
index f9d67d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bz2.so
diff --git a/php/apache2-php5.3/ext/calendar.ini b/php/apache2-php5.3/ext/calendar.ini
deleted file mode 100644 (file)
index 9106f44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=calendar.so
diff --git a/php/apache2-php5.3/ext/curl.ini b/php/apache2-php5.3/ext/curl.ini
deleted file mode 100644 (file)
index 3ed40f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=curl.so
diff --git a/php/apache2-php5.3/ext/dba.ini b/php/apache2-php5.3/ext/dba.ini
deleted file mode 100644 (file)
index 3058911..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=dba.so
diff --git a/php/apache2-php5.3/ext/enchant.ini b/php/apache2-php5.3/ext/enchant.ini
deleted file mode 100644 (file)
index f9b3244..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=enchant.so
diff --git a/php/apache2-php5.3/ext/exif.ini b/php/apache2-php5.3/ext/exif.ini
deleted file mode 100644 (file)
index 0688bbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=exif.so
diff --git a/php/apache2-php5.3/ext/ftp.ini b/php/apache2-php5.3/ext/ftp.ini
deleted file mode 100644 (file)
index d4c6f43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ftp.so
diff --git a/php/apache2-php5.3/ext/gd.ini b/php/apache2-php5.3/ext/gd.ini
deleted file mode 100644 (file)
index 1941c0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gd.so
diff --git a/php/apache2-php5.3/ext/gettext.ini b/php/apache2-php5.3/ext/gettext.ini
deleted file mode 100644 (file)
index 1b2e930..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gettext.so
diff --git a/php/apache2-php5.3/ext/gmp.ini b/php/apache2-php5.3/ext/gmp.ini
deleted file mode 100644 (file)
index 16d339e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gmp.so
diff --git a/php/apache2-php5.3/ext/imap.ini b/php/apache2-php5.3/ext/imap.ini
deleted file mode 100644 (file)
index a70747f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=imap.so
diff --git a/php/apache2-php5.3/ext/intl.ini b/php/apache2-php5.3/ext/intl.ini
deleted file mode 100644 (file)
index b334e92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=intl.so
diff --git a/php/apache2-php5.3/ext/ldap.ini b/php/apache2-php5.3/ext/ldap.ini
deleted file mode 100644 (file)
index 00825a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ldap.so
diff --git a/php/apache2-php5.3/ext/mbstring.ini b/php/apache2-php5.3/ext/mbstring.ini
deleted file mode 100644 (file)
index 772b052..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mbstring.so
diff --git a/php/apache2-php5.3/ext/mcrypt.ini b/php/apache2-php5.3/ext/mcrypt.ini
deleted file mode 100644 (file)
index 547ebdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mcrypt.so
diff --git a/php/apache2-php5.3/ext/mysql.ini b/php/apache2-php5.3/ext/mysql.ini
deleted file mode 100644 (file)
index da09c40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysql.so
diff --git a/php/apache2-php5.3/ext/mysqli.ini b/php/apache2-php5.3/ext/mysqli.ini
deleted file mode 100644 (file)
index 9d0502f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysqli.so
diff --git a/php/apache2-php5.3/ext/odbc.ini b/php/apache2-php5.3/ext/odbc.ini
deleted file mode 100644 (file)
index 96a0730..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=odbc.so
diff --git a/php/apache2-php5.3/ext/pcntl.ini b/php/apache2-php5.3/ext/pcntl.ini
deleted file mode 100644 (file)
index f0a7145..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pcntl.so
diff --git a/php/apache2-php5.3/ext/pspell.ini b/php/apache2-php5.3/ext/pspell.ini
deleted file mode 100644 (file)
index b4d0a8c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pspell.so
diff --git a/php/apache2-php5.3/ext/snmp.ini b/php/apache2-php5.3/ext/snmp.ini
deleted file mode 100644 (file)
index 15acf38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=snmp.so
diff --git a/php/apache2-php5.3/ext/soap.ini b/php/apache2-php5.3/ext/soap.ini
deleted file mode 100644 (file)
index 1deef9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=soap.so
diff --git a/php/apache2-php5.3/ext/sockets.ini b/php/apache2-php5.3/ext/sockets.ini
deleted file mode 100644 (file)
index 327228b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sockets.so
diff --git a/php/apache2-php5.3/ext/sysvmsg.ini b/php/apache2-php5.3/ext/sysvmsg.ini
deleted file mode 100644 (file)
index 639950e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvmsg.so
diff --git a/php/apache2-php5.3/ext/sysvsem.ini b/php/apache2-php5.3/ext/sysvsem.ini
deleted file mode 100644 (file)
index dd2c343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvsem.so
diff --git a/php/apache2-php5.3/ext/sysvshm.ini b/php/apache2-php5.3/ext/sysvshm.ini
deleted file mode 100644 (file)
index 4c26779..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvshm.so
diff --git a/php/apache2-php5.3/ext/tidy.ini b/php/apache2-php5.3/ext/tidy.ini
deleted file mode 100644 (file)
index 834babc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=tidy.so
diff --git a/php/apache2-php5.3/ext/wddx.ini b/php/apache2-php5.3/ext/wddx.ini
deleted file mode 100644 (file)
index 95571ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=wddx.so
diff --git a/php/apache2-php5.3/ext/xmlrpc.ini b/php/apache2-php5.3/ext/xmlrpc.ini
deleted file mode 100644 (file)
index b03d93c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xmlrpc.so
diff --git a/php/apache2-php5.3/ext/xsl.ini b/php/apache2-php5.3/ext/xsl.ini
deleted file mode 100644 (file)
index 3223510..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xsl.so
diff --git a/php/apache2-php5.3/ext/zip.ini b/php/apache2-php5.3/ext/zip.ini
deleted file mode 100644 (file)
index bb70997..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zip.so
diff --git a/php/apache2-php5.3/ext/zlib.ini b/php/apache2-php5.3/ext/zlib.ini
deleted file mode 100644 (file)
index 3d29bce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zlib.so
index 0af83e3ed0f29cedcef3bcb19b7d2f46d6b4a621..0c012e1da621c467b0df09236ecd290e0effd0ca 100644 (file)
@@ -420,6 +420,10 @@ disable_classes =
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120
 
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;
 ;;;;;;;;;;;;;;;;;
@@ -454,6 +458,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M
@@ -639,6 +646,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -963,7 +975,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
@@ -973,7 +985,6 @@ default_socket_timeout = 60
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
-;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 
@@ -1252,6 +1263,14 @@ mysql.trace_mode = Off
 ; http://php.net/mysqli.max-persistent
 mysqli.max_persistent = -1
 
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
@@ -1292,12 +1311,12 @@ mysqli.default_pw =
 mysqli.reconnect = Off
 
 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = On
@@ -1364,7 +1383,7 @@ mysqlnd.collect_memory_statistics = On
 ; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off
 
-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
 ; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
@@ -1596,7 +1615,7 @@ session.entropy_length = 0
 ; On windows, setting the entropy_length setting will activate the 
 ; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
-session.entropy_file =
+session.entropy_file = /dev/urandom
 
 ; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
@@ -1700,7 +1719,7 @@ mssql.secure_connection = Off
 ;mssql.max_procs = -1
 
 ; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
 
@@ -1893,6 +1912,12 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php/cgi-php5.3/ext-active/bcmath.ini b/php/cgi-php5.3/ext-active/bcmath.ini
deleted file mode 120000 (symlink)
index c5482f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/bcmath.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/bz2.ini b/php/cgi-php5.3/ext-active/bz2.ini
deleted file mode 120000 (symlink)
index 1cd67c8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/bz2.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/calendar.ini b/php/cgi-php5.3/ext-active/calendar.ini
deleted file mode 120000 (symlink)
index 8ea0ad9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/calendar.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/curl.ini b/php/cgi-php5.3/ext-active/curl.ini
deleted file mode 120000 (symlink)
index cebfa0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/curl.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/dba.ini b/php/cgi-php5.3/ext-active/dba.ini
deleted file mode 120000 (symlink)
index 13459e2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/dba.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/enchant.ini b/php/cgi-php5.3/ext-active/enchant.ini
deleted file mode 120000 (symlink)
index b3b44b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/enchant.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/exif.ini b/php/cgi-php5.3/ext-active/exif.ini
deleted file mode 120000 (symlink)
index 0b57b92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/exif.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/ftp.ini b/php/cgi-php5.3/ext-active/ftp.ini
deleted file mode 120000 (symlink)
index 812cf09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/ftp.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/gd.ini b/php/cgi-php5.3/ext-active/gd.ini
deleted file mode 120000 (symlink)
index 8e6cc7d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/gd.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/gettext.ini b/php/cgi-php5.3/ext-active/gettext.ini
deleted file mode 120000 (symlink)
index 3303fbc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/gettext.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/gmp.ini b/php/cgi-php5.3/ext-active/gmp.ini
deleted file mode 120000 (symlink)
index e11f744..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/gmp.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/imap.ini b/php/cgi-php5.3/ext-active/imap.ini
deleted file mode 120000 (symlink)
index 0475992..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/imap.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/intl.ini b/php/cgi-php5.3/ext-active/intl.ini
deleted file mode 120000 (symlink)
index 92edbcc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/intl.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/ldap.ini b/php/cgi-php5.3/ext-active/ldap.ini
deleted file mode 120000 (symlink)
index dee6822..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/ldap.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/mbstring.ini b/php/cgi-php5.3/ext-active/mbstring.ini
deleted file mode 120000 (symlink)
index 91e625f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/mbstring.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/mcrypt.ini b/php/cgi-php5.3/ext-active/mcrypt.ini
deleted file mode 120000 (symlink)
index e23bdee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/mcrypt.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/mysql.ini b/php/cgi-php5.3/ext-active/mysql.ini
deleted file mode 120000 (symlink)
index a7233e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/mysql.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/mysqli.ini b/php/cgi-php5.3/ext-active/mysqli.ini
deleted file mode 120000 (symlink)
index d5405d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/mysqli.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/odbc.ini b/php/cgi-php5.3/ext-active/odbc.ini
deleted file mode 120000 (symlink)
index 864c5b0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/odbc.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/pcntl.ini b/php/cgi-php5.3/ext-active/pcntl.ini
deleted file mode 120000 (symlink)
index 95f496e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/pcntl.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/pspell.ini b/php/cgi-php5.3/ext-active/pspell.ini
deleted file mode 120000 (symlink)
index e7d5cb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/pspell.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/snmp.ini b/php/cgi-php5.3/ext-active/snmp.ini
deleted file mode 120000 (symlink)
index 1cc15d7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/snmp.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/soap.ini b/php/cgi-php5.3/ext-active/soap.ini
deleted file mode 120000 (symlink)
index 3d96d18..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/soap.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/sockets.ini b/php/cgi-php5.3/ext-active/sockets.ini
deleted file mode 120000 (symlink)
index f6c2b48..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/sockets.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/sysvmsg.ini b/php/cgi-php5.3/ext-active/sysvmsg.ini
deleted file mode 120000 (symlink)
index 8f47e0f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/sysvmsg.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/sysvsem.ini b/php/cgi-php5.3/ext-active/sysvsem.ini
deleted file mode 120000 (symlink)
index a8aafdf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/sysvsem.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/sysvshm.ini b/php/cgi-php5.3/ext-active/sysvshm.ini
deleted file mode 120000 (symlink)
index bff669a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/sysvshm.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/tidy.ini b/php/cgi-php5.3/ext-active/tidy.ini
deleted file mode 120000 (symlink)
index f883069..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/tidy.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/wddx.ini b/php/cgi-php5.3/ext-active/wddx.ini
deleted file mode 120000 (symlink)
index 9f70415..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/wddx.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/xmlrpc.ini b/php/cgi-php5.3/ext-active/xmlrpc.ini
deleted file mode 120000 (symlink)
index 04f9efc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/xmlrpc.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/xsl.ini b/php/cgi-php5.3/ext-active/xsl.ini
deleted file mode 120000 (symlink)
index 73fce9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/xsl.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/zip.ini b/php/cgi-php5.3/ext-active/zip.ini
deleted file mode 120000 (symlink)
index 5c6d322..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/zip.ini
\ No newline at end of file
diff --git a/php/cgi-php5.3/ext-active/zlib.ini b/php/cgi-php5.3/ext-active/zlib.ini
deleted file mode 120000 (symlink)
index 57a6803..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/zlib.ini
\ No newline at end of file
index 119e167048a1f89a3358235eaa055a060cec1854..a56eab82a9d0b419e93ec47631374426e58119b1 100644 (file)
@@ -1,26 +1 @@
 extension=apc.so
-apc.enabled="1"
-apc.shm_segments="1"
-apc.shm_size="30M"
-apc.num_files_hint="1024"
-apc.ttl="7200"
-apc.user_ttl="7200"
-apc.gc_ttl="3600"
-apc.cache_by_default="1"
-;apc.filters=""
-;apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
-apc.slam_defense="0"
-apc.file_update_protection="2"
-apc.enable_cli="0"
-apc.max_file_size="1M"
-apc.stat="1"
-apc.write_lock="1"
-apc.report_autofilter="0"
-apc.include_once_override="0"
-apc.rfc1867="0"
-apc.rfc1867_prefix="upload_"
-apc.rfc1867_name="APC_UPLOAD_PROGRESS"
-apc.rfc1867_freq="0"
-apc.localcache="0"
-apc.localcache.size="512"
-apc.coredump_unmap="0"
diff --git a/php/cgi-php5.3/ext/bcmath.ini b/php/cgi-php5.3/ext/bcmath.ini
deleted file mode 100644 (file)
index 7e0ae9a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bcmath.so
diff --git a/php/cgi-php5.3/ext/bz2.ini b/php/cgi-php5.3/ext/bz2.ini
deleted file mode 100644 (file)
index f9d67d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bz2.so
diff --git a/php/cgi-php5.3/ext/calendar.ini b/php/cgi-php5.3/ext/calendar.ini
deleted file mode 100644 (file)
index 9106f44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=calendar.so
diff --git a/php/cgi-php5.3/ext/curl.ini b/php/cgi-php5.3/ext/curl.ini
deleted file mode 100644 (file)
index 3ed40f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=curl.so
diff --git a/php/cgi-php5.3/ext/dba.ini b/php/cgi-php5.3/ext/dba.ini
deleted file mode 100644 (file)
index 3058911..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=dba.so
diff --git a/php/cgi-php5.3/ext/enchant.ini b/php/cgi-php5.3/ext/enchant.ini
deleted file mode 100644 (file)
index f9b3244..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=enchant.so
diff --git a/php/cgi-php5.3/ext/exif.ini b/php/cgi-php5.3/ext/exif.ini
deleted file mode 100644 (file)
index 0688bbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=exif.so
diff --git a/php/cgi-php5.3/ext/ftp.ini b/php/cgi-php5.3/ext/ftp.ini
deleted file mode 100644 (file)
index d4c6f43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ftp.so
diff --git a/php/cgi-php5.3/ext/gd.ini b/php/cgi-php5.3/ext/gd.ini
deleted file mode 100644 (file)
index 1941c0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gd.so
diff --git a/php/cgi-php5.3/ext/gettext.ini b/php/cgi-php5.3/ext/gettext.ini
deleted file mode 100644 (file)
index 1b2e930..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gettext.so
diff --git a/php/cgi-php5.3/ext/gmp.ini b/php/cgi-php5.3/ext/gmp.ini
deleted file mode 100644 (file)
index 16d339e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gmp.so
diff --git a/php/cgi-php5.3/ext/imap.ini b/php/cgi-php5.3/ext/imap.ini
deleted file mode 100644 (file)
index a70747f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=imap.so
diff --git a/php/cgi-php5.3/ext/intl.ini b/php/cgi-php5.3/ext/intl.ini
deleted file mode 100644 (file)
index b334e92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=intl.so
diff --git a/php/cgi-php5.3/ext/ldap.ini b/php/cgi-php5.3/ext/ldap.ini
deleted file mode 100644 (file)
index 00825a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ldap.so
diff --git a/php/cgi-php5.3/ext/mbstring.ini b/php/cgi-php5.3/ext/mbstring.ini
deleted file mode 100644 (file)
index 772b052..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mbstring.so
diff --git a/php/cgi-php5.3/ext/mcrypt.ini b/php/cgi-php5.3/ext/mcrypt.ini
deleted file mode 100644 (file)
index 547ebdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mcrypt.so
diff --git a/php/cgi-php5.3/ext/mysql.ini b/php/cgi-php5.3/ext/mysql.ini
deleted file mode 100644 (file)
index da09c40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysql.so
diff --git a/php/cgi-php5.3/ext/mysqli.ini b/php/cgi-php5.3/ext/mysqli.ini
deleted file mode 100644 (file)
index 9d0502f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysqli.so
diff --git a/php/cgi-php5.3/ext/odbc.ini b/php/cgi-php5.3/ext/odbc.ini
deleted file mode 100644 (file)
index 96a0730..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=odbc.so
diff --git a/php/cgi-php5.3/ext/pcntl.ini b/php/cgi-php5.3/ext/pcntl.ini
deleted file mode 100644 (file)
index f0a7145..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pcntl.so
diff --git a/php/cgi-php5.3/ext/pspell.ini b/php/cgi-php5.3/ext/pspell.ini
deleted file mode 100644 (file)
index b4d0a8c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pspell.so
diff --git a/php/cgi-php5.3/ext/snmp.ini b/php/cgi-php5.3/ext/snmp.ini
deleted file mode 100644 (file)
index 15acf38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=snmp.so
diff --git a/php/cgi-php5.3/ext/soap.ini b/php/cgi-php5.3/ext/soap.ini
deleted file mode 100644 (file)
index 1deef9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=soap.so
diff --git a/php/cgi-php5.3/ext/sockets.ini b/php/cgi-php5.3/ext/sockets.ini
deleted file mode 100644 (file)
index 327228b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sockets.so
diff --git a/php/cgi-php5.3/ext/sysvmsg.ini b/php/cgi-php5.3/ext/sysvmsg.ini
deleted file mode 100644 (file)
index 639950e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvmsg.so
diff --git a/php/cgi-php5.3/ext/sysvsem.ini b/php/cgi-php5.3/ext/sysvsem.ini
deleted file mode 100644 (file)
index dd2c343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvsem.so
diff --git a/php/cgi-php5.3/ext/sysvshm.ini b/php/cgi-php5.3/ext/sysvshm.ini
deleted file mode 100644 (file)
index 4c26779..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvshm.so
diff --git a/php/cgi-php5.3/ext/tidy.ini b/php/cgi-php5.3/ext/tidy.ini
deleted file mode 100644 (file)
index 834babc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=tidy.so
diff --git a/php/cgi-php5.3/ext/wddx.ini b/php/cgi-php5.3/ext/wddx.ini
deleted file mode 100644 (file)
index 95571ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=wddx.so
diff --git a/php/cgi-php5.3/ext/xmlrpc.ini b/php/cgi-php5.3/ext/xmlrpc.ini
deleted file mode 100644 (file)
index b03d93c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xmlrpc.so
diff --git a/php/cgi-php5.3/ext/xsl.ini b/php/cgi-php5.3/ext/xsl.ini
deleted file mode 100644 (file)
index 3223510..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xsl.so
diff --git a/php/cgi-php5.3/ext/zip.ini b/php/cgi-php5.3/ext/zip.ini
deleted file mode 100644 (file)
index bb70997..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zip.so
diff --git a/php/cgi-php5.3/ext/zlib.ini b/php/cgi-php5.3/ext/zlib.ini
deleted file mode 100644 (file)
index 3d29bce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zlib.so
index 26ecfb251726e42e9e8853374f05922044337dd5..272588949a3a880e5f6074fc3c12a7b9634ba488 100644 (file)
@@ -419,6 +419,10 @@ disable_classes =
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120
 
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;
 ;;;;;;;;;;;;;;;;;
@@ -428,7 +432,7 @@ disable_classes =
 ; threat in any way, but it makes it possible to determine whether you use PHP
 ; on your server or not.
 ; http://php.net/expose-php
-expose_php = Off
+expose_php = On
 
 ;;;;;;;;;;;;;;;;;;;
 ; Resource Limits ;
@@ -453,6 +457,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M
@@ -637,6 +644,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -887,7 +899,7 @@ max_file_uploads = 20
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 ; http://php.net/allow-url-fopen
-allow_url_fopen = Off
+allow_url_fopen = On
 
 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 ; http://php.net/allow-url-include
@@ -959,7 +971,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
@@ -969,7 +981,6 @@ default_socket_timeout = 60
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
-;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 
@@ -1248,6 +1259,14 @@ mysql.trace_mode = Off
 ; http://php.net/mysqli.max-persistent
 mysqli.max_persistent = -1
 
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
@@ -1288,12 +1307,12 @@ mysqli.default_pw =
 mysqli.reconnect = Off
 
 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = On
@@ -1360,7 +1379,7 @@ mysqlnd.collect_memory_statistics = On
 ; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off
 
-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
 ; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
@@ -1592,7 +1611,6 @@ session.entropy_length = 0
 ; On windows, setting the entropy_length setting will activate the 
 ; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
-session.entropy_file =
 
 ; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
@@ -1696,7 +1714,7 @@ mssql.secure_connection = Off
 ;mssql.max_procs = -1
 
 ; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
 
@@ -1889,6 +1907,12 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php/cli-php5.3/ext-active/bcmath.ini b/php/cli-php5.3/ext-active/bcmath.ini
deleted file mode 120000 (symlink)
index 826548f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/bcmath.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/bz2.ini b/php/cli-php5.3/ext-active/bz2.ini
deleted file mode 120000 (symlink)
index a130aa6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/bz2.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/calendar.ini b/php/cli-php5.3/ext-active/calendar.ini
deleted file mode 120000 (symlink)
index 40cc0f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/calendar.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/curl.ini b/php/cli-php5.3/ext-active/curl.ini
deleted file mode 120000 (symlink)
index d7500d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/curl.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/dba.ini b/php/cli-php5.3/ext-active/dba.ini
deleted file mode 120000 (symlink)
index 46e4bdf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/dba.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/enchant.ini b/php/cli-php5.3/ext-active/enchant.ini
deleted file mode 120000 (symlink)
index 6d625df..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/enchant.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/exif.ini b/php/cli-php5.3/ext-active/exif.ini
deleted file mode 120000 (symlink)
index 0cba204..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/exif.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/ftp.ini b/php/cli-php5.3/ext-active/ftp.ini
deleted file mode 120000 (symlink)
index 17bdf23..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/ftp.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/gd.ini b/php/cli-php5.3/ext-active/gd.ini
deleted file mode 120000 (symlink)
index 01dbef2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/gd.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/gettext.ini b/php/cli-php5.3/ext-active/gettext.ini
deleted file mode 120000 (symlink)
index a544cfb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/gettext.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/gmp.ini b/php/cli-php5.3/ext-active/gmp.ini
deleted file mode 120000 (symlink)
index 44bab54..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/gmp.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/imap.ini b/php/cli-php5.3/ext-active/imap.ini
deleted file mode 120000 (symlink)
index 9a3c358..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/imap.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/intl.ini b/php/cli-php5.3/ext-active/intl.ini
deleted file mode 120000 (symlink)
index 1e184e2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/intl.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/ldap.ini b/php/cli-php5.3/ext-active/ldap.ini
deleted file mode 120000 (symlink)
index b5c5d4f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/ldap.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/mbstring.ini b/php/cli-php5.3/ext-active/mbstring.ini
deleted file mode 120000 (symlink)
index 2e699be..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/mbstring.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/mcrypt.ini b/php/cli-php5.3/ext-active/mcrypt.ini
deleted file mode 120000 (symlink)
index 8ebd2d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/mcrypt.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/mysql.ini b/php/cli-php5.3/ext-active/mysql.ini
deleted file mode 120000 (symlink)
index cb764a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/mysql.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/mysqli.ini b/php/cli-php5.3/ext-active/mysqli.ini
deleted file mode 120000 (symlink)
index 5d16f5f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/mysqli.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/odbc.ini b/php/cli-php5.3/ext-active/odbc.ini
deleted file mode 120000 (symlink)
index 43d276a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/odbc.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/pcntl.ini b/php/cli-php5.3/ext-active/pcntl.ini
deleted file mode 120000 (symlink)
index 8e5122d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/pcntl.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/pspell.ini b/php/cli-php5.3/ext-active/pspell.ini
deleted file mode 120000 (symlink)
index 75928e4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/pspell.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/snmp.ini b/php/cli-php5.3/ext-active/snmp.ini
deleted file mode 120000 (symlink)
index d160f8e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/snmp.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/soap.ini b/php/cli-php5.3/ext-active/soap.ini
deleted file mode 120000 (symlink)
index 8fbd6e0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/soap.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/sockets.ini b/php/cli-php5.3/ext-active/sockets.ini
deleted file mode 120000 (symlink)
index 3af21f9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/sockets.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/sysvmsg.ini b/php/cli-php5.3/ext-active/sysvmsg.ini
deleted file mode 120000 (symlink)
index b279a8e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/sysvmsg.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/sysvsem.ini b/php/cli-php5.3/ext-active/sysvsem.ini
deleted file mode 120000 (symlink)
index e7d5192..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/sysvsem.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/sysvshm.ini b/php/cli-php5.3/ext-active/sysvshm.ini
deleted file mode 120000 (symlink)
index 1b62420..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/sysvshm.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/tidy.ini b/php/cli-php5.3/ext-active/tidy.ini
deleted file mode 120000 (symlink)
index cec5a06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/tidy.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/wddx.ini b/php/cli-php5.3/ext-active/wddx.ini
deleted file mode 120000 (symlink)
index 92a9c95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/wddx.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/xmlrpc.ini b/php/cli-php5.3/ext-active/xmlrpc.ini
deleted file mode 120000 (symlink)
index 1424232..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/xmlrpc.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/xsl.ini b/php/cli-php5.3/ext-active/xsl.ini
deleted file mode 120000 (symlink)
index 0c6cdb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/xsl.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/zip.ini b/php/cli-php5.3/ext-active/zip.ini
deleted file mode 120000 (symlink)
index 435b3ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/zip.ini
\ No newline at end of file
diff --git a/php/cli-php5.3/ext-active/zlib.ini b/php/cli-php5.3/ext-active/zlib.ini
deleted file mode 120000 (symlink)
index 3407a19..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/zlib.ini
\ No newline at end of file
index 119e167048a1f89a3358235eaa055a060cec1854..a56eab82a9d0b419e93ec47631374426e58119b1 100644 (file)
@@ -1,26 +1 @@
 extension=apc.so
-apc.enabled="1"
-apc.shm_segments="1"
-apc.shm_size="30M"
-apc.num_files_hint="1024"
-apc.ttl="7200"
-apc.user_ttl="7200"
-apc.gc_ttl="3600"
-apc.cache_by_default="1"
-;apc.filters=""
-;apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
-apc.slam_defense="0"
-apc.file_update_protection="2"
-apc.enable_cli="0"
-apc.max_file_size="1M"
-apc.stat="1"
-apc.write_lock="1"
-apc.report_autofilter="0"
-apc.include_once_override="0"
-apc.rfc1867="0"
-apc.rfc1867_prefix="upload_"
-apc.rfc1867_name="APC_UPLOAD_PROGRESS"
-apc.rfc1867_freq="0"
-apc.localcache="0"
-apc.localcache.size="512"
-apc.coredump_unmap="0"
diff --git a/php/cli-php5.3/ext/bcmath.ini b/php/cli-php5.3/ext/bcmath.ini
deleted file mode 100644 (file)
index 7e0ae9a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bcmath.so
diff --git a/php/cli-php5.3/ext/bz2.ini b/php/cli-php5.3/ext/bz2.ini
deleted file mode 100644 (file)
index f9d67d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bz2.so
diff --git a/php/cli-php5.3/ext/calendar.ini b/php/cli-php5.3/ext/calendar.ini
deleted file mode 100644 (file)
index 9106f44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=calendar.so
diff --git a/php/cli-php5.3/ext/curl.ini b/php/cli-php5.3/ext/curl.ini
deleted file mode 100644 (file)
index 3ed40f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=curl.so
diff --git a/php/cli-php5.3/ext/dba.ini b/php/cli-php5.3/ext/dba.ini
deleted file mode 100644 (file)
index 3058911..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=dba.so
diff --git a/php/cli-php5.3/ext/enchant.ini b/php/cli-php5.3/ext/enchant.ini
deleted file mode 100644 (file)
index f9b3244..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=enchant.so
diff --git a/php/cli-php5.3/ext/exif.ini b/php/cli-php5.3/ext/exif.ini
deleted file mode 100644 (file)
index 0688bbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=exif.so
diff --git a/php/cli-php5.3/ext/ftp.ini b/php/cli-php5.3/ext/ftp.ini
deleted file mode 100644 (file)
index d4c6f43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ftp.so
diff --git a/php/cli-php5.3/ext/gd.ini b/php/cli-php5.3/ext/gd.ini
deleted file mode 100644 (file)
index 1941c0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gd.so
diff --git a/php/cli-php5.3/ext/gettext.ini b/php/cli-php5.3/ext/gettext.ini
deleted file mode 100644 (file)
index 1b2e930..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gettext.so
diff --git a/php/cli-php5.3/ext/gmp.ini b/php/cli-php5.3/ext/gmp.ini
deleted file mode 100644 (file)
index 16d339e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gmp.so
diff --git a/php/cli-php5.3/ext/imap.ini b/php/cli-php5.3/ext/imap.ini
deleted file mode 100644 (file)
index a70747f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=imap.so
diff --git a/php/cli-php5.3/ext/intl.ini b/php/cli-php5.3/ext/intl.ini
deleted file mode 100644 (file)
index b334e92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=intl.so
diff --git a/php/cli-php5.3/ext/ldap.ini b/php/cli-php5.3/ext/ldap.ini
deleted file mode 100644 (file)
index 00825a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ldap.so
diff --git a/php/cli-php5.3/ext/mbstring.ini b/php/cli-php5.3/ext/mbstring.ini
deleted file mode 100644 (file)
index 772b052..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mbstring.so
diff --git a/php/cli-php5.3/ext/mcrypt.ini b/php/cli-php5.3/ext/mcrypt.ini
deleted file mode 100644 (file)
index 547ebdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mcrypt.so
diff --git a/php/cli-php5.3/ext/mysql.ini b/php/cli-php5.3/ext/mysql.ini
deleted file mode 100644 (file)
index da09c40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysql.so
diff --git a/php/cli-php5.3/ext/mysqli.ini b/php/cli-php5.3/ext/mysqli.ini
deleted file mode 100644 (file)
index 9d0502f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysqli.so
diff --git a/php/cli-php5.3/ext/odbc.ini b/php/cli-php5.3/ext/odbc.ini
deleted file mode 100644 (file)
index 96a0730..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=odbc.so
diff --git a/php/cli-php5.3/ext/pcntl.ini b/php/cli-php5.3/ext/pcntl.ini
deleted file mode 100644 (file)
index f0a7145..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pcntl.so
diff --git a/php/cli-php5.3/ext/pspell.ini b/php/cli-php5.3/ext/pspell.ini
deleted file mode 100644 (file)
index b4d0a8c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pspell.so
diff --git a/php/cli-php5.3/ext/snmp.ini b/php/cli-php5.3/ext/snmp.ini
deleted file mode 100644 (file)
index 15acf38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=snmp.so
diff --git a/php/cli-php5.3/ext/soap.ini b/php/cli-php5.3/ext/soap.ini
deleted file mode 100644 (file)
index 1deef9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=soap.so
diff --git a/php/cli-php5.3/ext/sockets.ini b/php/cli-php5.3/ext/sockets.ini
deleted file mode 100644 (file)
index 327228b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sockets.so
diff --git a/php/cli-php5.3/ext/sysvmsg.ini b/php/cli-php5.3/ext/sysvmsg.ini
deleted file mode 100644 (file)
index 639950e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvmsg.so
diff --git a/php/cli-php5.3/ext/sysvsem.ini b/php/cli-php5.3/ext/sysvsem.ini
deleted file mode 100644 (file)
index dd2c343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvsem.so
diff --git a/php/cli-php5.3/ext/sysvshm.ini b/php/cli-php5.3/ext/sysvshm.ini
deleted file mode 100644 (file)
index 4c26779..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvshm.so
diff --git a/php/cli-php5.3/ext/tidy.ini b/php/cli-php5.3/ext/tidy.ini
deleted file mode 100644 (file)
index 834babc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=tidy.so
diff --git a/php/cli-php5.3/ext/wddx.ini b/php/cli-php5.3/ext/wddx.ini
deleted file mode 100644 (file)
index 95571ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=wddx.so
diff --git a/php/cli-php5.3/ext/xmlrpc.ini b/php/cli-php5.3/ext/xmlrpc.ini
deleted file mode 100644 (file)
index b03d93c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xmlrpc.so
diff --git a/php/cli-php5.3/ext/xsl.ini b/php/cli-php5.3/ext/xsl.ini
deleted file mode 100644 (file)
index 3223510..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xsl.so
diff --git a/php/cli-php5.3/ext/zip.ini b/php/cli-php5.3/ext/zip.ini
deleted file mode 100644 (file)
index bb70997..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zip.so
diff --git a/php/cli-php5.3/ext/zlib.ini b/php/cli-php5.3/ext/zlib.ini
deleted file mode 100644 (file)
index 3d29bce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zlib.so
index 38067fd2f769a4e1a23175ec1ae1b14b7c49d609..5a517227cad19d0f25058730ad848b8bd1ea3e6b 100644 (file)
@@ -419,6 +419,10 @@ disable_classes =
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120
 
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;
 ;;;;;;;;;;;;;;;;;
@@ -453,6 +457,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M
@@ -639,6 +646,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -962,7 +974,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
@@ -972,7 +984,6 @@ default_socket_timeout = 60
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
-;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 
@@ -1251,6 +1262,14 @@ mysql.trace_mode = Off
 ; http://php.net/mysqli.max-persistent
 mysqli.max_persistent = -1
 
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
@@ -1291,12 +1310,12 @@ mysqli.default_pw =
 mysqli.reconnect = Off
 
 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = On
@@ -1363,7 +1382,7 @@ mysqlnd.collect_memory_statistics = On
 ; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off
 
-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
 ; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
@@ -1595,7 +1614,7 @@ session.entropy_length = 0
 ; On windows, setting the entropy_length setting will activate the 
 ; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
-session.entropy_file =
+session.entropy_file = /dev/urandom
 
 ; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
@@ -1699,7 +1718,7 @@ mssql.secure_connection = Off
 ;mssql.max_procs = -1
 
 ; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
 
@@ -1892,6 +1911,12 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php/embed-php5.3/ext-active/bcmath.ini b/php/embed-php5.3/ext-active/bcmath.ini
deleted file mode 120000 (symlink)
index 56a12f4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/bcmath.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/bz2.ini b/php/embed-php5.3/ext-active/bz2.ini
deleted file mode 120000 (symlink)
index ce77108..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/bz2.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/calendar.ini b/php/embed-php5.3/ext-active/calendar.ini
deleted file mode 120000 (symlink)
index 7c90b0c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/calendar.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/curl.ini b/php/embed-php5.3/ext-active/curl.ini
deleted file mode 120000 (symlink)
index 771b0a1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/curl.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/dba.ini b/php/embed-php5.3/ext-active/dba.ini
deleted file mode 120000 (symlink)
index 248949f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/dba.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/enchant.ini b/php/embed-php5.3/ext-active/enchant.ini
deleted file mode 120000 (symlink)
index c7a4a8d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/enchant.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/exif.ini b/php/embed-php5.3/ext-active/exif.ini
deleted file mode 120000 (symlink)
index 8ada06b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/exif.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/ftp.ini b/php/embed-php5.3/ext-active/ftp.ini
deleted file mode 120000 (symlink)
index cbf996b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/ftp.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/gd.ini b/php/embed-php5.3/ext-active/gd.ini
deleted file mode 120000 (symlink)
index 82d8a45..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/gd.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/gettext.ini b/php/embed-php5.3/ext-active/gettext.ini
deleted file mode 120000 (symlink)
index 5ebd3fa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/gettext.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/gmp.ini b/php/embed-php5.3/ext-active/gmp.ini
deleted file mode 120000 (symlink)
index 8d75d0f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/gmp.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/imap.ini b/php/embed-php5.3/ext-active/imap.ini
deleted file mode 120000 (symlink)
index b5de9ad..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/imap.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/intl.ini b/php/embed-php5.3/ext-active/intl.ini
deleted file mode 120000 (symlink)
index e3293da..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/intl.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/ldap.ini b/php/embed-php5.3/ext-active/ldap.ini
deleted file mode 120000 (symlink)
index ca4e5a0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/ldap.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/mbstring.ini b/php/embed-php5.3/ext-active/mbstring.ini
deleted file mode 120000 (symlink)
index 718e6e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/mbstring.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/mcrypt.ini b/php/embed-php5.3/ext-active/mcrypt.ini
deleted file mode 120000 (symlink)
index b42a636..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/mcrypt.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/mysql.ini b/php/embed-php5.3/ext-active/mysql.ini
deleted file mode 120000 (symlink)
index ad1ee4b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/mysql.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/mysqli.ini b/php/embed-php5.3/ext-active/mysqli.ini
deleted file mode 120000 (symlink)
index 26ba5c6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/mysqli.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/odbc.ini b/php/embed-php5.3/ext-active/odbc.ini
deleted file mode 120000 (symlink)
index 704cdd6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/odbc.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/pcntl.ini b/php/embed-php5.3/ext-active/pcntl.ini
deleted file mode 120000 (symlink)
index 9b5628b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/pcntl.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/pspell.ini b/php/embed-php5.3/ext-active/pspell.ini
deleted file mode 120000 (symlink)
index f8e6ffe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/pspell.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/snmp.ini b/php/embed-php5.3/ext-active/snmp.ini
deleted file mode 120000 (symlink)
index f971521..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/snmp.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/soap.ini b/php/embed-php5.3/ext-active/soap.ini
deleted file mode 120000 (symlink)
index 0bb20b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/soap.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/sockets.ini b/php/embed-php5.3/ext-active/sockets.ini
deleted file mode 120000 (symlink)
index b40c169..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/sockets.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/sysvmsg.ini b/php/embed-php5.3/ext-active/sysvmsg.ini
deleted file mode 120000 (symlink)
index 4cc4fbf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/sysvmsg.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/sysvsem.ini b/php/embed-php5.3/ext-active/sysvsem.ini
deleted file mode 120000 (symlink)
index 6039be1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/sysvsem.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/sysvshm.ini b/php/embed-php5.3/ext-active/sysvshm.ini
deleted file mode 120000 (symlink)
index 925021f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/sysvshm.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/tidy.ini b/php/embed-php5.3/ext-active/tidy.ini
deleted file mode 120000 (symlink)
index 2245444..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/tidy.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/wddx.ini b/php/embed-php5.3/ext-active/wddx.ini
deleted file mode 120000 (symlink)
index e41c4ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/wddx.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/xmlrpc.ini b/php/embed-php5.3/ext-active/xmlrpc.ini
deleted file mode 120000 (symlink)
index 49562fa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/xmlrpc.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/xsl.ini b/php/embed-php5.3/ext-active/xsl.ini
deleted file mode 120000 (symlink)
index 7df11c2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/xsl.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/zip.ini b/php/embed-php5.3/ext-active/zip.ini
deleted file mode 120000 (symlink)
index 9964b65..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/zip.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext-active/zlib.ini b/php/embed-php5.3/ext-active/zlib.ini
deleted file mode 120000 (symlink)
index 90e98da..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/zlib.ini
\ No newline at end of file
diff --git a/php/embed-php5.3/ext/bcmath.ini b/php/embed-php5.3/ext/bcmath.ini
deleted file mode 100644 (file)
index 7e0ae9a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bcmath.so
diff --git a/php/embed-php5.3/ext/bz2.ini b/php/embed-php5.3/ext/bz2.ini
deleted file mode 100644 (file)
index f9d67d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bz2.so
diff --git a/php/embed-php5.3/ext/calendar.ini b/php/embed-php5.3/ext/calendar.ini
deleted file mode 100644 (file)
index 9106f44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=calendar.so
diff --git a/php/embed-php5.3/ext/curl.ini b/php/embed-php5.3/ext/curl.ini
deleted file mode 100644 (file)
index 3ed40f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=curl.so
diff --git a/php/embed-php5.3/ext/dba.ini b/php/embed-php5.3/ext/dba.ini
deleted file mode 100644 (file)
index 3058911..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=dba.so
diff --git a/php/embed-php5.3/ext/enchant.ini b/php/embed-php5.3/ext/enchant.ini
deleted file mode 100644 (file)
index f9b3244..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=enchant.so
diff --git a/php/embed-php5.3/ext/exif.ini b/php/embed-php5.3/ext/exif.ini
deleted file mode 100644 (file)
index 0688bbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=exif.so
diff --git a/php/embed-php5.3/ext/ftp.ini b/php/embed-php5.3/ext/ftp.ini
deleted file mode 100644 (file)
index d4c6f43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ftp.so
diff --git a/php/embed-php5.3/ext/gd.ini b/php/embed-php5.3/ext/gd.ini
deleted file mode 100644 (file)
index 1941c0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gd.so
diff --git a/php/embed-php5.3/ext/gettext.ini b/php/embed-php5.3/ext/gettext.ini
deleted file mode 100644 (file)
index 1b2e930..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gettext.so
diff --git a/php/embed-php5.3/ext/gmp.ini b/php/embed-php5.3/ext/gmp.ini
deleted file mode 100644 (file)
index 16d339e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gmp.so
diff --git a/php/embed-php5.3/ext/imap.ini b/php/embed-php5.3/ext/imap.ini
deleted file mode 100644 (file)
index a70747f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=imap.so
diff --git a/php/embed-php5.3/ext/intl.ini b/php/embed-php5.3/ext/intl.ini
deleted file mode 100644 (file)
index b334e92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=intl.so
diff --git a/php/embed-php5.3/ext/ldap.ini b/php/embed-php5.3/ext/ldap.ini
deleted file mode 100644 (file)
index 00825a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ldap.so
diff --git a/php/embed-php5.3/ext/mbstring.ini b/php/embed-php5.3/ext/mbstring.ini
deleted file mode 100644 (file)
index 772b052..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mbstring.so
diff --git a/php/embed-php5.3/ext/mcrypt.ini b/php/embed-php5.3/ext/mcrypt.ini
deleted file mode 100644 (file)
index 547ebdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mcrypt.so
diff --git a/php/embed-php5.3/ext/mysql.ini b/php/embed-php5.3/ext/mysql.ini
deleted file mode 100644 (file)
index da09c40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysql.so
diff --git a/php/embed-php5.3/ext/mysqli.ini b/php/embed-php5.3/ext/mysqli.ini
deleted file mode 100644 (file)
index 9d0502f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysqli.so
diff --git a/php/embed-php5.3/ext/odbc.ini b/php/embed-php5.3/ext/odbc.ini
deleted file mode 100644 (file)
index 96a0730..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=odbc.so
diff --git a/php/embed-php5.3/ext/pcntl.ini b/php/embed-php5.3/ext/pcntl.ini
deleted file mode 100644 (file)
index f0a7145..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pcntl.so
diff --git a/php/embed-php5.3/ext/pspell.ini b/php/embed-php5.3/ext/pspell.ini
deleted file mode 100644 (file)
index b4d0a8c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pspell.so
diff --git a/php/embed-php5.3/ext/snmp.ini b/php/embed-php5.3/ext/snmp.ini
deleted file mode 100644 (file)
index 15acf38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=snmp.so
diff --git a/php/embed-php5.3/ext/soap.ini b/php/embed-php5.3/ext/soap.ini
deleted file mode 100644 (file)
index 1deef9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=soap.so
diff --git a/php/embed-php5.3/ext/sockets.ini b/php/embed-php5.3/ext/sockets.ini
deleted file mode 100644 (file)
index 327228b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sockets.so
diff --git a/php/embed-php5.3/ext/sysvmsg.ini b/php/embed-php5.3/ext/sysvmsg.ini
deleted file mode 100644 (file)
index 639950e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvmsg.so
diff --git a/php/embed-php5.3/ext/sysvsem.ini b/php/embed-php5.3/ext/sysvsem.ini
deleted file mode 100644 (file)
index dd2c343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvsem.so
diff --git a/php/embed-php5.3/ext/sysvshm.ini b/php/embed-php5.3/ext/sysvshm.ini
deleted file mode 100644 (file)
index 4c26779..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvshm.so
diff --git a/php/embed-php5.3/ext/tidy.ini b/php/embed-php5.3/ext/tidy.ini
deleted file mode 100644 (file)
index 834babc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=tidy.so
diff --git a/php/embed-php5.3/ext/wddx.ini b/php/embed-php5.3/ext/wddx.ini
deleted file mode 100644 (file)
index 95571ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=wddx.so
diff --git a/php/embed-php5.3/ext/xmlrpc.ini b/php/embed-php5.3/ext/xmlrpc.ini
deleted file mode 100644 (file)
index b03d93c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xmlrpc.so
diff --git a/php/embed-php5.3/ext/xsl.ini b/php/embed-php5.3/ext/xsl.ini
deleted file mode 100644 (file)
index 3223510..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xsl.so
diff --git a/php/embed-php5.3/ext/zip.ini b/php/embed-php5.3/ext/zip.ini
deleted file mode 100644 (file)
index bb70997..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zip.so
diff --git a/php/embed-php5.3/ext/zlib.ini b/php/embed-php5.3/ext/zlib.ini
deleted file mode 100644 (file)
index 3d29bce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zlib.so
index 26ecfb251726e42e9e8853374f05922044337dd5..272588949a3a880e5f6074fc3c12a7b9634ba488 100644 (file)
@@ -419,6 +419,10 @@ disable_classes =
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120
 
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;
 ;;;;;;;;;;;;;;;;;
@@ -428,7 +432,7 @@ disable_classes =
 ; threat in any way, but it makes it possible to determine whether you use PHP
 ; on your server or not.
 ; http://php.net/expose-php
-expose_php = Off
+expose_php = On
 
 ;;;;;;;;;;;;;;;;;;;
 ; Resource Limits ;
@@ -453,6 +457,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M
@@ -637,6 +644,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -887,7 +899,7 @@ max_file_uploads = 20
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 ; http://php.net/allow-url-fopen
-allow_url_fopen = Off
+allow_url_fopen = On
 
 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 ; http://php.net/allow-url-include
@@ -959,7 +971,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
@@ -969,7 +981,6 @@ default_socket_timeout = 60
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
-;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 
@@ -1248,6 +1259,14 @@ mysql.trace_mode = Off
 ; http://php.net/mysqli.max-persistent
 mysqli.max_persistent = -1
 
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
@@ -1288,12 +1307,12 @@ mysqli.default_pw =
 mysqli.reconnect = Off
 
 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = On
@@ -1360,7 +1379,7 @@ mysqlnd.collect_memory_statistics = On
 ; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off
 
-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
 ; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
@@ -1592,7 +1611,6 @@ session.entropy_length = 0
 ; On windows, setting the entropy_length setting will activate the 
 ; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
-session.entropy_file =
 
 ; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
@@ -1696,7 +1714,7 @@ mssql.secure_connection = Off
 ;mssql.max_procs = -1
 
 ; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
 
@@ -1889,6 +1907,12 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php/fpm-php5.3/ext-active/bcmath.ini b/php/fpm-php5.3/ext-active/bcmath.ini
deleted file mode 120000 (symlink)
index 50920b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/bcmath.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/bz2.ini b/php/fpm-php5.3/ext-active/bz2.ini
deleted file mode 120000 (symlink)
index 65d899b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/bz2.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/calendar.ini b/php/fpm-php5.3/ext-active/calendar.ini
deleted file mode 120000 (symlink)
index 4b59a3d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/calendar.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/curl.ini b/php/fpm-php5.3/ext-active/curl.ini
deleted file mode 120000 (symlink)
index 95a83d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/curl.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/dba.ini b/php/fpm-php5.3/ext-active/dba.ini
deleted file mode 120000 (symlink)
index 36bda47..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/dba.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/enchant.ini b/php/fpm-php5.3/ext-active/enchant.ini
deleted file mode 120000 (symlink)
index bbd5ea7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/enchant.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/exif.ini b/php/fpm-php5.3/ext-active/exif.ini
deleted file mode 120000 (symlink)
index 5c667e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/exif.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/ftp.ini b/php/fpm-php5.3/ext-active/ftp.ini
deleted file mode 120000 (symlink)
index 2cdac08..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/ftp.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/gd.ini b/php/fpm-php5.3/ext-active/gd.ini
deleted file mode 120000 (symlink)
index ae4e8f2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/gd.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/gettext.ini b/php/fpm-php5.3/ext-active/gettext.ini
deleted file mode 120000 (symlink)
index c0a0fae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/gettext.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/gmp.ini b/php/fpm-php5.3/ext-active/gmp.ini
deleted file mode 120000 (symlink)
index e21cfdc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/gmp.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/imap.ini b/php/fpm-php5.3/ext-active/imap.ini
deleted file mode 120000 (symlink)
index b6cbab2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/imap.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/intl.ini b/php/fpm-php5.3/ext-active/intl.ini
deleted file mode 120000 (symlink)
index 18e9890..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/intl.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/ldap.ini b/php/fpm-php5.3/ext-active/ldap.ini
deleted file mode 120000 (symlink)
index 10a6aba..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/ldap.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/mbstring.ini b/php/fpm-php5.3/ext-active/mbstring.ini
deleted file mode 120000 (symlink)
index 9704708..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/mbstring.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/mcrypt.ini b/php/fpm-php5.3/ext-active/mcrypt.ini
deleted file mode 120000 (symlink)
index 9e3f027..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/mcrypt.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/mysql.ini b/php/fpm-php5.3/ext-active/mysql.ini
deleted file mode 120000 (symlink)
index 225057d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/mysql.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/mysqli.ini b/php/fpm-php5.3/ext-active/mysqli.ini
deleted file mode 120000 (symlink)
index 549ef0f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/mysqli.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/odbc.ini b/php/fpm-php5.3/ext-active/odbc.ini
deleted file mode 120000 (symlink)
index 5d5f29f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/odbc.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/pcntl.ini b/php/fpm-php5.3/ext-active/pcntl.ini
deleted file mode 120000 (symlink)
index 0059a95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/pcntl.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/pspell.ini b/php/fpm-php5.3/ext-active/pspell.ini
deleted file mode 120000 (symlink)
index 9b62f58..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/pspell.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/snmp.ini b/php/fpm-php5.3/ext-active/snmp.ini
deleted file mode 120000 (symlink)
index 7cda956..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/snmp.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/soap.ini b/php/fpm-php5.3/ext-active/soap.ini
deleted file mode 120000 (symlink)
index 87d5857..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/soap.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/sockets.ini b/php/fpm-php5.3/ext-active/sockets.ini
deleted file mode 120000 (symlink)
index dc448ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/sockets.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/sysvmsg.ini b/php/fpm-php5.3/ext-active/sysvmsg.ini
deleted file mode 120000 (symlink)
index 05f5bce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/sysvmsg.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/sysvsem.ini b/php/fpm-php5.3/ext-active/sysvsem.ini
deleted file mode 120000 (symlink)
index 0307f3f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/sysvsem.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/sysvshm.ini b/php/fpm-php5.3/ext-active/sysvshm.ini
deleted file mode 120000 (symlink)
index ab9dfd9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/sysvshm.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/tidy.ini b/php/fpm-php5.3/ext-active/tidy.ini
deleted file mode 120000 (symlink)
index b0ec2b7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/tidy.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/wddx.ini b/php/fpm-php5.3/ext-active/wddx.ini
deleted file mode 120000 (symlink)
index 1be22ef..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/wddx.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/xmlrpc.ini b/php/fpm-php5.3/ext-active/xmlrpc.ini
deleted file mode 120000 (symlink)
index 33ee22d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/xmlrpc.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/xsl.ini b/php/fpm-php5.3/ext-active/xsl.ini
deleted file mode 120000 (symlink)
index f13b375..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/xsl.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/zip.ini b/php/fpm-php5.3/ext-active/zip.ini
deleted file mode 120000 (symlink)
index fcba933..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/zip.ini
\ No newline at end of file
diff --git a/php/fpm-php5.3/ext-active/zlib.ini b/php/fpm-php5.3/ext-active/zlib.ini
deleted file mode 120000 (symlink)
index e898e36..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/zlib.ini
\ No newline at end of file
index 119e167048a1f89a3358235eaa055a060cec1854..a56eab82a9d0b419e93ec47631374426e58119b1 100644 (file)
@@ -1,26 +1 @@
 extension=apc.so
-apc.enabled="1"
-apc.shm_segments="1"
-apc.shm_size="30M"
-apc.num_files_hint="1024"
-apc.ttl="7200"
-apc.user_ttl="7200"
-apc.gc_ttl="3600"
-apc.cache_by_default="1"
-;apc.filters=""
-;apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
-apc.slam_defense="0"
-apc.file_update_protection="2"
-apc.enable_cli="0"
-apc.max_file_size="1M"
-apc.stat="1"
-apc.write_lock="1"
-apc.report_autofilter="0"
-apc.include_once_override="0"
-apc.rfc1867="0"
-apc.rfc1867_prefix="upload_"
-apc.rfc1867_name="APC_UPLOAD_PROGRESS"
-apc.rfc1867_freq="0"
-apc.localcache="0"
-apc.localcache.size="512"
-apc.coredump_unmap="0"
diff --git a/php/fpm-php5.3/ext/bcmath.ini b/php/fpm-php5.3/ext/bcmath.ini
deleted file mode 100644 (file)
index 7e0ae9a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bcmath.so
diff --git a/php/fpm-php5.3/ext/bz2.ini b/php/fpm-php5.3/ext/bz2.ini
deleted file mode 100644 (file)
index f9d67d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=bz2.so
diff --git a/php/fpm-php5.3/ext/calendar.ini b/php/fpm-php5.3/ext/calendar.ini
deleted file mode 100644 (file)
index 9106f44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=calendar.so
diff --git a/php/fpm-php5.3/ext/curl.ini b/php/fpm-php5.3/ext/curl.ini
deleted file mode 100644 (file)
index 3ed40f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=curl.so
diff --git a/php/fpm-php5.3/ext/dba.ini b/php/fpm-php5.3/ext/dba.ini
deleted file mode 100644 (file)
index 3058911..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=dba.so
diff --git a/php/fpm-php5.3/ext/enchant.ini b/php/fpm-php5.3/ext/enchant.ini
deleted file mode 100644 (file)
index f9b3244..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=enchant.so
diff --git a/php/fpm-php5.3/ext/exif.ini b/php/fpm-php5.3/ext/exif.ini
deleted file mode 100644 (file)
index 0688bbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=exif.so
diff --git a/php/fpm-php5.3/ext/ftp.ini b/php/fpm-php5.3/ext/ftp.ini
deleted file mode 100644 (file)
index d4c6f43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ftp.so
diff --git a/php/fpm-php5.3/ext/gd.ini b/php/fpm-php5.3/ext/gd.ini
deleted file mode 100644 (file)
index 1941c0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gd.so
diff --git a/php/fpm-php5.3/ext/gettext.ini b/php/fpm-php5.3/ext/gettext.ini
deleted file mode 100644 (file)
index 1b2e930..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gettext.so
diff --git a/php/fpm-php5.3/ext/gmp.ini b/php/fpm-php5.3/ext/gmp.ini
deleted file mode 100644 (file)
index 16d339e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=gmp.so
diff --git a/php/fpm-php5.3/ext/imap.ini b/php/fpm-php5.3/ext/imap.ini
deleted file mode 100644 (file)
index a70747f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=imap.so
diff --git a/php/fpm-php5.3/ext/intl.ini b/php/fpm-php5.3/ext/intl.ini
deleted file mode 100644 (file)
index b334e92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=intl.so
diff --git a/php/fpm-php5.3/ext/ldap.ini b/php/fpm-php5.3/ext/ldap.ini
deleted file mode 100644 (file)
index 00825a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=ldap.so
diff --git a/php/fpm-php5.3/ext/mbstring.ini b/php/fpm-php5.3/ext/mbstring.ini
deleted file mode 100644 (file)
index 772b052..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mbstring.so
diff --git a/php/fpm-php5.3/ext/mcrypt.ini b/php/fpm-php5.3/ext/mcrypt.ini
deleted file mode 100644 (file)
index 547ebdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mcrypt.so
diff --git a/php/fpm-php5.3/ext/mysql.ini b/php/fpm-php5.3/ext/mysql.ini
deleted file mode 100644 (file)
index da09c40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysql.so
diff --git a/php/fpm-php5.3/ext/mysqli.ini b/php/fpm-php5.3/ext/mysqli.ini
deleted file mode 100644 (file)
index 9d0502f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=mysqli.so
diff --git a/php/fpm-php5.3/ext/odbc.ini b/php/fpm-php5.3/ext/odbc.ini
deleted file mode 100644 (file)
index 96a0730..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=odbc.so
diff --git a/php/fpm-php5.3/ext/pcntl.ini b/php/fpm-php5.3/ext/pcntl.ini
deleted file mode 100644 (file)
index f0a7145..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pcntl.so
diff --git a/php/fpm-php5.3/ext/pspell.ini b/php/fpm-php5.3/ext/pspell.ini
deleted file mode 100644 (file)
index b4d0a8c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=pspell.so
diff --git a/php/fpm-php5.3/ext/snmp.ini b/php/fpm-php5.3/ext/snmp.ini
deleted file mode 100644 (file)
index 15acf38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=snmp.so
diff --git a/php/fpm-php5.3/ext/soap.ini b/php/fpm-php5.3/ext/soap.ini
deleted file mode 100644 (file)
index 1deef9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=soap.so
diff --git a/php/fpm-php5.3/ext/sockets.ini b/php/fpm-php5.3/ext/sockets.ini
deleted file mode 100644 (file)
index 327228b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sockets.so
diff --git a/php/fpm-php5.3/ext/sysvmsg.ini b/php/fpm-php5.3/ext/sysvmsg.ini
deleted file mode 100644 (file)
index 639950e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvmsg.so
diff --git a/php/fpm-php5.3/ext/sysvsem.ini b/php/fpm-php5.3/ext/sysvsem.ini
deleted file mode 100644 (file)
index dd2c343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvsem.so
diff --git a/php/fpm-php5.3/ext/sysvshm.ini b/php/fpm-php5.3/ext/sysvshm.ini
deleted file mode 100644 (file)
index 4c26779..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=sysvshm.so
diff --git a/php/fpm-php5.3/ext/tidy.ini b/php/fpm-php5.3/ext/tidy.ini
deleted file mode 100644 (file)
index 834babc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=tidy.so
diff --git a/php/fpm-php5.3/ext/wddx.ini b/php/fpm-php5.3/ext/wddx.ini
deleted file mode 100644 (file)
index 95571ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=wddx.so
diff --git a/php/fpm-php5.3/ext/xmlrpc.ini b/php/fpm-php5.3/ext/xmlrpc.ini
deleted file mode 100644 (file)
index b03d93c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xmlrpc.so
diff --git a/php/fpm-php5.3/ext/xsl.ini b/php/fpm-php5.3/ext/xsl.ini
deleted file mode 100644 (file)
index 3223510..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=xsl.so
diff --git a/php/fpm-php5.3/ext/zip.ini b/php/fpm-php5.3/ext/zip.ini
deleted file mode 100644 (file)
index bb70997..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zip.so
diff --git a/php/fpm-php5.3/ext/zlib.ini b/php/fpm-php5.3/ext/zlib.ini
deleted file mode 100644 (file)
index 3d29bce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-extension=zlib.so
index 26ecfb251726e42e9e8853374f05922044337dd5..272588949a3a880e5f6074fc3c12a7b9634ba488 100644 (file)
@@ -419,6 +419,10 @@ disable_classes =
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120
 
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;
 ;;;;;;;;;;;;;;;;;
@@ -428,7 +432,7 @@ disable_classes =
 ; threat in any way, but it makes it possible to determine whether you use PHP
 ; on your server or not.
 ; http://php.net/expose-php
-expose_php = Off
+expose_php = On
 
 ;;;;;;;;;;;;;;;;;;;
 ; Resource Limits ;
@@ -453,6 +457,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M
@@ -637,6 +644,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -887,7 +899,7 @@ max_file_uploads = 20
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 ; http://php.net/allow-url-fopen
-allow_url_fopen = Off
+allow_url_fopen = On
 
 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 ; http://php.net/allow-url-include
@@ -959,7 +971,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
@@ -969,7 +981,6 @@ default_socket_timeout = 60
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
-;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 
@@ -1248,6 +1259,14 @@ mysql.trace_mode = Off
 ; http://php.net/mysqli.max-persistent
 mysqli.max_persistent = -1
 
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
@@ -1288,12 +1307,12 @@ mysqli.default_pw =
 mysqli.reconnect = Off
 
 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = On
@@ -1360,7 +1379,7 @@ mysqlnd.collect_memory_statistics = On
 ; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off
 
-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
 ; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
@@ -1592,7 +1611,6 @@ session.entropy_length = 0
 ; On windows, setting the entropy_length setting will activate the 
 ; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
-session.entropy_file =
 
 ; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
@@ -1696,7 +1714,7 @@ mssql.secure_connection = Off
 ;mssql.max_procs = -1
 
 ; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
 
@@ -1889,6 +1907,12 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[xsl]
+; Write operations from within XSLT are disabled by default.
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; Set it to 0 to allow all operations
+;xsl.security_prefs = 44
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/portage b/portage
index 8e4784b10d07a76822ad36827dc024b1743ccdbe..42cc3d301e78831e9786b0e7566643d374ac9d1c 160000 (submodule)
--- a/portage
+++ b/portage
@@ -1 +1 @@
-Subproject commit 8e4784b10d07a76822ad36827dc024b1743ccdbe
+Subproject commit 42cc3d301e78831e9786b0e7566643d374ac9d1c
index 9ce6e630190e8932d673553581367de979755b83..0fbfcb6a2f10043af31ef41218d052c62c287365 100644 (file)
 #
 #
 
+/^Subject:.*zusammenarbeit zur webverbesserung/                REJECT  Header-Spamschutzregel 1049
+/^X-PHP-Script: biditsaleit.com\/dz\/mailer.php*/      REJECT  Header-Spamschutzregel 1048
 /^Subject:.*from GMC manufacturer/     REJECT Header-Spamschutzregel 1047
 /^Return-Path: *ventouxl@ns[0-9]{3}.medialook.net/     REJECT  Header-Spamschutzregel 1046
 /^From :.*Topillen Apotheke /          REJECT Header-Spamschutzregel 1145
 /^Subject: Top Apotheke/               REJECT Header-Spamschutzregel 1144
-/^Message-ID: *phx.gbl/        REJECT  Header-Spamschutzregel 1143
+/^message-ID: *phx.gbl/        REJECT  Header-Spamschutzregel 1143
 /^List-Unsubscribe: *e-mailing.pymac.fr\/[a-z]\/[a-z]\/[0-9]{4}\/[0-9]{6}/     REJECT  Header-Spamschutzregel 1142
 /^Return-Path: *@oanm[0-9]{2}.com/     REJECT Header-Spamschutzregel 1141
 /^Subject: lighting products from GMC manufacturer/    REJECT Header-Spamschutzregel 1140
diff --git a/postfix/header_checks.2011-12-27_11:47:25 b/postfix/header_checks.2011-12-27_11:47:25
new file mode 100644 (file)
index 0000000..9ce6e63
--- /dev/null
@@ -0,0 +1,368 @@
+# Version 3.70 / 25.09.2011
+#
+# Das Postfix-Buch - Sichere Mailserver mit Linux
+# http://www.postfixbuch.de - Peer Heinlein
+#
+# Heinlein Professional Linux Support GmbH
+# http://www.heinlein-support.de
+#
+# Downloadquelle dieser Datei: http://www.postfixbuch.de/web/service/checks/
+#
+#
+# Verwendung der Filtersammlung auf eigene Gefahr.
+#
+# Es handelt sich dabei um einen tagesaktuellen Auszug der beim
+# ISP "JPBerlin.de" genutzten Filterregeln. Bitte pruefen Sie vor einem
+# Einsatz bei Ihnen ganz genau, ob diese Regeln noch aktuell und sinnvoll
+# sind und ob Sie sie einsetzen moechten!
+#
+#
+# Setzen Sie in /etc/postfix/main.cf einfach
+#
+# header_checks = pcre:/etc/postfix/header_checks oder
+# oder
+# header_checks = regexp:/etc/postfix/header_checks
+#
+# und fuehren Sie "rcpostfix reload" aus.
+#
+# Tipp: pcre ist ein Drittel schneller als regexp!
+#
+#
+
+#
+# Die Nummern hinter dem REJECT tauchen spaeter iM SMTP-Error oder im Log
+# auf, um die Filter-Regel wiederzufinden, die den Block ausgeloest hat.
+# Es kann stattdessen auch einfacher Text benutzt werden.
+#
+
+
+#
+#
+# Besondere Regelungen ausserhalb unseres Spamschutzes
+# ===============================================
+#
+
+# Filtert Amavis-Einträge      
+/^Received: from localhost/    IGNORE
+
+#
+# Domeus hat bis heute nicht den Unterschied zwischen Mailheader-To und
+# SMTP-Envelope-To verstanden und fabriziert seit nunmehr über sieben Jahren in
+# schöner Regelmäßigkeit Mailschleifen im vier/fünfstelligen Bereich.
+#
+# /^Received:.*domeus\.com/    REJECT Domeus baut Mailschleifen und hat wichtige RFCs nicht verstanden
+
+/X-policyd-weight:.*to=dresden@listen.attac.de/         IGNORE
+
+#
+#
+# Tagesaktuelle, nur voruebergehende Regelungen:
+# ===============================================
+# [Immer mit Timestamp (!) und ggf. Ticket-Nummer eintragen!]
+#
+/^Received: from 62.56.132.7.satcom-systems.net/       REJECT Header-Spamschutzregel TMP-1
+
+# 20110630 - HPLS-Ticket#: 2011063010000278
+/^Received: from dsl88-247-23947.ttnet.net.tr/         REJECT Header-Spamschutzregel TMP-2
+
+# 20110925 - u.A. HPLS-Ticket#: 2011092510000102
+/^Subject: *pdf ist Ihre Gewinnchancen Informationen*/ REJECT Header-Spamschutzregel TMP-3
+
+#
+#
+# Dauerhaft genutzte Regelungen:
+# ===============================================
+# [Immer mit aufsteiger Nummer sauber eintragen!]
+#
+#
+
+/^Subject:.*from GMC manufacturer/     REJECT Header-Spamschutzregel 1047
+/^Return-Path: *ventouxl@ns[0-9]{3}.medialook.net/     REJECT  Header-Spamschutzregel 1046
+/^From :.*Topillen Apotheke /          REJECT Header-Spamschutzregel 1145
+/^Subject: Top Apotheke/               REJECT Header-Spamschutzregel 1144
+/^Message-ID: *phx.gbl/        REJECT  Header-Spamschutzregel 1143
+/^List-Unsubscribe: *e-mailing.pymac.fr\/[a-z]\/[a-z]\/[0-9]{4}\/[0-9]{6}/     REJECT  Header-Spamschutzregel 1142
+/^Return-Path: *@oanm[0-9]{2}.com/     REJECT Header-Spamschutzregel 1141
+/^Subject: lighting products from GMC manufacturer/    REJECT Header-Spamschutzregel 1140
+/^Subject: OFFIZIELLE GEWINNBENACHRITIGUNG/    REJECT Header-Spamschutzregel 1139
+/^Subject: God bless you as you get back to me/        REJECT  Header-Spamschutzregel 1038
+/^List-Unsubribe: *tk3.sbc01.com\/sy\/*/       REJECT  Header-Spamschutzregel 1037
+/^List-Unsubscribe: *tk3.sbc01.com\/sy\/*/     REJECT  Header-Spamschutzregel 1037
+/^Message-ID: *[0-9]{8}-[0-9]{8}-[0-9a-z]{3}-0@S102*/  REJECT  Header-Spamschutzregel 1036
+/^Subject: *YOUR EMAIL HAS WON YOU GBP*/       REJECT  Header-Spamschutzregel 1035
+/^From: *ventouxl@ns[0-9]?[0-9].medialook.net/ REJECT  Header-Spamschutzregel 1034
+/^From: *gestioncreditexpert_[0-9]{4}@gce-mailer-[0-9]{2}.com/ REJECT  Header-Spamschutzregel 1033
+/^From:.*erosvision.com/       REJECT Header-Spamschutzregel 1032
+/^From:*@payapl.fr/    REJECT  Header-Spamschutzregel 1031
+# 20110706 - HPLS-Ticket#: 2011070610000053
+/^X-PHP-Script: mars.rapidvps.com\/~emoosite\/tmp\/install_4b10cb87da737\/languages\/site\/husa.php*/  REJECT  Header-Spamschutzregel 1030
+/^Thread-Index: *Acvd0cAG8IQaasqAcNaztWODnM30ZA/       REJECT Header-Spamschutzregel 1029
+/^Subject: aktualisieren Sie Ihre Bankdaten/   REJECT Header-Spamschutzregel 1028
+/^Subject: Erfahrungsbericht Bernd Matthes/    REJECT Header-Spamschutzregel 1027
+/^Subject:.*IP PBX/i                   REJECT Header-Spamschutzregel 1026
+/^From:.*Nicoll Christopher John/      REJECT Header-Spamschutzregel 1025
+/^From:.*SHELL PETROLEUM/              REJECT Header-Spamschutzregel 1024
+/^From:.*Versicherungs Dienst/         REJECT Header-Spamschutzregel 1023
+/^From:.*soft-cd.com/                  REJECT Header-Spamschutzregel 1022
+/^From: "Oxford Business News" <info@oxford-bn.org>/   REJECT Header-Spamschutzregel 1021
+/^Subject: =?iso-8859-1?Q?Leider_st=F6?= =?iso-8859-1?Q?ren_Sie.?=/    REJECT Header-Spamschutzregel 1020
+/^From:.*Elena.*@eposta.ru/            REJECT Header-Spamschutzregel 1019
+/^Subject:.*Results 2008 !/            REJECT Header-Spamschutzregel 1018
+/^From: Sponsor Lotto/                 REJECT Header-Spamschutzregel 1017
+/^From:.*nodiet@web.de/                        REJECT Header-Spamschutzregel 1016
+/^From:.*edirects.com/                  REJECT Header-Spamschutzregel 1015
+/^Subject:.*WINNING NOTIFICATION!!!/           REJECT Header-Spamschutzregel 1014
+/^Subject:.*Wir wissen was Frauen wollern/         REJECT Header-Spamschutzregel 1013
+/^From:.*newscd\.org/                  REJECT Header-Spamschutzregel 1012
+/^From:.*mms-und-sms-gutschein.com/    REJECT Header-Spamschutzregel 1011
+/^Subject:.*CONFIRM YOUR WINNING/      REJECT Header-Spamschutzregel 1010
+/^Subject:.*Gratisaktion - Du wurdest ausgewaehlt unseren neuen SMS/   REJECT Header-Spamschutzregel 1009
+/^From:.*Seitensprung/                 REJECT Header-Spamschutzregel 1008
+/^Received:.*germans-mailc.com/                REJECT Header-Spamschutzregel 1007: Lisa-Schindler-Spam 
+/^Received:.*stienitzsee.info/         REJECT Header-Spamschutzregel 1006
+/^Subject: Bonus 555eu/                                REJECT Header-Spamschutzregel 1005
+/^Subject: *(ATTN|TO) *:.*SALES? *MANAGER/i    REJECT Header-Spamschutzregel 1004
+/^Subject:.*Take this postcard now!/   REJECT Header-Spamschutzregel 1003
+/^Subject:.*FUXIN/                     REJECT Header-Spamschutzregel 1002
+/^From:.*marion.backera/               REJECT Header-Spamschutzregel 1001
+/^Subject:.*kein spam. aber eine Antwort auf ihre Fragen/      REJECT Header-Spamschutzregel 1000
+
+
+
+
+# Nazi-Spam-Welle mit Hetze
+
+########################################
+if /^Subject:/i
+
+/^Subject: 4,8 Mill\. Osteuropaeer durch Fischer-Volmer Erlass/        REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Auf Streife durch den Berliner Wedding/     REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Auslaender bevorzugt/                       REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Auslaenderpolitik/                          REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Deutsche werden kuenftig beim Arzt abgezockt/       REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Du wirst zum Sklaven gemacht\!\!\!/         REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Graeberschaendung auf bundesdeutsche Anordnung/     REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Hier sind wir Lehrer die einzigen Auslaender/       REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Paranoider Deutschenmoerder kommt in Psychiatrie/   REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Tuerkei in die EU/                          REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Verbrechen der deutschen Frau/              REJECT Header-Spamschutzregel Nazi Spam
+/^Subject:.*Skandal in Berlin/                                 REJECT Header-Spamschutzregel JPBERLIN-14
+/^Subject:.*Auslaendergewalt: Herr Rau, wo waren Sie?/ REJECT Header-Spamschutzregel JPBERLIN-15
+/^Subject:.*Bankrott des Gesundheitswesens durch Auslaender!/  REJECT Header-Spamschutzregel JPBERLIN-16
+/^Subject:.*Wer an ein Tabu ruehrt, muss und darf vernichtet werden/   REJECT Header-Spamschutzregel JPBERLIN-17
+/^Subject:.*EU Beitritt der Tuerkei/   REJECT Header-Spamschutzregel JPBERLIN-18
+/^Subject:.*Bin ich zu weltfremd.*Ich glaube wohl kaum/ REJECT Header-Spamschutzregel JPBERLIN-19
+/^Subject:.*Die Deform der sozialen Ordnung/           REJECT Header-Spamschutzregel JPBERLIN-20
+/^Subject:.*Moschee-Bau in Deutschland/                        REJECT Header-Spamschutzregel JPBERLIN-21
+/^Subject:.*Augen auf.*So sieht es aus/                        REJECT Header-Spamschutzregel JPBERLIN-22
+/^Subject:.*Paradies Bundesrepublik - Rente fuer die Welt/     REJECT Header-Spamschutzregel JPBERLIN-23
+/^Subject:.*Libanesen in Berlin/                       REJECT Header-Spamschutzregel JPBERLIN-24
+/^Subject:.*Garather klagen ueber eskalierende Gewalt im Stadtteil!/   REJECT Header-Spamschutzregel JPBERLIN-24
+/^Subject:.*Auslaender erschleichen sich zunehmend Sozialleistungen/   REJECT Header-Spamschutzregel JPBERLIN-25
+/^Subject:.*Auslaenderkriminalitaet steigt weiter!/    REJECT Header-Spamschutzregel JPBERLIN-26
+/^Subject:.*Das kann unmoeglich sein -Leserbrief/      REJECT Header-Spamschutzregel JPBERLIN-27
+/^Subject:.*Nein zum Zuwanderungsgesetz !/             REJECT Header-Spamschutzregel JPBERLIN-28
+/^Subject:.*Skandalurteil in Darmstadt/                        REJECT Header-Spamschutzregel JPBERLIN-29
+/^Subject:.*Auf Kosten der deutschen Beitragszahler und Rentner!/      REJECT Header-Spamschutzregel JPBERLIN-30
+/^Subject:.*Wir haben die Auslaender doch geholt/      REJECT Header-Spamschutzregel JPBERLIN-31
+/^Subject:.*TUERKEN-TERROR AM HIMMELFAHRTSTAG/         REJECT Header-Spamschutzregel JPBERLIN-32
+/^Subject:.*MULTI-KULTI-BANDE TYRANNISIERTE MITSCHUELER/       REJECT Header-Spamschutzregel JPBERLIN-33
+/^Subject:.*ASYLANTEN BEGRABSCHTEN DEUTSCHES MAEDCHEN/ REJECT Header-Spamschutzregel JPBERLIN-34
+/^Subject:.*Was Deutschland braucht, sind deutsche Kinder!/    REJECT Header-Spamschutzregel JPBERLIN-35
+/^Subject:.*Diplomatische Zensur/      REJECT Header-Spamschutzregel JPBERLIN-36
+/^Subject:.*EU gibt Erwerbslosen volle Freizuegigkeit/ REJECT Header-Spamschutzregel JPBERLIN-37
+/^Subject:.*Richter unterstuetzt kriminelle Auslaenderin/      REJECT Header-Spamschutzregel JPBERLIN-38
+/^Subject:.*Auslaenderanteile in Schweizer Gefaengnissen/      REJECT Header-Spamschutzregel JPBERLIN-39
+/^Subject:.*Augen auf! (So sieht es aus!)/             REJECT Header-Spamschutzregel JPBERLIN-40
+/^Subject:.*Neue Voelkerwanderung droht!/              REJECT Header-Spamschutzregel JPBERLIN-41
+/^Subject:.*Client TOS Notification/                   REJECT Header-Spamschutzregel JPBERLIN-50
+/^Subject:.* CIALIS /                                  REJECT Header-Spamschutzregel JPBERLIN-51: Cialis-Keyword
+/^Subject:.*Postbank Sicherheitsaktualisierung/                REJECT Header-Spamschutzregel JPBERLIN-52
+/^Subject:.*Sicherheitsaktualisierung/                 REJECT Header-Spamschutzregel JPBERLIN-53
+/^Subject:.*Deutsche-bank Sicherheitsaktualisierung/   REJECT Header-Spamschutzregel JPBERLIN-54
+/^Subject:.*internet.*pharmacy/        REJECT Header-Spamschutzregel JPBERLIN-55
+/^Subject:.*Affordable Premade Logos/  REJECT Header-Spamschutzregel JPBERLIN-56
+/^Subject:.*Best prices.*on the net/   REJECT Header-Spamschutzregel JPBERLIN-57
+/^Subject:.*V.?i.?a.?g.?r.?a/          REJECT Header-Spamschutzregel JPBERLIN-58: Viagra-Keyword
+/^Subject:.*X.?a.?n.?a.?x/             REJECT Header-Spamschutzregel JPBERLIN-59: Xanax-Keyword
+/^Subject:.*Phentermine/               REJECT Header-Spamschutzregel JPBERLIN-60
+/^Subject:.*Die Sahne tropft heraus/   REJECT Header-Spamschutzregel JPBERLIN-61
+/^Subject:.* Rolex /                   REJECT Header-Spamschutzregel JPBERLIN-62
+/^Subject:.*Rechnung Online Monat November 2004/       REJECT Header-Spamschutzregel JPBERLIN-63 Trojaner-Alarm
+/^Subject:.*Replica Watch Models/      REJECT Header-Spamschutzregel JPBERLIN-64
+/^Subject:.*Sehr geehrter Postbankkunde/       REJECT Header-Spamschutzregel JPBERLIN-65
+/^Subject:.*AIR ANTALYA/               REJECT Header-Spamschutzregel JPBERLIN-66
+/^Subject:.*Search engines - submit/   REJECT Header-Spamschutzregel JPBERLIN-12
+/^Subject:.*Search engine traffic/     REJECT Header-Spamschutzregel JPBERLIN-13
+/^Subject: More efficient than via-gra/        REJECT Header-Spamschutzregel 22
+/^Subject: Mailadresse unbekannt/      REJECT Header-Spamschutzregel 27
+/^Subject:.*SARS: Viet Nam removed from list of affected countries.*/ REJECT Header-Spamschutzregel 29
+/^Subject:.*Wichtig !!! Die Telefonnummer die du haben wolltest/ REJECT Header-Spamschutzregel 31
+/^Subject:.*Weihnachtsbaeume ab EURO.*/        REJECT Header-Spamschutzregel 32
+/^Subject:.*Neue Version zum downloaden.*/     REJECT Header-Spamschutzregel 33
+/^Subject:.*Frants for.*/      REJECT Header-Spamschutzregel 34
+/^Subject:.*FREEE.*/   REJECT Header-Spamschutzregel 35
+/^Subject:.*Webdesign leicht gemacht.*/        REJECT Header-Spamschutzregel 36
+/^Subject:.*Check this Message Board Out.*/ REJECT Header-Spamschutzregel 37
+/^Subject: SAVE GERMANY VOTE STOIBER.*/ REJECT Header-Spamschutzregel 38
+
+Endif
+####################################
+
+
+
+#/^Return-Path: <MAILER-DAEMON>/       REJECT Header-Spamschutzregel 20
+/^Received:.*luftmensch.com/           REJECT Header-Spamschutzregel 28
+/^Delivered-To:.*jo@pcj.mlbc.test/      REJECT Header-Spamschutzregel 
+/From:.*Mandy Tweed/   REJECT Header-Spamschutzregel 39
+/Received: from privat .*.aol.com/     REJECT Header-Spamschutzregel 40
+/Received:.*tpg_exsrvr.thepowellgroup.com/     REJECT Header-Spamschutzregel 41
+/Received: from mx?.eudoramail.com/    REJECT Header-Spamschutzregel 42
+/Flashmail\.com/       REJECT Header-Spamschutzregel 44
+
+
+
+#      
+# Checks gesammelt aus dem Netz von    
+# http://www.hispalinux.es/~data/postfix/      
+#      
+
+######################################
+If /^Subject:/i
+
+/^Subject: FW: Warm this world by truely Love$/        REJECT Header-Spamschutzregel 51
+/^Subject:.*Fwd:Peace BeTweeN AmeriCa and IsLaM!/ REJECT Header-Spamschutzregel 58
+/^Subject: ILOVEYOU/                           REJECT Header-Spamschutzregel 60
+# Regel 61 rausgenommen -- zu allgemein. 20080128 / phei
+#/^Subject: (Re: )*Important Message From/      REJECT Header-Spamschutzregel 61
+/^Subject: (Re: )*BubbleBoy is back!/          REJECT Header-Spamschutzregel 62
+/^Subject: Accept Credit Cards/                REJECT Header-Spamschutzregel 63
+/^Subject: How Soon Are You Going To Retire\?/ REJECT Header-Spamschutzregel 64
+/^Subject: \[ADV:/                            REJECT Header-Spamschutzregel 65
+/^Subject: ADV:/                               REJECT Header-Spamschutzregel 66
+/^Subject: Snowhite and the Seven Dwarfs - The REAL story!/    REJECT Header-Spamschutzregel 67
+/^Subject: Are you losing sleep over debt\?/   REJECT Header-Spamschutzregel 68
+/^Subject: a stock that makes money/           REJECT Header-Spamschutzregel 69
+/^Subject: high earnings may soar/             REJECT Header-Spamschutzregel 70
+/^Subject: See the VIDEO Britney/              REJECT Header-Spamschutzregel 71
+/^Subject: FW: VIDEOS OF BRITNEY/              REJECT Header-Spamschutzregel 72
+/^Subject: STOLEN HARDCORE VIDEO/              REJECT Header-Spamschutzregel 73
+/^Subject: NEW CASH PROGRAM/                 REJECT Header-Spamschutzregel 74
+/^Subject: Hot Celebs 100% Exposed!/                REJECT Header-Spamschutzregel 75
+/^Subject: Make It Happen/                 REJECT Header-Spamschutzregel 76
+/^Subject: If you need extra money...read this!/ REJECT Header-Spamschutzregel 77
+/^Subject: Recieve A Free Quote/                REJECT Header-Spamschutzregel 78
+/^Subject: We Have Low Mortgage Rates!!!/        REJECT Header-Spamschutzregel 79
+/^Subject: Re: travel confirmation/                REJECT Header-Spamschutzregel 80
+/^Subject: Receive a FREE SAMPLE of Viagra for Women/ REJECT Header-Spamschutzregel 81
+/^Subject: DOUBLE YOUR BREAST SIZE! GUARANTEED/        REJECT Header-Spamschutzregel 82
+/^Subject: Ground Breaking Business "Starts Today"/    REJECT Header-Spamschutzregel 83
+/^Subject: AS SEEN ON T\.V/    REJECT Header-Spamschutzregel 84
+/^Subject: 99 Million Email Addresses - \$99/  REJECT Header-Spamschutzregel 85
+/^Subject: 50 Million Fresh Email Addresses/   REJECT Header-Spamschutzregel 87
+/^Subject: 200 Million Email Addresses - \$149/        REJECT Header-Spamschutzregel 88
+/^Subject: Get Viagra Online Now !!!/  REJECT Header-Spamschutzregel 89
+/^Subject: Boost Your Windows Reliability/     REJECT Header-Spamschutzregel 90
+/^Subject: I know what you've been doing/      REJECT Header-Spamschutzregel 91
+/^Subject: Hot Penny Stock Pick/       REJECT Header-Spamschutzregel 92
+/^Subject: Need a great deal on a home loan\?/         REJECT Header-Spamschutzregel 93
+/^Subject: I used to be in debt too!/  REJECT Header-Spamschutzregel 94
+/^Subject: Work less, make more/       REJECT Header-Spamschutzregel 95
+/^Subject: Drive Your Web Counter Ballistic/   REJECT Header-Spamschutzregel 96
+/^Subject: Re: have you considered doing this\?/       REJECT Header-Spamschutzregel 97
+/^Subject: Work from home and get paid!/       REJECT Header-Spamschutzregel 98
+/^Subject: Enter To Win One of 25 Dream Vacations!!/   REJECT Header-Spamschutzregel 99
+/^Subject: Do You Accept Credit Cards/         REJECT Header-Spamschutzregel 100
+/^Subject: Home Owners ONLY/   REJECT Header-Spamschutzregel 101
+/^Subject: Your Credit Info/   REJECT Header-Spamschutzregel 102
+/^Subject: Do you owe money\?/         REJECT Header-Spamschutzregel 103
+/^Subject: Need a Home Loan? We Can Help!!/    REJECT Header-Spamschutzregel 104
+/^Subject: stock alert/        REJECT Header-Spamschutzregel 105
+/^Subject: contact lenses/     REJECT Header-Spamschutzregel 106
+/^Subject: ENLARGE YOUR PACAKGE GUARANTEED/    REJECT Header-Spamschutzregel 107
+/^Subject: ENLARGE YOUR PACKAGE GUARANTEED/    REJECT Header-Spamschutzregel 108
+/^Subject: We purchase uncollected Judicial Judgments/         REJECT Header-Spamschutzregel 109
+/^Subject: Increase Your Gas Mileage by up to 27%!/    REJECT Header-Spamschutzregel 112
+/^Subject: Willow Flower Herb For Prostate Problems\./         REJECT Header-Spamschutzregel 113
+/^Subject: NEW Increase Your Gas Mileage by 27%/       REJECT Header-Spamschutzregel 114
+/^Subject: The easiest way to make money on the internet!/     REJECT Header-Spamschutzregel 115
+/^Subject: Re: think about this\.\.\./         REJECT Header-Spamschutzregel 116
+/^Subject: think about this\.\.\./     REJECT Header-Spamschutzregel 117
+/^Subject: At Last, Herbal V, the All Natural Alternative!/    REJECT Header-Spamschutzregel 119
+/^Subject: Make Money In Your Sleep! /         REJECT Header-Spamschutzregel 120
+/^Subject: FREE Satellite TV System/   REJECT Header-Spamschutzregel 122
+/^Subject: About your site/    REJECT Header-Spamschutzregel 124
+/^Subject: No Deposit VISA or Master Card!/    REJECT Header-Spamschutzregel 126
+/^Subject: FREE Auto Insurance Quote!/         REJECT Header-Spamschutzregel 127
+/^Subject: Need money for college\?/   REJECT Header-Spamschutzregel 131
+/^Subject:(\s+\[[^]]*\])?\s+[-\.{<]*ADV(ertisement)?[-:\.>}\s]/        REJECT Header-Spamschutzregel 153
+/^Subject:.*\s+ADV$/   REJECT Header-Spamschutzregel 154
+/^Subject: I viewed your site-/        REJECT Header-Spamschutzregel 155
+/^Subject:.*Millions?\s*(E?-?MAIL\s*)?ADDRESS/         REJECT Header-Spamschutzregel 156
+/^Subject:.*(are you (being investigated|in need of a lifestyle)|Free 1 Ounce Silver Coin|All foreign residents.  Check out this offer|CAN YOU ADVERTISE TO OVER 20 MILLION E-MAIL ADDRESSES\??|DSL - FREE DSL Modem! FREE Install! NO Contract!|We want to give you a Brand New FREE Motorola Pager|FREE Motorola Pager|Cellphone Signal Booster|You('| ha)?ve qualified for)/        REJECT Header-Spamschutzregel 157
+# /^Subject:.*[ ._]{5,}[^0 ._]\d+$/    REJECT Header-Spamschutzregel 160
+# /^Subject:.*[ ._]{5,}\[[^ ]+\]$/     REJECT Header-Spamschutzregel 161
+/^Subject:.*\sTime[: ]+\d+:\d+:\d+ [AP]M\s*$/i         REJECT Header-Spamschutzregel 162
+/^Subject: Snowhite and the Seven Dwarfs - The REAL story!/    REJECT Header-Spamschutzregel 177
+/^Subject: new photos from my party!/  REJECT Header-Spamschutzregel 180
+#/^Subject:.*=\?(euc-kr|ks_c_5601-1987)\?/     REJECT Header-Spamschutzregel 200
+/^Subject: Liebe freunde, es tropft wieder/    REJECT Header-Spamschutzregel 201
+/^Subject: The best gift a wife or girlfriend could ever ask for/              REJECT Header-Spamschutzregel 202
+/^Subject: Increase your drive, stamina, size and performance.. reach your potential!/                 REJECT Header-Spamschutzregel 203
+/^Subject: Discover your true sexual potential/                                                        REJECT Header-Spamschutzregel 204
+/^Subject: .*you could need it Pharamaceu tical/                                                       REJECT Header-Spamschutzregel 205
+/^Subject: Nearly 65% of women claim they wish their lover was more adept.. let us help/               REJECT Header-Spamschutzregel 206
+/^Subject: Increased spending on homeland security has created incredible opportunity/                 REJECT Header-Spamschutzregel 207
+/^Subject: The security explosion/                                                                     REJECT Header-Spamschutzregel 208
+/^Subject: Ermittlungsverfahren gegen Sie.*/   REJECT Header-Spamschutzregel 210
+/^Subject: Bekommen Sie Uhren.*/                       REJECT Header-Spamschutzregel 211
+Endif
+#################################################
+
+
+/^To: <ABALTAS@europarl.eu.int>/ REJECT Header-Spamschutzregel 53
+/^To: ACERCAS@europarl.eu.int/ REJECT Header-Spamschutzregel 54
+/^To: infomail@recurrent.com/ REJECT Header-Spamschutzregel 57
+/^X-Spanska:/                               REJECT Header-Spamschutzregel 59
+/^From steve-larson1@execs.com/        REJECT Header-Spamschutzregel 110
+/^From @execs.com*/    REJECT Header-Spamschutzregel 111
+/^From: enews@uscav.com/       REJECT Header-Spamschutzregel 118
+/weatherbug\.com/      REJECT Header-Spamschutzregel 123
+/virtumundo\.com/      REJECT Header-Spamschutzregel 125
+/thesexymessage\.com/  REJECT Header-Spamschutzregel 128
+/insideporn\.net/      REJECT Header-Spamschutzregel 129
+/shoplet\.com/         REJECT Header-Spamschutzregel 132
+/real-net\.net/        REJECT Header-Spamschutzregel 133
+/bizinfo/      REJECT Header-Spamschutzregel 134
+/servicenetbest\.com/  REJECT Header-Spamschutzregel 135
+/petter_zhang/         REJECT Header-Spamschutzregel 137
+/^(To|From|Cc|Reply-To):.*Investor Alert/      REJECT Header-Spamschutzregel 142
+/^(To|From|Cc|Reply-To):.*friend@(public.com|localhost.net)/   REJECT Header-Spamschutzregel 143
+/^(To|From|Cc|Reply-To):.*[ <]\d+@(onramp|prodigy|uu)\.net/    REJECT Header-Spamschutzregel 145
+/^(To|From|Cc|Reply-To):.*@funstuff2000.net/   REJECT Header-Spamschutzregel 146
+/^(To|From|Cc|Reply-To):.*(infowatch\.net|nakedmail\d?\.com)/  REJECT Header-Spamschutzregel 147
+/^(To|From|Cc|Reply-To):.*customer@aol/        REJECT Header-Spamschutzregel 148
+/^To: ListMembers@theneteffect/        REJECT Header-Spamschutzregel 149
+/^Reply-To:.*@(china\.com|rever-dreaming\.com|btamail\.net\.cn|amdpress\.com|nakedmail\d?\.com|big-salesfor\.you-now\.net)/    REJECT Header-Spamschutzregel 150
+
+# X-Bulkmail rausgenommen, da dies von UCI-Kinowelt benutzt wird :-(
+#/^X-(Advertisement|\d|UltraMail|Bulkmail): /  REJECT Header-Spamschutzregel 166
+/^X-(Advertisement|\d|UltraMail): /    REJECT Header-Spamschutzregel 166
+
+/^(Received|Message-Id|X-(Mailer|Sender)):.*\b(E-Broadcaster|Emailer Platinum|eMarksman|Extractor|e-Merge|from stealth[^.]|Global Messenger|GroupMaster|Mailcast|MailKing|Match10|MassE-Mail|massmail\.pl|News Breaker|Powermailer|Quick Shot|Ready Aim Fire|WindoZ|WorldMerge|Yourdora)\b/    REJECT Header-Spamschutzregel 167
+/^X-Mailer:.*\b(Aristotle|Avalanche|Blaster|Bomber|DejaVu|eMerge|Extractor|UltraMail|Sonic|Floodgate|GeoList|Mach10|MegaPro|Aureate|MultiMailer|Bluecom|Achi-Kochi Mail|Direct Email|Andrew's SuperCool Blastoise|MailerGear|Advanced Mass Sender|SpireMail|MailWorkZ|UltimDBMail|Mabry)\b/    REJECT Header-Spamschutzregel 168
+/^X-EM-(Version|Registration):/ WARN   TEST DER X-EM-Header
+/^X-AD2000-(Serial|Register):/         REJECT Header-Spamschutzregel 170
+/^X-Server: Advanced Direct Remailer/  REJECT Header-Spamschutzregel 171
+# spamware mistake.  real header is "Comments:"        
+/^Comment: Authenticated sender is/    REJECT Header-Spamschutzregel 174
+# viruses      
+/^(To|From|Cc|Reply-To):.*@sexyfun.net/        REJECT Header-Spamschutzregel 178
+/^Content-Disposition: Multipart message/i     REJECT Header-Spamschutzregel 179
+# sendmail Received: header overflow   
+/^Received:.*\.{50,}/  REJECT Header-Spamschutzregel 183
+# Date headers do not end in AM or PM.
+/^Date:.* [AP]M/i      REJECT Header-Spamschutzregel 193
+# invalid timezone in Date header      
+/^Date:.*[+-](1[4-9]|2\d)\d\d$/        REJECT Header-Spamschutzregel 195
+/^From:.*icyhot.bakas24.de/            REJECT Header-Spamschutzregel 209
diff --git a/postfix/header_checks.2012-01-28_15:45:56 b/postfix/header_checks.2012-01-28_15:45:56
new file mode 100644 (file)
index 0000000..396bcce
--- /dev/null
@@ -0,0 +1,369 @@
+# Version 3.70 / 25.09.2011
+#
+# Das Postfix-Buch - Sichere Mailserver mit Linux
+# http://www.postfixbuch.de - Peer Heinlein
+#
+# Heinlein Professional Linux Support GmbH
+# http://www.heinlein-support.de
+#
+# Downloadquelle dieser Datei: http://www.postfixbuch.de/web/service/checks/
+#
+#
+# Verwendung der Filtersammlung auf eigene Gefahr.
+#
+# Es handelt sich dabei um einen tagesaktuellen Auszug der beim
+# ISP "JPBerlin.de" genutzten Filterregeln. Bitte pruefen Sie vor einem
+# Einsatz bei Ihnen ganz genau, ob diese Regeln noch aktuell und sinnvoll
+# sind und ob Sie sie einsetzen moechten!
+#
+#
+# Setzen Sie in /etc/postfix/main.cf einfach
+#
+# header_checks = pcre:/etc/postfix/header_checks oder
+# oder
+# header_checks = regexp:/etc/postfix/header_checks
+#
+# und fuehren Sie "rcpostfix reload" aus.
+#
+# Tipp: pcre ist ein Drittel schneller als regexp!
+#
+#
+
+#
+# Die Nummern hinter dem REJECT tauchen spaeter iM SMTP-Error oder im Log
+# auf, um die Filter-Regel wiederzufinden, die den Block ausgeloest hat.
+# Es kann stattdessen auch einfacher Text benutzt werden.
+#
+
+
+#
+#
+# Besondere Regelungen ausserhalb unseres Spamschutzes
+# ===============================================
+#
+
+# Filtert Amavis-Einträge      
+/^Received: from localhost/    IGNORE
+
+#
+# Domeus hat bis heute nicht den Unterschied zwischen Mailheader-To und
+# SMTP-Envelope-To verstanden und fabriziert seit nunmehr über sieben Jahren in
+# schöner Regelmäßigkeit Mailschleifen im vier/fünfstelligen Bereich.
+#
+# /^Received:.*domeus\.com/    REJECT Domeus baut Mailschleifen und hat wichtige RFCs nicht verstanden
+
+/X-policyd-weight:.*to=dresden@listen.attac.de/         IGNORE
+
+#
+#
+# Tagesaktuelle, nur voruebergehende Regelungen:
+# ===============================================
+# [Immer mit Timestamp (!) und ggf. Ticket-Nummer eintragen!]
+#
+/^Received: from 62.56.132.7.satcom-systems.net/       REJECT Header-Spamschutzregel TMP-1
+
+# 20110630 - HPLS-Ticket#: 2011063010000278
+/^Received: from dsl88-247-23947.ttnet.net.tr/         REJECT Header-Spamschutzregel TMP-2
+
+# 20110925 - u.A. HPLS-Ticket#: 2011092510000102
+/^Subject: *pdf ist Ihre Gewinnchancen Informationen*/ REJECT Header-Spamschutzregel TMP-3
+
+#
+#
+# Dauerhaft genutzte Regelungen:
+# ===============================================
+# [Immer mit aufsteiger Nummer sauber eintragen!]
+#
+#
+
+/^X-PHP-Script: biditsaleit.com\/dz\/mailer.php*/      REJECT  Header-Spamschutzregel 1048
+/^Subject:.*from GMC manufacturer/     REJECT Header-Spamschutzregel 1047
+/^Return-Path: *ventouxl@ns[0-9]{3}.medialook.net/     REJECT  Header-Spamschutzregel 1046
+/^From :.*Topillen Apotheke /          REJECT Header-Spamschutzregel 1145
+/^Subject: Top Apotheke/               REJECT Header-Spamschutzregel 1144
+/^message-ID: *phx.gbl/        REJECT  Header-Spamschutzregel 1143
+/^List-Unsubscribe: *e-mailing.pymac.fr\/[a-z]\/[a-z]\/[0-9]{4}\/[0-9]{6}/     REJECT  Header-Spamschutzregel 1142
+/^Return-Path: *@oanm[0-9]{2}.com/     REJECT Header-Spamschutzregel 1141
+/^Subject: lighting products from GMC manufacturer/    REJECT Header-Spamschutzregel 1140
+/^Subject: OFFIZIELLE GEWINNBENACHRITIGUNG/    REJECT Header-Spamschutzregel 1139
+/^Subject: God bless you as you get back to me/        REJECT  Header-Spamschutzregel 1038
+/^List-Unsubribe: *tk3.sbc01.com\/sy\/*/       REJECT  Header-Spamschutzregel 1037
+/^List-Unsubscribe: *tk3.sbc01.com\/sy\/*/     REJECT  Header-Spamschutzregel 1037
+/^Message-ID: *[0-9]{8}-[0-9]{8}-[0-9a-z]{3}-0@S102*/  REJECT  Header-Spamschutzregel 1036
+/^Subject: *YOUR EMAIL HAS WON YOU GBP*/       REJECT  Header-Spamschutzregel 1035
+/^From: *ventouxl@ns[0-9]?[0-9].medialook.net/ REJECT  Header-Spamschutzregel 1034
+/^From: *gestioncreditexpert_[0-9]{4}@gce-mailer-[0-9]{2}.com/ REJECT  Header-Spamschutzregel 1033
+/^From:.*erosvision.com/       REJECT Header-Spamschutzregel 1032
+/^From:*@payapl.fr/    REJECT  Header-Spamschutzregel 1031
+# 20110706 - HPLS-Ticket#: 2011070610000053
+/^X-PHP-Script: mars.rapidvps.com\/~emoosite\/tmp\/install_4b10cb87da737\/languages\/site\/husa.php*/  REJECT  Header-Spamschutzregel 1030
+/^Thread-Index: *Acvd0cAG8IQaasqAcNaztWODnM30ZA/       REJECT Header-Spamschutzregel 1029
+/^Subject: aktualisieren Sie Ihre Bankdaten/   REJECT Header-Spamschutzregel 1028
+/^Subject: Erfahrungsbericht Bernd Matthes/    REJECT Header-Spamschutzregel 1027
+/^Subject:.*IP PBX/i                   REJECT Header-Spamschutzregel 1026
+/^From:.*Nicoll Christopher John/      REJECT Header-Spamschutzregel 1025
+/^From:.*SHELL PETROLEUM/              REJECT Header-Spamschutzregel 1024
+/^From:.*Versicherungs Dienst/         REJECT Header-Spamschutzregel 1023
+/^From:.*soft-cd.com/                  REJECT Header-Spamschutzregel 1022
+/^From: "Oxford Business News" <info@oxford-bn.org>/   REJECT Header-Spamschutzregel 1021
+/^Subject: =?iso-8859-1?Q?Leider_st=F6?= =?iso-8859-1?Q?ren_Sie.?=/    REJECT Header-Spamschutzregel 1020
+/^From:.*Elena.*@eposta.ru/            REJECT Header-Spamschutzregel 1019
+/^Subject:.*Results 2008 !/            REJECT Header-Spamschutzregel 1018
+/^From: Sponsor Lotto/                 REJECT Header-Spamschutzregel 1017
+/^From:.*nodiet@web.de/                        REJECT Header-Spamschutzregel 1016
+/^From:.*edirects.com/                  REJECT Header-Spamschutzregel 1015
+/^Subject:.*WINNING NOTIFICATION!!!/           REJECT Header-Spamschutzregel 1014
+/^Subject:.*Wir wissen was Frauen wollern/         REJECT Header-Spamschutzregel 1013
+/^From:.*newscd\.org/                  REJECT Header-Spamschutzregel 1012
+/^From:.*mms-und-sms-gutschein.com/    REJECT Header-Spamschutzregel 1011
+/^Subject:.*CONFIRM YOUR WINNING/      REJECT Header-Spamschutzregel 1010
+/^Subject:.*Gratisaktion - Du wurdest ausgewaehlt unseren neuen SMS/   REJECT Header-Spamschutzregel 1009
+/^From:.*Seitensprung/                 REJECT Header-Spamschutzregel 1008
+/^Received:.*germans-mailc.com/                REJECT Header-Spamschutzregel 1007: Lisa-Schindler-Spam 
+/^Received:.*stienitzsee.info/         REJECT Header-Spamschutzregel 1006
+/^Subject: Bonus 555eu/                                REJECT Header-Spamschutzregel 1005
+/^Subject: *(ATTN|TO) *:.*SALES? *MANAGER/i    REJECT Header-Spamschutzregel 1004
+/^Subject:.*Take this postcard now!/   REJECT Header-Spamschutzregel 1003
+/^Subject:.*FUXIN/                     REJECT Header-Spamschutzregel 1002
+/^From:.*marion.backera/               REJECT Header-Spamschutzregel 1001
+/^Subject:.*kein spam. aber eine Antwort auf ihre Fragen/      REJECT Header-Spamschutzregel 1000
+
+
+
+
+# Nazi-Spam-Welle mit Hetze
+
+########################################
+if /^Subject:/i
+
+/^Subject: 4,8 Mill\. Osteuropaeer durch Fischer-Volmer Erlass/        REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Auf Streife durch den Berliner Wedding/     REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Auslaender bevorzugt/                       REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Auslaenderpolitik/                          REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Deutsche werden kuenftig beim Arzt abgezockt/       REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Du wirst zum Sklaven gemacht\!\!\!/         REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Graeberschaendung auf bundesdeutsche Anordnung/     REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Hier sind wir Lehrer die einzigen Auslaender/       REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Paranoider Deutschenmoerder kommt in Psychiatrie/   REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Tuerkei in die EU/                          REJECT Header-Spamschutzregel Nazi Spam
+/^Subject: Verbrechen der deutschen Frau/              REJECT Header-Spamschutzregel Nazi Spam
+/^Subject:.*Skandal in Berlin/                                 REJECT Header-Spamschutzregel JPBERLIN-14
+/^Subject:.*Auslaendergewalt: Herr Rau, wo waren Sie?/ REJECT Header-Spamschutzregel JPBERLIN-15
+/^Subject:.*Bankrott des Gesundheitswesens durch Auslaender!/  REJECT Header-Spamschutzregel JPBERLIN-16
+/^Subject:.*Wer an ein Tabu ruehrt, muss und darf vernichtet werden/   REJECT Header-Spamschutzregel JPBERLIN-17
+/^Subject:.*EU Beitritt der Tuerkei/   REJECT Header-Spamschutzregel JPBERLIN-18
+/^Subject:.*Bin ich zu weltfremd.*Ich glaube wohl kaum/ REJECT Header-Spamschutzregel JPBERLIN-19
+/^Subject:.*Die Deform der sozialen Ordnung/           REJECT Header-Spamschutzregel JPBERLIN-20
+/^Subject:.*Moschee-Bau in Deutschland/                        REJECT Header-Spamschutzregel JPBERLIN-21
+/^Subject:.*Augen auf.*So sieht es aus/                        REJECT Header-Spamschutzregel JPBERLIN-22
+/^Subject:.*Paradies Bundesrepublik - Rente fuer die Welt/     REJECT Header-Spamschutzregel JPBERLIN-23
+/^Subject:.*Libanesen in Berlin/                       REJECT Header-Spamschutzregel JPBERLIN-24
+/^Subject:.*Garather klagen ueber eskalierende Gewalt im Stadtteil!/   REJECT Header-Spamschutzregel JPBERLIN-24
+/^Subject:.*Auslaender erschleichen sich zunehmend Sozialleistungen/   REJECT Header-Spamschutzregel JPBERLIN-25
+/^Subject:.*Auslaenderkriminalitaet steigt weiter!/    REJECT Header-Spamschutzregel JPBERLIN-26
+/^Subject:.*Das kann unmoeglich sein -Leserbrief/      REJECT Header-Spamschutzregel JPBERLIN-27
+/^Subject:.*Nein zum Zuwanderungsgesetz !/             REJECT Header-Spamschutzregel JPBERLIN-28
+/^Subject:.*Skandalurteil in Darmstadt/                        REJECT Header-Spamschutzregel JPBERLIN-29
+/^Subject:.*Auf Kosten der deutschen Beitragszahler und Rentner!/      REJECT Header-Spamschutzregel JPBERLIN-30
+/^Subject:.*Wir haben die Auslaender doch geholt/      REJECT Header-Spamschutzregel JPBERLIN-31
+/^Subject:.*TUERKEN-TERROR AM HIMMELFAHRTSTAG/         REJECT Header-Spamschutzregel JPBERLIN-32
+/^Subject:.*MULTI-KULTI-BANDE TYRANNISIERTE MITSCHUELER/       REJECT Header-Spamschutzregel JPBERLIN-33
+/^Subject:.*ASYLANTEN BEGRABSCHTEN DEUTSCHES MAEDCHEN/ REJECT Header-Spamschutzregel JPBERLIN-34
+/^Subject:.*Was Deutschland braucht, sind deutsche Kinder!/    REJECT Header-Spamschutzregel JPBERLIN-35
+/^Subject:.*Diplomatische Zensur/      REJECT Header-Spamschutzregel JPBERLIN-36
+/^Subject:.*EU gibt Erwerbslosen volle Freizuegigkeit/ REJECT Header-Spamschutzregel JPBERLIN-37
+/^Subject:.*Richter unterstuetzt kriminelle Auslaenderin/      REJECT Header-Spamschutzregel JPBERLIN-38
+/^Subject:.*Auslaenderanteile in Schweizer Gefaengnissen/      REJECT Header-Spamschutzregel JPBERLIN-39
+/^Subject:.*Augen auf! (So sieht es aus!)/             REJECT Header-Spamschutzregel JPBERLIN-40
+/^Subject:.*Neue Voelkerwanderung droht!/              REJECT Header-Spamschutzregel JPBERLIN-41
+/^Subject:.*Client TOS Notification/                   REJECT Header-Spamschutzregel JPBERLIN-50
+/^Subject:.* CIALIS /                                  REJECT Header-Spamschutzregel JPBERLIN-51: Cialis-Keyword
+/^Subject:.*Postbank Sicherheitsaktualisierung/                REJECT Header-Spamschutzregel JPBERLIN-52
+/^Subject:.*Sicherheitsaktualisierung/                 REJECT Header-Spamschutzregel JPBERLIN-53
+/^Subject:.*Deutsche-bank Sicherheitsaktualisierung/   REJECT Header-Spamschutzregel JPBERLIN-54
+/^Subject:.*internet.*pharmacy/        REJECT Header-Spamschutzregel JPBERLIN-55
+/^Subject:.*Affordable Premade Logos/  REJECT Header-Spamschutzregel JPBERLIN-56
+/^Subject:.*Best prices.*on the net/   REJECT Header-Spamschutzregel JPBERLIN-57
+/^Subject:.*V.?i.?a.?g.?r.?a/          REJECT Header-Spamschutzregel JPBERLIN-58: Viagra-Keyword
+/^Subject:.*X.?a.?n.?a.?x/             REJECT Header-Spamschutzregel JPBERLIN-59: Xanax-Keyword
+/^Subject:.*Phentermine/               REJECT Header-Spamschutzregel JPBERLIN-60
+/^Subject:.*Die Sahne tropft heraus/   REJECT Header-Spamschutzregel JPBERLIN-61
+/^Subject:.* Rolex /                   REJECT Header-Spamschutzregel JPBERLIN-62
+/^Subject:.*Rechnung Online Monat November 2004/       REJECT Header-Spamschutzregel JPBERLIN-63 Trojaner-Alarm
+/^Subject:.*Replica Watch Models/      REJECT Header-Spamschutzregel JPBERLIN-64
+/^Subject:.*Sehr geehrter Postbankkunde/       REJECT Header-Spamschutzregel JPBERLIN-65
+/^Subject:.*AIR ANTALYA/               REJECT Header-Spamschutzregel JPBERLIN-66
+/^Subject:.*Search engines - submit/   REJECT Header-Spamschutzregel JPBERLIN-12
+/^Subject:.*Search engine traffic/     REJECT Header-Spamschutzregel JPBERLIN-13
+/^Subject: More efficient than via-gra/        REJECT Header-Spamschutzregel 22
+/^Subject: Mailadresse unbekannt/      REJECT Header-Spamschutzregel 27
+/^Subject:.*SARS: Viet Nam removed from list of affected countries.*/ REJECT Header-Spamschutzregel 29
+/^Subject:.*Wichtig !!! Die Telefonnummer die du haben wolltest/ REJECT Header-Spamschutzregel 31
+/^Subject:.*Weihnachtsbaeume ab EURO.*/        REJECT Header-Spamschutzregel 32
+/^Subject:.*Neue Version zum downloaden.*/     REJECT Header-Spamschutzregel 33
+/^Subject:.*Frants for.*/      REJECT Header-Spamschutzregel 34
+/^Subject:.*FREEE.*/   REJECT Header-Spamschutzregel 35
+/^Subject:.*Webdesign leicht gemacht.*/        REJECT Header-Spamschutzregel 36
+/^Subject:.*Check this Message Board Out.*/ REJECT Header-Spamschutzregel 37
+/^Subject: SAVE GERMANY VOTE STOIBER.*/ REJECT Header-Spamschutzregel 38
+
+Endif
+####################################
+
+
+
+#/^Return-Path: <MAILER-DAEMON>/       REJECT Header-Spamschutzregel 20
+/^Received:.*luftmensch.com/           REJECT Header-Spamschutzregel 28
+/^Delivered-To:.*jo@pcj.mlbc.test/      REJECT Header-Spamschutzregel 
+/From:.*Mandy Tweed/   REJECT Header-Spamschutzregel 39
+/Received: from privat .*.aol.com/     REJECT Header-Spamschutzregel 40
+/Received:.*tpg_exsrvr.thepowellgroup.com/     REJECT Header-Spamschutzregel 41
+/Received: from mx?.eudoramail.com/    REJECT Header-Spamschutzregel 42
+/Flashmail\.com/       REJECT Header-Spamschutzregel 44
+
+
+
+#      
+# Checks gesammelt aus dem Netz von    
+# http://www.hispalinux.es/~data/postfix/      
+#      
+
+######################################
+If /^Subject:/i
+
+/^Subject: FW: Warm this world by truely Love$/        REJECT Header-Spamschutzregel 51
+/^Subject:.*Fwd:Peace BeTweeN AmeriCa and IsLaM!/ REJECT Header-Spamschutzregel 58
+/^Subject: ILOVEYOU/                           REJECT Header-Spamschutzregel 60
+# Regel 61 rausgenommen -- zu allgemein. 20080128 / phei
+#/^Subject: (Re: )*Important Message From/      REJECT Header-Spamschutzregel 61
+/^Subject: (Re: )*BubbleBoy is back!/          REJECT Header-Spamschutzregel 62
+/^Subject: Accept Credit Cards/                REJECT Header-Spamschutzregel 63
+/^Subject: How Soon Are You Going To Retire\?/ REJECT Header-Spamschutzregel 64
+/^Subject: \[ADV:/                            REJECT Header-Spamschutzregel 65
+/^Subject: ADV:/                               REJECT Header-Spamschutzregel 66
+/^Subject: Snowhite and the Seven Dwarfs - The REAL story!/    REJECT Header-Spamschutzregel 67
+/^Subject: Are you losing sleep over debt\?/   REJECT Header-Spamschutzregel 68
+/^Subject: a stock that makes money/           REJECT Header-Spamschutzregel 69
+/^Subject: high earnings may soar/             REJECT Header-Spamschutzregel 70
+/^Subject: See the VIDEO Britney/              REJECT Header-Spamschutzregel 71
+/^Subject: FW: VIDEOS OF BRITNEY/              REJECT Header-Spamschutzregel 72
+/^Subject: STOLEN HARDCORE VIDEO/              REJECT Header-Spamschutzregel 73
+/^Subject: NEW CASH PROGRAM/                 REJECT Header-Spamschutzregel 74
+/^Subject: Hot Celebs 100% Exposed!/                REJECT Header-Spamschutzregel 75
+/^Subject: Make It Happen/                 REJECT Header-Spamschutzregel 76
+/^Subject: If you need extra money...read this!/ REJECT Header-Spamschutzregel 77
+/^Subject: Recieve A Free Quote/                REJECT Header-Spamschutzregel 78
+/^Subject: We Have Low Mortgage Rates!!!/        REJECT Header-Spamschutzregel 79
+/^Subject: Re: travel confirmation/                REJECT Header-Spamschutzregel 80
+/^Subject: Receive a FREE SAMPLE of Viagra for Women/ REJECT Header-Spamschutzregel 81
+/^Subject: DOUBLE YOUR BREAST SIZE! GUARANTEED/        REJECT Header-Spamschutzregel 82
+/^Subject: Ground Breaking Business "Starts Today"/    REJECT Header-Spamschutzregel 83
+/^Subject: AS SEEN ON T\.V/    REJECT Header-Spamschutzregel 84
+/^Subject: 99 Million Email Addresses - \$99/  REJECT Header-Spamschutzregel 85
+/^Subject: 50 Million Fresh Email Addresses/   REJECT Header-Spamschutzregel 87
+/^Subject: 200 Million Email Addresses - \$149/        REJECT Header-Spamschutzregel 88
+/^Subject: Get Viagra Online Now !!!/  REJECT Header-Spamschutzregel 89
+/^Subject: Boost Your Windows Reliability/     REJECT Header-Spamschutzregel 90
+/^Subject: I know what you've been doing/      REJECT Header-Spamschutzregel 91
+/^Subject: Hot Penny Stock Pick/       REJECT Header-Spamschutzregel 92
+/^Subject: Need a great deal on a home loan\?/         REJECT Header-Spamschutzregel 93
+/^Subject: I used to be in debt too!/  REJECT Header-Spamschutzregel 94
+/^Subject: Work less, make more/       REJECT Header-Spamschutzregel 95
+/^Subject: Drive Your Web Counter Ballistic/   REJECT Header-Spamschutzregel 96
+/^Subject: Re: have you considered doing this\?/       REJECT Header-Spamschutzregel 97
+/^Subject: Work from home and get paid!/       REJECT Header-Spamschutzregel 98
+/^Subject: Enter To Win One of 25 Dream Vacations!!/   REJECT Header-Spamschutzregel 99
+/^Subject: Do You Accept Credit Cards/         REJECT Header-Spamschutzregel 100
+/^Subject: Home Owners ONLY/   REJECT Header-Spamschutzregel 101
+/^Subject: Your Credit Info/   REJECT Header-Spamschutzregel 102
+/^Subject: Do you owe money\?/         REJECT Header-Spamschutzregel 103
+/^Subject: Need a Home Loan? We Can Help!!/    REJECT Header-Spamschutzregel 104
+/^Subject: stock alert/        REJECT Header-Spamschutzregel 105
+/^Subject: contact lenses/     REJECT Header-Spamschutzregel 106
+/^Subject: ENLARGE YOUR PACAKGE GUARANTEED/    REJECT Header-Spamschutzregel 107
+/^Subject: ENLARGE YOUR PACKAGE GUARANTEED/    REJECT Header-Spamschutzregel 108
+/^Subject: We purchase uncollected Judicial Judgments/         REJECT Header-Spamschutzregel 109
+/^Subject: Increase Your Gas Mileage by up to 27%!/    REJECT Header-Spamschutzregel 112
+/^Subject: Willow Flower Herb For Prostate Problems\./         REJECT Header-Spamschutzregel 113
+/^Subject: NEW Increase Your Gas Mileage by 27%/       REJECT Header-Spamschutzregel 114
+/^Subject: The easiest way to make money on the internet!/     REJECT Header-Spamschutzregel 115
+/^Subject: Re: think about this\.\.\./         REJECT Header-Spamschutzregel 116
+/^Subject: think about this\.\.\./     REJECT Header-Spamschutzregel 117
+/^Subject: At Last, Herbal V, the All Natural Alternative!/    REJECT Header-Spamschutzregel 119
+/^Subject: Make Money In Your Sleep! /         REJECT Header-Spamschutzregel 120
+/^Subject: FREE Satellite TV System/   REJECT Header-Spamschutzregel 122
+/^Subject: About your site/    REJECT Header-Spamschutzregel 124
+/^Subject: No Deposit VISA or Master Card!/    REJECT Header-Spamschutzregel 126
+/^Subject: FREE Auto Insurance Quote!/         REJECT Header-Spamschutzregel 127
+/^Subject: Need money for college\?/   REJECT Header-Spamschutzregel 131
+/^Subject:(\s+\[[^]]*\])?\s+[-\.{<]*ADV(ertisement)?[-:\.>}\s]/        REJECT Header-Spamschutzregel 153
+/^Subject:.*\s+ADV$/   REJECT Header-Spamschutzregel 154
+/^Subject: I viewed your site-/        REJECT Header-Spamschutzregel 155
+/^Subject:.*Millions?\s*(E?-?MAIL\s*)?ADDRESS/         REJECT Header-Spamschutzregel 156
+/^Subject:.*(are you (being investigated|in need of a lifestyle)|Free 1 Ounce Silver Coin|All foreign residents.  Check out this offer|CAN YOU ADVERTISE TO OVER 20 MILLION E-MAIL ADDRESSES\??|DSL - FREE DSL Modem! FREE Install! NO Contract!|We want to give you a Brand New FREE Motorola Pager|FREE Motorola Pager|Cellphone Signal Booster|You('| ha)?ve qualified for)/        REJECT Header-Spamschutzregel 157
+# /^Subject:.*[ ._]{5,}[^0 ._]\d+$/    REJECT Header-Spamschutzregel 160
+# /^Subject:.*[ ._]{5,}\[[^ ]+\]$/     REJECT Header-Spamschutzregel 161
+/^Subject:.*\sTime[: ]+\d+:\d+:\d+ [AP]M\s*$/i         REJECT Header-Spamschutzregel 162
+/^Subject: Snowhite and the Seven Dwarfs - The REAL story!/    REJECT Header-Spamschutzregel 177
+/^Subject: new photos from my party!/  REJECT Header-Spamschutzregel 180
+#/^Subject:.*=\?(euc-kr|ks_c_5601-1987)\?/     REJECT Header-Spamschutzregel 200
+/^Subject: Liebe freunde, es tropft wieder/    REJECT Header-Spamschutzregel 201
+/^Subject: The best gift a wife or girlfriend could ever ask for/              REJECT Header-Spamschutzregel 202
+/^Subject: Increase your drive, stamina, size and performance.. reach your potential!/                 REJECT Header-Spamschutzregel 203
+/^Subject: Discover your true sexual potential/                                                        REJECT Header-Spamschutzregel 204
+/^Subject: .*you could need it Pharamaceu tical/                                                       REJECT Header-Spamschutzregel 205
+/^Subject: Nearly 65% of women claim they wish their lover was more adept.. let us help/               REJECT Header-Spamschutzregel 206
+/^Subject: Increased spending on homeland security has created incredible opportunity/                 REJECT Header-Spamschutzregel 207
+/^Subject: The security explosion/                                                                     REJECT Header-Spamschutzregel 208
+/^Subject: Ermittlungsverfahren gegen Sie.*/   REJECT Header-Spamschutzregel 210
+/^Subject: Bekommen Sie Uhren.*/                       REJECT Header-Spamschutzregel 211
+Endif
+#################################################
+
+
+/^To: <ABALTAS@europarl.eu.int>/ REJECT Header-Spamschutzregel 53
+/^To: ACERCAS@europarl.eu.int/ REJECT Header-Spamschutzregel 54
+/^To: infomail@recurrent.com/ REJECT Header-Spamschutzregel 57
+/^X-Spanska:/                               REJECT Header-Spamschutzregel 59
+/^From steve-larson1@execs.com/        REJECT Header-Spamschutzregel 110
+/^From @execs.com*/    REJECT Header-Spamschutzregel 111
+/^From: enews@uscav.com/       REJECT Header-Spamschutzregel 118
+/weatherbug\.com/      REJECT Header-Spamschutzregel 123
+/virtumundo\.com/      REJECT Header-Spamschutzregel 125
+/thesexymessage\.com/  REJECT Header-Spamschutzregel 128
+/insideporn\.net/      REJECT Header-Spamschutzregel 129
+/shoplet\.com/         REJECT Header-Spamschutzregel 132
+/real-net\.net/        REJECT Header-Spamschutzregel 133
+/bizinfo/      REJECT Header-Spamschutzregel 134
+/servicenetbest\.com/  REJECT Header-Spamschutzregel 135
+/petter_zhang/         REJECT Header-Spamschutzregel 137
+/^(To|From|Cc|Reply-To):.*Investor Alert/      REJECT Header-Spamschutzregel 142
+/^(To|From|Cc|Reply-To):.*friend@(public.com|localhost.net)/   REJECT Header-Spamschutzregel 143
+/^(To|From|Cc|Reply-To):.*[ <]\d+@(onramp|prodigy|uu)\.net/    REJECT Header-Spamschutzregel 145
+/^(To|From|Cc|Reply-To):.*@funstuff2000.net/   REJECT Header-Spamschutzregel 146
+/^(To|From|Cc|Reply-To):.*(infowatch\.net|nakedmail\d?\.com)/  REJECT Header-Spamschutzregel 147
+/^(To|From|Cc|Reply-To):.*customer@aol/        REJECT Header-Spamschutzregel 148
+/^To: ListMembers@theneteffect/        REJECT Header-Spamschutzregel 149
+/^Reply-To:.*@(china\.com|rever-dreaming\.com|btamail\.net\.cn|amdpress\.com|nakedmail\d?\.com|big-salesfor\.you-now\.net)/    REJECT Header-Spamschutzregel 150
+
+# X-Bulkmail rausgenommen, da dies von UCI-Kinowelt benutzt wird :-(
+#/^X-(Advertisement|\d|UltraMail|Bulkmail): /  REJECT Header-Spamschutzregel 166
+/^X-(Advertisement|\d|UltraMail): /    REJECT Header-Spamschutzregel 166
+
+/^(Received|Message-Id|X-(Mailer|Sender)):.*\b(E-Broadcaster|Emailer Platinum|eMarksman|Extractor|e-Merge|from stealth[^.]|Global Messenger|GroupMaster|Mailcast|MailKing|Match10|MassE-Mail|massmail\.pl|News Breaker|Powermailer|Quick Shot|Ready Aim Fire|WindoZ|WorldMerge|Yourdora)\b/    REJECT Header-Spamschutzregel 167
+/^X-Mailer:.*\b(Aristotle|Avalanche|Blaster|Bomber|DejaVu|eMerge|Extractor|UltraMail|Sonic|Floodgate|GeoList|Mach10|MegaPro|Aureate|MultiMailer|Bluecom|Achi-Kochi Mail|Direct Email|Andrew's SuperCool Blastoise|MailerGear|Advanced Mass Sender|SpireMail|MailWorkZ|UltimDBMail|Mabry)\b/    REJECT Header-Spamschutzregel 168
+/^X-EM-(Version|Registration):/ WARN   TEST DER X-EM-Header
+/^X-AD2000-(Serial|Register):/         REJECT Header-Spamschutzregel 170
+/^X-Server: Advanced Direct Remailer/  REJECT Header-Spamschutzregel 171
+# spamware mistake.  real header is "Comments:"        
+/^Comment: Authenticated sender is/    REJECT Header-Spamschutzregel 174
+# viruses      
+/^(To|From|Cc|Reply-To):.*@sexyfun.net/        REJECT Header-Spamschutzregel 178
+/^Content-Disposition: Multipart message/i     REJECT Header-Spamschutzregel 179
+# sendmail Received: header overflow   
+/^Received:.*\.{50,}/  REJECT Header-Spamschutzregel 183
+# Date headers do not end in AM or PM.
+/^Date:.* [AP]M/i      REJECT Header-Spamschutzregel 193
+# invalid timezone in Date header      
+/^Date:.*[+-](1[4-9]|2\d)\d\d$/        REJECT Header-Spamschutzregel 195
+/^From:.*icyhot.bakas24.de/            REJECT Header-Spamschutzregel 209
index 9e401b8513efd98ae4197e8adf817b4be5032da3..6d2f3486827a10ae718c63597c9b40befa466a4c 100644 (file)
@@ -3,10 +3,11 @@
 # GO INTO /etc/profile NOT /etc/profile.env
 
 export CONFIG_PROTECT='/var/bind /usr/share/gnupg/qualified.txt /usr/share/openvpn/easy-rsa'
-export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 export EDITOR='/usr/bin/vim'
 export GCC_SPECS=''
 export GDK_USE_XFT='1'
+export GSETTINGS_BACKEND='gconf'
 export GUILE_LOAD_PATH='/usr/share/guile/1.8'
 export HG='/usr/bin/hg'
 export INFOPATH='/usr/share/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info'
diff --git a/rc.conf b/rc.conf
index acc4b3cb1ca3991a87dacbb36263b5e277884ac7..e0be8cb1551dc55e4b040b5b36ae92c27f931794 100644 (file)
--- a/rc.conf
+++ b/rc.conf
@@ -1,18 +1,8 @@
 # Global OpenRC configuration settings
 
-# Set to "YES" if you want the rc system to try and start services
-# in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with its name as the output will get
-# jumbled up.
-# WARNING: whilst we have improved parallel, it can still potentially lock
-# the boot process. Don't file bugs about this unless you can supply
-# patches that fix it without breaking other things!
-#rc_parallel="NO"
-
 # Set rc_interactive to "YES" and you'll be able to press the I key during
 # boot so you can choose to start specific services. Set to "NO" to disable
-# this feature. This feature is automatically disabled if rc_parallel is
-# set to YES.
+# this feature.
 #rc_interactive="YES"
 
 # If we need to drop to a shell, you can specify it here.
@@ -45,11 +35,11 @@ rc_shell=/sbin/sulogin
 # /var/log/rc.log
 # NOTE: Linux systems require the devfs service to be started before
 # logging can take place and as such cannot log the sysinit runlevel.
-#rc_logger="YES"
+rc_logger="YES"
 
 # Through rc_log_path you can specify a custom log file.
 # The default value is: /var/log/rc.log
-#rc_log_path="/var/log/rc.log"
+rc_log_path="/var/log/rc.log"
 
 # By default we filter the environment for our running scripts. To allow other
 # variables through, add them here. Use a * to allow all variables through.
@@ -138,9 +128,8 @@ unicode="YES"
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
+rc_sys=""
 
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12
-
index 35f4908dbcb9d82358fc7778413dfdbefdc100e6..c1e08f98fd267e5804c47231314975f002f3a932 100644 (file)
@@ -49,6 +49,20 @@ chip "w83793-*"
     set in9_max  3.0 * 1.10
 
 
+chip "w83795g-*" "w83795adg-*"
+
+    label in12 "+3.3V"
+    label in13 "3VSB"
+    label in14 "Vbat"
+
+    set in12_min  3.3 * 0.90
+    set in12_max  3.3 * 1.10
+    set in13_min  3.3 * 0.90
+    set in13_max  3.3 * 1.10
+    set in14_min  3.0 * 0.90
+    set in14_max  3.3 * 1.10
+
+
 chip "via686a-*"
 
     label in0 "Vcore"
@@ -209,7 +223,8 @@ chip "smsc47m192-*"
     label temp1 "SIO Temp"
 
 
-chip "lm85-*" "lm85b-*" "lm85c-*" "adm1027-*" "adt7463-*" "adt7468-*" "emc6d100-*" "emc6d102-*"
+chip "lm85-*" "lm85b-*" "lm85c-*" "adm1027-*" "adt7463-*" "adt7468-*" \
+     "emc6d100-*" "emc6d102-*" "emc6d103-*" "emc6d103s-*" 
 
     label in1 "Vcore"
     label in2 "+3.3V"
@@ -228,6 +243,14 @@ chip "lm85-*" "lm85b-*" "lm85c-*" "adm1027-*" "adt7463-*" "adt7468-*" "emc6d100-
     label temp2 "M/B Temp"
 
 
+chip "emc6w201-*"
+
+    label in2 "+3.3V"
+    label in3 "+5V"
+
+    label temp6 "M/B Temp"
+
+
 chip "pc87365-*" "pc87366-*"
 
 # Voltage inputs
@@ -266,7 +289,26 @@ chip "adm1030-*" "adm1031-*"
     label temp1 "M/B Temp"
 
 
-chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*"
+chip "w83627thf-*"
+
+    label in3 "+5V"
+    label in7 "5VSB"
+    label in8 "Vbat"
+
+    # Internal resistors
+    compute in3  @ * (1 + 34/51), @ / (1 + 34/51)
+    compute in7  @ * (1 + 34/51), @ / (1 + 34/51)
+
+    set in3_min  5.0 * 0.90
+    set in3_max  5.0 * 1.10
+    set in7_min  5.0 * 0.90
+    set in7_max  5.0 * 1.10
+# The battery voltage may or may not be monitored.
+#    set in8_min  3.0 * 0.90
+#    set in8_max  3.0 * 1.10
+
+
+chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" "nct6775-*" "nct6776-*"
 
     label in0 "Vcore"
     label in2 "AVCC"
@@ -284,6 +326,23 @@ chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*"
     set in8_max  3.0 * 1.10
 
 
+chip "w83627uhg-*"
+
+    label in2 "AVCC"
+    label in3 "+5V"
+    label in7 "5VSB"
+    label in8 "Vbat"
+
+    set in2_min  5.0 * 0.90
+    set in2_max  5.0 * 1.10
+    set in3_min  5.0 * 0.90
+    set in3_max  5.0 * 1.10
+    set in7_min  5.0 * 0.90
+    set in7_max  5.0 * 1.10
+    set in8_min  3.0 * 0.90
+    set in8_max  3.0 * 1.10
+
+
 chip "f71805f-*"
 
     label in0 "+3.3V"
@@ -383,7 +442,22 @@ chip "sch5027-*"
     set in6_max  3.0 * 1.10
 
 
-chip "f71882fg-*"
+chip "sch5127-*"
+
+    label in2 "+3.3V"
+    label in5 "3VSB"
+    label in6 "Vbat"
+
+    set in2_min  3.3 * 0.90
+    set in2_max  3.3 * 1.10
+    set in5_min  3.3 * 0.90
+    set in5_max  3.3 * 1.10
+    set in6_min  3.0 * 0.90
+    set in6_max  3.0 * 1.10
+
+
+chip "f71808e-*" "f71808a-*" "f71862fg-*" "f71869-*" "f71869a-*" "f71882fg-*" \
+     "f71889fg-*" "f71889ed-*" "f71889a-*"
 
     label in0 "+3.3V"
     label in7 "3VSB"
@@ -394,7 +468,7 @@ chip "f71882fg-*"
     compute in8  @*2, @/2
 
 
-chip "f8000-*"
+chip "f71858fg-*" "f8000-*"
 
     label in0 "+3.3V"
     label in1 "3VSB"
@@ -405,6 +479,17 @@ chip "f8000-*"
     compute in2  @*2, @/2
 
 
+chip "f81865f-*"
+
+    label in0 "+3.3V"
+    label in5 "3VSB"
+    label in6 "Vbat"
+
+    compute in0  @*2, @/2
+    compute in5  @*2, @/2
+    compute in6  @*2, @/2
+
+
 chip "adt7473-*" "adt7475-*"
 
     label in2 "+3.3V"
diff --git a/ssl/CA-Brehm/stunnel/mkcert b/ssl/CA-Brehm/stunnel/mkcert
new file mode 100755 (executable)
index 0000000..cd3ac76
--- /dev/null
@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# This is a short script to quickly generate a self-signed X.509 key for
+# Courier-IMAP/POP3 over SSL.
+
+set -e
+
+test -x /usr/bin/openssl || exit 0
+
+CADir="/etc/ssl/CA-Brehm/stunnel"
+prefix="/usr"
+randfile="$CADir/stunnel.rand"
+days=1875
+do_install=0
+
+if [ "${#BASH_ARGV[@]}" == "0" ]; then
+    echo "No instances to generate certificates given." >&2
+    exit 1
+fi
+
+echo
+echo "Generating Random file '$randfile' ..."
+dd if=/dev/urandom of=$randfile count=1 2>/dev/null
+
+clear_randfile() {
+    if [ -f "${randfile}" ] ; then
+        
+    fi
+}
+
+trap clear_randfile INT TERM EXIT
+
+for i in "${BASH_ARGV[@]}"; do
+    echo
+    echo " - '${i}'"
+    echo
+
+    target_dir="${CADir}/${i}"
+
+    if [ ! -d "${target_dir}" ] ; then
+        echo "   Creating directory ${target_dir} ..."
+        mkdir -p "${target_dir}" || exit 3
+    fi
+
+    pemfile="${target_dir}/${i}-cert.pem"
+    conffile="${target_dir}/${i}-cert.cnf"
+
+    if [ ! -f "${conffile}" ] ; then
+    fi
+
+done
+
+exit 0
+Instances="webmail myadmin"
+
+for i in $Instances ; do
+
+  pemfile="$CADir/$i-cert.pem"
+  conffile="$CADir/$i-cert.cnf"
+
+  if [ -f $pemfile ]; then
+    echo "$pemfile already exists."
+    continue
+  fi
+  do_install=1
+
+  if [ ! -f $conffile ] ; then
+    echo "$conffile does not exists!"
+    exit 2
+  fi
+
+  cp /dev/null $pemfile
+  chmod 600 $pemfile
+  chown root $pemfile
+
+  cleanup() {
+    echo
+    echo "Emergency Cleanup ..." >&2
+    rm -f $pemfile
+    rm -f $randfile
+    exit 10
+  }
+
+  echo "Generating Cert for IMAP ..."
+  /usr/bin/openssl req -new -x509 -days $days -nodes \
+          -config $conffile -out $pemfile -keyout $pemfile || cleanup
+  /usr/bin/openssl gendh -rand $randfile 512 >> $pemfile || cleanup
+  /usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+
+done
+
+if [ "$do_install" = "1" ] ; then
+
+  echo
+  echo "Installing Certificates ..."
+
+  for i in $Instances ; do
+
+    pemfile="$CADir/$i-cert.pem"
+    pemfile_orig="/etc/apache2/ssl/$i-cert.pem"
+
+    cp -pv $pemfile $pemfile_orig
+
+  done
+
+fi
+
+rm -f $randfile
+
+
+# vim: ts=4 expandtab
diff --git a/ssl/CA-Brehm/stunnel/stunnel-cert.cnf b/ssl/CA-Brehm/stunnel/stunnel-cert.cnf
new file mode 100644 (file)
index 0000000..dabb192
--- /dev/null
@@ -0,0 +1,22 @@
+RANDFILE = /usr/share/webmail.rand
+
+[ req ]
+default_bits = 1024
+encrypt_key = yes
+distinguished_name = req_dn
+x509_extensions = cert_type
+prompt = no
+
+[ req_dn ]
+C=DE
+ST=Berlin
+L=Berlin
+O=Brehm
+OU=Frank Brehm SSL Key
+CN=myadmin.brehm-online.com
+emailAddress=frank@brehm-online.com
+
+
+[ cert_type ]
+nsCertType = server
+
diff --git a/ssl/CA-Brehm/stunnel/stunnel.rand b/ssl/CA-Brehm/stunnel/stunnel.rand
new file mode 100644 (file)
index 0000000..5f47e05
Binary files /dev/null and b/ssl/CA-Brehm/stunnel/stunnel.rand differ
index 4bc0cba56bdf02dac91fc114f97e7ade04747930..859a5808c231cbe8d9feaca6e4544d5841768d1c 100644 (file)
@@ -39,29 +39,28 @@ default_ca  = CA_default            # The default ca section
 ####################################################################
 [ CA_default ]
 
-dir            = /etc/ssl/CA-Brehm             # Where everything is kept
-
-certs          = $dir/certs                    # Where the issued certs are kept
-crl_dir                = $dir/crl                      # Where the issued crl are kept
-database       = $dir/index.txt                # database index file.
-#unique_subject        = no                            # Set to 'no' to allow creation of
-                                               # several ctificates with same subject.
-new_certs_dir  = $dir/newcerts                 # default place for new certs.
-
-certificate    = $dir/cacert.pem               # The CA certificate
-serial         = $dir/serial                   # The current serial number
-crlnumber      = $dir/crlnumber                # the current crl number
-                                               # must be commented out to leave a V1 CRL
-crl            = $dir/crl.pem                  # The current CRL
+dir            = /etc/ssl/CA-Brehm     # Where everything is kept
+certs          = $dir/certs            # Where the issued certs are kept
+crl_dir                = $dir/crl              # Where the issued crl are kept
+database       = $dir/index.txt        # database index file.
+#unique_subject        = no                    # Set to 'no' to allow creation of
+                                       # several ctificates with same subject.
+new_certs_dir  = $dir/newcerts         # default place for new certs.
+
+certificate    = $dir/cacert.pem       # The CA certificate
+serial         = $dir/serial           # The current serial number
+crlnumber      = $dir/crlnumber        # the current crl number
+                                       # must be commented out to leave a V1 CRL
+crl            = $dir/crl.pem          # The current CRL
 private_key    = $dir/private/cakey.pem        # The private key
-RANDFILE       = $dir/private/.rand            # private random number file
+RANDFILE       = $dir/private/.rand    # private random number file
 
-x509_extensions        = usr_cert                      # The extentions to add to the cert
+x509_extensions        = usr_cert              # The extentions to add to the cert
 
 # Comment out the following two lines for the "traditional"
 # (and highly broken) format.
-name_opt       = ca_default                    # Subject Name options
-cert_opt       = ca_default                    # Certificate field options
+name_opt       = ca_default            # Subject Name options
+cert_opt       = ca_default            # Certificate field options
 
 # Extension copying option: use with caution.
 # copy_extensions = copy
@@ -116,13 +115,12 @@ x509_extensions   = v3_ca # The extentions to add to the self signed cert
 
 # This sets a mask for permitted string types. There are several options. 
 # default: PrintableString, T61String, BMPString.
-# pkix  : PrintableString, BMPString.
-# utf8only: only UTF8Strings.
+# pkix  : PrintableString, BMPString (PKIX recommendation before 2004)
+# utf8only: only UTF8Strings (PKIX recommendation after 2004).
 # nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
 # MASK:XXXX a literal mask value.
-# WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
-# so use this option with caution!
-string_mask = nombstr
+# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+string_mask = utf8only
 
 # req_extensions = v3_req # The extensions to add to a certificate request
 
@@ -147,7 +145,7 @@ localityName                        = Locality Name (eg, city)
 organizationalUnitName         = Organizational Unit Name (eg, section)
 #organizationalUnitName_default        =
 
-commonName                     = Common Name (eg, YOUR name)
+commonName                     = Common Name (e.g. server FQDN or YOUR name)
 commonName_max                 = 64
 
 emailAddress                   = Email Address
@@ -213,6 +211,9 @@ authorityKeyIdentifier=keyid,issuer
 #nsCaPolicyUrl
 #nsSslServerName
 
+# This is required for TSA certificates.
+# extendedKeyUsage = critical,timeStamping
+
 [ v3_req ]
 
 # Extensions to add to a certificate request
@@ -230,7 +231,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 
 subjectKeyIdentifier=hash
 
-authorityKeyIdentifier=keyid:always,issuer:always
+authorityKeyIdentifier=keyid:always,issuer
 
 # This is what PKIX recommends but some broken software chokes on critical
 # extensions.
@@ -263,7 +264,7 @@ basicConstraints = CA:true
 # Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
 
 # issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always,issuer:always
+authorityKeyIdentifier=keyid:always
 
 [ proxy_cert_ext ]
 # These extensions should be added when creating a proxy certificate
@@ -296,7 +297,7 @@ nsComment                   = "OpenSSL Generated Certificate"
 
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer:always
+authorityKeyIdentifier=keyid,issuer
 
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
index 01212b45753a3cb6f36e4ac6f53ebf8c06d74c04..18760c6e673d76ea7d83995e7b6dc5ec48839adb 100644 (file)
@@ -39,29 +39,28 @@ default_ca  = CA_default            # The default ca section
 ####################################################################
 [ CA_default ]
 
-dir            = ./demoCA                      # Where everything is kept
-
-certs          = $dir/certs                    # Where the issued certs are kept
-crl_dir                = $dir/crl                      # Where the issued crl are kept
-database       = $dir/index.txt                # database index file.
-#unique_subject        = no                            # Set to 'no' to allow creation of
-                                               # several ctificates with same subject.
-new_certs_dir  = $dir/newcerts                 # default place for new certs.
-
-certificate    = $dir/cacert.pem               # The CA certificate
-serial         = $dir/serial                   # The current serial number
-crlnumber      = $dir/crlnumber                # the current crl number
-                                               # must be commented out to leave a V1 CRL
-crl            = $dir/crl.pem                  # The current CRL
-private_key    = $dir/private/cakey.pem        # The private key
-RANDFILE       = $dir/private/.rand            # private random number file
-
-x509_extensions        = usr_cert                      # The extentions to add to the cert
+dir            = ./demoCA              # Where everything is kept
+certs          = $dir/certs            # Where the issued certs are kept
+crl_dir                = $dir/crl              # Where the issued crl are kept
+database       = $dir/index.txt        # database index file.
+#unique_subject        = no                    # Set to 'no' to allow creation of
+                                       # several ctificates with same subject.
+new_certs_dir  = $dir/newcerts         # default place for new certs.
+
+certificate    = $dir/cacert.pem       # The CA certificate
+serial         = $dir/serial           # The current serial number
+crlnumber      = $dir/crlnumber        # the current crl number
+                                       # must be commented out to leave a V1 CRL
+crl            = $dir/crl.pem          # The current CRL
+private_key    = $dir/private/cakey.pem# The private key
+RANDFILE       = $dir/private/.rand    # private random number file
+
+x509_extensions        = usr_cert              # The extentions to add to the cert
 
 # Comment out the following two lines for the "traditional"
 # (and highly broken) format.
-name_opt       = ca_default                    # Subject Name options
-cert_opt       = ca_default                    # Certificate field options
+name_opt       = ca_default            # Subject Name options
+cert_opt       = ca_default            # Certificate field options
 
 # Extension copying option: use with caution.
 # copy_extensions = copy
@@ -146,7 +145,7 @@ localityName                        = Locality Name (eg, city)
 organizationalUnitName         = Organizational Unit Name (eg, section)
 #organizationalUnitName_default        =
 
-commonName                     = Common Name (eg, YOUR name)
+commonName                     = Common Name (e.g. server FQDN or YOUR name)
 commonName_max                 = 64
 
 emailAddress                   = Email Address
index 922c067cf74a7af0b9ec2d5813627250fbeb93d3..3415fc07e32fff06dafcf5d50b325a4a644bd356 100644 (file)
@@ -9,10 +9,10 @@ language.dat.d
 language.dat.lua.d
 language.def.d
 ls-R
-texdoc.d
 texmf.d
 updmap.d
 web2c
+web2c.d
 
 ./dvipdfm:
 config
@@ -41,9 +41,6 @@ format.texlive-latex.cnf
 .keep_app-text_texlive-core-0
 
 
-./texdoc.d:
-texdoc.cnf
-
 ./texmf.d:
 00header.cnf
 05searchpaths.cnf
@@ -52,14 +49,18 @@ texdoc.cnf
 20sizes.cnf
 
 ./updmap.d:
-.keep_app-text_texlive-core-0
 00updmap.cfg
+.keep_app-text_texlive-core-0
 texlive-basic.cfg
 texlive-fontsrecommended.cfg
 texlive-latex.cfg
 
 ./web2c:
-.keep_app-text_texlive-core-0
 fmtutil.cnf
+.keep_app-text_texlive-core-0
 texmf.cnf
 updmap.cfg
+
+./web2c.d:
+fmtutil-hdr.cnf
+updmap-hdr.cfg
diff --git a/texmf/texdoc.d/texdoc.cnf b/texmf/texdoc.d/texdoc.cnf
deleted file mode 100644 (file)
index 0d63d98..0000000
+++ /dev/null
@@ -1,414 +0,0 @@
-# texdoc.cnf
-#
-# DO NOT edit this file!
-#
-# For your personal or local setting, if you are a normal user, run 'texdoc -f'
-# and use the file indicated by a star. You may need to create it. DO NOT copy
-# the present file, please create a new one (you may want to copy/paste/edit
-# portions of the present file however, or just read it for inspiration).
-#
-# For system-wide configuration or other uses, you may want to use the other
-# files listed, see the manual (texdoc texdoc) for details. The files are read
-# in the order they are printed. If a value is set multiple times, first wins.
-#
-# In those files, you can set your preferred viewer for various formats,
-# some nice names (alias) for specific documentation, and your preferred default
-# values of texdoc's configuration settings.
-#
-# Everything after a # on a line is ignored.
-# Spaces at the beginning/end of a line, as well as empty lines, are ignored.
-#
-# For more details, see the texdoc manual (try `texdoc texdoc').
-
-### Viewer settings ###
-
-# Defaults depend on what is available on you system, as well as you desktop
-# environment.  Here are a few examples.
-#
-# %s is optional and stands for the filename.
-#
-# viewer_pdf = xpdf             # works
-# viewer_pdf = xpdf %s &        # works even better
-
-# If you want to enable support for zipped documentation (see below),
-# you may want to adapt viewer_* so that it starts a subshell:
-#
-# viewer_pdf = (xpdf %s) &
-#
-# Otherwise, the & will have no effect since the viewing command is followed by
-# some cleanup-commands for temporary files. For the same reason, %s must be the
-# last thing on your command line: (xpdf %s -option) will not work.
-#
-# WARNING: for zip support your viewer needs to be blocking, i.e. it must not
-# return immediately: otherwise the temporary file will be deleted too early.
-
-### Zipped documentation support ###
-
-# WARNING: support for zipped documents works only on Unix. Make sure that the
-# values of the associated options are adapted to your system.  Read the above
-# warning concerning viewers.
-
-# Built-in defaults (for reference):
-#
-# zipext_list   =       # (empty list)
-# rm_file       = rm -f
-# rm_dir        = rmdir
-#
-# For each "ext" in zipext_list, you must define a "unzip_ext" unzipper.
-# The unzipped data must be printed on stdout. Example:
-#
-# zipext_list = gz
-# unzip_gz = gzip -d -c
-
-### Other settings ###
-
-# Built-in defaults (for reference):
-#
-# mode = view
-#
-# interact_switch = true
-# machine_switch = false
-#
-# verbosity_level = 2   # Print: 0 nothing, 1 errors, 2 warnings, 3: infos
-# debug_list =          # the empty list
-#
-# ext_list = pdf, html, txt, ps, dvi,   # Note: empty string at end
-# badext_list = txt,                    # Note: empty string at end
-# basename_list = readme
-# badbasename_list = readme
-
-## Known suffixes for documentation
-suffix_list = doc, -doc, _doc, .doc, /doc, manual, /manual, -manual, userguide, /user_guide, -guide, -user, -man, notes
-
-### Score ###
-
-# Only results with positive scores are displayed (unless mode is 'showall').
-# Results with score <= -100 are never displayed.
-# 
-# You can adjust the score of results containing a pattern with adjscore,
-# either globally or only for specific keywords
-
-# Makefile's are never documentation, just as documents in src or source subdir
-# -1000 should be enough to kill them
-adjscore /Makefile = -1000
-adjscore /src/ = -1000
-adjscore /source/ = -1000
-
-# licence files aren't very likely to contain relevant documentation, but it
-# feels wrong to totally kill them...
-adjscore copying = -10
-adjscore license = -10
-adjscore gpl = -10
-
-# tex-virtual-academy provides a lot of fake matches
-adjscore /tex-virtual-academy-pl/ = -50
-
-# test and example files are not likely the best documentation
-adjscore test = -3
-adjscore example = -3
-adjscore sample = -3
-
-# readme's usually deserve a negative score because they have a bad extension,
-# but they're still slightly better than other results with negative scores...
-adjscore readme = 0.1
-
-# Uncomment this to make the man pages have a greater priority
-#adjscore .man1. = 5
-#adjscore .man5. = 5
-
-# 'texdoc' may look like "tex's documentation" but it isn't...
-adjscore(tex) texdoc = -10
-adjscore(tex) tex-gyre = -10
-adjscore(tex) tex-ps = -10
-
-# avoid too many results to be shown for 'latex'
-# package names
-adjscore(latex) guide-to-latex = -10 # only usefull with the book
-adjscore(latex) latex-web-companion = -10
-adjscore(latex) tufte-latex = -10
-adjscore(latex) cweb-latex = -10
-adjscore(latex) duerer-latex = -10
-adjscore(latex) cjw-latex = -10
-adjscore(latex) ocr-latex = -10
-# file names
-adjscore(latex) Content_LaTeX_Package_Demo = -10
-adjscore(latex) example_latex = -10
-adjscore(latex) test_latex = -10
-
-# beamer
-adjscore(beamer) beamer-tut-pt = -10
-adjscore(beamer) beamer-tut-pt/tutorialbeamer = +10
-adjscore(beamer) presentations = -10
-adjscore(beamer) beamer-FUBerlin = -3
-
-# context
-adjscore(context) circuitikz = -10
-
-# it is also possible to set the score directly in alias directives
-# eg, fontinstallationguide is related to fontinst:
-alias(0.1) fontinst = fontinstallationguide
-
-### Aliases ###
-
-## Essential documentation
-
-alias live = texlive-en
-alias texlive = texlive-en
-alias latex = latex-doc-ptr
-
-## various stuff
-
-# a few useful general documents
-alias faq-en = newfaq
-alias faq = newfaq
-adjscore(symbols) /staves/ = -5
-
-# various lshort translations
-adjscore(lshort) /lshort-english/ = +3  # original
-alias lshort-de = l2kurz                # german
-alias lshort-pl = lshort-polish/lshort2e # polish
-alias lshort-pt = ptlshort              # portuguese
-alias lshort-sk = slshorte              # slovak
-alias lshort-es = lshort-spanish/lshort # spanish
-
-# *TeX engines reference manuals, man pages and related
-alias e-tex-ref = etex_man
-alias etex-ref = etex_man
-alias pdftex-ref = pdftex-a
-alias luatex-ref = luatexref-t
-alias etex-man = etex.man1
-alias pdftex-man = pdftex.man1
-#alias xetex-man = xetex.man1 # should exist...
-alias luatex-man = luatex.man1
-alias luatex-pkg = oberdiek/luatex.pdf
-
-# by default, <engine> = <engine>-ref (duplicated: no alias cascading)
-alias e-tex = etex_man
-alias etex = etex_man
-alias xetex = XeTeX-reference
-alias luatex = luatexref-t
-
-# latex/basic classes
-alias article = classes
-alias report = classes
-alias book = classes
-#alias ltxguide = ???
-#alias minimal = ???
-adjscore(minimal) europecv = -1000 # false positive
-
-# latex/basic packages, grouped by dtx
-alias bezier = latex209
-alias fleqn = latex209
-alias leqno = latex209
-alias openbib = latex209
-alias t1enc = latex209
-alias fix-cm = fixltx2e
-alias flafter = source2e
-alias tracefnt = source2e
-alias fontenc = source2e
-alias textcomp = source2e
-alias(20) fontenc = encguide
-alias(20) textcomp = encguide
-alias makeidx = makeindx
-alias showidx = makeindx
-alias letter = base/letter
-alias slides = base/slides
-alias shortvrb = base/doc
-alias doc = base/doc
-# TODO: try to avoid the huge amount of false positives for `doc' itself.
-
-# latex's required graphics bundle
-alias graphics = grfguide
-alias graphicx = grfguide
-alias color = grfguide
-alias epsfig = grfguide
-
-# latex's required psnfss2e bundle
-alias mathpazo = psnfss2e
-alias mathptmx = psnfss2e
-alias helvet = psnfss2e
-alias avant = psnfss2e
-alias courier = psnfss2e
-alias chancery = psnfss2e
-alias bookman = psnfss2e
-alias newcent = psnfss2e
-alias charter = psnfss2e
-alias times = psnfss2e
-alias palatino = psnfss2e
-alias mathptm = psnfss2e
-alias mathpple = psnfss2e
-alias utopia = psnfss2e 
-
-# ams
-alias amsmath = amsldoc
-alias amsthm = amsthdoc
-alias amsfonts = amsfndoc
-alias amsrefs = amsrdoc
-alias amslatex2 = technote
-#
-alias amsmath-dev = amsmath
-alias amscls-dev = amsclass
-alias amsart-dev = amsclass
-alias amsproc-dev = amsclass
-alias amsbook-dev = amsclass
-
-# koma-script
-alias koma-script = scrguien
-alias koma = scrguien
-alias scrartcl = scrguien
-alias scrreprt = scrguien
-alias scrbook = scrguien
-alias typearea = scrguien
-alias koma-script-de = scrguide
-alias koma-de = scrguide
-alias scrartcl-de = scrguide
-alias scrreprt-de = scrguide
-alias scrbook-de = scrguide
-alias typearea-de = scrguide
-
-# tugboat package and classes
-alias tugboat = ltubguid
-
-# caption
-alias caption = caption-eng
-alias caption-dev = caption.pdf
-
-# misc
-alias hyperref = hyperref/manual.pdf
-alias hyperref-dev = hyperref.pdf
-alias bibtex = btxdoc
-alias metapost = mpman
-alias(5) metapost = mpintro
-alias(5) metapost = mpgraph
-alias iso = isoman
-alias pstricks = pstricks-doc
-alias xstring-fr = xstring_doc_fr
-alias isomath = isomath.sty.pdf
-alias elsarticle = elsdoc
-alias afoot = arabtex-doc
-alias vntex = vntex # umbrella document (manual comes first due to catalogue)
-alias asymptote = asymptote # not mentioned in the catalogue currently
-alias nonfloat = nonfloat-en
-alias nonfloat-de = nonfloat
-alias subdocs = bezos
-alias dotlessi = bezos
-alias checkend = bezos
-alias arabicfont = bezos
-alias cm-super = cm-super/README
-alias cmsuper = cm-super/README
-alias(5) cmsuper = cm-super/FAQ
-alias cyrillic = cyrillic/00readme.txt
-
-## a few easy patterns
-
-# egrep 'manual\.pdf\>'
-alias t-angles = t-manual
-alias tree-dvips = tree-manual
-
-# egrep 'user\.pdf\>'
-alias cweb-latex = cweb-user
-
-# egrep 'doc\.pdf\>'
-alias barcode = eandoc.pdf
-alias enctex-cz = encdoc
-alias jurabib-de = jbgerdoc
-alias ofs = ofsdoc-e
-alias ofs-cz = ofsdoc
-alias pst-geo = pst-map3d-doc
-alias german = gerdoc
-alias ngerman = gerdoc
-alias pst-eucl = pst-eucl/euclide_english
-alias pst-eucl-fr = pst-eucl/euclide
-
-## aliases basically borrowed from texdoctk.dat with some adaptations
-
-alias texguide = usrguide
-alias lehman = fontinstallationguide
-alias uktugfaq = newfaq
-alias datenumber-de = datenumber/docgerman
-alias index = ind
-alias psnfss = psnfss2e
-alias euro = eurosamp
-alias lmfonts = lm-info
-alias dutch = rapdoc
-alias montex = mlsquick
-alias(60) akademia = tex-virtual-academy-pl/index.html
-alias otibet = otibet/unidoc
-alias startex = startex/base/guide
-alias apmgraph = pmgraph
-alias tikz = pgfmanual
-alias treetex = tree_doc
-alias(5) xypic = xyrefer
-alias pbdiagram = pb-manual
-alias expressg = expeg
-alias arydshln = arydshln-man
-alias natbib2 = natnotes
-alias tangles = t-angles/t-manual
-alias mathenv = mdwtab
-alias gnlogic = gn-logic14
-alias labels(1) = envlab/elguide
-alias lineno = ulineno
-alias akletter = akletter/lettereng
-alias mltex = mltex/mltex.txt
-alias flcards = flashcards
-alias tex4ht = tex4ht/mn.html
-alias ppower4 = ppower4/report
-alias latex3 = ltx3info
-alias musictex = musicdoc
-alias kluwer = kluwer/usrman
-alias cv = curve/curve
-alias preprint = preprint/00readme.txt
-alias onrannual = onrannual/README
-
-## packages from ctan/macros/latex/contrib/misc or with doc in .sty only
-
-# the score used is 4.1 because:
-# - it is less than 4.5, the default score of foobar/foobar.pdf for name foobar
-# - it is greater than the worse false positive here (.../VERSION for version)
-#
-# Anyway, this is a hopefully a temporary measure, since work is going on to
-# produce suitable documentation for all these packages (thanks to Philipp
-# Stephani and Robin Fairbairns mostly).
-
-alias(4.1) 3parttable = 3parttable.sty
-alias(4.1) bibcheck = bibcheck.sty
-alias(4.1) concrete = concrete.sty
-alias(4.1) linsys = linsys.sty
-alias(4.1) mitpress = mitpress.sty
-alias(4.1) morefloats = morefloats.sty
-alias(4.1) nextpage = nextpage.sty
-alias(4.1) parskip = parskip.sty
-alias(4.1) path = path.sty
-alias(4.1) printlen = printlen.sty
-alias(4.1) relsize = relsize.sty
-alias(4.1) romanneg = romanneg.sty
-alias(4.1) secdot = secdot.sty
-alias(4.1) section = section.sty
-alias(4.1) selectp = selectp.sty
-alias(4.1) sepnum = sepnum.sty
-alias(4.1) shadow = shadow.sty
-alias(4.1) showtags = showtags.sty
-alias(4.1) sphack = sphack.sty
-alias(4.1) statex2 = statex2.sty
-alias(4.1) statex = statex.sty
-alias(4.1) subfigmat = subfigmat.sty
-alias(4.1) texilikecover = texilikecover.sty
-alias(4.1) thrmappendix = thrmappendix.sty
-alias(4.1) topcapt = topcapt.sty
-alias(4.1) varwidth = varwidth.sty
-alias(4.1) verbasef = verbasef.sty
-alias(4.1) version = version.sty
-alias(4.1) vertbars = vertbars.sty
-alias(4.1) vrbexin = vrbexin.sty
-alias(4.1) wrapfig = wrapfig.sty
-alias(0) theoremref = theoremref.sty
-alias(0) shadethm = shadethm.sty
-
-# The next line has no effect when this file is installed as the last
-# configuration file (default) but is useful when you install it as the "tricky"
-# configuration file (usually TEXMFHOME/texdoc/texdoc-dist.cnf) whose mere
-# existence is a hack to make it easier to run the the development version, see
-# <http://tug.org/texdoc/dev/>.
-#
-# It is strongly recommended NOT to use it in any other circumstance.
-lastfile_switch = true
index b8cccf0bea2a182f8b5f228297f7e191d7b33997..1b91171cf0cb5411b8e42d98387b95062896c9c2 100644 (file)
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Oct  3 04:04:52 2010
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 31 04:12:04 2011
 # $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $
 # 
 # The full updmap.cfg is generated by concatenating updmap-hdr.cfg with
@@ -125,11 +125,15 @@ dvipdfmDownloadBase14 true
 #! Map auncial.map
 #! Map aurical.map
 #! Map ybv.map
+#! MixedMap bbold.map
 #! Map belleek.map
 #! Map bera.map
 #! Map ybd.map
+#! Map sqrcaps.map
+#! Map boondox.map
 #! Map pbsi.map
 #! Map burmese.map
+#! Map cantarell.map
 #! Map cmin.map
 #! MixedMap cbgreek-full.map
 #! MixedMap ccpl.map
@@ -147,19 +151,23 @@ dvipdfmDownloadBase14 true
 #! MixedMap cm-super-x2.map
 #! Map cmcyr.map
 #! MixedMap cmll.map
+#! Map comfortaa.map
+#! Map original-context-symbol.map
 #! MixedMap csother.map
 #! MixedMap cstext.map
 #! Map cyklop.map
 #! Map dictsym.map
 #! Map dstroke.map
+#! Map droid.map
 #! Map yes.map
 #! Map epigrafica.map
 #! Map epiolmec.map
 #! MixedMap esint.map
+#! Map ESSTIX.map
 #! Map esvect.map
 #! MixedMap ethiop.map
-#! Map zpeu.map
 #! MixedMap eurosym.map
+#! Map fdsymbol.map
 #! Map fge.map
 #! Map foekfont.map
 #! Map fonetika.map
@@ -175,7 +183,6 @@ dvipdfmDownloadBase14 true
 #! Map gfsporson.map
 #! Map gfssolomos.map
 #! Map yfrak.map
-#! Map troff-updmap.map
 #! Map ugq.map
 #! Map grverb.map
 #! MixedMap hfbright.map
@@ -209,6 +216,7 @@ dvipdfmDownloadBase14 true
 #! Map knitfont.map
 #! Map kpfonts.map
 #! Map kurier.map
+#! Map lato.map
 #! Map libertine.map
 #! Map yly.map
 #! Map linearA.map
@@ -217,15 +225,18 @@ dvipdfmDownloadBase14 true
 #! MixedMap lxfonts.map
 #! MixedMap manfnt.map
 #! Map marvosym.map
+#! Map mathabx.map
 #! Map mdbch.map
 #! Map mdput.map
 #! Map mdugm.map
+#! Map troff-updmap.map
 #! MixedMap mflogo.map
 #! Map MnSymbol.map
 #! MixedMap mongolian.map
 #! MixedMap musix.map
 #! Map norasi-c90.map
 #! Map cherokee.map
+#! Map ocrb.map
 #! Map oinuit.map
 #! Map omega.map
 #! Map phaistos.map
@@ -233,10 +244,13 @@ dvipdfmDownloadBase14 true
 #! MixedMap plother.map
 #! MixedMap pltext.map
 #! Map ap.map
+#! Map prodint.map
 #! Map charter.map
 #! Map fpls.map
 #! Map pazo.map
 #! Map utopia.map
+#! Map PTSans-type1.map
+#! Map PTSerif-type1.map
 #! Map pxfonts.map
 #! Map recycle.map
 #! Map yrd.map
@@ -248,6 +262,7 @@ dvipdfmDownloadBase14 true
 #! Map icelandic.map
 #! MixedMap stmaryrd.map
 #! Map tabvar.map
+Map mathpple.map
 #! Map qag.map
 #! Map qbk.map
 #! Map qcr.map
@@ -256,6 +271,7 @@ dvipdfmDownloadBase14 true
 #! Map qpl.map
 #! Map qtm.map
 #! Map qzc.map
+#! Map tfrupee.map
 #! MixedMap tipa.map
 #! MixedMap trajan.map
 #! Map txfonts.map
@@ -286,4 +302,3 @@ dvipdfmDownloadBase14 true
 #! MixedMap wasy.map
 #! MixedMap xypic.map
 #! MixedMap yhmath.map
-#! Map slantcm.map
index 77e93759ded9238694f31d5f24c0047074da744f..5584bf7a95c49afd10e1aa56f599aab2d25688e2 100644 (file)
@@ -4,7 +4,6 @@ MixedMap cm-super-t2b.map
 MixedMap cm-super-t2c.map
 MixedMap cm-super-ts1.map
 MixedMap cm-super-x2.map
-Map zpeu.map
 MixedMap eurosym.map
 Map lm.map
 Map marvosym.map
diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf
new file mode 100644 (file)
index 0000000..1d93173
--- /dev/null
@@ -0,0 +1,35 @@
+# $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $
+# Originally written by Thomas Esser, 1998. Public domain.
+#
+# As of TeX Live 2008, the final fmtutil.cnf is generated by
+# tlmgr generate fmtutil.  You can use
+# tlmgr generate fmtutil -localcfg /some/file to make local additions.
+# See tlmgr --help for more info.
+#
+# The format of the table is:
+#
+# format  engine  pattern-file  arguments
+#
+# The last "argument" must be the name of the file on which to run
+# the ini-engine (such as initex).  If the ini-engine is e-TeX, and the
+# e-TeX extensions should be enabled, the filename must be prefixed with
+# a * character.
+# 
+# fmtutil always passes the -ini option to the engine.
+# If no pattern-file is desired, use -.
+# Either spaces or tabs can be used as separators.
+# 
+# Other notes:
+# 1) tex and amstex just load hyphen.tex. No customization.
+#    You can have your own customized (via babel's hyphen.cfg)
+#    formats on top of plain by using "bplain.tex" instead of
+#    plain.tex (see e.g. bplain.ini file for bplain format).
+#
+# 2) etex-based formats load language.def, not language.dat.
+#
+# 3) The symbolic link to the right engines (e.g. bplain -> tex)
+#    is generated by the "texlinks" script.
+# 
+# 4) usual comments start with "# ", whereas disabled configurations
+#    start with "#! " in this file.
+
diff --git a/texmf/web2c.d/updmap-hdr.cfg b/texmf/web2c.d/updmap-hdr.cfg
new file mode 100644 (file)
index 0000000..68bdc36
--- /dev/null
@@ -0,0 +1,101 @@
+# $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $
+# 
+# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with
+# all the Map and MixedMap lines from an installation, possibly
+# appending a local configuration file.
+#
+# To make local customizations to the map files, please use of the
+# following methods:
+#
+# 1) call 
+#       updmap-sys --enable Map=foo.map
+#    for each map file.  (Or MixedMap instead of Map, if your font has
+#    both Metafont and outline definitions.)  See the updmap --help
+#    documentation.
+#
+# 2) add your local map entries to the file
+#       TEXMFLOCAL/web2c/updmap-local.cfg
+#    and then call
+#       tlmgr generate updmap
+#    which will concatenate updmap-local.cfg to the end of the final
+#    updmap.cfg.  (You can override the local.cfg file location with the
+#    --localcfg option; see tlmgr --help.)
+#
+# If you use either of these methods, your local adaptations will be
+# preserved when tlmgr updates the installation or this config file.
+# Manual edits to updmap.cfg may be lost on update.
+
+
+################################################################
+# OPTIONS
+################################################################
+
+#
+# dvipsPreferOutline
+#
+# Should dvips (by default) prefer bitmap fonts or outline fonts
+# if both are available? Independent of this setting, outlines
+# can be forced by putting "p psfonts_t1.map" into a config file
+# that dvips reads. Bitmaps (for the fonts in question) can
+# be forced by putting "p psfonts_pk.map" into a config file.
+# We provide such config files which can be enabled via
+# dvips -Poutline ... resp. dvips -Ppk ...
+#
+# Valid settings for dvipsPreferOutline are true / false:
+dvipsPreferOutline true
+
+#
+# LW35
+#
+# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and
+# how are the filenames chosen? Valid settings:
+#   URW:     URW fonts with "vendor" filenames (e.g. n019064l.pfb)
+#   URWkb:   URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb)
+#   ADOBE:   Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
+#   ADOBEkb: Adobe fonts with  "berry" filenames (e.g. phvbo8an.pfb)
+LW35 URWkb
+
+#
+# dvipsDownloadBase35
+# 
+# Should dvips (by default) download the standard 35 LaserWriter fonts
+# with the document (then set dvipsDownloadBase35 true) or should these
+# fonts be used from the ps interpreter / printer?
+# Whatever the default is, the user can override it by specifying
+# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download
+# the LW35 fonts resp. use the built-in fonts.
+#
+# Valid settings are true / false:
+dvipsDownloadBase35 false
+
+#
+# pdftexDownloadBase14
+#
+# Should pdftex download the base 14 pdf fonts? Since some configurations
+# (ps / pdf tools / printers) use bad default fonts, it is safer to download
+# the fonts. The pdf files will get bigger, though.
+# Valid settings are true (download the fonts) or false (don't download
+# the fonts). Adobe recommends embedding all fonts.
+pdftexDownloadBase14 true
+
+#
+# dvipdfmDownloadBase14
+#
+# Should dvipdfm download the base 14 pdf fonts? Since some configurations
+# (ps / pdf tools / printers) use bad default fonts, it is safer to download
+# the fonts. The pdf files will get bigger, though.
+# Valid settings are true (download the fonts) or false (don't download
+# the fonts).
+dvipdfmDownloadBase14 true
+
+################################################################
+# Map files.
+################################################################
+#
+# There are two possible entries: Map and MixedMap. Both have one additional
+# argument: the filename of the map file. MixedMap ("mixed" means that
+# the font is available as bitmap and as outline) lines will not be used
+# in the default map of dvips if dvipsPreferOutline is false. Inactive
+# Map files should be marked by "#! " (without the quotes), not just #.
+#
+
index 1e4a29a9cda5de4af801b04d418c10f4bd7c04a0..18112a988e1b9b2841f802ecb007cbeb1e9d3241 100644 (file)
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Oct  3 04:04:52 2010
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 31 04:12:04 2011
 # $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $
 # 
 # The full updmap.cfg is generated by concatenating updmap-hdr.cfg with
@@ -125,11 +125,15 @@ dvipdfmDownloadBase14 true
 #! Map auncial.map
 #! Map aurical.map
 #! Map ybv.map
+#! MixedMap bbold.map
 #! Map belleek.map
 #! Map bera.map
 #! Map ybd.map
+#! Map sqrcaps.map
+#! Map boondox.map
 #! Map pbsi.map
 #! Map burmese.map
+#! Map cantarell.map
 #! Map cmin.map
 #! MixedMap cbgreek-full.map
 #! MixedMap ccpl.map
@@ -147,19 +151,23 @@ dvipdfmDownloadBase14 true
 #! MixedMap cm-super-x2.map
 #! Map cmcyr.map
 #! MixedMap cmll.map
+#! Map comfortaa.map
+#! Map original-context-symbol.map
 #! MixedMap csother.map
 #! MixedMap cstext.map
 #! Map cyklop.map
 #! Map dictsym.map
 #! Map dstroke.map
+#! Map droid.map
 #! Map yes.map
 #! Map epigrafica.map
 #! Map epiolmec.map
 #! MixedMap esint.map
+#! Map ESSTIX.map
 #! Map esvect.map
 #! MixedMap ethiop.map
-#! Map zpeu.map
 #! MixedMap eurosym.map
+#! Map fdsymbol.map
 #! Map fge.map
 #! Map foekfont.map
 #! Map fonetika.map
@@ -175,7 +183,6 @@ dvipdfmDownloadBase14 true
 #! Map gfsporson.map
 #! Map gfssolomos.map
 #! Map yfrak.map
-#! Map troff-updmap.map
 #! Map ugq.map
 #! Map grverb.map
 #! MixedMap hfbright.map
@@ -209,6 +216,7 @@ dvipdfmDownloadBase14 true
 #! Map knitfont.map
 #! Map kpfonts.map
 #! Map kurier.map
+#! Map lato.map
 #! Map libertine.map
 #! Map yly.map
 #! Map linearA.map
@@ -217,15 +225,18 @@ dvipdfmDownloadBase14 true
 #! MixedMap lxfonts.map
 #! MixedMap manfnt.map
 #! Map marvosym.map
+#! Map mathabx.map
 #! Map mdbch.map
 #! Map mdput.map
 #! Map mdugm.map
+#! Map troff-updmap.map
 #! MixedMap mflogo.map
 #! Map MnSymbol.map
 #! MixedMap mongolian.map
 #! MixedMap musix.map
 #! Map norasi-c90.map
 #! Map cherokee.map
+#! Map ocrb.map
 #! Map oinuit.map
 #! Map omega.map
 #! Map phaistos.map
@@ -233,10 +244,13 @@ dvipdfmDownloadBase14 true
 #! MixedMap plother.map
 #! MixedMap pltext.map
 #! Map ap.map
+#! Map prodint.map
 #! Map charter.map
 #! Map fpls.map
 #! Map pazo.map
 #! Map utopia.map
+#! Map PTSans-type1.map
+#! Map PTSerif-type1.map
 #! Map pxfonts.map
 #! Map recycle.map
 #! Map yrd.map
@@ -248,6 +262,7 @@ dvipdfmDownloadBase14 true
 #! Map icelandic.map
 #! MixedMap stmaryrd.map
 #! Map tabvar.map
+Map mathpple.map
 #! Map qag.map
 #! Map qbk.map
 #! Map qcr.map
@@ -256,6 +271,7 @@ dvipdfmDownloadBase14 true
 #! Map qpl.map
 #! Map qtm.map
 #! Map qzc.map
+#! Map tfrupee.map
 #! MixedMap tipa.map
 #! MixedMap trajan.map
 #! Map txfonts.map
@@ -286,7 +302,6 @@ dvipdfmDownloadBase14 true
 #! MixedMap wasy.map
 #! MixedMap xypic.map
 #! MixedMap yhmath.map
-#! Map slantcm.map
 Map      euler.map
 MixedMap cmextra.map
 MixedMap cm.map
@@ -301,7 +316,6 @@ MixedMap cm-super-t2b.map
 MixedMap cm-super-t2c.map
 MixedMap cm-super-ts1.map
 MixedMap cm-super-x2.map
-Map zpeu.map
 MixedMap eurosym.map
 Map lm.map
 Map marvosym.map
diff --git a/xdg/autostart/gnome-keyring-gpg.desktop b/xdg/autostart/gnome-keyring-gpg.desktop
new file mode 100644 (file)
index 0000000..342bafa
--- /dev/null
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+Name=GPG Password Agent
+Name[de]=GPG-Passwort-Agent
+Name[en_GB]=GPG Password Agent
+Comment=GNOME Keyring: GPG Agent
+Comment[de]=GNOME-Schlüsselbunddienst: GPG-Agent
+Comment[en_GB]=GNOME Keyring: GPG Agent
+Exec= gnome-keyring-daemon --start --components=gpg
+OnlyShowIn=GNOME;LXDE;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=2.32.1
diff --git a/xdg/autostart/gnome-keyring-pkcs11.desktop b/xdg/autostart/gnome-keyring-pkcs11.desktop
new file mode 100644 (file)
index 0000000..97f3ba3
--- /dev/null
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+Name=Certificate and Key Storage
+Name[de]=Zertifikat-/Schlüsselverwahrung
+Name[en_GB]=Certificate and Key Storage
+Comment=GNOME Keyring: PKCS#11 Component
+Comment[de]=GNOME-Schlüsselbunddienst: PKCS#11-Komponente
+Comment[en_GB]=GNOME Keyring: PKCS#11 Component
+Exec=/usr/bin/gnome-keyring-daemon --start --components=pkcs11
+OnlyShowIn=GNOME;LXDE;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=2.32.1
diff --git a/xdg/autostart/gnome-keyring-secrets.desktop b/xdg/autostart/gnome-keyring-secrets.desktop
new file mode 100644 (file)
index 0000000..a8b8d03
--- /dev/null
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+Name=Secret Storage Service
+Name[de]=Sicherheitsdienst
+Name[en_GB]=Secret Storage Service
+Comment=GNOME Keyring: Secret Service
+Comment[de]=GNOME-Schlüsselbunddienst: Sicherheitsdienst
+Comment[en_GB]=GNOME Keyring: Secret Service
+Exec=/usr/bin/gnome-keyring-daemon --start --components=secrets
+OnlyShowIn=GNOME;LXDE;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=2.32.1
diff --git a/xdg/autostart/gnome-keyring-ssh.desktop b/xdg/autostart/gnome-keyring-ssh.desktop
new file mode 100644 (file)
index 0000000..5ed5734
--- /dev/null
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+Name=SSH Key Agent
+Name[de]=SSH-Schlüsselagent
+Name[en_GB]=SSH Key Agent
+Comment=GNOME Keyring: SSH Agent
+Comment[de]=GNOME-Schlüsselbunddienst: SSH-Agent
+Comment[en_GB]=GNOME Keyring: SSH Agent
+Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
+OnlyShowIn=GNOME;LXDE;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=2.32.1
diff --git a/xdg/autostart/gsettings-data-convert.desktop b/xdg/autostart/gsettings-data-convert.desktop
new file mode 100644 (file)
index 0000000..0a027f4
--- /dev/null
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=GSettings Data Conversion
+Name[de]=GSettings-Datenumwandlung
+Name[en_GB]=GSettings Data Conversion
+Comment=Migrates user settings from GConf to dconf
+Comment[de]=Migriert Benutzereinstellungen von GConf zu dconf
+Comment[en_GB]=Migrates user settings from GConf to dconf
+Exec=gsettings-data-convert
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Phase=Initialization