From 2b61912f91ceae5ddd904f93cc64761f47118233 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 14 Aug 2013 22:16:44 +0200 Subject: [PATCH] Current state --- X11/Xresources | 25 +- apache2/modules.d/00_apache_manual.conf | 4 +- conf.d/saslauthd | 32 +- conf.d/syslog-ng | 38 +- config-archive/etc/conf.d/syslog-ng | 8 + config-archive/etc/conf.d/syslog-ng.dist | 42 + config-archive/etc/postfix/main.cf | 4 +- config-archive/etc/postfix/main.cf.1 | 6 +- config-archive/etc/postfix/main.cf.2 | 4 +- config-archive/etc/postfix/main.cf.3 | 13 +- config-archive/etc/postfix/main.cf.4 | 4 +- config-archive/etc/postfix/main.cf.5 | 2 +- config-archive/etc/postfix/main.cf.6 | 692 +++ config-archive/etc/postfix/main.cf.dist | 5 +- config-archive/etc/smartd.conf | 147 + config-archive/etc/smartd.conf.dist | 145 + config-archive/etc/syslog-ng/syslog-ng.conf | 21 +- config-archive/etc/syslog-ng/syslog-ng.conf.1 | 94 + ...g-ng.conf.dist.new => syslog-ng.conf.dist} | 14 +- .../usr/share/config/kdm/kdmrc.dist.new | 2 +- cron.daily/hplip_cron | 36 - csh.env | 4 +- cups/printers.conf | 2 +- cups/subscriptions.conf | 4 +- env.d/05binutils | 4 +- env.d/binutils/config-x86_64-pc-linux-gnu | 2 +- env.d/binutils/x86_64-pc-linux-gnu-2.22 | 4 - env.d/binutils/x86_64-pc-linux-gnu-2.23.1 | 4 + etckeeper/commit.d/99push | 8 + etckeeper/etckeeper.conf | 6 +- etckeeper/pre-commit.d/30store-metadata | 6 +- etckeeper/uninit.d/50vcs-uninit | 4 +- etckeeper/update-ignore.d/01update-ignore | 5 +- .../infinality/conf.src/40-repl-generic.conf | 9 + fonts/infinality/conf.src/41-repl-os-inf.conf | 42 + .../infinality/conf.src/41-repl-os-linux.conf | 255 ++ fonts/infinality/conf.src/41-repl-os-osx.conf | 250 ++ fonts/infinality/conf.src/41-repl-os-win.conf | 256 ++ .../conf.src/60-group-non-tt-fonts.conf | 3875 ++++++++++++++++- .../conf.src/60-group-tt-fonts.conf | 2837 +++++++++++- .../61-group-non-tt-rendering-default.conf | 28 + .../conf.src/62-tt-monospace-rendering.conf | 114 + .../62-tt-traced-bitmap-rendering.conf | 107 + .../80-selective-rendering-inf-win-lin.conf | 69 +- .../generate60/60-group-non-tt-fonts.conf.awk | 44 + .../generate60/60-group-non-tt-fonts.list | 474 ++ .../generate60/60-group-tt-fonts.conf.awk | 29 + .../generate60/60-group-tt-fonts.list | 252 ++ .../conf.src/generate60/generate60.sh | 5 + fonts/infinality/infinality.conf | 11 +- .../nyx/30-non-latin-nyx.conf | 30 +- .../nyx/43-repl-terminus.conf | 1 - .../nyx/43-repl-tt-traced-bitmap.conf | 1 + gconf/gconf.xml.defaults/%gconf-tree.xml | 138 +- gentoo/gentoogtkrc | 51 +- gentoo/gentoorc | 275 +- hp/hplip.conf | 10 +- init.d/cpufrequtils | 35 +- init.d/dmcrypt | 346 -- init.d/g15daemon | 33 +- init.d/saslauthd | 6 +- init.d/syslog-ng | 72 +- portage/make.conf | 16 +- portage/package.keywords | 8 + portage/package.mask | 3 + portage/package.use | 4 + postfix/main.cf | 4 +- profile.env | 4 +- resolv.conf | 10 +- revdep-rebuild/61-icedtea-bin-6 | 2 +- smartd.conf | 7 +- smartd_warning.sh | 214 + speech-dispatcher/modules/cicero.conf | 4 +- speech-dispatcher/modules/espeak.conf | 15 + speech-dispatcher/speechd.conf | 18 +- syslog-ng/modules.conf | 32 - syslog-ng/scl.conf | 11 +- syslog-ng/syslog-ng.conf | 10 +- whois.conf | 1 + xdg/autostart/hplip-systray.desktop | 6 +- 80 files changed, 10413 insertions(+), 1002 deletions(-) create mode 100644 config-archive/etc/conf.d/syslog-ng create mode 100644 config-archive/etc/conf.d/syslog-ng.dist create mode 100644 config-archive/etc/postfix/main.cf.6 create mode 100644 config-archive/etc/smartd.conf create mode 100644 config-archive/etc/smartd.conf.dist create mode 100644 config-archive/etc/syslog-ng/syslog-ng.conf.1 rename config-archive/etc/syslog-ng/{syslog-ng.conf.dist.new => syslog-ng.conf.dist} (80%) delete mode 100755 cron.daily/hplip_cron delete mode 100644 env.d/binutils/x86_64-pc-linux-gnu-2.22 create mode 100644 env.d/binutils/x86_64-pc-linux-gnu-2.23.1 create mode 100755 etckeeper/commit.d/99push create mode 100644 fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf create mode 100644 fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk create mode 100644 fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list create mode 100644 fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk create mode 100644 fonts/infinality/conf.src/generate60/60-group-tt-fonts.list create mode 100644 fonts/infinality/conf.src/generate60/generate60.sh delete mode 120000 fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf create mode 120000 fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf delete mode 100755 init.d/dmcrypt create mode 100755 smartd_warning.sh delete mode 100644 syslog-ng/modules.conf diff --git a/X11/Xresources b/X11/Xresources index d34e0012..c65472e2 100644 --- a/X11/Xresources +++ b/X11/Xresources @@ -1,27 +1,4 @@ -################################################################# -################## EXPLANATION OF SETTINGS ###################### -################################################################# - -# XFT settings are like a red-headed stepchild that should be beaten severely. -# These only affect legacy programs, and *parts* of some modern programs like -# google-chrome. We only deal with these settings because we have to, otherwise -# crap will slip by. I recommend using hintslight and autohint as the defaults -# normally in local.conf. The reason hintfull and autohint:0 is needed here -# because otherwise some programs will occassionally request slight hinting for -# a truetype font. When a program does this, Freetype automatically uses the -# autohinter, when you may actually want it to be rendered with the TT hinter, -# (if specified in local.conf). So setting this to hintfull guarantees that the -# TT font will be rendered with the TT hinter (assuming it is specified in -# /etc/fonts/local.conf to be rendered that way.) For TT fonts that you want -# rendered with autohint, specifiying that in the /etc/fonts/local.conf -# should be enough. But you might think that by setting this to hintfull -# that it's going to use Freetype's full autohinting (which we *completely* -# avoid) for fonts you want autohinted. This is where -# INFINALITY_FT_AUTOFIT_FORCE_SLIGHT_HINTING comes in. It tells freetype to -# use slight hinting on fonts set for autohinting, even if the program requests -# full autohinting. Freetype's full hinting only looks OK under certain -# circumstances. The goal of infinality is to make infinality hinting look -# good all the time. +! basic settings for infinality Xft.antialias: 1 Xft.autohint: 0 diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index a0e5c830..d1f11402 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -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/conf.d/saslauthd b/conf.d/saslauthd index 3f2653c5..1eeaa483 100644 --- a/conf.d/saslauthd +++ b/conf.d/saslauthd @@ -1,25 +1,21 @@ -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf,v 1.2 2007/04/07 13:03:55 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf,v 1.1 2013/07/13 12:01:10 pacho Exp $ -# Config file for /etc/init.d/saslauthd +# Config file for /etc/init.d/saslauthd and systemd unit -# Initial (empty) options. -SASLAUTHD_OPTS="" +# PLEASE READ THIS IF YOU ARE USING SYSTEMD +# Please note that systemd does not expand shell variables +# thus, something like FOO="${FOO} bar" won't work. # Specify the authentications mechanism. # **NOTE** For a list see: saslauthd -v # Since 2.1.19, add "-r" to options for old behavior, # ie. reassemble user and realm to user@realm form. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r" -SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam" - -# Specify the hostname for remote IMAP server. -# **NOTE** Only needed if rimap auth mechanism is used. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost" - -# Specify the number of worker processes to create. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5" - -# Enable credential cache, set cache size and timeout. -# **NOTE** Size is measured in kilobytes. -# Timeout is measured in seconds. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30" +# +# Specify the hostname for remote IMAP server using: +# "-O localhost". +# Specify the number of worker processes to create using: +# "-n ". +# Enable credential cache, set cache size and timeout using: +# "-c -s -t ". +# +SASLAUTHD_OPTS="-a pam" diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng index 9c7eade5..6a437d1b 100644 --- a/conf.d/syslog-ng +++ b/conf.d/syslog-ng @@ -1,8 +1,42 @@ # 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=/var/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. -#rc_after="net" - SYSLOG_NG_OPTS="" diff --git a/config-archive/etc/conf.d/syslog-ng b/config-archive/etc/conf.d/syslog-ng new file mode 100644 index 00000000..9c7eade5 --- /dev/null +++ b/config-archive/etc/conf.d/syslog-ng @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/syslog-ng + +# Put any additional options for syslog-ng here. +# See syslog-ng(8) for more information. + +#rc_after="net" + +SYSLOG_NG_OPTS="" diff --git a/config-archive/etc/conf.d/syslog-ng.dist b/config-archive/etc/conf.d/syslog-ng.dist new file mode 100644 index 00000000..6a437d1b --- /dev/null +++ b/config-archive/etc/conf.d/syslog-ng.dist @@ -0,0 +1,42 @@ +# 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=/var/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/postfix/main.cf b/config-archive/etc/postfix/main.cf index c438ed09..1232f478 100644 --- a/config-archive/etc/postfix/main.cf +++ b/config-archive/etc/postfix/main.cf @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.5/html +html_directory = /usr/share/doc/postfix-2.10.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.5/readme +readme_directory = /usr/share/doc/postfix-2.10.0/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1 index c1606d6e..c438ed09 100644 --- a/config-archive/etc/postfix/main.cf.1 +++ b/config-archive/etc/postfix/main.cf.1 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.4/html +html_directory = /usr/share/doc/postfix-2.9.5/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,11 +658,11 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.4/readme +readme_directory = /usr/share/doc/postfix-2.9.5/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes -smtpd_sasl2_auth_enable = yes +#smtpd_sasl2_auth_enable = yes smtpd_sasl_security_options = noanonymous broken_sasl_auth_clients = yes smtpd_sasl_local_domain = $myhostname diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2 index 22ce4373..c1606d6e 100644 --- a/config-archive/etc/postfix/main.cf.2 +++ b/config-archive/etc/postfix/main.cf.2 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.3/html +html_directory = /usr/share/doc/postfix-2.9.4/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.3/readme +readme_directory = /usr/share/doc/postfix-2.9.4/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3 index 03fb0bfa..22ce4373 100644 --- a/config-archive/etc/postfix/main.cf.3 +++ b/config-archive/etc/postfix/main.cf.3 @@ -39,7 +39,7 @@ command_directory = /usr/sbin # daemon programs (i.e. programs listed in the master.cf file). This # directory must be owned by root. # -daemon_directory = /usr/lib64/postfix +daemon_directory = /usr/libexec/postfix # The data_directory parameter specifies the location of Postfix-writable # data files (caches, random numbers). This directory must be owned @@ -463,7 +463,12 @@ mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64 # the main.cf file, otherwise the SMTP server will reject mail for # non-UNIX accounts with "User unknown in local recipient table". # -#mailbox_transport = lmtp:unix:/file/name +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. #mailbox_transport = cyrus # The fallback_transport specifies the optional transport in master.cf @@ -640,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.8.9/html +html_directory = /usr/share/doc/postfix-2.9.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.8.9/readme +readme_directory = /usr/share/doc/postfix-2.9.3/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4 index 76d1551d..03fb0bfa 100644 --- a/config-archive/etc/postfix/main.cf.4 +++ b/config-archive/etc/postfix/main.cf.4 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.8.7/html +html_directory = /usr/share/doc/postfix-2.8.9/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.8.7/readme +readme_directory = /usr/share/doc/postfix-2.8.9/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5 index dba4ff00..76d1551d 100644 --- a/config-archive/etc/postfix/main.cf.5 +++ b/config-archive/etc/postfix/main.cf.5 @@ -264,7 +264,7 @@ unknown_local_recipient_reject_code = 550 #mynetworks = 168.100.189.0/28, 127.0.0.0/8 #mynetworks = $config_directory/mynetworks #mynetworks = hash:/etc/postfix/network_table -mynetworks = 10.12.11.0/24 +mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64 # The relay_domains parameter restricts what destinations this system will # relay mail to. See the smtpd_recipient_restrictions description in diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6 new file mode 100644 index 00000000..dba4ff00 --- /dev/null +++ b/config-archive/etc/postfix/main.cf.6 @@ -0,0 +1,692 @@ +# Global Postfix configuration file. This file lists only a subset +# of all parameters. For the syntax, and for a complete parameter +# list, see the postconf(5) manual page (command: "man 5 postconf"). +# +# For common configuration examples, see BASIC_CONFIGURATION_README +# and STANDARD_CONFIGURATION_README. To find these documents, use +# the command "postconf html_directory readme_directory", or go to +# http://www.postfix.org/. +# +# For best results, change no more than 2-3 parameters at a time, +# and test if Postfix still works after every change. + +# SOFT BOUNCE +# +# The soft_bounce parameter provides a limited safety net for +# testing. When soft_bounce is enabled, mail will remain queued that +# would otherwise bounce. This parameter disables locally-generated +# bounces, and prevents the SMTP server from rejecting mail permanently +# (by changing 5xx replies into 4xx replies). However, soft_bounce +# is no cure for address rewriting mistakes or mail routing mistakes. +# +#soft_bounce = no + +# LOCAL PATHNAME INFORMATION +# +# The queue_directory specifies the location of the Postfix queue. +# This is also the root directory of Postfix daemons that run chrooted. +# See the files in examples/chroot-setup for setting up Postfix chroot +# environments on different UNIX systems. +# +queue_directory = /var/spool/postfix + +# The command_directory parameter specifies the location of all +# postXXX commands. +# +command_directory = /usr/sbin + +# The daemon_directory parameter specifies the location of all Postfix +# daemon programs (i.e. programs listed in the master.cf file). This +# directory must be owned by root. +# +daemon_directory = /usr/lib64/postfix + +# The data_directory parameter specifies the location of Postfix-writable +# data files (caches, random numbers). This directory must be owned +# by the mail_owner account (see below). +# +data_directory = /var/lib/postfix + +# QUEUE AND PROCESS OWNERSHIP +# +# The mail_owner parameter specifies the owner of the Postfix queue +# and of most Postfix daemon processes. Specify the name of a user +# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS +# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In +# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED +# USER. +# +mail_owner = postfix + +# The default_privs parameter specifies the default rights used by +# the local delivery agent for delivery to external file or command. +# These rights are used in the absence of a recipient user context. +# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. +# +#default_privs = nobody + +# INTERNET HOST AND DOMAIN NAMES +# +# The myhostname parameter specifies the internet hostname of this +# mail system. The default is to use the fully-qualified domain name +# from gethostname(). $myhostname is used as a default value for many +# other configuration parameters. +# +#myhostname = host.domain.tld +#myhostname = virtual.domain.tld +myhostname = bruni.home.brehm-online.com + +# The mydomain parameter specifies the local internet domain name. +# The default is to use $myhostname minus the first component. +# $mydomain is used as a default value for many other configuration +# parameters. +# +#mydomain = domain.tld +mydomain = home.brehm-online.com + +# SENDING MAIL +# +# The myorigin parameter specifies the domain that locally-posted +# mail appears to come from. The default is to append $myhostname, +# which is fine for small sites. If you run a domain with multiple +# machines, you should (1) change this to $mydomain and (2) set up +# a domain-wide alias database that aliases each user to +# user@that.users.mailhost. +# +# For the sake of consistency between sender and recipient addresses, +# myorigin also specifies the default domain name that is appended +# to recipient addresses that have no @domain part. +# +#myorigin = $myhostname +#myorigin = $mydomain +myorigin = brehm-online.com + +# RECEIVING MAIL + +# The inet_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on. By default, +# the software claims all active interfaces on the machine. The +# parameter also controls delivery of mail to user@[ip.address]. +# +# See also the proxy_interfaces parameter, for network addresses that +# are forwarded to us via a proxy or network address translator. +# +# Note: you need to stop/start Postfix when this parameter changes. +# +#inet_interfaces = all +#inet_interfaces = $myhostname +#inet_interfaces = $myhostname, localhost +inet_interfaces = 10.12.11.2, localhost + +# The proxy_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on by way of a +# proxy or network address translation unit. This setting extends +# the address list specified with the inet_interfaces parameter. +# +# You must specify your proxy/NAT addresses when your system is a +# backup MX host for other domains, otherwise mail delivery loops +# will happen when the primary MX host is down. +# +#proxy_interfaces = +#proxy_interfaces = 1.2.3.4 + +# The mydestination parameter specifies the list of domains that this +# machine considers itself the final destination for. +# +# These domains are routed to the delivery agent specified with the +# local_transport parameter setting. By default, that is the UNIX +# compatible delivery agent that lookups all recipients in /etc/passwd +# and /etc/aliases or their equivalent. +# +# The default is $myhostname + localhost.$mydomain. On a mail domain +# gateway, you should also include $mydomain. +# +# Do not specify the names of virtual domains - those domains are +# specified elsewhere (see VIRTUAL_README). +# +# Do not specify the names of domains that this machine is backup MX +# host for. Specify those names via the relay_domains settings for +# the SMTP server, or use permit_mx_backup if you are lazy (see +# STANDARD_CONFIGURATION_README). +# +# The local machine is always the final destination for mail addressed +# to user@[the.net.work.address] of an interface that the mail system +# receives mail on (see the inet_interfaces parameter). +# +# Specify a list of host or domain names, /file/name or type:table +# patterns, separated by commas and/or whitespace. A /file/name +# pattern is replaced by its contents; a type:table is matched when +# a name matches a lookup key (the right-hand side is ignored). +# Continue long lines by starting the next line with whitespace. +# +# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". +# +#mydestination = $myhostname, localhost.$mydomain, localhost +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, +# mail.$mydomain, www.$mydomain, ftp.$mydomain + +# REJECTING MAIL FOR UNKNOWN LOCAL USERS +# +# The local_recipient_maps parameter specifies optional lookup tables +# with all names or addresses of users that are local with respect +# to $mydestination, $inet_interfaces or $proxy_interfaces. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown local users. This parameter is defined by default. +# +# To turn off local recipient checking in the SMTP server, specify +# local_recipient_maps = (i.e. empty). +# +# The default setting assumes that you use the default Postfix local +# delivery agent for local delivery. You need to update the +# local_recipient_maps setting if: +# +# - You define $mydestination domain recipients in files other than +# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. +# For example, you define $mydestination domain recipients in +# the $virtual_mailbox_maps files. +# +# - You redefine the local delivery agent in master.cf. +# +# - You redefine the "local_transport" setting in main.cf. +# +# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" +# feature of the Postfix local delivery agent (see local(8)). +# +# Details are described in the LOCAL_RECIPIENT_README file. +# +# Beware: if the Postfix SMTP server runs chrooted, you probably have +# to access the passwd file via the proxymap service, in order to +# overcome chroot restrictions. The alternative, having a copy of +# the system passwd file in the chroot jail is just not practical. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify a bare username, an @domain.tld +# wild-card, or specify a user@domain.tld address. +# +#local_recipient_maps = unix:passwd.byname $alias_maps +#local_recipient_maps = proxy:unix:passwd.byname $alias_maps +#local_recipient_maps = + +# The unknown_local_recipient_reject_code specifies the SMTP server +# response code when a recipient domain matches $mydestination or +# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty +# and the recipient address or address local-part is not found. +# +# The default setting is 550 (reject mail) but it is safer to start +# with 450 (try again later) until you are certain that your +# local_recipient_maps settings are OK. +# +unknown_local_recipient_reject_code = 550 + +# TRUST AND RELAY CONTROL + +# The mynetworks parameter specifies the list of "trusted" SMTP +# clients that have more privileges than "strangers". +# +# In particular, "trusted" SMTP clients are allowed to relay mail +# through Postfix. See the smtpd_recipient_restrictions parameter +# in postconf(5). +# +# You can specify the list of "trusted" network addresses by hand +# or you can let Postfix do it for you (which is the default). +# +# By default (mynetworks_style = subnet), Postfix "trusts" SMTP +# clients in the same IP subnetworks as the local machine. +# On Linux, this does works correctly only with interfaces specified +# with the "ifconfig" command. +# +# Specify "mynetworks_style = class" when Postfix should "trust" SMTP +# clients in the same IP class A/B/C networks as the local machine. +# Don't do this with a dialup site - it would cause Postfix to "trust" +# your entire provider's network. Instead, specify an explicit +# mynetworks list by hand, as described below. +# +# Specify "mynetworks_style = host" when Postfix should "trust" +# only the local machine. +# +#mynetworks_style = class +#mynetworks_style = subnet +#mynetworks_style = host + +# Alternatively, you can specify the mynetworks list by hand, in +# which case Postfix ignores the mynetworks_style setting. +# +# Specify an explicit list of network/netmask patterns, where the +# mask specifies the number of bits in the network part of a host +# address. +# +# You can also specify the absolute pathname of a pattern file instead +# of listing the patterns here. Specify type:table for table-based lookups +# (the value on the table right-hand side is not used). +# +#mynetworks = 168.100.189.0/28, 127.0.0.0/8 +#mynetworks = $config_directory/mynetworks +#mynetworks = hash:/etc/postfix/network_table +mynetworks = 10.12.11.0/24 + +# The relay_domains parameter restricts what destinations this system will +# relay mail to. See the smtpd_recipient_restrictions description in +# postconf(5) for detailed information. +# +# By default, Postfix relays mail +# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "untrusted" clients to destinations that match $relay_domains or +# subdomains thereof, except addresses with sender-specified routing. +# The default relay_domains value is $mydestination. +# +# In addition to the above, the Postfix SMTP server by default accepts mail +# that Postfix is final destination for: +# - destinations that match $inet_interfaces or $proxy_interfaces, +# - destinations that match $mydestination +# - destinations that match $virtual_alias_domains, +# - destinations that match $virtual_mailbox_domains. +# These destinations do not need to be listed in $relay_domains. +# +# Specify a list of hosts or domains, /file/name patterns or type:name +# lookup tables, separated by commas and/or whitespace. Continue +# long lines by starting the next line with whitespace. A file name +# is replaced by its contents; a type:name table is matched when a +# (parent) domain appears as lookup key. +# +# NOTE: Postfix will not automatically forward mail for domains that +# list this system as their primary or backup MX host. See the +# permit_mx_backup restriction description in postconf(5). +# +#relay_domains = $mydestination + +# INTERNET OR INTRANET + +# The relayhost parameter specifies the default host to send mail to +# when no entry is matched in the optional transport(5) table. When +# no relayhost is given, mail is routed directly to the destination. +# +# On an intranet, specify the organizational domain name. If your +# internal DNS uses no MX records, specify the name of the intranet +# gateway host instead. +# +# In the case of SMTP, specify a domain, host, host:port, [host]:port, +# [address] or [address]:port; the form [host] turns off MX lookups. +# +# If you're connected via UUCP, see also the default_transport parameter. +# +#relayhost = $mydomain +#relayhost = [gateway.my.domain] +#relayhost = [mailserver.isp.tld] +#relayhost = uucphost +#relayhost = [an.ip.add.ress] + +# REJECTING UNKNOWN RELAY USERS +# +# The relay_recipient_maps parameter specifies optional lookup tables +# with all addresses in the domains that match $relay_domains. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown relay users. This feature is off by default. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify an @domain.tld wild-card, or specify +# a user@domain.tld address. +# +#relay_recipient_maps = hash:/etc/postfix/relay_recipients + +# INPUT RATE CONTROL +# +# The in_flow_delay configuration parameter implements mail input +# flow control. This feature is turned on by default, although it +# still needs further development (it's disabled on SCO UNIX due +# to an SCO bug). +# +# A Postfix process will pause for $in_flow_delay seconds before +# accepting a new message, when the message arrival rate exceeds the +# message delivery rate. With the default 100 SMTP server process +# limit, this limits the mail inflow to 100 messages a second more +# than the number of messages delivered per second. +# +# Specify 0 to disable the feature. Valid delays are 0..10. +# +#in_flow_delay = 1s + +# ADDRESS REWRITING +# +# The ADDRESS_REWRITING_README document gives information about +# address masquerading or other forms of address rewriting including +# username->Firstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /some/where/procmail +#mailbox_command = /some/where/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#mailbox_transport = lmtp:unix:/file/name +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = /usr/sbin/sendmail + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = /usr/bin/newaliases + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = /usr/bin/mailq + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = postdrop + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = /usr/share/doc/postfix-2.8.7/html + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = /usr/share/man + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = /etc/postfix + +# readme_directory: The location of the Postfix README files. +# +readme_directory = /usr/share/doc/postfix-2.8.7/readme +home_mailbox = .maildir/ + +smtpd_sasl_auth_enable = yes +smtpd_sasl2_auth_enable = yes +smtpd_sasl_security_options = noanonymous +broken_sasl_auth_clients = yes +smtpd_sasl_local_domain = $myhostname + +# Authentifizierter Relay-Mail-Versand +smtp_sasl_auth_enable = yes +smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth +smtp_sasl_security_options = noanonymous +relayhost = [mail.brehm-online.com] +#relayhost = [helga-six.brehm-online.com] + +smtpd_use_tls = yes +#smtpd_tls_auth_only = yes +smtpd_tls_key_file = /etc/postfix/postfix.pem +smtpd_tls_cert_file = /etc/postfix/postfix.pem +#smtpd_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem +smtpd_tls_loglevel = 1 +smtpd_tls_received_header = yes +smtpd_tls_session_cache_timeout = 3600s +tls_random_source = dev:/dev/urandom + +# schön tls verwenden +smtp_use_tls = yes +smtp_tls_key_file = /etc/postfix/postfix.pem +smtp_tls_cert_file = /etc/postfix/postfix.pem +#smtp_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem +# vermurkste zertifikate: egal +smtp_tls_enforce_peername = no + +#debug_peer_list = 217.237.40.156 + +inet_protocols = all diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist index 3dc53047..849ec433 100644 --- a/config-archive/etc/postfix/main.cf.dist +++ b/config-archive/etc/postfix/main.cf.dist @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.0/html +html_directory = /usr/share/doc/postfix-2.10.1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,6 +653,5 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.0/readme +readme_directory = /usr/share/doc/postfix-2.10.1/readme home_mailbox = .maildir/ -smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination diff --git a/config-archive/etc/smartd.conf b/config-archive/etc/smartd.conf new file mode 100644 index 00000000..80214991 --- /dev/null +++ b/config-archive/etc/smartd.conf @@ -0,0 +1,147 @@ +# Sample configuration file for smartd. See man smartd.conf. + +# Home page is: http://smartmontools.sourceforge.net + +# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ + +# 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) +/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +/dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +#/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|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, FreeBSD). Start long self-tests Tuesdays +# between 1-2 and 3-4 am. +#/dev/twl0 -d 3ware,0 -a -s L/../../2/01 +#/dev/twa0 -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/config-archive/etc/smartd.conf.dist b/config-archive/etc/smartd.conf.dist new file mode 100644 index 00000000..5ef85b1b --- /dev/null +++ b/config-archive/etc/smartd.conf.dist @@ -0,0 +1,145 @@ +# 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/config-archive/etc/syslog-ng/syslog-ng.conf b/config-archive/etc/syslog-ng/syslog-ng.conf index 45827938..20e93366 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf +++ b/config-archive/etc/syslog-ng/syslog-ng.conf @@ -18,20 +18,23 @@ options { # people so turn it down to once an hour. Set it to zero # if you don't want the functionality at all. mark_freq(3600); + + frac_digits(3); + ts_format(iso); }; source src { unix-stream("/dev/log" max-connections(256)); internal(); file("/proc/kmsg"); - udp(); + #udp(); }; ######################################################### # Logging-Ziele destination d_syslog { file("/var/log/syslog"); }; -destination d_fac { file("/var/log/facility/$FACILITY"); }; +destination d_fac { file("/var/log/syslog.d/$FACILITY"); }; destination d_debug { file("/var/log/debug"); }; destination d_all { file("/var/log/all"); }; destination d_messages { file("/var/log/messages"); }; @@ -50,6 +53,13 @@ destination d_console_12 { file("/dev/tty12"); }; #destination d_xconsole { pipe("/dev/xconsole"); }; destination d_xconsole { pipe("/dev/console"); }; +# By default messages are logged to tty12... +#destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + ######################################################### # Filter-Definitionen @@ -83,12 +93,5 @@ log { source(src); filter(f_syslog); destination(d_syslog); }; log { source(src); filter(f_debug); destination(d_debug); }; log { source(src); destination(d_all); }; -# By default messages are logged to tty12... -destination console_all { file("/dev/tty12"); }; -# ...if you intend to use /dev/console for programs like xconsole -# you can comment out the destination line above that references /dev/tty12 -# and uncomment the line below. -#destination console_all { file("/dev/console"); }; - #log { source(src); destination(messages); }; #log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1 new file mode 100644 index 00000000..45827938 --- /dev/null +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.1 @@ -0,0 +1,94 @@ +@version: 3.2 +# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $ +# +# Syslog-ng default configuration file for Gentoo Linux + +options { + long_hostnames(off); + chain_hostnames(no); + flush_lines(0); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark_freq(3600); +}; + +source src { + unix-stream("/dev/log" max-connections(256)); + internal(); + file("/proc/kmsg"); + udp(); +}; + +######################################################### +# Logging-Ziele + +destination d_syslog { file("/var/log/syslog"); }; +destination d_fac { file("/var/log/facility/$FACILITY"); }; +destination d_debug { file("/var/log/debug"); }; +destination d_all { file("/var/log/all"); }; +destination d_messages { file("/var/log/messages"); }; + +destination d_console { usertty("root"); }; +destination d_console_all { usertty("*"); }; +#destination loghost { udp("loghost" port(999)); }; + +# By default messages are logged to tty12... +destination d_console_12 { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#destination d_xconsole { pipe("/dev/xconsole"); }; +destination d_xconsole { pipe("/dev/console"); }; + +######################################################### +# Filter-Definitionen + +filter f_syslog { not facility(authpriv, mail); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..emerg) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_warnings { level(warn..emerg) + and not facility( mail, news); }; + +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_alarm { level(crit, alert); }; + +######################################################## +# Log-Definitionen + +log { source(src); destination(d_fac); }; + +log { source(src); filter(f_messages); destination(d_messages); }; +#log { source(src); filter(f_messages); destination(d_xconsole); }; +log { source(src); filter(f_warnings); destination(d_console_12); }; +log { source(src); filter(f_alarm); destination(d_console); }; +log { source(src); filter(f_emergency); destination(d_console_all); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); destination(d_all); }; + +# By default messages are logged to tty12... +destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#log { source(src); destination(messages); }; +#log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new b/config-archive/etc/syslog-ng/syslog-ng.conf.dist similarity index 80% rename from config-archive/etc/syslog-ng/syslog-ng.conf.dist.new rename to config-archive/etc/syslog-ng/syslog-ng.conf.dist index 2589f2fb..e8d3b4f1 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.dist @@ -1,9 +1,13 @@ -@version: 3.2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $ +@version: 3.4 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ # # Syslog-ng default configuration file for Gentoo Linux +# https://bugs.gentoo.org/show_bug.cgi?id=426814 +@include "scl.conf" + options { + threaded(yes); chain_hostnames(no); # The default action of syslog-ng is to log a STATS line @@ -18,11 +22,7 @@ options { mark_freq(3600); }; -source src { - unix-stream("/dev/log" max-connections(256)); - internal(); - file("/proc/kmsg"); -}; +source src { system(); internal(); }; destination messages { file("/var/log/messages"); }; diff --git a/config-archive/usr/share/config/kdm/kdmrc.dist.new b/config-archive/usr/share/config/kdm/kdmrc.dist.new index 23b42d9c..4299e174 100644 --- a/config-archive/usr/share/config/kdm/kdmrc.dist.new +++ b/config-archive/usr/share/config/kdm/kdmrc.dist.new @@ -449,7 +449,7 @@ FaceDir=/var/lib/kdm/faces # Random seed for forging saved session types, etc. of unknown users. # This value should be random but constant across the login domain. # Default is 0 -ForgingSeed=1372757330 +ForgingSeed=1376268632 # Specify conversation plugins for the login dialog. Each plugin can be # specified as a base name (which expands to $kde_modulesdir/kgreet_$base) # or as a full pathname. diff --git a/cron.daily/hplip_cron b/cron.daily/hplip_cron deleted file mode 100755 index a32906f4..00000000 --- a/cron.daily/hplip_cron +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -LC_ALL=C -LANG=C - -LOG_DIR=/var/log/hp/tmp/ - -# Default for number of days to keep old log files in /var/log/hp/tmp -LOGFILE_DAYS=1 -MAXSIZE=1048576 # 1 GB - -# Clears the logs which are less than 3 days. -if [ -d $LOG_DIR ]; then - find $LOG_DIR -type f -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -rf -else - mkdir -p $LOG_DIR - chgrp "lp" -R $LOG_DIR - chmod 1774 $LOG_DIR -fi - -USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1` - -# Clears the logs if size is greater that specificed limit -while [ $USAGE -gt $MAXSIZE ]; do - - # changing the user specified LOGFILE_DAYS days to 1 days lesser. - LOGFILE_DAYS=`expr $LOGFILE_DAYS "-" 1` - - # If same day logs are reaching Max size, deleting all log files. - if [ $LOGFILE_DAYS -eq 0 ]; then - find $LOG_DIR -type f -print0 2>/dev/null | xargs -r -0 rm -rf - else - find $LOG_DIR -type f -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -rf - fi - USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1` -done diff --git a/csh.env b/csh.env index c3c3568b..db791bc8 100644 --- a/csh.env +++ b/csh.env @@ -10,7 +10,7 @@ setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.0-r1/html' setenv GCC_SPECS '' setenv GSETTINGS_BACKEND 'dconf' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info' +setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info' setenv JAVACC_HOME '/usr/share/javacc/' setenv LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -28,7 +28,7 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/' setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' diff --git a/cups/printers.conf b/cups/printers.conf index 8050a21e..fea33e5e 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.6.2 -# Written by cupsd on 2013-07-28 22:12 +# Written by cupsd on 2013-08-13 07:06 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 184f58f6..d3fcb422 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ # Subscription configuration file for CUPS v1.6.2 -# Written by cupsd on 2013-07-28 22:12 -NextSubscriptionId 182 +# Written by cupsd on 2013-08-09 00:41 +NextSubscriptionId 184 diff --git a/env.d/05binutils b/env.d/05binutils index bf004d1d..40c7c1f5 100644 --- a/env.d/05binutils +++ b/env.d/05binutils @@ -1,2 +1,2 @@ -MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man -INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info +MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man +INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info diff --git a/env.d/binutils/config-x86_64-pc-linux-gnu b/env.d/binutils/config-x86_64-pc-linux-gnu index 11427ca8..930d9b82 100644 --- a/env.d/binutils/config-x86_64-pc-linux-gnu +++ b/env.d/binutils/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=2.22 +CURRENT=2.23.1 diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.22 b/env.d/binutils/x86_64-pc-linux-gnu-2.22 deleted file mode 100644 index aac9c13a..00000000 --- a/env.d/binutils/x86_64-pc-linux-gnu-2.22 +++ /dev/null @@ -1,4 +0,0 @@ -TARGET="x86_64-pc-linux-gnu" -VER="2.22" -LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.22" -FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 b/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 new file mode 100644 index 00000000..d9ce38f8 --- /dev/null +++ b/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 @@ -0,0 +1,4 @@ +TARGET="x86_64-pc-linux-gnu" +VER="2.23.1" +LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.23.1" +FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/etckeeper/commit.d/99push b/etckeeper/commit.d/99push new file mode 100755 index 00000000..9a5d81ea --- /dev/null +++ b/etckeeper/commit.d/99push @@ -0,0 +1,8 @@ +#!/bin/sh +if [ -n "$PUSH_REMOTE" ]; then + if [ "$VCS" = git ] && [ -d .git ]; then + git push "$PUSH_REMOTE" master || true + else + echo "PUSH_REMOTE not yet supported for $VCS" >&2 + fi +fi diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf index b910c8a0..9492c8f3 100644 --- a/etckeeper/etckeeper.conf +++ b/etckeeper/etckeeper.conf @@ -30,7 +30,7 @@ DARCS_COMMIT_OPTIONS="-a" #AVOID_COMMIT_BEFORE_INSTALL=1 # The high-level package manager that's being used. -# (apt, pacman-g2, yum etc) +# (apt, pacman-g2, yum, zypper etc) # For gentoo this is emerge HIGHLEVEL_PACKAGE_MANAGER=emerge @@ -38,3 +38,7 @@ HIGHLEVEL_PACKAGE_MANAGER=emerge # (dpkg, rpm, pacman-g2, etc) # For gentoo this is qlist LOWLEVEL_PACKAGE_MANAGER=qlist + +# To push each commit to a remote, put the name of the remote here. +# (eg, "origin" for git). +PUSH_REMOTE="" diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index 455429af..d445db10 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -81,14 +81,16 @@ generate_metadata() { if (exists $uidcache{$want}) { return $uidcache{$want}; } - return $uidcache{$want}=scalar getpwuid($want); + my $name=scalar getpwuid($want); + return $uidcache{$want}=defined $name ? $name : $want; } sub gidname { my $want=shift; if (exists $gidcache{$want}) { return $gidcache{$want}; } - return $gidcache{$want}=scalar getgrgid($want); + my $name=scalar getgrgid($want); + return $gidcache{$want}=defined $name ? $name : $want; } chomp; my @stat=stat($_); diff --git a/etckeeper/uninit.d/50vcs-uninit b/etckeeper/uninit.d/50vcs-uninit index 803b0b53..b61abfde 100755 --- a/etckeeper/uninit.d/50vcs-uninit +++ b/etckeeper/uninit.d/50vcs-uninit @@ -21,9 +21,9 @@ if ! grep -q "$managed_by_etckeeper" "$file"; then exit 0 else realfile="$file" - if [ -n "`type -p tempfile`" ]; then + if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif [ -n "`type -p mktemp`" ]; then + elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore index 46d81627..d59ad149 100755 --- a/etckeeper/update-ignore.d/01update-ignore +++ b/etckeeper/update-ignore.d/01update-ignore @@ -149,6 +149,7 @@ writefile () { ignore "openvpn/openvpn-status.log" ignore "cups/subscriptions.conf" ignore "cups/subscriptions.conf.O" + ignore "fake-hwclock.data" nl comment "editor temp files" @@ -174,9 +175,9 @@ if [ -e "$file" ]; then fi fi realfile="$file" - if [ -n "`type -p tempfile`" ]; then + if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif [ -n "`type -p mktemp`" ]; then + elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/fonts/infinality/conf.src/40-repl-generic.conf b/fonts/infinality/conf.src/40-repl-generic.conf index 3ebb3c4b..56df53c5 100644 --- a/fonts/infinality/conf.src/40-repl-generic.conf +++ b/fonts/infinality/conf.src/40-repl-generic.conf @@ -12,6 +12,9 @@ + + true + sans-serif @@ -20,6 +23,9 @@ + + true + serif @@ -28,6 +34,9 @@ + + true + monospace diff --git a/fonts/infinality/conf.src/41-repl-os-inf.conf b/fonts/infinality/conf.src/41-repl-os-inf.conf index 4d9dddd0..38bf5344 100644 --- a/fonts/infinality/conf.src/41-repl-os-inf.conf +++ b/fonts/infinality/conf.src/41-repl-os-inf.conf @@ -13,6 +13,9 @@ + + true + Helvetica @@ -21,6 +24,9 @@ + + true + Helvetica @@ -30,6 +36,9 @@ + + true + Courier 10 Pitch @@ -38,6 +47,9 @@ + + true + Courier 10 Pitch @@ -47,6 +59,9 @@ + + true + Helvetica Neue @@ -55,6 +70,9 @@ + + true + Helvetica Neue @@ -64,6 +82,9 @@ + + true + Palatino @@ -72,6 +93,9 @@ + + true + Palatino @@ -81,6 +105,9 @@ + + true + Lucida Sans @@ -89,6 +116,9 @@ + + true + Lucida Sans @@ -100,6 +130,9 @@ + + true + Courier New @@ -111,6 +144,9 @@ + + true + Courier New @@ -124,6 +160,9 @@ + + true + Times @@ -132,6 +171,9 @@ + + true + Times diff --git a/fonts/infinality/conf.src/41-repl-os-linux.conf b/fonts/infinality/conf.src/41-repl-os-linux.conf index 56a9f904..9c84a221 100644 --- a/fonts/infinality/conf.src/41-repl-os-linux.conf +++ b/fonts/infinality/conf.src/41-repl-os-linux.conf @@ -6,25 +6,134 @@ + + true + Nimbus Sans + + + Liberation Sans + + + + + true + + Nimbus Sans L + + + Liberation Sans + + + + + true + + Arial + + + Liberation Sans + + + + + true + + Helvetica + + + Liberation Sans + + + + + true + + Helvetica Neue + + + Liberation Sans + + + + + true + + Freesans Liberation Sans + + + + true + Nimbus Sans + + + Liberation Sans + + + + + true + + Nimbus Sans L + + + Liberation Sans + + + + + + true + + Arial + + + Liberation Sans + + + + + true + + Helvetica + + + Liberation Sans + + + + + true + + Helvetica Neue + + + Liberation Sans + + + + + true + + Freesans @@ -32,18 +141,47 @@ + + + true + Bitstream Vera Sans + + + DejaVu Sans + + + + + true + + Verdana DejaVu Sans + + + + true + Bitstream Vera Sans + + + DejaVu Sans + + + + + true + + Verdana @@ -52,21 +190,89 @@ + + true + Courier + + + Liberation Mono + + + + + true + + FreeMono + + + Liberation Mono + + + + + true + + Nimbus Mono L + + + Liberation Mono + + + + + true + + Courier New Liberation Mono + + + + true + Courier + + + Liberation Mono + + + + + true + + FreeMono + + + Liberation Mono + + + + + true + + Nimbus Mono L + + + Liberation Mono + + + + + true + + Courier New @@ -74,20 +280,69 @@ + + + true + Times + + + DejaVu Serif + + + + + true + + Nimbus Serif L + + + DejaVu Serif + + + + + true + + Times New Roman DejaVu Serif + + + + true + Times + + + DejaVu Serif + + + + + true + + Nimbus Serif L + + + DejaVu Serif + + + + + true + + Times New Roman diff --git a/fonts/infinality/conf.src/41-repl-os-osx.conf b/fonts/infinality/conf.src/41-repl-os-osx.conf index 9ced9fbb..0b22c303 100644 --- a/fonts/infinality/conf.src/41-repl-os-osx.conf +++ b/fonts/infinality/conf.src/41-repl-os-osx.conf @@ -6,11 +6,54 @@ + + true + Nimbus Sans + + + Helvetica Neue + + + + + true + + Nimbus Sans L + + + Helvetica Neue + + + + + true + + Arial + + + Helvetica Neue + + + + + true + + Liberation Sans + + + Helvetica Neue + + + + + true + + Freesans @@ -18,11 +61,54 @@ + + true + Nimbus Sans + + + Helvetica Neue + + + + + true + + Nimbus Sans L + + + Helvetica Neue + + + + + true + + Arial + + + Helvetica Neue + + + + + true + + Liberation Sans + + + Helvetica Neue + + + + + true + + Freesans @@ -31,9 +117,32 @@ + + true + Courier New + + + Courier + + + + + true + + FreeMono + + + Courier + + + + + true + + Nimbus Mono L @@ -41,9 +150,32 @@ + + true + Courier New + + + Courier + + + + + true + + FreeMono + + + Courier + + + + + true + + Nimbus Mono L @@ -52,11 +184,54 @@ + + true + Times New Roman + + + Times + + + + + true + + DejaVu Serif + + + Times + + + + + true + + Nimbus Serif L + + + Times + + + + + true + + Liberation Serif + + + Times + + + + + true + + FreeSerif @@ -64,11 +239,54 @@ + + true + Times New Roman + + + Times + + + + + true + + DejaVu Serif + + + Times + + + + + true + + Nimbus Serif L + + + Times + + + + + true + + Liberation Serif + + + Times + + + + + true + + FreeSerif @@ -77,6 +295,9 @@ + + true + Palatino Linotype @@ -85,6 +306,9 @@ + + true + Palatino Linotype @@ -94,8 +318,21 @@ + + true + Lucida Sans + + + Lucida Grande + + + + + true + + Lucida Sans Unicode @@ -103,8 +340,21 @@ + + true + Lucida Sans + + + Lucida Grande + + + + + true + + Lucida Sans Unicode diff --git a/fonts/infinality/conf.src/41-repl-os-win.conf b/fonts/infinality/conf.src/41-repl-os-win.conf index 5e66fd44..d0e6b152 100644 --- a/fonts/infinality/conf.src/41-repl-os-win.conf +++ b/fonts/infinality/conf.src/41-repl-os-win.conf @@ -6,12 +6,65 @@ + + true + Nimbus Sans + + + Arial + + + + + true + + Nimbus Sans L + + + Arial + + + + + true + + Helvetica Neue + + + Arial + + + + + true + + Helvetica + + + Arial + + + + + true + + Liberation Sans + + + Arial + + + + + true + + Freesans @@ -19,12 +72,65 @@ + + true + Nimbus Sans + + + Arial + + + + + true + + Nimbus Sans L + + + Arial + + + + + true + + Helvetica Neue + + + Arial + + + + + true + + Helvetica + + + Arial + + + + + true + + Liberation Sans + + + Arial + + + + + true + + Freesans @@ -33,6 +139,9 @@ + + true + Bitstream Vera Sans DejaVu Sans @@ -42,6 +151,9 @@ + + true + Bitstream Vera Sans DejaVu Sans @@ -52,9 +164,32 @@ + + true + Courier + + + Courier New + + + + + true + + FreeMono + + + Courier New + + + + + true + + Nimbus Mono L @@ -62,9 +197,32 @@ + + true + Courier + + + Courier New + + + + + true + + FreeMono + + + Courier New + + + + + true + + Nimbus Mono L @@ -73,10 +231,43 @@ + + true + Times + + + Times New Roman + + + + + true + + DejaVu Serif + + + Times New Roman + + + + + true + + Nimbus Serif L + + + Times New Roman + + + + + true + + Liberation Serif @@ -84,10 +275,43 @@ + + true + Times + + + Times New Roman + + + + + true + + DejaVu Serif + + + Times New Roman + + + + + true + + Nimbus Serif L + + + Times New Roman + + + + + true + + Liberation Serif @@ -96,6 +320,9 @@ + + true + Palatino @@ -104,6 +331,9 @@ + + true + Palatino @@ -113,8 +343,21 @@ + + true + Lucida Sans + + + Lucida Sans Unicode + + + + + true + + Lucida Grande @@ -122,8 +365,21 @@ + + true + Lucida Sans + + + Lucida Sans Unicode + + + + + true + + Lucida Grande diff --git a/fonts/infinality/conf.src/60-group-non-tt-fonts.conf b/fonts/infinality/conf.src/60-group-non-tt-fonts.conf index 027a85e4..a7e17016 100644 --- a/fonts/infinality/conf.src/60-group-non-tt-fonts.conf +++ b/fonts/infinality/conf.src/60-group-non-tt-fonts.conf @@ -10,475 +10,4263 @@ - Abel AR PL ShanHeiSun Uni + + + NON TT Instructed Font + + + + + + Abel + + + NON TT Instructed Font + + + + + Abril Fatface + + + NON TT Instructed Font + + + + + Aclonica + + + NON TT Instructed Font + + + + + Acme + + + NON TT Instructed Font + + + + + Actor + + + NON TT Instructed Font + + + + + Aladin + + + NON TT Instructed Font + + + + + Aldrich + + + NON TT Instructed Font + + + + + Alex Brush + + + NON TT Instructed Font + + + + + Alfa Slab One - Alike Angular + + + NON TT Instructed Font + + + + + Alike - Allerta Stencil + + + NON TT Instructed Font + + + + + + Alike Angular + + + NON TT Instructed Font + + + + + Allerta - Almendra SC + + + NON TT Instructed Font + + + + + + Allerta Stencil + + + NON TT Instructed Font + + + + + Almendra + + + NON TT Instructed Font + + + + + + Almendra SC + + + NON TT Instructed Font + + + + + Amaranth + + + NON TT Instructed Font + + + + + American Typewriter + + + NON TT Instructed Font + + + + + Andada + + + NON TT Instructed Font + + + + + Andika + + + NON TT Instructed Font + + + + + Annie Use Your Telescope + + + NON TT Instructed Font + + + + + Anton - Apple Garamond Light + + + NON TT Instructed Font + + + + + Apple Garamond + + + NON TT Instructed Font + + + + + + Apple Garamond Light + + + NON TT Instructed Font + + + + + Apple Symbols + + + NON TT Instructed Font + + + + + AppleGothic + + + NON TT Instructed Font + + + + + Arabic Typesetting + + + NON TT Instructed Font + + + + + Arapey + + + NON TT Instructed Font + + + + + Arbutus + + + NON TT Instructed Font + + + + + Architects Daughter + + + NON TT Instructed Font + + + + + Arizonia - Armata - Asset - Astloch - Asul - Atomic Age - Aubrey + + + NON TT Instructed Font + + + + + + Armata + + + NON TT Instructed Font + + + + + + Asset + + + NON TT Instructed Font + + + + + + Astloch + + + NON TT Instructed Font + + + + + + Asul + + + NON TT Instructed Font + + + + + + Atomic Age + + + NON TT Instructed Font + + + + + + Aubrey + + + NON TT Instructed Font + + + + + Bad Script + + + NON TT Instructed Font + + + + + Baekmuk Gulim + + + NON TT Instructed Font + + + + + Balthazar + + + NON TT Instructed Font + + + + + Bangers + + + NON TT Instructed Font + + + + + Basic + + + NON TT Instructed Font + + + + + Baskerville + + + NON TT Instructed Font + + + + + Baumans + + + NON TT Instructed Font + + + + + Belgrano + + + NON TT Instructed Font + + + + + Bentham + + + NON TT Instructed Font + + + + + Bevan + + + NON TT Instructed Font + + + + + Big Caslon + + + NON TT Instructed Font + + + + + Bigshot One - Bilbo Swash Caps + + + NON TT Instructed Font + + + + + Bilbo + + + NON TT Instructed Font + + + + + + Bilbo Swash Caps + + + NON TT Instructed Font + + + + + Bitter + + + NON TT Instructed Font + + + + + Black Ops One + + + NON TT Instructed Font + + + + + Bonbon + + + NON TT Instructed Font + + + + + Boogaloo - Bowlby One SC + + + NON TT Instructed Font + + + + + Bowlby One + + + NON TT Instructed Font + + + + + + Bowlby One SC + + + NON TT Instructed Font + + + + + Brawler + + + NON TT Instructed Font + + + + + Bree Serif + + + NON TT Instructed Font + + + + + BrushScript + + + NON TT Instructed Font + + + + + Bubblegum Sans + + + NON TT Instructed Font + + + + + Buda + + + NON TT Instructed Font + + + + + Buenard + + + NON TT Instructed Font + + + + + Butcherman + + + NON TT Instructed Font + + + + + CMU Bright + + + NON TT Instructed Font + + + + + + Cabin + + + NON TT Instructed Font + + + + + Cabin Condensed + + + NON TT Instructed Font + + + + + Cabin Sketch - Cabin + + + NON TT Instructed Font + + + + + Caesar Dressing + + + NON TT Instructed Font + + + + + Cagliostro + + + NON TT Instructed Font + + + + + Calligraffitti + + + NON TT Instructed Font + + + + + Cambo + + + NON TT Instructed Font + + + + + Candal - Cantarell Regular + + + NON TT Instructed Font + + + + + Cantarell + + + NON TT Instructed Font + + + + + + Cantarell Regular + + + NON TT Instructed Font + + + + + CantarellRegular + + + NON TT Instructed Font + + + + + Cardo + + + NON TT Instructed Font + + + + + Carme + + + NON TT Instructed Font + + + + + Carter One + + + NON TT Instructed Font + + + + + Caudex + + + NON TT Instructed Font + + + + + Cedarville Cursive + + + NON TT Instructed Font + + + + + Century Schoolbook L + + + NON TT Instructed Font + + + + + Ceviche One + + + NON TT Instructed Font + + + + + Changa One + + + NON TT Instructed Font + + + + + Chango + + + NON TT Instructed Font + + + + + Charis SIL + + + NON TT Instructed Font + + + + + Cherry Cream Soda + + + NON TT Instructed Font + + + + + Chewy + + + NON TT Instructed Font + + + + + Chicle + + + NON TT Instructed Font + + + + + Chivo + + + NON TT Instructed Font + + + + + Cochin - Coda Caption + + + NON TT Instructed Font + + + + + Coda - Comfortaa Regular + + + NON TT Instructed Font + + + + + + Coda Caption + + + NON TT Instructed Font + + + + + Comfortaa + + + NON TT Instructed Font + + + + + + Comfortaa Regular + + + NON TT Instructed Font + + + + + ComfortaaRegular + + + NON TT Instructed Font + + + + + Coming Soon + + + NON TT Instructed Font + + + + + Concert One + + + NON TT Instructed Font + + + + + Contrail One + + + NON TT Instructed Font + + + + + Convergence + + + NON TT Instructed Font + + + + + Cookie + + + NON TT Instructed Font + + + + + Copperplate + + + NON TT Instructed Font + + + + + Copse + + + NON TT Instructed Font + + + + + Corben + + + NON TT Instructed Font + + + + + Courier Std + + + NON TT Instructed Font + + + + + Courier10 BT + + + NON TT Instructed Font + + + + + Coustard + + + NON TT Instructed Font + + + + + Covered By Your Grace + + + NON TT Instructed Font + + + + + Crafty Girls + + + NON TT Instructed Font + + + + + Creepster + + + NON TT Instructed Font + + + + + Crete Round + + + NON TT Instructed Font + + + + + Crimson Text + + + NON TT Instructed Font + + + + + Crushed + + + NON TT Instructed Font + + + + + Cuprum + + + NON TT Instructed Font + + + + + Damion + + + NON TT Instructed Font + + + + + Dancing Script + + + NON TT Instructed Font + + + + + David + + + NON TT Instructed Font + + + + + Dawning of a New Day + + + NON TT Instructed Font + + + + + Days One + + + NON TT Instructed Font + + + + + + Delius + + + NON TT Instructed Font + + + + + Delius Swash Caps + + + NON TT Instructed Font + + + + + Delius Unicase - Delius + + + NON TT Instructed Font + + + + + Devonshire + + + NON TT Instructed Font + + + + + Didact Gothic + + + NON TT Instructed Font + + + + + Didot + + + NON TT Instructed Font + + + + + DilenniaUPC + + + NON TT Instructed Font + + + + + District + + + NON TT Instructed Font + + + + + DokChampa + + + NON TT Instructed Font + + + + + Dorsa + + + NON TT Instructed Font + + + + + Dr Sugiyama + + + NON TT Instructed Font + + + + + Duru Sans + + + NON TT Instructed Font + + + + + Dutch801 Rm BT + + + NON TT Instructed Font + + + + + Dynalight + + + NON TT Instructed Font + + + + + EB Garamond + + + NON TT Instructed Font + + + + + Eater + + + NON TT Instructed Font + + + + + Electrolize + + + NON TT Instructed Font + + + + + Engagement + + + NON TT Instructed Font + + + + + Enriqueta + + + NON TT Instructed Font + + + + + EucrosiaUPC + + + NON TT Instructed Font + + + + + Eurostile LT Std + + + NON TT Instructed Font + + + + + Expletus Sans + + + NON TT Instructed Font + + + + + Fanwood Text - Fascinate Inline + + + NON TT Instructed Font + + + + + Fascinate + + + NON TT Instructed Font + + + + + + Fascinate Inline + + + NON TT Instructed Font + + + + + Federant + + + NON TT Instructed Font + + + + + Federo + + + NON TT Instructed Font + + + + + Fjord One + + + NON TT Instructed Font + + + + + Flamenco + + + NON TT Instructed Font + + + + + Flavors + + + NON TT Instructed Font + + + + + Fondamento + + + NON TT Instructed Font + + + + + Fontdiner Swanky + + + NON TT Instructed Font + + + + + Forum + + + NON TT Instructed Font + + + + + Francois One + + + NON TT Instructed Font + + + + + FreeMono + + + NON TT Instructed Font + + + + + FreeSans + + + NON TT Instructed Font + + + + + FreeSerif + + + NON TT Instructed Font + + + + + FreesiaUPC + + + NON TT Instructed Font + + + + + Fresca + + + NON TT Instructed Font + + + + + Frijole + + + NON TT Instructed Font + + + + + Frutiger LT Std + + + NON TT Instructed Font + + + + + Frutiger-Normal + + + NON TT Instructed Font + + + + + Fugaz One + + + NON TT Instructed Font + + + + + Galdeano + + + NON TT Instructed Font + + + + + Gautami + + + NON TT Instructed Font + + + + + Geneva Regular + + + NON TT Instructed Font + + + + + Geo - Geostar Fill + + + NON TT Instructed Font + + + + + Geostar + + + NON TT Instructed Font + + + + + + Geostar Fill + + + NON TT Instructed Font + + + + + Give You Glory + + + NON TT Instructed Font + + + + + Gloria Hallelujah + + + NON TT Instructed Font + + + + + Goblin One + + + NON TT Instructed Font + + + + + Gochi Hand + + + NON TT Instructed Font + + + + + Goudy Bookletter 1911 + + + NON TT Instructed Font + + + + + Gravitas One + + + NON TT Instructed Font + + + + + Gruppo + + + NON TT Instructed Font + + + + + Habibi + + + NON TT Instructed Font + + + + + Hammersmith One + + + NON TT Instructed Font + + + + + Handlee + + + NON TT Instructed Font + + + + + + Helvetica + + + NON TT Instructed Font + + + + + Helvetica CY + + + NON TT Instructed Font + + + + + Helvetica Neue - Helvetica + + + NON TT Instructed Font + + + + + Herr Von Muellerhoff + + + NON TT Instructed Font + + + + + Holtwood One SC + + + NON TT Instructed Font + + + + + Homemade Apple - IM Fell DW Pica SC + + + NON TT Instructed Font + + + + + + IM Fell + + + NON TT Instructed Font + + + + + IM Fell DW Pica - IM Fell Double Pica SC + + + NON TT Instructed Font + + + + + + IM Fell DW Pica SC + + + NON TT Instructed Font + + + + + IM Fell Double Pica + + + NON TT Instructed Font + + + + + + IM Fell Double Pica SC + + + NON TT Instructed Font + + + + + + IM Fell English + + + NON TT Instructed Font + + + + + IM Fell English SC - IM Fell English - IM Fell French Canon SC + + + NON TT Instructed Font + + + + + IM Fell French Canon - IM Fell Great Primer SC + + + NON TT Instructed Font + + + + + + IM Fell French Canon SC + + + NON TT Instructed Font + + + + + IM Fell Great Primer - IM Fell + + + NON TT Instructed Font + + + + + + IM Fell Great Primer SC + + + NON TT Instructed Font + + + + + Iceland + + + NON TT Instructed Font + + + + + Inder + + + NON TT Instructed Font + + + + + Indie Flower + + + NON TT Instructed Font + + + + + IrisUPC + + + NON TT Instructed Font + + + + + Irish Grover + + + NON TT Instructed Font + + + + + Italianno + + + NON TT Instructed Font + + + + + JasmineUPC + + + NON TT Instructed Font + + + + + Jockey One + + + NON TT Instructed Font + + + + + Jomolhari - Josefin Sans Std Light + + + NON TT Instructed Font + + + + + Josefin Sans + + + NON TT Instructed Font + + + + + + Josefin Sans Std Light + + + NON TT Instructed Font + + + + + Josefin Slab + + + NON TT Instructed Font + + + + + Judson + + + NON TT Instructed Font + + + + + Julee + + + NON TT Instructed Font + + + + + Jura + + + NON TT Instructed Font + + + + + Just Another Hand + + + NON TT Instructed Font + + + + + Just Me Again Down Here + + + NON TT Instructed Font + + + + + Kai + + + NON TT Instructed Font + + + + + Kalinga + + + NON TT Instructed Font + + + + + Kameron + + + NON TT Instructed Font + + + + + Kelly Slab + + + NON TT Instructed Font + + + + + Kenia + + + NON TT Instructed Font + + + + + Knewave + + + NON TT Instructed Font + + + + + KodchiangUPC + + + NON TT Instructed Font + + + + + Kranky + + + NON TT Instructed Font + + + + + Kreon + + + NON TT Instructed Font + + + + + Kristi + + + NON TT Instructed Font + + + + + La Belle Aurore + + + NON TT Instructed Font + + + + + Laconic + + + NON TT Instructed Font + + + + + Lacuna + + + NON TT Instructed Font + + + + + Lancelot + + + NON TT Instructed Font + + + + + Lato + + + NON TT Instructed Font + + + + + League Script + + + NON TT Instructed Font + + + + + Leckerli One + + + NON TT Instructed Font + + + + + Lekton + + + NON TT Instructed Font + + + + + Lemon + + + NON TT Instructed Font + + + + + Levenim MT + + + NON TT Instructed Font + + + + + LilyUPC + + + NON TT Instructed Font + + + + + Limelight + + + NON TT Instructed Font + + + + + Linden Hill + + + NON TT Instructed Font + + + + + Linux Biolinum + + + NON TT Instructed Font + + + + + Linux Libertine - Lobster Two + + + NON TT Instructed Font + + + + + + Linux Libertine Display O + + + NON TT Instructed Font + + + + + + Linux Libertine Initials O + + + NON TT Instructed Font + + + + + + Linux Libertine Mono O + + + NON TT Instructed Font + + + + + + Linux Libertine O + + + NON TT Instructed Font + + + + + Lobster + + + NON TT Instructed Font + + + + + + Lobster Two + + + NON TT Instructed Font + + + + + Lohit Bengali + + + NON TT Instructed Font + + + + + + Lohit Devanagari + + + NON TT Instructed Font + + + + + Lohit Gujarati + + + NON TT Instructed Font + + + + + Lohit Hindi + + + NON TT Instructed Font + + + + + Lohit Kannada + + + NON TT Instructed Font + + + + + Lohit Malayalam + + + NON TT Instructed Font + + + + + Lohit Oriya + + + NON TT Instructed Font + + + + + Lohit Punjabi + + + NON TT Instructed Font + + + + + Lohit Tamil + + + NON TT Instructed Font + + + + + Lohit Telugu - Lohit Devanagari + + + NON TT Instructed Font + + + + + Lora + + + NON TT Instructed Font + + + + + Love Ya Like A Sister + + + NON TT Instructed Font + + + + + Loved by the King + + + NON TT Instructed Font + + + + + Lucida Sans Std + + + NON TT Instructed Font + + + + + Luckiest Guy + + + NON TT Instructed Font + + + + + Luxi Sans + + + NON TT Instructed Font + + + + + Luxi Serif + + + NON TT Instructed Font + + + + + M+ 2p + + + NON TT Instructed Font + + + + + MS-Mincho + + + NON TT Instructed Font + + + + + Maiden Orange + + + NON TT Instructed Font + + + + + Marck Script + + + NON TT Instructed Font + + + + + Marko One + + + NON TT Instructed Font + + + + + Marmelad + + + NON TT Instructed Font + + + + + Marvel - Mate SC + + + NON TT Instructed Font + + + + + Mate + + + NON TT Instructed Font + + + + + + Mate SC + + + NON TT Instructed Font + + + + + Maven Pro + + + NON TT Instructed Font + + + + + Meddon + + + NON TT Instructed Font + + + + + MedievalSharp + + + NON TT Instructed Font + + + + + Medula One + + + NON TT Instructed Font + + + + + Megalopolis + + + NON TT Instructed Font + + + + + Megrim + + + NON TT Instructed Font + + + + + Merienda One + + + NON TT Instructed Font + + + + + Merriweather + + + NON TT Instructed Font + + + + + Metamorphous + + + NON TT Instructed Font + + + + + Metrophobic + + + NON TT Instructed Font + + + + + MgOpen Canonica + + + NON TT Instructed Font + + + + + MgOpen Cosmetica + + + NON TT Instructed Font + + + + + MgOpen Modata + + + NON TT Instructed Font + + + + + MgOpen Moderna + + + NON TT Instructed Font + + + + + Michroma - Miltonian Tattoo + + + NON TT Instructed Font + + + + + Miltonian + + + NON TT Instructed Font + + + + + + Miltonian Tattoo + + + NON TT Instructed Font + + + + + Miniver + + + NON TT Instructed Font + + + + + Miriam + + + NON TT Instructed Font + + + + + Miss Fajardose + + + NON TT Instructed Font + + + + + Miss Saint Delafield + + + NON TT Instructed Font + + + + + Modern Antiqua + + + NON TT Instructed Font + + + + + Monofett + + + NON TT Instructed Font + + + + + Monoton + + + NON TT Instructed Font + + + + + Monsieur La Doulaise + + + NON TT Instructed Font + + + + + Montez + + + NON TT Instructed Font + + + + + Montserrat + + + NON TT Instructed Font + + + + + Mountains of Christmas + + + NON TT Instructed Font + + + + + Mr Bedford + + + NON TT Instructed Font + + + + + Mr Dafoe + + + NON TT Instructed Font + + + + + Mr De Haviland + + + NON TT Instructed Font + + + + + Mrs Sheppards + + + NON TT Instructed Font + + + + + Muli + + + NON TT Instructed Font + + + + + Myriad Pro + + + NON TT Instructed Font + + + + + MyriadRegular + + + NON TT Instructed Font + + + + + Neucha + + + NON TT Instructed Font + + + + + News Cycle + + + NON TT Instructed Font + + + + + Niconne + + + NON TT Instructed Font + + + + + Nimbus Mono L + + + NON TT Instructed Font + + + + + Nimbus Roman No9 L - Nimbus Sans L + + + NON TT Instructed Font + + + + + Nimbus Sans + + + NON TT Instructed Font + + + + + + Nimbus Sans L + + + NON TT Instructed Font + + + + + Nixie One - Nobile-bold-italic002 + + + NON TT Instructed Font + + + + + + Nobile + + + NON TT Instructed Font + + + + + Nobile-bold + + + NON TT Instructed Font + + + + + + Nobile-bold-italic002 + + + NON TT Instructed Font + + + + + Nobile-italic002 + + + NON TT Instructed Font + + + + + Nobile002 - Nobile + + + NON TT Instructed Font + + + + + Nosifer + + + NON TT Instructed Font + + + + + Nothing You Could Do + + + NON TT Instructed Font + + + + + Noticia Text + + + NON TT Instructed Font + + + + + Numans + + + NON TT Instructed Font + + + + + Nunito + + + NON TT Instructed Font + + + + + OFL Sorts Mill Goudy TT + + + NON TT Instructed Font + + + + + OTS derived font - OTS derivied font + + + NON TT Instructed Font + + + + + + OTS derivied font + + + NON TT Instructed Font + + + + + Ocean Sans Std + + + NON TT Instructed Font + + + + + Old Standard TT + + + NON TT Instructed Font + + + + + Optima + + + NON TT Instructed Font + + + + + Orbitron + + + NON TT Instructed Font + + + + + Original Surfer + + + NON TT Instructed Font + + + + + Oswald + + + NON TT Instructed Font + + + + + Over the Rainbow - Overlock SC + + + NON TT Instructed Font + + + + + Overlock + + + NON TT Instructed Font + + + + + + Overlock SC + + + NON TT Instructed Font + + + + + Ovo + + + NON TT Instructed Font + + + + + Oxygen + + + NON TT Instructed Font + + + + + Pacifico + + + NON TT Instructed Font + + + + + Palladio + + + NON TT Instructed Font + + + + + Passero One + + + NON TT Instructed Font + + + + + Passion One + + + NON TT Instructed Font + + + + + Patrick Hand + + + NON TT Instructed Font + + + + + Patua One + + + NON TT Instructed Font + + + + + Paytone One + + + NON TT Instructed Font + + + + + Permanent Marker + + + NON TT Instructed Font + + + + + Petrona + + + NON TT Instructed Font + + + + + Philosopher + + + NON TT Instructed Font + + + + + Piedra + + + NON TT Instructed Font + + + + + Pinyon Script + + + NON TT Instructed Font + + + + + Plaster + + + NON TT Instructed Font + + + + + Playball + + + NON TT Instructed Font + + + + + Playfair Display + + + NON TT Instructed Font + + + + + Podkova + + + NON TT Instructed Font + + + + + Poller One + + + NON TT Instructed Font + + + + + Poly + + + NON TT Instructed Font + + + + + Pompiere + + + NON TT Instructed Font + + + + + Prata + + + NON TT Instructed Font + + + + + PrimaSans BT + + + NON TT Instructed Font + + + + + Prociono + + + NON TT Instructed Font + + + + + Puritan + + + NON TT Instructed Font + + + + + Quantico - Quattrocento Sans + + + NON TT Instructed Font + + + + + Quattrocento + + + NON TT Instructed Font + + + + + + Quattrocento Sans + + + NON TT Instructed Font + + + + + Questrial + + + NON TT Instructed Font + + + + + Quicksand + + + NON TT Instructed Font + + + + + Qwigley + + + NON TT Instructed Font + + + + + Radley + + + NON TT Instructed Font + + + + + Raleway + + + NON TT Instructed Font + + + + + Rammetto One + + + NON TT Instructed Font + + + + + Rancho + + + NON TT Instructed Font + + + + + Rationale + + + NON TT Instructed Font + + + + + Redressed - Ribeye Marrow + + + NON TT Instructed Font + + + + + Ribeye + + + NON TT Instructed Font + + + + + + Ribeye Marrow + + + NON TT Instructed Font + + + + + Righteous + + + NON TT Instructed Font + + + + + Rochester + + + NON TT Instructed Font + + + + + Rock Salt + + + NON TT Instructed Font + + + + + Rokkitt + + + NON TT Instructed Font + + + + + Rosario + + + NON TT Instructed Font + + + + + Ruge Boogie + + + NON TT Instructed Font + + + + + Ruslan Display + + + NON TT Instructed Font + + + + + Ruthie + + + NON TT Instructed Font + + + + + Sail + + + NON TT Instructed Font + + + + + Salsa + + + NON TT Instructed Font + + + + + Sancreek + + + NON TT Instructed Font + + + + + Sansita One + + + NON TT Instructed Font + + + + + Sarina + + + NON TT Instructed Font + + + + + Satisfy + + + NON TT Instructed Font + + + + + Schoolbell + + + NON TT Instructed Font + + + + + Shadows Into Light + + + NON TT Instructed Font + + + + + Shanti + + + NON TT Instructed Font + + + + + Short Stack + + + NON TT Instructed Font + + + + + Sigmar One - Signika Negative + + + NON TT Instructed Font + + + + + Signika + + + NON TT Instructed Font + + + + + + Signika Negative + + + NON TT Instructed Font + + + + + SimHei + + + NON TT Instructed Font + + + + + Six Caps + + + NON TT Instructed Font + + + + + Slackey + + + NON TT Instructed Font + + + + + Smokum + + + NON TT Instructed Font + + + + + Smythe + + + NON TT Instructed Font + + + + + Sniglet + + + NON TT Instructed Font + + + + + Snippet + + + NON TT Instructed Font + + + + + Sofia + + + NON TT Instructed Font + + + + + Sorts Mill Goudy + + + NON TT Instructed Font + + + + + Special Elite + + + NON TT Instructed Font + + + + + Spicy Rice + + + NON TT Instructed Font + + + + + Spinnaker + + + NON TT Instructed Font + + + + + Spirax + + + NON TT Instructed Font + + + + + Squada One + + + NON TT Instructed Font + + + + + Stardos Stencil + + + NON TT Instructed Font + + + + + Stint Ultra Condensed + + + NON TT Instructed Font + + + + + Stoke + + + NON TT Instructed Font + + + + + Sue Ellen Francisco + + + NON TT Instructed Font + + + + + Sunshiney + + + NON TT Instructed Font + + + + + Supermercado One + + + NON TT Instructed Font + + + + + Swanky and Moo Moo + + + NON TT Instructed Font + + + + + Swansea + + + NON TT Instructed Font + + + + + Swiss721 + + + NON TT Instructed Font + + + + + Syncopate + + + NON TT Instructed Font + + + + + Tenor Sans + + + NON TT Instructed Font + + + + + Terminal Dosis + + + NON TT Instructed Font + + + + + The Girl Next Door + + + NON TT Instructed Font + + + + + TheSans Mono + + + NON TT Instructed Font + + + + + Tienne + + + NON TT Instructed Font + + + + + Times LT Std + + + NON TT Instructed Font + + + + + Times New Roman MT Std + + + NON TT Instructed Font + + + + + Times Roman + + + NON TT Instructed Font + + + + + Times Ten LT Std + + + NON TT Instructed Font + + + + + Trade Winds + + + NON TT Instructed Font + + + + + Trykker + + + NON TT Instructed Font + + + + + Tulpen One + + + NON TT Instructed Font + + + + + URWClassico - Ultra-Light 100 + + + NON TT Instructed Font + + + + + Ultra + + + NON TT Instructed Font + + + + + + Ultra-Light 100 + + + NON TT Instructed Font + + + + + Uncial Antiqua + + + NON TT Instructed Font + + + + + UnifrakturCook + + + NON TT Instructed Font + + + + + UnifrakturMaguntia + + + NON TT Instructed Font + + + + + Univers LT Std + + + NON TT Instructed Font + + + + + Unkempt + + + NON TT Instructed Font + + + + + Unlock + + + NON TT Instructed Font + + + + + Unna + + + NON TT Instructed Font + + + + + Utopia + + + NON TT Instructed Font + + + + + VT323 - Varela Round + + + NON TT Instructed Font + + + + + Varela + + + NON TT Instructed Font + + + + + + Varela Round + + + NON TT Instructed Font + + + + + Vast Shadow + + + NON TT Instructed Font + + + + + Verdimka + + + NON TT Instructed Font + + + + + Vibur + + + NON TT Instructed Font + + + + + Vidaloka + + + NON TT Instructed Font + + + + + Viga + + + NON TT Instructed Font + + + + + Volkhov + + + NON TT Instructed Font + + + + + Voltaire + + + NON TT Instructed Font + + + + + Waiting for the Sunrise + + + NON TT Instructed Font + + + + + Wallpoet + + + NON TT Instructed Font + + + + + Walter Turncoat + + + NON TT Instructed Font + + + + + Wire One + + + NON TT Instructed Font + + + + + Yellowtail + + + NON TT Instructed Font + + + + + Yeseva One + + + NON TT Instructed Font + + + + + Yesteryear + + + NON TT Instructed Font + + + + + Zeyada + + + NON TT Instructed Font + + + + + cmbx10 + + + NON TT Instructed Font + + + + + cmex10 + + + NON TT Instructed Font + + + + + cmmi10 + + + NON TT Instructed Font + + + + + cmr10 + + + NON TT Instructed Font + + + + + cmsy10 + + + NON TT Instructed Font + + + + + cmtt10 + + + NON TT Instructed Font + + + + + eufm10 + + + NON TT Instructed Font + + + + + msam10 + + + NON TT Instructed Font + + + + + msbm10 + + + NON TT Instructed Font + + + + + + proxima nova + + + NON TT Instructed Font + + + + + proxima nova bold + + + NON TT Instructed Font + + + + + proxima nova regular - proxima nova + + + NON TT Instructed Font + + + + + proxima-nova-1 + + + NON TT Instructed Font + + + + + proxima-nova-2 + + + NON TT Instructed Font + + + + + wasy10 @@ -505,3 +4293,4 @@ + diff --git a/fonts/infinality/conf.src/60-group-tt-fonts.conf b/fonts/infinality/conf.src/60-group-tt-fonts.conf index 62a6d9de..a56d990b 100644 --- a/fonts/infinality/conf.src/60-group-tt-fonts.conf +++ b/fonts/infinality/conf.src/60-group-tt-fonts.conf @@ -5,7 +5,7 @@ + to look OK with infinality patches --> @@ -13,251 +13,3017 @@ Adamina + + + TT Instructed Font + + + + + + false + + Aguafina Script + + + TT Instructed Font + + + + + + false + + Alice + + + TT Instructed Font + + + + + + false + + Allan + + + TT Instructed Font + + + + + + false + + + Aller + + + TT Instructed Font + + + + + + false + + Aller Display + + + TT Instructed Font + + + + + + false + + Aller Light - Aller + + + TT Instructed Font + + + + + + false + + Amatic SC + + + TT Instructed Font + + + + + + false + + Andale Mono + + + TT Instructed Font + + + + + + false + + Andalus + + + TT Instructed Font + + + + + + false + + Angsana New + + + TT Instructed Font + + + + + + false + + AngsanaUPC - Anonymous Pro + + + TT Instructed Font + + + + + + false + + Anonymous + + + TT Instructed Font + + + + + + false + + + Anonymous Pro + + + TT Instructed Font + + + + + + false + + Antic + + + TT Instructed Font + + + + + + false + + Aparajita + + + TT Instructed Font + + + + + + false + + Apple Chancery + + + TT Instructed Font + + + + + + false + + Apple LiGothic + + + TT Instructed Font + + + + + + false + + Aquabase + + + TT Instructed Font + + + + + + false + + Arabic Typesetting + + + TT Instructed Font + + + + + + false + + + Arial + + + TT Instructed Font + + + + + + false + + Arial Black + + + TT Instructed Font + + + + + + false + + Arial MT - Arial Monospaced - Arial Narrow - Arial SF MT - Arial Unicode MS - Arial - ArialMT - Arimo - Arimo - Artifika + + + TT Instructed Font + + + + + + false + + + Arial Monospaced + + + TT Instructed Font + + + + + + false + + + Arial Narrow + + + TT Instructed Font + + + + + + false + + + Arial SF MT + + + TT Instructed Font + + + + + + false + + + Arial Unicode MS + + + TT Instructed Font + + + + + + false + + + ArialMT + + + TT Instructed Font + + + + + + false + + + Arimo + + + TT Instructed Font + + + + + + false + + + Arimo + + + TT Instructed Font + + + + + + false + + + Artifika + + + TT Instructed Font + + + + + + false + + Arvo + + + TT Instructed Font + + + + + + false + + BPmono + + + TT Instructed Font + + + + + + false + + Batang + + + TT Instructed Font + + + + + + false + + BatangChe + + + TT Instructed Font + + + + + + false + + Bitstream Charter - Bitstream Vera Sans Mono + + + TT Instructed Font + + + + + + false + + Bitstream Vera Sans + + + TT Instructed Font + + + + + + false + + + Bitstream Vera Sans Mono + + + TT Instructed Font + + + + + + false + + Bitstream Vera Serif + + + TT Instructed Font + + + + + + false + + Book Antiqua + + + TT Instructed Font + + + + + + false + + Bookman Old Style + + + TT Instructed Font + + + + + + false + + Browallia New + + + TT Instructed Font + + + + + + false + + BrowalliaUPC + + + TT Instructed Font + + + + + + false + + Calibri - Cambria Math + + + TT Instructed Font + + + + + + false + + Cambria + + + TT Instructed Font + + + + + + false + + + Cambria Math + + + TT Instructed Font + + + + + + false + + Candara - Century Gothic + + + TT Instructed Font + + + + + + false + + Century + + + TT Instructed Font + + + + + + false + + + Century Gothic + + + TT Instructed Font + + + + + + false + + Chalkboard + + + TT Instructed Font + + + + + + false + + Chalkduster - Charcoal CY + + + TT Instructed Font + + + + + + false + + Charcoal + + + TT Instructed Font + + + + + + false + + + Charcoal CY + + + TT Instructed Font + + + + + + false + + Charis SIL + + + TT Instructed Font + + + + + + false + + Chicago + + + TT Instructed Font + + + + + + false + + Comic Sans MS + + + TT Instructed Font + + + + + + false + + Consolas + + + TT Instructed Font + + + + + + false + + Constantia + + + TT Instructed Font + + + + + + false + + Corbel + + + TT Instructed Font + + + + + + false + + Cordia New + + + TT Instructed Font + + + + + + false + + CordiaUPC + + + TT Instructed Font + + + + + + false + + + Courier + + + TT Instructed Font + + + + + + false + + Courier 10 Pitch + + + TT Instructed Font + + + + + + false + + Courier New - Courier + + + TT Instructed Font + + + + + + false + + Cousine + + + TT Instructed Font + + + + + + false + + DFKai-SB + + + TT Instructed Font + + + + + + false + + Dark Courier + + + TT Instructed Font + + + + + + false + + DaunPenh + + + TT Instructed Font + + + + + + false + + David + + + TT Instructed Font + + + + + + false + + DejaVu LGC Sans Mono - DejaVu Sans Mono + + + TT Instructed Font + + + + + + false + + DejaVu Sans + + + TT Instructed Font + + + + + + false + + + DejaVu Sans Mono + + + TT Instructed Font + + + + + + false + + DejaVu Serif + + + TT Instructed Font + + + + + + false + + Delicious + + + TT Instructed Font + + + + + + false + + DilleniaUPC + + + TT Instructed Font + + + + + + false + + DokChampa + + + TT Instructed Font + + + + + + false + + Dotum + + + TT Instructed Font + + + + + + false + + DotumChe - Droid Sans Mono + + + TT Instructed Font + + + + + + false + + Droid Sans + + + TT Instructed Font + + + + + + false + + + Droid Sans Mono + + + TT Instructed Font + + + + + + false + + Droid Serif + + + TT Instructed Font + + + + + + false + + Ebrima + + + TT Instructed Font + + + + + + false + + Essential PragmataPro + + + TT Instructed Font + + + + + + false + + Estrangelo Edessa + + + TT Instructed Font + + + + + + false + + EucrosiaUPC + + + TT Instructed Font + + + + + + false + + Euphemia + + + TT Instructed Font + + + + + + false + + FangSong + + + TT Instructed Font + + + + + + false + + FrankRuehl + + + TT Instructed Font + + + + + + false + + Franklin Gothic Medium + + + TT Instructed Font + + + + + + false + + FreesiaUPC + + + TT Instructed Font + + + + + + false + + Frutiger Linotype + + + TT Instructed Font + + + + + + false + + Futura + + + TT Instructed Font + + + + + + false + + Gabriola + + + TT Instructed Font + + + + + + false + + Garamond + + + TT Instructed Font + + + + + + false + + Gautami + + + TT Instructed Font + + + + + + false + + Geneva + + + TT Instructed Font + + + + + + false + + Geneva CY + + + TT Instructed Font + + + + + + false + + + Gentium + + + TT Instructed Font + + + + + + false + + Gentium Basic + + + TT Instructed Font + + + + + + false + + Gentium Book Basic - Gentium + + + TT Instructed Font + + + + + + false + + Georgia + + + TT Instructed Font + + + + + + false + + Gill Sans + + + TT Instructed Font + + + + + + false + + Gisha + + + TT Instructed Font + + + + + + false + + Gotham Book + + + TT Instructed Font + + + + + + false + + Gotham Light + + + TT Instructed Font + + + + + + false + + Gotham Medium + + + TT Instructed Font + + + + + + false + + Guatami + + + TT Instructed Font + + + + + + false + + Gulim + + + TT Instructed Font + + + + + + false + + GulimChe + + + TT Instructed Font + + + + + + false + + Gungsuh + + + TT Instructed Font + + + + + + false + + GungsuhChe + + + TT Instructed Font + + + + + + false + + Hard Gothic + + + TT Instructed Font + + + + + + false + + Herculanum + + + TT Instructed Font + + + + + + false + + Hoefler Text + + + TT Instructed Font + + + + + + false + + Impact + + + TT Instructed Font + + + + + + false + + Inconsolata + + + TT Instructed Font + + + + + + false + + IrisUPC + + + TT Instructed Font + + + + + + false + + Iskoola Pota + + + TT Instructed Font + + + + + + false + + Istok Web + + + TT Instructed Font + + + + + + false + + JasmineUPC + + + TT Instructed Font + + + + + + false + + KaiTi + + + TT Instructed Font + + + + + + false + + Kalinga + + + TT Instructed Font + + + + + + false + + Kartika + + + TT Instructed Font + + + + + + false + + Khmer UI + + + TT Instructed Font + + + + + + false + + KodchiangUPC + + + TT Instructed Font + + + + + + false + + Kokila + + + TT Instructed Font + + + + + + false + + Lao UI + + + TT Instructed Font + + + + + + false + + Latha + + + TT Instructed Font + + + + + + false + + Leelawadee + + + TT Instructed Font + + + + + + false + + Levenim MT + + + TT Instructed Font + + + + + + false + + Liberation Mono + + + TT Instructed Font + + + + + + false + + Liberation Sans + + + TT Instructed Font + + + + + + false + + Liberation Serif + + + TT Instructed Font + + + + + + false + + LilyUPC - Linux Libertine + + + TT Instructed Font + + + + + + false + + Lobster + + + TT Instructed Font + + + + + + false + + Lucida Console + + + TT Instructed Font + + + + + + false + + Lucida Grande + + + TT Instructed Font + + + + + + false + + + Lucida Sans + + + TT Instructed Font + + + + + + false + + Lucida Sans Typewriter + + + TT Instructed Font + + + + + + false + + Lucida Sans Unicode - Lucida Sans + + + TT Instructed Font + + + + + + false + + Luxi Mono + + + TT Instructed Font + + + + + + false + + MS Gothic + + + TT Instructed Font + + + + + + false + + MS Mincho + + + TT Instructed Font + + + + + + false + + MS PGothic + + + TT Instructed Font + + + + + + false + + MS PMincho + + + TT Instructed Font + + + + + + false + + MS UI Gothic + + + TT Instructed Font + + + + + + false + + MV Boli + + + TT Instructed Font + + + + + + false + + Mako + + + TT Instructed Font + + + + + + false + + Malgun Gothic + + + TT Instructed Font + + + + + + false + + Mangal + + + TT Instructed Font + + + + + + false + + Marker Felt - Meiryo UI + + + TT Instructed Font + + + + + + false + + Meiryo + + + TT Instructed Font + + + + + + false + + + Meiryo UI + + + TT Instructed Font + + + + + + false + + Menlo + + + TT Instructed Font + + + + + + false + + MetaBold-Roman + + + TT Instructed Font + + + + + + false + + MetaBook-Roman + + + TT Instructed Font + + + + + + false + + MetaMedium-Roman + + + TT Instructed Font + + + + + + false + + Microsoft Himalaya + + + TT Instructed Font + + + + + + false + + Microsoft JhengHei + + + TT Instructed Font + + + + + + false + + Microsoft New Tai Lue + + + TT Instructed Font + + + + + + false + + Microsoft PhagsPa + + + TT Instructed Font + + + + + + false + + Microsoft Sans Serif + + + TT Instructed Font + + + + + + false + + Microsoft Tai Le + + + TT Instructed Font + + + + + + false + + Microsoft Uighur + + + TT Instructed Font + + + + + + false + + Microsoft YaHei + + + TT Instructed Font + + + + + + false + + Microsoft Yi Baiti - MingLiU-ExtB + + + TT Instructed Font + + + + + + false + + MingLiU - MingLiU_HKSCS-ExtB + + + TT Instructed Font + + + + + + false + + + MingLiU-ExtB + + + TT Instructed Font + + + + + + false + + MingLiU_HKSCS - Miriam Fixed + + + TT Instructed Font + + + + + + false + + + MingLiU_HKSCS-ExtB + + + TT Instructed Font + + + + + + false + + Miriam + + + TT Instructed Font + + + + + + false + + + Miriam Fixed + + + TT Instructed Font + + + + + + false + + Molengo + + + TT Instructed Font + + + + + + false + + Monaco + + + TT Instructed Font + + + + + + false + + Mongolian Baiti + + + TT Instructed Font + + + + + + false + + MoolBoran + + + TT Instructed Font + + + + + + false + + NSimSun + + + TT Instructed Font + + + + + + false + + Narkisim + + + TT Instructed Font + + + + + + false + + Neuton + + + TT Instructed Font + + + + + + false + + Nina + + + TT Instructed Font + + + + + + false + + Nova Cut + + + TT Instructed Font + + + + + + false + + Nova Flat + + + TT Instructed Font + + + + + + false + + Nova Oval + + + TT Instructed Font + + + + + + false + + Nova Round + + + TT Instructed Font + + + + + + false + + Nova Script + + + TT Instructed Font + + + + + + false + + Nova Slim + + + TT Instructed Font + + + + + + false + + Nova Square - NovaMono + + + TT Instructed Font + + + + + + false + + + NovaMono + + + TT Instructed Font + + + + + + false + + Nyala + + + TT Instructed Font + + + + + + false + + Open Sans - PMingLiU-ExtB + + + TT Instructed Font + + + + + + false + + PMingLiU + + + TT Instructed Font + + + + + + false + + + PMingLiU-ExtB + + + TT Instructed Font + + + + + + false + + + PT Sans + + + TT Instructed Font + + + + + + false + + PT Sans Caption + + + TT Instructed Font + + + + + + false + + PT Sans Narrow - PT Sans - PT Serif Caption + + + TT Instructed Font + + + + + + false + + PT Serif + + + TT Instructed Font + + + + + + false + + + PT Serif Caption + + + TT Instructed Font + + + + + + false + + Padauk + + + TT Instructed Font + + + + + + false + + Palatino Linotype + + + TT Instructed Font + + + + + + false + + Papyrus + + + TT Instructed Font + + + + + + false + + Plantagenet Cherokee + + + TT Instructed Font + + + + + + false + + Play + + + TT Instructed Font + + + + + + false + + Pragmata + + + TT Instructed Font + + + + + + false + + PragmataPro + + + TT Instructed Font + + + + + + false + + Raavi + + + TT Instructed Font + + + + + + false + + Reenie Beanie + + + TT Instructed Font + + + + + + false + + Rod + + + TT Instructed Font + + + + + + false + + Sakkal Majalla + + + TT Instructed Font + + + + + + false + + Segoe Print + + + TT Instructed Font + + + + + + false + + Segoe Script + + + TT Instructed Font + + + + + + false + + + Segoe UI + + + TT Instructed Font + + + + + + false + + Segoe UI Light + + + TT Instructed Font + + + + + + false + + + Segoe UI Mono + + + TT Instructed Font + + + + + + false + + Segoe UI Semibold + + + TT Instructed Font + + + + + + false + + Segoe UI Symbol - Segoe UI + + + TT Instructed Font + + + + + + false + + + Segoe WP + + + TT Instructed Font + + + + + + false + + + Segoe WP Black + + + TT Instructed Font + + + + + + false + + + Segoe WP Light + + + TT Instructed Font + + + + + + false + + + Segoe WP SemiLight + + + TT Instructed Font + + + + + + false + + + Segoe WP Semibold + + + TT Instructed Font + + + + + + false + + Shonar Bangla + + + TT Instructed Font + + + + + + false + + Shruti + + + TT Instructed Font + + + + + + false + + SimHei - SimSun-ExtB + + + TT Instructed Font + + + + + + false + + SimSun - Simplified Arabic Fixed + + + TT Instructed Font + + + + + + false + + + SimSun-ExtB + + + TT Instructed Font + + + + + + false + + Simplified Arabic + + + TT Instructed Font + + + + + + false + + + Simplified Arabic Fixed + + + TT Instructed Font + + + + + + false + + Skia + + + TT Instructed Font + + + + + + false + + Sylfaen + + + TT Instructed Font + + + + + + false + + Symbol + + + TT Instructed Font + + + + + + false + + TITUS Cyberbit Basic + + + TT Instructed Font + + + + + + false + + Tahoma + + + TT Instructed Font + + + + + + false + + Tangerine - Times New Roman + + + TT Instructed Font + + + + + + false + + Times + + + TT Instructed Font + + + + + + false + + + Times New Roman + + + TT Instructed Font + + + + + + false + + Tinos + + + TT Instructed Font + + + + + + false + + Traditional Arabic + + + TT Instructed Font + + + + + + false + + Trebuchet MS + + + TT Instructed Font + + + + + + false + + Tunga + + + TT Instructed Font + + + + + + false + + + Ubuntu + + + TT Instructed Font + + + + + + false + + Ubuntu Condensed + + + TT Instructed Font + + + + + + false + + Ubuntu Mono - Ubuntu + + + TT Instructed Font + + + + + + false + + Utsaah + + + TT Instructed Font + + + + + + false + + Vani + + + TT Instructed Font + + + + + + false + + Verdana + + + TT Instructed Font + + + + + + false + + Vijaya + + + TT Instructed Font + + + + + + false + + Vollkorn + + + TT Instructed Font + + + + + + false + + Vrinda + + + TT Instructed Font + + + + + + false + + Webdings + + + TT Instructed Font + + + + + + false + + Wingdings + + + TT Instructed Font + + + + + + false + + Yanone Kaffeesatz + + + TT Instructed Font + + + + + + false + + Zapfino @@ -266,3 +3032,4 @@ + diff --git a/fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf b/fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf new file mode 100644 index 00000000..3f7402f5 --- /dev/null +++ b/fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf @@ -0,0 +1,28 @@ + + + + + + + + + + + + NON TT Instructed Font + + + true + + + hintslight + + + true + + + true + + + + diff --git a/fonts/infinality/conf.src/62-tt-monospace-rendering.conf b/fonts/infinality/conf.src/62-tt-monospace-rendering.conf index 70a9cfa9..290f1f07 100644 --- a/fonts/infinality/conf.src/62-tt-monospace-rendering.conf +++ b/fonts/infinality/conf.src/62-tt-monospace-rendering.conf @@ -8,23 +8,137 @@ + Andale Mono + + + use-bitmaps-if-set + + + + + Anonymous Pro + + + use-bitmaps-if-set + + + + + Bitstream Vera Sans Mono + + + use-bitmaps-if-set + + + + + Courier New + + + use-bitmaps-if-set + + + + + DejaVu Sans Mono + + + use-bitmaps-if-set + + + + + Essential PragmataPro + + + use-bitmaps-if-set + + + + + Inconsolata + + + use-bitmaps-if-set + + + + + Liberation Mono + + + use-bitmaps-if-set + + + + + Lucida Console + + + use-bitmaps-if-set + + + + + Lucida Sans Typewriter + + + use-bitmaps-if-set + + + + + Monaco + + + use-bitmaps-if-set + + + + + Pragmata + + + use-bitmaps-if-set + + + + + PragmataPro + + + use-bitmaps-if-set + + + + + Ubuntu Mono + + use-bitmaps-if-set + + + + + + use-bitmaps-if-set + true diff --git a/fonts/infinality/conf.src/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/conf.src/62-tt-traced-bitmap-rendering.conf index 46c4b673..eda8ff5e 100644 --- a/fonts/infinality/conf.src/62-tt-traced-bitmap-rendering.conf +++ b/fonts/infinality/conf.src/62-tt-traced-bitmap-rendering.conf @@ -7,18 +7,92 @@ + ProFontWindows + + + use-bitmaps-if-set + + + + + ProggyCleanTT + + + use-bitmaps-if-set + + + + + ProggySquareTTSZ + + + use-bitmaps-if-set + + + + + ProggyTinyTTSZ + + + use-bitmaps-if-set + + + + + ProggyCleanTT CE + + + use-bitmaps-if-set + + + + + ProFont + + + use-bitmaps-if-set + + + + + Terminus + + + use-bitmaps-if-set + + + + + Terminus (TTF) + + + use-bitmaps-if-set + + + + + MonteCarlo + + use-bitmaps-if-set + + + + + + use-bitmaps-if-set + hintnone @@ -44,8 +118,41 @@ ProggyCleanTT + + + 16 + + + 16 + + + + + ProggyCleanTT CE + + + 16 + + + 16 + + + + + ProggySquareTTSZ + + + 16 + + + 16 + + + + + ProggyTinyTTSZ diff --git a/fonts/infinality/conf.src/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/conf.src/80-selective-rendering-inf-win-lin.conf index 029b0840..ba21a538 100644 --- a/fonts/infinality/conf.src/80-selective-rendering-inf-win-lin.conf +++ b/fonts/infinality/conf.src/80-selective-rendering-inf-win-lin.conf @@ -12,6 +12,16 @@ Droid Sans Mono + + + 19 + + + true + + + + Droid Sans @@ -26,7 +36,33 @@ Aquabase + + + 14 + + + hintslight + + + true + + + + Browallia New + + + 14 + + + hintslight + + + true + + + + BrowalliaUPC @@ -96,8 +132,10 @@ roman - + 18 + + 19 @@ -113,8 +151,10 @@ Gill Sans - + 11 + + 12 @@ -130,10 +170,27 @@ Droid Sans - + 9 - 10 + + 11 + + + medium + + + true + + + hintslight + + + + + Droid Sans + + 14 @@ -152,8 +209,10 @@ Ubuntu Mono - + 12 + + 13 diff --git a/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk b/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk new file mode 100644 index 00000000..7df981cf --- /dev/null +++ b/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk @@ -0,0 +1,44 @@ +BEGIN { + printf "\n" + printf "\n" + printf "\n\n" + printf "\t\n\n" + printf "\t\n" + printf "\t\n\n" + printf "\t\n" +} + +{ + printf "\t\n" + printf "\t\t\n" + printf "\t\t\t" + printf $0 + printf "\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\tNON TT Instructed Font\n" + printf "\t\t\n" + printf "\t\n\n" +} + +END { + printf "\t\n" + printf "\t\t\n" + printf "\t\t\tNON TT Instructed Font\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\ttrue\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\thintslight\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\ttrue\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\ttrue\n" + printf "\t\t\n" + printf "\t\n\n" + printf "\n\n" +} + diff --git a/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list b/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list new file mode 100644 index 00000000..7c4cb20b --- /dev/null +++ b/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list @@ -0,0 +1,474 @@ +AR PL ShanHeiSun Uni +Abel +Abril Fatface +Aclonica +Acme +Actor +Aladin +Aldrich +Alex Brush +Alfa Slab One +Alike +Alike Angular +Allerta +Allerta Stencil +Almendra +Almendra SC +Amaranth +American Typewriter +Andada +Andika +Annie Use Your Telescope +Anton +Apple Garamond +Apple Garamond Light +Apple Symbols +AppleGothic +Arabic Typesetting +Arapey +Arbutus +Architects Daughter +Arizonia +Armata +Asset +Astloch +Asul +Atomic Age +Aubrey +Bad Script +Baekmuk Gulim +Balthazar +Bangers +Basic +Baskerville +Baumans +Belgrano +Bentham +Bevan +Big Caslon +Bigshot One +Bilbo +Bilbo Swash Caps +Bitter +Black Ops One +Bonbon +Boogaloo +Bowlby One +Bowlby One SC +Brawler +Bree Serif +BrushScript +Bubblegum Sans +Buda +Buenard +Butcherman +CMU Bright +Cabin +Cabin Condensed +Cabin Sketch +Caesar Dressing +Cagliostro +Calligraffitti +Cambo +Candal +Cantarell +Cantarell Regular +CantarellRegular +Cardo +Carme +Carter One +Caudex +Cedarville Cursive +Century Schoolbook L +Ceviche One +Changa One +Chango +Charis SIL +Cherry Cream Soda +Chewy +Chicle +Chivo +Cochin +Coda +Coda Caption +Comfortaa +Comfortaa Regular +ComfortaaRegular +Coming Soon +Concert One +Contrail One +Convergence +Cookie +Copperplate +Copse +Corben +Courier Std +Courier10 BT +Coustard +Covered By Your Grace +Crafty Girls +Creepster +Crete Round +Crimson Text +Crushed +Cuprum +Damion +Dancing Script +David +Dawning of a New Day +Days One +Delius +Delius Swash Caps +Delius Unicase +Devonshire +Didact Gothic +Didot +DilenniaUPC +District +DokChampa +Dorsa +Dr Sugiyama +Duru Sans +Dutch801 Rm BT +Dynalight +EB Garamond +Eater +Electrolize +Engagement +Enriqueta +EucrosiaUPC +Eurostile LT Std +Expletus Sans +Fanwood Text +Fascinate +Fascinate Inline +Federant +Federo +Fjord One +Flamenco +Flavors +Fondamento +Fontdiner Swanky +Forum +Francois One +FreeMono +FreeSans +FreeSerif +FreesiaUPC +Fresca +Frijole +Frutiger LT Std +Frutiger-Normal +Fugaz One +Galdeano +Gautami +Geneva Regular +Geo +Geostar +Geostar Fill +Give You Glory +Gloria Hallelujah +Goblin One +Gochi Hand +Goudy Bookletter 1911 +Gravitas One +Gruppo +Habibi +Hammersmith One +Handlee +Helvetica +Helvetica CY +Helvetica Neue +Herr Von Muellerhoff +Holtwood One SC +Homemade Apple +IM Fell +IM Fell DW Pica +IM Fell DW Pica SC +IM Fell Double Pica +IM Fell Double Pica SC +IM Fell English +IM Fell English SC +IM Fell French Canon +IM Fell French Canon SC +IM Fell Great Primer +IM Fell Great Primer SC +Iceland +Inder +Indie Flower +IrisUPC +Irish Grover +Italianno +JasmineUPC +Jockey One +Jomolhari +Josefin Sans +Josefin Sans Std Light +Josefin Slab +Judson +Julee +Jura +Just Another Hand +Just Me Again Down Here +Kai +Kalinga +Kameron +Kelly Slab +Kenia +Knewave +KodchiangUPC +Kranky +Kreon +Kristi +La Belle Aurore +Laconic +Lacuna +Lancelot +Lato +League Script +Leckerli One +Lekton +Lemon +Levenim MT +LilyUPC +Limelight +Linden Hill +Linux Biolinum +Linux Libertine +Linux Libertine Display O +Linux Libertine Initials O +Linux Libertine Mono O +Linux Libertine O +Lobster +Lobster Two +Lohit Bengali +Lohit Devanagari +Lohit Gujarati +Lohit Hindi +Lohit Kannada +Lohit Malayalam +Lohit Oriya +Lohit Punjabi +Lohit Tamil +Lohit Telugu +Lora +Love Ya Like A Sister +Loved by the King +Lucida Sans Std +Luckiest Guy +Luxi Sans +Luxi Serif +M+ 2p +MS-Mincho +Maiden Orange +Marck Script +Marko One +Marmelad +Marvel +Mate +Mate SC +Maven Pro +Meddon +MedievalSharp +Medula One +Megalopolis +Megrim +Merienda One +Merriweather +Metamorphous +Metrophobic +MgOpen Canonica +MgOpen Cosmetica +MgOpen Modata +MgOpen Moderna +Michroma +Miltonian +Miltonian Tattoo +Miniver +Miriam +Miss Fajardose +Miss Saint Delafield +Modern Antiqua +Monofett +Monoton +Monsieur La Doulaise +Montez +Montserrat +Mountains of Christmas +Mr Bedford +Mr Dafoe +Mr De Haviland +Mrs Sheppards +Muli +Myriad Pro +MyriadRegular +Neucha +News Cycle +Niconne +Nimbus Mono L +Nimbus Roman No9 L +Nimbus Sans +Nimbus Sans L +Nixie One +Nobile +Nobile-bold +Nobile-bold-italic002 +Nobile-italic002 +Nobile002 +Nosifer +Nothing You Could Do +Noticia Text +Numans +Nunito +OFL Sorts Mill Goudy TT +OTS derived font +OTS derivied font +Ocean Sans Std +Old Standard TT +Optima +Orbitron +Original Surfer +Oswald +Over the Rainbow +Overlock +Overlock SC +Ovo +Oxygen +Pacifico +Palladio +Passero One +Passion One +Patrick Hand +Patua One +Paytone One +Permanent Marker +Petrona +Philosopher +Piedra +Pinyon Script +Plaster +Playball +Playfair Display +Podkova +Poller One +Poly +Pompiere +Prata +PrimaSans BT +Prociono +Puritan +Quantico +Quattrocento +Quattrocento Sans +Questrial +Quicksand +Qwigley +Radley +Raleway +Rammetto One +Rancho +Rationale +Redressed +Ribeye +Ribeye Marrow +Righteous +Rochester +Rock Salt +Rokkitt +Rosario +Ruge Boogie +Ruslan Display +Ruthie +Sail +Salsa +Sancreek +Sansita One +Sarina +Satisfy +Schoolbell +Shadows Into Light +Shanti +Short Stack +Sigmar One +Signika +Signika Negative +SimHei +Six Caps +Slackey +Smokum +Smythe +Sniglet +Snippet +Sofia +Sorts Mill Goudy +Special Elite +Spicy Rice +Spinnaker +Spirax +Squada One +Stardos Stencil +Stint Ultra Condensed +Stoke +Sue Ellen Francisco +Sunshiney +Supermercado One +Swanky and Moo Moo +Swansea +Swiss721 +Syncopate +Tenor Sans +Terminal Dosis +The Girl Next Door +TheSans Mono +Tienne +Times LT Std +Times New Roman MT Std +Times Roman +Times Ten LT Std +Trade Winds +Trykker +Tulpen One +URWClassico +Ultra +Ultra-Light 100 +Uncial Antiqua +UnifrakturCook +UnifrakturMaguntia +Univers LT Std +Unkempt +Unlock +Unna +Utopia +VT323 +Varela +Varela Round +Vast Shadow +Verdimka +Vibur +Vidaloka +Viga +Volkhov +Voltaire +Waiting for the Sunrise +Wallpoet +Walter Turncoat +Wire One +Yellowtail +Yeseva One +Yesteryear +Zeyada +cmbx10 +cmex10 +cmmi10 +cmr10 +cmsy10 +cmtt10 +eufm10 +msam10 +msbm10 +proxima nova +proxima nova bold +proxima nova regular +proxima-nova-1 +proxima-nova-2 +wasy10 diff --git a/fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk b/fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk new file mode 100644 index 00000000..22e03825 --- /dev/null +++ b/fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk @@ -0,0 +1,29 @@ +BEGIN { + printf "\n" + printf "\n" + printf "\n\n" + printf "\t\n\n" + printf "\t\n\n" +} + +{ + printf "\t\n" + printf "\t\t\n" + printf "\t\t\tfalse\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\t" + printf $0 + printf "\n" + printf "\t\t\n" + printf "\t\t\n" + printf "\t\t\tTT Instructed Font\n" + printf "\t\t\n" + printf "\t\n\n" +} + +END { + printf "\n\n" +} + diff --git a/fonts/infinality/conf.src/generate60/60-group-tt-fonts.list b/fonts/infinality/conf.src/generate60/60-group-tt-fonts.list new file mode 100644 index 00000000..0165708b --- /dev/null +++ b/fonts/infinality/conf.src/generate60/60-group-tt-fonts.list @@ -0,0 +1,252 @@ +Adamina +Aguafina Script +Alice +Allan +Aller +Aller Display +Aller Light +Amatic SC +Andale Mono +Andalus +Angsana New +AngsanaUPC +Anonymous +Anonymous Pro +Antic +Aparajita +Apple Chancery +Apple LiGothic +Aquabase +Arabic Typesetting +Arial +Arial Black +Arial MT +Arial Monospaced +Arial Narrow +Arial SF MT +Arial Unicode MS +ArialMT +Arimo +Arimo +Artifika +Arvo +BPmono +Batang +BatangChe +Bitstream Charter +Bitstream Vera Sans +Bitstream Vera Sans Mono +Bitstream Vera Serif +Book Antiqua +Bookman Old Style +Browallia New +BrowalliaUPC +Calibri +Cambria +Cambria Math +Candara +Century +Century Gothic +Chalkboard +Chalkduster +Charcoal +Charcoal CY +Charis SIL +Chicago +Comic Sans MS +Consolas +Constantia +Corbel +Cordia New +CordiaUPC +Courier +Courier 10 Pitch +Courier New +Cousine +DFKai-SB +Dark Courier +DaunPenh +David +DejaVu LGC Sans Mono +DejaVu Sans +DejaVu Sans Mono +DejaVu Serif +Delicious +DilleniaUPC +DokChampa +Dotum +DotumChe +Droid Sans +Droid Sans Mono +Droid Serif +Ebrima +Essential PragmataPro +Estrangelo Edessa +EucrosiaUPC +Euphemia +FangSong +FrankRuehl +Franklin Gothic Medium +FreesiaUPC +Frutiger Linotype +Futura +Gabriola +Garamond +Gautami +Geneva +Geneva CY +Gentium +Gentium Basic +Gentium Book Basic +Georgia +Gill Sans +Gisha +Gotham Book +Gotham Light +Gotham Medium +Guatami +Gulim +GulimChe +Gungsuh +GungsuhChe +Hard Gothic +Herculanum +Hoefler Text +Impact +Inconsolata +IrisUPC +Iskoola Pota +Istok Web +JasmineUPC +KaiTi +Kalinga +Kartika +Khmer UI +KodchiangUPC +Kokila +Lao UI +Latha +Leelawadee +Levenim MT +Liberation Mono +Liberation Sans +Liberation Serif +LilyUPC +Lobster +Lucida Console +Lucida Grande +Lucida Sans +Lucida Sans Typewriter +Lucida Sans Unicode +Luxi Mono +MS Gothic +MS Mincho +MS PGothic +MS PMincho +MS UI Gothic +MV Boli +Mako +Malgun Gothic +Mangal +Marker Felt +Meiryo +Meiryo UI +Menlo +MetaBold-Roman +MetaBook-Roman +MetaMedium-Roman +Microsoft Himalaya +Microsoft JhengHei +Microsoft New Tai Lue +Microsoft PhagsPa +Microsoft Sans Serif +Microsoft Tai Le +Microsoft Uighur +Microsoft YaHei +Microsoft Yi Baiti +MingLiU +MingLiU-ExtB +MingLiU_HKSCS +MingLiU_HKSCS-ExtB +Miriam +Miriam Fixed +Molengo +Monaco +Mongolian Baiti +MoolBoran +NSimSun +Narkisim +Neuton +Nina +Nova Cut +Nova Flat +Nova Oval +Nova Round +Nova Script +Nova Slim +Nova Square +NovaMono +Nyala +Open Sans +PMingLiU +PMingLiU-ExtB +PT Sans +PT Sans Caption +PT Sans Narrow +PT Serif +PT Serif Caption +Padauk +Palatino Linotype +Papyrus +Plantagenet Cherokee +Play +Pragmata +PragmataPro +Raavi +Reenie Beanie +Rod +Sakkal Majalla +Segoe Print +Segoe Script +Segoe UI +Segoe UI Light +Segoe UI Mono +Segoe UI Semibold +Segoe UI Symbol +Segoe WP +Segoe WP Black +Segoe WP Light +Segoe WP SemiLight +Segoe WP Semibold +Shonar Bangla +Shruti +SimHei +SimSun +SimSun-ExtB +Simplified Arabic +Simplified Arabic Fixed +Skia +Sylfaen +Symbol +TITUS Cyberbit Basic +Tahoma +Tangerine +Times +Times New Roman +Tinos +Traditional Arabic +Trebuchet MS +Tunga +Ubuntu +Ubuntu Condensed +Ubuntu Mono +Utsaah +Vani +Verdana +Vijaya +Vollkorn +Vrinda +Webdings +Wingdings +Yanone Kaffeesatz +Zapfino diff --git a/fonts/infinality/conf.src/generate60/generate60.sh b/fonts/infinality/conf.src/generate60/generate60.sh new file mode 100644 index 00000000..b332dc06 --- /dev/null +++ b/fonts/infinality/conf.src/generate60/generate60.sh @@ -0,0 +1,5 @@ + #!/bin/sh + +awk -f 60-group-tt-fonts.conf.awk 60-group-tt-fonts.list > 60-group-tt-fonts.conf +awk -f 60-group-non-tt-fonts.conf.awk 60-group-non-tt-fonts.list > 60-group-non-tt-fonts.conf + diff --git a/fonts/infinality/infinality.conf b/fonts/infinality/infinality.conf index 6f02054b..4a69979d 100644 --- a/fonts/infinality/infinality.conf +++ b/fonts/infinality/infinality.conf @@ -68,6 +68,15 @@ + + + + + + true + + + @@ -89,7 +98,7 @@ - 72 + 96 diff --git a/fonts/infinality/styles.conf.avail/nyx/30-non-latin-nyx.conf b/fonts/infinality/styles.conf.avail/nyx/30-non-latin-nyx.conf index e332835b..55242c1c 100644 --- a/fonts/infinality/styles.conf.avail/nyx/30-non-latin-nyx.conf +++ b/fonts/infinality/styles.conf.avail/nyx/30-non-latin-nyx.conf @@ -10,9 +10,9 @@ - + serif - + Liberation Serif DejaVu Serif FreeSerif @@ -40,11 +40,11 @@ Georgia Times Palatino Linotype - + - + sans-serif - + Liberation Sans Arial DejaVu Sans @@ -78,11 +78,11 @@ Helvetica Tahoma Arial Unicode MS - + - + monospace - + Liberation Mono DejaVu Sans Mono Droid Sans Mono @@ -95,26 +95,26 @@ Microsoft YaHei MPH 2B Damase Courier - + - + fantasy - + Impact Copperplate Gothic Std Cooper Std Bauhaus Std - + - + cursive - + ITC Zapf Chancery Std Zapfino Comic Sans MS Chalkboard Chalkduster - + diff --git a/fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf b/fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf deleted file mode 120000 index b9c8de75..00000000 --- a/fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf +++ /dev/null @@ -1 +0,0 @@ -../../conf.src/43-repl-terminus.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf @@ -0,0 +1 @@ +../../conf.src/43-repl-tt-traced-bitmap.conf \ No newline at end of file diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index c96c380d..e9b22b11 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2896,39 +2896,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3001,9 +3001,9 @@ - - - + + + @@ -17833,13 +17833,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17849,13 +17847,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17865,13 +17861,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17881,13 +17875,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17897,13 +17889,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17913,13 +17903,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17929,13 +17917,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17945,13 +17931,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17961,13 +17945,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17977,13 +17959,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17993,13 +17973,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18009,13 +17987,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18025,13 +18001,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18041,13 +18015,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18057,13 +18029,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18073,13 +18043,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18089,13 +18057,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18105,13 +18071,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18121,13 +18085,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18137,13 +18099,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18153,13 +18113,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -19887,13 +19845,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19901,7 +19859,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -19909,13 +19867,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19923,7 +19881,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -19931,13 +19889,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19945,7 +19903,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -19953,13 +19911,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19967,7 +19925,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -19975,13 +19933,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19989,7 +19947,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -19997,13 +19955,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20011,7 +19969,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -20019,13 +19977,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20033,7 +19991,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20319,13 +20277,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20333,7 +20291,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. diff --git a/gentoo/gentoogtkrc b/gentoo/gentoogtkrc index 25902af2..7a5c5551 100644 --- a/gentoo/gentoogtkrc +++ b/gentoo/gentoogtkrc @@ -1,39 +1,22 @@ -# -# This is the GTK+ RC file for gentoo. The first (rudimentary) -# GTK+ RC support was added in version 0.9.15. -# -# Currently named widgets are: -# "mainPane{0,1}" The CLists in the panes. -# "cstPreview" The preview CList in style config. -# "txvText" The Text widget used for viewing -# text (output capture, ViewText & ViewHex cmds). -# -# Other widgets must be accessed by their class names. -# -# For information about how to write GTK+ RC files, see the -# official GTK+ tutorial (doubtlessly available from www.gtk.org). -# +/* GTK+ 3.x styling for gentoo. + * + * Created in May 2012 by Emil Brink. + * + * See for information. +*/ -# style [= ] -# { -#