From 3630da500e61fb77749735c5446968b451a7872d Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 31 Aug 2015 11:41:26 +0200 Subject: [PATCH] Current state --- .etckeeper | 43 +- DIR_COLORS | 15 +- anacrontab | 16 - apache2/modules.d/00_apache_manual.conf | 4 +- bash_completion.d/alias | 1 - bash_completion.d/apache2ctl | 1 - bash_completion.d/aspell | 1 - bash_completion.d/base | 1 - bash_completion.d/blockdev | 1 - bash_completion.d/brctl | 1 - bash_completion.d/bzip2 | 1 - bash_completion.d/cal | 1 - bash_completion.d/chage | 1 - bash_completion.d/chown | 1 - bash_completion.d/configure | 1 - bash_completion.d/convert | 1 - bash_completion.d/cpio | 1 - bash_completion.d/crontab | 1 - bash_completion.d/curl | 1 - bash_completion.d/dd | 1 - bash_completion.d/dmesg | 1 - bash_completion.d/eix | 1 - bash_completion.d/eog | 1 - bash_completion.d/eselect | 1 - bash_completion.d/export | 1 - bash_completion.d/fdisk | 1 - bash_completion.d/figlet.bashcomp | 1 - bash_completion.d/file | 1 - bash_completion.d/find | 1 - bash_completion.d/flock | 1 - bash_completion.d/fsck | 1 - bash_completion.d/gcc | 1 - bash_completion.d/genlop | 1 - bash_completion.d/getent | 1 - bash_completion.d/git | 1 - bash_completion.d/gpg | 1 - bash_completion.d/groupadd | 1 - bash_completion.d/groupdel | 1 - bash_completion.d/groupmems | 1 - bash_completion.d/groupmod | 1 - bash_completion.d/gzip | 1 - bash_completion.d/hexdump | 1 - bash_completion.d/htop | 1 - bash_completion.d/htpasswd | 1 - bash_completion.d/iconv | 1 - bash_completion.d/info | 1 - bash_completion.d/ip | 1 - bash_completion.d/iptables | 1 - bash_completion.d/kill | 1 - bash_completion.d/killall | 1 - bash_completion.d/layman | 1 - bash_completion.d/ldapsearch | 1 - bash_completion.d/lftp | 1 - bash_completion.d/links | 1 - bash_completion.d/logger | 1 - bash_completion.d/losetup | 1 - bash_completion.d/lsof | 1 - bash_completion.d/lvm | 1 - bash_completion.d/lzma | 1 - bash_completion.d/lzop | 1 - bash_completion.d/make | 1 - bash_completion.d/man | 1 - bash_completion.d/mc | 1 - bash_completion.d/mdadm | 1 - bash_completion.d/mkfs | 1 - bash_completion.d/mkinitrd | 1 - bash_completion.d/mkswap | 1 - bash_completion.d/mktemp | 1 - bash_completion.d/modinfo | 1 - bash_completion.d/modprobe | 1 - bash_completion.d/more | 1 - bash_completion.d/mount | 1 - bash_completion.d/mount.linux | 1 - bash_completion.d/mysql | 1 - bash_completion.d/mysqladmin | 1 - bash_completion.d/nc | 1 - bash_completion.d/ncftp | 1 - bash_completion.d/nmap | 1 - bash_completion.d/nslookup | 1 - bash_completion.d/ntpdate | 1 - bash_completion.d/openssl | 1 - bash_completion.d/passwd | 1 - bash_completion.d/patch | 1 - bash_completion.d/perl | 1 - bash_completion.d/pgrep | 1 - bash_completion.d/ping | 1 - bash_completion.d/postcat | 1 - bash_completion.d/postconf | 1 - bash_completion.d/postfix | 1 - bash_completion.d/postmap | 1 - bash_completion.d/postsuper | 1 - bash_completion.d/psql | 1 - bash_completion.d/pwd | 1 - bash_completion.d/pwgen | 1 - bash_completion.d/python | 1 - bash_completion.d/rcs | 1 - bash_completion.d/rmmod | 1 - bash_completion.d/rrdtool | 1 - bash_completion.d/rsync | 1 - bash_completion.d/screen | 1 - bash_completion.d/sh | 1 - bash_completion.d/smartctl | 1 - bash_completion.d/ssh | 1 - bash_completion.d/ssh-add | 1 - bash_completion.d/sshfs | 1 - bash_completion.d/strace | 1 - bash_completion.d/strings | 1 - bash_completion.d/su | 1 - bash_completion.d/subversion | 1 - bash_completion.d/sudo | 1 - bash_completion.d/swapon | 1 - bash_completion.d/sysctl | 1 - bash_completion.d/tar | 1 - bash_completion.d/tcpdump | 1 - bash_completion.d/tracepath | 1 - bash_completion.d/tree | 1 - bash_completion.d/tune2fs | 1 - bash_completion.d/udevadm | 1 - bash_completion.d/umount | 1 - bash_completion.d/umount.linux | 1 - bash_completion.d/unrar | 1 - bash_completion.d/useradd | 1 - bash_completion.d/userdel | 1 - bash_completion.d/usermod | 1 - bash_completion.d/vim | 1 - bash_completion.d/vmstat | 1 - bash_completion.d/watch | 1 - bash_completion.d/wget | 1 - bash_completion.d/xxd | 1 - bash_completion.d/xz | 1 - conf.d/git-daemon | 2 +- conf.d/pydoc-3.3 | 7 - conf.d/smartd | 4 - conf.d/syslog-ng | 42 -- .../apache2/modules.d/00_apache_manual.conf | 4 +- .../apache2/modules.d/00_apache_manual.conf.1 | 8 +- .../apache2/modules.d/00_apache_manual.conf.2 | 4 +- .../apache2/modules.d/00_apache_manual.conf.3 | 4 +- .../apache2/modules.d/00_apache_manual.conf.4 | 4 +- .../apache2/modules.d/00_apache_manual.conf.5 | 6 +- .../apache2/modules.d/00_apache_manual.conf.6 | 4 +- .../apache2/modules.d/00_apache_manual.conf.7 | 26 + .../modules.d/00_apache_manual.conf.dist | 4 +- ....conf.dist.new => dispatch-conf.conf.dist} | 2 +- config-archive/etc/logrotate.conf | 23 +- config-archive/etc/logrotate.conf.1 | 4 +- config-archive/etc/logrotate.conf.2 | 52 ++ config-archive/etc/logrotate.conf.dist | 24 +- config-archive/etc/logrotate.conf.dist.new | 43 -- config-archive/etc/mysql/my.cnf | 44 +- config-archive/etc/mysql/my.cnf.1 | 146 +++++ config-archive/etc/mysql/my.cnf.dist | 45 +- .../etc/{screenrc.dist.new => screenrc.dist} | 22 +- config-archive/etc/ssh/sshd_config | 20 +- config-archive/etc/ssh/sshd_config.1 | 7 +- config-archive/etc/ssh/sshd_config.2 | 26 +- config-archive/etc/ssh/sshd_config.3 | 13 +- config-archive/etc/ssh/sshd_config.4 | 68 ++- config-archive/etc/ssh/sshd_config.5 | 134 +++++ config-archive/etc/ssh/sshd_config.dist | 9 +- config-archive/etc/ssl/openssl.cnf | 350 ++++++++++++ config-archive/etc/ssl/openssl.cnf.dist.new | 350 ++++++++++++ courier/authlib/authdaemonrc | 2 +- courier/authlib/authdaemonrc.dist | 2 +- cron.hourly/0anacron | 17 - csh.env | 1 - cups/cups-browsed.conf | 15 + dispatch-conf.conf | 3 +- env.d/60python-docs-3.3 | 1 - eselect/postgresql/slots/9.4/base | 2 +- grub.d/10_linux | 14 +- grub.d/20_linux_xen | 14 +- grub.d/30_os-prober | 3 +- init.d/git-daemon | 2 +- init.d/ip6tables | 2 +- init.d/iptables | 2 +- init.d/kmod-static-nodes | 6 +- init.d/named | 2 +- init.d/pciparm | 2 +- init.d/postgresql-9.4 | 2 +- init.d/pydoc-3.3 | 29 - init.d/smartd | 29 - init.d/sshd | 34 +- init.d/stunnel | 2 +- init.d/svnserve | 2 +- init.d/syslog-ng | 59 -- layman/layman.cfg | 1 + logrotate.conf | 2 +- logrotate.d/rsyslog | 90 ++-- logrotate.d/syslog-ng | 84 +-- mke2fs.conf | 2 +- mutt/Muttrc.dist | 104 +++- mysql/my.cnf | 4 +- mysql/my.cnf.orig | 143 +++++ php/apache2-php5.6/php.ini | 1 - php/cgi-php5.6/php.ini | 1 - php/cli-php5.6/php.ini | 1 - php/embed-php5.6/php.ini | 1 - php/fpm-php5.6/php.ini | 1 - portage/make.conf | 4 +- portage/package.use | 5 +- profile.env | 1 - rsyslog.conf | 16 +- rsyslog.d/50-default.conf | 104 ++-- rsyslog.d/60-fb.conf | 47 ++ runlevels/default/rsyslog | 1 + runlevels/default/syslog-ng | 1 - screenrc | 24 +- security/limits.conf | 2 +- security/namespace.init | 2 +- smartd.conf | 145 ----- smartd_warning.sh | 212 -------- ssh/moduli | 507 +++++++++--------- ssh/sshd_config | 73 +-- .../patterndb.d/.keep_app-admin_syslog-ng-0 | 0 syslog-ng/scl.conf | 31 -- texmf/{dvipdfmx => dvipdfmx.d}/dvipdfmx.cfg | 69 ++- texmf/fmtutil.d/format.texlive-basic.cnf | 3 +- texmf/fmtutil.d/format.texlive-latex.cnf | 3 +- texmf/ls-R | 21 +- texmf/psutils.d/paper.cfg | 3 + texmf/texmf.d/00header.cnf | 7 +- texmf/texmf.d/05searchpaths.cnf | 38 +- texmf/texmf.d/10standardpaths.cnf | 47 +- texmf/texmf.d/15options.cnf | 3 +- texmf/texmf.d/20sizes.cnf | 15 +- texmf/updmap.d/00updmap.cfg | 352 +++++++++++- texmf/updmap.d/texlive-basic.cfg | 3 +- texmf/updmap.d/texlive-fontsrecommended.cfg | 10 + texmf/web2c.d/fmtutil-hdr.cnf | 6 +- texmf/web2c.d/updmap-hdr.cfg | 88 ++- texmf/web2c/fmtutil.cnf | 6 +- texmf/web2c/texmf.cnf | 110 ++-- texmf/web2c/updmap.cfg | 365 ++++++++++++- tmpfiles.d/screen.conf | 1 + vim/vimrc | 2 +- 236 files changed, 3061 insertions(+), 1653 deletions(-) delete mode 100644 anacrontab delete mode 120000 bash_completion.d/alias delete mode 120000 bash_completion.d/apache2ctl delete mode 120000 bash_completion.d/aspell delete mode 120000 bash_completion.d/base delete mode 120000 bash_completion.d/blockdev delete mode 120000 bash_completion.d/brctl delete mode 120000 bash_completion.d/bzip2 delete mode 120000 bash_completion.d/cal delete mode 120000 bash_completion.d/chage delete mode 120000 bash_completion.d/chown delete mode 120000 bash_completion.d/configure delete mode 120000 bash_completion.d/convert delete mode 120000 bash_completion.d/cpio delete mode 120000 bash_completion.d/crontab delete mode 120000 bash_completion.d/curl delete mode 120000 bash_completion.d/dd delete mode 120000 bash_completion.d/dmesg delete mode 120000 bash_completion.d/eix delete mode 120000 bash_completion.d/eog delete mode 120000 bash_completion.d/eselect delete mode 120000 bash_completion.d/export delete mode 120000 bash_completion.d/fdisk delete mode 120000 bash_completion.d/figlet.bashcomp delete mode 120000 bash_completion.d/file delete mode 120000 bash_completion.d/find delete mode 120000 bash_completion.d/flock delete mode 120000 bash_completion.d/fsck delete mode 120000 bash_completion.d/gcc delete mode 120000 bash_completion.d/genlop delete mode 120000 bash_completion.d/getent delete mode 120000 bash_completion.d/git delete mode 120000 bash_completion.d/gpg delete mode 120000 bash_completion.d/groupadd delete mode 120000 bash_completion.d/groupdel delete mode 120000 bash_completion.d/groupmems delete mode 120000 bash_completion.d/groupmod delete mode 120000 bash_completion.d/gzip delete mode 120000 bash_completion.d/hexdump delete mode 120000 bash_completion.d/htop delete mode 120000 bash_completion.d/htpasswd delete mode 120000 bash_completion.d/iconv delete mode 120000 bash_completion.d/info delete mode 120000 bash_completion.d/ip delete mode 120000 bash_completion.d/iptables delete mode 120000 bash_completion.d/kill delete mode 120000 bash_completion.d/killall delete mode 120000 bash_completion.d/layman delete mode 120000 bash_completion.d/ldapsearch delete mode 120000 bash_completion.d/lftp delete mode 120000 bash_completion.d/links delete mode 120000 bash_completion.d/logger delete mode 120000 bash_completion.d/losetup delete mode 120000 bash_completion.d/lsof delete mode 120000 bash_completion.d/lvm delete mode 120000 bash_completion.d/lzma delete mode 120000 bash_completion.d/lzop delete mode 120000 bash_completion.d/make delete mode 120000 bash_completion.d/man delete mode 120000 bash_completion.d/mc delete mode 120000 bash_completion.d/mdadm delete mode 120000 bash_completion.d/mkfs delete mode 120000 bash_completion.d/mkinitrd delete mode 120000 bash_completion.d/mkswap delete mode 120000 bash_completion.d/mktemp delete mode 120000 bash_completion.d/modinfo delete mode 120000 bash_completion.d/modprobe delete mode 120000 bash_completion.d/more delete mode 120000 bash_completion.d/mount delete mode 120000 bash_completion.d/mount.linux delete mode 120000 bash_completion.d/mysql delete mode 120000 bash_completion.d/mysqladmin delete mode 120000 bash_completion.d/nc delete mode 120000 bash_completion.d/ncftp delete mode 120000 bash_completion.d/nmap delete mode 120000 bash_completion.d/nslookup delete mode 120000 bash_completion.d/ntpdate delete mode 120000 bash_completion.d/openssl delete mode 120000 bash_completion.d/passwd delete mode 120000 bash_completion.d/patch delete mode 120000 bash_completion.d/perl delete mode 120000 bash_completion.d/pgrep delete mode 120000 bash_completion.d/ping delete mode 120000 bash_completion.d/postcat delete mode 120000 bash_completion.d/postconf delete mode 120000 bash_completion.d/postfix delete mode 120000 bash_completion.d/postmap delete mode 120000 bash_completion.d/postsuper delete mode 120000 bash_completion.d/psql delete mode 120000 bash_completion.d/pwd delete mode 120000 bash_completion.d/pwgen delete mode 120000 bash_completion.d/python delete mode 120000 bash_completion.d/rcs delete mode 120000 bash_completion.d/rmmod delete mode 120000 bash_completion.d/rrdtool delete mode 120000 bash_completion.d/rsync delete mode 120000 bash_completion.d/screen delete mode 120000 bash_completion.d/sh delete mode 120000 bash_completion.d/smartctl delete mode 120000 bash_completion.d/ssh delete mode 120000 bash_completion.d/ssh-add delete mode 120000 bash_completion.d/sshfs delete mode 120000 bash_completion.d/strace delete mode 120000 bash_completion.d/strings delete mode 120000 bash_completion.d/su delete mode 120000 bash_completion.d/subversion delete mode 120000 bash_completion.d/sudo delete mode 120000 bash_completion.d/swapon delete mode 120000 bash_completion.d/sysctl delete mode 120000 bash_completion.d/tar delete mode 120000 bash_completion.d/tcpdump delete mode 120000 bash_completion.d/tracepath delete mode 120000 bash_completion.d/tree delete mode 120000 bash_completion.d/tune2fs delete mode 120000 bash_completion.d/udevadm delete mode 120000 bash_completion.d/umount delete mode 120000 bash_completion.d/umount.linux delete mode 120000 bash_completion.d/unrar delete mode 120000 bash_completion.d/useradd delete mode 120000 bash_completion.d/userdel delete mode 120000 bash_completion.d/usermod delete mode 120000 bash_completion.d/vim delete mode 120000 bash_completion.d/vmstat delete mode 120000 bash_completion.d/watch delete mode 120000 bash_completion.d/wget delete mode 120000 bash_completion.d/xxd delete mode 120000 bash_completion.d/xz delete mode 100644 conf.d/pydoc-3.3 delete mode 100644 conf.d/smartd delete mode 100644 conf.d/syslog-ng create mode 100644 config-archive/etc/apache2/modules.d/00_apache_manual.conf.7 rename config-archive/etc/{dispatch-conf.conf.dist.new => dispatch-conf.conf.dist} (97%) create mode 100644 config-archive/etc/logrotate.conf.2 delete mode 100644 config-archive/etc/logrotate.conf.dist.new create mode 100644 config-archive/etc/mysql/my.cnf.1 rename config-archive/etc/{screenrc.dist.new => screenrc.dist} (93%) create mode 100644 config-archive/etc/ssh/sshd_config.5 create mode 100644 config-archive/etc/ssl/openssl.cnf create mode 100644 config-archive/etc/ssl/openssl.cnf.dist.new delete mode 100755 cron.hourly/0anacron delete mode 100644 env.d/60python-docs-3.3 delete mode 100755 init.d/pydoc-3.3 delete mode 100755 init.d/smartd delete mode 100755 init.d/syslog-ng create mode 100644 mysql/my.cnf.orig create mode 100644 rsyslog.d/60-fb.conf create mode 120000 runlevels/default/rsyslog delete mode 120000 runlevels/default/syslog-ng delete mode 100644 smartd.conf delete mode 100755 smartd_warning.sh delete mode 100644 syslog-ng/patterndb.d/.keep_app-admin_syslog-ng-0 delete mode 100644 syslog-ng/scl.conf rename texmf/{dvipdfmx => dvipdfmx.d}/dvipdfmx.cfg (75%) create mode 100644 texmf/psutils.d/paper.cfg create mode 100644 tmpfiles.d/screen.conf diff --git a/.etckeeper b/.etckeeper index cbd673d..db41d33 100755 --- a/.etckeeper +++ b/.etckeeper @@ -24,11 +24,12 @@ mkdir -p './security/limits.d' mkdir -p './security/namespace.d' mkdir -p './sensors.d' mkdir -p './skel/.ssh' -mkdir -p './smartd_warning.d' mkdir -p './ssl/CA-Brehm/certs' mkdir -p './ssl/CA-Brehm/crl' mkdir -p './ssl/CA-Brehm/newcerts' mkdir -p './systemd/network' +mkdir -p './texmf/dvipdfm/config' +mkdir -p './texmf/dvips.d' mkdir -p './udev/hwdb.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' @@ -64,7 +65,6 @@ maybe chmod 0755 'alternatives' maybe chmod 0644 'alternatives/README' maybe chgrp 'amavis' 'amavisd.conf' maybe chmod 0640 'amavisd.conf' -maybe chmod 0644 'anacrontab' maybe chmod 0755 'apache2' maybe chmod 0644 'apache2/httpd.conf' maybe chmod 0644 'apache2/info_users_passwd' @@ -207,7 +207,6 @@ maybe chmod 0644 'conf.d/postgresql-9.2' maybe chmod 0644 'conf.d/postgresql-9.4' maybe chmod 0640 'conf.d/postgrey' maybe chmod 0644 'conf.d/pydoc-2.7' -maybe chmod 0644 'conf.d/pydoc-3.3' maybe chmod 0644 'conf.d/pydoc-3.4' maybe chmod 0644 'conf.d/quota' maybe chmod 0644 'conf.d/rpcbind' @@ -217,7 +216,6 @@ maybe chmod 0644 'conf.d/salt' maybe chmod 0644 'conf.d/samba' maybe chmod 0644 'conf.d/saslauthd' maybe chmod 0644 'conf.d/slapd' -maybe chmod 0644 'conf.d/smartd' maybe chmod 0644 'conf.d/snmpd' maybe chmod 0644 'conf.d/snmptrapd' maybe chmod 0644 'conf.d/sntp' @@ -225,7 +223,6 @@ maybe chmod 0644 'conf.d/spamd' maybe chmod 0644 'conf.d/sshd' maybe chmod 0644 'conf.d/staticroute' maybe chmod 0644 'conf.d/svnserve' -maybe chmod 0644 'conf.d/syslog-ng' maybe chmod 0644 'conf.d/tmpfiles' maybe chmod 0644 'conf.d/udev' maybe chmod 0644 'conf.d/ulogd' @@ -256,6 +253,7 @@ maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.3' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.4' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.5' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.6' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.7' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf.dist' @@ -326,7 +324,7 @@ maybe chmod 0644 'config-archive/etc/default/grub.1' maybe chmod 0644 'config-archive/etc/default/grub.2' maybe chmod 0644 'config-archive/etc/default/grub.dist' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf' -maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist.new' +maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist' maybe chmod 0755 'config-archive/etc/eselect' maybe chmod 0755 'config-archive/etc/eselect/postgresql' maybe chmod 0755 'config-archive/etc/eselect/postgresql/slots' @@ -411,8 +409,8 @@ maybe chmod 0440 'config-archive/etc/ldap.conf.sudo' maybe chmod 0440 'config-archive/etc/ldap.conf.sudo.dist' maybe chmod 0644 'config-archive/etc/logrotate.conf' maybe chmod 0644 'config-archive/etc/logrotate.conf.1' +maybe chmod 0644 'config-archive/etc/logrotate.conf.2' maybe chmod 0644 'config-archive/etc/logrotate.conf.dist' -maybe chmod 0644 'config-archive/etc/logrotate.conf.dist.new' maybe chmod 0755 'config-archive/etc/logrotate.d' maybe chmod 0644 'config-archive/etc/logrotate.d/clamav' maybe chmod 0644 'config-archive/etc/logrotate.d/clamav.dist' @@ -445,6 +443,7 @@ maybe chmod 0644 'config-archive/etc/mke2fs.conf' maybe chmod 0644 'config-archive/etc/mke2fs.conf.dist' maybe chmod 0755 'config-archive/etc/mysql' maybe chmod 0644 'config-archive/etc/mysql/my.cnf' +maybe chmod 0644 'config-archive/etc/mysql/my.cnf.1' maybe chmod 0644 'config-archive/etc/mysql/my.cnf.dist' maybe chmod 0755 'config-archive/etc/nagios' maybe chmod 0640 'config-archive/etc/nagios/nrpe.cfg' @@ -615,7 +614,7 @@ maybe chmod 0644 'config-archive/etc/request-key.conf.dist' maybe chmod 0644 'config-archive/etc/rkhunter.conf' maybe chmod 0644 'config-archive/etc/rkhunter.conf.dist.new' maybe chmod 0644 'config-archive/etc/screenrc' -maybe chmod 0644 'config-archive/etc/screenrc.dist.new' +maybe chmod 0644 'config-archive/etc/screenrc.dist' maybe chmod 0755 'config-archive/etc/skel' maybe chmod 0644 'config-archive/etc/skel/.bash_logout' maybe chmod 0644 'config-archive/etc/skel/.bash_logout.dist.new' @@ -628,7 +627,11 @@ maybe chmod 0600 'config-archive/etc/ssh/sshd_config.1' maybe chmod 0600 'config-archive/etc/ssh/sshd_config.2' maybe chmod 0600 'config-archive/etc/ssh/sshd_config.3' maybe chmod 0600 'config-archive/etc/ssh/sshd_config.4' +maybe chmod 0600 'config-archive/etc/ssh/sshd_config.5' maybe chmod 0600 'config-archive/etc/ssh/sshd_config.dist' +maybe chmod 0755 'config-archive/etc/ssl' +maybe chmod 0644 'config-archive/etc/ssl/openssl.cnf' +maybe chmod 0644 'config-archive/etc/ssl/openssl.cnf.dist.new' maybe chmod 0755 'config-archive/etc/stunnel' maybe chmod 0644 'config-archive/etc/stunnel/stunnel.conf' maybe chmod 0644 'config-archive/etc/stunnel/stunnel.conf.dist' @@ -751,7 +754,6 @@ maybe chmod 0755 'cron.daily/rkhunter' maybe chmod 0644 'cron.deny' maybe chmod 0750 'cron.hourly' maybe chmod 0644 'cron.hourly/.keep_sys-process_cronbase-0' -maybe chmod 0750 'cron.hourly/0anacron' maybe chmod 0755 'cron.hourly/sysstat' maybe chmod 0750 'cron.monthly' maybe chmod 0644 'cron.monthly/.keep_sys-process_cronbase-0' @@ -828,7 +830,6 @@ maybe chmod 0644 'env.d/50guile' maybe chmod 0644 'env.d/50ncurses' maybe chmod 0644 'env.d/50postgresql' maybe chmod 0644 'env.d/60python-docs-2.7' -maybe chmod 0644 'env.d/60python-docs-3.3' maybe chmod 0644 'env.d/70less' maybe chmod 0644 'env.d/80mercurial' maybe chmod 0644 'env.d/80subversion-extras' @@ -1222,7 +1223,6 @@ maybe chmod 0755 'init.d/procfs' maybe chmod 0755 'init.d/proftpd' maybe chmod 0755 'init.d/pwcheck' maybe chmod 0755 'init.d/pydoc-2.7' -maybe chmod 0755 'init.d/pydoc-3.3' maybe chmod 0755 'init.d/pydoc-3.4' maybe chmod 0755 'init.d/quota' maybe chmod 0755 'init.d/reboot.sh' @@ -1237,7 +1237,6 @@ maybe chmod 0755 'init.d/saslauthd' maybe chmod 0755 'init.d/savecache' maybe chmod 0755 'init.d/shutdown.sh' maybe chmod 0755 'init.d/slapd' -maybe chmod 0755 'init.d/smartd' maybe chmod 0755 'init.d/snmpd' maybe chmod 0755 'init.d/snmptrapd' maybe chmod 0755 'init.d/sntp' @@ -1250,7 +1249,6 @@ maybe chmod 0755 'init.d/swapfiles' maybe chmod 0755 'init.d/swclock' maybe chmod 0755 'init.d/sysctl' maybe chmod 0755 'init.d/sysfs' -maybe chmod 0755 'init.d/syslog-ng' maybe chmod 0755 'init.d/sysstat' maybe chmod 0755 'init.d/termencoding' maybe chmod 0755 'init.d/tmpfiles.dev' @@ -1423,6 +1421,7 @@ maybe chmod 0644 'mutt/Muttrc.dist' maybe chmod 0644 'mutt/mime.types.dist' maybe chmod 0755 'mysql' maybe chmod 0644 'mysql/my.cnf' +maybe chmod 0644 'mysql/my.cnf.orig' maybe chmod 0644 'mysql/mysqlaccess.conf' maybe chown 'nagios' 'nagios' maybe chgrp 'nagios' 'nagios' @@ -1741,6 +1740,7 @@ maybe chmod 0644 'rsyslog.conf' maybe chmod 0755 'rsyslog.d' maybe chmod 0644 'rsyslog.d/.keep_app-admin_rsyslog-0' maybe chmod 0644 'rsyslog.d/50-default.conf' +maybe chmod 0644 'rsyslog.d/60-fb.conf' maybe chmod 0755 'runlevels' maybe chmod 0755 'runlevels/boot' maybe chmod 0755 'runlevels/default' @@ -1810,9 +1810,6 @@ maybe chmod 0644 'skel/.bash_profile' maybe chmod 0644 'skel/.bashrc' maybe chmod 0700 'skel/.ssh' maybe chmod 0644 'slsh.rc' -maybe chmod 0644 'smartd.conf' -maybe chmod 0755 'smartd_warning.d' -maybe chmod 0755 'smartd_warning.sh' maybe chmod 0755 'snmp' maybe chmod 0644 'snmp/snmpd.conf.example' maybe chmod 0755 'ssh' @@ -1914,9 +1911,6 @@ maybe chmod 0644 'sysctl.conf' maybe chmod 0755 'sysctl.d' maybe chmod 0644 'sysctl.d/README' maybe chmod 0755 'syslog-ng' -maybe chmod 0755 'syslog-ng/patterndb.d' -maybe chmod 0644 'syslog-ng/patterndb.d/.keep_app-admin_syslog-ng-0' -maybe chmod 0644 'syslog-ng/scl.conf' maybe chmod 0644 'syslog-ng/syslog-ng.conf' maybe chmod 0644 'syslog-ng/syslog-ng.conf.orig' maybe chmod 0644 'sysstat' @@ -1957,8 +1951,11 @@ maybe chmod 0644 'terminfo/x/xterm' maybe chmod 0644 'terminfo/x/xterm-color' maybe chmod 0644 'terminfo/x/xterm-xfree86' maybe chmod 0755 'texmf' -maybe chmod 0755 'texmf/dvipdfmx' -maybe chmod 0644 'texmf/dvipdfmx/dvipdfmx.cfg' +maybe chmod 0755 'texmf/dvipdfm' +maybe chmod 0755 'texmf/dvipdfm/config' +maybe chmod 0755 'texmf/dvipdfmx.d' +maybe chmod 0644 'texmf/dvipdfmx.d/dvipdfmx.cfg' +maybe chmod 0755 'texmf/dvips.d' maybe chmod 0755 'texmf/fmtutil.d' maybe chmod 0644 'texmf/fmtutil.d/format.texlive-basic.cnf' maybe chmod 0644 'texmf/fmtutil.d/format.texlive-latex.cnf' @@ -1969,6 +1966,8 @@ maybe chmod 0644 'texmf/language.dat.lua.d/.keep_app-text_texlive-core-0' maybe chmod 0755 'texmf/language.def.d' maybe chmod 0644 'texmf/language.def.d/.keep_app-text_texlive-core-0' maybe chmod 0644 'texmf/ls-R' +maybe chmod 0755 'texmf/psutils.d' +maybe chmod 0644 'texmf/psutils.d/paper.cfg' maybe chmod 0755 'texmf/texmf.d' maybe chmod 0644 'texmf/texmf.d/00header.cnf' maybe chmod 0644 'texmf/texmf.d/05searchpaths.cnf' @@ -1989,6 +1988,8 @@ maybe chmod 0644 'texmf/web2c/.keep_app-text_texlive-core-0' maybe chmod 0644 'texmf/web2c/fmtutil.cnf' maybe chmod 0644 'texmf/web2c/texmf.cnf' maybe chmod 0644 'texmf/web2c/updmap.cfg' +maybe chmod 0755 'tmpfiles.d' +maybe chmod 0644 'tmpfiles.d/screen.conf' maybe chmod 0755 'udev' maybe chmod 0444 'udev/hwdb.bin' maybe chmod 0755 'udev/hwdb.d' diff --git a/DIR_COLORS b/DIR_COLORS index de64a03..89c085d 100644 --- a/DIR_COLORS +++ b/DIR_COLORS @@ -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-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 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. @@ -32,14 +32,17 @@ TERM dtterm TERM eterm-color TERM gnome TERM gnome-256color +TERM hurd TERM jfbterm TERM konsole TERM kterm TERM linux TERM linux-c TERM mach-color +TERM mach-gnu-color TERM mlterm TERM putty +TERM putty-256color TERM rxvt TERM rxvt-256color TERM rxvt-cygwin @@ -116,18 +119,25 @@ EXEC 01;32 # archives or compressed (bright red) .tar 01;31 .tgz 01;31 +.arc 01;31 .arj 01;31 .taz 01;31 +.lha 01;31 +.lz4 01;31 .lzh 01;31 .lzma 01;31 .tlz 01;31 .txz 01;31 +.tzo 01;31 +.t7z 01;31 .zip 01;31 .z 01;31 .Z 01;31 .dz 01;31 .gz 01;31 +.lrz 01;31 .lz 01;31 +.lzo 01;31 .xz 01;31 .bz2 01;31 .bz 01;31 @@ -141,11 +151,13 @@ EXEC 01;32 .ear 01;31 .sar 01;31 .rar 01;31 +.alz 01;31 .ace 01;31 .zoo 01;31 .cpio 01;31 .7z 01;31 .rz 01;31 +.cab 01;31 # image formats .jpg 01;35 @@ -214,6 +226,7 @@ EXEC 01;32 .aac 00;36 .au 00;36 .flac 00;36 +.m4a 00;36 .mid 00;36 .midi 00;36 .mka 00;36 diff --git a/anacrontab b/anacrontab deleted file mode 100644 index 78c6f8c..0000000 --- a/anacrontab +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/anacrontab: configuration file for anacron - -# See anacron(8) and anacrontab(5) for details. - -SHELL=/bin/sh -PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=root -# the maximal random delay added to the base delay of the jobs -RANDOM_DELAY=45 -# the jobs will be started during the following hours only -START_HOURS_RANGE=3-22 - -#period in days delay in minutes job-identifier command -1 5 cron.daily nice run-parts /etc/cron.daily -7 25 cron.weekly nice run-parts /etc/cron.weekly -@monthly 45 cron.monthly nice run-parts /etc/cron.monthly diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index f352638..e2c1b36 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.31/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/bash_completion.d/alias b/bash_completion.d/alias deleted file mode 120000 index 2d07598..0000000 --- a/bash_completion.d/alias +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/alias \ No newline at end of file diff --git a/bash_completion.d/apache2ctl b/bash_completion.d/apache2ctl deleted file mode 120000 index 0d85ffd..0000000 --- a/bash_completion.d/apache2ctl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/apache2ctl \ No newline at end of file diff --git a/bash_completion.d/aspell b/bash_completion.d/aspell deleted file mode 120000 index 631d11e..0000000 --- a/bash_completion.d/aspell +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/aspell \ No newline at end of file diff --git a/bash_completion.d/base b/bash_completion.d/base deleted file mode 120000 index 2e036d1..0000000 --- a/bash_completion.d/base +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/base \ No newline at end of file diff --git a/bash_completion.d/blockdev b/bash_completion.d/blockdev deleted file mode 120000 index b80a580..0000000 --- a/bash_completion.d/blockdev +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/blockdev \ No newline at end of file diff --git a/bash_completion.d/brctl b/bash_completion.d/brctl deleted file mode 120000 index c9ed3ce..0000000 --- a/bash_completion.d/brctl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/brctl \ No newline at end of file diff --git a/bash_completion.d/bzip2 b/bash_completion.d/bzip2 deleted file mode 120000 index 326a69b..0000000 --- a/bash_completion.d/bzip2 +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/bzip2 \ No newline at end of file diff --git a/bash_completion.d/cal b/bash_completion.d/cal deleted file mode 120000 index 72c1223..0000000 --- a/bash_completion.d/cal +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/cal \ No newline at end of file diff --git a/bash_completion.d/chage b/bash_completion.d/chage deleted file mode 120000 index 7388061..0000000 --- a/bash_completion.d/chage +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/chage \ No newline at end of file diff --git a/bash_completion.d/chown b/bash_completion.d/chown deleted file mode 120000 index c18521e..0000000 --- a/bash_completion.d/chown +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/chown \ No newline at end of file diff --git a/bash_completion.d/configure b/bash_completion.d/configure deleted file mode 120000 index 3875167..0000000 --- a/bash_completion.d/configure +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/configure \ No newline at end of file diff --git a/bash_completion.d/convert b/bash_completion.d/convert deleted file mode 120000 index 55112f2..0000000 --- a/bash_completion.d/convert +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/convert \ No newline at end of file diff --git a/bash_completion.d/cpio b/bash_completion.d/cpio deleted file mode 120000 index 2c3dffb..0000000 --- a/bash_completion.d/cpio +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/cpio \ No newline at end of file diff --git a/bash_completion.d/crontab b/bash_completion.d/crontab deleted file mode 120000 index 9ec9333..0000000 --- a/bash_completion.d/crontab +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/crontab \ No newline at end of file diff --git a/bash_completion.d/curl b/bash_completion.d/curl deleted file mode 120000 index 7dd6ef1..0000000 --- a/bash_completion.d/curl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/curl \ No newline at end of file diff --git a/bash_completion.d/dd b/bash_completion.d/dd deleted file mode 120000 index 8fa6d94..0000000 --- a/bash_completion.d/dd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/dd \ No newline at end of file diff --git a/bash_completion.d/dmesg b/bash_completion.d/dmesg deleted file mode 120000 index 0878e45..0000000 --- a/bash_completion.d/dmesg +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/dmesg \ No newline at end of file diff --git a/bash_completion.d/eix b/bash_completion.d/eix deleted file mode 120000 index e4aa83f..0000000 --- a/bash_completion.d/eix +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/eix \ No newline at end of file diff --git a/bash_completion.d/eog b/bash_completion.d/eog deleted file mode 120000 index af4c861..0000000 --- a/bash_completion.d/eog +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/eog \ No newline at end of file diff --git a/bash_completion.d/eselect b/bash_completion.d/eselect deleted file mode 120000 index 4512d10..0000000 --- a/bash_completion.d/eselect +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/eselect \ No newline at end of file diff --git a/bash_completion.d/export b/bash_completion.d/export deleted file mode 120000 index cd19e6a..0000000 --- a/bash_completion.d/export +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/export \ No newline at end of file diff --git a/bash_completion.d/fdisk b/bash_completion.d/fdisk deleted file mode 120000 index 269ec89..0000000 --- a/bash_completion.d/fdisk +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/fdisk \ No newline at end of file diff --git a/bash_completion.d/figlet.bashcomp b/bash_completion.d/figlet.bashcomp deleted file mode 120000 index df26927..0000000 --- a/bash_completion.d/figlet.bashcomp +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/figlet.bashcomp \ No newline at end of file diff --git a/bash_completion.d/file b/bash_completion.d/file deleted file mode 120000 index 954cef4..0000000 --- a/bash_completion.d/file +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/file \ No newline at end of file diff --git a/bash_completion.d/find b/bash_completion.d/find deleted file mode 120000 index c607160..0000000 --- a/bash_completion.d/find +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/find \ No newline at end of file diff --git a/bash_completion.d/flock b/bash_completion.d/flock deleted file mode 120000 index 599e392..0000000 --- a/bash_completion.d/flock +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/flock \ No newline at end of file diff --git a/bash_completion.d/fsck b/bash_completion.d/fsck deleted file mode 120000 index 57449f6..0000000 --- a/bash_completion.d/fsck +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/fsck \ No newline at end of file diff --git a/bash_completion.d/gcc b/bash_completion.d/gcc deleted file mode 120000 index 5a868a0..0000000 --- a/bash_completion.d/gcc +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/gcc \ No newline at end of file diff --git a/bash_completion.d/genlop b/bash_completion.d/genlop deleted file mode 120000 index 3ceb237..0000000 --- a/bash_completion.d/genlop +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/genlop \ No newline at end of file diff --git a/bash_completion.d/getent b/bash_completion.d/getent deleted file mode 120000 index 00934bf..0000000 --- a/bash_completion.d/getent +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/getent \ No newline at end of file diff --git a/bash_completion.d/git b/bash_completion.d/git deleted file mode 120000 index 794cbb2..0000000 --- a/bash_completion.d/git +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/git \ No newline at end of file diff --git a/bash_completion.d/gpg b/bash_completion.d/gpg deleted file mode 120000 index 92096b8..0000000 --- a/bash_completion.d/gpg +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/gpg \ No newline at end of file diff --git a/bash_completion.d/groupadd b/bash_completion.d/groupadd deleted file mode 120000 index 20c9bd3..0000000 --- a/bash_completion.d/groupadd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/groupadd \ No newline at end of file diff --git a/bash_completion.d/groupdel b/bash_completion.d/groupdel deleted file mode 120000 index 4256b96..0000000 --- a/bash_completion.d/groupdel +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/groupdel \ No newline at end of file diff --git a/bash_completion.d/groupmems b/bash_completion.d/groupmems deleted file mode 120000 index 4d88066..0000000 --- a/bash_completion.d/groupmems +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/groupmems \ No newline at end of file diff --git a/bash_completion.d/groupmod b/bash_completion.d/groupmod deleted file mode 120000 index d3f49a1..0000000 --- a/bash_completion.d/groupmod +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/groupmod \ No newline at end of file diff --git a/bash_completion.d/gzip b/bash_completion.d/gzip deleted file mode 120000 index bfb9c7a..0000000 --- a/bash_completion.d/gzip +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/gzip \ No newline at end of file diff --git a/bash_completion.d/hexdump b/bash_completion.d/hexdump deleted file mode 120000 index 727ff95..0000000 --- a/bash_completion.d/hexdump +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/hexdump \ No newline at end of file diff --git a/bash_completion.d/htop b/bash_completion.d/htop deleted file mode 120000 index c4efd5a..0000000 --- a/bash_completion.d/htop +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/htop \ No newline at end of file diff --git a/bash_completion.d/htpasswd b/bash_completion.d/htpasswd deleted file mode 120000 index 38e3a18..0000000 --- a/bash_completion.d/htpasswd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/htpasswd \ No newline at end of file diff --git a/bash_completion.d/iconv b/bash_completion.d/iconv deleted file mode 120000 index b18d3f5..0000000 --- a/bash_completion.d/iconv +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/iconv \ No newline at end of file diff --git a/bash_completion.d/info b/bash_completion.d/info deleted file mode 120000 index 4432048..0000000 --- a/bash_completion.d/info +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/info \ No newline at end of file diff --git a/bash_completion.d/ip b/bash_completion.d/ip deleted file mode 120000 index 38f5349..0000000 --- a/bash_completion.d/ip +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ip \ No newline at end of file diff --git a/bash_completion.d/iptables b/bash_completion.d/iptables deleted file mode 120000 index 0b433ad..0000000 --- a/bash_completion.d/iptables +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/iptables \ No newline at end of file diff --git a/bash_completion.d/kill b/bash_completion.d/kill deleted file mode 120000 index 8c8523c..0000000 --- a/bash_completion.d/kill +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/kill \ No newline at end of file diff --git a/bash_completion.d/killall b/bash_completion.d/killall deleted file mode 120000 index 3588935..0000000 --- a/bash_completion.d/killall +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/killall \ No newline at end of file diff --git a/bash_completion.d/layman b/bash_completion.d/layman deleted file mode 120000 index 0001968..0000000 --- a/bash_completion.d/layman +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/layman \ No newline at end of file diff --git a/bash_completion.d/ldapsearch b/bash_completion.d/ldapsearch deleted file mode 120000 index ca35302..0000000 --- a/bash_completion.d/ldapsearch +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ldapsearch \ No newline at end of file diff --git a/bash_completion.d/lftp b/bash_completion.d/lftp deleted file mode 120000 index 3cb1406..0000000 --- a/bash_completion.d/lftp +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/lftp \ No newline at end of file diff --git a/bash_completion.d/links b/bash_completion.d/links deleted file mode 120000 index 4d74019..0000000 --- a/bash_completion.d/links +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/links \ No newline at end of file diff --git a/bash_completion.d/logger b/bash_completion.d/logger deleted file mode 120000 index dec55a2..0000000 --- a/bash_completion.d/logger +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/logger \ No newline at end of file diff --git a/bash_completion.d/losetup b/bash_completion.d/losetup deleted file mode 120000 index 03021c8..0000000 --- a/bash_completion.d/losetup +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/losetup \ No newline at end of file diff --git a/bash_completion.d/lsof b/bash_completion.d/lsof deleted file mode 120000 index 977735e..0000000 --- a/bash_completion.d/lsof +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/lsof \ No newline at end of file diff --git a/bash_completion.d/lvm b/bash_completion.d/lvm deleted file mode 120000 index f7da84f..0000000 --- a/bash_completion.d/lvm +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/lvm \ No newline at end of file diff --git a/bash_completion.d/lzma b/bash_completion.d/lzma deleted file mode 120000 index 50049ba..0000000 --- a/bash_completion.d/lzma +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/lzma \ No newline at end of file diff --git a/bash_completion.d/lzop b/bash_completion.d/lzop deleted file mode 120000 index e8b3228..0000000 --- a/bash_completion.d/lzop +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/lzop \ No newline at end of file diff --git a/bash_completion.d/make b/bash_completion.d/make deleted file mode 120000 index 9efd534..0000000 --- a/bash_completion.d/make +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/make \ No newline at end of file diff --git a/bash_completion.d/man b/bash_completion.d/man deleted file mode 120000 index 2784b23..0000000 --- a/bash_completion.d/man +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/man \ No newline at end of file diff --git a/bash_completion.d/mc b/bash_completion.d/mc deleted file mode 120000 index 25c4b1e..0000000 --- a/bash_completion.d/mc +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mc \ No newline at end of file diff --git a/bash_completion.d/mdadm b/bash_completion.d/mdadm deleted file mode 120000 index d9be7c8..0000000 --- a/bash_completion.d/mdadm +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mdadm \ No newline at end of file diff --git a/bash_completion.d/mkfs b/bash_completion.d/mkfs deleted file mode 120000 index 8679b57..0000000 --- a/bash_completion.d/mkfs +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mkfs \ No newline at end of file diff --git a/bash_completion.d/mkinitrd b/bash_completion.d/mkinitrd deleted file mode 120000 index 7a54e49..0000000 --- a/bash_completion.d/mkinitrd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mkinitrd \ No newline at end of file diff --git a/bash_completion.d/mkswap b/bash_completion.d/mkswap deleted file mode 120000 index 91380d0..0000000 --- a/bash_completion.d/mkswap +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mkswap \ No newline at end of file diff --git a/bash_completion.d/mktemp b/bash_completion.d/mktemp deleted file mode 120000 index 2f828d2..0000000 --- a/bash_completion.d/mktemp +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mktemp \ No newline at end of file diff --git a/bash_completion.d/modinfo b/bash_completion.d/modinfo deleted file mode 120000 index 992f3d0..0000000 --- a/bash_completion.d/modinfo +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/modinfo \ No newline at end of file diff --git a/bash_completion.d/modprobe b/bash_completion.d/modprobe deleted file mode 120000 index e36015d..0000000 --- a/bash_completion.d/modprobe +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/modprobe \ No newline at end of file diff --git a/bash_completion.d/more b/bash_completion.d/more deleted file mode 120000 index 2946074..0000000 --- a/bash_completion.d/more +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/more \ No newline at end of file diff --git a/bash_completion.d/mount b/bash_completion.d/mount deleted file mode 120000 index 44c12da..0000000 --- a/bash_completion.d/mount +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mount \ No newline at end of file diff --git a/bash_completion.d/mount.linux b/bash_completion.d/mount.linux deleted file mode 120000 index ce7662c..0000000 --- a/bash_completion.d/mount.linux +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mount.linux \ No newline at end of file diff --git a/bash_completion.d/mysql b/bash_completion.d/mysql deleted file mode 120000 index 18111dd..0000000 --- a/bash_completion.d/mysql +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mysql \ No newline at end of file diff --git a/bash_completion.d/mysqladmin b/bash_completion.d/mysqladmin deleted file mode 120000 index f77e26e..0000000 --- a/bash_completion.d/mysqladmin +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/mysqladmin \ No newline at end of file diff --git a/bash_completion.d/nc b/bash_completion.d/nc deleted file mode 120000 index 301a038..0000000 --- a/bash_completion.d/nc +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/nc \ No newline at end of file diff --git a/bash_completion.d/ncftp b/bash_completion.d/ncftp deleted file mode 120000 index 61b4ac0..0000000 --- a/bash_completion.d/ncftp +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ncftp \ No newline at end of file diff --git a/bash_completion.d/nmap b/bash_completion.d/nmap deleted file mode 120000 index 222e1fe..0000000 --- a/bash_completion.d/nmap +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/nmap \ No newline at end of file diff --git a/bash_completion.d/nslookup b/bash_completion.d/nslookup deleted file mode 120000 index e7de771..0000000 --- a/bash_completion.d/nslookup +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/nslookup \ No newline at end of file diff --git a/bash_completion.d/ntpdate b/bash_completion.d/ntpdate deleted file mode 120000 index c8f8211..0000000 --- a/bash_completion.d/ntpdate +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ntpdate \ No newline at end of file diff --git a/bash_completion.d/openssl b/bash_completion.d/openssl deleted file mode 120000 index ff76adf..0000000 --- a/bash_completion.d/openssl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/openssl \ No newline at end of file diff --git a/bash_completion.d/passwd b/bash_completion.d/passwd deleted file mode 120000 index effebd3..0000000 --- a/bash_completion.d/passwd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/passwd \ No newline at end of file diff --git a/bash_completion.d/patch b/bash_completion.d/patch deleted file mode 120000 index 4d3a459..0000000 --- a/bash_completion.d/patch +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/patch \ No newline at end of file diff --git a/bash_completion.d/perl b/bash_completion.d/perl deleted file mode 120000 index 2fadcc9..0000000 --- a/bash_completion.d/perl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/perl \ No newline at end of file diff --git a/bash_completion.d/pgrep b/bash_completion.d/pgrep deleted file mode 120000 index 3067e68..0000000 --- a/bash_completion.d/pgrep +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/pgrep \ No newline at end of file diff --git a/bash_completion.d/ping b/bash_completion.d/ping deleted file mode 120000 index ee44888..0000000 --- a/bash_completion.d/ping +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ping \ No newline at end of file diff --git a/bash_completion.d/postcat b/bash_completion.d/postcat deleted file mode 120000 index 3ea67a3..0000000 --- a/bash_completion.d/postcat +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/postcat \ No newline at end of file diff --git a/bash_completion.d/postconf b/bash_completion.d/postconf deleted file mode 120000 index e888a99..0000000 --- a/bash_completion.d/postconf +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/postconf \ No newline at end of file diff --git a/bash_completion.d/postfix b/bash_completion.d/postfix deleted file mode 120000 index 45cfb45..0000000 --- a/bash_completion.d/postfix +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/postfix \ No newline at end of file diff --git a/bash_completion.d/postmap b/bash_completion.d/postmap deleted file mode 120000 index 7760ffc..0000000 --- a/bash_completion.d/postmap +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/postmap \ No newline at end of file diff --git a/bash_completion.d/postsuper b/bash_completion.d/postsuper deleted file mode 120000 index 7df1a85..0000000 --- a/bash_completion.d/postsuper +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/postsuper \ No newline at end of file diff --git a/bash_completion.d/psql b/bash_completion.d/psql deleted file mode 120000 index c648fb1..0000000 --- a/bash_completion.d/psql +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/psql \ No newline at end of file diff --git a/bash_completion.d/pwd b/bash_completion.d/pwd deleted file mode 120000 index cd438fd..0000000 --- a/bash_completion.d/pwd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/pwd \ No newline at end of file diff --git a/bash_completion.d/pwgen b/bash_completion.d/pwgen deleted file mode 120000 index 721b671..0000000 --- a/bash_completion.d/pwgen +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/pwgen \ No newline at end of file diff --git a/bash_completion.d/python b/bash_completion.d/python deleted file mode 120000 index 3e18e2a..0000000 --- a/bash_completion.d/python +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/python \ No newline at end of file diff --git a/bash_completion.d/rcs b/bash_completion.d/rcs deleted file mode 120000 index a05b823..0000000 --- a/bash_completion.d/rcs +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/rcs \ No newline at end of file diff --git a/bash_completion.d/rmmod b/bash_completion.d/rmmod deleted file mode 120000 index 1b68c27..0000000 --- a/bash_completion.d/rmmod +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/rmmod \ No newline at end of file diff --git a/bash_completion.d/rrdtool b/bash_completion.d/rrdtool deleted file mode 120000 index d9169fd..0000000 --- a/bash_completion.d/rrdtool +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/rrdtool \ No newline at end of file diff --git a/bash_completion.d/rsync b/bash_completion.d/rsync deleted file mode 120000 index 9d7e0d7..0000000 --- a/bash_completion.d/rsync +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/rsync \ No newline at end of file diff --git a/bash_completion.d/screen b/bash_completion.d/screen deleted file mode 120000 index 837a302..0000000 --- a/bash_completion.d/screen +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/screen \ No newline at end of file diff --git a/bash_completion.d/sh b/bash_completion.d/sh deleted file mode 120000 index 228adbe..0000000 --- a/bash_completion.d/sh +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/sh \ No newline at end of file diff --git a/bash_completion.d/smartctl b/bash_completion.d/smartctl deleted file mode 120000 index 0e4cf8d..0000000 --- a/bash_completion.d/smartctl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/smartctl \ No newline at end of file diff --git a/bash_completion.d/ssh b/bash_completion.d/ssh deleted file mode 120000 index 12aa924..0000000 --- a/bash_completion.d/ssh +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ssh \ No newline at end of file diff --git a/bash_completion.d/ssh-add b/bash_completion.d/ssh-add deleted file mode 120000 index b06e7b3..0000000 --- a/bash_completion.d/ssh-add +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/ssh-add \ No newline at end of file diff --git a/bash_completion.d/sshfs b/bash_completion.d/sshfs deleted file mode 120000 index b6d8dac..0000000 --- a/bash_completion.d/sshfs +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/sshfs \ No newline at end of file diff --git a/bash_completion.d/strace b/bash_completion.d/strace deleted file mode 120000 index b76dd13..0000000 --- a/bash_completion.d/strace +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/strace \ No newline at end of file diff --git a/bash_completion.d/strings b/bash_completion.d/strings deleted file mode 120000 index e7f3df3..0000000 --- a/bash_completion.d/strings +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/strings \ No newline at end of file diff --git a/bash_completion.d/su b/bash_completion.d/su deleted file mode 120000 index 34d8cec..0000000 --- a/bash_completion.d/su +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/su \ No newline at end of file diff --git a/bash_completion.d/subversion b/bash_completion.d/subversion deleted file mode 120000 index d695b86..0000000 --- a/bash_completion.d/subversion +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/subversion \ No newline at end of file diff --git a/bash_completion.d/sudo b/bash_completion.d/sudo deleted file mode 120000 index 0a78fcc..0000000 --- a/bash_completion.d/sudo +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/sudo \ No newline at end of file diff --git a/bash_completion.d/swapon b/bash_completion.d/swapon deleted file mode 120000 index b7fe42f..0000000 --- a/bash_completion.d/swapon +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/swapon \ No newline at end of file diff --git a/bash_completion.d/sysctl b/bash_completion.d/sysctl deleted file mode 120000 index 5e92cda..0000000 --- a/bash_completion.d/sysctl +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/sysctl \ No newline at end of file diff --git a/bash_completion.d/tar b/bash_completion.d/tar deleted file mode 120000 index 49c64dd..0000000 --- a/bash_completion.d/tar +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/tar \ No newline at end of file diff --git a/bash_completion.d/tcpdump b/bash_completion.d/tcpdump deleted file mode 120000 index 480050e..0000000 --- a/bash_completion.d/tcpdump +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/tcpdump \ No newline at end of file diff --git a/bash_completion.d/tracepath b/bash_completion.d/tracepath deleted file mode 120000 index 73eb0b6..0000000 --- a/bash_completion.d/tracepath +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/tracepath \ No newline at end of file diff --git a/bash_completion.d/tree b/bash_completion.d/tree deleted file mode 120000 index 50aa20b..0000000 --- a/bash_completion.d/tree +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/tree \ No newline at end of file diff --git a/bash_completion.d/tune2fs b/bash_completion.d/tune2fs deleted file mode 120000 index 279279e..0000000 --- a/bash_completion.d/tune2fs +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/tune2fs \ No newline at end of file diff --git a/bash_completion.d/udevadm b/bash_completion.d/udevadm deleted file mode 120000 index 42f3a35..0000000 --- a/bash_completion.d/udevadm +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/udevadm \ No newline at end of file diff --git a/bash_completion.d/umount b/bash_completion.d/umount deleted file mode 120000 index e1f657d..0000000 --- a/bash_completion.d/umount +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/umount \ No newline at end of file diff --git a/bash_completion.d/umount.linux b/bash_completion.d/umount.linux deleted file mode 120000 index c3940fe..0000000 --- a/bash_completion.d/umount.linux +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/umount.linux \ No newline at end of file diff --git a/bash_completion.d/unrar b/bash_completion.d/unrar deleted file mode 120000 index d40496b..0000000 --- a/bash_completion.d/unrar +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/unrar \ No newline at end of file diff --git a/bash_completion.d/useradd b/bash_completion.d/useradd deleted file mode 120000 index 8540323..0000000 --- a/bash_completion.d/useradd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/useradd \ No newline at end of file diff --git a/bash_completion.d/userdel b/bash_completion.d/userdel deleted file mode 120000 index 3d783c2..0000000 --- a/bash_completion.d/userdel +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/userdel \ No newline at end of file diff --git a/bash_completion.d/usermod b/bash_completion.d/usermod deleted file mode 120000 index e4d1cdf..0000000 --- a/bash_completion.d/usermod +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/usermod \ No newline at end of file diff --git a/bash_completion.d/vim b/bash_completion.d/vim deleted file mode 120000 index a077149..0000000 --- a/bash_completion.d/vim +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/vim \ No newline at end of file diff --git a/bash_completion.d/vmstat b/bash_completion.d/vmstat deleted file mode 120000 index 911d471..0000000 --- a/bash_completion.d/vmstat +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/vmstat \ No newline at end of file diff --git a/bash_completion.d/watch b/bash_completion.d/watch deleted file mode 120000 index 5594483..0000000 --- a/bash_completion.d/watch +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/watch \ No newline at end of file diff --git a/bash_completion.d/wget b/bash_completion.d/wget deleted file mode 120000 index 9375e2a..0000000 --- a/bash_completion.d/wget +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/wget \ No newline at end of file diff --git a/bash_completion.d/xxd b/bash_completion.d/xxd deleted file mode 120000 index fd6b14a..0000000 --- a/bash_completion.d/xxd +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/xxd \ No newline at end of file diff --git a/bash_completion.d/xz b/bash_completion.d/xz deleted file mode 120000 index 666c981..0000000 --- a/bash_completion.d/xz +++ /dev/null @@ -1 +0,0 @@ -../../usr/share/bash-completion/xz \ No newline at end of file diff --git a/conf.d/git-daemon b/conf.d/git-daemon index db77de5..69b209f 100644 --- a/conf.d/git-daemon +++ b/conf.d/git-daemon @@ -13,7 +13,7 @@ GITDAEMON_OPTS="--syslog --base-path=/var/git" # To run an anonymous git safely, the following user should be able to only -# read your Git repositories. It should not able able to write to anywhere on +# read your Git repositories. It should not be able to write to anywhere on # your system, esp. not the repositories. GIT_USER="nobody" GIT_GROUP="nobody" diff --git a/conf.d/pydoc-3.3 b/conf.d/pydoc-3.3 deleted file mode 100644 index 26ccb54..0000000 --- a/conf.d/pydoc-3.3 +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/init.d/pydoc.conf -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.3 2011/10/27 13:56:55 neurogeek Exp $ - -# This file contains the configuration for pydoc's internal webserver. - -# Default port for Python's pydoc server. -PYDOC3_3_PORT="7464" diff --git a/conf.d/smartd b/conf.d/smartd deleted file mode 100644 index 4b7db4d..0000000 --- a/conf.d/smartd +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/smartd: config file for /etc/init.d/smartd - -# Insert any other options needed -SMARTD_OPTS="" diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng deleted file mode 100644 index 42fa26a..0000000 --- a/conf.d/syslog-ng +++ /dev/null @@ -1,42 +0,0 @@ -# Config file for /etc/init.d/syslog-ng - -# If you are not using network logging, this entire section should be -# commented out. Otherwise, choose one of the settings below based on -# how you are configuring your network. -# -# If you are using the net.* scripts to configure your network, you should -# set rc_need to match the interface through which your logging server -# can be reached. -#rc_need="net.eth0" -# -# If you are using an interface manager like wicd, dhcpcd in standalone -# mode, networkmanager, etc to control your interfaces, set rc_need to -# the name of that service. -# rc_need="dhcpcd" -#rc_need="networkmanager" -# -# If you are using newnet and configuring your interface statically with -# the network script, you should use this setting. -#rc_need="network" -# -# You can use this setting, but I do not recommend relying on it. -#rc_need="net" -# -# You may also want to uncomment the following if you are using network -# logging. -#rc_use="stunnel" - -# For very customized setups these variables can be adjusted as needed -# but for most situations they should remain commented: -# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf -# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng -# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist -# SYSLOG_NG_PIDFILE_DIR=/run -# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid -# SYSLOG_NG_GROUP=root -# SYSLOG_NG_USER=root - -# Put any additional options for syslog-ng here. -# See syslog-ng(8) for more information. - -SYSLOG_NG_OPTS="" diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf b/config-archive/etc/apache2/modules.d/00_apache_manual.conf index 5d8ffc1..f352638 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27-r4/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 index 391c2e6..5d8ffc1 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 @@ -2,10 +2,12 @@ # http://yourserver.example.com/manual/ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ + + -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27-r4/manual$1" - + Options Indexes AllowOverride None Order allow,deny @@ -22,5 +24,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac ForceLanguagePriority Prefer Fallback + + # vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2 index 33ae915..391c2e6 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2 +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2 @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.25/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3 index f43bf59..33ae915 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3 +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3 @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.24/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.25/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4 index 240d6b4..f43bf59 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4 +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4 @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.23/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.24/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5 index 25de5d1..240d6b4 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5 +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5 @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.23/manual$1" - + Options Indexes AllowOverride None Order allow,deny @@ -18,7 +18,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1 RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2 - LanguagePriority en de es fr ja ko pt-br + LanguagePriority de en es fr ja ko pt-br ForceLanguagePriority Prefer Fallback diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6 index a1bfed2..25de5d1 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6 +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6 @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7 new file mode 100644 index 0000000..a1bfed2 --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7 @@ -0,0 +1,26 @@ +# Provide access to the documentation on your server as +# http://yourserver.example.com/manual/ +# The documentation is always available at +# http://httpd.apache.org/docs/2.2/ + +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1" + + + Options Indexes + AllowOverride None + Order allow,deny + Allow from all + + + SetHandler type-map + + + SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1 + RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2 + + LanguagePriority en de es fr ja ko pt-br + ForceLanguagePriority Prefer Fallback + + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist index f7d9fd6..f4ff100 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.31/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/dispatch-conf.conf.dist.new b/config-archive/etc/dispatch-conf.conf.dist similarity index 97% rename from config-archive/etc/dispatch-conf.conf.dist.new rename to config-archive/etc/dispatch-conf.conf.dist index 125b7cc..7efce8a 100644 --- a/config-archive/etc/dispatch-conf.conf.dist.new +++ b/config-archive/etc/dispatch-conf.conf.dist @@ -31,7 +31,7 @@ diff="diff -Nu '%s' '%s'" pager="" # Default options used if less is the pager -less-opts="--no-init --QUIT-AT-EOF" +less-opts="--no-init --quit-if-one-screen" # Diff for interactive merges. # %s output file diff --git a/config-archive/etc/logrotate.conf b/config-archive/etc/logrotate.conf index 41dfc3a..116d4a5 100644 --- a/config-archive/etc/logrotate.conf +++ b/config-archive/etc/logrotate.conf @@ -1,27 +1,26 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $ # -# Logrotate default configuration file for Gentoo Linux -# -# See "man logrotate" for details +# Default logrotate(8) configuration file for Gentoo Linux. +# See "man logrotate" for details. -# rotate log files weekly +# rotate log files weekly. weekly #daily -# keep 4 weeks worth of backlogs +# keep 4 weeks worth of backlogs. #rotate 4 rotate 10 maxage 2y -# create new (empty) log files after rotating old ones +# create new (empty) log files after rotating old ones. create -# use date as a suffix of the rotated file +# use date as a suffix of the rotated file. dateext tabooprefix \. -# uncomment this if you want your log files compressed +# compress rotated log files. compress notifempty @@ -31,10 +30,10 @@ noolddir # is it okay, if a logfile doesn't exists ? missingok -# packages can drop log rotation information into this directory +# packages can drop log rotation information into this directory. include /etc/logrotate.d -# no packages own wtmp and btmp -- we'll rotate them here +# no packages own wtmp and btmp -- we'll rotate them here. /var/log/wtmp { monthly create 0664 root utmp @@ -50,3 +49,5 @@ include /etc/logrotate.d } # system-specific logs may be also be configured here. + +# vim: ts=4 filetype=conf diff --git a/config-archive/etc/logrotate.conf.1 b/config-archive/etc/logrotate.conf.1 index 3968f20..41dfc3a 100644 --- a/config-archive/etc/logrotate.conf.1 +++ b/config-archive/etc/logrotate.conf.1 @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $ # # Logrotate default configuration file for Gentoo Linux # @@ -34,7 +34,7 @@ missingok # packages can drop log rotation information into this directory include /etc/logrotate.d -# no packages own lastlog or wtmp -- we'll rotate them here +# no packages own wtmp and btmp -- we'll rotate them here /var/log/wtmp { monthly create 0664 root utmp diff --git a/config-archive/etc/logrotate.conf.2 b/config-archive/etc/logrotate.conf.2 new file mode 100644 index 0000000..3968f20 --- /dev/null +++ b/config-archive/etc/logrotate.conf.2 @@ -0,0 +1,52 @@ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $ +# +# Logrotate default configuration file for Gentoo Linux +# +# See "man logrotate" for details + +# rotate log files weekly +weekly +#daily + +# keep 4 weeks worth of backlogs +#rotate 4 +rotate 10 +maxage 2y + +# create new (empty) log files after rotating old ones +create + +# use date as a suffix of the rotated file +dateext + +tabooprefix \. + +# uncomment this if you want your log files compressed +compress + +notifempty +#nomail +noolddir + +# is it okay, if a logfile doesn't exists ? +missingok + +# packages can drop log rotation information into this directory +include /etc/logrotate.d + +# no packages own lastlog or wtmp -- we'll rotate them here +/var/log/wtmp { + monthly + create 0664 root utmp + size=4096K + rotate 12 +} + +/var/log/btmp { + missingok + monthly + create 0600 root utmp + rotate 12 +} + +# system-specific logs may be also be configured here. diff --git a/config-archive/etc/logrotate.conf.dist b/config-archive/etc/logrotate.conf.dist index 9059ce9..b6292ec 100644 --- a/config-archive/etc/logrotate.conf.dist +++ b/config-archive/etc/logrotate.conf.dist @@ -1,40 +1,38 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $ +# $Id$ # -# Logrotate default configuration file for Gentoo Linux -# -# See "man logrotate" for details +# Default logrotate(8) configuration file for Gentoo Linux. +# See "man logrotate" for details. -# rotate log files weekly +# rotate log files weekly. weekly #daily -# keep 4 weeks worth of backlogs +# keep 4 weeks worth of backlogs. rotate 4 -# create new (empty) log files after rotating old ones +# create new (empty) log files after rotating old ones. create -# use date as a suffix of the rotated file +# use date as a suffix of the rotated file. dateext -# uncomment this if you want your log files compressed +# compress rotated log files. compress notifempty nomail noolddir -# packages can drop log rotation information into this directory +# packages can drop log rotation information into this directory. include /etc/logrotate.d -# no packages own wtmp and btmp -- we'll rotate them here +# no packages own wtmp and btmp -- we'll rotate them here. /var/log/wtmp { monthly create 0664 root utmp - minsize 1M + minsize 1M rotate 1 } - /var/log/btmp { missingok monthly diff --git a/config-archive/etc/logrotate.conf.dist.new b/config-archive/etc/logrotate.conf.dist.new deleted file mode 100644 index 4a5184a..0000000 --- a/config-archive/etc/logrotate.conf.dist.new +++ /dev/null @@ -1,43 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $ -# -# Default logrotate(8) configuration file for Gentoo Linux. -# See "man logrotate" for details. - -# rotate log files weekly. -weekly -#daily - -# keep 4 weeks worth of backlogs. -rotate 4 - -# create new (empty) log files after rotating old ones. -create - -# use date as a suffix of the rotated file. -dateext - -# compress rotated log files. -compress - -notifempty -nomail -noolddir - -# packages can drop log rotation information into this directory. -include /etc/logrotate.d - -# no packages own wtmp and btmp -- we'll rotate them here. -/var/log/wtmp { - monthly - create 0664 root utmp - minsize 1M - rotate 1 -} -/var/log/btmp { - missingok - monthly - create 0600 root utmp - rotate 1 -} - -# system-specific logs may be also be configured here. diff --git a/config-archive/etc/mysql/my.cnf b/config-archive/etc/mysql/my.cnf index 458e10d..8b30e2c 100644 --- a/config-archive/etc/mysql/my.cnf +++ b/config-archive/etc/mysql/my.cnf @@ -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 $ +# $Id$ # The following options will be passed to all MySQL clients [client] @@ -52,15 +52,17 @@ log-error = /var/log/mysql/mysqld.err basedir = /usr datadir = /var/lib/mysql skip-external-locking -key_buffer = 16M -max_allowed_packet = 1M -table_cache = 64 +key_buffer_size = 16M +max_allowed_packet = 4M +table_open_cache = 400 sort_buffer_size = 512K -net_buffer_length = 8K +net_buffer_length = 16K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M -language = /usr/share/mysql/english +lc_messages_dir = /usr/share/mysql +#Set this to your desired error message language +lc_messages = en_US # security: # using "localhost" in connects uses sockets by default @@ -75,7 +77,7 @@ tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname # you need the debug USE flag enabled to use the following directives, -# if needed, uncomment them, start the server and issue +# if needed, uncomment them, start the server and issue # #tail -f /tmp/mysqld.sql /tmp/mysqld.trace # this will show you *exactly* what's happening in your server ;) @@ -84,34 +86,22 @@ tmpdir = /tmp/ #debug = d:t:i:o,/tmp/mysqld.trace #one-thread -# uncomment the following directives if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# # the rest of the innodb config follows: # don't eat too much memory, we're trying to be safe on 64Mb boxes # you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase it if you have lots of tables -innodb_additional_mem_pool_size = 2M +innodb_buffer_pool_size = 128M # # i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( # and upstream wants things to be under /var/lib/mysql/, so that's the route # we have to take for the moment #innodb_data_home_dir = /var/lib/mysql/ -#innodb_log_arch_dir = /var/lib/mysql/ #innodb_log_group_home_dir = /var/lib/mysql/ # you may wish to change this size to be more suitable for your system # the max is there to avoid run-away growth on your machine innodb_data_file_path = ibdata1:10M:autoextend:max:128M # we keep this at around 25% of of innodb_buffer_pool_size # sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) -innodb_log_file_size = 5M +innodb_log_file_size = 48M # this is the default, increase it if you have very large transactions going on innodb_log_buffer_size = 8M # this is the default and won't hurt you @@ -122,6 +112,10 @@ innodb_flush_log_at_trx_commit = 1 innodb_lock_wait_timeout = 50 innodb_file_per_table +# Uncomment this to get FEDERATED engine support +#plugin-load=federated=ha_federated.so +loose-federated + [mysqldump] quick max_allowed_packet = 16M @@ -131,16 +125,16 @@ max_allowed_packet = 16M #safe-updates [isamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M read_buffer = 2M write_buffer = 2M [myisamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M +read_buffer_size = 2M +write_buffer_size = 2M [mysqlhotcopy] interactive-timeout diff --git a/config-archive/etc/mysql/my.cnf.1 b/config-archive/etc/mysql/my.cnf.1 new file mode 100644 index 0000000..458e10d --- /dev/null +++ b/config-archive/etc/mysql/my.cnf.1 @@ -0,0 +1,146 @@ +# /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 $ + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=/usr/share/mysql/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log = /var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server = utf8 +user = mysql +port = 3306 +socket = /var/run/mysqld/mysqld.sock +pid-file = /var/run/mysqld/mysqld.pid +log-error = /var/log/mysql/mysqld.err +basedir = /usr +datadir = /var/lib/mysql +skip-external-locking +key_buffer = 16M +max_allowed_packet = 1M +table_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +language = /usr/share/mysql/english + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = /tmp/ +#log-update = /path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = /tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 16M +# this is the default, increase it if you have lots of tables +innodb_additional_mem_pool_size = 2M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir = /var/lib/mysql/ +#innodb_log_arch_dir = /var/lib/mysql/ +#innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +innodb_log_file_size = 5M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_file_per_table + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/config-archive/etc/mysql/my.cnf.dist b/config-archive/etc/mysql/my.cnf.dist index 50a3c2e..14d0dd3 100644 --- a/config-archive/etc/mysql/my.cnf.dist +++ b/config-archive/etc/mysql/my.cnf.dist @@ -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.3 2012/02/15 02:07:21 jmbsvicetto Exp $ +# $Id$ # The following options will be passed to all MySQL clients [client] @@ -52,15 +52,17 @@ log-error = /var/log/mysql/mysqld.err basedir = /usr datadir = /var/lib/mysql skip-external-locking -key_buffer = 16M -max_allowed_packet = 1M -table_open_cache = 64 +key_buffer_size = 16M +max_allowed_packet = 4M +table_open_cache = 400 sort_buffer_size = 512K -net_buffer_length = 8K +net_buffer_length = 16K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M -language = /usr/share/mysql/english +lc_messages_dir = /usr/share/mysql +#Set this to your desired error message language +lc_messages = en_US # security: # using "localhost" in connects uses sockets by default @@ -75,7 +77,7 @@ tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname # you need the debug USE flag enabled to use the following directives, -# if needed, uncomment them, start the server and issue +# if needed, uncomment them, start the server and issue # #tail -f /tmp/mysqld.sql /tmp/mysqld.trace # this will show you *exactly* what's happening in your server ;) @@ -84,21 +86,10 @@ tmpdir = /tmp/ #debug = d:t:i:o,/tmp/mysqld.trace #one-thread -# uncomment the following directives if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# # the rest of the innodb config follows: # don't eat too much memory, we're trying to be safe on 64Mb boxes # you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase it if you have lots of tables -innodb_additional_mem_pool_size = 2M +innodb_buffer_pool_size = 128M # # i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( # and upstream wants things to be under /var/lib/mysql/, so that's the route @@ -111,7 +102,7 @@ innodb_additional_mem_pool_size = 2M innodb_data_file_path = ibdata1:10M:autoextend:max:128M # we keep this at around 25% of of innodb_buffer_pool_size # sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) -innodb_log_file_size = 5M +innodb_log_file_size = 48M # this is the default, increase it if you have very large transactions going on innodb_log_buffer_size = 8M # this is the default and won't hurt you @@ -122,6 +113,10 @@ innodb_flush_log_at_trx_commit = 1 innodb_lock_wait_timeout = 50 innodb_file_per_table +# Uncomment this to get FEDERATED engine support +#plugin-load=federated=ha_federated.so +loose-federated + [mysqldump] quick max_allowed_packet = 16M @@ -131,16 +126,18 @@ max_allowed_packet = 16M #safe-updates [isamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M read_buffer = 2M write_buffer = 2M [myisamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M +read_buffer_size = 2M +write_buffer_size = 2M [mysqlhotcopy] interactive-timeout + +[mariadb] diff --git a/config-archive/etc/screenrc.dist.new b/config-archive/etc/screenrc.dist similarity index 93% rename from config-archive/etc/screenrc.dist.new rename to config-archive/etc/screenrc.dist index 02e63bf..11f2f55 100644 --- a/config-archive/etc/screenrc.dist.new +++ b/config-archive/etc/screenrc.dist @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # /etc/screenrc @@ -114,12 +114,12 @@ defnonblock on # xterm understands both im/ic and doesn't have a status line. # Note: Do not specify im and ic in the real termcap/info file as # some programs (e.g. vi) will not work anymore. - termcap xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l - terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l + termcap xterm* hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l + terminfo xterm* hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l # 80/132 column switching must be enabled for ^AW to work # change init sequence to not switch width - termcapinfo xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l + termcapinfo xterm* Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l # Make the output buffer large for (fast) xterms. # termcapinfo xterm* OL=10000 @@ -127,25 +127,25 @@ defnonblock on # tell screen that xterm can switch to dark background and has function # keys. - termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l' - termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' - termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' + termcapinfo xterm* 'VR=\E[?5h:VN=\E[?5l' + termcapinfo xterm* 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' + termcapinfo xterm* 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' # special xterm hardstatus: use the window title. - termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' + termcapinfo xterm* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' #terminfo xterm 'vb=\E[?5h$<200/>\E[?5l' - termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' + termcapinfo xterm* 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' # emulate part of the 'K' charset - termcapinfo xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' + termcapinfo xterm* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' # xterm-52 tweaks: # - uses background color for delete operations termcapinfo xterm* be # Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195) - termcapinfo xterm|xterms|xs ti@:te=\E[2J + termcapinfo xterm*|xs ti@:te=\E[2J # WYSE TERMINALS # =============================================================== diff --git a/config-archive/etc/ssh/sshd_config b/config-archive/etc/ssh/sshd_config index c7c3f62..5eb8312 100644 --- a/config-archive/etc/ssh/sshd_config +++ b/config-archive/etc/ssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD$ +# $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -194,13 +194,29 @@ UsePrivilegeSeparation sandbox # Default for new installations. # Allow client to pass locale environment variables AcceptEnv LANG LC_* +# here are the new patched ldap related tokens +# entries in your LDAP must have posixAccount & ldapPublicKey objectclass +#UseLPK yes +#LpkLdapConf /etc/ldap.conf +#LpkServers ldap://10.1.7.1/ ldap://10.1.7.2/ +#LpkUserDN ou=users,dc=phear,dc=org +#LpkGroupDN ou=groups,dc=phear,dc=org +#LpkBindDN cn=Manager,dc=phear,dc=org +#LpkBindPw secret +#LpkServerGroup mail +#LpkFilter (hostAccess=master.phear.org) +#LpkForceTLS no +#LpkSearchTimelimit 3 +#LpkBindTimelimit 3 +#LpkPubKeyAttr sshPublicKey + # override default of no subsystems Subsystem sftp /usr/lib64/misc/sftp-server # the following are HPN related configuration options # tcp receive buffer polling. disable in non autotuning kernels #TcpRcvBufPoll yes - + # disable hpn performance boosts #HPNDisabled no diff --git a/config-archive/etc/ssh/sshd_config.1 b/config-archive/etc/ssh/sshd_config.1 index 6401926..c7c3f62 100644 --- a/config-archive/etc/ssh/sshd_config.1 +++ b/config-archive/etc/ssh/sshd_config.1 @@ -24,6 +24,7 @@ #HostKey /etc/ssh/ssh_host_rsa_key #HostKey /etc/ssh/ssh_host_dsa_key #HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key # "key type names" for X.509 certificates with RSA key # Note first defined is used in signature operations! @@ -153,8 +154,8 @@ PasswordAuthentication no #GSSAPICleanupCredentials yes #GSSAPIStrictAcceptorCheck yes -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will # be allowed through the ChallengeResponseAuthentication and # PasswordAuthentication. Depending on your PAM configuration, # PAM authentication via ChallengeResponseAuthentication may bypass @@ -170,6 +171,7 @@ UsePAM yes #X11Forwarding no #X11DisplayOffset 10 #X11UseLocalhost yes +#PermitTTY yes PrintMotd no PrintLastLog no #TCPKeepAlive yes @@ -213,6 +215,7 @@ Subsystem sftp /usr/lib64/misc/sftp-server #Match User anoncvs # X11Forwarding no # AllowTcpForwarding no +# PermitTTY no # ForceCommand cvs server # Allow client to pass locale environment variables #367017 diff --git a/config-archive/etc/ssh/sshd_config.2 b/config-archive/etc/ssh/sshd_config.2 index e8168d6..6401926 100644 --- a/config-archive/etc/ssh/sshd_config.2 +++ b/config-archive/etc/ssh/sshd_config.2 @@ -27,8 +27,8 @@ # "key type names" for X.509 certificates with RSA key # Note first defined is used in signature operations! -#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5 #X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1 +#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5 # "key type names" for X.509 certificates with DSA key # Note first defined is used in signature operations! @@ -95,6 +95,9 @@ #KeyRegenerationInterval 1h #ServerKeyBits 1024 +# Ciphers and keying +#RekeyLimit default none + # Logging # obsoletes QuietMode and FascistLogging #SyslogFacility AUTH @@ -116,6 +119,11 @@ PermitRootLogin yes # but this is overridden so installations will only check .ssh/authorized_keys #AuthorizedKeysFile .ssh/authorized_keys +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts #RhostsRSAAuthentication no # similar for protocol version 2 @@ -166,16 +174,17 @@ PrintMotd no PrintLastLog no #TCPKeepAlive yes #UseLogin no -#UsePrivilegeSeparation yes +UsePrivilegeSeparation sandbox # Default for new installations. #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 #UseDNS yes #PidFile /var/run/sshd.pid -#MaxStartups 10 +#MaxStartups 10:30:100 #PermitTunnel no #ChrootDirectory none +#VersionAddendum none # no default banner path #Banner none @@ -190,18 +199,21 @@ Subsystem sftp /usr/lib64/misc/sftp-server # tcp receive buffer polling. disable in non autotuning kernels #TcpRcvBufPoll yes -# allow the use of the none cipher -#NoneEnabled no - -# disable hpn performance boosts. +# disable hpn performance boosts #HPNDisabled no # buffer size for hpn to non-hpn connections #HPNBufferSize 2048 +# allow the use of the none cipher +#NoneEnabled no + # Example of overriding settings on a per-user basis #Match User anoncvs # X11Forwarding no # AllowTcpForwarding no # ForceCommand cvs server + +# Allow client to pass locale environment variables #367017 +AcceptEnv LANG LC_* diff --git a/config-archive/etc/ssh/sshd_config.3 b/config-archive/etc/ssh/sshd_config.3 index e686e9f..e8168d6 100644 --- a/config-archive/etc/ssh/sshd_config.3 +++ b/config-archive/etc/ssh/sshd_config.3 @@ -7,7 +7,7 @@ # The strategy used for options in the default sshd_config shipped with # OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options change a +# possible, but leave them commented. Uncommented options override the # default value. #Port 22 @@ -103,14 +103,17 @@ # Authentication: #LoginGraceTime 2m -#PermitRootLogin yes -PermitRootLogin no +PermitRootLogin yes +#PermitRootLogin no #StrictModes yes #MaxAuthTries 6 #MaxSessions 10 #RSAAuthentication yes #PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys #AuthorizedKeysFile .ssh/authorized_keys # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts @@ -140,6 +143,7 @@ PasswordAuthentication no # GSSAPI options #GSSAPIAuthentication no #GSSAPICleanupCredentials yes +#GSSAPIStrictAcceptorCheck yes # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will @@ -176,6 +180,9 @@ PrintLastLog no # no default banner path #Banner none +# Allow client to pass locale environment variables +AcceptEnv LANG LC_* + # override default of no subsystems Subsystem sftp /usr/lib64/misc/sftp-server diff --git a/config-archive/etc/ssh/sshd_config.4 b/config-archive/etc/ssh/sshd_config.4 index ca72979..e686e9f 100644 --- a/config-archive/etc/ssh/sshd_config.4 +++ b/config-archive/etc/ssh/sshd_config.4 @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $ +# $OpenBSD$ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -25,6 +25,72 @@ #HostKey /etc/ssh/ssh_host_dsa_key #HostKey /etc/ssh/ssh_host_ecdsa_key +# "key type names" for X.509 certificates with RSA key +# Note first defined is used in signature operations! +#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5 +#X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1 + +# "key type names" for X.509 certificates with DSA key +# Note first defined is used in signature operations! +#X509KeyAlgorithm x509v3-sign-dss,dss-asn1 +#X509KeyAlgorithm x509v3-sign-dss,dss-raw + +# The intended use for the X509 client certificate. Without this option +# no chain verification will be done. Currently accepted uses are case +# insensitive: +# - "sslclient", "SSL client", "SSL_client" or "client" +# - "any", "Any Purpose", "Any_Purpose" or "AnyPurpose" +# - "skip" or ""(empty): don`t check purpose. +#AllowedCertPurpose sslclient + +# Specifies whether self-issued(self-signed) X.509 certificate can be +# allowed only by entry in AutorizedKeysFile that contain matching +# public key or certificate blob. +#KeyAllowSelfIssued no + +# Specifies whether CRL must present in store for all certificates in +# certificate chain with atribute "cRLDistributionPoints" +#MandatoryCRL no + +# A file with multiple certificates of certificate signers +# in PEM format concatenated together. +#CACertificateFile /etc/ssh/ca/ca-bundle.crt + +# A directory with certificates of certificate signers. +# The certificates should have name of the form: [HASH].[NUMBER] +# or have symbolic links to them of this form. +#CACertificatePath /etc/ssh/ca/crt + +# A file with multiple CRL of certificate signers +# in PEM format concatenated together. +#CARevocationFile /etc/ssh/ca/ca-bundle.crl + +# A directory with CRL of certificate signers. +# The CRL should have name of the form: [HASH].r[NUMBER] +# or have symbolic links to them of this form. +#CARevocationPath /etc/ssh/ca/crl + +# LDAP protocol version. +# Example: +# CAldapVersion 2 + +# Note because of OpenSSH options parser limitation +# use %3D instead of = ! +# LDAP initialization may require URL to be escaped, i.e. +# use %2C instead of ,(comma). Escaped URL don't depend from +# LDAP initialization method. +# Example: +# CAldapURL ldap://localhost:389/dc%3Dexample%2Cdc%3Dcom + +# SSH can use "Online Certificate Status Protocol"(OCSP) +# to validate certificate. Set VAType to +# - none : do not use OCSP to validate certificates; +# - ocspcert: validate only certificates that specify `OCSP +# Service Locator' URL; +# - ocspspec: use specified in the configuration 'OCSP Responder' +# to validate all certificates. +#VAType none + # Lifetime and size of ephemeral version 1 server key #KeyRegenerationInterval 1h #ServerKeyBits 1024 diff --git a/config-archive/etc/ssh/sshd_config.5 b/config-archive/etc/ssh/sshd_config.5 new file mode 100644 index 0000000..ca72979 --- /dev/null +++ b/config-archive/etc/ssh/sshd_config.5 @@ -0,0 +1,134 @@ +# $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +PermitRootLogin no +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication no +PasswordAuthentication no +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +PrintMotd no +PrintLastLog no +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib64/misc/sftp-server + +# the following are HPN related configuration options +# tcp receive buffer polling. disable in non autotuning kernels +#TcpRcvBufPoll yes + +# allow the use of the none cipher +#NoneEnabled no + +# disable hpn performance boosts. +#HPNDisabled no + +# buffer size for hpn to non-hpn connections +#HPNBufferSize 2048 + + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server diff --git a/config-archive/etc/ssh/sshd_config.dist b/config-archive/etc/ssh/sshd_config.dist index 5683e16..5b4b032 100644 --- a/config-archive/etc/ssh/sshd_config.dist +++ b/config-archive/etc/ssh/sshd_config.dist @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $ +# $OpenBSD: sshd_config,v 1.95 2015/04/27 21:42:48 djm Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -41,7 +41,7 @@ # Authentication: #LoginGraceTime 2m -#PermitRootLogin yes +#PermitRootLogin no #StrictModes yes #MaxAuthTries 6 #MaxSessions 10 @@ -84,7 +84,6 @@ PasswordAuthentication no # GSSAPI options #GSSAPIAuthentication no #GSSAPICleanupCredentials yes -#GSSAPIStrictAcceptorCheck yes # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will @@ -113,8 +112,8 @@ UsePrivilegeSeparation sandbox # Default for new installations. #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid +#UseDNS no +#PidFile /run/sshd.pid #MaxStartups 10:30:100 #PermitTunnel no #ChrootDirectory none diff --git a/config-archive/etc/ssl/openssl.cnf b/config-archive/etc/ssl/openssl.cnf new file mode 100644 index 0000000..0eda4ba --- /dev/null +++ b/config-archive/etc/ssl/openssl.cnf @@ -0,0 +1,350 @@ +# +# OpenSSL example configuration file. +# This is mostly being used for generation of certificate requests. +# + +# This definition stops the following lines choking if HOME isn't +# defined. +HOME = . +RANDFILE = $ENV::HOME/.rnd + +# Extra OBJECT IDENTIFIER info: +#oid_file = $ENV::HOME/.oid +oid_section = new_oids + +# To use this configuration file with the "-extfile" option of the +# "openssl x509" utility, name here the section containing the +# X.509v3 extensions to use: +# extensions = +# (Alternatively, use a configuration file that has only +# X.509v3 extensions in its main [= default] section.) + +[ new_oids ] + +# 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 + +#################################################################### +[ 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 +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 + +# Extension copying option: use with caution. +# copy_extensions = copy + +# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs +# so this is commented out by default to leave a V1 CRL. +# crlnumber must also be commented out to leave a V1 CRL. +# crl_extensions = crl_ext + +default_days = 1875 # how long to certify for +default_crl_days= 30 # how long before next CRL +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 +# For type CA, the listed attributes must be the same, and the optional +# and supplied fields are just that :-) +policy = policy_match + +# For the CA policy +[ policy_match ] +countryName = match +stateOrProvinceName = optional +organizationName = optional +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +# For the 'anything' policy +# At this point in time, you must list all acceptable 'object' +# types. +[ policy_anything ] +countryName = optional +stateOrProvinceName = optional +localityName = optional +organizationName = optional +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +#################################################################### +[ req ] +default_bits = 1024 +default_keyfile = privkey.pem +distinguished_name = req_distinguished_name +attributes = req_attributes +x509_extensions = v3_ca # The extentions to add to the self signed cert + +# Passwords for private keys if not present they will be prompted for +# input_password = secret +# output_password = secret + +# This sets a mask for permitted string types. There are several options. +# default: PrintableString, T61String, BMPString. +# 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: ancient versions of Netscape crash on BMPStrings or UTF8Strings. +string_mask = utf8only + +# req_extensions = v3_req # The extensions to add to a certificate request + +[ req_distinguished_name ] +countryName = Country Name (2 letter code) +countryName_default = DE +countryName_min = 2 +countryName_max = 2 + +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Berlin + +localityName = Locality Name (eg, city) + +0.organizationName = Organization Name (eg, company) +0.organizationName_default = Internet Widgits Pty Ltd + +# we can do this but it is not needed normally :-) +#1.organizationName = Second Organization Name (eg, company) +#1.organizationName_default = World Wide Web Pty Ltd + +organizationalUnitName = Organizational Unit Name (eg, section) +#organizationalUnitName_default = + +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_max = 64 + +emailAddress = Email Address +emailAddress_max = 64 + +# SET-ex3 = SET extension number 3 + +[ req_attributes ] +challengePassword = A challenge password +challengePassword_min = 4 +challengePassword_max = 20 + +unstructuredName = An optional company name + +[ usr_cert ] + +# These extensions are added when 'ca' signs a request. + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# Here are some examples of the usage of nsCertType. If it is omitted +# the certificate can be used for anything *except* object signing. + +# This is OK for an SSL server. +# nsCertType = server + +# For an object signing certificate this would be used. +# nsCertType = objsign + +# For normal client use this is typical +# nsCertType = client, email + +# and for everything including object signing: +# nsCertType = client, email, objsign + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# This will be displayed in Netscape's comment listbox. +nsComment = "OpenSSL Generated Certificate" + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem +#nsBaseUrl +#nsRevocationUrl +#nsRenewalUrl +#nsCaPolicyUrl +#nsSslServerName + +# This is required for TSA certificates. +# extendedKeyUsage = critical,timeStamping + +[ v3_req ] + +# Extensions to add to a certificate request + +basicConstraints = CA:FALSE +keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +[ v3_ca ] + + +# Extensions for a typical CA + + +# PKIX recommendation. + +subjectKeyIdentifier=hash + +authorityKeyIdentifier=keyid:always,issuer + +# This is what PKIX recommends but some broken software chokes on critical +# extensions. +#basicConstraints = critical,CA:true +# So we do this instead. +basicConstraints = CA:true + +# Key usage: this is typical for a CA certificate. However since it will +# prevent it being used as an test self-signed certificate it is best +# left out by default. +# keyUsage = cRLSign, keyCertSign + +# Some might want this also +# nsCertType = sslCA, emailCA + +# Include email address in subject alt name: another PKIX recommendation +# subjectAltName=email:copy +# Copy issuer details +# issuerAltName=issuer:copy + +# DER hex encoding of an extension: beware experts only! +# obj=DER:02:03 +# Where 'obj' is a standard or added object +# You can even override a supported extension: +# basicConstraints= critical, DER:30:03:01:01:FF + +[ crl_ext ] + +# CRL extensions. +# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL. + +# issuerAltName=issuer:copy +authorityKeyIdentifier=keyid:always + +[ proxy_cert_ext ] +# These extensions should be added when creating a proxy certificate + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# Here are some examples of the usage of nsCertType. If it is omitted +# the certificate can be used for anything *except* object signing. + +# This is OK for an SSL server. +# nsCertType = server + +# For an object signing certificate this would be used. +# nsCertType = objsign + +# For normal client use this is typical +# nsCertType = client, email + +# and for everything including object signing: +# nsCertType = client, email, objsign + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# This will be displayed in Netscape's comment listbox. +nsComment = "OpenSSL Generated Certificate" + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem +#nsBaseUrl +#nsRevocationUrl +#nsRenewalUrl +#nsCaPolicyUrl +#nsSslServerName + +# 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) diff --git a/config-archive/etc/ssl/openssl.cnf.dist.new b/config-archive/etc/ssl/openssl.cnf.dist.new new file mode 100644 index 0000000..1eb86c4 --- /dev/null +++ b/config-archive/etc/ssl/openssl.cnf.dist.new @@ -0,0 +1,350 @@ +# +# OpenSSL example configuration file. +# This is mostly being used for generation of certificate requests. +# + +# This definition stops the following lines choking if HOME isn't +# defined. +HOME = . +RANDFILE = $ENV::HOME/.rnd + +# Extra OBJECT IDENTIFIER info: +#oid_file = $ENV::HOME/.oid +oid_section = new_oids + +# To use this configuration file with the "-extfile" option of the +# "openssl x509" utility, name here the section containing the +# X.509v3 extensions to use: +# extensions = +# (Alternatively, use a configuration file that has only +# X.509v3 extensions in its main [= default] section.) + +[ new_oids ] + +# 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 + +#################################################################### +[ 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 + +# 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 + +# Extension copying option: use with caution. +# copy_extensions = copy + +# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs +# so this is commented out by default to leave a V1 CRL. +# crlnumber must also be commented out to leave a V1 CRL. +# crl_extensions = crl_ext + +default_days = 365 # how long to certify for +default_crl_days= 30 # how long before next CRL +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 +# For type CA, the listed attributes must be the same, and the optional +# and supplied fields are just that :-) +policy = policy_match + +# For the CA policy +[ policy_match ] +countryName = match +stateOrProvinceName = match +organizationName = match +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +# For the 'anything' policy +# At this point in time, you must list all acceptable 'object' +# types. +[ policy_anything ] +countryName = optional +stateOrProvinceName = optional +localityName = optional +organizationName = optional +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +#################################################################### +[ req ] +default_bits = 2048 +default_keyfile = privkey.pem +distinguished_name = req_distinguished_name +attributes = req_attributes +x509_extensions = v3_ca # The extentions to add to the self signed cert + +# Passwords for private keys if not present they will be prompted for +# input_password = secret +# output_password = secret + +# This sets a mask for permitted string types. There are several options. +# default: PrintableString, T61String, BMPString. +# 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: ancient versions of Netscape crash on BMPStrings or UTF8Strings. +string_mask = utf8only + +# req_extensions = v3_req # The extensions to add to a certificate request + +[ req_distinguished_name ] +countryName = Country Name (2 letter code) +countryName_default = AU +countryName_min = 2 +countryName_max = 2 + +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Some-State + +localityName = Locality Name (eg, city) + +0.organizationName = Organization Name (eg, company) +0.organizationName_default = Internet Widgits Pty Ltd + +# we can do this but it is not needed normally :-) +#1.organizationName = Second Organization Name (eg, company) +#1.organizationName_default = World Wide Web Pty Ltd + +organizationalUnitName = Organizational Unit Name (eg, section) +#organizationalUnitName_default = + +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_max = 64 + +emailAddress = Email Address +emailAddress_max = 64 + +# SET-ex3 = SET extension number 3 + +[ req_attributes ] +challengePassword = A challenge password +challengePassword_min = 4 +challengePassword_max = 20 + +unstructuredName = An optional company name + +[ usr_cert ] + +# These extensions are added when 'ca' signs a request. + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# Here are some examples of the usage of nsCertType. If it is omitted +# the certificate can be used for anything *except* object signing. + +# This is OK for an SSL server. +# nsCertType = server + +# For an object signing certificate this would be used. +# nsCertType = objsign + +# For normal client use this is typical +# nsCertType = client, email + +# and for everything including object signing: +# nsCertType = client, email, objsign + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# This will be displayed in Netscape's comment listbox. +nsComment = "OpenSSL Generated Certificate" + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem +#nsBaseUrl +#nsRevocationUrl +#nsRenewalUrl +#nsCaPolicyUrl +#nsSslServerName + +# This is required for TSA certificates. +# extendedKeyUsage = critical,timeStamping + +[ v3_req ] + +# Extensions to add to a certificate request + +basicConstraints = CA:FALSE +keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +[ v3_ca ] + + +# Extensions for a typical CA + + +# PKIX recommendation. + +subjectKeyIdentifier=hash + +authorityKeyIdentifier=keyid:always,issuer + +# This is what PKIX recommends but some broken software chokes on critical +# extensions. +#basicConstraints = critical,CA:true +# So we do this instead. +basicConstraints = CA:true + +# Key usage: this is typical for a CA certificate. However since it will +# prevent it being used as an test self-signed certificate it is best +# left out by default. +# keyUsage = cRLSign, keyCertSign + +# Some might want this also +# nsCertType = sslCA, emailCA + +# Include email address in subject alt name: another PKIX recommendation +# subjectAltName=email:copy +# Copy issuer details +# issuerAltName=issuer:copy + +# DER hex encoding of an extension: beware experts only! +# obj=DER:02:03 +# Where 'obj' is a standard or added object +# You can even override a supported extension: +# basicConstraints= critical, DER:30:03:01:01:FF + +[ crl_ext ] + +# CRL extensions. +# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL. + +# issuerAltName=issuer:copy +authorityKeyIdentifier=keyid:always + +[ proxy_cert_ext ] +# These extensions should be added when creating a proxy certificate + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# Here are some examples of the usage of nsCertType. If it is omitted +# the certificate can be used for anything *except* object signing. + +# This is OK for an SSL server. +# nsCertType = server + +# For an object signing certificate this would be used. +# nsCertType = objsign + +# For normal client use this is typical +# nsCertType = client, email + +# and for everything including object signing: +# nsCertType = client, email, objsign + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# This will be displayed in Netscape's comment listbox. +nsComment = "OpenSSL Generated Certificate" + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem +#nsBaseUrl +#nsRevocationUrl +#nsRenewalUrl +#nsCaPolicyUrl +#nsSslServerName + +# 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) diff --git a/courier/authlib/authdaemonrc b/courier/authlib/authdaemonrc index 5bd2a35..d4e21b4 100644 --- a/courier/authlib/authdaemonrc +++ b/courier/authlib/authdaemonrc @@ -1,4 +1,4 @@ -##VERSION: $Id: 2013-08-20 21:38:40 -0400 0404e6724c4edec3859842fb06d86c3ad52e8cc2$ +##VERSION: $Id: 7b218a8185f424046f3ef3322a37443983e443e3-20150228120722$ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authdaemonrc.dist b/courier/authlib/authdaemonrc.dist index abdebbd..37a5426 100644 --- a/courier/authlib/authdaemonrc.dist +++ b/courier/authlib/authdaemonrc.dist @@ -1,4 +1,4 @@ -##VERSION: $Id: 2013-08-20 21:38:40 -0400 0404e6724c4edec3859842fb06d86c3ad52e8cc2$ +##VERSION: $Id: 7b218a8185f424046f3ef3322a37443983e443e3-20150228120722$ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. diff --git a/cron.hourly/0anacron b/cron.hourly/0anacron deleted file mode 100755 index 7bcb684..0000000 --- a/cron.hourly/0anacron +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Check whether 0anacron was run today already -if test -r /var/spool/anacron/cron.daily; then - day=`cat /var/spool/anacron/cron.daily` -fi -if [ `date +%Y%m%d` = "$day" ]; then - exit 0; -fi - -# Do not run jobs when on battery power -if test -x /usr/bin/on_ac_power; then - /usr/bin/on_ac_power >/dev/null 2>&1 - if test $? -eq 1; then - exit 0 - fi -fi -/usr/sbin/anacron -s diff --git a/csh.env b/csh.env index fcf17af..db8468a 100644 --- a/csh.env +++ b/csh.env @@ -18,7 +18,6 @@ setenv OPENGL_PROFILE 'xorg-x11' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin' setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.8/html/library' -setenv PYTHONDOCS_3_3 '/usr/share/doc/python-docs-3.3.2/html/library' setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin' setenv XDG_CONFIG_DIRS '/etc/xdg' setenv XDG_DATA_DIRS '/usr/local/share:/usr/share' diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf index b90f1de..48aa300 100644 --- a/cups/cups-browsed.conf +++ b/cups/cups-browsed.conf @@ -44,6 +44,21 @@ BrowseRemoteProtocols DNSSD,CUPS # CreateIPPPrinterQueues Yes +# If cups-browsed is automatically creating print queues for native +# IPP network printers ("CreateIPPPrinterQueues Yes"), the type of +# queue to be created can be selected by the "IPPPrinterQueueType" +# directive. The "PPD" setting makes always queues with PPD file +# being created and no queue if the printer does not supply sufficient +# information for creating a PPD. With "NoPPD" the queue is always +# created with a System V interface script as filter, also when +# creatig a PPD would be possible. "Auto" (the default) lets a PPD +# being created if the printer supplies sufficient information and a +# System V interface script otherwise. + +# IPPPrinterQueueType Auto +# IPPPrinterQueueType PPD +# IPPPrinterQueueType NoPPD + # The AutoShutdown directive specifies whether cups-browsed should # automatically terminate when it has no local raw queues set up # pointing to any discovered remote printers (auto shutdown diff --git a/dispatch-conf.conf b/dispatch-conf.conf index 302ef08..b05bc16 100644 --- a/dispatch-conf.conf +++ b/dispatch-conf.conf @@ -6,6 +6,7 @@ archive-dir=${EPREFIX}/etc/config-archive # Use rcs for storing files in the archive directory? +# NOTE: You should install dev-vcs/rcs before enabling this option. # WARNING: When configured to use rcs, read and execute permissions of # archived files may be inherited from the first check in of a working # file, as documented in the ci(1) man page. This means that even if @@ -31,7 +32,7 @@ diff="diff -Nu '%s' '%s' | colordiff" pager="" # Default options used if less is the pager -less-opts="--no-init --QUIT-AT-EOF" +less-opts="--no-init --quit-if-one-screen" # Diff for interactive merges. # %s output file diff --git a/env.d/60python-docs-3.3 b/env.d/60python-docs-3.3 deleted file mode 100644 index a868263..0000000 --- a/env.d/60python-docs-3.3 +++ /dev/null @@ -1 +0,0 @@ -PYTHONDOCS_3_3="/usr/share/doc/python-docs-3.3.2/html/library" diff --git a/eselect/postgresql/slots/9.4/base b/eselect/postgresql/slots/9.4/base index a02c00d..380fd5b 100644 --- a/eselect/postgresql/slots/9.4/base +++ b/eselect/postgresql/slots/9.4/base @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-9.4.3" +postgres_ebuilds="${postgres_ebuilds} postgresql-9.4.4" diff --git a/grub.d/10_linux b/grub.d/10_linux index d03b3eb..94fe619 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -149,13 +149,15 @@ EOF machine=`uname -m` case "x$machine" in xi?86 | xx86_64) - list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; + list= + for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done ;; *) - list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; + list= + for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done ;; esac case "$machine" in diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen index bf48f2b..efc2725 100755 --- a/grub.d/20_linux_xen +++ b/grub.d/20_linux_xen @@ -137,7 +137,8 @@ EOF EOF } -linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do +linux_list= +for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do if grub_file_is_not_garbage "$i"; then basename=$(basename $i) version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") @@ -149,9 +150,9 @@ linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do break fi done - if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi + if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then linux_list="$linux_list $i" ; fi fi - done` +done if [ "x${linux_list}" = "x" ] ; then exit 0 fi @@ -165,9 +166,10 @@ file_is_not_sym () { esac } -xen_list=`for i in /boot/xen*; do - if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi - done` +xen_list= +for i in /boot/xen*; do + if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_list="$xen_list $i" ; fi +done prepare_boot_cache= boot_device_id= diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober index 4c1b457..d7e7923 100755 --- a/grub.d/30_os-prober +++ b/grub.d/30_os-prober @@ -319,9 +319,8 @@ EOF EOF ;; *) - echo -n " " # TRANSLATORS: %s is replaced by OS name. - gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2 + gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2 ;; esac done diff --git a/init.d/git-daemon b/init.d/git-daemon index ee9a64e..b6ecfd9 100755 --- a/init.d/git-daemon +++ b/init.d/git-daemon @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.4 2014/03/03 19:21:29 polynomial-c Exp $ +# $Id$ pidfile="/var/run/git-daemon.pid" command="/usr/bin/git" diff --git a/init.d/ip6tables b/init.d/ip6tables index a63d076..440e840 100755 --- a/init.d/ip6tables +++ b/init.d/ip6tables @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $ +# $Id$ extra_commands="check save panic" extra_started_commands="reload" diff --git a/init.d/iptables b/init.d/iptables index a63d076..440e840 100755 --- a/init.d/iptables +++ b/init.d/iptables @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $ +# $Id$ extra_commands="check save panic" extra_started_commands="reload" diff --git a/init.d/kmod-static-nodes b/init.d/kmod-static-nodes index dcbf679..379cbb1 100755 --- a/init.d/kmod-static-nodes +++ b/init.d/kmod-static-nodes @@ -1,14 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/kmod-static-nodes-r1,v 1.1 2014/07/11 12:28:07 ssuominen Exp $ +# $Id$ description="Create list of required static device nodes for the current kernel" depend() { after dev-mount before tmpfiles.dev dev - keyword -lxc + keyword -lxc -systemd-nspawn } start() { diff --git a/init.d/named b/init.d/named index 7f49553..a320d34 100755 --- a/init.d/named +++ b/init.d/named @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r13,v 1.1 2014/01/31 21:24:49 idl0r Exp $ +# $Id$ extra_commands="checkconfig checkzones" extra_started_commands="reload" diff --git a/init.d/pciparm b/init.d/pciparm index 705b647..d7973bf 100755 --- a/init.d/pciparm +++ b/init.d/pciparm @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.3 2008/10/11 02:47:50 robbat2 Exp $ +# $Id$ depend() { before bootmisc hdparm diff --git a/init.d/postgresql-9.4 b/init.d/postgresql-9.4 index 635b609..c6eb749 100755 --- a/init.d/postgresql-9.4 +++ b/init.d/postgresql-9.4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-9.3,v 1.1 2015/06/04 19:34:58 titanofold Exp $ +# $Id$ extra_started_commands="reload" diff --git a/init.d/pydoc-3.3 b/init.d/pydoc-3.3 deleted file mode 100755 index fc1676e..0000000 --- a/init.d/pydoc-3.3 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public Licence v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.4 2011/10/27 13:56:55 neurogeek Exp $ - -depend() { - need net -} - -start() { - local pydoc_port="${PYDOC3_3_PORT-${PYDOC_PORT}}" - - if [ -z "${pydoc_port}" ]; then - eerror "Port not set" - return 1 - fi - - ebegin "Starting pydoc server on port ${pydoc_port}" - start-stop-daemon --start --background --make-pidfile \ - --pidfile /var/run/pydoc3.3.pid \ - --exec /usr/bin/pydoc3.3 -- -p "${pydoc_port}" - eend $? -} - -stop() { - ebegin "Stopping pydoc server" - start-stop-daemon --stop --quiet --pidfile /var/run/pydoc3.3.pid - eend $? -} diff --git a/init.d/smartd b/init.d/smartd deleted file mode 100755 index d6273e6..0000000 --- a/init.d/smartd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd-r1.rc,v 1.1 2014/08/09 09:36:30 polynomial-c Exp $ - -pidfile="/run/smartd.pid" -command="/usr/sbin/smartd" -command_args="-p ${pidfile} ${SMARTD_OPTS}" -extra_started_commands="reload" - -depend() { - need localmount - after bootmisc -} - -start_pre() { - if [ ! -f "/etc/smartd.conf" ] ; then - eerror "You should setup your /etc/smartd.conf file!" - eerror "See the smartd.conf(5) manpage." - return 1 - fi - return 0 -} - -reload() { - ebegin "Reloading configuration" - start-stop-daemon --signal HUP --pidfile ${pidfile} ${command##*/} - eend $? -} diff --git a/init.d/sshd b/init.d/sshd index 1b872bc..34e1970 100755 --- a/init.d/sshd +++ b/init.d/sshd @@ -1,38 +1,36 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.3 2013/04/24 03:13:03 vapier Exp $ +# $Id$ extra_commands="checkconfig" extra_started_commands="reload" -SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh} -SSHD_CONFIG=${SSHD_CONFIG:-${SSHD_CONFDIR}/sshd_config} -SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid} -SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd} +: ${SSHD_CONFDIR:=/etc/ssh} +: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config} +: ${SSHD_PIDFILE:=/var/run/${SVCNAME}.pid} +: ${SSHD_BINARY:=/usr/sbin/sshd} depend() { use logger dns - if [ "${rc_need+set}" = "set" ]; then + if [ "${rc_need+set}" = "set" ] ; then : # Do nothing, the user has explicitly set rc_need else - warn_addr='' + local x warn_addr for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do - case "$x" in + case "${x}" in 0.0.0.0|0.0.0.0:*) ;; ::|\[::\]*) ;; - *) warn_addr="${warn_addr} $x" ;; + *) warn_addr="${warn_addr} ${x}" ;; esac done - unset x - if [ "${warn_addr:+set}" = "set" ]; then - need net + if [ -n "${warn_addr}" ] ; then + need net ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd" ewarn "where FOO is the interface(s) providing the following address(es):" ewarn "${warn_addr}" fi - unset warn_addr fi } @@ -41,8 +39,8 @@ checkconfig() { mkdir -p /var/empty || return 1 fi - if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then - eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd" + if [ ! -e "${SSHD_CONFIG}" ] ; then + eerror "You need an ${SSHD_CONFIG} file to run sshd" eerror "There is a sample file in /usr/share/doc/openssh" return 1 fi @@ -51,8 +49,8 @@ checkconfig() { [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \ && SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}" - [ "${SSHD_CONFDIR}" != "/etc/ssh" ] \ - && SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config" + [ "${SSHD_CONFIG}" != "/etc/ssh/sshd_config" ] \ + && SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFIG}" "${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1 } diff --git a/init.d/stunnel b/init.d/stunnel index db0e1fd..6ca77a3 100755 --- a/init.d/stunnel +++ b/init.d/stunnel @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel,v 1.1 2014/08/08 12:20:25 blueness Exp $ +# $Id$ SERVICENAME=${SVCNAME#*.} SERVICENAME=${SERVICENAME:-stunnel} diff --git a/init.d/svnserve b/init.d/svnserve index 2a4fd4b..1236cf5 100755 --- a/init.d/svnserve +++ b/init.d/svnserve @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 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.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $ +# $Id$ description="svn server" pidfile="/var/run/svnserve.pid" diff --git a/init.d/syslog-ng b/init.d/syslog-ng deleted file mode 100755 index 8242c2b..0000000 --- a/init.d/syslog-ng +++ /dev/null @@ -1,59 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.2 2014/12/18 19:51:36 mr_bones_ Exp $ - -SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} -SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} -SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} -SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run} -SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} - -SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root} -SYSLOG_NG_USER=${SYSLOG_NG_USER:-root} - -command="/usr/sbin/syslog-ng" -command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}" -extra_commands="checkconfig" -extra_started_commands="reload" -pidfile="${SYSLOG_NG_PIDFILE}" -start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\"" -description="Syslog-ng is a syslog replacement with advanced filtering features." -description_checkconfig="Check the configuration file that will be used by \"start\"" -description_reload="Reload the configuration without exiting" -required_files="${SYSLOG_NG_CONFIGFILE}" -required_dirs="${SYSLOG_NG_PIDFILE_DIR}" - -depend() { - use clock - need hostname localmount - after bootmisc - provide logger -} - -checkconfig() { - ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" - syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" - eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" -} - -start_pre() { - checkconfig || return 1 - checkpath \ - -d \ - --mode 0700 \ - --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \ - "${SYSLOG_NG_STATEFILE_DIR}" -} - -stop_pre() { - [ "$RC_CMD" = restart ] && sleep 1 - return 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading configuration and re-opening log files" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} diff --git a/layman/layman.cfg b/layman/layman.cfg index e5c7c72..fdb0b8a 100644 --- a/layman/layman.cfg +++ b/layman/layman.cfg @@ -38,6 +38,7 @@ make_conf : %(storage)s/make.conf # file:///var/lib/layman/my-list.xml overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml + http://www.brehm-online.com/gentoo/overlay-repos.xml #----------------------------------------------------------- # The directory to scan for xml overlay definition files to include diff --git a/logrotate.conf b/logrotate.conf index 116d4a5..ee43af7 100644 --- a/logrotate.conf +++ b/logrotate.conf @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $ +# $Id$ # # Default logrotate(8) configuration file for Gentoo Linux. # See "man logrotate" for details. diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog index 1eae30e..3952b76 100644 --- a/logrotate.d/rsyslog +++ b/logrotate.d/rsyslog @@ -1,37 +1,57 @@ -# Uncomment the following directive if you have re-enabled -# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf" -#/var/log/syslog -#{ -# rotate 7 -# daily -# missingok -# notifempty -# delaycompress -# compress -# postrotate -# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null -# endscript -#} -/var/log/auth.log -/var/log/cron.log -/var/log/daemon.log -/var/log/kern.log -/var/log/lpr.log -/var/log/mail.log -/var/log/news.log -/var/log/user.log -/var/log/debug.log -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null - endscript +script syslog-reload + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null || true +endscript + +/var/log/messages /var/log/syslog { + daily + olddir /var/log/.old/%Y-%m + missingok + size 1024K + postrotate syslog-reload +} + +/var/log/syslog.d/* { + daily + olddir /var/log/syslog.d/.old/%Y-%m + missingok + size 1024K + postrotate syslog-reload + maxage 1y } + +/var/log/mail/*.log { + daily + olddir /var/log/mail/.old/%Y-%m + missingok + size 1024K + postrotate syslog-reload + maxage 2y +} + +/var/log/debug.log /var/log/debug /var/log/all /var/log/all.log { + daily + olddir /var/log/.old/%Y-%m + missingok + size 4M + postrotate syslog-reload + maxage 6m +} + +#/var/log/mail/authdaemond /var/log/mail/amavis* /var/log/mail/imapd* /var/log/mail/pop3d* /var/log/mail/postgrey /var/log/mail/spam* { +# daily +# olddir /var/log/mail/.old/%Y-%m +# size 1024K +# postrotate syslog-reload +# maxage 1y +#} + +#/var/log/mail/postfix/* { +# daily +# olddir /var/log/mail/.old/postfix/%Y-%m +# size 1024K +# postrotate syslog-reload +# maxage 1y +#} + +# vim: ts=4 filetype=conf diff --git a/logrotate.d/syslog-ng b/logrotate.d/syslog-ng index b68987e..12fc070 100644 --- a/logrotate.d/syslog-ng +++ b/logrotate.d/syslog-ng @@ -12,47 +12,47 @@ # endscript #} -script syslog-reload - /etc/init.d/syslog-ng reload >/dev/null || true -endscript - -/var/log/messages /var/log/syslog { - daily - olddir /var/log/.old/%Y-%m - size 1024K - postrotate syslog-reload -} - -/var/log/syslog.d/* { - daily - olddir /var/log/syslog.d/.old/%Y-%m - size 1024K - postrotate syslog-reload - maxage 1y -} - -/var/log/debug.log /var/log/debug /var/log/all { - daily - olddir /var/log/.old/%Y-%m - size 4M - postrotate syslog-reload - maxage 6m -} - -/var/log/mail/authdaemond /var/log/mail/amavis* /var/log/mail/imapd* /var/log/mail/pop3d* /var/log/mail/postgrey /var/log/mail/spam* { - daily - olddir /var/log/mail/.old/%Y-%m - size 1024K - postrotate syslog-reload - maxage 1y -} - -/var/log/mail/postfix/* { - daily - olddir /var/log/mail/.old/postfix/%Y-%m - size 1024K - postrotate syslog-reload - maxage 1y -} +#script syslog-reload +# /etc/init.d/syslog-ng reload >/dev/null || true +#endscript + +#/var/log/messages /var/log/syslog { +# daily +# olddir /var/log/.old/%Y-%m +# size 1024K +# postrotate syslog-reload +#} + +#/var/log/syslog.d/* { +# daily +# olddir /var/log/syslog.d/.old/%Y-%m +# size 1024K +# postrotate syslog-reload +# maxage 1y +#} + +#/var/log/debug.log /var/log/debug /var/log/all { +# daily +# olddir /var/log/.old/%Y-%m +# size 4M +# postrotate syslog-reload +# maxage 6m +#} + +#/var/log/mail/authdaemond /var/log/mail/amavis* /var/log/mail/imapd* /var/log/mail/pop3d* /var/log/mail/postgrey /var/log/mail/spam* { +# daily +# olddir /var/log/mail/.old/%Y-%m +# size 1024K +# postrotate syslog-reload +# maxage 1y +#} + +#/var/log/mail/postfix/* { +# daily +# olddir /var/log/mail/.old/postfix/%Y-%m +# size 1024K +# postrotate syslog-reload +# maxage 1y +#} # vim: ts=4 filetype=conf diff --git a/mke2fs.conf b/mke2fs.conf index 0871f77..47f59cc 100644 --- a/mke2fs.conf +++ b/mke2fs.conf @@ -1,5 +1,5 @@ [defaults] - base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr + base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr default_mntopts = acl,user_xattr enable_periodic_fsck = 0 blocksize = 4096 diff --git a/mutt/Muttrc.dist b/mutt/Muttrc.dist index 5a492d5..693bbc3 100644 --- a/mutt/Muttrc.dist +++ b/mutt/Muttrc.dist @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ "call urlview to extract URLs out of a message" # Show documentation when pressing F1 -macro generic,pager " less /usr/share/doc/mutt-1.5.23-r5/manual.txt" "show Mutt documentation" +macro generic,pager " less /usr/share/doc/mutt-1.5.23-r7/manual.txt" "show Mutt documentation" # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" @@ -747,6 +747,45 @@ attachments -I message/external-body # $crypt_autosign, $crypt_replysign and $smime_is_default. # # +# set crypt_confirmhook=yes +# +# Name: crypt_confirmhook +# Type: boolean +# Default: yes +# +# +# If set, then you will be prompted for confirmation of keys when using +# the crypt-hook command. If unset, no such confirmation prompt will +# be presented. This is generally considered unsafe, especially where +# typos are concerned. +# +# +# set crypt_opportunistic_encrypt=no +# +# Name: crypt_opportunistic_encrypt +# Type: boolean +# Default: no +# +# +# Setting this variable will cause Mutt to automatically enable and +# disable encryption, based on whether all message recipient keys +# can be located by mutt. +# +# When this option is enabled, mutt will determine the encryption +# setting each time the TO, CC, and BCC lists are edited. If +# $edit_headers is set, mutt will also do so each time the message +# is edited. +# +# While this is set, encryption settings can't be manually changed. +# The pgp or smime menus provide an option to disable the option for +# a particular message. +# +# If $crypt_autoencrypt or $crypt_replyencrypt enable encryption for +# a message, this option will be disabled for the message. It can +# be manually re-enabled in the pgp or smime menus. +# (Crypto only) +# +# # set crypt_replyencrypt=yes # # Name: crypt_replyencrypt @@ -2684,7 +2723,7 @@ attachments -I message/external-body # %s Expands to the name of a file containing the signature part # of a multipart/signed attachment when verifying it. # %a The value of $pgp_sign_as. -# %r One or more key IDs. +# %r One or more key IDs (or fingerprints if available). # # # For examples on how to configure these formats for the various versions @@ -2841,7 +2880,7 @@ attachments -I message/external-body # # This command is used to list the public key ring's contents. The # output format must be analogous to the one used by -# gpg --list-keys --with-colons +# gpg --list-keys --with-colons --with-fingerprint # # This format is also generated by the pgpring utility which comes # with mutt. @@ -2860,7 +2899,7 @@ attachments -I message/external-body # # This command is used to list the secret key ring's contents. The # output format must be analogous to the one used by: -# gpg --list-keys --with-colons +# gpg --list-keys --with-colons --with-fingerprint # # This format is also generated by the pgpring utility which comes # with mutt. @@ -2870,14 +2909,17 @@ attachments -I message/external-body # (PGP only) # # -# set pgp_long_ids=no +# set pgp_long_ids=yes # # Name: pgp_long_ids # Type: boolean -# Default: no +# Default: yes # # # If set, use 64 bit PGP key IDs, if unset use the normal 32 bit key IDs. +# NOTE: Internally, Mutt has transitioned to using fingerprints (or long key IDs +# as a fallback). This option now only controls the display of key IDs +# in the key selection menu and a few other places. # (PGP only) # # @@ -3135,6 +3177,8 @@ attachments -I message/external-body # # # If set, mutt will use a possibly-running gpg-agent(1) process. +# Note that as of version 2.1, GnuPG no longer exports GPG_AGENT_INFO, so +# mutt no longer verifies if the agent is running. # (PGP only) # # @@ -3389,6 +3433,31 @@ attachments -I message/external-body # Also see the $postpone variable. # # +# set postpone_encrypt=no +# +# Name: postpone_encrypt +# Type: boolean +# Default: no +# +# +# When set, postponed messages that are marked for encryption will be +# encrypted using the key in $postpone_encrypt_as before saving. +# (Crypto only) +# +# +# set postpone_encrypt_as="" +# +# Name: postpone_encrypt_as +# Type: string +# Default: "" +# +# +# This is the key used to encrypt postponed messages. It should be in +# keyid or fingerprint form (e.g. 0x00112233 for PGP or the +# hash-value that OpenSSL generates for S/MIME). +# (Crypto only) +# +# # set preconnect="" # # Name: preconnect @@ -4257,16 +4326,15 @@ attachments -I message/external-body # (S/MIME only) # # -# set smime_encrypt_with="" +# set smime_encrypt_with="aes256" # # Name: smime_encrypt_with # Type: string -# Default: "" +# Default: "aes256" # # # This sets the algorithm that should be used for encryption. -# Valid choices are ``des'', ``des3'', ``rc2-40'', ``rc2-64'', ``rc2-128''. -# If unset, ``3des'' (TripleDES) is used. +# Valid choices are ``aes128'', ``aes192'', ``aes256'', ``des'', ``des3'', ``rc2-40'', ``rc2-64'', ``rc2-128''. # (S/MIME only) # # @@ -4784,6 +4852,22 @@ attachments -I message/external-body # the function. # # +# set ssl_ciphers="" +# +# Name: ssl_ciphers +# Type: string +# Default: "" +# +# +# Contains a colon-seperated list of ciphers to use when using SSL. +# For OpenSSL, see ciphers(1) for the syntax of the string. +# +# For GnuTLS, this option will be used in place of "NORMAL" at the +# start of the priority string. See gnutls_priority_init(3) for the +# syntax and more details. (Note: GnuTLS version 2.1.7 or higher is +# required.) +# +# # set status_chars="-*%A" # # Name: status_chars diff --git a/mysql/my.cnf b/mysql/my.cnf index 47a2ba6..c419739 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -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.6,v 1.2 2015/03/15 17:31:35 grknight Exp $ +# $Id$ # The following options will be passed to all MySQL clients [client] @@ -138,3 +138,5 @@ write_buffer_size = 2M [mysqlhotcopy] interactive-timeout + +[mariadb] diff --git a/mysql/my.cnf.orig b/mysql/my.cnf.orig new file mode 100644 index 0000000..14d0dd3 --- /dev/null +++ b/mysql/my.cnf.orig @@ -0,0 +1,143 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Id$ + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=/usr/share/mysql/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log = /var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server = utf8 +user = mysql +port = 3306 +socket = /var/run/mysqld/mysqld.sock +pid-file = /var/run/mysqld/mysqld.pid +log-error = /var/log/mysql/mysqld.err +basedir = /usr +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 4M +table_open_cache = 400 +sort_buffer_size = 512K +net_buffer_length = 16K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +lc_messages_dir = /usr/share/mysql +#Set this to your desired error message language +lc_messages = en_US + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = /tmp/ +#log-update = /path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = /tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 128M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir = /var/lib/mysql/ +#innodb_log_arch_dir = /var/lib/mysql/ +#innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +innodb_log_file_size = 48M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_file_per_table + +# Uncomment this to get FEDERATED engine support +#plugin-load=federated=ha_federated.so +loose-federated + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer_size = 2M +write_buffer_size = 2M + +[mysqlhotcopy] +interactive-timeout + +[mariadb] diff --git a/php/apache2-php5.6/php.ini b/php/apache2-php5.6/php.ini index 20bc846..28ab2a7 100644 --- a/php/apache2-php5.6/php.ini +++ b/php/apache2-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/cgi-php5.6/php.ini b/php/cgi-php5.6/php.ini index 20bc846..28ab2a7 100644 --- a/php/cgi-php5.6/php.ini +++ b/php/cgi-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/cli-php5.6/php.ini b/php/cli-php5.6/php.ini index 20bc846..28ab2a7 100644 --- a/php/cli-php5.6/php.ini +++ b/php/cli-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/embed-php5.6/php.ini b/php/embed-php5.6/php.ini index 20bc846..28ab2a7 100644 --- a/php/embed-php5.6/php.ini +++ b/php/embed-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/php/fpm-php5.6/php.ini b/php/fpm-php5.6/php.ini index 20bc846..28ab2a7 100644 --- a/php/fpm-php5.6/php.ini +++ b/php/fpm-php5.6/php.ini @@ -898,7 +898,6 @@ default_socket_timeout = 60 ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll ;extension=php_shmop.dll ; The MIBS data available in the PHP distribution must be installed. diff --git a/portage/make.conf b/portage/make.conf index f767da6..b296a32 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -62,7 +62,7 @@ GRUB_PLATFORMS="coreboot emu multiboot pc qemu" #PHP_TARGETS="php5-3" PHP_TARGETS="php5-3 php5-5" -PYTHON_TARGETS="python2_7 python3_3 python3_4" +PYTHON_TARGETS="python2_7 python3_4" PYTHON_SINGLE_TARGET="python3_4" RUBY_TARGETS="ruby19" @@ -80,7 +80,7 @@ USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl da jadetex java javascript jbig jpeg jpeg2k json kerberos lasi ldap libwww lua \ lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \ nis nss numpy odbc ogg openexr openldap openssl pam pch pcre pdf perl pic png php postgres postscript python rar samba sasl \ - session smtp snmp soap spamassassin speex spell sqlite sqlite3 sse sse2 ssh \ + sctp session smtp snmp soap spamassassin speex spell sqlite sqlite3 sse sse2 ssh \ subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \ vorbis wmf x264 xattr xml xmlrpc xpm xsl xslt xvid zlib -development -rdoc" diff --git a/portage/package.use b/portage/package.use index f00cf35..4e18dd0 100644 --- a/portage/package.use +++ b/portage/package.use @@ -171,6 +171,7 @@ net-misc/curl libssh2 net-misc/iputils -doc caps gnutls net-misc/openssh sctp -X509 net-misc/openvpn down-root iproute2 +net-misc/stunnel stunnel3 net-nds/openldap experimental -kerberos overlays @@ -181,7 +182,7 @@ sci-mathematics/pari -doc sys-apps/busybox math sys-apps/dbus -doc sys-apps/openrc tools -sys-apps/pciutils network-cron -zlib +sys-apps/pciutils dns network-cron -zlib sys-apps/portage epydoc sys-apps/usbutils network-cron sys-apps/util-linux ddate loop-aes slang tty-helpers @@ -207,7 +208,7 @@ sys-libs/readline utils sys-fs/quota rpc sys-fs/udev devfs-compat edd extras hwdb -sys-process/cronie anacron +#sys-process/cronie anacron sys-process/lsof rpc virtual/ffmpeg libav diff --git a/profile.env b/profile.env index 21f1cb1..13f6415 100644 --- a/profile.env +++ b/profile.env @@ -18,7 +18,6 @@ export OPENGL_PROFILE='xorg-x11' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin' export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library' -export PYTHONDOCS_3_3='/usr/share/doc/python-docs-3.3.2/html/library' export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/lib64/subversion/bin' export XDG_CONFIG_DIRS='/etc/xdg' export XDG_DATA_DIRS='/usr/local/share:/usr/share' diff --git a/rsyslog.conf b/rsyslog.conf index da48459..a927dca 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -11,7 +11,7 @@ # own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/ # Check config syntax on startup and abort if unclean (default: off) -#$AbortOnUncleanConfig on +$AbortOnUncleanConfig on ############### @@ -25,7 +25,7 @@ module(load="imuxsock") module(load="imklog") # Inject "--MARK--" messages every $Interval (seconds) -#module(load="immark" Interval="600") +module(load="immark" Interval="3600") # Read syslog messages from UDP #module(load="imudp") @@ -35,6 +35,12 @@ module(load="imklog") #module(load="imtcp") #input(type="imtcp" port="514") +module(load="impstats" + interval="43200" + severity="7" + log.syslog="off" + /* need to turn log stream logging off! */ + log.file="/var/log/syslog.d/stats.log") ######################### ### GLOBAL DIRECTIVES ### @@ -51,9 +57,13 @@ $Umask 0022 module( load="builtin:omfile" - Template="RSYSLOG_TraditionalFileFormat" + Template="RSYSLOG_FileFormat" FileCreateMode="0644" DirCreateMode="0755" + fileOwnerNum="0" + fileGroupNum="0" + dirOwnerNum="0" + dirGroupNum="0" ) diff --git a/rsyslog.d/50-default.conf b/rsyslog.d/50-default.conf index 9ae8578..28fa0a4 100644 --- a/rsyslog.d/50-default.conf +++ b/rsyslog.d/50-default.conf @@ -2,63 +2,63 @@ ### DEFAULT ACTIONS ### ####################### -auth,authpriv.* action( - type="omfile" - File="/var/log/auth.log" - FileCreateMode="0600" - FileOwner="root" - FileGroup="adm" - Sync="off" -) +#auth,authpriv.* action( +# type="omfile" +# File="/var/log/auth.log" +# FileCreateMode="0600" +# FileOwner="root" +# FileGroup="adm" +# Sync="off" +#) -cron.* action( - type="omfile" - File="/var/log/cron.log" - FileOwner="root" - FileGroup="adm" -) +#cron.* action( +# type="omfile" +# File="/var/log/cron.log" +# FileOwner="root" +# FileGroup="adm" +#) -daemon.* action( - type="omfile" - File="/var/log/daemon.log" - FileOwner="root" - FileGroup="adm" -) +#daemon.* action( +# type="omfile" +# File="/var/log/daemon.log" +# FileOwner="root" +# FileGroup="adm" +#) -kern.* action( - type="omfile" - File="/var/log/kern.log" - FileOwner="root" - FileGroup="adm" -) +#kern.* action( +# type="omfile" +# File="/var/log/kern.log" +# FileOwner="root" +# FileGroup="adm" +#) -lpr.* action( - type="omfile" - File="/var/log/lpr.log" - FileOwner="root" - FileGroup="adm" -) +#lpr.* action( +# type="omfile" +# File="/var/log/lpr.log" +# FileOwner="root" +# FileGroup="adm" +#) -mail.* action( - type="omfile" - File="/var/log/mail.log" - FileOwner="root" - FileGroup="adm" -) +#mail.* action( +# type="omfile" +# File="/var/log/mail.log" +# FileOwner="root" +# FileGroup="adm" +#) -news.* action( - type="omfile" - File="/var/log/news.log" - FileOwner="root" - FileGroup="adm" -) +#news.* action( +# type="omfile" +# File="/var/log/news.log" +# FileOwner="root" +# FileGroup="adm" +#) -user.* action( - type="omfile" - File="/var/log/user.log" - FileOwner="root" - FileGroup="adm" -) +#user.* action( +# type="omfile" +# File="/var/log/user.log" +# FileOwner="root" +# FileGroup="adm" +#) *.=debug;auth,authpriv,news,mail.none action( type="omfile" @@ -67,7 +67,7 @@ user.* action( FileGroup="adm" ) -*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( +*.info;auth,authpriv,cron,lpr,mail,news.none action( type="omfile" File="/var/log/messages" FileOwner="root" @@ -77,7 +77,7 @@ user.* action( # Uncomment the following directive to re-enable the # deprecated "/var/log/syslog" log file (don't forget to re-enable log # rotation in "/etc/logrotate.d/rsyslog" if you do that!) -#*.*;auth,authpriv.none action( +#*.*;auth,authpriv,mail.none action( # type="omfile" # File="/var/log/syslog" # FileOwner="root" diff --git a/rsyslog.d/60-fb.conf b/rsyslog.d/60-fb.conf new file mode 100644 index 0000000..acef03b --- /dev/null +++ b/rsyslog.d/60-fb.conf @@ -0,0 +1,47 @@ + +template ( + name="facility" + type="string" + string="/var/log/syslog.d/%syslogfacility-text%.log" +) + +*.* action( + type="omfile" + DynaFile="facility" + DirCreateMode="0755" + FileCreateMode="0644" + FileOwner="root" + FileGroup="adm" +) + +template ( + name="mail" + type="string" + string="/var/log/mail/%programname%.log" +) + +mail.* action( + type="omfile" + DynaFile="mail" + DirCreateMode="0755" + FileCreateMode="0644" + FileOwner="root" + FileGroup="adm" +) + +*.* action( + type="omfile" + File="/var/log/all.log" + FileOwner="root" + FileGroup="adm" + Sync="off" +) + +*.warn;news,mail.none action( + type="omfile" + File="/dev/tty12" + FileOwner="root" + FileGroup="root" +) + +# vim: filetype=conf diff --git a/runlevels/default/rsyslog b/runlevels/default/rsyslog new file mode 120000 index 0000000..c2a829b --- /dev/null +++ b/runlevels/default/rsyslog @@ -0,0 +1 @@ +/etc/init.d/rsyslog \ No newline at end of file diff --git a/runlevels/default/syslog-ng b/runlevels/default/syslog-ng deleted file mode 120000 index 83ec2ac..0000000 --- a/runlevels/default/syslog-ng +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/syslog-ng \ No newline at end of file diff --git a/screenrc b/screenrc index 8248ff0..8089001 100644 --- a/screenrc +++ b/screenrc @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # /etc/screenrc @@ -64,7 +64,7 @@ multiuser off # Change default scrollback value for new windows - defscrollback 10000 # default: 100 + defscrollback 50000 # default: 100 # Define the time that all windows monitored for silence should # wait before displaying a message. Default 30 seconds. @@ -116,12 +116,12 @@ caption always " %{gw}$LOGNAME@%H | %{bw}%c%{-} | %{kw}%-Lw%{rw}%50>%{rW}%n%f* % # xterm understands both im/ic and doesn't have a status line. # Note: Do not specify im and ic in the real termcap/info file as # some programs (e.g. vi) will not work anymore. - termcap xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l - terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l + termcap xterm* hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l + terminfo xterm* hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l # 80/132 column switching must be enabled for ^AW to work # change init sequence to not switch width - termcapinfo xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l + termcapinfo xterm* Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l # Make the output buffer large for (fast) xterms. # termcapinfo xterm* OL=10000 @@ -129,25 +129,25 @@ caption always " %{gw}$LOGNAME@%H | %{bw}%c%{-} | %{kw}%-Lw%{rw}%50>%{rW}%n%f* % # tell screen that xterm can switch to dark background and has function # keys. - termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l' - termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' - termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' + termcapinfo xterm* 'VR=\E[?5h:VN=\E[?5l' + termcapinfo xterm* 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' + termcapinfo xterm* 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' # special xterm hardstatus: use the window title. - termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' + termcapinfo xterm* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' #terminfo xterm 'vb=\E[?5h$<200/>\E[?5l' - termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' + termcapinfo xterm* 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' # emulate part of the 'K' charset - termcapinfo xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' + termcapinfo xterm* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' # xterm-52 tweaks: # - uses background color for delete operations termcapinfo xterm* be # Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195) - termcapinfo xterm|xterms|xs ti@:te=\E[2J + termcapinfo xterm*|xs ti@:te=\E[2J # WYSE TERMINALS # =============================================================== diff --git a/security/limits.conf b/security/limits.conf index fd66ab7..be621a7 100644 --- a/security/limits.conf +++ b/security/limits.conf @@ -21,7 +21,7 @@ # - data - max data size (KB) # - fsize - maximum filesize (KB) # - memlock - max locked-in-memory address space (KB) -# - nofile - max number of open files +# - nofile - max number of open file descriptors # - rss - max resident set size (KB) # - stack - max stack size (KB) # - cpu - max CPU time (MIN) diff --git a/security/namespace.init b/security/namespace.init index 9ab5806..67d4aa2 100755 --- a/security/namespace.init +++ b/security/namespace.init @@ -1,4 +1,4 @@ -#!/bin/sh -p +#!/bin/sh # It receives polydir path as $1, the instance path as $2, # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3, # and user name in $4. diff --git a/smartd.conf b/smartd.conf deleted file mode 100644 index 5ef85b1..0000000 --- a/smartd.conf +++ /dev/null @@ -1,145 +0,0 @@ -# Sample configuration file for smartd. See man smartd.conf. - -# Home page is: http://smartmontools.sourceforge.net - -# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ - -# smartd will re-read the configuration file if it receives a HUP -# signal - -# The file gives a list of devices to monitor using smartd, with one -# device per line. Text after a hash (#) is ignored, and you may use -# spaces and tabs for white space. You may use '\' to continue lines. - -# You can usually identify which hard disks are on your system by -# looking in /proc/ide and in /proc/scsi. - -# The word DEVICESCAN will cause any remaining lines in this -# configuration file to be ignored: it tells smartd to scan for all -# ATA and SCSI devices. DEVICESCAN may be followed by any of the -# Directives listed below, which will be applied to all devices that -# are found. Most users should comment out DEVICESCAN and explicitly -# list the devices that they wish to monitor. -DEVICESCAN - -# Alternative setting to ignore temperature and power-on hours reports -# in syslog. -#DEVICESCAN -I 194 -I 231 -I 9 - -# Alternative setting to report more useful raw temperature in syslog. -#DEVICESCAN -R 194 -R 231 -I 9 - -# Alternative setting to report raw temperature changes >= 5 Celsius -# and min/max temperatures. -#DEVICESCAN -I 194 -I 231 -I 9 -W 5 - -# First (primary) ATA/IDE hard disk. Monitor all attributes, enable -# automatic online data collection, automatic Attribute autosave, and -# start a short self-test every day between 2-3am, and a long self test -# Saturdays between 3-4am. -#/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03) - -# Monitor SMART status, ATA Error Log, Self-test log, and track -# changes in all attributes except for attribute 194 -#/dev/hdb -H -l error -l selftest -t -I 194 - -# Monitor all attributes except normalized Temperature (usually 194), -# but track Temperature changes >= 4 Celsius, report Temperatures -# >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). -# Send mail on SMART failures or when Temperature is >= 55 Celsius. -#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com - -# An ATA disk may appear as a SCSI device to the OS. If a SCSI to -# ATA Translation (SAT) layer is between the OS and the device then -# this can be flagged with the '-d sat' option. This situation may -# become common with SATA disks in SAS and FC environments. -# /dev/sda -a -d sat - -# A very silent check. Only report SMART health status if it fails -# But send an email in this case -#/dev/hdc -H -C 0 -U 0 -m admin@example.com - -# First two SCSI disks. This will monitor everything that smartd can -# monitor. Start extended self-tests Wednesdays between 6-7pm and -# Sundays between 1-2 am -#/dev/sda -d scsi -s L/../../3/18 -#/dev/sdb -d scsi -s L/../../7/01 - -# Monitor 4 ATA disks connected to a 3ware 6/7/8000 controller which uses -# the 3w-xxxx driver. Start long self-tests Sundays between 1-2, 2-3, 3-4, -# and 4-5 am. -# NOTE: starting with the Linux 2.6 kernel series, the /dev/sdX interface -# is DEPRECATED. Use the /dev/tweN character device interface instead. -# For example /dev/twe0, /dev/twe1, and so on. -#/dev/sdc -d 3ware,0 -a -s L/../../7/01 -#/dev/sdc -d 3ware,1 -a -s L/../../7/02 -#/dev/sdc -d 3ware,2 -a -s L/../../7/03 -#/dev/sdc -d 3ware,3 -a -s L/../../7/04 - -# Monitor 2 ATA disks connected to a 3ware 9000 controller which -# uses the 3w-9xxx driver (Linux, FreeBSD). Start long self-tests Tuesdays -# between 1-2 and 3-4 am. -#/dev/twa0 -d 3ware,0 -a -s L/../../2/01 -#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 - -# Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which -# uses the 3w-sas driver (Linux). Start long self-tests Tuesdays -# between 1-2 and 3-4 am. -# On FreeBSD /dev/tws0 should be used instead -#/dev/twl0 -d 3ware,0 -a -s L/../../2/01 -#/dev/twl0 -d 3ware,1 -a -s L/../../2/03 - -# Same as above for Windows. Option '-d 3ware,N' is not necessary, -# disk (port) number is specified in device name. -# NOTE: On Windows, DEVICESCAN works also for 3ware controllers. -#/dev/hdc,0 -a -s L/../../2/01 -#/dev/hdc,1 -a -s L/../../2/03 - -# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long -# self-tests Sundays between 1-2, 2-3, and 3-4 am. -#/dev/sdd -d hpt,1/1 -a -s L/../../7/01 -#/dev/sdd -d hpt,1/2 -a -s L/../../7/02 -#/dev/sdd -d hpt,1/3 -a -s L/../../7/03 - -# Monitor 2 ATA disks connected to the same PMPort which connected to the -# HighPoint RocketRAID. Start long self-tests Tuesdays between 1-2 and 3-4 am -#/dev/sdd -d hpt,1/4/1 -a -s L/../../2/01 -#/dev/sdd -d hpt,1/4/2 -a -s L/../../2/03 - -# HERE IS A LIST OF DIRECTIVES FOR THIS CONFIGURATION FILE. -# PLEASE SEE THE smartd.conf MAN PAGE FOR DETAILS -# -# -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N, hpt,L/M/N -# -T TYPE set the tolerance to one of: normal, permissive -# -o VAL Enable/disable automatic offline tests (on/off) -# -S VAL Enable/disable attribute autosave (on/off) -# -n MODE No check. MODE is one of: never, sleep, standby, idle -# -H Monitor SMART Health Status, report if failed -# -l TYPE Monitor SMART log. Type is one of: error, selftest -# -f Monitor for failure of any 'Usage' Attributes -# -m ADD Send warning email to ADD for -H, -l error, -l selftest, and -f -# -M TYPE Modify email warning behavior (see man page) -# -s REGE Start self-test when type/date matches regular expression (see man page) -# -p Report changes in 'Prefailure' Normalized Attributes -# -u Report changes in 'Usage' Normalized Attributes -# -t Equivalent to -p and -u Directives -# -r ID Also report Raw values of Attribute ID with -p, -u or -t -# -R ID Track changes in Attribute ID Raw value with -p, -u or -t -# -i ID Ignore Attribute ID for -f Directive -# -I ID Ignore Attribute ID for -p, -u or -t Directive -# -C ID Report if Current Pending Sector count non-zero -# -U ID Report if Offline Uncorrectable count non-zero -# -W D,I,C Monitor Temperature D)ifference, I)nformal limit, C)ritical limit -# -v N,ST Modifies labeling of Attribute N (see man page) -# -a Default: equivalent to -H -f -t -l error -l selftest -C 197 -U 198 -# -F TYPE Use firmware bug workaround. Type is one of: none, samsung -# -P TYPE Drive-specific presets: use, ignore, show, showall -# # Comment: text after a hash sign is ignored -# \ Line continuation character -# Attribute ID is a decimal integer 1 <= ID <= 255 -# except for -C and -U, where ID = 0 turns them off. -# All but -d, -m and -M Directives are only implemented for ATA devices -# -# If the test string DEVICESCAN is the first uncommented text -# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z] -# DEVICESCAN may be followed by any desired Directives. diff --git a/smartd_warning.sh b/smartd_warning.sh deleted file mode 100755 index 6a1df14..0000000 --- a/smartd_warning.sh +++ /dev/null @@ -1,212 +0,0 @@ -#! /bin/sh -# -# smartd warning script -# -# Copyright (C) 2012-14 Christian Franke -# -# 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, or (at your option) -# any later version. -# -# You should have received a copy of the GNU General Public License -# (for example COPYING); If not, see . -# -# $Id: smartd_warning.sh.in 3932 2014-06-29 19:02:38Z chrfranke $ -# - -set -e - -# Set by config.status -PACKAGE="smartmontools" -VERSION="6.3" -prefix="/usr" -sysconfdir="/etc" -smartdscriptdir="${sysconfdir}" - -# Default mailer -os_mailer="mail" - -# Plugin directory (disabled if empty) -plugindir="${smartdscriptdir}/smartd_warning.d" - -# Parse options -dryrun= -case $1 in - --dryrun) dryrun=t; shift ;; -esac - -if [ $# != 0 ]; then - cat <&2 - exit 1 -fi - -# Get host and domain names -for cmd in 'hostname' 'echo "[Unknown]"'; do - hostname=`eval $cmd 2>/dev/null` || continue - test -n "$hostname" || continue - break -done - -dnsdomain=${hostname#*.} -if [ "$dnsdomain" != "$hostname" ]; then - # hostname command printed FQDN - hostname=${hostname%%.*} -else - for cmd in 'dnsdomainname' 'hostname -d' 'echo'; do - dnsdomain=`eval $cmd 2>/dev/null` || continue - break - done - test "$dnsdomain" != "(none)" || dnsdomain= -fi - -for cmd in 'nisdomainname' 'hostname -y' 'domainname' 'echo'; do - nisdomain=`eval $cmd 2>/dev/null` || continue - break -done -test "$nisdomain" != "(none)" || nisdomain= - -# Format subject -export SMARTD_SUBJECT="SMART error (${SMARTD_FAILTYPE-[SMARTD_FAILTYPE]}) detected on host: $hostname" - -# Format message -fullmessage=` - echo "This message was generated by the smartd daemon running on:" - echo - echo " host name: $hostname" - echo " DNS domain: ${dnsdomain:-[Empty]}" - test -z "$nisdomain" || - echo " NIS domain: $nisdomain" - #test -z "$USERDOMAIN" || - # echo " Win domain: $USERDOMAIN" - echo - echo "The following warning/error was logged by the smartd daemon:" - echo - echo "${SMARTD_MESSAGE-[SMARTD_MESSAGE]}" - echo - echo "Device info:" - echo "${SMARTD_DEVICEINFO-[SMARTD_DEVICEINFO]}" - echo - echo "For details see host's SYSLOG." - if [ "$SMARTD_FAILTYPE" != "EmailTest" ]; then - echo - echo "You can also use the smartctl utility for further investigation." - test "$SMARTD_PREVCNT" = "0" || - echo "The original message about this issue was sent at ${SMARTD_TFIRST-[SMARTD_TFIRST]}" - case $SMARTD_NEXTDAYS in - '') echo "No additional messages about this problem will be sent." ;; - 1) echo "Another message will be sent in 24 hours if the problem persists." ;; - *) echo "Another message will be sent in $SMARTD_NEXTDAYS days if the problem persists." ;; - esac - fi -` - -# Export message with trailing newline -export SMARTD_FULLMESSAGE="$fullmessage -" - -# Run plugin scripts if requested -if test -n "$plugindir"; then - case " $SMARTD_ADDRESS" in - *\ @*) - if [ -n "$dryrun" ]; then - echo "export SMARTD_SUBJECT='$SMARTD_SUBJECT'" - echo "export SMARTD_FULLMESSAGE='$SMARTD_FULLMESSAGE'" - fi - - # Run ALL scripts if requested - case " $SMARTD_ADDRESS " in - *\ @ALL\ *) - for cmd in "$plugindir"/*; do - if [ -f "$cmd" ] && [ -x "$cmd" ]; then - if [ -n "$dryrun" ]; then - echo "$cmd &2 - fi - ;; - *) - SMARTD_ADDRESS="${SMARTD_ADDRESS:+ }$ad" - ;; - esac - done - - # Send email to remaining addresses - test -n "$SMARTD_ADDRESS" || exit 0 - ;; - esac -fi - -# Send mail or run command -if [ -n "$SMARTD_ADDRESS" ]; then - - # Send mail, use platform mailer by default - test -n "$SMARTD_MAILER" || SMARTD_MAILER=$os_mailer - if [ -n "$dryrun" ]; then - echo "exec '$SMARTD_MAILER' -s '$SMARTD_SUBJECT' $SMARTD_ADDRESS < diff --git a/texmf/fmtutil.d/format.texlive-basic.cnf b/texmf/fmtutil.d/format.texlive-basic.cnf index f8c4e47..66b8983 100644 --- a/texmf/fmtutil.d/format.texlive-basic.cnf +++ b/texmf/fmtutil.d/format.texlive-basic.cnf @@ -1,5 +1,6 @@ -# Generated for texlive-basic by texlive-module.eclass +# Generated for texlive-basic by texlive-module.eclass dviluatex luatex language.def,language.dat.lua dviluatex.ini +luajittex luajittex language.def,language.dat.lua luatex.ini luatex luatex language.def,language.dat.lua luatex.ini mf mf-nowin - -translate-file=cp227.tcx mf.ini etex pdftex language.def -translate-file=cp227.tcx *etex.ini diff --git a/texmf/fmtutil.d/format.texlive-latex.cnf b/texmf/fmtutil.d/format.texlive-latex.cnf index 6ab164c..8722fc0 100644 --- a/texmf/fmtutil.d/format.texlive-latex.cnf +++ b/texmf/fmtutil.d/format.texlive-latex.cnf @@ -1,6 +1,7 @@ -# Generated for texlive-latex by texlive-module.eclass +# Generated for texlive-latex by texlive-module.eclass dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini lualatex luatex language.dat,language.dat.lua lualatex.ini pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex diff --git a/texmf/ls-R b/texmf/ls-R index 5ad5827..f26f872 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -1,20 +1,30 @@ % ls-R -- filename database for kpathsea; do not change this line. ./: .: -dvipdfmx +dvipdfm +dvipdfmx.d +dvips.d fmtutil.d language.dat.d language.dat.lua.d language.def.d ls-R +psutils.d texmf.d updmap.d web2c web2c.d -./dvipdfmx: +./dvipdfm: +config + +./dvipdfm/config: + +./dvipdfmx.d: dvipdfmx.cfg +./dvips.d: + ./fmtutil.d: format.texlive-basic.cnf format.texlive-latex.cnf @@ -29,6 +39,9 @@ format.texlive-latex.cnf .keep_app-text_texlive-core-0 +./psutils.d: +paper.cfg + ./texmf.d: 00header.cnf 05searchpaths.cnf @@ -37,15 +50,15 @@ format.texlive-latex.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 diff --git a/texmf/psutils.d/paper.cfg b/texmf/psutils.d/paper.cfg new file mode 100644 index 0000000..49a6aeb --- /dev/null +++ b/texmf/psutils.d/paper.cfg @@ -0,0 +1,3 @@ +# default papersize +p a4 +# more comment diff --git a/texmf/texmf.d/00header.cnf b/texmf/texmf.d/00header.cnf index e0d38fd..7d713dc 100644 --- a/texmf/texmf.d/00header.cnf +++ b/texmf/texmf.d/00header.cnf @@ -3,9 +3,9 @@ % % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an -% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. +% entire copy! -- in ../../texmf.cnf. That is, if this file is +% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2014/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,4 +40,3 @@ % use of this. - diff --git a/texmf/texmf.d/05searchpaths.cnf b/texmf/texmf.d/05searchpaths.cnf index 03eaeae..27db0f9 100644 --- a/texmf/texmf.d/05searchpaths.cnf +++ b/texmf/texmf.d/05searchpaths.cnf @@ -11,13 +11,13 @@ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: +% The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +% We used to have a separate /texmf tree with some core programs and files. +% Keep the variable name. +TEXMFMAIN = $TEXMFDIST + % The Gentoo site tree TEXMFSITE = $TEXMFROOT/texmf-site @@ -42,20 +42,17 @@ TEXMFVAR = ~/.texlive/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/texmf-config -% List all the texmf trees. +% List all the texmf trees. For an explanation of what they are, see the +% TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named % explicitly and before all other trees. % -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions +% should take precedence over distribution files -- although it is +% generally a source of confusion to have different versions of a +% package installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -63,13 +60,19 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use % VARTEXFONTS for generated files, if the original tree isn't writable; % otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST + +% First writable tree here is used by Lua(La)TeX for the font cache. +% LuaLaTeX uses the value here, while ConTeXt uses the same variable but +% from texmfcnf.lua; therefore the two values should be kept in sync. +% (As should everything else in texmf.cnf <-> texmfcnf.lua.) +TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR % We use GLOBALVARTEXFONTS in order to always be able to search in the global % font cache even if VARTEXFONTS is overridden. @@ -91,3 +94,4 @@ VARTEXFONTS = $GLOBALVARTEXFONTS % one of the TEXMF directories (avoids overlapping ls-R files). + diff --git a/texmf/texmf.d/10standardpaths.cnf b/texmf/texmf.d/10standardpaths.cnf index d046a95..4dbc623 100644 --- a/texmf/texmf.d/10standardpaths.cnf +++ b/texmf/texmf.d/10standardpaths.cnf @@ -58,15 +58,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - % LuaTeX. TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// % XeTeX. @@ -79,7 +75,7 @@ TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. @@ -253,8 +249,8 @@ MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc % Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. +% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. +% ConTeXT MkIV (all platforms) also use these values. % FONTCONFIG_FILE = fonts.conf FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf @@ -301,7 +297,7 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx % the /tex/ will not be found. % % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. +% The default LUAINPUTS suffices for luatex and dviluatex. % LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// @@ -329,20 +325,22 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % argv[0], in kpse_set_program_name. % % This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % The idea behind this lengthy definition: for each of -% SELFAUTO{LOC,DIR,AUTO}, look in the directory, -% then the subdirectories share/texmf-local and share/texmf, -% then ./texmf-local and ./texmf. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- we want to include one more directory: the % great-grandparent's texmf-local, because that is how TL is installed % by default. That is, given a binary % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find @@ -350,20 +348,13 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % As a result, we cannot use actual brace expansion in the definition, % since we don't want to scatter ../'s throughout the value. Hence we -% explicitly list every directory. Arguably more understandable this -% way anyway. +% explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ -$SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ -$SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ -$SELFAUTOPARENT/../texmf-local/web2c,\ -$SELFAUTOPARENT,\ -$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/local/share/texmf/web2c,\ +$SELFAUTOPARENT/etc/texmf/web2c\ } % % For reference, here is the old brace-using definition: diff --git a/texmf/texmf.d/15options.cnf b/texmf/texmf.d/15options.cnf index e947780..285e9b9 100644 --- a/texmf/texmf.d/15options.cnf +++ b/texmf/texmf.d/15options.cnf @@ -62,7 +62,7 @@ shell_escape.initex = f % for the purportedly safe shell_escape_commands above to system % directories. TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// % Allow TeX \openin, \openout, or \input on filenames starting with `.' % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? @@ -147,3 +147,4 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 + diff --git a/texmf/texmf.d/20sizes.cnf b/texmf/texmf.d/20sizes.cnf index 24a6289..98fd8ae 100644 --- a/texmf/texmf.d/20sizes.cnf +++ b/texmf/texmf.d/20sizes.cnf @@ -1,4 +1,4 @@ -% Part 3: Array and other sizes for TeX (and Metafont). +% Part 3: Array and other sizes for TeX, Metafont, etc. % % If you want to change some of these sizes only for a certain TeX % variant, the usual dot notation works, e.g., @@ -20,7 +20,7 @@ % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +main_memory = 5000000 % words of inimemory available; also applies to inimf&mp extra_mem_top = 0 % extra high memory for chars, tokens, etc. extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. @@ -30,17 +30,17 @@ extra_mem_bot.context = 4000000 % Words of font info for TeX (total size of all TFM files, approximately). % Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 +font_mem_size = 8000000 % Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). font_max = 9000 % Extra space for the hash table of control sequences. -hash_extra = 200000 +hash_extra = 600000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 +pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. string_vacancies = 90000 @@ -68,7 +68,7 @@ nest_size = 500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group +save_size = 100000 % for saving values outside current group stack_size = 5000 % simultaneous input sources % These are Omega-specific. @@ -107,4 +107,7 @@ line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 +% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? +% Default is 0, to not guess. +guess_input_kanji_encoding = 1 diff --git a/texmf/updmap.d/00updmap.cfg b/texmf/updmap.d/00updmap.cfg index 7128c79..53e4c56 100644 --- a/texmf/updmap.d/00updmap.cfg +++ b/texmf/updmap.d/00updmap.cfg @@ -1,12 +1,36 @@ -# $Id: updmap.cfg 26891 2012-06-10 22:41:49Z karl $ -# updmap.cfg for TEXMFMAIN - updmap options. +# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue Sep 30 03:19:47 2014 +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ +# +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. +# +# To make local customizations to the map files, using one of the +# following methods is simplest: +# 1) run +# 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. This will add lines to the updmap.cfg file in +# TEXMFSYSCONFIG (creating it if necessary). +# +# 2) put all your additional fonts into TEXMFLOCAL, edit +# TEXMFLOCAL/web2c/updmap.cfg, and run updmap-sys. +# +# See the output of updmap --help and/or +# http://tug.org/fonts/fontinstall.html for more. +# +# In any case, manual edits to TL's updmap.cfg files, psfonts.map, +# pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. +# +# Options for updmap. -################################################################ -# OPTIONS -################################################################ -# # dvipsPreferOutline # # Should dvips (by default) prefer bitmap fonts or outline fonts @@ -17,10 +41,9 @@ # 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 @@ -29,9 +52,10 @@ dvipsPreferOutline true # 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 @@ -41,36 +65,322 @@ LW35 URWkb # dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download # the LW35 fonts resp. use the built-in fonts. # -# Valid settings are true / false: dvipsDownloadBase35 true -# + # 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. +# the fonts. The PDF files will get bigger, though. +# pdftexDownloadBase14 true -# + # dvipdfmDownloadBase14 # # Should dvipdfm(x) 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 -# + # kanjiEmbed # # updmap generates a file kanjix.map for usage with dvipdfmx. With this # option one can switch between not embedding any kanji font, or # any of the several available. -# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring -# in a map file name will be replaced with this value, and the respective -# map file used. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. +# kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg) +#! Map accanthis.map +#! Map OrnementsADF.map +#! Map ArrowsADF.map +#! Map BulletsADF.map +#! Map Alegreya.map +#! MixedMap allrunes.map +#! Map euler.map +#! MixedMap cm.map +#! MixedMap cmextra.map +#! MixedMap cyrillic.map +#! MixedMap latxfont.map +#! MixedMap symbols.map +#! Map AnonymousPro.map +#! Map uaq.map +#! Map antt.map +#! Map arabi.map +#! MixedMap arabtex.map +#! Map syriac.map +#! Map archaicprw.map +#! Map arev.map +#! MixedMap arss.map +#! MixedMap artm.map +#! Map bkaiu.map +#! Map bsmiu.map +#! Map gbsnu.map +#! Map gkaiu.map +#! Map ascii.map +#! Map aspectratio.map +#! Map augie.map +#! Map auncial.map +#! Map aurical.map +#! Map uag.map +#! Map ybv.map +#! Map Baskervaldx.map +#! MixedMap bbold.map +#! Map belleek.map +#! Map bera.map +#! Map ybd.map +#! Map bguq.map +#! Map sqrcaps.map +#! Map ubk.map +#! Map boondox.map +#! Map pbsi.map +#! Map burmese.map +#! Map cabin.map +#! Map caladea.map +#! Map calligra.map +#! Map cantarell.map +#! Map carlito.map +#! Map cmin.map +#! MixedMap cbgreek-full.map +#! MixedMap ccpl.map +#! Map ccicons.map +#! Map clm.map +#! Map chemarrow.map +#! Map cinzel.map +#! Map cjhebrew.map +#! Map ClearSans.map +#! MixedMap cmtext-bsr-interpolated.map +#! Map cm-lgc.map +#! MixedMap cm-super-t1.map +#! MixedMap cm-super-t2a.map +#! MixedMap cm-super-t2b.map +#! MixedMap cm-super-t2c.map +#! MixedMap cm-super-ts1.map +#! MixedMap cm-super-x2.map +#! Map cmcyr.map +#! MixedMap cmll.map +#! Map comfortaa.map +#! Map original-context-symbol.map +#! Map CountriesOfEurope.map +#! Map ucr.map +#! Map cs-charter.map +#! Map csfonts.map +#! Map cyklop.map +#! Map dad.map +#! Map dante.map +#! Map dejavu-type1.map +#! Map dictsym.map +#! Map dstroke.map +#! Map droid.map +#! Map dutchcal.map +#! Map EBGaramond.map +#! Map EBGaramond-Maths.map +#! Map yes.map +#! Map epigrafica.map +#! Map epiolmec.map +#! Map erewhon.map +#! MixedMap esint.map +#! Map ESSTIX.map +#! Map esvect.map +#! MixedMap ethiop.map +#! MixedMap eurosym.map +#! Map fbb.map +#! Map fdsymbol.map +#! Map fetamont.map +#! Map fge.map +#! Map fira.map +#! Map foekfont.map +#! Map fonetika.map +#! Map nectec.map +#! Map nf.map +#! Map sipa.map +#! Map tlwg.map +#! Map fourier-utopia-expert.map +#! Map fourier.map +#! Map frcursive.map +#! Map garuda-c90.map +#! Map gentium-type1.map +#! Map gfsartemisia.map +#! Map gfsbaskerville.map +#! Map gfsbodoni.map +#! Map gfscomplutum.map +#! Map gfsdidot.map +#! Map gfsneohellenic.map +#! Map gfsporson.map +#! Map gfssolomos.map +#! Map gillius.map +#! Map yfrak.map +#! Map ugq.map +#! Map hacm.map +#! Map uhv.map +#! Map Heuristica.map +#! MixedMap hfbright.map +#! MixedMap iby.map +#! Map zi4.map +#! Map Acorn.map +#! Map AnnSton.map +#! Map ArtNouv.map +#! Map ArtNouvc.map +#! Map Carrickc.map +#! Map Eichenla.map +#! Map Eileen.map +#! Map EileenBl.map +#! Map Elzevier.map +#! Map GotIn.map +#! Map GoudyIn.map +#! Map Kinigcap.map +#! Map Konanur.map +#! Map Kramer.map +#! Map MorrisIn.map +#! Map Nouveaud.map +#! Map Romantik.map +#! Map Rothdn.map +#! Map RoyalIn.map +#! Map Sanremo.map +#! Map Starburst.map +#! Map Typocaps.map +#! Map Zallman.map +#! Map ipaex-type1.map +#! Map iwona.map +#! KanjiMap otf-@kanjiEmbed@.map +#! KanjiMap otf-cktx.map +#! KanjiMap otf-up-@kanjiEmbed@.map +#! Map kerkis.map +#! Map knitfont.map +#! Map kpfonts.map +#! Map kurier.map +#! Map lato.map +#! Map libertine.map +#! Map LibreBaskerville.map +#! Map LibreCaslon.map +#! Map yly.map +#! Map linearA.map +#! Map l7x-urwvn.map +#! Map lm.map +#! Map LobsterTwo.map +#! MixedMap lxfonts.map +#! MixedMap manfnt.map +#! Map marvosym.map +#! Map mathabx.map +#! Map mdbch.map +#! Map mdgreek.map +#! Map mdici.map +#! Map mdpgd.map +#! Map mdpus.map +#! Map mdput.map +#! Map mdugm.map +#! Map mdsymbol.map +#! Map merriweather.map +#! Map troff-updmap.map +#! MixedMap mflogo.map +#! Map mintspirit.map +#! Map MnSymbol.map +#! MixedMap mongolian.map +#! MixedMap musix.map +#! Map mxedruli.map +#! Map nanumfonts.map +#! Map unc.map +#! Map newpx.map +#! Map newtx.map +#! Map newtxtt.map +#! Map norasi-c90.map +#! Map cherokee.map +#! Map ocrb.map +#! Map oinuit.map +#! Map omega.map +#! Map opensans.map +#! Map overlock.map +#! Map upl.map +#! Map paratype-type1.map +#! Map dummy-space.map +#! Map phaistos.map +#! MixedMap pigpen.map +#! MixedMap plother.map +#! MixedMap pltext.map +#! Map PlayfairDisplay.map +#! Map ap.map +#! Map prodint.map +#! Map charter.map +#! Map fpls.map +#! Map pazo.map +#! Map utopia.map +#! KanjiMap morisawa.map +#! KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map +#! Map pxfonts.map +#! Map pxtx.map +#! Map quattrocento.map +#! Map Raleway.map +#! Map recycle.map +#! Map roboto.map +#! Map yrd.map +#! MixedMap rsfs.map +#! Map rsfso.map +#! Map skt.map +#! Map sansmathaccent.map +#! Map sansmathfonts.map +#! MixedMap semaf.map +#! Map SkakNew.map +#! Map SourceCodePro.map +#! Map SourceSansPro.map +#! Map starfont.map +#! Map icelandic.map +#! Map stix.map +#! MixedMap stmaryrd.map +#! Map superiors.map +#! Map usy.map +#! Map tabvar.map +Map mathpple.map +#! Map qag.map +#! Map qbk.map +#! Map qcr.map +#! Map qcs.map +#! Map qhv.map +#! Map qpl.map +#! Map qtm.map +#! Map qzc.map +#! Map tfrupee.map +#! Map utm.map +#! MixedMap tipa.map +#! MixedMap trajan.map +#! Map txfonts.map +#! Map gptimes.map +#! Map umj.map +#! Map universalis.map +#! KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map +#! MixedMap dvng.map +#! Map yv1.map +#! Map yv2.map +#! Map yv3.map +#! Map yvo.map +#! Map yvt.map +#! Map arevvn.map +#! Map chartervn.map +#! Map cmbrightvn.map +#! Map concretevn.map +#! Map grotesqvn.map +#! Map txttvn.map +#! Map urwvn.map +#! MixedMap vnrother.map +#! MixedMap vnrtext.map +#! Map vntopia.map +#! Map dgj.map +#! Map dmj.map +#! Map mc2j.map +#! Map mcj.map +#! Map mr2j.map +#! Map mrj.map +#! MixedMap wasy.map +#! Map XCharter.map +#! MixedMap xypic.map +#! MixedMap yhmath.map +#! Map uzc.map +#! Map uzd.map diff --git a/texmf/updmap.d/texlive-basic.cfg b/texmf/updmap.d/texlive-basic.cfg index 3b73535..e91058d 100644 --- a/texmf/updmap.d/texlive-basic.cfg +++ b/texmf/updmap.d/texlive-basic.cfg @@ -1,8 +1,9 @@ Map euler.map -MixedMap cm.map MixedMap cmextra.map +MixedMap cm.map MixedMap cyrillic.map MixedMap latxfont.map MixedMap symbols.map MixedMap cmtext-bsr-interpolated.map MixedMap mflogo.map +Map dummy-space.map diff --git a/texmf/updmap.d/texlive-fontsrecommended.cfg b/texmf/updmap.d/texlive-fontsrecommended.cfg index 5584bf7..ecbeac1 100644 --- a/texmf/updmap.d/texlive-fontsrecommended.cfg +++ b/texmf/updmap.d/texlive-fontsrecommended.cfg @@ -1,14 +1,21 @@ +Map uag.map +Map ubk.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map MixedMap cm-super-t2b.map MixedMap cm-super-t2c.map MixedMap cm-super-ts1.map MixedMap cm-super-x2.map +Map ucr.map MixedMap eurosym.map +Map uhv.map Map lm.map Map marvosym.map +Map unc.map +Map upl.map Map pxfonts.map MixedMap rsfs.map +Map usy.map Map qag.map Map qbk.map Map qcr.map @@ -17,6 +24,9 @@ Map qhv.map Map qpl.map Map qtm.map Map qzc.map +Map utm.map MixedMap tipa.map Map txfonts.map MixedMap wasy.map +Map uzc.map +Map uzd.map diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf index 1d93173..b753274 100644 --- a/texmf/web2c.d/fmtutil-hdr.cnf +++ b/texmf/web2c.d/fmtutil-hdr.cnf @@ -1,4 +1,4 @@ -# $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $ +# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $ # Originally written by Thomas Esser, 1998. Public domain. # # As of TeX Live 2008, the final fmtutil.cnf is generated by @@ -13,7 +13,7 @@ # 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. +# a * character; this is essentially equivalent to the -etex option. # # fmtutil always passes the -ini option to the engine. # If no pattern-file is desired, use -. @@ -23,7 +23,7 @@ # 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). +# plain.tex (e.g., bplain.ini file for bplain format). # # 2) etex-based formats load language.def, not language.dat. # diff --git a/texmf/web2c.d/updmap-hdr.cfg b/texmf/web2c.d/updmap-hdr.cfg index 5eda450..db3560c 100644 --- a/texmf/web2c.d/updmap-hdr.cfg +++ b/texmf/web2c.d/updmap-hdr.cfg @@ -1,11 +1,10 @@ -# $Id: updmap-hdr.cfg 26891 2012-06-10 22:41:49Z karl $ +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ # -# The updmap.cfg in this tree (TEXMFDIST) is generated by tlmgr by -# concatenating updmap-hdr.cfg with all updmap.cfg files found. +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. # # To make local customizations to the map files, using one of the # following methods is simplest: -# # 1) run # updmap-sys --enable Map=foo.map # for each map file. (Or MixedMap instead of Map, if your font has @@ -21,7 +20,82 @@ # # In any case, manual edits to TL's updmap.cfg files, psfonts.map, # pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. + +# +# Options for updmap. + + +# 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 ... +# +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. +# +dvipsDownloadBase35 true + + +# 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. +# +pdftexDownloadBase14 true + + +# dvipdfmDownloadBase14 +# +# Should dvipdfm(x) 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. +# +dvipdfmDownloadBase14 true + + +# kanjiEmbed +# +# updmap generates a file kanjix.map for usage with dvipdfmx. With this +# option one can switch between not embedding any kanji font, or +# any of the several available. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. # -# The default settings of the updmap options (not maps) are specified in -# TEXMFMAIN/web2c/updmap.cfg and can be overridden by an updmap.cfg in -# any other tree. +kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg) diff --git a/texmf/web2c/fmtutil.cnf b/texmf/web2c/fmtutil.cnf index 57c7722..2d692a2 100644 --- a/texmf/web2c/fmtutil.cnf +++ b/texmf/web2c/fmtutil.cnf @@ -1,14 +1,16 @@ -# Generated for texlive-basic by texlive-module.eclass +# Generated for texlive-basic by texlive-module.eclass dviluatex luatex language.def,language.dat.lua dviluatex.ini +luajittex luajittex language.def,language.dat.lua luatex.ini luatex luatex language.def,language.dat.lua luatex.ini mf mf-nowin - -translate-file=cp227.tcx mf.ini etex pdftex language.def -translate-file=cp227.tcx *etex.ini pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini tex tex - tex.ini -# Generated for texlive-latex by texlive-module.eclass +# Generated for texlive-latex by texlive-module.eclass dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini lualatex luatex language.dat,language.dat.lua lualatex.ini pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex diff --git a/texmf/web2c/texmf.cnf b/texmf/web2c/texmf.cnf index dded415..68c8a23 100644 --- a/texmf/web2c/texmf.cnf +++ b/texmf/web2c/texmf.cnf @@ -3,9 +3,9 @@ % % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an -% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. +% entire copy! -- in ../../texmf.cnf. That is, if this file is +% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2014/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,7 +40,6 @@ % use of this. - % Part 1: Search paths and directories. % This is the parent directory of our several trees, i.e., @@ -54,13 +53,13 @@ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: +% The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +% We used to have a separate /texmf tree with some core programs and files. +% Keep the variable name. +TEXMFMAIN = $TEXMFDIST + % The Gentoo site tree TEXMFSITE = $TEXMFROOT/texmf-site @@ -85,20 +84,17 @@ TEXMFVAR = ~/.texlive/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/texmf-config -% List all the texmf trees. +% List all the texmf trees. For an explanation of what they are, see the +% TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named % explicitly and before all other trees. % -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions +% should take precedence over distribution files -- although it is +% generally a source of confusion to have different versions of a +% package installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -106,13 +102,19 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use % VARTEXFONTS for generated files, if the original tree isn't writable; % otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST + +% First writable tree here is used by Lua(La)TeX for the font cache. +% LuaLaTeX uses the value here, while ConTeXt uses the same variable but +% from texmfcnf.lua; therefore the two values should be kept in sync. +% (As should everything else in texmf.cnf <-> texmfcnf.lua.) +TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR % We use GLOBALVARTEXFONTS in order to always be able to search in the global % font cache even if VARTEXFONTS is overridden. @@ -134,6 +136,7 @@ VARTEXFONTS = $GLOBALVARTEXFONTS % one of the TEXMF directories (avoids overlapping ls-R files). + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the following variables. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -194,15 +197,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - % LuaTeX. TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// % XeTeX. @@ -215,7 +214,7 @@ TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. @@ -389,8 +388,8 @@ MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc % Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. +% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. +% ConTeXT MkIV (all platforms) also use these values. % FONTCONFIG_FILE = fonts.conf FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf @@ -437,7 +436,7 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx % the /tex/ will not be found. % % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. +% The default LUAINPUTS suffices for luatex and dviluatex. % LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// @@ -465,20 +464,22 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % argv[0], in kpse_set_program_name. % % This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % The idea behind this lengthy definition: for each of -% SELFAUTO{LOC,DIR,AUTO}, look in the directory, -% then the subdirectories share/texmf-local and share/texmf, -% then ./texmf-local and ./texmf. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- we want to include one more directory: the % great-grandparent's texmf-local, because that is how TL is installed % by default. That is, given a binary % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find @@ -486,20 +487,13 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % As a result, we cannot use actual brace expansion in the definition, % since we don't want to scatter ../'s throughout the value. Hence we -% explicitly list every directory. Arguably more understandable this -% way anyway. +% explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ -$SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ -$SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ -$SELFAUTOPARENT/../texmf-local/web2c,\ -$SELFAUTOPARENT,\ -$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/local/share/texmf/web2c,\ +$SELFAUTOPARENT/etc/texmf/web2c\ } % % For reference, here is the old brace-using definition: @@ -577,7 +571,7 @@ shell_escape.initex = f % for the purportedly safe shell_escape_commands above to system % directories. TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// % Allow TeX \openin, \openout, or \input on filenames starting with `.' % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? @@ -662,7 +656,8 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 -% Part 3: Array and other sizes for TeX (and Metafont). + +% Part 3: Array and other sizes for TeX, Metafont, etc. % % If you want to change some of these sizes only for a certain TeX % variant, the usual dot notation works, e.g., @@ -684,7 +679,7 @@ BIBTEX_CSFILE = 88591lat.csf % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +main_memory = 5000000 % words of inimemory available; also applies to inimf&mp extra_mem_top = 0 % extra high memory for chars, tokens, etc. extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. @@ -694,17 +689,17 @@ extra_mem_bot.context = 4000000 % Words of font info for TeX (total size of all TFM files, approximately). % Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 +font_mem_size = 8000000 % Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). font_max = 9000 % Extra space for the hash table of control sequences. -hash_extra = 200000 +hash_extra = 600000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 +pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. string_vacancies = 90000 @@ -732,7 +727,7 @@ nest_size = 500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group +save_size = 100000 % for saving values outside current group stack_size = 5000 % simultaneous input sources % These are Omega-specific. @@ -771,4 +766,7 @@ line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 +% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? +% Default is 0, to not guess. +guess_input_kanji_encoding = 1 diff --git a/texmf/web2c/updmap.cfg b/texmf/web2c/updmap.cfg index c769b27..0146d13 100644 --- a/texmf/web2c/updmap.cfg +++ b/texmf/web2c/updmap.cfg @@ -1,12 +1,36 @@ -# $Id: updmap.cfg 26891 2012-06-10 22:41:49Z karl $ -# updmap.cfg for TEXMFMAIN - updmap options. +# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue Sep 30 03:19:47 2014 +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ +# +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. +# +# To make local customizations to the map files, using one of the +# following methods is simplest: +# 1) run +# 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. This will add lines to the updmap.cfg file in +# TEXMFSYSCONFIG (creating it if necessary). +# +# 2) put all your additional fonts into TEXMFLOCAL, edit +# TEXMFLOCAL/web2c/updmap.cfg, and run updmap-sys. +# +# See the output of updmap --help and/or +# http://tug.org/fonts/fontinstall.html for more. +# +# In any case, manual edits to TL's updmap.cfg files, psfonts.map, +# pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. +# +# Options for updmap. -################################################################ -# OPTIONS -################################################################ -# # dvipsPreferOutline # # Should dvips (by default) prefer bitmap fonts or outline fonts @@ -17,10 +41,9 @@ # 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 @@ -29,9 +52,10 @@ dvipsPreferOutline true # 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 @@ -41,58 +65,352 @@ LW35 URWkb # dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download # the LW35 fonts resp. use the built-in fonts. # -# Valid settings are true / false: dvipsDownloadBase35 true -# + # 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. +# the fonts. The PDF files will get bigger, though. +# pdftexDownloadBase14 true -# + # dvipdfmDownloadBase14 # # Should dvipdfm(x) 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 -# + # kanjiEmbed # # updmap generates a file kanjix.map for usage with dvipdfmx. With this # option one can switch between not embedding any kanji font, or # any of the several available. -# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring -# in a map file name will be replaced with this value, and the respective -# map file used. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. +# kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg) +#! Map accanthis.map +#! Map OrnementsADF.map +#! Map ArrowsADF.map +#! Map BulletsADF.map +#! Map Alegreya.map +#! MixedMap allrunes.map +#! Map euler.map +#! MixedMap cm.map +#! MixedMap cmextra.map +#! MixedMap cyrillic.map +#! MixedMap latxfont.map +#! MixedMap symbols.map +#! Map AnonymousPro.map +#! Map uaq.map +#! Map antt.map +#! Map arabi.map +#! MixedMap arabtex.map +#! Map syriac.map +#! Map archaicprw.map +#! Map arev.map +#! MixedMap arss.map +#! MixedMap artm.map +#! Map bkaiu.map +#! Map bsmiu.map +#! Map gbsnu.map +#! Map gkaiu.map +#! Map ascii.map +#! Map aspectratio.map +#! Map augie.map +#! Map auncial.map +#! Map aurical.map +#! Map uag.map +#! Map ybv.map +#! Map Baskervaldx.map +#! MixedMap bbold.map +#! Map belleek.map +#! Map bera.map +#! Map ybd.map +#! Map bguq.map +#! Map sqrcaps.map +#! Map ubk.map +#! Map boondox.map +#! Map pbsi.map +#! Map burmese.map +#! Map cabin.map +#! Map caladea.map +#! Map calligra.map +#! Map cantarell.map +#! Map carlito.map +#! Map cmin.map +#! MixedMap cbgreek-full.map +#! MixedMap ccpl.map +#! Map ccicons.map +#! Map clm.map +#! Map chemarrow.map +#! Map cinzel.map +#! Map cjhebrew.map +#! Map ClearSans.map +#! MixedMap cmtext-bsr-interpolated.map +#! Map cm-lgc.map +#! MixedMap cm-super-t1.map +#! MixedMap cm-super-t2a.map +#! MixedMap cm-super-t2b.map +#! MixedMap cm-super-t2c.map +#! MixedMap cm-super-ts1.map +#! MixedMap cm-super-x2.map +#! Map cmcyr.map +#! MixedMap cmll.map +#! Map comfortaa.map +#! Map original-context-symbol.map +#! Map CountriesOfEurope.map +#! Map ucr.map +#! Map cs-charter.map +#! Map csfonts.map +#! Map cyklop.map +#! Map dad.map +#! Map dante.map +#! Map dejavu-type1.map +#! Map dictsym.map +#! Map dstroke.map +#! Map droid.map +#! Map dutchcal.map +#! Map EBGaramond.map +#! Map EBGaramond-Maths.map +#! Map yes.map +#! Map epigrafica.map +#! Map epiolmec.map +#! Map erewhon.map +#! MixedMap esint.map +#! Map ESSTIX.map +#! Map esvect.map +#! MixedMap ethiop.map +#! MixedMap eurosym.map +#! Map fbb.map +#! Map fdsymbol.map +#! Map fetamont.map +#! Map fge.map +#! Map fira.map +#! Map foekfont.map +#! Map fonetika.map +#! Map nectec.map +#! Map nf.map +#! Map sipa.map +#! Map tlwg.map +#! Map fourier-utopia-expert.map +#! Map fourier.map +#! Map frcursive.map +#! Map garuda-c90.map +#! Map gentium-type1.map +#! Map gfsartemisia.map +#! Map gfsbaskerville.map +#! Map gfsbodoni.map +#! Map gfscomplutum.map +#! Map gfsdidot.map +#! Map gfsneohellenic.map +#! Map gfsporson.map +#! Map gfssolomos.map +#! Map gillius.map +#! Map yfrak.map +#! Map ugq.map +#! Map hacm.map +#! Map uhv.map +#! Map Heuristica.map +#! MixedMap hfbright.map +#! MixedMap iby.map +#! Map zi4.map +#! Map Acorn.map +#! Map AnnSton.map +#! Map ArtNouv.map +#! Map ArtNouvc.map +#! Map Carrickc.map +#! Map Eichenla.map +#! Map Eileen.map +#! Map EileenBl.map +#! Map Elzevier.map +#! Map GotIn.map +#! Map GoudyIn.map +#! Map Kinigcap.map +#! Map Konanur.map +#! Map Kramer.map +#! Map MorrisIn.map +#! Map Nouveaud.map +#! Map Romantik.map +#! Map Rothdn.map +#! Map RoyalIn.map +#! Map Sanremo.map +#! Map Starburst.map +#! Map Typocaps.map +#! Map Zallman.map +#! Map ipaex-type1.map +#! Map iwona.map +#! KanjiMap otf-@kanjiEmbed@.map +#! KanjiMap otf-cktx.map +#! KanjiMap otf-up-@kanjiEmbed@.map +#! Map kerkis.map +#! Map knitfont.map +#! Map kpfonts.map +#! Map kurier.map +#! Map lato.map +#! Map libertine.map +#! Map LibreBaskerville.map +#! Map LibreCaslon.map +#! Map yly.map +#! Map linearA.map +#! Map l7x-urwvn.map +#! Map lm.map +#! Map LobsterTwo.map +#! MixedMap lxfonts.map +#! MixedMap manfnt.map +#! Map marvosym.map +#! Map mathabx.map +#! Map mdbch.map +#! Map mdgreek.map +#! Map mdici.map +#! Map mdpgd.map +#! Map mdpus.map +#! Map mdput.map +#! Map mdugm.map +#! Map mdsymbol.map +#! Map merriweather.map +#! Map troff-updmap.map +#! MixedMap mflogo.map +#! Map mintspirit.map +#! Map MnSymbol.map +#! MixedMap mongolian.map +#! MixedMap musix.map +#! Map mxedruli.map +#! Map nanumfonts.map +#! Map unc.map +#! Map newpx.map +#! Map newtx.map +#! Map newtxtt.map +#! Map norasi-c90.map +#! Map cherokee.map +#! Map ocrb.map +#! Map oinuit.map +#! Map omega.map +#! Map opensans.map +#! Map overlock.map +#! Map upl.map +#! Map paratype-type1.map +#! Map dummy-space.map +#! Map phaistos.map +#! MixedMap pigpen.map +#! MixedMap plother.map +#! MixedMap pltext.map +#! Map PlayfairDisplay.map +#! Map ap.map +#! Map prodint.map +#! Map charter.map +#! Map fpls.map +#! Map pazo.map +#! Map utopia.map +#! KanjiMap morisawa.map +#! KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map +#! Map pxfonts.map +#! Map pxtx.map +#! Map quattrocento.map +#! Map Raleway.map +#! Map recycle.map +#! Map roboto.map +#! Map yrd.map +#! MixedMap rsfs.map +#! Map rsfso.map +#! Map skt.map +#! Map sansmathaccent.map +#! Map sansmathfonts.map +#! MixedMap semaf.map +#! Map SkakNew.map +#! Map SourceCodePro.map +#! Map SourceSansPro.map +#! Map starfont.map +#! Map icelandic.map +#! Map stix.map +#! MixedMap stmaryrd.map +#! Map superiors.map +#! Map usy.map +#! Map tabvar.map +Map mathpple.map +#! Map qag.map +#! Map qbk.map +#! Map qcr.map +#! Map qcs.map +#! Map qhv.map +#! Map qpl.map +#! Map qtm.map +#! Map qzc.map +#! Map tfrupee.map +#! Map utm.map +#! MixedMap tipa.map +#! MixedMap trajan.map +#! Map txfonts.map +#! Map gptimes.map +#! Map umj.map +#! Map universalis.map +#! KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map +#! MixedMap dvng.map +#! Map yv1.map +#! Map yv2.map +#! Map yv3.map +#! Map yvo.map +#! Map yvt.map +#! Map arevvn.map +#! Map chartervn.map +#! Map cmbrightvn.map +#! Map concretevn.map +#! Map grotesqvn.map +#! Map txttvn.map +#! Map urwvn.map +#! MixedMap vnrother.map +#! MixedMap vnrtext.map +#! Map vntopia.map +#! Map dgj.map +#! Map dmj.map +#! Map mc2j.map +#! Map mcj.map +#! Map mr2j.map +#! Map mrj.map +#! MixedMap wasy.map +#! Map XCharter.map +#! MixedMap xypic.map +#! MixedMap yhmath.map +#! Map uzc.map +#! Map uzd.map Map euler.map -MixedMap cm.map MixedMap cmextra.map +MixedMap cm.map MixedMap cyrillic.map MixedMap latxfont.map MixedMap symbols.map MixedMap cmtext-bsr-interpolated.map MixedMap mflogo.map +Map dummy-space.map +Map uag.map +Map ubk.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map MixedMap cm-super-t2b.map MixedMap cm-super-t2c.map MixedMap cm-super-ts1.map MixedMap cm-super-x2.map +Map ucr.map MixedMap eurosym.map +Map uhv.map Map lm.map Map marvosym.map +Map unc.map +Map upl.map Map pxfonts.map MixedMap rsfs.map +Map usy.map Map qag.map Map qbk.map Map qcr.map @@ -101,9 +419,12 @@ Map qhv.map Map qpl.map Map qtm.map Map qzc.map +Map utm.map MixedMap tipa.map Map txfonts.map MixedMap wasy.map +Map uzc.map +Map uzd.map Map charter.map Map fpls.map Map pazo.map diff --git a/tmpfiles.d/screen.conf b/tmpfiles.d/screen.conf new file mode 100644 index 0000000..5c76462 --- /dev/null +++ b/tmpfiles.d/screen.conf @@ -0,0 +1 @@ +d /tmp/screen 0755 root root diff --git a/vim/vimrc b/vim/vimrc index 4575017..255ab3f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -2,7 +2,7 @@ scriptencoding utf-8 " ^^ Please leave the above line at the start of the file. " Default configuration file for Vim -" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.3 2010/04/15 19:30:32 darkside Exp $ +" $Id$ " Written by Aron Griffis " Modified by Ryan Phillips -- 2.39.5