From: Frank Brehm Date: Tue, 29 Jan 2013 21:24:47 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d71e6f2e62c6b5bbadda0994b3031bd929822fc4;p=config%2Fbruni%2Fetc.git Current state --- diff --git a/NetworkManager/dispatcher.d/10-openrc-status b/NetworkManager/dispatcher.d/10-openrc-status index 97884104..c216b164 100755 --- a/NetworkManager/dispatcher.d/10-openrc-status +++ b/NetworkManager/dispatcher.d/10-openrc-status @@ -17,7 +17,14 @@ rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inac export IN_BACKGROUND=YES case "$2" in - up) nm-online -t 0 -x && exec rc-service NetworkManager start ;; - down) nm-online -t 0 -x || exec rc-service NetworkManager stop ;; - pre-sleep) exec rc-service NetworkManager stop ;; + up) nm-online -t 0 -x && + ! rc-service NetworkManager status 2>&1 | grep -q started && + exec rc-service NetworkManager start ;; + down) nm-online -t 0 -x || + rc-service NetworkManager status 2>&1 | grep -q stopped || + exec rc-service NetworkManager stop ;; + pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped || + exec rc-service NetworkManager stop ;; esac +exit 0 +# vim: set ts=4: diff --git a/X11/Xresources b/X11/Xresources new file mode 100644 index 00000000..d34e0012 --- /dev/null +++ b/X11/Xresources @@ -0,0 +1,32 @@ +################################################################# +################## 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. + +Xft.antialias: 1 +Xft.autohint: 0 +Xft.dpi: 96 +Xft.hinting: 1 +Xft.hintstyle: hintfull +Xft.lcdfilter: lcddefault +Xft.rgba: rgb diff --git a/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 b/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 index 1f06e4d5..2374fbae 100755 --- a/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 +++ b/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 @@ -1,5 +1,5 @@ #!/bin/sh -if [ -z ${XDG_MENU_PREFIX} ] && [ "${DESKTOP_SESSION}" = "KDE-4" ]; then +if [ -z "${XDG_MENU_PREFIX}" ] && [ "${DESKTOP_SESSION}" = "KDE-4" ]; then export XDG_MENU_PREFIX="kde-4-" fi diff --git a/acpi/actions/powerbtn.sh b/acpi/actions/powerbtn.sh new file mode 100755 index 00000000..39a3d9b5 --- /dev/null +++ b/acpi/actions/powerbtn.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# /etc/acpi/powerbtn.sh +# Taken from Debian's 2.0.4-1 diff file. This version handles KDE4. +# Power Button event handler. +# Checks to see if gnome or KDE are already handling the power button. +# If not, initiates a plain shutdown. + +# getXuser gets the X user belonging to the display in $displaynum. +# If you want the foreground X user, use getXconsole! +# Input: +# displaynum - X display number +# Output: +# XUSER - the name of the user +# XAUTHORITY - full pathname of the user's .Xauthority file +getXuser() { + user=`pinky -fw | awk '{ if ($2 == ":'$displaynum'" || $(NF) == ":'$displaynum'" ) { print $1; exit; } }'` + if [ x"$user" = x"" ]; then + startx=`pgrep -n startx` + if [ x"$startx" != x"" ]; then + user=`ps -o user --no-headers $startx` + fi + fi + if [ x"$user" != x"" ]; then + userhome=`getent passwd $user | cut -d: -f6` + export XAUTHORITY=$userhome/.Xauthority + else + export XAUTHORITY="" + fi + export XUSER=$user +} + +# Gets the X display number for the active virtual terminal. +# Output: +# DISPLAY - the X display number +# See getXuser()'s output. +getXconsole() { + console=`fgconsole`; + displaynum=`ps t tty$console | sed -n -re 's,.*/X .*:([0-9]+).*,\1,p'` + if [ x"$displaynum" != x"" ]; then + export DISPLAY=":$displaynum" + getXuser + fi +} + +# Skip if we are just in the middle of resuming. +test -f /var/lock/acpisleep && exit 0 + +# If the current X console user is running a power management daemon that +# handles suspend/resume requests, let them handle policy. + +getXconsole + +# A list of power management system process names. +PMS="gnome-power-manager kpowersave xfce4-power-manager" +PMS="$PMS guidance-power-manager.py dalston-power-applet" + +# If one of those is running or any of several others, +if pidof x $PMS > /dev/null || + ( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) || + ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then + # Get out as the power manager that is running will take care of things. + exit +fi + +# No power managment system appears to be running. Just initiate a plain +# shutdown. +/sbin/shutdown -h now "Power button pressed" + diff --git a/acpi/default.sh b/acpi/default.sh index 9fe26a16..8be6f3e1 100755 --- a/acpi/default.sh +++ b/acpi/default.sh @@ -18,7 +18,7 @@ case "$group" in button) case "$action" in power) - /sbin/init 0 + /etc/acpi/actions/powerbtn.sh ;; # if your laptop doesnt turn on/off the display via hardware diff --git a/apache2/modules.d/75_mod_perl.conf b/apache2/modules.d/75_mod_perl.conf deleted file mode 100644 index 596d2cc7..00000000 --- a/apache2/modules.d/75_mod_perl.conf +++ /dev/null @@ -1,50 +0,0 @@ - -LoadModule perl_module modules/mod_perl.so - -#PerlTrace all -PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl" -PerlModule ModPerl::Registry - -# Provide two aliases to the same cgi-bin directory, to see the effects of the -# 2 different mod_perl modes for Apache2::Registry Mode -Alias /perl/ /var/www/localhost/perl/ -# for Apache2::Perlrun Mode -Alias /cgi-perl/ /var/www/localhost/perl/ - - - SetHandler perl-script - PerlResponseHandler Apache2::Status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - - - - SetHandler perl-script - PerlResponseHandler ModPerl::PerlRun - Options -Indexes ExecCGI - PerlOptions +ParseHeaders - - -# set Apache::Registry Mode for /perl Alias - - SetHandler perl-script - PerlResponseHandler ModPerl::Registry - Options -Indexes ExecCGI - PerlSendHeader On - Order allow,deny - Allow from all - - -# set Apache::PerlRun Mode for /cgi-perl Alias - - SetHandler perl-script - PerlResponseHandler ModPerl::PerlRun - Options -Indexes ExecCGI - PerlSendHeader On - Order allow,deny - Allow from all - - - -# vim: ts=4 filetype=apache diff --git a/apache2/modules.d/apache2-mod_perl-startup.pl b/apache2/modules.d/apache2-mod_perl-startup.pl deleted file mode 100644 index afc048ac..00000000 --- a/apache2/modules.d/apache2-mod_perl-startup.pl +++ /dev/null @@ -1,24 +0,0 @@ -use lib qw(/home/httpd/perl); - -# enable if the mod_perl 1.0 compatibility is needed -#use Apache2::compat (); - -use ModPerl::Util (); #for CORE::GLOBAL::exit - -use Apache2::RequestRec (); -use Apache2::RequestIO (); -use Apache2::RequestUtil (); - -use Apache2::ServerRec (); -use Apache2::ServerUtil (); -use Apache2::Connection (); -use Apache2::Log (); - -use APR::Table (); - -use ModPerl::Registry (); - -use Apache2::Const -compile => ':common'; -use APR::Const -compile => ':common'; - -1; diff --git a/bash_completion.d/eselect b/bash_completion.d/eselect new file mode 120000 index 00000000..4512d10d --- /dev/null +++ b/bash_completion.d/eselect @@ -0,0 +1 @@ +../../usr/share/bash-completion/eselect \ No newline at end of file diff --git a/bash_completion.d/git-prompt b/bash_completion.d/git-prompt new file mode 120000 index 00000000..30cedda4 --- /dev/null +++ b/bash_completion.d/git-prompt @@ -0,0 +1 @@ +../../usr/share/bash-completion/git-prompt \ No newline at end of file diff --git a/bluetooth/audio.conf b/bluetooth/audio.conf index 302e0460..fd6092af 100644 --- a/bluetooth/audio.conf +++ b/bluetooth/audio.conf @@ -9,7 +9,7 @@ # If we want to disable support for specific services # Defaults to supporting all implemented services -#Disable=Control,Source +#Disable=Gateway,Source,Socket # SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA) # Defaults to HCI @@ -33,7 +33,7 @@ HFP=true MaxConnected=1 # Set to true to enable use of fast connectable mode (faster page scanning) -# for HFP when incomming call starts. Default settings are restored after +# for HFP when incoming call starts. Default settings are restored after # call is answered or rejected. Page scan interval is much shorter and page # scan type changed to interlaced. Such allows faster connection initiated # by a headset. diff --git a/bluetooth/main.conf b/bluetooth/main.conf index 321f6221..787ef4f7 100644 --- a/bluetooth/main.conf +++ b/bluetooth/main.conf @@ -26,10 +26,6 @@ PairableTimeout = 0 # which is 16384 (10 seconds). PageTimeout = 8192 -# Discover scheduler interval used in Adapter.DiscoverDevices -# The value is in seconds. Defaults is 30. -DiscoverSchedulerInterval = 30 - # Automatic connection for bonded devices driven by platform/user events. # If a platform plugin uses this mechanism, automatic connections will be # enabled during the interval defined below. Initially, this feature @@ -43,9 +39,11 @@ InitiallyPowered = true # Remember the previously stored Powered state when initializing adapters RememberPowered = true -# Use vendor, product and version information for DID profile support. -# The values are separated by ":" and VID, PID and version. -#DeviceID = 1234:5678:abcd +# Use vendor id source (assigner), vendor, product and version information for +# DID profile support. The values are separated by ":" and assigner, VID, PID +# and version. +# Possible vendor id source values: bluetooth, usb (defaults to usb) +#DeviceID = bluetooth:1234:5678:abcd # Do reverse service discovery for previously unknown devices that connect to # us. This option is really only needed for qualification since the BITE tester @@ -62,6 +60,5 @@ NameResolving = true # that they were created for. DebugKeys = false -# Enable the GATT Attribute Server. Default is false, because it is only -# useful for testing. -AttributeServer = false +# Enable the GATT functionality. Default is false +EnableGatt = false diff --git a/colordiffrc b/colordiffrc index 6e75b2b5..4bcb02d2 100644 --- a/colordiffrc +++ b/colordiffrc @@ -8,6 +8,9 @@ banner=no # To make the patch file *include* colours, change the option # below to 'yes' color_patches=no +# Sometimes it can be useful to specify which diff command to +# use: that can be specified here +diff_cmd=diff # # available colours are: white, yellow, green, blue, # cyan, red, magenta, black, diff --git a/colordiffrc-lightbg b/colordiffrc-lightbg index fe5333f4..2dfab3c1 100644 --- a/colordiffrc-lightbg +++ b/colordiffrc-lightbg @@ -8,6 +8,9 @@ banner=no # To make the patch file *include* colours, change the option # below to 'yes' color_patches=no +# Sometimes it can be useful to specify which diff command to +# use: that can be specified here +diff_cmd=diff # # available colours are: white, yellow, green, blue, # cyan, red, magenta, black, diff --git a/conf.d/git-daemon b/conf.d/git-daemon index 75b42168..db77de5d 100644 --- a/conf.d/git-daemon +++ b/conf.d/git-daemon @@ -10,7 +10,7 @@ # --export-all --- Exports all repositories # --port=XXXX --- Starts in port XXXX instead of 9418 # -GITDAEMON_OPTS="--syslog /var/git" +GITDAEMON_OPTS="--syslog --base-path=/var/git" # To run an anonymous git safely, the following user should be able to only # read your Git repositories. It should not able able to write to anywhere on diff --git a/conf.d/udev b/conf.d/udev index 12c2afa1..667cc8ba 100644 --- a/conf.d/udev +++ b/conf.d/udev @@ -1,16 +1,5 @@ # /etc/conf.d/udev: config file for udev -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - # udev can trigger coldplug events which cause services to start and # kernel modules to be loaded. # Services are deferred to start in the boot runlevel. @@ -22,9 +11,6 @@ persistent_cd_disable="no" # in /etc/conf.d/rc: rc_plug_services="!*" #rc_coldplug="YES" - - - # Expert options: # Timeout in seconds to wait for processing of uevents at boot. @@ -35,12 +21,12 @@ persistent_cd_disable="no" # udevd --help for possible values #udev_opts="" -# Run udevd --debug and write output to $RUNDIR/udev.log +# Run udevd --debug and write output to /run/udevdebug.log # Should not be kept on as it fills diskspace slowly #udev_debug="YES" # Run udevadmin monitor to get a log of all events -# in $RUNDIR/udevmonitor.log +# in /run/udevmonitor.log #udev_monitor="YES" # Keep udevmonitor running after populating /dev. diff --git a/config-archive/etc/mail/aliases b/config-archive/etc/mail/aliases new file mode 100644 index 00000000..8dde63ea --- /dev/null +++ b/config-archive/etc/mail/aliases @@ -0,0 +1,61 @@ +# Basic system aliases -- these MUST be present. +MAILER-DAEMON: postmaster +postmaster: root +root: frank + +# General redirections for pseudo accounts. +adm: root +bin: root +daemon: root +exim: root +lp: root +mail: root +named: root +postfix: root + +# Well-known aliases -- these should be filled in! +# root: +# operator: + +# Standard RFC2142 aliases +abuse: postmaster +ftp: root +hostmaster: root +news: usenet +noc: root +security: root +usenet: root +uucp: root +webmaster: root +www: webmaster + +# trap decode to catch security attacks +noreply: /dev/null +decode: noreply +nobody: noreply + +# Persönliche Aliase + +# Frank Brehm +frank: frank@brehm-online.com +fbr: frank +brehm: frank +fbrehm: frank +f.brehm: frank +f-brehm: frank +frank.brehm: frank +frank-brehm: frank + +# Doris Hennig +doris: doris@hennig-berlin.org + +# Heiko Hennig +patrick: hennig-patrick@gmx.de + +# Heiko Hennig +heiko: heiko-monkey-hennig@gmx.de + +# Vivien Winkler +vivi: viviwinkler@gmx.de + + diff --git a/config-archive/etc/mail/aliases.dist.new b/config-archive/etc/mail/aliases.dist.new new file mode 100644 index 00000000..ea835059 --- /dev/null +++ b/config-archive/etc/mail/aliases.dist.new @@ -0,0 +1,33 @@ +# Basic system aliases -- these MUST be present. +MAILER-DAEMON: postmaster +postmaster: root + +# General redirections for pseudo accounts. +adm: root +bin: root +daemon: root +exim: root +lp: root +mail: root +named: root +nobody: root +postfix: root + +# Well-known aliases -- these should be filled in! +# root: +# operator: + +# Standard RFC2142 aliases +abuse: postmaster +ftp: root +hostmaster: root +news: usenet +noc: root +security: root +usenet: root +uucp: root +webmaster: root +www: webmaster + +# trap decode to catch security attacks +# decode: /dev/null diff --git a/config-archive/etc/mysql/my.cnf b/config-archive/etc/mysql/my.cnf index b324ed2c..775dce06 100644 --- a/config-archive/etc/mysql/my.cnf +++ b/config-archive/etc/mysql/my.cnf @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $ # The following options will be passed to all MySQL clients [client] @@ -58,6 +58,7 @@ skip-external-locking key_buffer = 16M max_allowed_packet = 1M table_cache = 64 +table_open_cache = 64 sort_buffer_size = 512K net_buffer_length = 8K read_buffer_size = 256K diff --git a/config-archive/etc/mysql/my.cnf.1 b/config-archive/etc/mysql/my.cnf.1 new file mode 100644 index 00000000..b324ed2c --- /dev/null +++ b/config-archive/etc/mysql/my.cnf.1 @@ -0,0 +1,149 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $ + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 +prompt = MySQL \u@\h:\d >\_ + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=/usr/share/mysql/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log = /var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server = utf8 +default-character-set = utf8 +user = mysql +port = 3306 +socket = /var/run/mysqld/mysqld.sock +pid-file = /var/run/mysqld/mysqld.pid +log-error = /var/log/mysql/mysqld.err +basedir = /usr +#datadir = /var/lib/mysql +datadir = /data/mysql +skip-external-locking +key_buffer = 16M +max_allowed_packet = 1M +table_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +language = /usr/share/mysql/german + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +#bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = /tmp/ +#log-update = /path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = /tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 16M +# this is the default, increase it if you have lots of tables +innodb_additional_mem_pool_size = 2M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir = /var/lib/mysql/ +#innodb_log_arch_dir = /var/lib/mysql/ +#innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +innodb_log_file_size = 5M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_file_per_table + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/config-archive/etc/mysql/my.cnf.dist b/config-archive/etc/mysql/my.cnf.dist index 9a439848..2b0bd062 100644 --- a/config-archive/etc/mysql/my.cnf.dist +++ b/config-archive/etc/mysql/my.cnf.dist @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ # The following options will be passed to all MySQL clients [client] diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf index 22ce4373..c1606d6e 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.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.1 b/config-archive/etc/postfix/main.cf.1 index 03fb0bfa..22ce4373 100644 --- a/config-archive/etc/postfix/main.cf.1 +++ b/config-archive/etc/postfix/main.cf.1 @@ -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.2 b/config-archive/etc/postfix/main.cf.2 index 76d1551d..03fb0bfa 100644 --- a/config-archive/etc/postfix/main.cf.2 +++ b/config-archive/etc/postfix/main.cf.2 @@ -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.3 b/config-archive/etc/postfix/main.cf.3 index dba4ff00..76d1551d 100644 --- a/config-archive/etc/postfix/main.cf.3 +++ b/config-archive/etc/postfix/main.cf.3 @@ -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.4 b/config-archive/etc/postfix/main.cf.4 new file mode 100644 index 00000000..dba4ff00 --- /dev/null +++ b/config-archive/etc/postfix/main.cf.4 @@ -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 a7c38349..01dcbc7e 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.9.4/html +html_directory = /usr/share/doc/postfix-2.9.5/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,5 +653,5 @@ 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/ diff --git a/courier/authlib/authdaemonrc b/courier/authlib/authdaemonrc index c3824474..4b758be4 100644 --- a/courier/authlib/authdaemonrc +++ b/courier/authlib/authdaemonrc @@ -1,4 +1,4 @@ -##VERSION: $Id: authdaemonrc.in 17 2011-04-04 02:07:37Z mrsam $ +##VERSION: $Id: authdaemonrc.in 239 2012-10-06 23:51:19Z mrsam $ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. @@ -17,21 +17,21 @@ # fit on one line. Do not use any additional whitespace for indentation, # or anything else. -##NAME: authmodulelist:2 +##NAME: authmodulelist:3 # # The authentication modules that are linked into authdaemond. The # default list is installed. You may selectively disable modules simply # by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authpgsql authldap authmysql authcustom authpipe +# can use are: authuserdb authpam authshadow authpgsql authldap authmysql authsqlite authcustom authpipe -authmodulelist="authmysql " +authmodulelist="authmysql authpgsql authsqlite authldap authpam authuserdb authshadow authcustom authpipe" -##NAME: authmodulelistorig:3 +##NAME: authmodulelistorig:4 # # This setting is used by Courier's webadmin module, and should be left # alone -authmodulelistorig="authuserdb authpam authshadow authpgsql authldap authmysql authcustom authpipe" +authmodulelistorig="authuserdb authpam authshadow authpgsql authldap authmysql authsqlite authcustom authpipe" ##NAME: daemons:0 # diff --git a/courier/authlib/authdaemonrc.dist b/courier/authlib/authdaemonrc.dist index e66f6350..46456409 100644 --- a/courier/authlib/authdaemonrc.dist +++ b/courier/authlib/authdaemonrc.dist @@ -1,4 +1,4 @@ -##VERSION: $Id: authdaemonrc.in 17 2011-04-04 02:07:37Z mrsam $ +##VERSION: $Id: authdaemonrc.in 239 2012-10-06 23:51:19Z mrsam $ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. @@ -17,21 +17,21 @@ # fit on one line. Do not use any additional whitespace for indentation, # or anything else. -##NAME: authmodulelist:2 +##NAME: authmodulelist:3 # # The authentication modules that are linked into authdaemond. The # default list is installed. You may selectively disable modules simply # by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authpgsql authldap authmysql authcustom authpipe +# can use are: authuserdb authpam authshadow authpgsql authldap authmysql authsqlite authcustom authpipe -authmodulelist="authuserdb authpam authshadow authpgsql authldap authmysql authcustom authpipe" +authmodulelist="authuserdb authpam authshadow authpgsql authldap authmysql authsqlite authcustom authpipe" -##NAME: authmodulelistorig:3 +##NAME: authmodulelistorig:4 # # This setting is used by Courier's webadmin module, and should be left # alone -authmodulelistorig="authuserdb authpam authshadow authpgsql authldap authmysql authcustom authpipe" +authmodulelistorig="authuserdb authpam authshadow authpgsql authldap authmysql authsqlite authcustom authpipe" ##NAME: daemons:0 # diff --git a/courier/authlib/authsqliterc b/courier/authlib/authsqliterc new file mode 100644 index 00000000..2826fff8 --- /dev/null +++ b/courier/authlib/authsqliterc @@ -0,0 +1,247 @@ +##VERSION: $Id: authsqliterc 17 2011-04-04 02:07:37Z mrsam $ +# +# Copyright 2012 Double Precision, Inc. See COPYING for +# distribution information. +# +# Do not alter lines that begin with ##, they are used when upgrading +# this configuration. +# +# authsqliterc created from authsqliterc.dist by sysconftool +# +# Each line in this file must follow the following format: +# +# field[spaces|tabs]value +# +# That is, the name of the field, followed by spaces or tabs, followed by +# field value. Trailing spaces are prohibited. + + +##NAME: LOCATION:0 +# +# The SQLite database. You must create this database beforehand, and create +# the users table, as defined below. + +SQLITE_DATABASE /var/users.db + +##NAME: SQLITE_USER_TABLE:0 +# +# Suggested format of the table specified by SQLITE_USER_TABLE: +# +# CREATE TABLE passwd ( +# id text not null primary key, +# crypt text, # Either... +# clear text, # ... or +# name text, +# uid int, +# gid int, +# home text not null, +# maildir text, +# defaultdelivery text, +# quota text, +# options text); +# +# Use either crypt or clear, to specify whether cleartext or crypted passwords +# get used (and define either SQLITE_CRYPT_PWFIELD or SQLITE_CLEAR_PWFIELD, +# below, accordingly). + +SQLITE_USER_TABLE passwd + +##NAME: SQLITE_CRYPT_PWFIELD:0 +# +# Either SQLITE_CRYPT_PWFIELD or SQLITE_CLEAR_PWFIELD must be defined. Both +# are OK too. crypted passwords go into SQLITE_CRYPT_PWFIELD, cleartext +# passwords go into SQLITE_CLEAR_PWFIELD. Cleartext passwords allow +# CRAM-MD5 authentication to be implemented. + +SQLITE_CRYPT_PWFIELD crypt + +##NAME: SQLITE_CLEAR_PWFIELD:0 +# +# +# SQLITE_CLEAR_PWFIELD clear + +##NAME: SQLITE_DEFAULT_DOMAIN:0 +# +# If DEFAULT_DOMAIN is defined, and someone tries to log in as 'user', +# we will search for 'user@DEFAULT_DOMAIN' instead. +# +# +# DEFAULT_DOMAIN example.com + +##NAME: SQLITE_UID_FIELD:0 +# +# Other fields in the sqlite table: +# +# SQLITE_UID_FIELD - contains the numerical userid of the account +# +SQLITE_UID_FIELD uid + +##NAME: SQLITE_GID_FIELD:0 +# +# Numerical groupid of the account + +SQLITE_GID_FIELD gid + +##NAME: SQLITE_LOGIN_FIELD:0 +# +# The login id, default is id. Basically the query is: +# +# SELECT SQLITE_UID_FIELD, SQLITE_GID_FIELD, ... WHERE id='loginid' +# + +SQLITE_LOGIN_FIELD id + +##NAME: SQLITE_HOME_FIELD:0 +# + +SQLITE_HOME_FIELD home + +##NAME: SQLITE_NAME_FIELD:0 +# +# The user's name (optional) + +SQLITE_NAME_FIELD name + +##NAME: SQLITE_MAILDIR_FIELD:0 +# +# This is an optional field, and can be used to specify an arbitrary +# location of the maildir for the account, which normally defaults to +# $HOME/Maildir (where $HOME is read from SQLITE_HOME_FIELD). +# +# You still need to provide a SQLITE_HOME_FIELD, even if you uncomment this +# out. +# +# SQLITE_MAILDIR_FIELD maildir + +##NAME: SQLITE_DEFAULTDELIVERY:0 +# +# Courier mail server only: optional field specifies custom mail delivery +# instructions for this account (if defined) -- essentially overrides +# DEFAULTDELIVERY from ${sysconfdir}/courierd +# +# SQLITE_DEFAULTDELIVERY defaultdelivery + +##NAME: SQLITE_QUOTA_FIELD:0 +# +# Define SQLITE_QUOTA_FIELD to be the name of the field that can optionally +# specify a maildir quota. See README.maildirquota for more information +# +# SQLITE_QUOTA_FIELD quota + +##NAME: SQLITE_AUXOPTIONS:0 +# +# Auxiliary options. The SQLITE_AUXOPTIONS field should be a char field that +# contains a single string consisting of comma-separated "ATTRIBUTE=NAME" +# pairs. These names are additional attributes that define various per-account +# "options", as given in INSTALL's description of the "Account OPTIONS" +# setting. +# +# SQLITE_AUXOPTIONS_FIELD options +# +# You might want to try something like this, if you'd like to use a bunch +# of individual fields, instead of a single text blob: +# +# SQLITE_AUXOPTIONS_FIELD "disableimap=" || disableimap || ",disablepop3=" || disablepop3 || ",disablewebmail=" || disablewebmail || ",sharedgroup=" || sharedgroup +# +# This will let you define fields called "disableimap", etc, with the end result +# being something that the OPTIONS parser understands. + + +##NAME: SQLITE_WHERE_CLAUSE:0 +# +# This is optional, SQLITE_WHERE_CLAUSE can be basically set to an arbitrary +# fixed string that is appended to the WHERE clause of our query +# +# SQLITE_WHERE_CLAUSE server='mailhost.example.com' + +##NAME: SQLITE_SELECT_CLAUSE:0 +# +# This is optional, SQLITE_SELECT_CLAUSE can be set when you have a database, +# which is structuraly different from the proposed layout. The fixed string will +# be used to do a SELECT operation on database, which should return fields +# in order specified bellow: +# +# username, cryptpw, clearpw, uid, gid, home, maildir, quota, fullname, options +# +# The username field should include the domain (see example below). +# +# Enabling this option causes ignorance of any other field-related +# options, excluding default domain. +# +# There are two variables, which you can use. Substitution will be made +# for them, so you can put entered username (local part) and domain name +# in the right place of your query. These variables are: +# $(local_part), $(domain), $(service) +# +# If a $(domain) is empty (not given by the remote user) the default domain +# name is used in its place. +# +# $(service) will expand out to the service being authenticated: imap, imaps, +# pop3 or pop3s. Courier mail server only: service will also expand out to +# "courier", when searching for local mail account's location. In this case, +# if the "maildir" field is not empty it will be used in place of +# DEFAULTDELIVERY. Courier mail server will also use esmtp when doing +# authenticated ESMTP. +# +# For example: +# +# SQLITE_SELECT_CLAUSE SELECT popbox.local_part || '@' || popbox.domain_name,\ +# '{MD5}' || popbox.password_hash), \ +# popbox.clearpw, \ +# domain.uid, \ +# domain.gid, \ +# domain.path || '/' || popbox.mbox_name, \ +# '', \ +# domain.quota, \ +# '', \ +# "disableimap=" || disableimap || ",disablepop3=" || \ +# disablepop3 || ",disablewebmail=" || disablewebmail || \ +# ",sharedgroup=" || sharedgroup \ +# FROM popbox, domain \ +# WHERE popbox.local_part = '$(local_part)' \ +# AND popbox.domain_name = '$(domain)' \ +# AND popbox.domain_name = domain.domain_name + + +##NAME: SQLITE_ENUMERATE_CLAUSE:1 +# +# Optional custom SQL query used to enumerate accounts for authenumerate, +# in order to compile a list of accounts for shared folders. The query +# should return the following fields: name, uid, gid, homedir, maildir, options +# +# Example: +# SQLITE_ENUMERATE_CLAUSE SELECT popbox.local_part || '@' || popbox.domain_name, \ +# domain.uid, \ +# domain.gid, \ +# domain.path || '/' || popbox.mbox_name, \ +# '', \ +# 'sharedgroup=' || sharedgroup \ +# FROM popbox, domain \ +# WHERE popbox.local_part = '$(local_part)' \ +# AND popbox.domain_name = '$(domain)' \ +# AND popbox.domain_name = domain.domain_name + + +##NAME: SQLITE_CHPASS_CLAUSE:0 +# +# This is optional, SQLITE_CHPASS_CLAUSE can be set when you have a database, +# which is structuraly different from proposed. The fixed string will +# be used to do an UPDATE operation on database. In other words, it is +# used, when changing passwords. This is used by sqwebmail/Courier webmail. +# +# There are four variables, which you can use. Substitution will be made +# for them, so you can put entered username (local part) and domain name +# in the right place of your query. There variables are: +# $(local_part) , $(domain) , $(newpass) , $(newpass_crypt) +# +# If a $(domain) is empty (not given by the remote user) the default domain +# name is used in its place. +# $(newpass) contains plain password +# $(newpass_crypt) contains its crypted form +# +# SQLITE_CHPASS_CLAUSE UPDATE popbox \ +# SET clearpw='$(newpass)', \ +# password_hash='$(newpass_crypt)' \ +# WHERE local_part='$(local_part)' \ +# AND domain_name='$(domain)' +# diff --git a/courier/authlib/authsqliterc.dist b/courier/authlib/authsqliterc.dist new file mode 100644 index 00000000..2826fff8 --- /dev/null +++ b/courier/authlib/authsqliterc.dist @@ -0,0 +1,247 @@ +##VERSION: $Id: authsqliterc 17 2011-04-04 02:07:37Z mrsam $ +# +# Copyright 2012 Double Precision, Inc. See COPYING for +# distribution information. +# +# Do not alter lines that begin with ##, they are used when upgrading +# this configuration. +# +# authsqliterc created from authsqliterc.dist by sysconftool +# +# Each line in this file must follow the following format: +# +# field[spaces|tabs]value +# +# That is, the name of the field, followed by spaces or tabs, followed by +# field value. Trailing spaces are prohibited. + + +##NAME: LOCATION:0 +# +# The SQLite database. You must create this database beforehand, and create +# the users table, as defined below. + +SQLITE_DATABASE /var/users.db + +##NAME: SQLITE_USER_TABLE:0 +# +# Suggested format of the table specified by SQLITE_USER_TABLE: +# +# CREATE TABLE passwd ( +# id text not null primary key, +# crypt text, # Either... +# clear text, # ... or +# name text, +# uid int, +# gid int, +# home text not null, +# maildir text, +# defaultdelivery text, +# quota text, +# options text); +# +# Use either crypt or clear, to specify whether cleartext or crypted passwords +# get used (and define either SQLITE_CRYPT_PWFIELD or SQLITE_CLEAR_PWFIELD, +# below, accordingly). + +SQLITE_USER_TABLE passwd + +##NAME: SQLITE_CRYPT_PWFIELD:0 +# +# Either SQLITE_CRYPT_PWFIELD or SQLITE_CLEAR_PWFIELD must be defined. Both +# are OK too. crypted passwords go into SQLITE_CRYPT_PWFIELD, cleartext +# passwords go into SQLITE_CLEAR_PWFIELD. Cleartext passwords allow +# CRAM-MD5 authentication to be implemented. + +SQLITE_CRYPT_PWFIELD crypt + +##NAME: SQLITE_CLEAR_PWFIELD:0 +# +# +# SQLITE_CLEAR_PWFIELD clear + +##NAME: SQLITE_DEFAULT_DOMAIN:0 +# +# If DEFAULT_DOMAIN is defined, and someone tries to log in as 'user', +# we will search for 'user@DEFAULT_DOMAIN' instead. +# +# +# DEFAULT_DOMAIN example.com + +##NAME: SQLITE_UID_FIELD:0 +# +# Other fields in the sqlite table: +# +# SQLITE_UID_FIELD - contains the numerical userid of the account +# +SQLITE_UID_FIELD uid + +##NAME: SQLITE_GID_FIELD:0 +# +# Numerical groupid of the account + +SQLITE_GID_FIELD gid + +##NAME: SQLITE_LOGIN_FIELD:0 +# +# The login id, default is id. Basically the query is: +# +# SELECT SQLITE_UID_FIELD, SQLITE_GID_FIELD, ... WHERE id='loginid' +# + +SQLITE_LOGIN_FIELD id + +##NAME: SQLITE_HOME_FIELD:0 +# + +SQLITE_HOME_FIELD home + +##NAME: SQLITE_NAME_FIELD:0 +# +# The user's name (optional) + +SQLITE_NAME_FIELD name + +##NAME: SQLITE_MAILDIR_FIELD:0 +# +# This is an optional field, and can be used to specify an arbitrary +# location of the maildir for the account, which normally defaults to +# $HOME/Maildir (where $HOME is read from SQLITE_HOME_FIELD). +# +# You still need to provide a SQLITE_HOME_FIELD, even if you uncomment this +# out. +# +# SQLITE_MAILDIR_FIELD maildir + +##NAME: SQLITE_DEFAULTDELIVERY:0 +# +# Courier mail server only: optional field specifies custom mail delivery +# instructions for this account (if defined) -- essentially overrides +# DEFAULTDELIVERY from ${sysconfdir}/courierd +# +# SQLITE_DEFAULTDELIVERY defaultdelivery + +##NAME: SQLITE_QUOTA_FIELD:0 +# +# Define SQLITE_QUOTA_FIELD to be the name of the field that can optionally +# specify a maildir quota. See README.maildirquota for more information +# +# SQLITE_QUOTA_FIELD quota + +##NAME: SQLITE_AUXOPTIONS:0 +# +# Auxiliary options. The SQLITE_AUXOPTIONS field should be a char field that +# contains a single string consisting of comma-separated "ATTRIBUTE=NAME" +# pairs. These names are additional attributes that define various per-account +# "options", as given in INSTALL's description of the "Account OPTIONS" +# setting. +# +# SQLITE_AUXOPTIONS_FIELD options +# +# You might want to try something like this, if you'd like to use a bunch +# of individual fields, instead of a single text blob: +# +# SQLITE_AUXOPTIONS_FIELD "disableimap=" || disableimap || ",disablepop3=" || disablepop3 || ",disablewebmail=" || disablewebmail || ",sharedgroup=" || sharedgroup +# +# This will let you define fields called "disableimap", etc, with the end result +# being something that the OPTIONS parser understands. + + +##NAME: SQLITE_WHERE_CLAUSE:0 +# +# This is optional, SQLITE_WHERE_CLAUSE can be basically set to an arbitrary +# fixed string that is appended to the WHERE clause of our query +# +# SQLITE_WHERE_CLAUSE server='mailhost.example.com' + +##NAME: SQLITE_SELECT_CLAUSE:0 +# +# This is optional, SQLITE_SELECT_CLAUSE can be set when you have a database, +# which is structuraly different from the proposed layout. The fixed string will +# be used to do a SELECT operation on database, which should return fields +# in order specified bellow: +# +# username, cryptpw, clearpw, uid, gid, home, maildir, quota, fullname, options +# +# The username field should include the domain (see example below). +# +# Enabling this option causes ignorance of any other field-related +# options, excluding default domain. +# +# There are two variables, which you can use. Substitution will be made +# for them, so you can put entered username (local part) and domain name +# in the right place of your query. These variables are: +# $(local_part), $(domain), $(service) +# +# If a $(domain) is empty (not given by the remote user) the default domain +# name is used in its place. +# +# $(service) will expand out to the service being authenticated: imap, imaps, +# pop3 or pop3s. Courier mail server only: service will also expand out to +# "courier", when searching for local mail account's location. In this case, +# if the "maildir" field is not empty it will be used in place of +# DEFAULTDELIVERY. Courier mail server will also use esmtp when doing +# authenticated ESMTP. +# +# For example: +# +# SQLITE_SELECT_CLAUSE SELECT popbox.local_part || '@' || popbox.domain_name,\ +# '{MD5}' || popbox.password_hash), \ +# popbox.clearpw, \ +# domain.uid, \ +# domain.gid, \ +# domain.path || '/' || popbox.mbox_name, \ +# '', \ +# domain.quota, \ +# '', \ +# "disableimap=" || disableimap || ",disablepop3=" || \ +# disablepop3 || ",disablewebmail=" || disablewebmail || \ +# ",sharedgroup=" || sharedgroup \ +# FROM popbox, domain \ +# WHERE popbox.local_part = '$(local_part)' \ +# AND popbox.domain_name = '$(domain)' \ +# AND popbox.domain_name = domain.domain_name + + +##NAME: SQLITE_ENUMERATE_CLAUSE:1 +# +# Optional custom SQL query used to enumerate accounts for authenumerate, +# in order to compile a list of accounts for shared folders. The query +# should return the following fields: name, uid, gid, homedir, maildir, options +# +# Example: +# SQLITE_ENUMERATE_CLAUSE SELECT popbox.local_part || '@' || popbox.domain_name, \ +# domain.uid, \ +# domain.gid, \ +# domain.path || '/' || popbox.mbox_name, \ +# '', \ +# 'sharedgroup=' || sharedgroup \ +# FROM popbox, domain \ +# WHERE popbox.local_part = '$(local_part)' \ +# AND popbox.domain_name = '$(domain)' \ +# AND popbox.domain_name = domain.domain_name + + +##NAME: SQLITE_CHPASS_CLAUSE:0 +# +# This is optional, SQLITE_CHPASS_CLAUSE can be set when you have a database, +# which is structuraly different from proposed. The fixed string will +# be used to do an UPDATE operation on database. In other words, it is +# used, when changing passwords. This is used by sqwebmail/Courier webmail. +# +# There are four variables, which you can use. Substitution will be made +# for them, so you can put entered username (local part) and domain name +# in the right place of your query. There variables are: +# $(local_part) , $(domain) , $(newpass) , $(newpass_crypt) +# +# If a $(domain) is empty (not given by the remote user) the default domain +# name is used in its place. +# $(newpass) contains plain password +# $(newpass_crypt) contains its crypted form +# +# SQLITE_CHPASS_CLAUSE UPDATE popbox \ +# SET clearpw='$(newpass)', \ +# password_hash='$(newpass_crypt)' \ +# WHERE local_part='$(local_part)' \ +# AND domain_name='$(domain)' +# diff --git a/csh.env b/csh.env index 706c2df7..75cabeab 100644 --- a/csh.env +++ b/csh.env @@ -4,14 +4,14 @@ setenv ANT_HOME '/usr/share/ant' setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config /usr/share/openvpn/easy-rsa' -setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf ${EPREFIX}/etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' +setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf ${EPREFIX}/etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' setenv EDITOR '/usr/bin/vim' setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.0-r1/html' setenv GCC_SPECS '' setenv GDK_USE_XFT '1' setenv GSETTINGS_BACKEND 'dconf' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/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.22/info' setenv JAVACC_HOME '/usr/share/javacc/' setenv LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -29,22 +29,20 @@ 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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/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.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 MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' -setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin' +setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin:/usr/games/bin' setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/opt/bin/skype' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.2/html/library' setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.2/html/library' setenv PYTHONPATH '/usr/lib/portage/pym' setenv QT_GRAPHICSSYSTEM 'raster' setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins' -setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin' +setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin' setenv RUBYOPT '-rauto_gem' setenv R_HOME '/usr/lib64/R' -setenv SANE_CONFIG_DIR '/etc/sane.d' -setenv USB_DEVFS_PATH '/dev/bus/usb' setenv VBOX_APP_HOME '/usr/lib64/virtualbox' setenv XDG_CONFIG_DIRS '/etc/xdg' setenv XDG_DATA_DIRS '/usr/local/share:/usr/share:/usr/share/gdm' diff --git a/cups/printers.conf b/cups/printers.conf index 24cb6049..161ca530 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-01-08 18:44 +# Written by cupsd on 2013-01-29 21:28 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4 diff --git a/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf index 15b11b7e..7df1c8e8 100644 --- a/dbus-1/system.d/org.freedesktop.NetworkManager.conf +++ b/dbus-1/system.d/org.freedesktop.NetworkManager.conf @@ -43,14 +43,11 @@ send_interface="org.freedesktop.NetworkManager.Connection.Active"/> + send_interface="org.freedesktop.NetworkManager.Device.Modem"/> - - @@ -115,7 +112,5 @@ send_interface="org.freedesktop.NetworkManager" send_member="wake"/> - - 512 diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index 476e7c4a..2106f843 100644 --- a/env.d/04gcc-x86_64-pc-linux-gnu +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -1,6 +1,6 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4" +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3" GCC_SPECS="" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info" MULTIOSDIRS="../lib64:../lib32" diff --git a/env.d/20java-config b/env.d/20java-config index d4357333..1128b5d8 100644 --- a/env.d/20java-config +++ b/env.d/20java-config @@ -1,2 +1 @@ -MANPATH=/etc/java-config/system-vm/man/ -CONFIG_PROTECT_MASK="/etc/env.d/java/" +MANPATH="/etc/java-config-2/current-system-vm/man/" diff --git a/env.d/30sane b/env.d/30sane deleted file mode 100644 index e06f69f0..00000000 --- a/env.d/30sane +++ /dev/null @@ -1,2 +0,0 @@ -USB_DEVFS_PATH=/dev/bus/usb -SANE_CONFIG_DIR=/etc/sane.d diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE index e8dfd929..99ba9042 120000 --- a/env.d/gcc/.NATIVE +++ b/env.d/gcc/.NATIVE @@ -1 +1 @@ -x86_64-pc-linux-gnu-4.5.4 \ No newline at end of file +x86_64-pc-linux-gnu-4.6.3 \ No newline at end of file diff --git a/env.d/gcc/config-x86_64-pc-linux-gnu b/env.d/gcc/config-x86_64-pc-linux-gnu index 0954b8bb..63f79f2e 100644 --- a/env.d/gcc/config-x86_64-pc-linux-gnu +++ b/env.d/gcc/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=x86_64-pc-linux-gnu-4.5.4 +CURRENT=x86_64-pc-linux-gnu-4.6.3 diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 b/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 deleted file mode 100644 index d6e7ec1a..00000000 --- a/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 +++ /dev/null @@ -1,8 +0,0 @@ -LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info" -STDCXX_INCDIR="g++-v4" -CTARGET="x86_64-pc-linux-gnu" -GCC_SPECS="" -MULTIOSDIRS="../lib64:../lib32" -GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4" diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 b/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 new file mode 100644 index 00000000..1f636939 --- /dev/null +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 @@ -0,0 +1,8 @@ +LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info" +STDCXX_INCDIR="g++-v4" +CTARGET="x86_64-pc-linux-gnu" +GCC_SPECS="" +MULTIOSDIRS="../lib64:../lib32" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3" diff --git a/fonts/conf.avail/52-infinality.conf b/fonts/conf.avail/52-infinality.conf new file mode 100644 index 00000000..ac3162c2 --- /dev/null +++ b/fonts/conf.avail/52-infinality.conf @@ -0,0 +1,5 @@ + + + + infinality/infinality.conf + diff --git a/fonts/conf.avail/62-croscore-arimo.conf b/fonts/conf.avail/62-croscore-arimo.conf new file mode 100644 index 00000000..4ad40bf5 --- /dev/null +++ b/fonts/conf.avail/62-croscore-arimo.conf @@ -0,0 +1,40 @@ + + + + + sans-serif + + Arimo + + + + Arimo + + sans-serif + + + + Liberation Sans + + Arimo + + + + Arimo + + Liberation Sans + + + + Arial + + Arimo + + + + Arimo + + Arial + + + diff --git a/fonts/conf.avail/62-croscore-cousine.conf b/fonts/conf.avail/62-croscore-cousine.conf new file mode 100644 index 00000000..dea4f1bf --- /dev/null +++ b/fonts/conf.avail/62-croscore-cousine.conf @@ -0,0 +1,40 @@ + + + + + monospace + + Cousine + + + + Cousine + + monospace + + + + Liberation Mono + + Cousine + + + + Cousine + + Liberation Mono + + + + Courier New + + Cousine + + + + Cousine + + Courier New + + + diff --git a/fonts/conf.avail/62-croscore-symbolneu.conf b/fonts/conf.avail/62-croscore-symbolneu.conf new file mode 100644 index 00000000..a996fed1 --- /dev/null +++ b/fonts/conf.avail/62-croscore-symbolneu.conf @@ -0,0 +1,16 @@ + + + + + Symbol + + Symbol Neu + + + + Symbol Neu + + Symbol + + + diff --git a/fonts/conf.avail/62-croscore-tinos.conf b/fonts/conf.avail/62-croscore-tinos.conf new file mode 100644 index 00000000..40f84e0b --- /dev/null +++ b/fonts/conf.avail/62-croscore-tinos.conf @@ -0,0 +1,40 @@ + + + + + serif + + Tinos + + + + Tinos + + serif + + + + Liberation Serif + + Tinos + + + + Tinos + + Liberation Serif + + + + Times New Roman + + Tinos + + + + Tinos + + Times New Roman + + + diff --git a/fonts/infinality/conf.src/20-aliases-default-inf.conf b/fonts/infinality/conf.src/20-aliases-default-inf.conf new file mode 100644 index 00000000..e8465a21 --- /dev/null +++ b/fonts/infinality/conf.src/20-aliases-default-inf.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + sans-serif + + Arial + + + + serif + + Times New Roman + + + + monospace + + Courier New + + + + diff --git a/fonts/infinality/conf.src/20-aliases-default-linux.conf b/fonts/infinality/conf.src/20-aliases-default-linux.conf new file mode 100644 index 00000000..ba361e76 --- /dev/null +++ b/fonts/infinality/conf.src/20-aliases-default-linux.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + sans-serif + + DejaVu Sans + + + + serif + + Liberation Serif + + + + monospace + + Liberation Mono + + + + diff --git a/fonts/infinality/conf.src/20-aliases-default-osx.conf b/fonts/infinality/conf.src/20-aliases-default-osx.conf new file mode 100644 index 00000000..67993a2b --- /dev/null +++ b/fonts/infinality/conf.src/20-aliases-default-osx.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + sans-serif + + Lucida Grande + + + + serif + + Times + + + + monospace + + Courier + + + + diff --git a/fonts/infinality/conf.src/20-aliases-default-win.conf b/fonts/infinality/conf.src/20-aliases-default-win.conf new file mode 100644 index 00000000..4b0d8030 --- /dev/null +++ b/fonts/infinality/conf.src/20-aliases-default-win.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + sans-serif + + Arial + + + + serif + + Times New Roman + + + + monospace + + Courier New + + + + diff --git a/fonts/infinality/conf.src/20-fix-cantarell.conf b/fonts/infinality/conf.src/20-fix-cantarell.conf new file mode 100644 index 00000000..38a382fa --- /dev/null +++ b/fonts/infinality/conf.src/20-fix-cantarell.conf @@ -0,0 +1,17 @@ + + + + + + + + + + Cantarell + + + Cantarell + + + + diff --git a/fonts/infinality/conf.src/21-aliases-wine-linux.conf b/fonts/infinality/conf.src/21-aliases-wine-linux.conf new file mode 100644 index 00000000..8fad05c8 --- /dev/null +++ b/fonts/infinality/conf.src/21-aliases-wine-linux.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + System + + DejaVu Sans + + + + MS Shell Dlg + + DejaVu Sans + + + + MS Sans Serif + + DejaVu Sans + + + + \ No newline at end of file diff --git a/fonts/infinality/conf.src/21-aliases-wine-osx.conf b/fonts/infinality/conf.src/21-aliases-wine-osx.conf new file mode 100644 index 00000000..3f60b47d --- /dev/null +++ b/fonts/infinality/conf.src/21-aliases-wine-osx.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + System + + Lucida Grande + + + + MS Shell Dlg + + Lucida Grande + + + + MS Sans Serif + + Lucida Grande + + + + \ No newline at end of file diff --git a/fonts/infinality/conf.src/21-aliases-wine-win7-inf.conf b/fonts/infinality/conf.src/21-aliases-wine-win7-inf.conf new file mode 100644 index 00000000..a9c3afcd --- /dev/null +++ b/fonts/infinality/conf.src/21-aliases-wine-win7-inf.conf @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + System + + Segoe UI + + + + MS Shell Dlg + + Segoe UI + + + + MS Sans Serif + + Segoe UI + + + + \ No newline at end of file diff --git a/fonts/infinality/conf.src/21-aliases-wine-win98.conf b/fonts/infinality/conf.src/21-aliases-wine-win98.conf new file mode 100644 index 00000000..740e9cde --- /dev/null +++ b/fonts/infinality/conf.src/21-aliases-wine-win98.conf @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + System + + Microsoft Sans Serif + + + + MS Shell Dlg + + Microsoft Sans Serif + + + + MS Sans Serif + + Microsoft Sans Serif + + + + diff --git a/fonts/infinality/conf.src/21-aliases-wine-winxp.conf b/fonts/infinality/conf.src/21-aliases-wine-winxp.conf new file mode 100644 index 00000000..64e98522 --- /dev/null +++ b/fonts/infinality/conf.src/21-aliases-wine-winxp.conf @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + System + + Tahoma + + + + MS Shell Dlg + + Tahoma + + + + MS Sans Serif + + Tahoma + + + + diff --git a/fonts/infinality/conf.src/30-non-latin-inf-win.conf b/fonts/infinality/conf.src/30-non-latin-inf-win.conf new file mode 100644 index 00000000..bf9f1ddf --- /dev/null +++ b/fonts/infinality/conf.src/30-non-latin-inf-win.conf @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + serif + + Times New Roman + Batang + DFKai-SB + EucrosiaUPC + JasmineUPC + KaiTi + Kartika + KodchiangUPC + MingLiU + MS Mincho + SimSun + Sylfaen + DaunPenh + MV Boli + Iskoola Pota + Latha + Microsoft Himalaya + Mongolian Baiti + Shruti + Cardo + MPH 2B Damase + Times + Palatino Linotype + Liberation Serif + FreeSerif + Georgia + + + + sans-serif + + Arial + Meiryo + Arabic Typesetting + DokChampa + Malgun Gothic + Estrangelo Edessa + Gautami + Iskoola Pota + Microsoft YaHei + Mangal + Microsoft JhengHei + Vrinda + Plantagenet Cherokee + Raavi + Nyala + Tunga + Kartika + MV Boli + DaunPenh + Iskoola Pota + Latha + Microsoft Himalaya + Mongolian Baiti + Shruti + Skeirs + Cardo + MPH 2B Damase + Tahoma + Arial Unicode MS + Helvetica Neue + Helvetica + Liberation Sans + + + + monospace + + Courier New + Consolas + Inconsolata + Andale Mono + Courier New + Microsoft JhengHei + Microsoft YaHei + MPH 2B Damase + Courier + Liberation Mono + Droid Sans Mono + FreeMono + + + + 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/conf.src/30-non-latin-osx-lin.conf b/fonts/infinality/conf.src/30-non-latin-osx-lin.conf new file mode 100644 index 00000000..47c48490 --- /dev/null +++ b/fonts/infinality/conf.src/30-non-latin-osx-lin.conf @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + serif + + Times + Liberation Serif + FreeSerif + Times New Roman + Batang + DFKai-SB + EucrosiaUPC + JasmineUPC + KaiTi + Kartika + KodchiangUPC + MingLiU + MS Mincho + SimSun + Sylfaen + DaunPenh + MV Boli + Iskoola Pota + Latha + Microsoft Himalaya + Mongolian Baiti + Shruti + Cardo + MPH 2B Damase + Georgia + Palatino Linotype + + + + sans-serif + + Helvetica Neue + Helvetica + Liberation Sans + Arial + Meiryo + Arabic Typesetting + DokChampa + Malgun Gothic + Estrangelo Edessa + Gautami + Iskoola Pota + Microsoft YaHei + Mangal + Microsoft JhengHei + Vrinda + Plantagenet Cherokee + Raavi + Nyala + Tunga + Kartika + MV Boli + DaunPenh + Iskoola Pota + Latha + Microsoft Himalaya + Mongolian Baiti + Shruti + Skeirs + Cardo + MPH 2B Damase + Tahoma + Arial Unicode MS + + + + monospace + + Courier + Liberation Mono + Droid Sans Mono + FreeMono + Courier New + Consolas + Inconsolata + Andale Mono + Courier New + Microsoft JhengHei + Microsoft YaHei + MPH 2B Damase + + + + 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/conf.src/40-repl-generic.conf b/fonts/infinality/conf.src/40-repl-generic.conf new file mode 100644 index 00000000..3ebb3c4b --- /dev/null +++ b/fonts/infinality/conf.src/40-repl-generic.conf @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + sans-serif + + + Arial + + + + + serif + + + Times New Roman + + + + + monospace + + + Courier New + + + + + + diff --git a/fonts/infinality/conf.src/41-repl-os-inf.conf b/fonts/infinality/conf.src/41-repl-os-inf.conf new file mode 100644 index 00000000..4d9dddd0 --- /dev/null +++ b/fonts/infinality/conf.src/41-repl-os-inf.conf @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + Helvetica + + + Arial + + + + + Helvetica + + + Arial + + + + + + Courier 10 Pitch + + + Courier New + + + + + Courier 10 Pitch + + + Courier New + + + + + + Helvetica Neue + + + Arial + + + + + Helvetica Neue + + + Arial + + + + + + Palatino + + + Palatino Linotype + + + + + Palatino + + + Palatino Linotype + + + + + + Lucida Sans + + + Lucida Grande + + + + + Lucida Sans + + + Lucida Grande + + + + + + + + Courier New + + + 10 + + + Courier + + + + + Courier New + + + 10 + + + Courier + + + + + + + Times + + + Times New Roman + + + + + Times + + + Times New Roman + + + + diff --git a/fonts/infinality/conf.src/41-repl-os-linux.conf b/fonts/infinality/conf.src/41-repl-os-linux.conf new file mode 100644 index 00000000..56a9f904 --- /dev/null +++ b/fonts/infinality/conf.src/41-repl-os-linux.conf @@ -0,0 +1,98 @@ + + + + + + + + + + Nimbus Sans + Nimbus Sans L + Arial + Helvetica + Helvetica Neue + Freesans + + + Liberation Sans + + + + + Nimbus Sans + Nimbus Sans L + Arial + Helvetica + Helvetica Neue + Freesans + + + Liberation Sans + + + + + + Bitstream Vera Sans + Verdana + + + DejaVu Sans + + + + + Bitstream Vera Sans + Verdana + + + DejaVu Sans + + + + + + Courier + FreeMono + Nimbus Mono L + Courier New + + + Liberation Mono + + + + + Courier + FreeMono + Nimbus Mono L + Courier New + + + Liberation Mono + + + + + + Times + Nimbus Serif L + Times New Roman + + + DejaVu Serif + + + + + Times + Nimbus Serif L + Times New Roman + + + DejaVu Serif + + + + diff --git a/fonts/infinality/conf.src/41-repl-os-osx.conf b/fonts/infinality/conf.src/41-repl-os-osx.conf new file mode 100644 index 00000000..9ced9fbb --- /dev/null +++ b/fonts/infinality/conf.src/41-repl-os-osx.conf @@ -0,0 +1,115 @@ + + + + + + + + + + Nimbus Sans + Nimbus Sans L + Arial + Liberation Sans + Freesans + + + Helvetica Neue + + + + + Nimbus Sans + Nimbus Sans L + Arial + Liberation Sans + Freesans + + + Helvetica Neue + + + + + + Courier New + FreeMono + Nimbus Mono L + + + Courier + + + + + Courier New + FreeMono + Nimbus Mono L + + + Courier + + + + + + Times New Roman + DejaVu Serif + Nimbus Serif L + Liberation Serif + FreeSerif + + + Times + + + + + Times New Roman + DejaVu Serif + Nimbus Serif L + Liberation Serif + FreeSerif + + + Times + + + + + + Palatino Linotype + + + Palatino + + + + + Palatino Linotype + + + Palatino + + + + + + Lucida Sans + Lucida Sans Unicode + + + Lucida Grande + + + + + Lucida Sans + Lucida Sans Unicode + + + Lucida Grande + + + + diff --git a/fonts/infinality/conf.src/41-repl-os-win.conf b/fonts/infinality/conf.src/41-repl-os-win.conf new file mode 100644 index 00000000..5e66fd44 --- /dev/null +++ b/fonts/infinality/conf.src/41-repl-os-win.conf @@ -0,0 +1,134 @@ + + + + + + + + + + Nimbus Sans + Nimbus Sans L + Helvetica Neue + Helvetica + Liberation Sans + Freesans + + + Arial + + + + + Nimbus Sans + Nimbus Sans L + Helvetica Neue + Helvetica + Liberation Sans + Freesans + + + Arial + + + + + + Bitstream Vera Sans + DejaVu Sans + + + Verdana + + + + + Bitstream Vera Sans + DejaVu Sans + + + Verdana + + + + + + Courier + FreeMono + Nimbus Mono L + + + Courier New + + + + + Courier + FreeMono + Nimbus Mono L + + + Courier New + + + + + + Times + DejaVu Serif + Nimbus Serif L + Liberation Serif + + + Times New Roman + + + + + Times + DejaVu Serif + Nimbus Serif L + Liberation Serif + + + Times New Roman + + + + + + Palatino + + + Palatino Linotype + + + + + Palatino + + + Palatino Linotype + + + + + + Lucida Sans + Lucida Grande + + + Lucida Sans Unicode + + + + + Lucida Sans + Lucida Grande + + + Lucida Sans Unicode + + + + diff --git a/fonts/infinality/conf.src/42-repl-global.conf b/fonts/infinality/conf.src/42-repl-global.conf new file mode 100644 index 00000000..c9c255d8 --- /dev/null +++ b/fonts/infinality/conf.src/42-repl-global.conf @@ -0,0 +1,44 @@ + + + + + + + + + + + + FONT TO REPLACE 1 + + + REPLACEMENT FONT 1 + + + + + FONT TO REPLACE 1 + + + REPLACEMENT FONT 1 + + + + + + FONT TO REPLACE 2 + + + REPLACEMENT FONT 2 + + + + + FONT TO REPLACE 2 + + + REPLACEMENT FONT 2 + + + + diff --git a/fonts/infinality/conf.src/43-repl-tt-traced-bitmap.conf b/fonts/infinality/conf.src/43-repl-tt-traced-bitmap.conf new file mode 100644 index 00000000..175aaa86 --- /dev/null +++ b/fonts/infinality/conf.src/43-repl-tt-traced-bitmap.conf @@ -0,0 +1,102 @@ + + + + + + + + + + + Terminus + + + Terminus (ttf) + + + + + Terminus + + + Terminus (ttf) + + + + + + Profont + + + ProFontWindows + + + + + Profont + + + ProFontWindows + + + + + + ProggyClean + + + ProggyCleanTT + + + + + ProggyClean + + + ProggyCleanTT + + + + + + ProggySquare + + + ProggySquareTTSZ + + + + + ProggySquare + + + ProggySquareTTSZ + + + + + + ProggyTiny + + + ProggyTinyTTSZ + + + + + ProggyTiny + + + ProggyTinyTTSZ + + + + diff --git a/fonts/infinality/conf.src/44-repl-corrective.conf b/fonts/infinality/conf.src/44-repl-corrective.conf new file mode 100644 index 00000000..8aeaec02 --- /dev/null +++ b/fonts/infinality/conf.src/44-repl-corrective.conf @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + Arial + + + bold + + + Arial Black + + + black + + + + + + + Trebuchet + + + Trebuchet MS + + + + + Trebuchet + + + Trebuchet MS + + + + diff --git a/fonts/infinality/conf.src/50-base-rendering-inf-osx-lin.conf b/fonts/infinality/conf.src/50-base-rendering-inf-osx-lin.conf new file mode 100644 index 00000000..dfb5f466 --- /dev/null +++ b/fonts/infinality/conf.src/50-base-rendering-inf-osx-lin.conf @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + rgb + + + true + + + true + + + true + + + hintslight + + + lcddefault + + + + diff --git a/fonts/infinality/conf.src/50-base-rendering-osx2.conf b/fonts/infinality/conf.src/50-base-rendering-osx2.conf new file mode 100644 index 00000000..73d6751e --- /dev/null +++ b/fonts/infinality/conf.src/50-base-rendering-osx2.conf @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + rgb + + + false + + + false + + + true + + + hintnone + + + lcddefault + + + + diff --git a/fonts/infinality/conf.src/50-base-rendering-win7-winxp.conf b/fonts/infinality/conf.src/50-base-rendering-win7-winxp.conf new file mode 100644 index 00000000..8d2c486d --- /dev/null +++ b/fonts/infinality/conf.src/50-base-rendering-win7-winxp.conf @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + rgb + + + true + + + false + + + true + + + hintfull + + + lcddefault + + + + diff --git a/fonts/infinality/conf.src/50-base-rendering-win98.conf b/fonts/infinality/conf.src/50-base-rendering-win98.conf new file mode 100644 index 00000000..f623a980 --- /dev/null +++ b/fonts/infinality/conf.src/50-base-rendering-win98.conf @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + rgb + + + true + + + false + + + false + + + hintfull + + + lcddefault + + + + diff --git a/fonts/infinality/conf.src/60-group-non-tt-fonts.conf b/fonts/infinality/conf.src/60-group-non-tt-fonts.conf new file mode 100644 index 00000000..027a85e4 --- /dev/null +++ b/fonts/infinality/conf.src/60-group-non-tt-fonts.conf @@ -0,0 +1,507 @@ + + + + + + + + + + + + + Abel + AR PL ShanHeiSun Uni + Abril Fatface + Aclonica + Acme + Actor + Aladin + Aldrich + Alex Brush + Alfa Slab One + Alike Angular + Alike + Allerta Stencil + Allerta + Almendra SC + Almendra + Amaranth + American Typewriter + Andada + Andika + Annie Use Your Telescope + Anton + Apple Garamond Light + Apple Garamond + 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 Swash Caps + Bilbo + Bitter + Black Ops One + Bonbon + Boogaloo + Bowlby One SC + Bowlby One + Brawler + Bree Serif + BrushScript + Bubblegum Sans + Buda + Buenard + Butcherman + CMU Bright + Cabin Condensed + Cabin Sketch + Cabin + Caesar Dressing + Cagliostro + Calligraffitti + Cambo + Candal + Cantarell Regular + Cantarell + 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 Caption + Coda + Comfortaa Regular + Comfortaa + 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 Swash Caps + Delius Unicase + Delius + 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 Inline + Fascinate + 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 Fill + Geostar + Give You Glory + Gloria Hallelujah + Goblin One + Gochi Hand + Goudy Bookletter 1911 + Gravitas One + Gruppo + Habibi + Hammersmith One + Handlee + Helvetica CY + Helvetica Neue + Helvetica + Herr Von Muellerhoff + Holtwood One SC + Homemade Apple + IM Fell DW Pica SC + IM Fell DW Pica + IM Fell Double Pica SC + IM Fell Double Pica + IM Fell English SC + IM Fell English + IM Fell French Canon SC + IM Fell French Canon + IM Fell Great Primer SC + IM Fell Great Primer + IM Fell + Iceland + Inder + Indie Flower + IrisUPC + Irish Grover + Italianno + JasmineUPC + Jockey One + Jomolhari + Josefin Sans Std Light + Josefin Sans + 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 + Lobster Two + Lobster + Lohit Bengali + Lohit Gujarati + Lohit Hindi + Lohit Kannada + Lohit Malayalam + Lohit Oriya + Lohit Punjabi + Lohit Tamil + Lohit Telugu + Lohit Devanagari + 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 SC + Mate + Maven Pro + Meddon + MedievalSharp + Medula One + Megalopolis + Megrim + Merienda One + Merriweather + Metamorphous + Metrophobic + MgOpen Canonica + MgOpen Cosmetica + MgOpen Modata + MgOpen Moderna + Michroma + Miltonian Tattoo + Miltonian + 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 L + Nimbus Sans + Nixie One + Nobile-bold-italic002 + Nobile-bold + Nobile-italic002 + Nobile002 + Nobile + 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 SC + Overlock + 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 Sans + Quattrocento + Questrial + Quicksand + Qwigley + Radley + Raleway + Rammetto One + Rancho + Rationale + Redressed + Ribeye Marrow + Ribeye + 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 Negative + Signika + 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-Light 100 + Ultra + Uncial Antiqua + UnifrakturCook + UnifrakturMaguntia + Univers LT Std + Unkempt + Unlock + Unna + Utopia + VT323 + Varela Round + Varela + 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 bold + proxima nova regular + proxima nova + proxima-nova-1 + proxima-nova-2 + wasy10 + + + NON TT Instructed Font + + + + + + NON TT Instructed Font + + + true + + + hintslight + + + true + + + true + + + + diff --git a/fonts/infinality/conf.src/60-group-tt-fonts.conf b/fonts/infinality/conf.src/60-group-tt-fonts.conf new file mode 100644 index 00000000..62a6d9de --- /dev/null +++ b/fonts/infinality/conf.src/60-group-tt-fonts.conf @@ -0,0 +1,268 @@ + + + + + + + + + + + false + + + Adamina + Aguafina Script + Alice + Allan + Aller Display + Aller Light + Aller + Amatic SC + Andale Mono + Andalus + Angsana New + AngsanaUPC + Anonymous Pro + Anonymous + Antic + Aparajita + Apple Chancery + Apple LiGothic + Aquabase + Arabic Typesetting + Arial Black + Arial MT + Arial Monospaced + Arial Narrow + Arial SF MT + Arial Unicode MS + Arial + ArialMT + Arimo + Arimo + Artifika + Arvo + BPmono + Batang + BatangChe + Bitstream Charter + Bitstream Vera Sans Mono + Bitstream Vera Sans + Bitstream Vera Serif + Book Antiqua + Bookman Old Style + Browallia New + BrowalliaUPC + Calibri + Cambria Math + Cambria + Candara + Century Gothic + Century + Chalkboard + Chalkduster + Charcoal CY + Charcoal + Charis SIL + Chicago + Comic Sans MS + Consolas + Constantia + Corbel + Cordia New + CordiaUPC + Courier 10 Pitch + Courier New + Courier + Cousine + DFKai-SB + Dark Courier + DaunPenh + David + DejaVu LGC Sans Mono + DejaVu Sans Mono + DejaVu Sans + DejaVu Serif + Delicious + DilleniaUPC + DokChampa + Dotum + DotumChe + Droid Sans Mono + Droid Sans + 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 Basic + Gentium Book Basic + Gentium + 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 + Linux Libertine + Lobster + Lucida Console + Lucida Grande + Lucida Sans Typewriter + Lucida Sans Unicode + Lucida Sans + Luxi Mono + MS Gothic + MS Mincho + MS PGothic + MS PMincho + MS UI Gothic + MV Boli + Mako + Malgun Gothic + Mangal + Marker Felt + Meiryo UI + Meiryo + 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-ExtB + MingLiU + MingLiU_HKSCS-ExtB + MingLiU_HKSCS + Miriam Fixed + Miriam + 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-ExtB + PMingLiU + PT Sans Caption + PT Sans Narrow + PT Sans + PT Serif Caption + PT Serif + Padauk + Palatino Linotype + Papyrus + Plantagenet Cherokee + Play + Pragmata + PragmataPro + Raavi + Reenie Beanie + Rod + Sakkal Majalla + Segoe Print + Segoe Script + Segoe UI Light + Segoe UI Semibold + Segoe UI Symbol + Segoe UI + Shonar Bangla + Shruti + SimHei + SimSun-ExtB + SimSun + Simplified Arabic Fixed + Simplified Arabic + Skia + Sylfaen + Symbol + TITUS Cyberbit Basic + Tahoma + Tangerine + Times New Roman + Times + Tinos + Traditional Arabic + Trebuchet MS + Tunga + Ubuntu Condensed + Ubuntu Mono + Ubuntu + Utsaah + Vani + Verdana + Vijaya + Vollkorn + Vrinda + Webdings + Wingdings + Yanone Kaffeesatz + Zapfino + + + TT Instructed Font + + + + diff --git a/fonts/infinality/conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf b/fonts/infinality/conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf new file mode 100644 index 00000000..bbc3c91e --- /dev/null +++ b/fonts/infinality/conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf @@ -0,0 +1,49 @@ + + + + + + + + + NON TT Instructed Font + + + true + + + true + + + hintslight + + + true + + + true + + + + + + NON TT Instructed Font + + + false + + + true + + + hintfull + + + true + + + true + + + + diff --git a/fonts/infinality/conf.src/61-group-non-tt-rendering-win98.conf b/fonts/infinality/conf.src/61-group-non-tt-rendering-win98.conf new file mode 100644 index 00000000..68d05289 --- /dev/null +++ b/fonts/infinality/conf.src/61-group-non-tt-rendering-win98.conf @@ -0,0 +1,25 @@ + + + + + + + + + NON TT Instructed Font + + + none + + + true + + + true + + + true + + + + diff --git a/fonts/infinality/conf.src/61-group-tt-rendering-inf-7-xp.conf b/fonts/infinality/conf.src/61-group-tt-rendering-inf-7-xp.conf new file mode 100644 index 00000000..650ba188 --- /dev/null +++ b/fonts/infinality/conf.src/61-group-tt-rendering-inf-7-xp.conf @@ -0,0 +1,22 @@ + + + + + + + + + TT Instructed Font + + + true + + + hintfull + + + false + + + + diff --git a/fonts/infinality/conf.src/61-group-tt-rendering-linux.conf b/fonts/infinality/conf.src/61-group-tt-rendering-linux.conf new file mode 100644 index 00000000..69ee7b26 --- /dev/null +++ b/fonts/infinality/conf.src/61-group-tt-rendering-linux.conf @@ -0,0 +1,22 @@ + + + + + + + + + TT Instructed Font + + + true + + + hintslight + + + true + + + + diff --git a/fonts/infinality/conf.src/61-group-tt-rendering-osx.conf b/fonts/infinality/conf.src/61-group-tt-rendering-osx.conf new file mode 100644 index 00000000..9b7f06f1 --- /dev/null +++ b/fonts/infinality/conf.src/61-group-tt-rendering-osx.conf @@ -0,0 +1,22 @@ + + + + + + + + + TT Instructed Font + + + true + + + hintslight + + + true + + + + diff --git a/fonts/infinality/conf.src/61-group-tt-rendering-osx2.conf b/fonts/infinality/conf.src/61-group-tt-rendering-osx2.conf new file mode 100644 index 00000000..a363c417 --- /dev/null +++ b/fonts/infinality/conf.src/61-group-tt-rendering-osx2.conf @@ -0,0 +1,22 @@ + + + + + + + + + TT Instructed Font + + + true + + + hintnone + + + true + + + + diff --git a/fonts/infinality/conf.src/61-group-tt-rendering-win98.conf b/fonts/infinality/conf.src/61-group-tt-rendering-win98.conf new file mode 100644 index 00000000..57aead7f --- /dev/null +++ b/fonts/infinality/conf.src/61-group-tt-rendering-win98.conf @@ -0,0 +1,22 @@ + + + + + + + + + TT Instructed Font + + + false + + + hintfull + + + false + + + + diff --git a/fonts/infinality/conf.src/62-tt-monospace-rendering.conf b/fonts/infinality/conf.src/62-tt-monospace-rendering.conf new file mode 100644 index 00000000..70a9cfa9 --- /dev/null +++ b/fonts/infinality/conf.src/62-tt-monospace-rendering.conf @@ -0,0 +1,48 @@ + + + + + + + + + + + + + Andale Mono + Anonymous Pro + Bitstream Vera Sans Mono + Courier New + DejaVu Sans Mono + Essential PragmataPro + Inconsolata + Liberation Mono + Lucida Console + Lucida Sans Typewriter + Monaco + Pragmata + PragmataPro + Ubuntu Mono + + + true + + + true + + + false + + + false + + + hintfull + + + 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 new file mode 100644 index 00000000..46c4b673 --- /dev/null +++ b/fonts/infinality/conf.src/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1,212 @@ + + + + + + + + + + + + ProFontWindows + ProggyCleanTT + ProggySquareTTSZ + ProggyTinyTTSZ + ProggyCleanTT CE + ProFont + Terminus + Terminus (TTF) + MonteCarlo + + + hintnone + + + false + + + false + + + false + + + false + + + true + + + + + + + + ProggyCleanTT + ProggyCleanTT CE + ProggySquareTTSZ + ProggyTinyTTSZ + + + 16 + + + 16 + + + + + + ProFontWindows + + + 12 + + + 12 + + + + + + MonteCarlo + + + 12 + + + 12 + + + + + + + Terminus (TTF) + + + 12 + + + 12 + + + + + Terminus (TTF) + + + 13 + + + 12 + + + + + Terminus (TTF) + + + 15 + + + 14 + + + + + Terminus (TTF) + + + 17 + + + 16 + + + + + Terminus (TTF) + + + 19 + + + 18 + + + + + Terminus (TTF) + + + 21 + + + 20 + + + + + Terminus (TTF) + + + 23 + + + 22 + + + + + Terminus (TTF) + + + 17 + + + 16 + + + + + Terminus (TTF) + + + 28 + + + 24 + + + 24 + + + + + Terminus (TTF) + + + 32 + + + 28 + + + 28 + + + + + Terminus (TTF) + + + 32 + + + 32 + + + + diff --git a/fonts/infinality/conf.src/64-override-inf.conf b/fonts/infinality/conf.src/64-override-inf.conf new file mode 100644 index 00000000..ba1a19ca --- /dev/null +++ b/fonts/infinality/conf.src/64-override-inf.conf @@ -0,0 +1,20 @@ + + + + + + + + + + Lucida Grande + + + 9 + + + Lucida Sans Unicode + + + + diff --git a/fonts/infinality/conf.src/64-override-win98.conf b/fonts/infinality/conf.src/64-override-win98.conf new file mode 100644 index 00000000..79d8e012 --- /dev/null +++ b/fonts/infinality/conf.src/64-override-win98.conf @@ -0,0 +1,48 @@ + + + + + + + + + + medium + + + 14 + + + none + + + true + + + false + + + true + + + + + + + 18 + + + none + + + true + + + false + + + true + + + + diff --git a/fonts/infinality/conf.src/65-override.conf b/fonts/infinality/conf.src/65-override.conf new file mode 100644 index 00000000..c0801cb1 --- /dev/null +++ b/fonts/infinality/conf.src/65-override.conf @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + diff --git a/fonts/infinality/conf.src/70-forced-synthetic.conf b/fonts/infinality/conf.src/70-forced-synthetic.conf new file mode 100644 index 00000000..2e2300ed --- /dev/null +++ b/fonts/infinality/conf.src/70-forced-synthetic.conf @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + FONT NAME HERE + + + + + roman + + + + + true + + + + + roman + + + + + + + + roman + + + + true + + + + + matrix + + 1.0 + 0.2 + 0 + 1 + + + + + + oblique + + + + + + + + + + + YOUR FONT HERE + + + + + medium + + + + + true + + + + + medium + + + + + + + + true + + + + true + + + + bold + + + + diff --git a/fonts/infinality/conf.src/71-forced-synthetic-win98.conf b/fonts/infinality/conf.src/71-forced-synthetic-win98.conf new file mode 100644 index 00000000..1da63fbd --- /dev/null +++ b/fonts/infinality/conf.src/71-forced-synthetic-win98.conf @@ -0,0 +1,45 @@ + + + + + + + + + + TT Instructed Font + + + + roman + + + + roman + + + + oblique + + + + + + + TT Instructed Font + + + + medium + + + + medium + + + + bold + + + + diff --git a/fonts/infinality/conf.src/80-selective-rendering-inf-7-xp.conf b/fonts/infinality/conf.src/80-selective-rendering-inf-7-xp.conf new file mode 100644 index 00000000..769e9947 --- /dev/null +++ b/fonts/infinality/conf.src/80-selective-rendering-inf-7-xp.conf @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + 9 + + + hintslight + + + true + + + + + + + Arial Black + + + 12 + + + hintslight + + + true + + + + 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 new file mode 100644 index 00000000..029b0840 --- /dev/null +++ b/fonts/infinality/conf.src/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + Droid Sans Mono + Droid Sans + + + 19 + + + true + + + + + + + Aquabase + Browallia New + BrowalliaUPC + + + 14 + + + hintslight + + + true + + + + + + + Courier + + + roman + + + hintslight + + + true + + + + + + + Gentium + + + 18 + + + false + + + hintfull + + + + + + + Gill Sans + + + 17 + + + true + + + hintslight + + + + + + + Gill Sans + + + roman + + + 18 + 19 + + + true + + + hintslight + + + + + + + Gill Sans + + + 11 + 12 + + + true + + + hintslight + + + + + + + Droid Sans + + + 9 + 10 + 11 + 14 + + + medium + + + true + + + hintslight + + + + + + + Ubuntu Mono + + + 12 + 13 + + + medium + + + true + + + hintslight + + + + diff --git a/fonts/infinality/conf.src/81-final-rendering-inf-7-xp.conf b/fonts/infinality/conf.src/81-final-rendering-inf-7-xp.conf new file mode 100644 index 00000000..886cb8c6 --- /dev/null +++ b/fonts/infinality/conf.src/81-final-rendering-inf-7-xp.conf @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + diff --git a/fonts/infinality/conf.src/90-no-synthetic.conf b/fonts/infinality/conf.src/90-no-synthetic.conf new file mode 100644 index 00000000..b5cbf18b --- /dev/null +++ b/fonts/infinality/conf.src/90-no-synthetic.conf @@ -0,0 +1,100 @@ + + + + + + + + + + + roman + + + roman + + + false + + + oblique + + + + + + roman + + + roman + + + false + + + oblique + + + + + + medium + + + medium + + + false + + + bold + + + + + + medium + + + medium + + + false + + + bold + + + + + + + + semibold + + + bold + + + bold + + + + + + + book + + + bold + + + bold + + + + + diff --git a/fonts/infinality/conf.src/90-reject.conf b/fonts/infinality/conf.src/90-reject.conf new file mode 100644 index 00000000..4fe3104c --- /dev/null +++ b/fonts/infinality/conf.src/90-reject.conf @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + Inconsolata + + + bold + + + + + + diff --git a/fonts/infinality/conf.src/99-debug.conf b/fonts/infinality/conf.src/99-debug.conf new file mode 100644 index 00000000..75c93455 --- /dev/null +++ b/fonts/infinality/conf.src/99-debug.conf @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + rgb + + + true + + + false + + + true + + + hintfull + + + lcddefault + + + + diff --git a/fonts/infinality/infinality.conf b/fonts/infinality/infinality.conf new file mode 100644 index 00000000..6f02054b --- /dev/null +++ b/fonts/infinality/infinality.conf @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + Type 1 + + + + + + + + + false + + + + + + + true + + + + + + + + false + + + + + + + + false + + + + + + + + + 72 + + + + + + + + + + false + + + + + infinality/conf.d + + diff --git a/fonts/infinality/styles.conf.avail/debug/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/debug/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/42-repl-global.conf b/fonts/infinality/styles.conf.avail/debug/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/debug/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/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/fonts/infinality/styles.conf.avail/debug/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/debug/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/debug/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/debug/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/debug/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/debug/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/65-override.conf b/fonts/infinality/styles.conf.avail/debug/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/debug/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/debug/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/debug/99-debug.conf b/fonts/infinality/styles.conf.avail/debug/99-debug.conf new file mode 120000 index 00000000..bf9df787 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/debug/99-debug.conf @@ -0,0 +1 @@ +../../conf.src/99-debug.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/20-aliases-default-inf.conf b/fonts/infinality/styles.conf.avail/infinality/20-aliases-default-inf.conf new file mode 120000 index 00000000..911d8a63 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/20-aliases-default-inf.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-inf.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/infinality/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/21-aliases-wine-win7-inf.conf b/fonts/infinality/styles.conf.avail/infinality/21-aliases-wine-win7-inf.conf new file mode 120000 index 00000000..3c5405bb --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/21-aliases-wine-win7-inf.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-win7-inf.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/30-non-latin-inf-win.conf b/fonts/infinality/styles.conf.avail/infinality/30-non-latin-inf-win.conf new file mode 120000 index 00000000..6e321793 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/30-non-latin-inf-win.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-inf-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/41-repl-os-inf.conf b/fonts/infinality/styles.conf.avail/infinality/41-repl-os-inf.conf new file mode 120000 index 00000000..c9c46e4d --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/41-repl-os-inf.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-inf.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/42-repl-global.conf b/fonts/infinality/styles.conf.avail/infinality/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/infinality/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/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/fonts/infinality/styles.conf.avail/infinality/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/infinality/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/50-base-rendering-inf-osx-lin.conf b/fonts/infinality/styles.conf.avail/infinality/50-base-rendering-inf-osx-lin.conf new file mode 120000 index 00000000..1dceb226 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/50-base-rendering-inf-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-inf-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/infinality/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/infinality/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/61-group-non-tt-rendering-inf-7-xp-lin.conf b/fonts/infinality/styles.conf.avail/infinality/61-group-non-tt-rendering-inf-7-xp-lin.conf new file mode 120000 index 00000000..af1c1963 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/61-group-non-tt-rendering-inf-7-xp-lin.conf @@ -0,0 +1 @@ +../../conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/61-group-tt-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/infinality/61-group-tt-rendering-inf-7-xp.conf new file mode 120000 index 00000000..ac97127f --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/61-group-tt-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/infinality/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/infinality/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/64-override-inf.conf b/fonts/infinality/styles.conf.avail/infinality/64-override-inf.conf new file mode 120000 index 00000000..eaceff0e --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/64-override-inf.conf @@ -0,0 +1 @@ +../../conf.src/64-override-inf.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/65-override.conf b/fonts/infinality/styles.conf.avail/infinality/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/infinality/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/80-selective-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/infinality/80-selective-rendering-inf-7-xp.conf new file mode 120000 index 00000000..d1905b55 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/80-selective-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/styles.conf.avail/infinality/80-selective-rendering-inf-win-lin.conf new file mode 120000 index 00000000..fa2227bd --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-win-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/81-final-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/infinality/81-final-rendering-inf-7-xp.conf new file mode 120000 index 00000000..5dca3718 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/81-final-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/81-final-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/infinality/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/infinality/90-reject.conf b/fonts/infinality/styles.conf.avail/infinality/90-reject.conf new file mode 120000 index 00000000..0a602aaa --- /dev/null +++ b/fonts/infinality/styles.conf.avail/infinality/90-reject.conf @@ -0,0 +1 @@ +../../conf.src/90-reject.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/20-aliases-default-linux.conf b/fonts/infinality/styles.conf.avail/linux/20-aliases-default-linux.conf new file mode 120000 index 00000000..bea75c8d --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/20-aliases-default-linux.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-linux.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/linux/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/21-aliases-wine-linux.conf b/fonts/infinality/styles.conf.avail/linux/21-aliases-wine-linux.conf new file mode 120000 index 00000000..4df0239c --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/21-aliases-wine-linux.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-linux.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/30-non-latin-osx-lin.conf b/fonts/infinality/styles.conf.avail/linux/30-non-latin-osx-lin.conf new file mode 120000 index 00000000..fd61dfab --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/30-non-latin-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/41-repl-os-linux.conf b/fonts/infinality/styles.conf.avail/linux/41-repl-os-linux.conf new file mode 120000 index 00000000..24f9cb5f --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/41-repl-os-linux.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-linux.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/42-repl-global.conf b/fonts/infinality/styles.conf.avail/linux/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/linux/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/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/fonts/infinality/styles.conf.avail/linux/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/linux/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/50-base-rendering-inf-osx-lin.conf b/fonts/infinality/styles.conf.avail/linux/50-base-rendering-inf-osx-lin.conf new file mode 120000 index 00000000..1dceb226 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/50-base-rendering-inf-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-inf-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/linux/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/linux/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/61-group-non-tt-rendering-inf-7-xp-lin.conf b/fonts/infinality/styles.conf.avail/linux/61-group-non-tt-rendering-inf-7-xp-lin.conf new file mode 120000 index 00000000..af1c1963 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/61-group-non-tt-rendering-inf-7-xp-lin.conf @@ -0,0 +1 @@ +../../conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/61-group-tt-rendering-linux.conf b/fonts/infinality/styles.conf.avail/linux/61-group-tt-rendering-linux.conf new file mode 120000 index 00000000..6ce29504 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/61-group-tt-rendering-linux.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-linux.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/linux/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/linux/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/65-override.conf b/fonts/infinality/styles.conf.avail/linux/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/linux/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/styles.conf.avail/linux/80-selective-rendering-inf-win-lin.conf new file mode 120000 index 00000000..fa2227bd --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-win-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/linux/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/linux/90-reject.conf b/fonts/infinality/styles.conf.avail/linux/90-reject.conf new file mode 120000 index 00000000..0a602aaa --- /dev/null +++ b/fonts/infinality/styles.conf.avail/linux/90-reject.conf @@ -0,0 +1 @@ +../../conf.src/90-reject.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/20-aliases-default-nyx.conf b/fonts/infinality/styles.conf.avail/nyx/20-aliases-default-nyx.conf new file mode 100644 index 00000000..0cfbab90 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/20-aliases-default-nyx.conf @@ -0,0 +1,31 @@ + + + + + + + + + + + + + sans-serif + + Arimo + + + + serif + + Tinos + + + + monospace + + Cousine + + + + diff --git a/fonts/infinality/styles.conf.avail/nyx/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/nyx/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/21-aliases-wine-win7-inf.conf b/fonts/infinality/styles.conf.avail/nyx/21-aliases-wine-win7-inf.conf new file mode 120000 index 00000000..3c5405bb --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/21-aliases-wine-win7-inf.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-win7-inf.conf \ No newline at end of file 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 new file mode 100644 index 00000000..e332835b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/30-non-latin-nyx.conf @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + serif + + Liberation Serif + DejaVu Serif + FreeSerif + Times New Roman + Batang + DFKai-SB + EucrosiaUPC + JasmineUPC + KaiTi + Kartika + KodchiangUPC + MingLiU + MS Mincho + SimSun + Sylfaen + DaunPenh + MV Boli + Iskoola Pota + Latha + Microsoft Himalaya + Mongolian Baiti + Shruti + Cardo + MPH 2B Damase + Georgia + Times + Palatino Linotype + + + + sans-serif + + Liberation Sans + Arial + DejaVu Sans + Meiryo + Arabic Typesetting + DokChampa + Malgun Gothic + Estrangelo Edessa + Gautami + Iskoola Pota + Microsoft YaHei + Mangal + Microsoft JhengHei + Vrinda + Plantagenet Cherokee + Raavi + Nyala + Tunga + Kartika + MV Boli + DaunPenh + Iskoola Pota + Latha + Microsoft Himalaya + Mongolian Baiti + Shruti + Skeirs + Cardo + MPH 2B Damase + Helvetica Neue + Helvetica + Tahoma + Arial Unicode MS + + + + monospace + + Liberation Mono + DejaVu Sans Mono + Droid Sans Mono + Consolas + Inconsolata + Andale Mono + Courier New + FreeMono + Microsoft JhengHei + 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 new file mode 120000 index 00000000..b9c8de75 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf @@ -0,0 +1 @@ +../../conf.src/43-repl-terminus.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/nyx/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/50-base-rendering-inf-osx-lin.conf b/fonts/infinality/styles.conf.avail/nyx/50-base-rendering-inf-osx-lin.conf new file mode 120000 index 00000000..1dceb226 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/50-base-rendering-inf-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-inf-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/nyx/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/nyx/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/64-override-inf.conf b/fonts/infinality/styles.conf.avail/nyx/64-override-inf.conf new file mode 120000 index 00000000..eaceff0e --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/64-override-inf.conf @@ -0,0 +1 @@ +../../conf.src/64-override-inf.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/65-override.conf b/fonts/infinality/styles.conf.avail/nyx/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/80-selective-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/nyx/80-selective-rendering-inf-7-xp.conf new file mode 120000 index 00000000..d1905b55 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/80-selective-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/nyx/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/styles.conf.avail/nyx/80-selective-rendering-inf-win-lin.conf new file mode 120000 index 00000000..fa2227bd --- /dev/null +++ b/fonts/infinality/styles.conf.avail/nyx/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-win-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/20-aliases-default-osx.conf b/fonts/infinality/styles.conf.avail/osx/20-aliases-default-osx.conf new file mode 120000 index 00000000..937f15b6 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/20-aliases-default-osx.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/osx/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/21-aliases-wine-osx.conf b/fonts/infinality/styles.conf.avail/osx/21-aliases-wine-osx.conf new file mode 120000 index 00000000..5eff71c8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/21-aliases-wine-osx.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/30-non-latin-osx-lin.conf b/fonts/infinality/styles.conf.avail/osx/30-non-latin-osx-lin.conf new file mode 120000 index 00000000..fd61dfab --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/30-non-latin-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/41-repl-os-osx.conf b/fonts/infinality/styles.conf.avail/osx/41-repl-os-osx.conf new file mode 120000 index 00000000..8f0776b6 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/41-repl-os-osx.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/42-repl-global.conf b/fonts/infinality/styles.conf.avail/osx/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/osx/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/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/fonts/infinality/styles.conf.avail/osx/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/osx/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/50-base-rendering-inf-osx-lin.conf b/fonts/infinality/styles.conf.avail/osx/50-base-rendering-inf-osx-lin.conf new file mode 120000 index 00000000..1dceb226 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/50-base-rendering-inf-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-inf-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/50-base-rendering-osx2.conf b/fonts/infinality/styles.conf.avail/osx/50-base-rendering-osx2.conf new file mode 120000 index 00000000..016e0e98 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/50-base-rendering-osx2.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-osx2.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/osx/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/osx/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/61-group-tt-rendering-osx.conf b/fonts/infinality/styles.conf.avail/osx/61-group-tt-rendering-osx.conf new file mode 120000 index 00000000..6d02bca1 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/61-group-tt-rendering-osx.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/61-group-tt-rendering-osx2.conf b/fonts/infinality/styles.conf.avail/osx/61-group-tt-rendering-osx2.conf new file mode 120000 index 00000000..fcf725be --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/61-group-tt-rendering-osx2.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-osx2.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/osx/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/osx/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/65-override.conf b/fonts/infinality/styles.conf.avail/osx/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/osx/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/osx/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/20-aliases-default-osx.conf b/fonts/infinality/styles.conf.avail/osx2/20-aliases-default-osx.conf new file mode 120000 index 00000000..937f15b6 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/20-aliases-default-osx.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/osx2/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/21-aliases-wine-osx.conf b/fonts/infinality/styles.conf.avail/osx2/21-aliases-wine-osx.conf new file mode 120000 index 00000000..5eff71c8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/21-aliases-wine-osx.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/30-non-latin-osx-lin.conf b/fonts/infinality/styles.conf.avail/osx2/30-non-latin-osx-lin.conf new file mode 120000 index 00000000..fd61dfab --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/30-non-latin-osx-lin.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-osx-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/41-repl-os-osx.conf b/fonts/infinality/styles.conf.avail/osx2/41-repl-os-osx.conf new file mode 120000 index 00000000..8f0776b6 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/41-repl-os-osx.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-osx.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/42-repl-global.conf b/fonts/infinality/styles.conf.avail/osx2/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/osx2/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/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/fonts/infinality/styles.conf.avail/osx2/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/osx2/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/50-base-rendering-osx2.conf b/fonts/infinality/styles.conf.avail/osx2/50-base-rendering-osx2.conf new file mode 120000 index 00000000..016e0e98 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/50-base-rendering-osx2.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-osx2.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/osx2/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/osx2/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/61-group-tt-rendering-osx2.conf b/fonts/infinality/styles.conf.avail/osx2/61-group-tt-rendering-osx2.conf new file mode 120000 index 00000000..fcf725be --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/61-group-tt-rendering-osx2.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-osx2.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/osx2/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/osx2/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/65-override.conf b/fonts/infinality/styles.conf.avail/osx2/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/osx2/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/osx2/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/osx2/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/osx2/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/20-aliases-default-win.conf b/fonts/infinality/styles.conf.avail/win7/20-aliases-default-win.conf new file mode 120000 index 00000000..91ebf929 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/20-aliases-default-win.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/win7/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/21-aliases-wine-win7-inf.conf b/fonts/infinality/styles.conf.avail/win7/21-aliases-wine-win7-inf.conf new file mode 120000 index 00000000..3c5405bb --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/21-aliases-wine-win7-inf.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-win7-inf.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/30-non-latin-inf-win.conf b/fonts/infinality/styles.conf.avail/win7/30-non-latin-inf-win.conf new file mode 120000 index 00000000..6e321793 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/30-non-latin-inf-win.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-inf-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/41-repl-os-win.conf b/fonts/infinality/styles.conf.avail/win7/41-repl-os-win.conf new file mode 120000 index 00000000..ab176b7d --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/41-repl-os-win.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/42-repl-global.conf b/fonts/infinality/styles.conf.avail/win7/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/win7/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/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/fonts/infinality/styles.conf.avail/win7/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/win7/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/50-base-rendering-win7-winxp.conf b/fonts/infinality/styles.conf.avail/win7/50-base-rendering-win7-winxp.conf new file mode 120000 index 00000000..3c2e910f --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/50-base-rendering-win7-winxp.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-win7-winxp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/win7/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/win7/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/61-group-non-tt-rendering-inf-7-xp-lin.conf b/fonts/infinality/styles.conf.avail/win7/61-group-non-tt-rendering-inf-7-xp-lin.conf new file mode 120000 index 00000000..af1c1963 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/61-group-non-tt-rendering-inf-7-xp-lin.conf @@ -0,0 +1 @@ +../../conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/61-group-tt-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/win7/61-group-tt-rendering-inf-7-xp.conf new file mode 120000 index 00000000..ac97127f --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/61-group-tt-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/win7/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/win7/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/65-override.conf b/fonts/infinality/styles.conf.avail/win7/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/win7/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/80-selective-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/win7/80-selective-rendering-inf-7-xp.conf new file mode 120000 index 00000000..d1905b55 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/80-selective-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/styles.conf.avail/win7/80-selective-rendering-inf-win-lin.conf new file mode 120000 index 00000000..fa2227bd --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-win-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/81-final-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/win7/81-final-rendering-inf-7-xp.conf new file mode 120000 index 00000000..5dca3718 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/81-final-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/81-final-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/win7/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win7/90-reject.conf b/fonts/infinality/styles.conf.avail/win7/90-reject.conf new file mode 120000 index 00000000..0a602aaa --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win7/90-reject.conf @@ -0,0 +1 @@ +../../conf.src/90-reject.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/20-aliases-default-win.conf b/fonts/infinality/styles.conf.avail/win98/20-aliases-default-win.conf new file mode 120000 index 00000000..91ebf929 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/20-aliases-default-win.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/win98/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/21-aliases-wine-win98.conf b/fonts/infinality/styles.conf.avail/win98/21-aliases-wine-win98.conf new file mode 120000 index 00000000..fec6f4fb --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/21-aliases-wine-win98.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-win98.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/30-non-latin-inf-win.conf b/fonts/infinality/styles.conf.avail/win98/30-non-latin-inf-win.conf new file mode 120000 index 00000000..6e321793 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/30-non-latin-inf-win.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-inf-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/41-repl-os-win.conf b/fonts/infinality/styles.conf.avail/win98/41-repl-os-win.conf new file mode 120000 index 00000000..ab176b7d --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/41-repl-os-win.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/42-repl-global.conf b/fonts/infinality/styles.conf.avail/win98/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/win98/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/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/fonts/infinality/styles.conf.avail/win98/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/win98/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/50-base-rendering-win98.conf b/fonts/infinality/styles.conf.avail/win98/50-base-rendering-win98.conf new file mode 120000 index 00000000..2f77fd67 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/50-base-rendering-win98.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-win98.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/win98/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/win98/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/61-group-non-tt-rendering-win98.conf b/fonts/infinality/styles.conf.avail/win98/61-group-non-tt-rendering-win98.conf new file mode 120000 index 00000000..2b8475ee --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/61-group-non-tt-rendering-win98.conf @@ -0,0 +1 @@ +../../conf.src/61-group-non-tt-rendering-win98.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/61-group-tt-rendering-win98.conf b/fonts/infinality/styles.conf.avail/win98/61-group-tt-rendering-win98.conf new file mode 120000 index 00000000..de919515 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/61-group-tt-rendering-win98.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-win98.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/win98/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/win98/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/64-override-win98.conf b/fonts/infinality/styles.conf.avail/win98/64-override-win98.conf new file mode 120000 index 00000000..baa278f5 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/64-override-win98.conf @@ -0,0 +1 @@ +../../conf.src/64-override-win98.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/65-override.conf b/fonts/infinality/styles.conf.avail/win98/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/win98/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/71-forced-synthetic-win98.conf b/fonts/infinality/styles.conf.avail/win98/71-forced-synthetic-win98.conf new file mode 120000 index 00000000..822a1e3e --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/71-forced-synthetic-win98.conf @@ -0,0 +1 @@ +../../conf.src/71-forced-synthetic-win98.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/styles.conf.avail/win98/80-selective-rendering-inf-win-lin.conf new file mode 120000 index 00000000..fa2227bd --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-win-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/win98/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/win98/90-reject.conf b/fonts/infinality/styles.conf.avail/win98/90-reject.conf new file mode 120000 index 00000000..0a602aaa --- /dev/null +++ b/fonts/infinality/styles.conf.avail/win98/90-reject.conf @@ -0,0 +1 @@ +../../conf.src/90-reject.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/20-aliases-default-win.conf b/fonts/infinality/styles.conf.avail/winxp/20-aliases-default-win.conf new file mode 120000 index 00000000..91ebf929 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/20-aliases-default-win.conf @@ -0,0 +1 @@ +../../conf.src/20-aliases-default-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/20-fix-cantarell.conf b/fonts/infinality/styles.conf.avail/winxp/20-fix-cantarell.conf new file mode 120000 index 00000000..a893650b --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/20-fix-cantarell.conf @@ -0,0 +1 @@ +../../conf.src/20-fix-cantarell.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/21-aliases-wine-winxp.conf b/fonts/infinality/styles.conf.avail/winxp/21-aliases-wine-winxp.conf new file mode 120000 index 00000000..e530064a --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/21-aliases-wine-winxp.conf @@ -0,0 +1 @@ +../../conf.src/21-aliases-wine-winxp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/30-non-latin-inf-win.conf b/fonts/infinality/styles.conf.avail/winxp/30-non-latin-inf-win.conf new file mode 120000 index 00000000..6e321793 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/30-non-latin-inf-win.conf @@ -0,0 +1 @@ +../../conf.src/30-non-latin-inf-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/41-repl-os-win.conf b/fonts/infinality/styles.conf.avail/winxp/41-repl-os-win.conf new file mode 120000 index 00000000..ab176b7d --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/41-repl-os-win.conf @@ -0,0 +1 @@ +../../conf.src/41-repl-os-win.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/42-repl-global.conf b/fonts/infinality/styles.conf.avail/winxp/42-repl-global.conf new file mode 120000 index 00000000..0abf23f7 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/42-repl-global.conf @@ -0,0 +1 @@ +../../conf.src/42-repl-global.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/winxp/43-repl-tt-traced-bitmap.conf new file mode 120000 index 00000000..8f2c9193 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/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/fonts/infinality/styles.conf.avail/winxp/44-repl-corrective.conf b/fonts/infinality/styles.conf.avail/winxp/44-repl-corrective.conf new file mode 120000 index 00000000..51597fba --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/44-repl-corrective.conf @@ -0,0 +1 @@ +../../conf.src/44-repl-corrective.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/50-base-rendering-win7-winxp.conf b/fonts/infinality/styles.conf.avail/winxp/50-base-rendering-win7-winxp.conf new file mode 120000 index 00000000..3c2e910f --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/50-base-rendering-win7-winxp.conf @@ -0,0 +1 @@ +../../conf.src/50-base-rendering-win7-winxp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/60-group-non-tt-fonts.conf b/fonts/infinality/styles.conf.avail/winxp/60-group-non-tt-fonts.conf new file mode 120000 index 00000000..289fa4d4 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/60-group-non-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-non-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/60-group-tt-fonts.conf b/fonts/infinality/styles.conf.avail/winxp/60-group-tt-fonts.conf new file mode 120000 index 00000000..08475314 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/60-group-tt-fonts.conf @@ -0,0 +1 @@ +../../conf.src/60-group-tt-fonts.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/61-group-non-tt-rendering-inf-7-xp-lin.conf b/fonts/infinality/styles.conf.avail/winxp/61-group-non-tt-rendering-inf-7-xp-lin.conf new file mode 120000 index 00000000..af1c1963 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/61-group-non-tt-rendering-inf-7-xp-lin.conf @@ -0,0 +1 @@ +../../conf.src/61-group-non-tt-rendering-inf-7-xp-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/61-group-tt-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/winxp/61-group-tt-rendering-inf-7-xp.conf new file mode 120000 index 00000000..ac97127f --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/61-group-tt-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/61-group-tt-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/62-tt-monospace-rendering.conf b/fonts/infinality/styles.conf.avail/winxp/62-tt-monospace-rendering.conf new file mode 120000 index 00000000..8ce66257 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/62-tt-monospace-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-monospace-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/62-tt-traced-bitmap-rendering.conf b/fonts/infinality/styles.conf.avail/winxp/62-tt-traced-bitmap-rendering.conf new file mode 120000 index 00000000..9a809dca --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/62-tt-traced-bitmap-rendering.conf @@ -0,0 +1 @@ +../../conf.src/62-tt-traced-bitmap-rendering.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/65-override.conf b/fonts/infinality/styles.conf.avail/winxp/65-override.conf new file mode 120000 index 00000000..81aad636 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/65-override.conf @@ -0,0 +1 @@ +../../conf.src/65-override.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/70-forced-synthetic.conf b/fonts/infinality/styles.conf.avail/winxp/70-forced-synthetic.conf new file mode 120000 index 00000000..52f1b0a8 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/70-forced-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/70-forced-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/80-selective-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/winxp/80-selective-rendering-inf-7-xp.conf new file mode 120000 index 00000000..d1905b55 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/80-selective-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/80-selective-rendering-inf-win-lin.conf b/fonts/infinality/styles.conf.avail/winxp/80-selective-rendering-inf-win-lin.conf new file mode 120000 index 00000000..fa2227bd --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/80-selective-rendering-inf-win-lin.conf @@ -0,0 +1 @@ +../../conf.src/80-selective-rendering-inf-win-lin.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/81-final-rendering-inf-7-xp.conf b/fonts/infinality/styles.conf.avail/winxp/81-final-rendering-inf-7-xp.conf new file mode 120000 index 00000000..5dca3718 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/81-final-rendering-inf-7-xp.conf @@ -0,0 +1 @@ +../../conf.src/81-final-rendering-inf-7-xp.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/90-no-synthetic.conf b/fonts/infinality/styles.conf.avail/winxp/90-no-synthetic.conf new file mode 120000 index 00000000..b0e46315 --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/90-no-synthetic.conf @@ -0,0 +1 @@ +../../conf.src/90-no-synthetic.conf \ No newline at end of file diff --git a/fonts/infinality/styles.conf.avail/winxp/90-reject.conf b/fonts/infinality/styles.conf.avail/winxp/90-reject.conf new file mode 120000 index 00000000..0a602aaa --- /dev/null +++ b/fonts/infinality/styles.conf.avail/winxp/90-reject.conf @@ -0,0 +1 @@ +../../conf.src/90-reject.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 c8b27e61..8b1638cb 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -145,31 +145,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2472,388 +2472,388 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -2919,49 +2919,49 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3074,7 +3074,7 @@ - + Whether to disable the keyboard shortcuts @@ -3831,12 +3831,12 @@ - + - + @@ -3844,7 +3844,7 @@ - + @@ -3852,13 +3852,13 @@ - + Whether to disable the plugins in the user's home directory - + @@ -3866,7 +3866,7 @@ Default location for the "Take Screenshot" dialogs, default is the Pictures directory - + @@ -3874,7 +3874,7 @@ Default location for the "Open..." dialogs, default is the current directory - + UTF-8 @@ -3905,7 +3905,7 @@ - + Sans Bold 20 @@ -3913,13 +3913,13 @@ Pango font description for subtitle rendering - + Amount of data to buffer for network streams before starting to display the stream (in seconds) - + Quality settings for the audio visualization: @@ -3929,7 +3929,7 @@ "3" for extra large. - + @@ -3942,27 +3942,27 @@ - + - + - + - + - + Approximate network connection speed, used to select quality on media over the network: @@ -3980,39 +3980,39 @@ "11" for Intranet/LAN. - + - + - + - + - + - + goom - + @@ -4020,7 +4020,7 @@ - + @@ -18312,1344 +18312,1344 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + @@ -19945,19 +19945,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19967,19 +19967,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19989,19 +19989,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20011,19 +20011,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20033,19 +20033,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20055,19 +20055,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20077,19 +20077,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20099,19 +20099,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20121,19 +20121,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" diff --git a/highlight/filetypes.conf b/highlight/filetypes.conf new file mode 100644 index 00000000..4a51ba1b --- /dev/null +++ b/highlight/filetypes.conf @@ -0,0 +1,101 @@ +-- File extension and shebang mapping + +FileMapping = { + + { Lang="ada", Extensions={"adb", "ads", "a", "gnad"} }, + { Lang="ampl", Extensions={"dat", "run"} }, + { Lang="amtrix", Extensions={"s4", "s4t", "s4h", "hnd", "t4"} }, + { Lang="asm", Extensions={"a51", "29k", "68s", "68x", "x86"} }, + { Lang="asp", Extensions={"asa"} }, + { Lang="ats", Extensions={"dats"} }, + { Lang="aspect", Extensions={"was", "wud"} }, + { Lang="bat", Extensions={"cmd"} }, + { Lang="c", Extensions={"c++", "cpp", "cxx", "cc", "h", "hh", "hxx", "hpp", "cu"} }, + { Lang="coldfusion", Extensions={"cfc","cfm"} }, + { Lang="cobol", Extensions={"cob", "cbl"} }, + { Lang="diff", Extensions={"patch"} }, + { Lang="eiffel", Extensions={"e", "se"} }, + { Lang="erlang", Extensions={"hrl", "erl"} }, + { Lang="euphoria", Extensions={"ex", "exw", "wxu", "ew", "eu"} }, + { Lang="fortran77", Extensions={"f", "for", "ftn"} }, + { Lang="fortran90", Extensions={"f95", "f90"} }, + { Lang="haskell", Extensions={"hs"} }, + { Lang="java", Extensions={"groovy", "grv"} }, + { Lang="lisp", Extensions={"cl", "clisp", "el", "lsp", "sbcl", "scom"} }, + { Lang="make", Extensions={"mak", "mk"} }, + { Lang="smnp", Extensions={"mib","smi"} }, + { Lang="ocaml", Extensions={"ml","mli"} }, + { Lang="mod2", Extensions={"mod", "def"} }, + { Lang="mod3", Extensions={"m3", "i3"} }, + { Lang="oberon", Extensions={"ooc"} }, + { Lang="php", Extensions={"php3", "php4", "php5", "php6"} }, + { Lang="pike", Extensions={"pmod"} }, + { Lang="pl1", Extensions={"ff", "fp", "fpp", "rpp","sf", "sp", "spb", + "spp","sps", "wp", "wf", "wpp","wps","wpb","bdy","spe"} }, + { Lang="perl", Extensions={"pl","perl", "cgi", "pm", "plx", "plex"} }, + { Lang="progress", Extensions={"p", "i", "w"} }, + { Lang="ruby", Extensions={"rb","ruby", "pp", "rjs"} }, + { Lang="rexx", Extensions={"rex", "rx", "the"} }, + { Lang="sh", Extensions={"bash", "ebuild", "eclass"} }, + { Lang="smalltalk", Extensions={"st", "gst", "sq"} }, + { Lang="sybase", Extensions={"sp"} }, + { Lang="tcl", Extensions={"wish", "itcl"} }, + { Lang="tex", Extensions={"sty", "cls"} }, + { Lang="vb", Extensions={"bas", "basic", "bi", "vbs"} }, + { Lang="verilog", Extensions={"v"} }, + { Lang="html", Extensions={"htm", "xhtml"} }, + { Lang="xml", Extensions={"sgm", "sgml", "nrm", "ent","hdr", "hub", "dtd", + "wml","vxml", "wml", "tld", "svg","xsl", "ecf", "jnlp", "xsd"} }, + { Lang="fsharp", Extensions={"fs","fsx"} }, + { Lang="informix", Extensions={"4gl"} }, + { Lang="blitzbasic", Extensions={"bb"} }, + { Lang="innosetup", Extensions={"iss"} }, + { Lang="lotus", Extensions={"ls"} }, + { Lang="ascend", Extensions={"a4c"} }, + { Lang="actionscript", Extensions={"as"} }, + { Lang="express", Extensions={"exp"} }, + { Lang="haxe", Extensions={"hx"} }, + { Lang="pyrex", Extensions={"pyx"} }, + + { Lang="abap4", Extensions={"abp"} }, + { Lang="csharp", Extensions={"cs"} }, + { Lang="interlis", Extensions={"ili"} }, + { Lang="logtalk", Extensions={"lgt"} }, + { Lang="matlab", Extensions={"m"} }, + { Lang="nsis", Extensions={"nsi"} }, + { Lang="bison", Extensions={"y"} }, + { Lang="squirrel", Extensions={"nut"} }, + { Lang="luban", Extensions={"lbn"} }, + { Lang="maya", Extensions={"mel"} }, + { Lang="nemerle", Extensions={"n"} }, + { Lang="paradox", Extensions={"sc"} }, + { Lang="netrexx", Extensions={"nrx"} }, + { Lang="clearbasic", Extensions={"cb"} }, + { Lang="graphviz", Extensions={"dot"} }, + { Lang="small", Extensions={"sma"} }, + { Lang="autoit", Extensions={"au3"} }, + { Lang="chill", Extensions={"chl"} }, + { Lang="autohotkey", Extensions={"ahk"} }, + { Lang="fame", Extensions={"inp"} }, + { Lang="modelica", Extensions={"mo"} }, + { Lang="maple", Extensions={"mpl"} }, + { Lang="jasmin", Extensions={"j"} }, + { Lang="snobol", Extensions={"sno"} }, + { Lang="icon", Extensions={"icn"} }, + { Lang="felix", Extensions={"flx"} }, + { Lang="clips", Extensions={"clp"} }, + { Lang="lindenscript", Extensions={"lsl"} }, + { Lang="lilypond", Extensions={"ly"} }, + { Lang="nasal", Extensions={"nas"} }, + { Lang="clean", Extensions={"icl"} }, + { Lang="assembler", Extensions={"asm"} }, + { Lang="bibtex", Extensions={"bib"} }, + { Lang="python", Extensions={"py"} }, + { Lang="txt", Extensions={"text"} }, + + { Lang="sh", Shebang=[[^#!(\/usr)?(\/local)?\/bin\/(bash|t?csh|[akz]?sh)]] }, + { Lang="pl", Shebang=[[^#!(\/usr)?(\/local)?\/bin\/perl]] }, + { Lang="py", Shebang=[[^#!(\/usr)?(\/local)?\/bin\/python]] }, + { Lang="awk", Shebang=[[^#!(\/usr)?(\/local)?\/bin\/[gn]?awk]] }, + +} diff --git a/hotplug.d/.keep_sys-apps_hotplug-base-0 b/hotplug.d/.keep_sys-apps_hotplug-base-0 deleted file mode 100644 index e69de29b..00000000 diff --git a/hotplug.d/default/default.hotplug b/hotplug.d/default/default.hotplug deleted file mode 100755 index cb0a1a5f..00000000 --- a/hotplug.d/default/default.hotplug +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh -# -# This version of /sbin/hotplug should works on most GNU/Linux systems -# using Linux 2.2.18+ or 2.4.* kernels. On 2.2.*, only USB has such -# hotplugging support; on 2.4.*, so do PCI/Cardbus and network interfaces. -# -# In 2.5, both classes and busses can report hotplug events as part -# of the driver model core functionality. Plus, /sys/$DEVPATH is -# available for scripting, as well as the $ACTION being reported. -# -# The kernel HOTPLUG configuration option needs to be enabled, and most -# device drivers will be compiled for MODULES (make allmod). -# -# -# HISTORY: -# -# 21-Nov-2002 Optionally log events; 2.5 notes (db) -# 26-Feb-2001 Cleanup (Gioele Barabucci) -# 14-Feb-2001 Better diagnostics: logging, agent list (contributors) -# 04-Jan-2001 First "New" version, which only delegates to -# specialized hotplug agents. -# -# $Id: default.hotplug,v 1.4 2004/09/20 21:40:27 kroah Exp $ -# - -exec < /dev/null -test -t 1 || exec > /dev/null -test -t 2 || exec 2>&1 - -cd /etc/hotplug -. ./hotplug.functions - -# DEBUG=yes export DEBUG - -debug_mesg "arguments ($*) env (`env`)" - -# -# Only one required argument: event type type being dispatched. -# Examples: usb, pci, isapnp, net, ieee1394, printer, disk, -# parport, input, ide, cpu, system, ... with 2.5, lots more. -# Other parameters are passed in the environment, or positionally -# through argv. -# -if [ $# -lt 1 ] || [ "$1" = "help" ] || [ "$1" = "--help" ]; then - if [ -t ]; then - echo "Usage: $0 AgentName [AgentArguments]" - - AGENTS="" - for AGENT in /etc/hotplug/*.agent ; do - TYPE=`basename $AGENT | sed s/.agent//` - if [ -x $AGENT ]; then - AGENTS="$AGENTS $TYPE" - else - AGENTS="$AGENTS ($TYPE)" - fi - done - echo "AgentName values on this system: $AGENTS" - else - mesg "illegal usage $*" - fi - exit 1 -fi - -# -# Delegate event handling: -# /sbin/hotplug FOO ..args.. ==> /etc/hotplug/FOO.agent ..args.. -# -AGENT=/etc/hotplug/$1.agent -if [ -x $AGENT ]; then - shift - if [ "$DEBUG" != "" ]; then - mesg "invoke $AGENT ($@)" - fi - exec $AGENT "$@" - mesg "couldn't exec $AGENT" - exit 1 -fi - -debug_mesg "no runnable $AGENT is installed" - -# -# Optionally log events we don't handle directly. -# Some program or person has asked for $LOG data. -# -LOG=/var/log/hotplug/$1.events -if [ ! -w $LOG ]; then - # catch-all for unclaimed events - LOG=/var/log/hotplug/events -fi -if [ -w $LOG ]; then - # record all basic event data - HOTPLUG_TYPE=$1 - shift - HOTPLUG_ARGS="$*" - export HOTPLUG_ARGS HOTPLUG_TYPE - - # use to tempfile to buffer events - # FIXME buffering acts oddly when logging to pipes, - # it'd be better not to need a tempfile - TMP=$(mktemp /var/log/hotplug/e-$HOTPLUG_TYPE-XXXXXXXX) - if [ $? -ne 0 ]; then - mesg "couldn't create tempfile for logging" - exit 1 - fi - - debug_mesg "log to $LOG ($HOTPLUG_TYPE $HOTPLUG_ARGS)" - log_to_stdout > $TMP - cat $TMP >> $LOG - rm -f $TMP - - exit 0 -fi - -exit 1 diff --git a/hotplug/blacklist b/hotplug/blacklist deleted file mode 100644 index a0ddec18..00000000 --- a/hotplug/blacklist +++ /dev/null @@ -1,28 +0,0 @@ -# -# Listing a module here prevents the hotplug scripts from loading it. -# Usually that'd be so that some other driver will bind it instead, -# no matter which driver happens to get probed first. Sometimes user -# mode tools can also control driver binding. -# -# Syntax: driver name alone (without any spaces) on a line. Other -# lines are ignored. -# - -# uhci ... usb-uhci handles the same pci class -usb-uhci -# usbcore ... module is loaded implicitly, ignore it otherwise -usbcore - -# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices -de4x5 -# At least 2.4.3 and later xircom_tulip doesn't have that conflict -# xircom_tulip_cb -dmfe - -#evbug is a debug tool and should be loaded explicitly -evbug - -# Don't hotplug eth1394, bug #128962 -eth1394 - -shpchp diff --git a/hotplug/dasd.agent b/hotplug/dasd.agent deleted file mode 100755 index b612907b..00000000 --- a/hotplug/dasd.agent +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# Dasd hotplug policy agent for Linux 2.4 kernels -# -# Copyright (c) 2002 SuSE Linux AG, Nuremberg -# -# the GNU Public License applies -# -# Author: Susanne Oberhauser , 2002 -# -# -# Kernel DASD hotplug params include: -# -# s390 device address -: ${DEVNO?Bad DASD invocation: \$DEVNO is not set} - -# Linux major and minor -: ${MAJOR?Bad DASD invocation: \$MAJOR is not set} -: ${MINOR?Bad DASD invocation: \$MINOR is not set} - -# Linux device name (dasda, ...) -: ${DASDNAME?Bad DASD invocation: \$DASDNAME is not set} - -# Hotplug event type (add, remove, partchk or partremove) -: ${ACTION?Bad DASD invocation: \$ACTION is not set} - -# -# they are generated here: /usr/src/linux/drivers/s390/block/dasd.c -# - -# -# HISTORY: -# -# 2002-08-06 Susanne Oberhauser -# created script - -cd /etc/hotplug -. hotplug.functions - -( test -d /dev/dasd && test -d /dev/labels ) || { - debug_mesg "/etc/init.d/boot.dasd_devfs_compat is not started. -ignoring $ACTION $DEVNO $MAJOR $MINOR $DASDNAME" - exit 0 -} - -mesg "$ACTION $DEVNO $MAJOR $MINOR $DASDNAME" - - -test -r dasd.permissions && . dasd.permissions || { - mesg DASD permission handling not found - exit 1 -} - -# to preserve the script from doing anything real, call it with -# CONDOM=echo -: ${CONDOM=} -# abort on error or unset variables: -set -o errexit -set -o nounset - -die() { - mesg "$*" - exit 1 -} - - -create_node() # -# environment: -# TYPE (char, block) -# NODE (filename including any leading directories) -# MAJOR, MINOR -# OWNER (user.group or unset, which means) -# PERMISSIONS (symbolic or unset, which means minimal settings) -# -# when this function exits sucessfully, -# $NODE exists as $TYPE-device with $MAJOR and $MINOR, belongs to -# $OWNER and has $PERMISSIONS. - -{ - debug_mesg "create_node $PERMISSIONS $OWNER $MAJOR $MINOR $TYPE $NODE" - case "$TYPE" in - block|b) TYPE=b;; - char|c) TYPE=c;; - *) die "create_node: wrong TYPE given" - esac - - - # Don't remove the node, if it has the correct major/minor - - if test -e "$NODE" - then - - # if the file exists, check that it is a $TYPE device with the - # correct major and minor - - if test -$TYPE "$NODE" - then - ls -l $NODE | { - - read existing_mode existing_nlink \ - existing_user existing_group \ - existing_major existing_minor \ - dummy - - if test "$existing_major" != "$MAJOR," || test "$existing_minor" != "$MINOR" - then - # create a new node using the existing - # permissions, ownership and timestamp - $CONDOM rm -f $NODE - $CONDOM mknod --mode="a=" $NODE $TYPE $MAJOR $MINOR - fi - } - else - # create a new node using the existing - # permissions, ownership and timestamp - $CONDOM rm -f $NODE - $CONDOM mknod --mode="a=" $NODE $TYPE $MAJOR $MINOR - fi - else - # TODO?: this does not support missing directories, yet: - # if the node does not exist yet, create it - $CONDOM mknod --mode="a=" $NODE $TYPE $MAJOR $MINOR - fi - - # always set ownership and permissions - $CONDOM chown $OWNER $NODE - $CONDOM chmod $PERMISSIONS $NODE -} - - -create_symlink() -# uses these from the environment: -# LINK -# TARGET -# OWNER (user.group) of the link. Directory components belong to root.root -# CONDOM -{ - debug_mesg "create_symlink $OWNER $LINK -> $TARGET" - # first create the directory if necessary: - link_dir=$(dirname "$LINK") - test -d "$link_dir" || { - test -e "$link_dir" && die "$link_dir exists but is not a directory: -$(ls -l $link_dir)" - } || { - $CONDOM install --directory --owner=root --group=root "$link_dir" - } - test -e "$LINK" && rm -rf "$LINK" - $CONDOM ln -snf "$TARGET" "$LINK" - $CONDOM chown "$OWNER" "$LINK" -} - -case $ACTION in - add) - export NODE=/dev/$DASDNAME - export TYPE=block - # get $OWNER and $PERMISSIONS - MISC=$DEVNO \ - dasd_permissions - create_node - LINK=/dev/dasd/$DEVNO/device TARGET=$NODE \ - create_symlink - LINK=/dev/dasd/$DEVNO/disk TARGET=$NODE \ - create_symlink - ;; - - remove) - $CONDOM rm -f /dev/$DASDNAME* - VOLSER=$(ls -l /dev/dasd/$DEVNO/VOLSER | sed -e 's,.*-> ,,') - $CONDOM rm -rf /dev/dasd/$DEVNO - test "${VOLSER}" != "" && $CONDOM rm -f "$VOLSER" - ;; - - partchk) - export NODE=/dev/$DASDNAME - export VOLSER=$(dasdview -j -f $NODE | sed -e 's,[[:space:]]\+$,,') - CHECKED_VOLSER=$( - echo "$VOLSER" | - sed -e ' - # spaces, slashes, asterisks and questionmarks are no good for filenames - s/[ /*?]/ space, slash, asterisk or questionmark /g - # nor are nonprinting characters - s/[^[:print:]]/ nonprinting characters /g - # "." and ".." are evil as well - s/^\.$/ dot / - s/^\.\.$/ dot dot / - ' - ) - - if test "$VOLSER" != "$CHECKED_VOLSER" - then - mesg "VOLSER label of $NODE is no legal filename: <$VOLSER> -> <$CHECKED_VOLSER> ignoring it." - VOLSER="" - fi - - - # If the volser label has changed, this is also notified as a - # 'partchk' action. remove the old volser if present and - # different from the new one. - - # The VOLSER symlink in the DEVNO directory points to the - # VOLSER file for deletion of the VOLSER label after device - # removal (the device is no longer available then to query the - # VOLSER from there). - - test -e /dev/dasd/$DEVNO/VOLSER && { - OLD_VOLSER="$(ls -l /dev/dasd/$DEVNO/VOLSER | sed -e 's,.*-> ,,')" - test "$OLD_VOLSER" = "/dev/labels/$VOLSER" || { - $CONDOM rm -f "$OLD_VOLSER" - } - } - - # Get ownership and permissions for the nodes and ownership - # for the symlinks: - - MISC=$VOLSER-$DEVNO \ - dasd_permissions - # add the volser symlink if no other dasd uses that volser yet. - test "$VOLSER" != "" && test ! -e /dev/labels/"$VOLSER" && { - LINK=/dev/labels/"$VOLSER" TARGET=../dasd/$DEVNO \ - create_symlink - - TARGET=/dev/labels/"$VOLSER" LINK=/dev/dasd/$DEVNO/VOLSER \ - create_symlink - } - - # TODO: for the time being, we ignore /proc/partitions and - # create all candidate partitions - export TYPE=block - for partition in 1 2 3 - do - - NODE=/dev/$DASDNAME$partition - - # get ownership and permissions for the partition - MISC="$VOLSER"-$DEVNO-$partition dasd_permissions - - MINOR=$((MINOR + partition)) create_node - - LINK=/dev/dasd/$DEVNO/part$partition TARGET=$NODE \ - create_symlink - done - ;; - - partremove) - $CONDOM rm -f /dev/$DASDNAME[123] - $CONDOM rm -rf /dev/dasd/$DEVNO/part* - ;; - *) - mesg DASD $ACTION event not supported - exit 1 ;; -esac diff --git a/hotplug/dasd.permissions b/hotplug/dasd.permissions deleted file mode 100755 index b8cb0b72..00000000 --- a/hotplug/dasd.permissions +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2002 SuSE Linux AG, Nuremberg -# -# Author: Susanne Oberhauser , 2002 -# -# the GNU Public License applies -# - -# modify this function at your heart's: -dasd_permissions() -{ - - case "$NODE-$MAJOR-$MINOR-$MISC" in - # add your special ownership handling here, e.g. - # - # this feature is experimental, which means it's neither - # supported nor maintained: you're on your own. - # - # /dev/dasd*-*-*-*-ORA*) OWNER=ora.ora; PERMISSIONS="ug=rw,o=";; - # - /dev/dasd*-*) - # default: - OWNER=root.disk - PERMISSIONS="ug=rw,o=" - ;; - *) - die "dasd_permissions: don't know what permissions to give $NODE-$MAJOR-$MINOR-$MISC" - esac -} diff --git a/hotplug/firmware.agent b/hotplug/firmware.agent deleted file mode 100755 index b65d129f..00000000 --- a/hotplug/firmware.agent +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# Firmware-specific hotplug policy agent. -# -# Kernel firmware hotplug params include: -# -# ACTION=%s [add or remove] -# DEVPATH=%s [in 2.5 kernels, /sys/$DEVPATH] -# FIRMWARE=%s -# -# HISTORY: -# -# 24-Jul-2003 Initial version of "new" hotplug agent. -# -# $Id: firmware.agent,v 1.4 2004/09/20 21:23:51 kroah Exp $ -# - -cd /etc/hotplug -. ./hotplug.functions -# DEBUG=yes export DEBUG - -# directory of the firmware files -FIRMWARE_DIR=/lib/firmware - -# mountpoint of sysfs -SYSFS=$(sed -n 's/^.* \([^ ]*\) sysfs .*$/\1/p' /proc/mounts) - -# use /proc for 2.4 kernels -if [ "$SYSFS" = "" ]; then - SYSFS=/proc -fi - -# -# What to do with this firmware hotplug event? -# -case "$ACTION" in - -add) - if [ ! -e $SYSFS/$DEVPATH/loading ]; then - sleep 1 - fi - - if [ -f "$FIRMWARE_DIR/$FIRMWARE" ]; then - echo 1 > $SYSFS/$DEVPATH/loading - cp "$FIRMWARE_DIR/$FIRMWARE" $SYSFS/$DEVPATH/data - echo 0 > $SYSFS/$DEVPATH/loading - else - echo -1 > $SYSFS/$DEVPATH/loading - fi - - ;; - -remove) - ;; - -*) - mesg "Firmware '$ACTION' event not supported" - exit 1 - ;; - -esac diff --git a/hotplug/hotplug.functions b/hotplug/hotplug.functions deleted file mode 100644 index 1c7ffb9e..00000000 --- a/hotplug/hotplug.functions +++ /dev/null @@ -1,194 +0,0 @@ -# -# Setup and BASH utility functions for use in hotplug agents -# -# Most essential parameters are passed from the kernel using -# environment variables. For more information, see the docs -# on-line at http://linux-hotplug.sourceforge.net or the -# sources for each hotplug-aware kernel subsystem. -# -# $Id: hotplug.functions,v 1.27 2004/09/20 23:12:07 kroah Exp $ -# -# - -# DEBUG=yes; export DEBUG -PATH=/bin:/sbin:/usr/sbin:/usr/bin - -KERNEL=`uname -r` -MODULE_DIR=/lib/modules/$KERNEL - -HOTPLUG_DIR=/etc/hotplug - -if [ -f /etc/sysconfig/hotplug ]; then - . /etc/sysconfig/hotplug -fi - -if [ -x /usr/bin/logger ]; then - LOGGER=/usr/bin/logger -elif [ -x /bin/logger ]; then - LOGGER=/bin/logger -else - unset LOGGER -fi -# -# for diagnostics -# -if [ -t 1 -o -z "$LOGGER" ]; then - mesg () { - echo "$@" - } -else - mesg () { - $LOGGER -t $(basename $0)"[$$]" "$@" - } -fi - -debug_mesg () { - test "$DEBUG" = "" -o "$DEBUG" = no && return - mesg "$@" -} - - -# -# Not "modprobe --autoclean" ... one driver module can handle many -# devices. Unloading should be done when no devices are present. -# Autocleaning happens if none of the devices are open, once any of -# them gets opened; wrong timing. -# -MODPROBE="/sbin/modprobe -s -q" -#MODPROBE="/sbin/modprobe -vs" - - -#################################################################### -# -# usage: load_driver type filename description -# -# modprobes driver module(s) if appropriate, and optionally -# invokes a driver-specific setup script (or user-mode driver). -# -# the "modules.*map" format file is guaranteed to exist -# -load_drivers () -{ - local LOADED TYPE FILENAME DESCRIPTION LISTER - DRIVERS="" - - # make this routine more readable - TYPE=$1 - FILENAME=$2 - DESCRIPTION=$3 - - # should we use usbmodules, pcimodules? not on 2.5+, because sysfs - # ought to expose the data we need to find all candidate drivers. - # (on 2.5.48 it does for usb; but maybe not yet for pci.) - case "$KERNEL" in - 2.2*|2.3*|2.4*) LISTER=`which ${TYPE}modules` ;; - *) LISTER="" ;; - esac - - if [ "$LISTER" != "" ]; then - # lister programs MIGHT be preferable to parsing from shell scripts: - # - usbmodules used for (a) multi-interface devices, (b) coldplug - # - pcimodules used only for coldplug - case $TYPE in - usb) - # "usbutils-0.8" (or later) is needed in $PATH - # only works if we have usbfs - # ... reads more descriptors than are passed in env - # ... doesn't handle comment syntax either - if [ "$DEVICE" = "" -o ! -f "$DEVICE" ]; then - LISTER= - else - DRIVERS=`$LISTER --mapfile $FILENAME --device $DEVICE` - fi ;; - - pci) - debug_mesg "pcimodules is scanning more than $PCI_SLOT ..." - DRIVERS=`$LISTER` - ;; - esac - fi - - # try parsing by shell scripts if no luck yet - if [ "$DRIVERS" = "" ]; then - ${TYPE}_map_modules < $FILENAME - fi - - # FIXME remove dups and blacklisted modules from $DRIVERS here - - if [ "$DRIVERS" = "" ]; then - return - fi - - # Note that DRIVERS aren't all going to be modules. - # For USB, some user-mode drivers or setup scripts may be listed. - debug_mesg Setup $DRIVERS for $DESCRIPTION - - # either kernel or user mode drivers may need to be set up - for MODULE in $DRIVERS - do - # maybe driver modules need loading - LOADED=false - if ! lsmod | grep -q "^$(echo $MODULE|sed -e 's/-/_/g') " > /dev/null 2>&1; then - if grep -q "^$(echo $MODULE|sed -e 's/[-_]/[-_]/g')\$" $HOTPLUG_DIR/blacklist \ - $HOTPLUG_DIR/blacklist.d/* \ - >/dev/null 2>&1; then - debug_mesg "... blacklisted module: $MODULE" - continue - fi - - # statically linked modules aren't shown by 'lsmod', - # and user mode drivers will ONLY have a setup script; - # it's not an error if a module doesn't exist or won't load. - if $MODPROBE -n $MODULE >/dev/null 2>&1 && - ! $MODPROBE $MODULE >/dev/null 2>&1 ; then - mesg "... can't load module $MODULE" - else - # /etc/modules.conf may have set non-default module - # parameters ... handle per-device parameters in apps - # (ioctls etc) not in setup scripts or modules.conf - LOADED=true - fi - else - # This module is already loaded - LOADED=true - fi - - # always run setup scripts after any matching kernel code has had - # a chance to do its thing, no matter whether it was dynamically - # or statically linked, or if there is only a user mode driver. - # the script might re-enumerate usb devices after firmware download, - # giving kernel code another chance. - if [ -x $HOTPLUG_DIR/$TYPE/$MODULE ]; then - debug_mesg Module setup $MODULE for $DESCRIPTION - $HOTPLUG_DIR/$TYPE/$MODULE - LOADED=true - fi - - if [ "$LOADED" = "false" ]; then - mesg "missing kernel or user mode driver $MODULE " - fi - if echo "$MODULE" | grep -q "usb-storage" > /dev/null 2>&1 ; then - [ -x /usr/sbin/updfstab ] && /usr/sbin/updfstab - fi - done -} - -#################################################################### -# -# usage: log_to_stdout filename -# -# writes a copy of the current hotplug event to stdout. -# add buffering, to avoid interleaving reports! -# -log_to_stdout () -{ - if [ -x /bin/date ]; then - echo "HOTPLUG_TIME='$(/bin/date)'" - fi - - env | egrep -v '^PATH=|^PWD=|^_=|^OLDPWD=|^SHLVL=|^HOME=' - echo '' - # empty line terminates events -} - -# vim:syntax=sh diff --git a/hotplug/ieee1394.agent b/hotplug/ieee1394.agent deleted file mode 100755 index 4e35a7ad..00000000 --- a/hotplug/ieee1394.agent +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -# -# IEEE1394-specific hotplug policy agent. -# -# This should handle 2.4.10 (or later) IEEE1394 hotplugging, with a -# consistent framework for adding device and driver specific treatments. -# -# Kernel IEEE1394 params are: -# -# ACTION=add or remove -# VENDOR_ID=24 bit vendor id -# GUID=64 bit globally unique id -# SPEFICIER_ID=24 bit id of owner of specification -# VERSION=version of specification -# -# See IEEE1212 for details on these parameters. -# -# HISTORY: -# 26-Mar-2002 Small cleanups to match other .agent files. (gkh) -# 16-Sept-2001 Initial version from Kristian Hogsberg -# (plus tweaks) -# -# $Id: ieee1394.agent,v 1.13 2004/09/20 21:43:37 kroah Exp $ -# - -cd /etc/hotplug -. ./hotplug.functions -# DEBUG=yes export DEBUG - -# generated by modutils 2.4.9 or later, for 2.4.10 and later kernels -MAP_CURRENT=$MODULE_DIR/modules.ieee1394map - -# accumulates list of modules we may care about -DRIVERS= - -if [ "$ACTION" = "" ]; then - mesg Bad IEEE1394 agent invocation - exit 1 -fi - - -device_vendor_id=$((0x$VENDOR_ID)) -device_specifier_id=$((0x$SPECIFIER_ID)) -device_version=$((0x$VERSION)) - -MATCH_VENDOR_ID=0x0001 -MATCH_SPECIFIER_ID=0x0004 -MATCH_VERSION=0x0008 - -# -# stdin is "modules.ieee1394map" syntax -# on return, all matching modules were added to $DRIVERS -# -ieee1394_map_modules () -{ - # comment line lists (current) pci_device_id field names - read ignored - - while read module match_flags vendor_id model_id specifier_id version - do - : check match for $module - - # convert from hex to dec - match_flags=$(($match_flags)) - vendor_id=$(($vendor_id)); model_id=$(($model_id)) - specifier_id=$(($specifier_id)); version=$(($version)) - - : vendor_id $vendor_id $device_vendor_id - if [ $(($match_flags & $MATCH_VENDOR_ID)) -ne 0 ] && [ $vendor_id -ne $device_vendor_id ]; then - continue - fi - - : specifier_id $specifier_id $device_specifier_id - if [ $(($match_flags & $MATCH_SPECIFIER_ID)) -ne 0 ] && [ $specifier_id -ne $device_specifier_id ]; then - continue - fi - - : version $version $device_version - if [ $(($match_flags & $MATCH_VERSION)) -ne 0 ] && [ $version != $device_version ]; then - continue - fi - - DRIVERS="$module $DRIVERS" - done -} - -# -# What to do with this IEEE1394 hotplug event? -# -case "$ACTION" in - -add) - LABEL="IEEE1394 product 0x$VENDOR_ID/0x$SPECIFIER_ID/0x$VERSION" - - # on 2.4 systems, modutils maintains MAP_CURRENT - if [ -r $MAP_CURRENT ]; then - load_drivers ieee1394 $MAP_CURRENT "$LABEL" - fi - - if [ "$DRIVERS" = "" ]; then - mesg "... no drivers for $LABEL" - exit 2 - fi - ;; - -remove) - ieee1394_map_modules < $MAP_CURRENT - for MODULE in $DRIVERS - do - if [ -x $HOTPLUG_DIR/ieee1394/$MODULE ]; then - $HOTPLUG_DIR/ieee1394/$MODULE - fi - done - ;; - -*) - debug_mesg "IEEE1394 '$ACTION' event not supported" - exit 1 - ;; - -esac diff --git a/hotplug/input.agent b/hotplug/input.agent deleted file mode 100755 index 66d9a785..00000000 --- a/hotplug/input.agent +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/sh -# -# input-specific hotplug policy agent. -# -# This should handle 2.6.* input hotplugging, -# with a consistent framework for adding device and driver -# specific handling. -# -# Normally, adding a input device will modprobe handler(s) for -# this device. -# -# Kernel input hotplug params include (not all of them may be available): -# -# ACTION=%s [add or remove] -# PRODUCT=%x/%x/%x/%x -# NAME=%s -# PHYS=%s -# EV=%lx -# KEY=%lx %lx ... -# REL=%lx -# ABS=%lx %lx ... -# MSC=%lx -# LED=%lx -# SND=%lx -# FF=%lx %lx ... -# -# HISTORY: -# -# 30-Jul-2003 initial version -# - -cd /etc/hotplug -. ./hotplug.functions -# DEBUG=yes export DEBUG - -# generated by module-init-tools -MAP_CURRENT=$MODULE_DIR/modules.inputmap - -# accumulates list of modules we may care about -DRIVERS="" - -if [ "$ACTION" = "" ]; then - mesg Bad INPUT agent invocation, no action - exit 1 -fi - -# we can't "unset IFS" on bash1, so save a copy -DEFAULT_IFS="$IFS" - -# -# Each modules.inputmap format line corresponds to one entry in a -# MODULE_DEVICE_TABLE(input,...) declaration in a kernel file. -# -matchBits=0; i_bustype=0; i_vendor=0; i_product=0; i_version=0; i_evBits=0 - -input_join_words () -{ - name="$1" - array="$2" - - if [ "$array" = '' ]; then - return - fi - - set $array - - tmp="$1" - shift - while [ "$#" -gt 0 ]; do - tmp="$tmp:$1" - shift - done - - eval "$name=\"$tmp\"" -} - -input_convert_vars () -{ - if [ "$PRODUCT" != "" ]; then - IFS=/ - set $PRODUCT '' - IFS="$DEFAULT_IFS" - i_bustype=$((0x$1)) - i_vendor=$((0x$2)) - i_product=$((0x$3)) - i_version=$((0x$4)) - fi - - if [ "$EV" != "" ]; then - i_evBits=$((0x$EV)) - fi - - input_join_words i_keyBits "$KEY" - input_join_words i_relBits "$REL" - input_join_words i_absBits "$ABS" - input_join_words i_mscBits "$MSC" - input_join_words i_ledBits "$LED" - input_join_words i_sndBits "$SND" - input_join_words i_ffBits "$FF" -} - -INPUT_DEVICE_ID_MATCH_BUS=1 -INPUT_DEVICE_ID_MATCH_VENDOR=2 -INPUT_DEVICE_ID_MATCH_PRODUCT=4 -INPUT_DEVICE_ID_MATCH_VERSION=8 -INPUT_DEVICE_ID_MATCH_EVBIT=$((0x010)) -INPUT_DEVICE_ID_MATCH_KEYBIT=$((0x020)) -INPUT_DEVICE_ID_MATCH_RELBIT=$((0x040)) -INPUT_DEVICE_ID_MATCH_ABSBIT=$((0x080)) -INPUT_DEVICE_ID_MATCH_MSCBIT=$((0x100)) -INPUT_DEVICE_ID_MATCH_LEDBIT=$((0x200)) -INPUT_DEVICE_ID_MATCH_SNDBIT=$((0x400)) -INPUT_DEVICE_ID_MATCH_FFBIT=$((0x800)) - - -input_match_bits () -{ - mod_bits=$1 - dev_bits=$2 - - if [ "$dev_bits" = "" ]; then - return 0 - fi - mword=$((0x${mod_bits##*:})) - dword=$((0x${dev_bits##*:})) - - while true; do - if [ $(( $mword & $dword != $mword )) -eq 1 ]; then - return 1 - fi - - mod_bits=${mod_bits%:*} - dev_bits=${dev_bits%:*} - - case "$mod_bits-$dev_bits" in - *:*-*:* ) - : continue - ;; - *:*-*|*-*:* ) - return 0 - ;; - * ) - return 1 - ;; - esac - done -} - -# -# stdin is "modules.inputmap" syntax -# on return, all matching modules were added to $DRIVERS -# -input_map_modules () -{ - while read line - do - # comments are lines that start with "#" ... - # be careful, they still get parsed by bash! - case "$line" in - \#*) continue ;; - esac - - set $line - - module="$1" - matchBits=$(($2)) - - bustype=$(($3)) - vendor=$(($4)) - product=$(($5)) - version=$(($6)) - - evBits="$7" - keyBits="$8" - relBits="$9" - - shift 9 - absBits="$1" - cbsBits="$2" - ledBits="$3" - sndBits="$4" - ffBits="$5" - driverInfo=$(($6)) - - : checkmatch $module - - : bustype $bustype $i_bustype - if [ $INPUT_DEVICE_ID_MATCH_BUS -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_BUS )) ] && - [ $bustype -ne $i_bustype ]; then - continue - fi - - : vendor $vendor $i_vendor - if [ $INPUT_DEVICE_ID_MATCH_VENDOR -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_VENDOR )) ] && - [ $vendor -ne $i_vendor ]; then - continue - fi - - : product $product $i_product - if [ $INPUT_DEVICE_ID_MATCH_PRODUCT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_PRODUCT )) ] && - [ $product -ne $i_product ]; then - continue - fi - - # version i_version $i_version < version $version - if [ $INPUT_DEVICE_ID_MATCH_VERSION -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_VERSION )) ] && - [ $version -ge $i_version ]; then - continue - fi - - : evBits $evBits $i_evBits - if [ $INPUT_DEVICE_ID_MATCH_EVBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_EVBIT )) ] && - input_match_bits "$evBits" "$i_evBits"; then - continue - fi - : keyBits $keyBits $i_keyBits - if [ $INPUT_DEVICE_ID_MATCH_KEYBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_KEYBIT )) ] && - input_match_bits "$keyBits" "$i_keyBits"; then - continue - fi - : relBits $relBits $i_relBits - if [ $INPUT_DEVICE_ID_MATCH_RELBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_RELBIT )) ] && - input_match_bits "$relBits" "$i_relBits"; then - continue - fi - - : absBits $absBits $i_absBits - if [ $INPUT_DEVICE_ID_MATCH_ABSBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_ABSBIT )) ] && - input_match_bits "$absBits" "$i_absBits"; then - continue - fi - - : mscBits $mscBits $i_mscBits - if [ $INPUT_DEVICE_ID_MATCH_MSCBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_MSCBIT )) ] && - input_match_bits "$mscBits" "$i_mscBits"; then - continue - fi - - : ledBits $ledBits $_ledBits - if [ $INPUT_DEVICE_ID_MATCH_LEDBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_LEDBIT )) ] && - input_match_bits "$ledBits" "$i_ledBits"; then - continue - fi - - : sndBits $sndBits $i_sndBits - if [ $INPUT_DEVICE_ID_MATCH_SNDBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_SNDBIT )) ] && - input_match_bits "$sndBits" "$i_sndBits"; then - continue - fi - - : ffBits $ffBits $i_ffBits - if [ $INPUT_DEVICE_ID_MATCH_FFBIT -eq $(( $matchBits & $INPUT_DEVICE_ID_MATCH_FFBIT )) ] && - input_match_bits "$ffBits" "$i_ffBits"; then - continue - fi - - : driverInfo $driverInfo - if [ $matchBits -eq 0 ] && [ $driverInfo -eq 0 ]; then - continue - fi - - # It was a match! - case " $DRIVERS " in - *" $module "* ) - : already found - ;; - * ) - DRIVERS="$module $DRIVERS" - ;; - esac - : drivers $DRIVERS - done -} - -# -# What to do with this INPUT hotplug event? -# -case $ACTION in - -add) - - input_convert_vars - - FOUND=false - LABEL="INPUT product $PRODUCT" - - if [ -r $MAP_CURRENT ]; then - load_drivers input $MAP_CURRENT "$LABEL" - fi - - if [ "$DRIVERS" != "" ]; then - FOUND=true - fi - - if [ "$FOUND" = "false" ]; then - debug_mesg "... no modules for $LABEL" - exit 2 - fi - - ;; - -remove) - : nothing so far - - ;; - -*) - debug_mesg INPUT $ACTION event not supported - exit 1 - ;; - -esac diff --git a/hotplug/input.rc b/hotplug/input.rc deleted file mode 100755 index 493b70d3..00000000 --- a/hotplug/input.rc +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh -# -# input.rc This loads handlers for those input devices -# that have drivers compiled in kernel -# Currently stopping is not supported -# -# Best invoked via /etc/init.d/hotplug or equivalent, with -# writable /tmp, /usr mounted, and syslogging active. -# - - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -PROCDIR=/proc/bus/input - -# source function library -if [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -fi - -if [ -f /etc/hotplug/hotplug.functions ]; then - . /etc/hotplug/hotplug.functions -fi - -input_reset_state () { - - PRODUCT= - NAME= - PHYS= - EV= - KEY= - REL= - ABS= - MSC= - LED= - SND= - FF= - -} - -# -# "COLD PLUG" ... load input handlers for compile-in input drivers loaded -# before the OS could really handle hotplug, perhaps because /sbin or -# $HOTPLUG_DIR wasn't available or /tmp wasn't writable. When/if the -# /sbin/hotplug program is invoked then, hotplug event notifications -# get dropped. To make up for such "cold boot" errors, we synthesize -# all the hotplug events we expect to have seen already. They can be -# out of order, and some might be duplicates. -# -input_boot_events () -{ - # do not even try if /proc/bus/input is missing - [ -d $PROCDIR ] || return - - if [ ! -r $PROCDIR/devices ]; then - echo $"** can't synthesize input events - $PROCDIR/devices missing" - return - fi - - ACTION=add - export ACTION - - export PRODUCT NAME PHYS EV KEY REL ABS MSC LED SND FF - input_reset_state - - # - # the following reads from /proc/bus/input/devices. It is inherently - # racy (esp. as this file may be changed by input.agent invocation) - # but so far input devices do not appear in sysfs - # - while read line; do - case "$line" in - I:* ) # product ID - eval "${line#I: }" - PRODUCT="$Bus/$Vendor/$Product/$Version" - ;; - N:* ) # name - eval "${line#N: }" - NAME="$Name" - ;; - P:* ) # Physical - eval "${line#P: }" - PHYS="$Phys" - ;; - B:* ) # Controls supported - line="${line#B: }" - eval "${line%%=*}=\"${line#*=}\"" - ;; - "" ) # End of block - debug_mesg "Invoking input.agent" - debug_mesg "PRODUCT=$PRODUCT" - debug_mesg "NAME=$NAME" - debug_mesg "PHYS=$PHYS" - debug_mesg "EV=$EV" - debug_mesg "KEY=$KEY" - debug_mesg "REL=$REL" - debug_mesg "ABS=$ABS" - debug_mesg "MSC=$MSC" - debug_mesg "LED=$LED" - debug_mesg "SND=$SND" - debug_mesg "FF=$FF" - /etc/hotplug/input.agent < /dev/null - input_reset_state - ;; - esac - done < $PROCDIR/devices -} - - -# See how we were called. -case "$1" in - start) - input_boot_events - ;; - stop) - : not supported currently - ;; - status) - echo $"INPUT status for kernel: " `uname -srm` - echo '' - - echo "INPUT devices:" - if [ -r $PROCDIR/devices ]; then - grep "^[INHP]:" $PROCDIR/devices - else - echo "$PROCDIR/devices not available" - fi - echo '' - - echo "INPUT handlers:" - if [ -r $PROCDIR/handlers ]; then - cat $PROCDIR/handlers - else - echo "$PROCDIR/handlers not available" - fi - - echo '' - - ;; - restart) - # always invoke by absolute path, else PATH=$PATH: - $0 stop && $0 start - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - exit 1 -esac diff --git a/hotplug/isapnp.rc b/hotplug/isapnp.rc deleted file mode 100755 index e69de29b..00000000 diff --git a/hotplug/net.agent b/hotplug/net.agent deleted file mode 100755 index f4915b17..00000000 --- a/hotplug/net.agent +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# Network hotplug policy agent for Linux 2.4 kernels -# -# Kernel NET hotplug params include: -# -# ACTION=%s [register or unregister] -# INTERFACE=%s -# -# HISTORY: -# -# 25-Feb-2001 Special case ppp and similar (redhat) -# 23-Jan-2001 Log invocation of "ifup" if debugging -# 04-Jan-2001 Initial version of "new" hotplug agent. -# -# $Id: net.agent,v 1.22 2004/09/20 23:02:34 kroah Exp $ -# - -cd /etc/hotplug -. ./hotplug.functions -# DEBUG=yes export DEBUG - -if [ "$INTERFACE" = "" ]; then - mesg Bad NET invocation: \$INTERFACE is not set - exit 1 -fi - -case $ACTION in -add|register) - # Red Hat specific hack... - if [ -f /etc/redhat-release ]; then - # Don't do anything if the network is stopped - if [ ! -f /var/lock/subsys/network ]; then - exit 0 - fi - fi - - case $INTERFACE in - # interfaces that are registered after being "up" (?) - ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) - debug_mesg assuming $INTERFACE is already up - exit 0 - ;; - # interfaces that are registered then brought up - *) - # NOTE: network configuration relies on administered state, - # we can't do much here without distro-specific knowledge - # such as whether/how to invoke DHCP, set up bridging, etc. - - # Run ifrename as needed - Jean II - # Remap interface names based on MAC address. This workaround - # the dreaded configuration problem "all my cards are 'eth0'"... - # This needs to be done before ifup otherwise ifup will get - # confused by the name changed and because iface need to be - # down to change its name. - if [ -x /sbin/ifrename ] && [ -r /etc/iftab ]; then - debug_mesg invoke ifrename for $INTERFACE - NEWNAME=`/sbin/ifrename -i $INTERFACE` - if [ -n "$NEWNAME" ]; then - debug_mesg iface $INTERFACE is remapped to $NEWNAME - INTERFACE=$NEWNAME - fi; - fi - - # RedHat and similar - export IN_HOTPLUG=1 - if [ -x /sbin/ifup ]; then - debug_mesg invoke ifup $INTERFACE - exec /sbin/ifup $INTERFACE - - # Gentoo - elif [ -f /etc/gentoo-release ]; then - script=/etc/init.d/net.$INTERFACE - if [ -x "$script" ]; then - debug_mesg invoke \"$script\" --quiet start - exec "$script" --quiet start - fi - else - mesg "how do I bring interfaces up on this distro?" - fi - ;; - esac - mesg $1 $ACTION event not handled - ;; - -remove|unregister) - case $INTERFACE in - # interfaces that are unregistered after being "down" (?) - ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) - debug_mesg assuming $INTERFACE is already down - exit 0 - ;; - *) - # right now it looks like only Gentoo wants to care about - # unregistering network devices... - if [ -f /etc/gentoo-release ]; then - script=/etc/init.d/net.$INTERFACE - if [ -x "$script" ]; then - debug_mesg invoke "$script" --quiet stop - exec "$script" --quiet stop - fi - fi - ;; - esac - mesg $1 $ACTION event not handled - ;; - -*) - debug_mesg NET $ACTION event for $INTERFACE not supported - exit 1 ;; - -esac diff --git a/hotplug/pci.agent b/hotplug/pci.agent deleted file mode 100755 index c3dc3315..00000000 --- a/hotplug/pci.agent +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh -# -# PCI-specific hotplug policy agent. -# -# This should handle 2.4.* PCI (including Cardbus) hotplugging, -# with a consistent framework for adding device and driver specific -# treatments. -# -# Kernel Cardbus/PCI params are: -# -# ACTION=%s [add or remove] -# PCI_CLASS=%06X -# PCI_ID=%04X:%04X -# PCI_SLOT_NAME=%s -# PCI_SUBSYS_ID=%04X:%04X -# -# If /proc is mounted, /proc/bus/pci/$PCI_SLOT_NAME is almost the name -# of the binary device descriptor file ... just change ':' to '/'. -# -# On systems using Linux 2.4.* kernels, be sure to use the right -# modutils (2.4.1+). -# -# -# HISTORY: -# -# 26-Feb-2001 Cleanup, support comments (Gioele Barabucci) -# 13-Jan-2001 Initial version of "new" hotplug agent; needs -# retesting. -# 17-Jan-2001 Update to latest kernel syntax (Dan Zink) -# 15-Feb-2001 Remove use of "<<" (Adam Richter) -# -# $Id: pci.agent,v 1.16 2004/09/20 21:43:37 kroah Exp $ -# - -cd /etc/hotplug -. ./hotplug.functions - -# generated by modutils, for current 2.4.x kernels -MAP_CURRENT=$MODULE_DIR/modules.pcimap - -# accumulates list of modules we may care about -DRIVERS= - -if [ "$PCI_CLASS" = "" ] || [ "$PCI_CLASS" = "" ]; then - mesg Bad PCI agent invocation - exit 1 -fi - -# -# Each modules.usbmap format line corresponds to one entry in a -# MODULE_DEVICE_TABLE(pci,...) declaration in a kernel file. -# -# Think of it as a database column with up to three "match specs" -# to associate kernel modules with particular devices or classes -# of device. The match specs provide a reasonably good filtering -# mechanism, but some driver probe() routines need to provide -# extra filtering. -# - -pci_convert_vars () -{ - pci_class=$((0x$PCI_CLASS)) - - set $(echo $PCI_ID | sed -e 's/\([^:]*\):\(.*\)/\1 \2/') - pci_id_vendor=$((0x$1)) - pci_id_device=$((0x$2)) - - set $(echo $PCI_SUBSYS_ID | sed -e 's/\([^:]*\):\(.*\)/\1 \2/') - pci_subid_vendor=$((0x$1)) - pci_subid_device=$((0x$2)) -} - -PCI_ANY=$((0xffffffff)) - - -# -# stdin is "modules.pcimap" syntax -# on return, ONE matching module was added to $DRIVERS -# -pci_map_modules () -{ - # comment line lists (current) pci_device_id field names - read ignored - - # look at each pci_device_id entry - # collect one match in $DRIVERS - while read module vendor device subvendor subdevice class class_mask ignored - do - # comments are lines that start with "#" ... - # be careful, they still get parsed by bash! - case "$module" in - \#*) continue ;; - esac - - # convert the fields from hex to dec - vendor=$(($vendor)); device=$(($device)) - subvendor=$(($subvendor)); subdevice=$(($subdevice)) - class=$(($class)); class_mask=$(($class_mask)) - - : checkmatch $module - - : vendor $vendor $pci_id_vendor - if [ $vendor -ne $PCI_ANY ] && [ $vendor -ne $pci_id_vendor ]; then - continue - fi - : device $device $pci_id_device - if [ $device -ne $PCI_ANY ] && [ $device -ne $pci_id_device ]; then - continue - fi - : sub-vendor $subvendor $pci_subid_vendor - if [ $subvendor -ne $PCI_ANY ] && [ $subvendor -ne $pci_subid_vendor ]; then - continue - fi - : sub-device $subdevice $pci_subid_device - if [ $subdevice -ne $PCI_ANY ] && [ $subdevice -ne $pci_subid_device ]; then - continue - fi - - class_temp=$(($pci_class & $class_mask)) - if [ $class_temp -eq $class ]; then - DRIVERS="$module $DRIVERS" - : drivers $DRIVERS - break - fi - done -} - - -# -# What to do with this PCI hotplug event? -# -case $ACTION in - -add) - pci_convert_vars - - LABEL="PCI slot $PCI_SLOT_NAME" - - # on 2.4 systems, modutils maintains MAP_CURRENT - if [ -r $MAP_CURRENT ]; then - load_drivers pci $MAP_CURRENT "$LABEL" - fi - - if [ "$DRIVERS" = "" ]; then - debug_mesg "... no modules for $LABEL" - exit 2 - fi - ;; - -*) - debug_mesg PCI $ACTION event not supported - exit 1 - ;; - -esac diff --git a/hotplug/pci.rc b/hotplug/pci.rc deleted file mode 100755 index ab3e8d94..00000000 --- a/hotplug/pci.rc +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# vim: syntax=sh -# -# pci.rc mostly to recover lost boot-time pci hotplug events -# -# $Id: pci.rc,v 1.12 2004/09/20 21:36:47 kroah Exp $ -# - -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -cd /etc/hotplug -. ./hotplug.functions - -pci_boot_events () -{ - # make sure the pci agent will run - ACTION=add - PCI_CLASS=0 - PCI_ID=0:0 - PCI_SLOT=0:0.0 - PCI_SLOT_NAME=0:0.0 - PCI_SUBSYS_ID=0:0 - export ACTION PCI_CLASS PCI_ID PCI_SLOT PCI_SLOT_NAME PCI_SUBSYS_ID - - if [ -d /sys/bus ]; then - # 2.6 kernels - if [ -d /sys/bus/pci/devices/ ]; then - cd /sys/bus/pci/devices/ - for PCI_DEVICE in *; do - set `echo $PCI_DEVICE \ - | sed -e 's/\([^:]*\):\(.*\):\(.*\)\.\(.*\)/\1 \2 \3 \4/'` - PCI_SLOT_NAME=$2:$3.$4 - PCI_CLASS="`cat $PCI_DEVICE/class`" - PCI_CLASS=${PCI_CLASS#0x} - vendor_id=`cat $PCI_DEVICE/vendor` - device_id=`cat $PCI_DEVICE/device` - PCI_ID="${vendor_id#0x}:${device_id#0x}" - sub_vendor_id=`cat $PCI_DEVICE/subsystem_vendor` - sub_device_id=`cat $PCI_DEVICE/subsystem_device` - PCI_SUBSYS_ID="${sub_vendor_id#0x}:${sub_device_id#0x}" - /sbin/hotplug pci - done - fi - else - # 2.4 kernels - LISTER=`which pcimodules` - if [ "$LISTER" = "" ] || [ ! -f /proc/bus/pci/devices ] || [ ! -x pci.agent ]; then - echo $"** can't synthesize pci hotplug events" - return 1 - fi - - # these notifications will be handled by pcimodules - for BUS in `cd /proc/bus/pci;find * -type d -print`; do - for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do - PCI_SLOT=$BUS:$SLOT_FUNC - /sbin/hotplug pci - done - done - fi - - return 0 -} - -# See how we were called. -case "$1" in - start) - pci_boot_events - ;; - stop) - # echo $"pci stop -- ignored" - ;; - status) - echo $"PCI Status for kernel: " `uname -srm` - echo '' - - if [ -f /proc/bus/pci/devices ]; then - COUNT=`ls /proc/bus/pci | wc -l` - if [ $COUNT -gt 1 ]; then - COUNT=`expr $COUNT - 1` - echo $"PCI up; bus count is $COUNT" - if [ -x /sbin/lspci ]; then - /sbin/lspci - fi - else - echo $"no PCI busses?" - fi - echo '' - else - echo $"no PCI /proc support?" - fi - echo '' - - ;; - restart) - # always invoke by absolute path, else PATH=$PATH: - $0 stop && $0 start - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - exit 1 -esac diff --git a/hotplug/pnp.distmap b/hotplug/pnp.distmap deleted file mode 100644 index 6339bdf8..00000000 --- a/hotplug/pnp.distmap +++ /dev/null @@ -1,9 +0,0 @@ -# isapnp module cardvendor carddevice driver_data vendor function ... -irtty-sir 0xffff 0xffff 0x00000000 0xd041 0x1005 -irtty-sir 0xffff 0xffff 0x00000000 0xd041 0x1105 -floppy 0xffff 0xffff 0x00000000 0xd041 0x0007 -pcspkr 0xffff 0xffff 0x00000000 0xd041 0x0008 -rtc 0xffff 0xffff 0x00000000 0xd041 0x000b -atkbd 0xffff 0xffff 0x00000000 0xd041 0x0303 -psmouse 0xffff 0xffff 0x00000000 0xd041 0x130f -analog 0xffff 0xffff 0x00000000 0xd041 0x2fb0 diff --git a/hotplug/pnp.rc b/hotplug/pnp.rc deleted file mode 100755 index d8bc2496..00000000 --- a/hotplug/pnp.rc +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh -# vim: syntax=sh -# -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Copyright (C) 2004 Alexander E. Patrakov (patrakov@ums.usu.ru) -# Copyright (C) 2004 Simone Gotti (simone.gotti@email.it) -# All Rights Reserved. -# -# Based on scripts by Simone Gotti, from: -# http://members.xoom.virgilio.it/motaboy/hotplug-isapnp-0.2.1.tar.bz2 -# - - -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -if [ "$(echo /sys/bus/pnp/devices/*)" = "/sys/bus/pnp/devices/*" ] -then - exit 0 -fi - -cd /etc/hotplug -. ./hotplug.functions - -MAP_CURRENT=$MODULE_DIR/modules.isapnpmap -DRIVERS= - -# WARNING: od and printf are in /usr/bin -decode_isapnp_vendor() { - echo -n $1 | od -A n -t d1 | ( read A B C - printf '%x\n' $(( ( ( $A & 0x3f ) << 2) | \ - ( ( $B & 0x18 ) >> 3) | \ - ( ( $B & 0x07 ) <<13) | \ - ( ( $C & 0x1f ) << 8) )) ) -} - -hex_swab() { - echo `echo $1 | cut -b3-4``echo $1 | cut -b1-2` -} - -# -# stdin is "modules.isapnpmap" syntax -# on return, ONE matching module was added to $DRIVERS -# -isapnp_map_modules () -{ - local module ignored - - CHECKED_ID="0x`echo $ISAPNP_ID | cut -b1-4`0x`echo $ISAPNP_ID | cut -b5-8`" - # comment line lists (current) isapnp_device_id field names - read ignored - - while read module cardvendor carddevice driver_data therest - do - # comments are lines that start with "#" ... - # be careful, they still get parsed by bash! - case "$module" in - \#*) continue ;; - esac - : checkmatch $module - set $therest - while [ $# -gt 0 ] - do - id_temp=$2$1 - if [ "$id_temp" = "$CHECKED_ID" ] ; then - DRIVERS="$module $DRIVERS" - : drivers $DRIVERS - break - fi - shift - shift - done - done -} - - -isapnp_boot_events () -{ - cd /sys/bus/pnp/devices/ - for ISAPNP_DEVICE in * ; do - ISAPNP_STRINGS=`cat $ISAPNP_DEVICE/id` - for ISAPNP_STRING in $ISAPNP_STRINGS ; do - rawcardvendor=`echo $ISAPNP_STRING | cut -b1-3` - rawcarddevice=`echo $ISAPNP_STRING | cut -b4-7` - cardvendor=`decode_isapnp_vendor $rawcardvendor` - carddevice=`hex_swab $rawcarddevice` - ISAPNP_ID=$carddevice$cardvendor - LABEL="ISAPNP id $ISAPNP_ID" - load_drivers isapnp $MAP_CURRENT "$LABEL" - load_drivers isapnp /etc/hotplug/pnp.distmap "$LABEL" - done - done - return 0 -} - - -# See how we were called. -case "$1" in - start) - isapnp_boot_events - ;; - stop) - # echo $"isapnp stop -- ignored" - ;; - status) - # echo $"isapnp status -- ignored" - ;; - restart) - # always invoke by absolute path, else PATH=$PATH: - $0 stop && $0 start - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - exit 1 -esac diff --git a/hotplug/scsi.agent b/hotplug/scsi.agent deleted file mode 100755 index a265a020..00000000 --- a/hotplug/scsi.agent +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# SCSI hotplug agent for 2.5 kernels -# -# ACTION=add -# DEVPATH=devices/scsi0/0:0:0:0 -# - -cd /etc/hotplug -. ./hotplug.functions - -case $ACTION in - -add) - # 2.5.50 kernel bug: this happens sometimes - if [ ! -d /sys/$DEVPATH ]; then - mesg "bogus sysfs DEVPATH=$DEVPATH" - exit 1 - fi - - TYPE_ATTR=/sys$DEVPATH/type - - # Possibly sleep here to try and avoid races with scsi attributes and block - # devices - count=120 - while [ ! -f $TYPE_ATTR ] && [ $count -gt 0 ] - do - # We seem to always hit this now, so don't output any message. - debug_mesg "waiting for $TYPE_ATTR" - sleep 1 - count=$(($count-1)) - done - - if [ ! -f $TYPE_ATTR ] - then - mesg "Attribute $TYPE_ATTR does not exist" - exit 1 - fi - - TYPE=$(cat $TYPE_ATTR) - case "$TYPE" in - # 2.5.51 style attributes; TYPE_* constants - 0) TYPE=disk ; MODULE=sd_mod ;; - # FIXME some tapes use 'osst' not 'st' - 1) TYPE=tape ; MODULE=st ;; - 2) TYPE=printer ;; - 3) TYPE=processor ;; - 4) TYPE=worm ; MODULE=sr_mod ;; - 5) TYPE=cdrom ; MODULE=sr_mod ;; - 6) TYPE=scanner ;; - 7) TYPE=mod ; MODULE=sd_mod ;; - 8) TYPE=changer ;; - 9) TYPE=comm ;; - 14) TYPE=enclosure ;; - esac - if [ "$MODULE" != "" ]; then - mesg "$TYPE at $DEVPATH" - modprobe $MODULE - else - debug_mesg "how to add device type=$TYPE at $DEVPATH ??" - fi - ;; - -*) - debug_mesg SCSI $ACTION event not supported - exit 1 - ;; - -esac diff --git a/hotplug/tape.agent b/hotplug/tape.agent deleted file mode 100755 index 8c2e6d64..00000000 --- a/hotplug/tape.agent +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -############################################################################### -# Tape hotplug agent for Linux 2.4 kernels -# -# Copyright (c) 2002 IBM Development Germany, Boeblingen -# -# the GNU Public License applies -# -# Author: Stefan Bader , 2002 -# -# History: -# 2002-10-14 Stefan Bader -# Fixed remove char case (missing statement) -# 2002-10-01 Stefan Bader -# Created inital version -# -# Generated by: -# /usr/src/linux/drivers/s390/char/tape.c -# -# Evionment: -# ACTION ::= add | remove -# DEVNO ::= <4 digit hex number> -# MAJOR ::= -# MINOR ::= -# INTERFACE ::= char | block -############################################################################### -: ${ACTION?Bad invocation: \$ACTION is not set} -: ${DEVNO?Bad invocation: \$DEVNO is not set} -: ${MAJOR?Bad invocation: \$MAJOR is not set} -: ${MINOR?Bad invocation: \$MINOR is not set} -: ${INTERFACE?Bad invocation: \$INTERFACE is not set} - -# Convert to lowercase (just in case) -DEVNO=$(echo $DEVNO | tr A-F a-f) - -cd /etc/hotplug -. hotplug.functions - -mesg "$ACTION $DEVNO $MAJOR $MINOR $INTERFACE" - -if test -r tape.permissions; then - . tape.permissions -else - mesg "Tape permission handling not found" - exit 1 -fi - -#============================================================================== -# To preserve the script from doing anything real, call it with -# CONDOM=echo -: ${CONDOM=} -# To try things on an alternate location set ROOTDIR to a different base -#: ${ROOTDIR=} -: ${ROOTDIR=} -# Abort on error or unset variables: -set -o errexit -set -o nounset -#============================================================================== - -#------------------------------------------------------------------------------ -# Environment: none -# Parameters : $1 : abort message -# $2 : optional return code -#------------------------------------------------------------------------------ -# Abort handling -abort() { - if test "$#" -lt 2; then - RC=1 - else - RC=$2 - fi - - mesg "$1 RC($RC)" - exit $RC -} - -#------------------------------------------------------------------------------ -# Environment: INTERFACE -# MINOR -# Parameters: none -# -# Prints: Tape number [0..127] -# Returns: 0 -#------------------------------------------------------------------------------ -tape_number() { - if test "$INTERFACE" = "block"; then - echo $MINOR - else - echo "$(($MINOR / 2))" - fi - return 0 -} - -#------------------------------------------------------------------------------ -# Environment: ROOTDIR -# DEVNO -# CONDOM -# Parameters: $1 : variable part of the link name -# $2 : variable part of the target node name -# -# Creates a symbolic link to access the tape device by devno -# -# Prints: nothing -# Returns: 0 on success, otherwise 1 -#------------------------------------------------------------------------------ -create_symlink() { - LINK=$ROOTDIR/dev/tape/$DEVNO/$1 - TARGET=../../../$2$(tape_number) - - # Do not create link if devfs compatibility mode is not started - if test ! -d $ROOTDIR/dev/tape; then - return 0 - fi - - if test ! -d $(dirname $LINK); then - $CONDOM mkdir -p $(dirname $LINK) || return 1 - fi - mesg "Creating symlink $LINK -> $TARGET" - $CONDOM rm -f $LINK || return 1 - $CONDOM ln -s $TARGET $LINK || return 1 - - return 0 -} - -#------------------------------------------------------------------------------ -# Environment: MAJOR -# MINOR -# Parameters: $1 : node name -# $2 : device type (b|c) -# -# Tests whether the node already exists with the correct type, major and minor -# -# Prints: nothing -# Returns: 0 if the node is ok, otherwise 1 -#------------------------------------------------------------------------------ -verify_node() { - NAME="$1" - TYPE="$2" - RC=1 - - if test -$TYPE "$NAME"; then - MAJMIN=$(ls -l "$NAME"|awk '{print $5 $6}') - - if test "$(echo $MAJMIN|cut -d, -f1)" = "$MAJOR"; then - if test "$(echo $MAJMIN|cut -d, -f2)" = "$MINOR"; then - RC=0 - fi - fi - fi - - return $RC -} - -#------------------------------------------------------------------------------ -# Environment: ROOTDIR -# INTERFACE -# CONDOM -# MAJOR -# MINOR -# OWNER -# PERMISSIONS -# Parameters: $1 : device type (b|c) -# $2 : variable part of the device node name ([brn]tibm) -# -# Creates a device node for the tpae device (if it doesn't exist) and sets -# the permissions. -# -# Prints: nothing -# Returns: 0 on success, otherwise 1 -#------------------------------------------------------------------------------ -create_node() { - TYPE="$1" - NAME="$ROOTDIR/dev/$2$(tape_number)" - - # FIXME: This would currently recreate the device node if it isn't - # right even if devfs compatibility isn't enabled. Should - # ownership and permissions be preserved in that case??? - if ! verify_node $NAME $TYPE; then - mesg "Creating devicenode $NAME" - $CONDOM rm -f "$NAME" || return 1 - $CONDOM mknod "$NAME" $TYPE $MAJOR $MINOR || return 1 - fi - - # We only want to change ownership and permissions if devfs compa- - # tibility is enabled. - tape_permissions $DEVNO - if test "$OWNER" != "" && test -d $ROOTDIR/dev/tape; then - $CONDOM chown $OWNER "$NAME" || return 1 - - if test "$PERMISSIONS" != ""; then - $CONDOM chmod "$PERMISSIONS" "$NAME" || return 1 - fi - fi - - return 0 -} - -#------------------------------------------------------------------------------ -# Main -#------------------------------------------------------------------------------ -case "$ACTION" in - add) - case "$INTERFACE" in - block) - create_node b btibm || return 1 - create_symlink block/disc btibm || return 1 - ;; - char) - create_node c ntibm || return 1 - create_symlink char/norewind ntibm || return 1 - MINOR=$(($MINOR + 1)) - create_node c rtibm || return 1 - create_symlink char/rewind rtibm || return 1 - ;; - *) - abort "Unknown interface type <$INTERFACE>" - ;; - esac - ;; - remove) - case "$INTERFACE" in - char) - $CONDOM rm -rf $ROOTDIR/dev/tape/$DEVNO/char - if test -d $ROOTDIR/dev/tape; then - $CONDOM rm -f \ - $ROOTDIR/dev/[nr]tibm$(tape_number) - fi - ;; - block) - $CONDOM rm -rf $ROOTDIR/dev/tape/$DEVNO/block - if test -d $ROOTDIR/dev/tape; then - $CONDOM \ - rm -f $ROOTDIR/dev/btibm$(tape_number) - fi - ;; - *) - abort "Unknown interface type <$INTERFACE>" - ;; - esac - - if test "$(ls $ROOTDIR/dev/tape/$DEVNO)" = ""; then - $CONDOM rmdir $ROOTDIR/dev/tape/$DEVNO - fi - ;; - *) - abort "$(basename $0): $ACTION event not supported" - ;; -esac - -exit 0 - diff --git a/hotplug/tape.permissions b/hotplug/tape.permissions deleted file mode 100755 index ca920cd3..00000000 --- a/hotplug/tape.permissions +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2002 IBM Development Germany, Boeblingen -# -# Author: Stefan Bader -# -# the GNU Public License applies -# -tape_permissions() { - DEVNO="$1" - - case "$DEVNO" in - # - # You could set other permissions to specific tape device - # numbers here. E.g. the following would override the default - # for tape 1a32 - # - # 1a32) OWNER=nobody.users PERMISSIONS="u=rw,go=";; - - *) OWNER=root.root PERMISSIONS="ug=rw,o=";; - esac - - return 0 -} diff --git a/hotplug/usb.agent b/hotplug/usb.agent deleted file mode 100755 index 6485e442..00000000 --- a/hotplug/usb.agent +++ /dev/null @@ -1,452 +0,0 @@ -#!/bin/sh -# -# USB-specific hotplug policy agent. -# -# This should handle 2.2.18+, 2.4.*, and 2.5.* USB hotplugging, -# with a consistent framework for adding device and driver -# specific handling. -# -# Normally, adding a usb device will modprobe a driver. If there -# is a /etc/hotplug/usb/$DRIVER script set up, it will also run, -# handling tasks like loading firmware or starting daemons. -# -# Kernel USB hotplug params include: -# -# ACTION=%s [add or remove] -# DEVPATH=%s [in 2.5 kernels, /sys/$DEVPATH] -# PRODUCT=%x/%x/%x -# INTERFACE=%d/%d/%d [ for interface 0, if TYPE=0/*/* ] -# TYPE=%d/%d/%d -# -# And if usbfs (originally called usbdevfs) is configured, also: -# -# DEVFS=/proc/bus/usb [gone in 2.5] -# DEVICE=/proc/bus/usb/%03d/%03d -# -# This script then adds the variable: -# -# REMOVER=/var/run/usb/ -# -# This is the path where the script would like to find a remover, if -# the target device needs one. This script is executed on remove if -# it is executable when the remove happens. -# -# If usbfs is mounted on /proc/bus/usb, $DEVICE is a file which -# can be read to get the device's current configuration descriptor. -# (The "usbmodules" utility does that.) Or it can be used by a -# user mode driver to interact with the usb device. USB hotplug -# does *not* require usbfs (or sysfs) to work, although on 2.4 -# some devices work better if "usbmodules" can help. -# -# For Linux 2.5+ kernels, there's no need for "usbmodules". For -# two reasons: first, hotplug is invoked for each interface, not -# just the first one. Second, sysfs exposes descriptors so they -# are easy to use for "coldplug" event simulation. (But sysfs is -# not a replacement for the driver I/O capabilities in usbfs.) -# -# On systems using Linux 2.4.* kernels, be sure to use the right -# modutils (2.4.2+). That ensures that hotplugging uses the list -# of modules installed for your kernel, rather than the one that's -# included here for use on systems without MODULE_DEVICE_TABLE -# support. -# -# -# HISTORY: -# -# 20-Nov-2002 some 2.5 updates; handle new 'device' hotplug; turn off -# 'sleep' hack since hcds must all queue control traffic -# 08-Aug-2002 support for multiple usermaps (maxk), minor cleanup -# 18-Jan-2002 fix match algorithm in usb_map_modules() -# 14-Jan-2002 fix work around 2.2 brokeness of $PRODUCT -# 09-Jan-2002 REMOVER for system without usbdevfs -# -# 14-Mar-2001 Cleanup, bitmask the match_flags -# 26-Feb-2001 Cleanup, support comments (Gioele Barabucci) -# 15-Feb-2001 Remove use of "<<" (Adam Richter) -# 23-Jan-2001 Update 2.2 handling; unfortunately there's no "feature -# test" that can work robustly -# 05-Jan-2001 Quick hack for kernel 2.4.0 and modutils 2.4.1 -# 03-Jan-2001 Initial version of "new" hotplug agent, using feedback -# and contributions from Adam Richter, Ryan VanderBijl, -# Norbert Preining, Florian Lohoff, David Brownell and -# others. To replace the original /etc/usb/policy. (db) -# -# $Id: usb.agent,v 1.43 2004/09/20 22:50:11 kroah Exp $ -# - -if [ -f /etc/sysconfig/usb ]; then - . /etc/sysconfig/usb -fi -if [ -f /etc/conf.d/usb ]; then - . /etc/conf.d/usb -fi - -cd /etc/hotplug -. ./hotplug.functions -# DEBUG=yes export DEBUG - -# generated by modutils, for current 2.4.x (and later) kernels -MAP_CURRENT=$MODULE_DIR/modules.usbmap - -# used if MAP_CURRENT is missing; for 2.2.x kernels -MAP_DISTMAP=$HOTPLUG_DIR/usb.distmap - -# -# used for kernel drivers that don't show up in CURRENT or DISTMAP, -# currently input drivers (joysticks, keyboards, etc). newer systems -# should use input hotplug events instead. -# -MAP_HANDMAP=$HOTPLUG_DIR/usb.handmap - -# -# used to run config scripts for user mode drivers (jPhoto, gPhoto2, -# rio500 tools, etc) ... instead of naming kernel modules, it names -# config scripts. those could change $DEVICE permissions, etc. -# -# for purely user mode drivers, scripts $HOTPLUG_DIR/usb/NAME should be -# installed with usermap files in $HOTPLUG_DIR/usb/NAME.usermap instead -# of continuing to use/modify $MAP_USERMAP -# -MAP_USERMAP=$HOTPLUG_DIR/usb.usermap - - -# accumulates list of modules we may care about -DRIVERS="" - -if [ "$ACTION" = "" ]; then - mesg Bad USB agent invocation, no action - exit 1 -fi - -# starting in kernel 2.5 there are two kinds of USB hotplug events. -# - per-interface; 2.2/2.4 kernels only reported the first one. -# "new" events have nonzero /sys/$DEVPATH/bInterfaceNumber -# - per-device; "new" events don't have $PRODUCT -SYSFS=/sys -if [ "$PRODUCT" = "" ]; then - # this is either an error, or we're on a 2.5 system... - if [ "$DEVPATH" = "" ]; then - mesg Bad USB agent invocation - exit 1 - fi - - # sysfs files may already be gone - if [ $ACTION = 'remove' ]; then - exit 0 - fi - - # we could be running before usb populated these attributes... - if [ ! -f $SYSFS/$DEVPATH/bNumConfigurations ]; then - # FIXME wait till they appear, or N seconds elapse - sleep 2 - fi - - # this could care about changing the default config, or warning - # when the user hooked a fast device up so it runs slowly. - if [ ! -f $SYSFS/$DEVPATH/bNumConfigurations ]; then - exit 0 - fi - TMP=$(cat $SYSFS/$DEVPATH/bNumConfigurations) - if [ $TMP -ne 1 ] && [ "$ACTION" = add ]; then - mesg Keeping default configuration with $SYSFS/$DEVPATH - fi - - # NOTE: it might be good to add an extension hook here rather - # than ignore these events, but even device-scope tasks such - # as firmware download can still use the interface-0 event - # (as they did with 2.2/2.4 hotplug setup scripts). - exit 0 -fi - -# we can't "unset IFS" on bash1, so save a copy -DEFAULT_IFS="$IFS" - -# -# Each modules.usbmap format line corresponds to one entry in a -# MODULE_DEVICE_TABLE(usb,...) declaration in a kernel file. -# -# Think of it as a database column with up to three "match specs" -# to associate kernel modules with particular devices or classes -# of device. The match specs provide a reasonably good filtering -# mechanism, but some driver probe() routines need to provide -# extra filtering. -# - -usb_convert_vars () -{ - # work around 2.2.early brokenness - # munges the usb_bcdDevice such that it is a integer rather - # than a float: e.g. 1.0 become 0100 - PRODUCT=`echo $PRODUCT | sed -e "s+\.\([0-9]\)$+.\10+" -e "s/\.$/00/" \ - -e "s+/\([0-9]\)\.\([0-9][0-9]\)+/0\1\2+" \ - -e "s+/\([0-9][0-9]\)\.\([0-9][0-9]\)+/\1\2+"` - set $(echo $PRODUCT | sed -e 's+\([^/]*\)/\([^/]*\)/\(.*\)+\1 \2 \3+') - usb_idVendor=$((0x$1)) - usb_idProduct=$((0x$2)) - usb_bcdDevice=$((0x$3)) - - if [ "$TYPE" != "" ]; then - IFS=/ - set $TYPE '' - usb_bDeviceClass=$1 - usb_bDeviceSubClass=$2 - usb_bDeviceProtocol=$3 - IFS="$DEFAULT_IFS" - elif [ -r $SYSFS/$DEVPATH/bDeviceClass ]; then - usb_bDeviceClass=$((0x$(cat $SYSFS/$DEVPATH/bDeviceClass))) - usb_bDeviceSubClass=$((0x$(cat $SYSFS/$DEVPATH/bDeviceSubClass))) - usb_bDeviceProtocol=$((0x$(cat $SYSFS/$DEVPATH/bDeviceProtocol))) - else - # out-of-range values - usb_bDeviceClass=1000 - usb_bDeviceSubClass=1000 - usb_bDeviceProtocol=1000 - fi - - if [ "$INTERFACE" != "" ]; then - IFS=/ - set $INTERFACE '' - usb_bInterfaceClass=$1 - usb_bInterfaceSubClass=$2 - usb_bInterfaceProtocol=$3 - IFS="$DEFAULT_IFS" - elif [ -r $SYSFS/$DEVPATH/bInterfaceClass ]; then - usb_bInterfaceClass=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceClass))) - usb_bInterfaceSubClass=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceSubClass))) - usb_bInterfaceProtocol=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceProtocol))) - else - # out-of-range values - usb_bInterfaceClass=1000 - usb_bInterfaceSubClass=1000 - usb_bInterfaceProtocol=1000 - fi -} - -USB_MATCH_VENDOR=$((0x0001)) -USB_MATCH_PRODUCT=$((0x0002)) -USB_MATCH_DEV_LO=$((0x0004)) -USB_MATCH_DEV_HI=$((0x0008)) -USB_MATCH_DEV_CLASS=$((0x0010)) -USB_MATCH_DEV_SUBCLASS=$((0x0020)) -USB_MATCH_DEV_PROTOCOL=$((0x0040)) -USB_MATCH_INT_CLASS=$((0x0080)) -USB_MATCH_INT_SUBCLASS=$((0x0100)) -USB_MATCH_INT_PROTOCOL=$((0x0200)) - -# -# stdin is "modules.usbmap" syntax -# on return, all matching modules were added to $DRIVERS -# -usb_map_modules () -{ - # look at each usb_device_id entry - # collect all matches in $DRIVERS - - while read line - do - # comments are lines that start with "#" ... - # be careful, they still get parsed by bash! - case "$line" in - \#*) continue ;; - "") continue ;; - esac - - set $line - - module=$1 - match_flags=$(($2)) - - idVendor=$(($3)) - idProduct=$(($4)) - bcdDevice_lo=$(($5)) - bcdDevice_hi=$(($6)) - - bDeviceClass=$(($7)) - bDeviceSubClass=$(($8)) - bDeviceProtocol=$(($9)) - - shift 9 - bInterfaceClass=$(($1)) - bInterfaceSubClass=$(($2)) - bInterfaceProtocol=$(($3)) - - : checkmatch $module - - : idVendor $idVendor $usb_idVendor - if [ $USB_MATCH_VENDOR -eq $(( $match_flags & $USB_MATCH_VENDOR )) ] && - [ $idVendor -ne $usb_idVendor ]; then - continue - fi - - : idProduct $idProduct $usb_idProduct - if [ $USB_MATCH_PRODUCT -eq $(( $match_flags & $USB_MATCH_PRODUCT )) ] && - [ $idProduct -ne $usb_idProduct ]; then - continue - fi - - : bcdDevice range $bcdDevice_hi $bcdDevice_lo actual $usb_bcdDevice - if [ $USB_MATCH_DEV_LO -eq $(( $match_flags & $USB_MATCH_DEV_LO )) ] && - [ $usb_bcdDevice -lt $bcdDevice_lo ]; then - continue - fi - - # bcdDevice_lo <= bcdDevice <= bcdDevice_hi - if [ $USB_MATCH_DEV_HI -eq $(( $match_flags & $USB_MATCH_DEV_HI )) ] && - [ $usb_bcdDevice -gt $bcdDevice_hi ]; then - continue - fi - - : bDeviceClass $bDeviceClass $usb_bDeviceClass - if [ $USB_MATCH_DEV_CLASS -eq $(( $match_flags & $USB_MATCH_DEV_CLASS )) ] && - [ $bDeviceClass -ne $usb_bDeviceClass ]; then - continue - fi - : bDeviceSubClass $bDeviceSubClass $usb_bDeviceSubClass - if [ $USB_MATCH_DEV_SUBCLASS -eq $(( $match_flags & $USB_MATCH_DEV_SUBCLASS )) ] && - [ $bDeviceSubClass -ne $usb_bDeviceSubClass ]; then - continue - fi - : bDeviceProtocol $bDeviceProtocol $usb_bDeviceProtocol - if [ $USB_MATCH_DEV_PROTOCOL -eq $(( $match_flags & $USB_MATCH_DEV_PROTOCOL )) ] && - [ $bDeviceProtocol -ne $usb_bDeviceProtocol ]; then - continue - fi - - # NOTE: for now, this only checks the first of perhaps - # several interfaces for this device. - - : bInterfaceClass $bInterfaceClass $usb_bInterfaceClass - if [ $USB_MATCH_INT_CLASS -eq $(( $match_flags & $USB_MATCH_INT_CLASS )) ] && - [ $bInterfaceClass -ne $usb_bInterfaceClass ]; then - continue - fi - : bInterfaceSubClass $bInterfaceSubClass $usb_bInterfaceSubClass - if [ $USB_MATCH_INT_SUBCLASS -eq $(( $match_flags & $USB_MATCH_INT_SUBCLASS )) ] && - [ $bInterfaceSubClass -ne $usb_bInterfaceSubClass ]; then - continue - fi - : bInterfaceProtocol $bInterfaceProtocol $usb_bInterfaceProtocol - if [ $USB_MATCH_INT_PROTOCOL -eq $(( $match_flags & $USB_MATCH_INT_PROTOCOL )) ] && - [ $bInterfaceProtocol -ne $usb_bInterfaceProtocol ]; then - continue - fi - - # It was a match! - DRIVERS="$module $DRIVERS" - : drivers $DRIVERS - done -} - -# -# declare a REMOVER name that the add action can use to create a -# remover, or that the remove action can use to execute a remover. -# -if [ "$DEVPATH" != "" ]; then - # probably, 2.6.x - REMOVER=/var/run/usb/$(readlink -f $SYSFS/$DEVPATH | sed -e 's;/;%;g') -elif [ "$DEVICE" != "" ]; then - # 2.4.x? - REMOVER=/var/run/usb/$(echo $DEVICE | sed -e 's;/;%;g') -else - # should not happen? - REMOVER=/var/run/usb/$(echo "$INTERFACE/$PRODUCT/$TYPE" | sed -e 's;/;%;g') -fi -export REMOVER - -# -# What to do with this USB hotplug event? -# -case $ACTION in - -add) - # partial workaround for 2.4 uhci/usb-uhci driver problem: they don't - # queue control requests, so device drivers can confuse each other if - # they happen to issue requests at the same time ... it happens easily - # with slow HID devices and "usbmodules". - # starting with 2.5 (DEVPATH set), all hcds must queue control traffic. - if [ "$DEVPATH" = "" ]; then - sleep 3 - fi - - usb_convert_vars - - FOUND=false - if [ -f $SYSFS/$DEVPATH/manufacturer ]; then - LABEL="USB `cat $SYSFS/$DEVPATH/manufacturer` `cat $SYSFS/$DEVPATH/product`" - else - LABEL="USB product $PRODUCT" - fi - - if [ -e "$REMOVER" ]; then - rm -f "$REMOVER" - fi - - # on 2.4 systems, modutils 2.4.2+ maintains MAP_CURRENT - # ... otherwise we can't rely on it (sigh) - case "$KERNEL" in - 2.4.*|2.5.*|2.6.*) - if [ -r $MAP_CURRENT ]; then - load_drivers usb $MAP_CURRENT "$LABEL" - fi;; - *) - if [ -r $MAP_DISTMAP ]; then - load_drivers usb $MAP_DISTMAP "$LABEL" - fi;; - esac - if [ "$DRIVERS" != "" ]; then - FOUND=true - fi - - # cope with special driver module configurations - # (mostly HID devices, until we have an input.agent) - # not needed on 2.6 - they are loaded by hotplug - case "$KERNEL" in - 2.6.* ) - : nothing - ;; - * ) - if [ -r $MAP_HANDMAP ]; then - load_drivers usb $MAP_HANDMAP "$LABEL" - if [ "$DRIVERS" != "" ]; then - FOUND=true - fi - fi - ;; - esac - - # some devices have user-mode drivers (no kernel module, but config) - # or specialized user-mode setup helpers - MODPROBE=: - for MAP in $MAP_USERMAP $HOTPLUG_DIR/usb/*.usermap - do - if [ -r $MAP ]; then - load_drivers usb $MAP "$LABEL" - if [ "$DRIVERS" != "" ]; then - FOUND=true - fi - fi - done - - if [ "$FOUND" = "false" ]; then - debug_mesg "... no modules for $LABEL" - exit 2 - fi - ;; - -remove) - if [ -x $REMOVER ]; then - $REMOVER - fi - rm -f $REMOVER - - if [ -x /usr/sbin/updfstab ]; then - /usr/sbin/updfstab - fi - ;; - -*) - debug_mesg USB $ACTION event not supported - exit 1 - ;; - -esac diff --git a/hotplug/usb.distmap b/hotplug/usb.distmap deleted file mode 100644 index f6a3d758..00000000 --- a/hotplug/usb.distmap +++ /dev/null @@ -1,222 +0,0 @@ -# usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info -iforce 0x0003 0x046d 0xc281 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -cpia_usb 0x0003 0x0553 0x0002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -acm 0x0070 0x0000 0x0000 0x0000 0x0000 0x02 0x00 0x00 0x00 0x00 0x00 0x00000000 -audio 0x0180 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x01 0x01 0x00 0x00000000 -bluetooth 0x0070 0x0000 0x0000 0x0000 0x0000 0xe0 0x01 0x01 0x00 0x00 0x00 0x00000000 -dabusb 0x0003 0x0547 0x2131 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dabusb 0x0003 0x0547 0x9999 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0120 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0130 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0131 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0132 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0100 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0110 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0111 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0x040a 0x0112 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dc2xx 0x0003 0xf003 0x6002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -dsbr100 0x0003 0x04b4 0x1002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -hid 0x0080 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x03 0x00 0x00 0x00000000 -ibmcam 0x000f 0x0545 0x8080 0x0002 0x0002 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -ibmcam 0x000f 0x0545 0x8080 0x030a 0x030a 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x03e8 0x0008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0506 0x03e8 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0557 0x2002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0557 0x4000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0565 0x0002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0565 0x0005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x05e9 0x0008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x06e1 0x0008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0707 0x0100 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x07aa 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x0846 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x13d2 0x0400 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x066b 0x2202 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x1645 0x0005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x2001 0x4000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -kaweth 0x0003 0x07b8 0x4000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -mdc800 0x0003 0x055f 0xa800 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x04ce 0x0300 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x0094 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x0099 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x009a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x00a0 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x00a3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x80a3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -microtek 0x0003 0x05da 0x80ac 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -ov511 0x0003 0x05a9 0x0511 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -ov511 0x0003 0x05a9 0xa511 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -ov511 0x0003 0x0813 0x0002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x083a 0x1046 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x07a6 0x8511 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x07a6 0x0986 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x08dd 0x0986 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x08dd 0x0987 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x08dd 0x0988 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x08dd 0x8511 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x07aa 0x0004 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x2001 0x4001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x2001 0x4002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x2001 0x4003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x2001 0xabc1 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x07b8 0xabc1 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x07b8 0x4002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x04bb 0x0904 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x056e 0x4002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x066b 0x2202 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x066b 0x2203 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x066b 0x2204 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x066b 0x2206 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x0411 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x0707 0x0200 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -pegasus 0x0003 0x15e8 0x9100 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -printer 0x0070 0x0000 0x0000 0x0000 0x0000 0x07 0x01 0x01 0x00 0x00 0x00 0x00000000 -printer 0x0070 0x0000 0x0000 0x0000 0x0000 0x07 0x01 0x02 0x00 0x00 0x00 0x00000000 -printer 0x0070 0x0000 0x0000 0x0000 0x0000 0x07 0x01 0x03 0x00 0x00 0x00 0x00000000 -printer 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x07 0x01 0x01 0x00000000 -printer 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x07 0x01 0x02 0x00000000 -printer 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x07 0x01 0x03 0x00000000 -rio500 0x0003 0x0841 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a5 0x2060 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a5 0x2040 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a5 0x2022 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x06bd 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x06bd 0x0002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x06bd 0x2061 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x06bd 0x0100 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0458 0x2001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0205 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0101 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0102 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0401 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0701 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0201 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x03f0 0x0601 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0638 0x0268 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x0099 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x0094 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x00a0 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x009a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x00a3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x80a3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x05da 0x80ac 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x055f 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0400 0x1000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x055f 0x0002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x055f 0x0003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x055f 0x0006 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0300 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0380 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0301 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0381 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0302 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0382 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0303 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0383 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0340 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0360 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0341 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x0461 0x0361 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04b8 0x0101 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04b8 0x0103 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04b8 0x0104 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04b8 0x0106 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04b8 0x0107 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x1606 0x0010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x1606 0x0030 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x1606 0x0230 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a7 0x0221 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a7 0x0211 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a7 0x0231 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a7 0x0311 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a7 0x0321 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -scanner 0x0003 0x04a7 0x0331 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -belkin_sa 0x0003 0x050d 0x0103 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -belkin_sa 0x0003 0x056c 0x8007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -belkin_sa 0x0003 0x0565 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -digi_acceleport 0x0003 0x05c5 0x0002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -digi_acceleport 0x0003 0x05c5 0x0004 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -empeg 0x0003 0x084f 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -ftdi_sio 0x0003 0x0403 0x8372 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -ftdi_sio 0x0003 0x0403 0x6001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0103 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0106 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0101 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0102 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0109 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0112 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0107 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0108 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x010f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x0110 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan 0x0003 0x06cd 0x010a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan_pda 0x0003 0x06cd 0x0103 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -keyspan_pda 0x0003 0x06cd 0x0104 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -mct_u232 0x0003 0x0711 0x0210 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -mct_u232 0x0003 0x0711 0x0230 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -mct_u232 0x0003 0x0711 0x0200 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -omninet 0x0003 0x0586 0x1000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -visor 0x0003 0x082d 0x0100 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -whiteheat 0x0003 0x0710 0x8001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -whiteheat 0x0003 0x0710 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x03ee 0x0000 0x0000 0x0245 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x03f0 0x0107 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x0001 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x0002 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x0006 0x0100 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x0007 0x0100 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x0009 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x000a 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x000b 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x000c 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x04e6 0x0101 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x054c 0x0010 0x0106 0x0210 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x054c 0x002d 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x057b 0x0000 0x0000 0x0299 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x057b 0x0000 0x0300 0x9999 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x059f 0xa601 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x05ab 0x0031 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x0644 0x0000 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x0693 0x0002 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x0693 0x0005 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x0781 0x0001 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x0781 0x0100 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x0781 0x0002 0x0009 0x0009 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x07af 0x0004 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x000f 0x07af 0x0005 0x0100 0x0100 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x01 0x01 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x02 0x01 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x03 0x01 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x04 0x01 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x05 0x01 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x06 0x01 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x01 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x02 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x03 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x04 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x05 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x06 0x00 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x01 0x50 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x02 0x50 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x03 0x50 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x04 0x50 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x05 0x50 0x00000000 -usb-storage 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x08 0x06 0x50 0x00000000 -usb-storage 0x000f 0x0ea0 0x06803 0x0200 0x0200 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usbcore 0x0080 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x09 0x00 0x00 0x00000000 -usbnet 0x0003 0x0547 0x2720 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00002a08 -usbnet 0x0003 0x0525 0x1080 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00002cf0 -usbnet 0x0003 0x067b 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00002d70 -usbnet 0x0003 0x067b 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00002d70 -uss720 0x0003 0x047e 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -uss720 0x0003 0x0557 0x2001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -uss720 0x0003 0x0729 0x1284 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -wacom 0x0003 0x056a 0x0010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -wacom 0x0003 0x056a 0x0020 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000001 -wacom 0x0003 0x056a 0x0021 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000002 -wacom 0x0003 0x056a 0x0022 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000003 -wacom 0x0003 0x056a 0x0023 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000004 -wacom 0x0003 0x056a 0x0024 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000005 -stir4200 0x0003 0x066f 0x4200 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 diff --git a/hotplug/usb.handmap b/hotplug/usb.handmap deleted file mode 100644 index 2e628325..00000000 --- a/hotplug/usb.handmap +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file contains modutils format usbmap entries -# with special driver mappings that the kernel -# for some reason does not expose through modutils -# -# Comments get read by bash so dont use punctuation -# RETEST ESPECIALLY AFER CHANGES TO COMMENTS -# -# -# usbcore hub driver metadata passes different metadata than -# policy agents see unless extra data from usbdevfs can be used -# -usbcore 0x0090 0x0000 0x0000 0x0000 0x0000 0x09 0x00 0x00 0x09 0x00 0x00 0x00000000 -# -# recognize keyboard and mouse boot protocols to avoid -# parsing all HID descriptors -# -keybdev 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x03 0x01 0x01 0x00000000 -mousedev 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x03 0x01 0x02 0x00000000 -# -# In the big picture not many HID devices are keyboards or mice -# HID device classes are defined with HID reports and so far -# there is no hotplugging support for hid or the input subsystem -# -# This section mapping HID devices to their input subsystem -# handlers will probably grow a lot -# -# FIXME describe each device by vendor and product name -# PLEASE DO NOT SUBMIT ANY MORE PATCHES WITHOUT SUCH COMMENTS -# -mousedev 0x0003 0x05a4 0x9998 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -joydev 0x0003 0x046d 0xc207 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -joydev 0x0003 0x045e 0x0008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -joydev 0x0003 0x047d 0x3002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -joydev 0x0003 0x07b5 0x9902 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Saitek Cyborg 3D USB -joydev 0x0003 0x06a3 0x0006 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -#Gravis Gamepad Pro -joydev 0x0003 0x0428 0x4001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Wacom tablets need "evdev" but don't depend on it; -# XFree86 wacom_drv needs both. -evdev 0x0003 0x056a 0x0010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0020 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0021 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0022 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0023 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0024 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -evdev 0x0003 0x056a 0x0042 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -usblcd 0x0003 0x1212 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 diff --git a/hotplug/usb.rc b/hotplug/usb.rc deleted file mode 100755 index 33ada7dc..00000000 --- a/hotplug/usb.rc +++ /dev/null @@ -1,391 +0,0 @@ -#!/bin/sh -# vim: syntax=sh -# -# usb.rc This brings the USB subsystem up and down safely. -# -# $Id: usb.rc,v 1.28 2004/09/20 22:30:35 kroah Exp $ -# -# Best invoked via /etc/init.d/hotplug or equivalent, with -# writable /tmp, /usr mounted, and syslogging active. -# -# Bus management is basically unrelated to runlevel changes; it -# relates to physical topology, including possibly hotpluggable -# busses (USB, Cardbus) or controllers. If a bus is physically -# present, it should normally be available. -# -# USB-dependant systems (iMacs, "legacy free" x86 systems, and so on) -# should statically link USB keyboard support into the kernel (USB core, -# EHCI/OHCI/UHCI/..., hid, input, keybdev; and likely mousedev) so the -# system console can't be removed by accident. - - -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -unset I_WANT_A_BROKEN_PS -PS_PERSONALITY=linux - -STATIC_MODULE_LIST= -X11_USBMICE_HACK=false - -# override any of the defaults above? -if [ -f /etc/sysconfig/usb ]; then - . /etc/sysconfig/usb -fi -if [ -f /etc/conf.d/usb ]; then - . /etc/conf.d/usb -fi - - -MOUSE_MODULES="mousedev input" - -# In its currently-recommended configuration, XFree86 3.3.6 always opens -# /dev/input/mice; so mousedev and input must be loaded before X11 starts. -if [ $X11_USBMICE_HACK = true ]; then - STATIC_MODULE_LIST="$MOUSE_MODULES $STATIC_MODULE_LIST" -fi - - -# -# "COLD PLUG" ... recovery from partial USB init that may have happened -# before the OS could really handle hotplug, perhaps because /sbin or -# $HOTPLUG_DIR wasn't available or /tmp wasn't writable. When/if the -# /sbin/hotplug program is invoked then, hotplug event notifications -# get dropped. To make up for such "cold boot" errors, we synthesize -# all the hotplug events we expect to have seen already. They can be -# out of order, and some might be duplicates. -# -# Note that on 2.5 the init filesystem may have loaded some of the more -# essential usb drivers (maybe usb-storage for a boot disk, and hid), -# but we may still need to load less important ones or invoke setup -# scripts that couldn't run earlier. -# -usb_boot_events () -{ - # - # FIXME on 2.5, /sys/bus/usb/devices/* gives all of the - # info we need. Interface hotplug events come from the - # "*:*" files, and device events (do them first) come - # from the others. - # - # don't expect usbmodules to exist!! and remove the - # dependency (below) on usbfs to decide whether we should - # be synthesizing coldplug events. - # - - # synthesize hotplug events if we can - - # make sure the usb agent will run - ACTION=add - PRODUCT=0/0/0 - TYPE= - INTERFACE= - DEVPATH= - DEVFS=/proc/bus/usb - DEVICE= - export ACTION PRODUCT TYPE INTERFACE DEVPATH DEVFS DEVICE - - if [ -d /sys/bus ]; then - if [ -d /sys/bus/usb/devices ]; then - cd /sys/bus/usb/devices - for device in /sys/bus/usb/devices/[0-9]*; do - devlink=$( readlink -f $device ) - DEVPATH=${devlink#/sys} - if [ -f $devlink/../idVendor ]; then - PRODUCT="$(cat $devlink/../idVendor)/$(cat $devlink/../idProduct)/$(cat $devlink/../bcdDevice)" - if [ -f $devlink/../../devnum ] - then - devbus=$( ( echo -n 000 ; cat $devlink/../../devnum ) | grep -o ...\$ ) - devdev=$( ( echo -n 000 ; cat $devlink/../devnum ) | grep -o ...\$ ) - DEVICE="/proc/bus/usb/$devbus/$devdev" - else - DEVICE= - fi - /etc/hotplug/usb.agent - fi - done - fi - else - # we need (non-bash) programs to parse descriptors. - LISTER=`which usbmodules` - if [ "$LISTER" = "" ] || [ ! -f /proc/bus/usb/devices ]; then - echo $"** can't synthesize root hub events" - return - fi - for DEVICE in /proc/bus/usb/*/*; do - /etc/hotplug/usb.agent - done - fi -} - - -maybe_start_usb () -{ - COUNT=0 - - # if USB is partially initted then synthesize "cold plug" events. the - # kernel probably dropped many "hot plug" events, and those it didn't - # drop likely couldn't trigger all the setup actions (kicking daemons, - # dropping config records, and so on). - - # if it's not initted at all (no hcds loaded) no synthesized events - # will be needed, we'll see real ones. knowing that there are no - # hcds available through version-portable logic is a nightmare, so - # assume we synthesize unless "usbfs" is clearly not initted (which - # we currently need when synthesizing, anyway). - - SYNTHESIZE=true - if [ ! -d /proc/bus/usb ]; then - SYNTHESIZE=false - fi - - # if distro hasn't already done part of this ... load core, - # and mount usbfs before the first hotplug agent fires - # (so it'll be available to the agents). - modprobe -q usbcore >/dev/null 2>&1 - if [ -d /proc/bus/usb ]; then - # if it's not mounted, try to mount it - if [ -z "`grep " /proc/bus/usb " /proc/mounts`" ]; then - if grep -q -E "^[^#][^[:space:]]+[[:space:]]+/proc/bus/usb/?[[:space:]]" /etc/fstab; then - mount /proc/bus/usb - else - if grep -q usbfs /proc/filesystems; then - mount -t usbfs usbfs /proc/bus/usb - else - mount -t usbdevfs usbdevfs /proc/bus/usb - fi - fi - fi - fi - - # Load Host Controller Drivers (HCDs) ... this automatically handles - # systems with multiple controllers (EHCI, OHCI, UHCI) without needing - # /proc or tools (lspci -v|grep USB, etc) to do so. If hotplugging - # is enabled on this system, initting a root hub will cause hotplug - # events to fire for every device on the tree at that root. - - # FIXME: some of this should be driven by PCI hotplugging, and have - # the blacklist control which uhci driver gets used (before 2.5). - - # "new style" HCDs ... more common code - modprobe -q ehci-hcd >/dev/null 2>&1 - modprobe -q ohci-hcd >/dev/null 2>&1 - modprobe -q uhci-hcd >/dev/null 2>&1 - - # "old style" HCDs ... more driver-specific bugs - modprobe -q usb-ohci >/dev/null 2>&1 - # NOTE: this prefers "uhci"; you may prefer "usb-uhci". - # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1 - modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1 - - # ... add any non-PCI HCDS here. Examples include the - # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on. - # ohci-hcd can handle some non-pci variants. - - if [ -d /proc/bus/usb ]; then - # If we see there are no busses, we "failed" and - # can report so even if we're partially nonmodular. - # - # NOTE: this fails on older kernels, where usbdevfs had two files - # ('devices' and 'drivers') with no hcds registered, but works on - # newer kernels where usbfs has zero files until hcds register, - # and might not have the 'drivers' file. - COUNT=`ls /proc/bus/usb | wc -l` - if [ $COUNT -lt 2 ]; then - umount /proc/bus/usb - rmmod usbcore >/dev/null 2>&1 - return 1 - fi - - # if USB is fully modular and yet can clean up, - # we know init failed without needing usbfs - elif rmmod usbcore >/dev/null 2>&1; then - return 1 - fi - - # hotplug events didn't fire during booting; - # cope with devices that enumerated earlier - # and may not have been fully configured. - if [ $SYNTHESIZE = true ]; then - sleep 1 - usb_boot_events - fi - - # Some modules are statically loaded, perhaps because they are - # needed to activate filesystem device nodes. - for MODULE in $STATIC_MODULE_LIST; do - modprobe $MODULE - done - - # we did everything we could ... - return 0 -} - -maybe_stop_usb () -{ - # call this multiple times if you had to take down components of the - # USB subsystem by hand; it cleans up whatever can - # be cleaned up, letting the system quiesce further. - - # NOTE: this list of "all USB modules" is unfortunate, but it seems - # inevitable until modutils supports the notion of drivers with use - # counts of zero that shouldn't be removed until after their device - # gets removed. Maybe in 2.5 ... of necessity, the list is partial. - - # disconnect all controllers we can, and kernel drivers - # HCDs first, so most drivers reduce their use counts. - rmmod ehci-hcd >/dev/null 2>&1 - rmmod ohci-hcd >/dev/null 2>&1 - rmmod uhci-hcd >/dev/null 2>&1 - rmmod usb-ohci >/dev/null 2>&1 - rmmod usb-uhci >/dev/null 2>&1 - rmmod uhci >/dev/null 2>&1 - - # user mode code may keep usbfs busy for a while yet ... - - # OK, usbcore won't actually be removed unless there happen to be - # no USB drivers loaded, and usbfs isn't mounted. let's force - # removal of autocleanable modules before trying to rmmod usbcore - rmmod -as -# note: module-init-tools 0.8a doesn't handle "-as" flags - - # Now let's workaround the fact that some USB modules never increase - # their module use counts, so that "rmmod -a" won't unload them. - # (And we can't use "modprobe --autoclean" anyway.) - rmmod acm >/dev/null 2>&1 - rmmod audio >/dev/null 2>&1 - rmmod auerswald >/dev/null 2>&1 - rmmod belkin_sa >/dev/null 2>&1 - rmmod bluetooth >/dev/null 2>&1 - rmmod catc >/dev/null 2>&1 - rmmod CDCEther >/dev/null 2>&1 - rmmod cpia_usb >/dev/null 2>&1 - rmmod cyberjack >/dev/null 2>&1 - rmmod dabusb >/dev/null 2>&1 - rmmod dc2xx >/dev/null 2>&1 - rmmod digi_acceleport >/dev/null 2>&1 - rmmod dsbr100 >/dev/null 2>&1 - rmmod emi26 >/dev/null 2>&1 - rmmod empeg >/dev/null 2>&1 - rmmod ftdi_sio >/dev/null 2>&1 - rmmod hci_usb >/dev/null 2>&1 - rmmod hid >/dev/null 2>&1 - rmmod hpusbscsi >/dev/null 2>&1 - rmmod ibmcam >/dev/null 2>&1 - rmmod iforce >/dev/null 2>&1 - rmmod io_edgeport >/dev/null 2>&1 - rmmod ipaq >/dev/null 2>&1 - rmmod ir-usb >/dev/null 2>&1 - rmmod irda-usb >/dev/null 2>&1 - rmmod kaweth >/dev/null 2>&1 - rmmod keyspan >/dev/null 2>&1 - rmmod keyspan_pda >/dev/null 2>&1 - rmmod kl5kusb105 >/dev/null 2>&1 - rmmod mct_u232 >/dev/null 2>&1 - rmmod mdc800 >/dev/null 2>&1 - rmmod microtek >/dev/null 2>&1 - rmmod omninet >/dev/null 2>&1 - rmmod ov511 >/dev/null 2>&1 - rmmod pegasus >/dev/null 2>&1 - rmmod pl2303 >/dev/null 2>&1 - rmmod printer >/dev/null 2>&1 - rmmod pwc pwcx >/dev/null 2>&1 - rmmod rio500 >/dev/null 2>&1 - rmmod rtl8150 >/dev/null 2>&1 - rmmod scanner >/dev/null 2>&1 - rmmod se401 >/dev/null 2>&1 - rmmod stv680 >/dev/null 2>&1 - rmmod usbhid >/dev/null 2>&1 - rmmod usbkbd >/dev/null 2>&1 - rmmod usbmouse >/dev/null 2>&1 - rmmod usbnet >/dev/null 2>&1 - rmmod usbtest >/dev/null 2>&1 - rmmod usb-storage >/dev/null 2>&1 - rmmod uss720 >/dev/null 2>&1 - rmmod vicam >/dev/null 2>&1 - rmmod visor >/dev/null 2>&1 - rmmod wacom >/dev/null 2>&1 - rmmod whiteheat >/dev/null 2>&1 - - if [ "$STATIC_MODULE_LIST" != "" ]; then - rmmod $STATIC_MODULE_LIST >/dev/null 2>&1 - fi - - # remove the helper modules that some usb modules need - rmmod usbserial >/dev/null 2>&1 - rmmod usbvideo >/dev/null 2>&1 - - # ok, hope that user mode drivers/managers closed their fds. - umount /proc/bus/usb >/dev/null 2>&1 - - rmmod usbcore >/dev/null 2>&1 - - # we did everything we could ... - return 0; -} - -# See how we were called. -case "$1" in - start) - maybe_start_usb - ;; - stop) - maybe_stop_usb - ;; - status) - echo $"USB Status for kernel: " `uname -srm` - echo '' - - if [ -f /proc/bus/usb/devices ]; then - # as noted above: this fails on older kernels, - # where usbfs created files differently. - COUNT=`ls /proc/bus/usb | wc -l` - if [ $COUNT -ge 2 ]; then - COUNT=`expr $COUNT - 2` - echo $"USB up; bus count is $COUNT" - grep "^[TPSI]:" /proc/bus/usb/devices - else - echo $"usbfs partially up; no busses" - fi - echo '' - - echo $"USB Drivers Loaded: " - if [ -f /proc/bus/usb/drivers ]; then - cat /proc/bus/usb/drivers - fi - if [ -d /sys/bus/usb ]; then - ls -1 /sys/bus/usb/drivers - fi - else - echo $"usbfs is unavailable. " - if [ -f /proc/modules ] && grep -F -q usbcore /proc/modules; then - echo $"USB module is loaded. " - else - echo $"USB may be statically linked. " - fi - echo $"If khubd is running, that shows USB is available." - fi - echo '' - - if [ -f /proc/sys/kernel/hotplug ]; then - echo $"khubd/hotplug thread: " - else - echo $"khubd thread:" - fi - ps -l | head -n 1 - ps -Al | grep 'khubd' | grep -v grep - echo '' - - lsmod - echo '' - - # /proc/devices too? "usb", "input", and others ... - - ;; - restart) - # always invoke by absolute path, else PATH=$PATH: - $0 stop && $0 start - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - exit 1 -esac diff --git a/hotplug/usb.usermap b/hotplug/usb.usermap deleted file mode 100644 index 50eb1c8b..00000000 --- a/hotplug/usb.usermap +++ /dev/null @@ -1 +0,0 @@ -# usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap index 88c90398..cd0e0578 100644 --- a/hotplug/usb/libsane.usermap +++ b/hotplug/usb/libsane.usermap @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.22 on Sun Jan 29 13:39:48 2012 +# by sane-desc 3.5 from sane-backends 1.0.23 on Tue Jan 29 10:16:56 2013 # # The entries below are used to detect a USB device and change owner # and permissions on the "device node" used by libusb. @@ -70,6 +70,8 @@ libusbscanner 0x0003 0x03f0 0x1405 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x03f0 0x1705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard ScanJet 7650 libusbscanner 0x0003 0x03f0 0x1805 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Hewlett-Packard ScanJet 4850C +libusbscanner 0x0003 0x03f0 0x1b05 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard ScanJet 3530C | Hewlett-Packard ScanJet 3570C libusbscanner 0x0003 0x03f0 0x2005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard ScanJet 3500C @@ -100,6 +102,8 @@ libusbscanner 0x0003 0x03f0 0x4305 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x03f0 0x4505 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard ScanJet G4050 libusbscanner 0x0003 0x03f0 0x4605 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Hewlett-Packard ScanJet N6310 +libusbscanner 0x0003 0x03f0 0x4705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard LaserJet M1120 MFP libusbscanner 0x0003 0x03f0 0x5617 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard LaserJet M1120n MFP @@ -108,6 +112,58 @@ libusbscanner 0x0003 0x03f0 0x5717 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x0400 0x1000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Mustek BearPaw 1200 | Mustek BearPaw 2400 libusbscanner 0x0003 0x0400 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 5100 +libusbscanner 0x0003 0x040a 0x4025 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 5300 +libusbscanner 0x0003 0x040a 0x4026 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 5500 +libusbscanner 0x0003 0x040a 0x4027 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 5000 +libusbscanner 0x0003 0x040a 0x4028 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 3300 +libusbscanner 0x0003 0x040a 0x4031 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 5 +libusbscanner 0x0003 0x040a 0x4032 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 7 +libusbscanner 0x0003 0x040a 0x403e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 9 +libusbscanner 0x0003 0x040a 0x403f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 5200 +libusbscanner 0x0003 0x040a 0x4041 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 3200 +libusbscanner 0x0003 0x040a 0x4043 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 4100 +libusbscanner 0x0003 0x040a 0x4053 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 6100 +libusbscanner 0x0003 0x040a 0x4054 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 7200 +libusbscanner 0x0003 0x040a 0x4056 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP C110 +libusbscanner 0x0003 0x040a 0x4057 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP C115 +libusbscanner 0x0003 0x040a 0x4058 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 2150 +libusbscanner 0x0003 0x040a 0x4059 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP C310 +libusbscanner 0x0003 0x040a 0x405d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP C315 +libusbscanner 0x0003 0x040a 0x405e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Advent AW10 +libusbscanner 0x0003 0x040a 0x4060 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak Hero Office 6.1 +libusbscanner 0x0003 0x040a 0x4062 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak Hero 7.1 +libusbscanner 0x0003 0x040a 0x4063 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak Hero 5.1 +libusbscanner 0x0003 0x040a 0x4064 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 9200 +libusbscanner 0x0003 0x040a 0x4065 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak ESP 2170 +libusbscanner 0x0003 0x040a 0x4066 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak Hero 9.1 +libusbscanner 0x0003 0x040a 0x4067 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak Hero 3.1 +libusbscanner 0x0003 0x040a 0x406d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Kodak i30 libusbscanner 0x0003 0x040a 0x6001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Kodak i40 @@ -118,6 +174,32 @@ libusbscanner 0x0003 0x040a 0x6003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x040a 0x6004 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Kodak i80 libusbscanner 0x0003 0x040a 0x6005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1210 +libusbscanner 0x0003 0x040a 0x600a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1220 +libusbscanner 0x0003 0x040a 0x600b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1310 +libusbscanner 0x0003 0x040a 0x600c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1320 +libusbscanner 0x0003 0x040a 0x600d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1410 +libusbscanner 0x0003 0x040a 0x600e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1420 +libusbscanner 0x0003 0x040a 0x600f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1440 +libusbscanner 0x0003 0x040a 0x6010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1000 A4 accessory +libusbscanner 0x0003 0x040a 0x6011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1000 A3 accessory +libusbscanner 0x0003 0x040a 0x6012 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i1405 +libusbscanner 0x0003 0x040a 0x601a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i2400 +libusbscanner 0x0003 0x040a 0x601c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i2600 +libusbscanner 0x0003 0x040a 0x601d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Kodak i2800 +libusbscanner 0x0003 0x040a 0x601e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Creative WebCam Go Mini libusbscanner 0x0003 0x041e 0x4007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Lexmark X70 | Lexmark X73 @@ -170,6 +252,8 @@ libusbscanner 0x0003 0x0461 0x0360 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x0461 0x0364 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Medion/Lifetec/Tevion/Cytron MD5345 | Medion/Lifetec/Tevion/Cytron MD6228 | Medion/Lifetec/Tevion/Cytron MD6471 libusbscanner 0x0003 0x0461 0x0377 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Xerox 2400 Onetouch +libusbscanner 0x0003 0x0461 0x038b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Trust Office Scan USB 19200 libusbscanner 0x0003 0x047b 0x1000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Hewlett-Packard ScanJet 4300c/Silitek @@ -248,6 +332,8 @@ libusbscanner 0x0003 0x04a7 0x044c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04a7 0x0474 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Xerox DocuMate272 libusbscanner 0x0003 0x04a7 0x0475 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Xerox DocuMate232 +libusbscanner 0x0003 0x04a7 0x0476 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Xerox DocuMate152 libusbscanner 0x0003 0x04a7 0x0477 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Xerox DocuMate752 @@ -320,9 +406,9 @@ libusbscanner 0x0003 0x04a9 0x160a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04a9 0x160b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon PIXMA MP750 libusbscanner 0x0003 0x04a9 0x1706 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Canon PIXMA MP780 +# Canon PIXMA MP780 | Canon PIXMA MP790 libusbscanner 0x0003 0x04a9 0x1707 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Canon PIXMA MP760 +# Canon PIXMA MP760 | Canon PIXMA MP770 libusbscanner 0x0003 0x04a9 0x1708 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon PIXMA MP150 libusbscanner 0x0003 0x04a9 0x1709 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 @@ -422,12 +508,64 @@ libusbscanner 0x0003 0x04a9 0x1741 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04a9 0x1742 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon PIXMA MX870 libusbscanner 0x0003 0x04a9 0x1743 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MP280 +libusbscanner 0x0003 0x04a9 0x1746 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MP495 +libusbscanner 0x0003 0x04a9 0x1747 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG5100 Series +libusbscanner 0x0003 0x04a9 0x1748 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG5200 Series +libusbscanner 0x0003 0x04a9 0x1749 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG6100 Series +libusbscanner 0x0003 0x04a9 0x174a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG8100 Series +libusbscanner 0x0003 0x04a9 0x174b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX360 +libusbscanner 0x0003 0x04a9 0x174d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX410 +libusbscanner 0x0003 0x04a9 0x174e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX420 +libusbscanner 0x0003 0x04a9 0x174f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX880 Series | Canon PIXMA MX882 | Canon PIXMA MX885 +libusbscanner 0x0003 0x04a9 0x1750 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG2100 Series +libusbscanner 0x0003 0x04a9 0x1751 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG3100 Series +libusbscanner 0x0003 0x04a9 0x1752 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG4100 Series +libusbscanner 0x0003 0x04a9 0x1753 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG5300 Series +libusbscanner 0x0003 0x04a9 0x1754 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG6200 Series +libusbscanner 0x0003 0x04a9 0x1755 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG8200 Series +libusbscanner 0x0003 0x04a9 0x1756 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MP493 +libusbscanner 0x0003 0x04a9 0x1757 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA E500 +libusbscanner 0x0003 0x04a9 0x1758 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX370 Series +libusbscanner 0x0003 0x04a9 0x1759 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA E600 +libusbscanner 0x0003 0x04a9 0x175a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX430 Series +libusbscanner 0x0003 0x04a9 0x175b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX510 Series +libusbscanner 0x0003 0x04a9 0x175c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX710 Series +libusbscanner 0x0003 0x04a9 0x175d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX890 Series +libusbscanner 0x0003 0x04a9 0x175e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan 8800F libusbscanner 0x0003 0x04a9 0x1901 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan LiDE 100 libusbscanner 0x0003 0x04a9 0x1904 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan LiDE 200 libusbscanner 0x0003 0x04a9 0x1905 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon CanoScan 700F +libusbscanner 0x0003 0x04a9 0x1907 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon CanoScan 9000F +libusbscanner 0x0003 0x04a9 0x1908 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan LiDE 110 libusbscanner 0x0003 0x04a9 0x1909 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan LiDE 210 @@ -486,22 +624,28 @@ libusbscanner 0x0003 0x04a9 0x265f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04a9 0x2660 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon imageCLASS MF3240 libusbscanner 0x0003 0x04a9 0x2684 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Canon imageCLASS MF6500 series +# Canon imageCLASS MF6500 series | Canon imageCLASS MF6550 libusbscanner 0x0003 0x04a9 0x2686 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon imageCLASS MF4120 | Canon imageCLASS MF4122 | Canon imageCLASS MF4140 | Canon imageCLASS MF4150 libusbscanner 0x0003 0x04a9 0x26a3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Canon imageCLASS MF4690 +# Canon imageCLASS MF4660 | Canon imageCLASS MF4690 libusbscanner 0x0003 0x04a9 0x26b0 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon imageCLASS MF4010 | Canon imageCLASS MF4018 libusbscanner 0x0003 0x04a9 0x26b4 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon imageCLASS MF4270 libusbscanner 0x0003 0x04a9 0x26b5 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageRUNNER 1020/1024/1025 +libusbscanner 0x0003 0x04a9 0x26e6 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon imageCLASS MF4370dn | Canon imageCLASS MF4380dn libusbscanner 0x0003 0x04a9 0x26ec 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon imageCLASS D480 libusbscanner 0x0003 0x04a9 0x26ed 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon I-SENSYS MF4320d | Canon I-SENSYS MF4330d | Canon imageCLASS MF4350d libusbscanner 0x0003 0x04a9 0x26ee 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageCLASS MF8030 +libusbscanner 0x0003 0x04a9 0x2707 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageCLASS MF4410 +libusbscanner 0x0003 0x04a9 0x2737 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Nikon LS 40 ED | Nikon LS 40 ED | Nikon Coolspan IV libusbscanner 0x0003 0x04b0 0x4000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Nikon LS 50 ED | Nikon Coolscan V ED | Nikon LS 50 ED | Nikon Coolscan V ED @@ -596,6 +740,10 @@ libusbscanner 0x0003 0x04b8 0x0138 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04b8 0x013a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON GT-F730 | EPSON GT-S630 | EPSON Perfection V33 | EPSON Perfection V330 Photo libusbscanner 0x0003 0x04b8 0x0142 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON GT-S55 +libusbscanner 0x0003 0x04b8 0x0143 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON GT-S85 +libusbscanner 0x0003 0x04b8 0x0144 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON CC-600PX | EPSON Stylus CX5100 | EPSON Stylus CX5200 | Epson CX-5200 | Epson CX-5400 | Epson CC-600PX | Epson Stylus CX5100 | Epson Stylus CX5200 libusbscanner 0x0003 0x04b8 0x0801 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON CC-570L | EPSON Stylus CX3100 | EPSON Stylus CX3200 | Epson CX-3200 | Epson CC-570L | Epson Stylus CX3100 | Epson Stylus CX3200 @@ -714,17 +862,17 @@ libusbscanner 0x0003 0x04b8 0x0854 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04b8 0x0855 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON PX-502A | EPSON Stylus NX510 Series | EPSON Stylus SX510W Series | EPSON Stylus TX550W Series | Epson PX-502A | Epson Stylus NX510 Series | Epson Stylus SX510W Series | Epson Stylus TX550W Series libusbscanner 0x0003 0x04b8 0x0856 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# EPSON ME 320 Series | EPSON ME 330 Series | EPSON Stylus NX125 | EPSON Stylus NX127 | EPSON Stylus SX125 | EPSON Stylus TX120 Series +# EPSON ME 320 Series | EPSON ME 330 Series | EPSON Stylus NX125 | EPSON Stylus NX127 | EPSON Stylus SX125 | EPSON Stylus TX120 Series | Epson Stylus SX125 libusbscanner 0x0003 0x04b8 0x085c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# EPSON ME OFFICE 960FWD Series | EPSON Stylus Office BX625FWD | EPSON Stylus Office TX620FWD Series | EPSON Stylus SX620FW Series | EPSON WorkForce 630 Series +# EPSON ME OFFICE 960FWD Series | EPSON PX-603F | EPSON Stylus Office BX625FWD | EPSON Stylus Office TX620FWD Series | EPSON Stylus SX620FW Series | EPSON WorkForce 630 Series libusbscanner 0x0003 0x04b8 0x085d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON ME OFFICE 900WD Series | EPSON PX-503A | EPSON Stylus Office BX525WD | EPSON Stylus NX625 | EPSON Stylus SX525WD | EPSON Stylus TX560WD Series | EPSON WorkForce 625 libusbscanner 0x0003 0x04b8 0x085e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON Stylus Office BX320FW Series | EPSON Stylus Office TX525FW | EPSON WorkForce 520 Series libusbscanner 0x0003 0x04b8 0x085f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# EPSON Artisan 835 | EPSON EP-903A | EPSON EP-903F | EPSON Stylus Photo PX820FWD Series +# EPSON Artisan 835 | EPSON EP-903A | EPSON EP-903F | EPSON Stylus Photo PX820FWD Series | EPSON Stylus Photo TX820FWD Series libusbscanner 0x0003 0x04b8 0x0860 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# EPSON Artisan 725 | EPSON EP-803A | EPSON EP-803AW | EPSON Stylus Photo PX720WD Series +# EPSON Artisan 725 | EPSON EP-803A | EPSON EP-803AW | EPSON Stylus Photo PX720WD Series | EPSON Stylus Photo TX720WD Series libusbscanner 0x0003 0x04b8 0x0861 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON EP-703A | EPSON Stylus Photo PX660 Series libusbscanner 0x0003 0x04b8 0x0862 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 @@ -734,8 +882,52 @@ libusbscanner 0x0003 0x04b8 0x0863 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04b8 0x0864 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # EPSON ME OFFICE 520 Series | EPSON Stylus NX220 Series | EPSON Stylus SX218 | EPSON Stylus TX220 Series libusbscanner 0x0003 0x04b8 0x0865 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# EPSON AcuLaser MX20DN | EPSON AcuLaser MX20DNF +# EPSON AcuLaser MX20DN | EPSON AcuLaser MX20DNF | EPSON AcuLaser MX21DNF libusbscanner 0x0003 0x04b8 0x0866 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-1600F +libusbscanner 0x0003 0x04b8 0x0869 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-673F | EPSON Stylus Office BX925FWD | EPSON WorkForce 840 Series +libusbscanner 0x0003 0x04b8 0x086a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Stylus Office BX305FW Plus | EPSON WorkForce 435 +libusbscanner 0x0003 0x04b8 0x0870 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON K200 Series +libusbscanner 0x0003 0x04b8 0x0871 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON K300 Series | EPSON WorkForce K301 +libusbscanner 0x0003 0x04b8 0x0872 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON L200 Series +libusbscanner 0x0003 0x04b8 0x0873 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-704A +libusbscanner 0x0003 0x04b8 0x0878 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Artisan 837 | EPSON EP-904A | EPSON EP-904F | EPSON Stylus Photo PX830FWD Series +libusbscanner 0x0003 0x04b8 0x0879 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Artisan 730 Series | EPSON EP-804A | EPSON EP-804AR | EPSON EP-804AW | EPSON Stylus Photo PX730WD Series +libusbscanner 0x0003 0x04b8 0x087b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-1700F +libusbscanner 0x0003 0x04b8 0x087c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-B750F | EPSON WP-4511 | EPSON WP-4515 | EPSON WP-4521 | EPSON WP-4525 | EPSON WP-4530 | EPSON WP-4535 | EPSON WP-4540 | EPSON WP-4545 +libusbscanner 0x0003 0x04b8 0x087d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-403A +libusbscanner 0x0003 0x04b8 0x087f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-434A | EPSON Stylus NX330 Series | EPSON Stylus SX430W Series | EPSON Stylus TX430W Series +libusbscanner 0x0003 0x04b8 0x0880 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME OFFICE 535 | EPSON PX-404A | EPSON Stylus TX235 +libusbscanner 0x0003 0x04b8 0x0881 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME 340 Series | EPSON Stylus NX130 Series | EPSON Stylus SX130 Series | EPSON Stylus TX130 Series +libusbscanner 0x0003 0x04b8 0x0883 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Stylus NX430W Series | EPSON Stylus SX440W Series | EPSON Stylus TX435W +libusbscanner 0x0003 0x04b8 0x0884 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Stylus NX230 Series | EPSON Stylus SX235W | EPSON Stylus TX230W Series +libusbscanner 0x0003 0x04b8 0x0885 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Stylus Office BX635FWD | EPSON WorkForce 645 +libusbscanner 0x0003 0x04b8 0x088f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME OFFICE 940FW Series | EPSON Stylus Office BX630FW Series | EPSON WorkForce 545 +libusbscanner 0x0003 0x04b8 0x0890 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Stylus Office BX535WD | EPSON Stylus NX635 | EPSON Stylus SX535WD +libusbscanner 0x0003 0x04b8 0x0891 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON Stylus Office BX935FWD | EPSON WorkForce 845 +libusbscanner 0x0003 0x04b8 0x0892 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-774A +libusbscanner 0x0003 0x04b8 0x0893 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Fujitsu fi-4010CU libusbscanner 0x0003 0x04c5 0x1029 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Fujitsu fi-4120C @@ -810,28 +1002,22 @@ libusbscanner 0x0003 0x04c5 0x117f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04c5 0x119d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Fujitsu fi-6800-CGA libusbscanner 0x0003 0x04c5 0x119e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6900 -libusbscanner 0x0003 0x04c5 0x119f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6900-CGA -libusbscanner 0x0003 0x04c5 0x11a0 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Fujitsu ScanSnap S1500 | Fujitsu ScanSnap S1500M libusbscanner 0x0003 0x04c5 0x11a2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Fujitsu ScanSnap S1300 libusbscanner 0x0003 0x04c5 0x11ed 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6125 -libusbscanner 0x0003 0x04c5 0x11ee 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6225 -libusbscanner 0x0003 0x04c5 0x11ef 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6145 +# Fujitsu fi-6140Z libusbscanner 0x0003 0x04c5 0x11f1 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6245 +# Fujitsu fi-6240Z libusbscanner 0x0003 0x04c5 0x11f2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6135 +# Fujitsu fi-6130Z libusbscanner 0x0003 0x04c5 0x11f3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Fujitsu fi-6235 +# Fujitsu fi-6230Z libusbscanner 0x0003 0x04c5 0x11f4 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Fujitsu fi-6110 libusbscanner 0x0003 0x04c5 0x11fc 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Fujitsu fi-5950C +libusbscanner 0x0003 0x04c5 0x1213 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Konica e-mini libusbscanner 0x0003 0x04c8 0x0722 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Panasonic KV-S2026C @@ -846,6 +1032,12 @@ libusbscanner 0x0003 0x04da 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04da 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Panasonic KV-S2028C libusbscanner 0x0003 0x04da 0x100a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Panasonic KV-S4085C +libusbscanner 0x0003 0x04da 0x100c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Panasonic KV-S4065C +libusbscanner 0x0003 0x04da 0x100d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Panasonic KV-S7075C +libusbscanner 0x0003 0x04da 0x100e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Panasonic KV-SS080 libusbscanner 0x0003 0x04da 0x100f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Panasonic KV-S1045C @@ -860,6 +1052,8 @@ libusbscanner 0x0003 0x04e8 0x3419 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04e8 0x341b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX4725-FN libusbscanner 0x0003 0x04e8 0x341f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-2160 +libusbscanner 0x0003 0x04e8 0x3425 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4500 libusbscanner 0x0003 0x04e8 0x3426 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung CLX-3170fn | Samsung CLX-3175FW @@ -868,6 +1062,8 @@ libusbscanner 0x0003 0x04e8 0x342a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04e8 0x342b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4824 libusbscanner 0x0003 0x04e8 0x342c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4828FN (4x28 Series) +libusbscanner 0x0003 0x04e8 0x342d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4300 libusbscanner 0x0003 0x04e8 0x342e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4600 @@ -876,6 +1072,12 @@ libusbscanner 0x0003 0x04e8 0x3433 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04e8 0x3434 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4825FN libusbscanner 0x0003 0x04e8 0x343c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-3185 +libusbscanner 0x0003 0x04e8 0x343d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4623FW +libusbscanner 0x0003 0x04e8 0x3440 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-3205W +libusbscanner 0x0003 0x04e8 0x3441 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Brother MFC-3100C libusbscanner 0x0003 0x04f9 0x010e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Brother MFC-5100C @@ -1144,10 +1346,8 @@ libusbscanner 0x0003 0x0638 0x0a13 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x0638 0x0a15 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Avision DS610CU Scancopier | Minolta-QMS SC-215 | OKI S700 Scancopier libusbscanner 0x0003 0x0638 0x0a16 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Avision AV600U Plus +# Avision AV610 | Avision AV600U Plus libusbscanner 0x0003 0x0638 0x0a18 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Avision AV610 -libusbscanner 0x0003 0x0638 0x0a19 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Avision AV220 libusbscanner 0x0003 0x0638 0x0a23 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Avision AV210 diff --git a/init.d/bluetooth b/init.d/bluetooth index 9280f93b..7328cd24 100755 --- a/init.d/bluetooth +++ b/init.d/bluetooth @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r1,v 1.1 2012/01/09 23:01:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r2,v 1.1 2012/07/06 18:41:14 pacho Exp $ depend() { after coldplug @@ -9,11 +9,13 @@ depend() { } start() { - ebegin "Udev coldplug of bluetooth devices" - udevadm trigger --subsystem-match=bluetooth --action=add + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec /usr/sbin/bluetoothd eend $? } stop() { - return 0 + ebegin "Shutting down ${SVCNAME}" + start-stop-daemon --stop --quiet --exec /usr/sbin/bluetoothd + eend $? } diff --git a/init.d/device-mapper b/init.d/device-mapper index 0b62d662..404c269b 100755 --- a/init.d/device-mapper +++ b/init.d/device-mapper @@ -1,30 +1,111 @@ #!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.67-r1,v 1.1 2010/06/09 22:41:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2,v 1.1 2012/05/27 07:05:22 robbat2 Exp $ depend() { - # necessary for services when using baselayout-2 - # but conflict for baselayout-1 - if [ -e /etc/init.d/root ] ; then - before checkfs fsck - after modules - fi # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that # means dmeventd is NOT notified, as it cannot be safely running - before dmeventd + before dmeventd checkfs fsck + after modules +} + +dm_in_proc() { + local retval=0 + for x in devices misc ; do + grep -qs 'device-mapper' /proc/${x} + retval=$((${retval} + $?)) + done + return ${retval} } +# char **get_new_dm_volumes(void) +# +# Return dmsetup commands to setup volumes +get_new_dm_volumes() { + local volume params + + # Filter comments and blank lines + grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ + while read volume params ; do + # If it exists, skip it + dmvolume_exists "${volume%:}" && continue + # Assemble the command to run to create volume + echo "echo ${params} | /sbin/dmsetup create ${volume%:}" + done + + return 0 +} + +# int dmvolume_exists(volume) +# +# Return true if volume exists in DM table +dmvolume_exists() { + local x line volume=$1 + + [ -z "${volume}" ] && return 1 + + /sbin/dmsetup ls 2>/dev/null | \ + while read line ; do + for x in ${line} ; do + # the following conditonal return only breaks out + # of the while loop, as it is running in a pipe. + [ "${x}" = "${volume}" ] && return 1 + # We only want to check the volume name + break + done + done + + # if 1 was returned from the above loop, then indicate that + # volume exists + [ $? = 1 ] && return 0 + + # otherwise the loop exited normally and the volume does not + # exist + return 1 +} + +# int is_empty_dm_volume(volume) +# +# Return true if the volume exists in DM table, but is empty/non-valid +is_empty_dm_volume() { + local table volume=$1 + + set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:") + [ "${volume}" = "$1" -a -z "$2" ] +} + + start() { - if [ ! -e /etc/init.d/root ] ; then - eerror "The ${SVCNAME} init script is written for baselayout-2" - eerror "Please do not use it with baselayout-1" - return 1 + if [ -e /proc/modules ] && ! dm_in_proc ; then + modprobe dm-mod 2>/dev/null fi + # Ensure the dirs exist for locking and running + checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm - local f=/lib64/rcscripts/addons/dm-start.sh - if [ -r "$f" ]; then - ( . "$f" ) + local x volume + + if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then + [ -n "$(get_new_dm_volumes)" ] && \ + einfo " Setting up device-mapper volumes:" + + get_new_dm_volumes | \ + while read x ; do + [ -n "${x}" ] || continue + + volume="${x##* }" + + ebegin " Creating volume: ${volume}" + if ! eval "${x}" >/dev/null 2>/dev/null ; then + eend 1 " Error creating volume: ${volume}" + # dmsetup still adds an empty volume in some cases, + # so lets remove it + is_empty_dm_volume "${volume}" && \ + /sbin/dmsetup remove "${volume}" 2>/dev/null + else + eend 0 + fi + done fi } diff --git a/init.d/hotplug b/init.d/hotplug deleted file mode 100755 index 59f11232..00000000 --- a/init.d/hotplug +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc.empty,v 1.3 2005/01/27 18:29:26 wolf31o2 Exp $ - -# -# nothing here anymore. Please use the coldplug package if you really want to -# load modules for devices that are discovered by your kernel before init runs. -# -# However, please realize that if you have any problems, the developers -# recommend just using the modules.autoload functionality to handle this in a -# much simpler manner. -# -# Comments, flames, and fine beer should be directed at gregkh@gentoo.org -# - -depend() { - need modules -} - -start () { - # just verify that people build their kernel with hotplug support. - if [ ! -f /proc/sys/kernel/hotplug ] ; then - eerror "CONFIG_HOTPLUG not enabled for this kernel!" - return 1 - fi - # This unpacks any firmware tarballs. Used for LiveCD. - if [ -e /lib/firmware.tar.bz2 ] - then - ebegin "Unpacking hotplug firmware" - tar xjf /lib/firmware.tar.bz2 -C /lib/firmware - eend 0 - fi -} diff --git a/init.d/lvm b/init.d/lvm index d840e7b7..a06aa0bb 100755 --- a/init.d/lvm +++ b/init.d/lvm @@ -1,39 +1,96 @@ #!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.67-r1,v 1.1 2010/06/09 22:41:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.95-r2,v 1.1 2012/05/27 07:05:22 robbat2 Exp $ depend() { - if [ -f /etc/init.d/sysfs ]; then - # on baselayout-1 this causes - # dependency-cycles with checkroot (before *) - before checkfs fsck - after modules device-mapper - fi - # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that - # means dmeventd is NOT notified, as it cannot be safely running - before dmeventd + use dmeventd + before checkfs fsck + after dmeventd modules device-mapper } -run_addon() { - local f=/lib64/rcscripts/addons/$1.sh - if [ -r "$f" ]; then - ( . "$f" ) - fi +config='global { locking_dir = "/run/lock/lvm" }' + +dm_in_proc() { + local retval=0 + for x in devices misc ; do + grep -qs 'device-mapper' /proc/${x} + retval=$((${retval} + $?)) + done + return ${retval} } start() { - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". + # LVM support for /usr, /home, /opt .... + # This should be done *before* checking local + # volumes, or they never get checked. + + # NOTE: Add needed modules for LVM or RAID, etc + # to /etc/modules.autoload if needed + for lvm_path in /bin/lvm /sbin/lvm ; do + [ -x "$lvm_path" ] && break + done + if [ ! -x "$lvm_path" ]; then + eerror "Cannot find lvm binary in /sbin or /bin!" return 1 fi - - run_addon lvm-start + if [ -z "${CDBOOT}" ] ; then + if [ -e /proc/modules ] && ! dm_in_proc ; then + modprobe dm-mod 2>/dev/null + fi + if [ -d /proc/lvm ] || dm_in_proc ; then + ebegin "Setting up the Logical Volume Manager" + #still echo stderr for debugging + lvm_commands="#! ${lvm_path} --config '${config}'\n" + # Extra PV find pass because some devices might not have been available until very recently + lvm_commands="${lvm_commands}pvscan\n" + # Now make the nodes + lvm_commands="${lvm_commands}vgscan --mknodes\n" + # And turn them on! + lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" + # Order of this is important, have to work around dash and LVM readline + printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null + eend $? "Failed to setup the LVM" + fi + fi } stop() { - run_addon lvm-stop + for lvm_path in /bin/lvm /sbin/lvm ; do + [ -x "$lvm_path" ] && break + done + if [ ! -x "$lvm_path" ]; then + eerror "Cannot find lvm binary in /sbin or /bin!" + return 1 + fi +# Stop LVM2 +if [ -x /sbin/vgs ] && \ + [ -x /sbin/vgchange ] && \ + [ -x /sbin/lvchange ] && \ + [ -f /etc/lvmtab -o -d /etc/lvm ] && \ + [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ] +then + einfo "Shutting down the Logical Volume Manager" + + + VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix 2> /dev/null) + + if [ "$VGS" ] + then + ebegin " Shutting Down LVs & VGs" + #still echo stderr for debugging + lvm_commands="#! ${lvm_path} --config '${config}'\n" + # Extra PV find pass because some devices might not have been available until very recently + lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n" + # Now make the nodes + lvm_commands="${lvm_commands}vgchange --sysinit -a ln\n" + # Order of this is important, have to work around dash and LVM readline + printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null + eend $? "Failed" + fi + + einfo "Finished Shutting down the Logical Volume Manager" +fi } # vim:ts=4 diff --git a/init.d/udev b/init.d/udev index 1912c8be..6b690447 100755 --- a/init.d/udev +++ b/init.d/udev @@ -1,22 +1,23 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -command=/sbin/udevd command_args="--daemon ${udev_opts}" -description="Run udevd and create the device-nodes" +description="udev manages device permissions and symbolic links in /dev" +extra_started_commands="reload" +description_reload="Reload the udev rules and databases" -persistent_cd_disable="${persistent_cd_disable:-no}" -persistent_net_disable="${persistent_net_disable:-no}" rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} udev_debug="${udev_debug:-no}" udev_monitor="${udev_monitor:-no}" udev_monitor_keep_running="${udev_monitor_keep_running:-no}" udev_settle_timeout="${udev_settle_timeout:-60}" -kv_min="${kb_min:-2.6.32}" +kv_min="${kv_min:-2.6.34}" depend() { + # we depend on udev-mount explicitly, not dev-mount generic as we don't + # want mdev as a dev-mount provider to come in. provide dev need sysfs udev-mount before checkfs fsck @@ -69,31 +70,37 @@ check_kernel() return 0 } -get_rundir() +start_pre() { - echo $(udevadm info --run) -} + check_kernel || return 1 + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" >/proc/sys/kernel/hotplug + fi -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} + # load unix domain sockets if built as module, Bug #221253 + # and not yet loaded, Bug #363549 + if [ ! -e /proc/net/unix ]; then + if ! modprobe unix; then + eerror "Cannot load the unix domain socket module" + return 1 + fi + fi -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=$(get_rundir)/rules.d/"$1" bname="$1" onoff="$2" + if yesno "${udev_debug}"; then + command_args="${command_args} --debug 2> /run/udevdebug.log" + fi - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" + bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd" + for f in ${bins}; do + if [ -x "$f" ] && ! [ -L "$f" ]; then + command="$f" + fi + done + if [ -z "$command" ]; then + eerror "Unable to find udev executable." + return 1 fi + return 0 } is_service_enabled() @@ -107,52 +114,23 @@ is_service_enabled() return 1 } -start_pre() +disable_oldnet_hotplug() { - if [ -d /run ]; then - checkpath -d -m 0755 -o root:root -q /run/udev - fi - if is_service_enabled network; then # disable network hotplugging - local f="$(get_rundir)/rules.d/90-network.rules" + local f="/run/udev/rules.d/90-network.rules" echo "# This file disables network hotplug events calling" >> "${f}" echo "# old-style openrc net scripts" >> "${f}" echo "# as we use /etc/init.d/network to set up our network" >> "${f}" fi - - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - /lib/udev/write_root_link_rule - - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable} - - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi - - # load unix domain sockets if built as module, Bug #221253 - # and not yet loaded, Bug #363549 - if [ ! -e /proc/net/unix ]; then - if ! modprobe unix; then - eerror "Cannot load the unix domain socket module" - fi - fi - - if yesno "${udev_debug}"; then - command_args="${command_args} --debug 2> $(get_rundir)/udev.log" - fi } start_udevmonitor() { yesno "${udev_monitor}" || return 0 - udevmonitor_log="$(get_rundir)/udevmonitor.log" - udevmonitor_pid="$(get_rundir)/udevmonitor.pid" + udevmonitor_log=/run/udevmonitor.log + udevmonitor_pid=/run/udevmonitor.pid einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events" start-stop-daemon --start --stdout "${udevmonitor_log}" \ @@ -175,70 +153,13 @@ populate_dev() udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot - # (in /etc/fstab and elsewhere) - # ebegin "Waiting for uevents to be processed" udevadm settle --timeout=${udev_settle_timeout} eend $? - udevadm control --property=do_not_run_plug_service= return 0 } -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - stop_udevmonitor() { yesno "${udev_monitor}" || return 0 @@ -265,11 +186,24 @@ display_hotplugged_services() start_post() { + disable_oldnet_hotplug start_udevmonitor populate_dev - check_persistent_net - check_udev_works || cleanup stop_udevmonitor display_hotplugged_services return 0 } + +stop() +{ + ebegin "Stopping ${name:-$RC_SVCNAME}" + udevadm control --exit + eend $? "Failed to stop $RC_SVCNAME" +} + +reload() +{ + ebegin "reloading udev rules and databases" + udevadm control --reload + eend $? +} diff --git a/init.d/udev-mount b/init.d/udev-mount index f8700391..a8683401 100755 --- a/init.d/udev-mount +++ b/init.d/udev-mount @@ -1,8 +1,8 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -description="mount devtmpfs or tmpfs on /dev" +description="mount devtmpfs on /dev" depend() { @@ -12,22 +12,42 @@ depend() mount_dev_directory() { - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 + local mounted=false fstab=false action=--mount msg=Mounting rc=0 + + if ! grep -qs devtmpfs /proc/filesystems; then + eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration" + eerror "for this version of udev to run successfully." + eerror "This requires immediate attention." + if ! mountinfo -q /dev; then + mount -n -t tmpfs dev /dev + busybox mdev -s + mkdir /dev/pts + fi + return 1 fi - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs + # Is /dev already a mounted devtmpfs? + mountinfo -q -f devtmpfs /dev && mounted=true + + # If an entry for /dev exists in fstab it must be a devtmpfs. + fstabinfo -q -t devtmpfs /dev && fstab=true + # No options are processed here as they should all be in /etc/fstab + if $fstab; then + $mounted && action=--remount && msg=Remounting + ebegin "$msg /dev according to /etc/fstab" + fstabinfo $action /dev + rc=$? + elif ! $mounted; then + ebegin "Mounting /dev" # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev + mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev + rc=$? + else + ebegin "Using /dev mounted from kernel" fi - eend $? + + eend $rc } seed_dev() @@ -43,14 +63,12 @@ seed_dev() # udevd will dup its stdin/stdout/stderr to /dev/null # and we do not want a file which gets buffered in ram [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - ${HAVE_SELINUX} && restorecon /dev/null # so udev can add its start-message to dmesg [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 # Create problematic directories mkdir -p /dev/pts /dev/shm - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null return 0 } @@ -58,14 +76,6 @@ start() { mount_dev_directory || return 1 - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - HAVE_SELINUX=true - restorecon /dev > /selinux/null - else - HAVE_SELINUX=false - fi - seed_dev return 0 } diff --git a/init.d/udev-postmount b/init.d/udev-postmount deleted file mode 100755 index d689681f..00000000 --- a/init.d/udev-postmount +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -udev_version() -{ - echo $(udevadm --version) -} - -depend() -{ - need localmount - if [ $(udev_version) -lt 175 ]; then - after dbus # for trigger failed - fi - keyword -vserver -lxc -} - -dir_writeable() -{ - touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ -} - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() -{ - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - local file dest - for file in "${RUNDIR}"/tmp-rules--*; do - dest=${file##*tmp-rules--} - [ "$dest" = '*' ] && break - type=${dest##70-persistent-} - type=${type%%.rules} - ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" - eend $? "Failed moving persistent rules!" - done -} - -start() -{ - RUNDIR=$(udevadm info --run) - # check if this system uses udev - [ -d "${RUNDIR}" ] || return 0 - - einfo "Doing udev cleanups" - - if [ $(udev_version) -lt 175 ]; then - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - fi - - # store persistent-rules that got created while booting - # when / was still read-only - store_persistent_rules -} - -stop() -{ - return 0 -} - -# vim:ts=4 diff --git a/layman/layman.cfg b/layman/layman.cfg index ea68e66e..e5c7c724 100644 --- a/layman/layman.cfg +++ b/layman/layman.cfg @@ -1,5 +1,4 @@ [MAIN] - #----------------------------------------------------------- # Defines the directory where overlays should be installed @@ -14,16 +13,23 @@ cache : %(storage)s/cache #----------------------------------------------------------- # The list of locally installed overlays -local_list: %(storage)s/overlays.xml +installed: %(storage)s/installed.xml + +# This has been renamed from the following +# old name : value use it for updating to new one above +# local_list: %(storage)s/overlays.xml +# either rename the overlays.xml file to installed.xml +# or edit the value above to the current name of your +# installed overlay(s) file. #----------------------------------------------------------- -# Path to the make.conf file that should be modified by +# Path to the make.conf file that should be modified by # layman make_conf : %(storage)s/make.conf #----------------------------------------------------------- -# URLs of the remote lists of overlays (one per line) or +# URLs of the remote lists of overlays (one per line) or # local overlay definitions # #overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml @@ -33,6 +39,15 @@ make_conf : %(storage)s/make.conf overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml +#----------------------------------------------------------- +# The directory to scan for xml overlay definition files to include +# in the list of available overlays. They are automatically added to the +# "overlays" parameter above. Use either method, but do not add the same +# definition in both. +# + +#overlay_defs : /etc/layman/overlays + #----------------------------------------------------------- # Proxy support # If unset, layman will use the http_proxy environment variable. @@ -46,7 +61,7 @@ overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml # Hopefully this description eases the double negation trouble: # # nocheck : yes -# - Accepts completene overlay entries without warnings +# - Accepts complete overlay entries without warnings # - Lists overlays of type foo (say Git) even with no foo installed # # nocheck : no @@ -65,6 +80,32 @@ nocheck : yes # #umask : 0022 +#----------------------------------------------------------- +# News reporting settings +# +# This is for when layman is adding/syncing overlays. +# It is required for GLEP 42. +# Currently there are 3 possible values: +# portage, pkgcore, custom +# +# portage: uses portage to report news only from overlay(s) in +# versions >=2.2.0_alpha72 or >=2.1.10.32 +# or all repositories (including gentoo) for older portage versions. +# pkgcore: does not yet support glep 42, no news is reported +# custom: requires that you provide a suitable python function +# to 'custom_news_func' using the api's config.set_option() +# or define the python package to import it from in custom_news_pkg + +news_reporter: portage + +#----------------------------------------------------------- +# News reporting custom function setting +# +# the pkg name that contains the layman_news_function() +# for it to import and use. It must be found in PYTHONPATH + +#custom_news_pkg : + #----------------------------------------------------------- # Command overrides # @@ -87,3 +128,73 @@ nocheck : yes #rsync_command : /usr/bin/rsync #svn_command : /usr/bin/svn #tar_command : /bin/tar +#g-common_command : /usr/bin/g-common + + +#----------------------------------------------------------- +# Command additional options +# +# These commnad options will be added to the above commands +# when the overlay is added or synced. +# +# note: there are some options hardcoded in the backend +# scripts already. All VCS types listed here are +# for general consistency. Options may not be available +# or recommended for all VCS types and/or add/sync operations. +# Any options defined here are deemed: +# "Use at your own risk" +# and are not supported. +# +# eg: +# svn_addopts : --config-option=config:miscellany:use-commit-times=yes +# + +#bzr_addopts : +#bzr_syncopts : +#cvs_addopts : +#cvs_syncopts : +#darcs_addopts : +#darcs_syncopts : +#git_addopts : +#git_syncopts : +#mercurial_addopts : +#mercurial_syncopts : +#rsync_syncopts : +#svn_addopts : +#svn_syncopts : +#g-common_generateopts : +#g-common_syncopts : + + +#----------------------------------------------------------- +# Per VCS Post Sync/Add hooks +# +# The listed commands will be run after every add/sync operation. +# All on one line If the repo path is needed, use a %cwd= in +# where you want the path substituted in. It will be detected +# and replaced with the correct path. +# +# eg: git_postsync : git-set-file-times +# eg: git_postsync : git-set-file-times %cwd= +# eg: git_postsync : git-set-file-times path=%cwd= +# +#bzr_postsync : +#cvs_postsync : +#darcs_postsync : +#git_postsync : +#mercurial_postsync : +#rsync_postsync : +#svn_postsync : +#tar_postsync : +#g-common_postsync : + + +#----------------------------------------------------------- +# Layman user info +# +# The user name and email to use when adding new repos +# +#git_user : layman +#git_email : layman@localhost + + diff --git a/layman/overlays/.keep_app-portage_layman-0 b/layman/overlays/.keep_app-portage_layman-0 new file mode 100644 index 00000000..e69de29b diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf index cc44c05d..62d62a07 100644 --- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf +++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf @@ -1,2 +1,2 @@ -/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3 diff --git a/lvm/lvm.conf b/lvm/lvm.conf index cec25782..de3077e8 100644 --- a/lvm/lvm.conf +++ b/lvm/lvm.conf @@ -51,9 +51,11 @@ devices { # Be careful if there there are symbolic links or multiple filesystem # entries for the same device as each name is checked separately against - # the list of patterns. The effect is that if any name matches any 'a' - # pattern, the device is accepted; otherwise if any name matches any 'r' - # pattern it is rejected; otherwise it is accepted. + # the list of patterns. The effect is that if the first pattern in the + # list to match a name is an 'a' pattern for any of the names, the device + # is accepted; otherwise if the first pattern in the list to match a name + # is an 'r' pattern for any of the names it is rejected; otherwise it is + # accepted. # Don't have more than one filter line active at once: only one gets used. @@ -86,6 +88,9 @@ devices { # It is safe to delete the contents: the tools regenerate it. # (The old setting 'cache' is still respected if neither of # these new ones is present.) + # N.B. If obtain_device_list_from_udev is set to 1 the list of + # devices is instead obtained from udev and any existing .cache + # file is removed. cache_dir = "/etc/lvm/cache" cache_file_prefix = "" @@ -103,6 +108,11 @@ devices { # 1 enables; 0 disables. sysfs_scan = 1 + # By default, LVM2 will ignore devices used as component paths + # of device-mapper multipath devices. + # 1 enables; 0 disables. + multipath_component_detection = 1 + # By default, LVM2 will ignore devices used as components of # software RAID (md) devices by looking for md superblocks. # 1 enables; 0 disables. @@ -185,35 +195,38 @@ devices { # This section allows you to configure the way in which LVM selects # free space for its Logical Volumes. -#allocation { -# When searching for free space to extend an LV, the "cling" -# allocation policy will choose space on the same PVs as the last -# segment of the existing LV. If there is insufficient space and a -# list of tags is defined here, it will check whether any of them are -# attached to the PVs concerned and then seek to match those PV tags -# between existing extents and new extents. -# Use the special tag "@*" as a wildcard to match any PV tag. -# -# Example: LVs are mirrored between two sites within a single VG. -# PVs are tagged with either @site1 or @site2 to indicate where -# they are situated. -# -# cling_tag_list = [ "@site1", "@site2" ] -# cling_tag_list = [ "@*" ] -# -# Changes made in version 2.02.85 extended the reach of the 'cling' -# policies to detect more situations where data can be grouped -# onto the same disks. Set this to 0 to revert to the previous -# algorithm. -# -# maximise_cling = 1 -# -# Set to 1 to guarantee that mirror logs will always be placed on -# different PVs from the mirror images. This was the default -# until version 2.02.85. -# -# mirror_logs_require_separate_pvs = 0 -#} +allocation { + + # When searching for free space to extend an LV, the "cling" + # allocation policy will choose space on the same PVs as the last + # segment of the existing LV. If there is insufficient space and a + # list of tags is defined here, it will check whether any of them are + # attached to the PVs concerned and then seek to match those PV tags + # between existing extents and new extents. + # Use the special tag "@*" as a wildcard to match any PV tag. + + # Example: LVs are mirrored between two sites within a single VG. + # PVs are tagged with either @site1 or @site2 to indicate where + # they are situated. + + # cling_tag_list = [ "@site1", "@site2" ] + # cling_tag_list = [ "@*" ] + + # Changes made in version 2.02.85 extended the reach of the 'cling' + # policies to detect more situations where data can be grouped + # onto the same disks. Set this to 0 to revert to the previous + # algorithm. + maximise_cling = 1 + + # Set to 1 to guarantee that mirror logs will always be placed on + # different PVs from the mirror images. This was the default + # until version 2.02.85. + mirror_logs_require_separate_pvs = 0 + + # Set to 1 to guarantee that thin pool metadata will always + # be placed on different PVs from the pool data. + thin_pool_metadata_require_separate_pvs = 0 +} # This section that allows you to configure the nature of the # information that LVM2 reports. @@ -380,7 +393,7 @@ global { # Local non-LV directory that holds file-based locks while commands are # in progress. A directory like /tmp that may get wiped on reboot is OK. - locking_dir = "/var/lock/lvm" + locking_dir = "/run/lock/lvm" # Whenever there are competing read-only and read-write access requests for # a volume group's metadata, instead of always granting the read-only @@ -424,8 +437,12 @@ global { # "mirror" - The original RAID1 implementation provided by LVM2/DM. It is # characterized by a flexible log solution (core, disk, mirrored) # and by the necessity to block I/O while reconfiguring in the - # event of a failure. Snapshots of this type of RAID1 can be - # problematic. + # event of a failure. + # + # There is an inherent race in the dmeventd failure handling + # logic with snapshots of devices using this type of RAID1 that + # in the worst case could cause a deadlock. + # Ref: https://bugzilla.redhat.com/show_bug.cgi?id=817130#c10 # # "raid1" - This implementation leverages MD's RAID1 personality through # device-mapper. It is characterized by a lack of log options. @@ -433,10 +450,45 @@ global { # on the same device as the image - no separate devices are # required.) This mirror implementation does not require I/O # to be blocked in the kernel in the event of a failure. + # This mirror implementation is not cluster-aware and cannot be + # used in a shared (active/active) fashion in a cluster. # # Specify the '--type ' option to override this default # setting. mirror_segtype_default = "mirror" + + # The default format for displaying LV names in lvdisplay was changed + # in version 2.02.89 to show the LV name and path separately. + # Previously this was always shown as /dev/vgname/lvname even when that + # was never a valid path in the /dev filesystem. + # Set to 1 to reinstate the previous format. + # + # lvdisplay_shows_full_device_path = 0 + + # Whether to use (trust) a running instance of lvmetad. If this is set to + # 0, all commands fall back to the usual scanning mechanisms. When set to 1 + # *and* when lvmetad is running (it is not auto-started), the volume group + # metadata and PV state flags are obtained from the lvmetad instance and no + # scanning is done by the individual commands. In a setup with lvmetad, + # lvmetad udev rules *must* be set up for LVM to work correctly. Without + # proper udev rules, all changes in block device configuration will be + # *ignored* until a manual 'vgscan' is performed. + use_lvmetad = 0 + + # Full path of the utility called to check that a thin metadata device + # is in a state that allows it to be used. + # Each time a thin pool needs to be activated or after it is deactivated + # this utility is executed. The activation will only proceed if the utility + # has an exit status of 0. + # Set to "" to skip this check. (Not recommended.) + # The thin tools are available as part of the device-mapper-persistent-data + # package from https://github.com/jthornber/thin-provisioning-tools. + # + thin_check_executable = "/sbin/thin_check" + + # String with options passed with thin_check command. By default, + # option '-q' is for quiet output. + thin_check_options = [ "-q" ] } activation { @@ -469,6 +521,11 @@ activation { # Useful for diagnosing problems with LVM2/udev interactions. verify_udev_operations = 0 + # If set to 1 and if deactivation of an LV fails, perhaps because + # a process run from a quick udev rule temporarily opened the device, + # retry the operation for a few seconds before failing. + retry_deactivation = 1 + # How to fill in missing stripes if activating an incomplete volume. # Using "error" will make inaccessible parts of the device return # I/O errors on access. You can instead use a device path, in which @@ -477,8 +534,14 @@ activation { # or snapshotted volumes is likely to result in data corruption. missing_stripe_filler = "error" + # The linear target is an optimised version of the striped target + # that only handles a single stripe. Set this to 0 to disable this + # optimisation and always use the striped target. + use_linear_target = 1 + # How much stack (in KB) to reserve for use while devices suspended - reserved_stack = 256 + # Prior to version 2.02.89 this used to be set to 256KB + reserved_stack = 64 # How much memory (in KB) to reserve for use while devices suspended reserved_memory = 8192 @@ -494,6 +557,25 @@ activation { # # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ] + # If auto_activation_volume_list is defined, each LV that is to be + # activated is checked against the list while using the autoactivation + # option (--activate ay/-a ay), and if it matches, it is activated. + # "vgname" and "vgname/lvname" are matched exactly. + # "@tag" matches any tag set in the LV or VG. + # "@*" matches if any tag defined on the host is also set in the LV or VG + # + # auto_activation_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ] + + # If read_only_volume_list is defined, each LV that is to be activated + # is checked against the list, and if it matches, it as activated + # in read-only mode. (This overrides '--permission rw' stored in the + # metadata.) + # "vgname" and "vgname/lvname" are matched exactly. + # "@tag" matches any tag set in the LV or VG. + # "@*" matches if any tag defined on the host is also set in the LV or VG + # + # read_only_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ] + # Size (in KB) of each copy operation when mirroring mirror_region_size = 512 @@ -503,9 +585,31 @@ activation { # "auto" - Use default value chosen by kernel. readahead = "auto" + # 'raid_fault_policy' defines how a device failure in a RAID logical + # volume is handled. This includes logical volumes that have the following + # segment types: raid1, raid4, raid5*, and raid6*. + # + # In the event of a failure, the following policies will determine what + # actions are performed during the automated response to failures (when + # dmeventd is monitoring the RAID logical volume) and when 'lvconvert' is + # called manually with the options '--repair' and '--use-policies'. + # + # "warn" - Use the system log to warn the user that a device in the RAID + # logical volume has failed. It is left to the user to run + # 'lvconvert --repair' manually to remove or replace the failed + # device. As long as the number of failed devices does not + # exceed the redundancy of the logical volume (1 device for + # raid4/5, 2 for raid6, etc) the logical volume will remain + # usable. + # + # "allocate" - Attempt to use any extra physical volumes in the volume + # group as spares and replace faulty devices. + # + raid_fault_policy = "warn" + # 'mirror_image_fault_policy' and 'mirror_log_fault_policy' define - # how a device failure affecting a mirror is handled. - # A mirror is composed of mirror images (copies) and a log. + # how a device failure affecting a mirror (of "mirror" segment type) is + # handled. A mirror is composed of mirror images (copies) and a log. # A disk log ensures that a mirror does not need to be re-synced # (all copies made the same) every time a machine reboots or crashes. # @@ -562,6 +666,25 @@ activation { snapshot_autoextend_threshold = 100 snapshot_autoextend_percent = 20 + # 'thin_pool_autoextend_threshold' and 'thin_pool_autoextend_percent' define + # how to handle automatic pool extension. The former defines when the + # pool should be extended: when its space usage exceeds this many + # percent. The latter defines how much extra space should be allocated for + # the pool, in percent of its current size. + # + # For example, if you set thin_pool_autoextend_threshold to 70 and + # thin_pool_autoextend_percent to 20, whenever a pool exceeds 70% usage, + # it will be extended by another 20%. For a 1G pool, using up 700M will + # trigger a resize to 1.2G. When the usage exceeds 840M, the pool will + # be extended to 1.44G, and so on. + # + # Setting thin_pool_autoextend_threshold to 100 disables automatic + # extensions. The minimum value is 50 (A setting below 50 will be treated + # as 50). + + thin_pool_autoextend_threshold = 100 + thin_pool_autoextend_percent = 20 + # While activating devices, I/O to devices being (re)configured is # suspended, and as a precaution against deadlocks, LVM2 needs to pin # any memory it is using so it is not paged out. Groups of pages that @@ -660,6 +783,15 @@ dmeventd { snapshot_library = "libdevmapper-event-lvm2snapshot.so" + # thin_library is the library used when monitoring a thin device. + # + # "libdevmapper-event-lvm2thin.so" monitors the filling of + # pool and emits a warning through syslog when the use of + # the pool exceeds 80%. The warning is repeated when 85%, 90% and + # 95% of the pool is filled. + + thin_library = "libdevmapper-event-lvm2thin.so" + # Full path of the dmeventd binary. # # executable = "/sbin/dmeventd" diff --git a/make.conf b/make.conf deleted file mode 100644 index 35cee26f..00000000 --- a/make.conf +++ /dev/null @@ -1,125 +0,0 @@ -# These settings were set by the catalyst build script that automatically -# built this stage. -# Please consult /usr/share/portage/config/make.conf.example for a more -# detailed example. -CFLAGS="-O2 -pipe" -CXXFLAGS="${CFLAGS}" -# WARNING: Changing your CHOST is not something that should be done lightly. -# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing. -CHOST="x86_64-pc-linux-gnu" - -MAKEOPTS="-j5" -#MAKEOPTS="-j1" - -GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" -#GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" -#GENTOO_MIRRORS="http://gentoo.mirror.web4u.cz/ ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo ftp://gentoo.mirror.dkm.cz/pub/gentoo/ ftp://mirror.bytemark.co.uk/gentoo/" - -PORT_LOGDIR=/var/log/portage - -PORTDIR_OVERLAY="/usr/local/portage" - -PORTAGE_RSYNC_OPTS="${PORTAGE_RSYNC_OPTS} --progress" - -PORTAGE_NICENESS=3 -AUTOCLEAN="yes" - -ACCEPT_LICENSE=" \ - DOOM3 \ - PUEL \ - RTCW \ - RTCW-ETEULA \ - dlj-1.1 \ - sun-bcla-java-vm \ - AdobeFlash-10 \ - AdobeFlash-10.1 \ - AdobeFlash-10.3 \ - skype-eula \ - skype-4.0.0.7-copyright \ - Oracle-BCLA-JavaSE \ -" - -EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" -#EMERGE_DEFAULT_OPTS="--with-bdeps y" - -CONFIG_PROTECT="/usr/share/xsessions \ - /var/www/localhost/htdocs/phpmyadmin \ - /var/lib/samba/private \ - /var/www/localhost/htdocs/cacti \ - /var/www/ldap/htdocs/config \ - /var/www/ldap/htdocs/templates \ - /usr/share/genkernel/arch/x86 \ - /usr/share/config/kdm \ -" - -#CONFIG_PROTECT_MASK="/etc/init.d" - -FEATURES="parallel-fetch userpriv usersandbox" - -#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" -#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" - -#LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW" -LINGUAS="de en en_GB en_US ru vi" - -# These are the USE flags that were used in addition to what is provided by the -# profile used for building. -USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards - amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo - calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl - curlwrappers cvs dbase dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples - encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig - foomaticdb ftp gconf gd gd-external ggi gif gimp git glade glib gmp gnome gnome-keyring - gnustep gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea - idn ieee1394 imagemagick imap imlib inifile ithreads java javascript - jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kde kdeenablefinal kdeprefix kerberos - keyring kig-scripting kpathsea lame latex lcms ldap libcaca - libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial - midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp - musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis - nptl nsplugin numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf perl - perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real - rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp - sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh - subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff - tools truetype twolame udev unicode usb v4l v4l2 vcd vidix video vim-syntax vorbis wav wavpack - wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine - xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xulrunner xvid yahoo - yaz yv12 zeroconf zlib - " - -# aqua darcs kate qt3 qt4 skey - -APACHE2_MPMS="prefork" -APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon - authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default - authz_groupfile authz_host authz_owner authz_user autoindex cache - cern_meta cgi cgid charset_lite dav dav_fs dav_lock dbd deflate dir - disk_cache dumpio env expires ext_filter file_cache filter headers - ident imagemap include info log_config log_forensic logio mem_cache - mime mime_magic negotiation proxy proxy_ajp proxy_balancer - proxy_connect proxy_ftp proxy_http rewrite setenvif so speling - status substitute unique_id userdir usertrack version vhost_alias - " - -INPUT_DEVICES="evdev keyboard mouse" - -VIDEO_CARDS="dummy fbdev radeon radeonhd svga vesa vga v4l" - -CAMERAS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 \ - digita dimagev dimera3500 directory enigma13 fuji gsmart300 hp215 \ - iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 \ - kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan \ - lg_gsm mars mustek panasonic_coolshot panasonic_dc1000 \ - panasonic_dc1580 panasonic_l859 pccam300 pccam600 polaroid_pdc320 \ - polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra \ - sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 \ - soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z template \ - topfield toshiba_pdrm11 tp6801" - -LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ - pdfimport scripting-javascript" -# scripting-beanshell wiki-publisher - -source /var/lib/layman/make.conf - diff --git a/modprobe.d/blacklist.conf b/modprobe.d/blacklist.conf deleted file mode 100644 index 90bc234b..00000000 --- a/modprobe.d/blacklist.conf +++ /dev/null @@ -1,29 +0,0 @@ -# This file lists modules which will not be loaded by udev, -# not at coldplugging and not on hotplug events. - -# Add your own entries to this file -# in the format "blacklist " - -# Some examples: -# evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Autoloading eth1394 most of the time re-orders your network -# interfaces, and with buggy kernel 2.6.21, udev persistent-net -# is not able to rename these devices, so you get eth?_rename devices -# plus an exceeded 30sec boot timeout -blacklist eth1394 - -# You probably want this to not get the console beep loud on every tab :) -#blacklist pcspkr - -# these drivers are very simple, the HID drivers are usually preferred -#blacklist usbmouse -#blacklist usbkbd - -# Sometimes loading a framebuffer driver at boot gets the console black -#install pci:v*d*sv*sd*bc03sc*i* /bin/true - -# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded -#blacklist usblp - diff --git a/modprobe.d/pnp-aliases.conf b/modprobe.d/pnp-aliases.conf deleted file mode 100644 index 3675fbbc..00000000 --- a/modprobe.d/pnp-aliases.conf +++ /dev/null @@ -1,17 +0,0 @@ -# /etc/modprobe.d/pnp-aliases -# -# These aliases are used by this udev-rule: -# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" -# -# They should help to autoload drivers used by various pnp-devices -# (if not blacklisted somewhere else) -# -alias pnp:dPNP0510 irtty-sir -alias pnp:dPNP0511 irtty-sir -alias pnp:dPNP0700 floppy -alias pnp:dPNP0800 pcspkr -alias pnp:dPNP0b00 rtc -alias pnp:dPNP0303 atkbd -alias pnp:dPNP0f13 psmouse -alias pnp:dPNPb02f analog - diff --git a/modprobe.d/usb-load-ehci-first.conf b/modprobe.d/usb-load-ehci-first.conf deleted file mode 100644 index 9b62fb40..00000000 --- a/modprobe.d/usb-load-ehci-first.conf +++ /dev/null @@ -1,2 +0,0 @@ -softdep uhci_hcd pre: ehci_hcd -softdep ohci_hcd pre: ehci_hcd diff --git a/mysql/my.cnf b/mysql/my.cnf index 775dce06..e054133e 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ # The following options will be passed to all MySQL clients [client] diff --git a/passwd b/passwd index dea4f5aa..4943db8b 100644 --- a/passwd +++ b/passwd @@ -52,3 +52,4 @@ postgres:x:70:70:added by portage for postgresql-server:/var/lib/postgresql:/bin memcached:x:115:2:added by portage for memcached:/dev/null:/sbin/nologin polkitd:x:116:987:added by portage for polkit:/var/lib/polkit-1:/sbin/nologin backuppc:x:117:986:added by portage for backuppc:/var/lib/backuppc:/bin/bash +saned:x:118:995:added by portage for sane-backends:/dev/null:/sbin/nologin diff --git a/passwd- b/passwd- index 13bc9d25..dea4f5aa 100644 --- a/passwd- +++ b/passwd- @@ -51,3 +51,4 @@ hsqldb:x:114:991:added by portage for hsqldb:/dev/null:/bin/sh postgres:x:70:70:added by portage for postgresql-server:/var/lib/postgresql:/bin/bash memcached:x:115:2:added by portage for memcached:/dev/null:/sbin/nologin polkitd:x:116:987:added by portage for polkit:/var/lib/polkit-1:/sbin/nologin +backuppc:x:117:986:added by portage for backuppc:/var/lib/backuppc:/bin/bash diff --git a/polkit-1/localauthority/10-vendor.d/01-org.freedesktop.NetworkManager.settings.modify.system.pkla b/polkit-1/localauthority/10-vendor.d/01-org.freedesktop.NetworkManager.settings.modify.system.pkla deleted file mode 100644 index d4433274..00000000 --- a/polkit-1/localauthority/10-vendor.d/01-org.freedesktop.NetworkManager.settings.modify.system.pkla +++ /dev/null @@ -1,6 +0,0 @@ -[Let users in plugdev group modify NetworkManager] -Identity=unix-group:plugdev -Action=org.freedesktop.NetworkManager.settings.modify.system -ResultAny=no -ResultInactive=no -ResultActive=yes \ No newline at end of file diff --git a/portage/make.conf b/portage/make.conf new file mode 100644 index 00000000..521fab21 --- /dev/null +++ b/portage/make.conf @@ -0,0 +1,125 @@ +# These settings were set by the catalyst build script that automatically +# built this stage. +# Please consult /usr/share/portage/config/make.conf.example for a more +# detailed example. +CFLAGS="-O2 -pipe" +CXXFLAGS="${CFLAGS}" +# WARNING: Changing your CHOST is not something that should be done lightly. +# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing. +CHOST="x86_64-pc-linux-gnu" + +MAKEOPTS="-j5" +#MAKEOPTS="-j1" + +GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" +#GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" +#GENTOO_MIRRORS="http://gentoo.mirror.web4u.cz/ ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo ftp://gentoo.mirror.dkm.cz/pub/gentoo/ ftp://mirror.bytemark.co.uk/gentoo/" + +PORT_LOGDIR=/var/log/portage + +PORTDIR_OVERLAY="/usr/local/portage" + +PORTAGE_RSYNC_OPTS="${PORTAGE_RSYNC_OPTS} --progress" + +PORTAGE_NICENESS=3 +AUTOCLEAN="yes" + +ACCEPT_LICENSE=" \ + DOOM3 \ + PUEL \ + RTCW \ + RTCW-ETEULA \ + dlj-1.1 \ + sun-bcla-java-vm \ + AdobeFlash-10 \ + AdobeFlash-10.1 \ + AdobeFlash-10.3 \ + skype-eula \ + skype-4.0.0.7-copyright \ + Oracle-BCLA-JavaSE \ +" + +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" +#EMERGE_DEFAULT_OPTS="--with-bdeps y" + +CONFIG_PROTECT="/usr/share/xsessions \ + /var/www/localhost/htdocs/phpmyadmin \ + /var/lib/samba/private \ + /var/www/localhost/htdocs/cacti \ + /var/www/ldap/htdocs/config \ + /var/www/ldap/htdocs/templates \ + /usr/share/genkernel/arch/x86 \ + /usr/share/config/kdm \ +" + +#CONFIG_PROTECT_MASK="/etc/init.d" + +FEATURES="parallel-fetch userpriv usersandbox" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +#LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW" +LINGUAS="de en en_GB en_US ru vi" + +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. +USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards + amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo + calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl + curlwrappers cvs dbase dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples + encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig + foomaticdb ftp gconf gd gd-external ggi gif gimp git glade glib gmp gnome gnome-keyring + gnustep gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea + idn ieee1394 imagemagick imap imlib inifile ithreads java javascript + jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kde kdeenablefinal kdeprefix kerberos + keyring kig-scripting kpathsea lame latex lcms ldap libcaca + libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial + midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp + musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis + nptl nsplugin numpy odbc ogg openal openexr opengl opus pango par pch pcntl pcre pdf perl + perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real + rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp + sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh + subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff + tools truetype twolame udev unicode usb v4l v4l2 vala vcd vidix video vim-syntax vorbis wav wavpack + wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine + xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xulrunner xvid yahoo + yaz yv12 zeroconf zlib + " + +# aqua darcs kate qt3 qt4 skey + +APACHE2_MPMS="prefork" +APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon + authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default + authz_groupfile authz_host authz_owner authz_user autoindex cache + cern_meta cgi cgid charset_lite dav dav_fs dav_lock dbd deflate dir + disk_cache dumpio env expires ext_filter file_cache filter headers + ident imagemap include info log_config log_forensic logio mem_cache + mime mime_magic negotiation proxy proxy_ajp proxy_balancer + proxy_connect proxy_ftp proxy_http rewrite setenvif so speling + status substitute unique_id userdir usertrack version vhost_alias + " + +INPUT_DEVICES="evdev keyboard mouse" + +VIDEO_CARDS="dummy fbdev radeon radeonhd svga vesa vga v4l" + +CAMERAS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 \ + digita dimagev dimera3500 directory enigma13 fuji gsmart300 hp215 \ + iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 \ + kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan \ + lg_gsm mars mustek panasonic_coolshot panasonic_dc1000 \ + panasonic_dc1580 panasonic_l859 pccam300 pccam600 polaroid_pdc320 \ + polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra \ + sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 \ + soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z template \ + topfield toshiba_pdrm11 tp6801" + +LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ + pdfimport scripting-javascript" +# scripting-beanshell wiki-publisher + +source /var/lib/layman/make.conf + diff --git a/portage/package.use b/portage/package.use index 29a447c6..bf5288c7 100644 --- a/portage/package.use +++ b/portage/package.use @@ -95,7 +95,7 @@ dev-tex/chktex -doc dev-util/gtk-doc highlight vim dev-util/strace aio -dev-vcs/git tk +dev-vcs/git highlight tk dev-vcs/subversion -dso extras -ruby games-misc/fortune-mod offensive @@ -154,7 +154,7 @@ media-libs/a52dec djbfft media-libs/alsa-lib alisp media-libs/faad2 digitalradio media-libs/fontconfig -doc -media-libs/freetype utils +media-libs/freetype infinality utils # media-libs/gd fontconfig media-libs/gegl -ffmpeg graphviz raw media-libs/giflib rle @@ -231,7 +231,8 @@ net-libs/libvncserver gcrypt gnutls net-libs/xulrunner system-sqlite wifi net-misc/curl libssh2 -net-misc/networkmanager dhcpcd -gnutls nss +net-misc/iputils caps gnutls +net-misc/networkmanager dhcpcd nss net-misc/ntp parse-clocks -zeroconf net-misc/openssh X509 sftplogging net-misc/openvpn eurephia iproute2 passwordsave @@ -286,7 +287,7 @@ www-apps/egroupware gallery www-apps/syscp aps autoresponder billing bind domainkey fcgid mailquota www-client/elinks finger gopher -ruby -www-client/firefox mozdevelop system-sqlite wifi xforms +www-client/firefox mozdevelop system-jpeg system-sqlite wifi xforms www-client/opera -qt3 www-servers/apache sni suexec -threads diff --git a/postfix/main.cf b/postfix/main.cf index c1606d6e..05db8182 100644 --- a/postfix/main.cf +++ b/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.4/html +html_directory = /usr/share/doc/postfix-2.9.5/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.4/readme +readme_directory = /usr/share/doc/postfix-2.9.5/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/profile.env b/profile.env index ba293d3d..02fa38f0 100644 --- a/profile.env +++ b/profile.env @@ -4,14 +4,14 @@ export ANT_HOME='/usr/share/ant' export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config /usr/share/openvpn/easy-rsa' -export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf ${EPREFIX}/etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' +export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf ${EPREFIX}/etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' export EDITOR='/usr/bin/vim' export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.0-r1/html' export GCC_SPECS='' export GDK_USE_XFT='1' export GSETTINGS_BACKEND='dconf' export HG='/usr/bin/hg' -export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info' +export 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' export JAVACC_HOME='/usr/share/javacc/' export LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' @@ -29,22 +29,20 @@ export LC_TIME='de_DE.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar' -export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/' +export 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/' export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' -export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin' +export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin:/usr/games/bin' export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/opt/bin/skype' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.2/html/library' export PYTHONDOCS_3_2='/usr/share/doc/python-docs-3.2.2/html/library' export PYTHONPATH='/usr/lib/portage/pym' export QT_GRAPHICSSYSTEM='raster' export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins' -export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin' +export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin' export RUBYOPT='-rauto_gem' export R_HOME='/usr/lib64/R' -export SANE_CONFIG_DIR='/etc/sane.d' -export USB_DEVFS_PATH='/dev/bus/usb' export VBOX_APP_HOME='/usr/lib64/virtualbox' export XDG_CONFIG_DIRS='/etc/xdg' export XDG_DATA_DIRS='/usr/local/share:/usr/share:/usr/share/gdm' diff --git a/resolv.conf b/resolv.conf index 9a19004e..2fa15003 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,6 @@ -# Generated by net-scripts for interface eth0 +# Hand made by Frank Brehm domain brehm-online.com -search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de -nameserver 10.12.11.1 +search brehm-online.com hennig-berlin.org uhu-banane.de profitbricks.localdomain dc1.de.profitbricks.net dc2.us.profitbricks.net pb.local +#nameserver 10.12.11.1 +nameserver 192.168.178.30 +nameserver 192.168.178.89 diff --git a/revdep-rebuild/61-icedtea-bin-7 b/revdep-rebuild/61-icedtea-bin-7 deleted file mode 100644 index e1f5f897..00000000 --- a/revdep-rebuild/61-icedtea-bin-7 +++ /dev/null @@ -1 +0,0 @@ -SEARCH_DIRS_MASK="/opt/icedtea-bin-7.2.3.3" diff --git a/revdep-rebuild/61-sun-jdk-1.6 b/revdep-rebuild/61-sun-jdk-1.6 index b221cbb2..530aeea4 100644 --- a/revdep-rebuild/61-sun-jdk-1.6 +++ b/revdep-rebuild/61-sun-jdk-1.6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.37" +SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.38" diff --git a/revdep-rebuild/61-sun-jre-bin-1.6 b/revdep-rebuild/61-sun-jre-bin-1.6 index 57e4dbad..2e3ee7f5 100644 --- a/revdep-rebuild/61-sun-jre-bin-1.6 +++ b/revdep-rebuild/61-sun-jre-bin-1.6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.37" +SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.38" diff --git a/runlevels/default/udev-postmount b/runlevels/default/udev-postmount deleted file mode 120000 index 563ffe7e..00000000 --- a/runlevels/default/udev-postmount +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/udev-postmount \ No newline at end of file diff --git a/sandbox.d/20icedtea-bin-7 b/sandbox.d/20icedtea-bin-7 deleted file mode 100644 index 3001f3cf..00000000 --- a/sandbox.d/20icedtea-bin-7 +++ /dev/null @@ -1 +0,0 @@ -SANDBOX_PREDICT="/proc/self/coredump_filter" diff --git a/sane.d/dll.conf b/sane.d/dll.conf index 61c9908d..6d184a8a 100644 --- a/sane.d/dll.conf +++ b/sane.d/dll.conf @@ -39,6 +39,7 @@ hpljm1005 hs2p ibm kodak +kodakaio kvs1025 kvs20xx leo diff --git a/sane.d/fujitsu.conf b/sane.d/fujitsu.conf index 645533e4..329bf1cf 100644 --- a/sane.d/fujitsu.conf +++ b/sane.d/fujitsu.conf @@ -3,8 +3,10 @@ # to set data buffer size, in bytes # the value ranges from 4096 - infinity -# but you may have scanning problems with -# a value larger than 65536 (the default) +# but old scanners may have scanning problems +# with a value larger than 65536 (the default) +# NOTE: this option is set to a larger value +# later in this file, for more recent scanners option buffer-size 65536 # To search for all FUJITSU scsi devices @@ -74,6 +76,9 @@ usb 0x04c5 0x1135 #fi-5530C2 usb 0x04c5 0x114a +# More recent scanners need a larger buffer for maximum speed +option buffer-size 262144 + #fi-6140 usb 0x04c5 0x114d @@ -128,16 +133,16 @@ usb 0x04c5 0x11ee #fi-6225 usb 0x04c5 0x11ef -#fi-6145 +#fi-6140Z usb 0x04c5 0x11f1 -#fi-6245 +#fi-6240Z usb 0x04c5 0x11f2 -#fi-6135 +#fi-6130Z usb 0x04c5 0x11f3 -#fi-6235 +#fi-6230Z usb 0x04c5 0x11f4 #fi-6110 diff --git a/sane.d/genesys.conf b/sane.d/genesys.conf index fd2cd682..55ab2316 100644 --- a/sane.d/genesys.conf +++ b/sane.d/genesys.conf @@ -97,6 +97,9 @@ usb 0x04a7 0x04ac # Panasonic KV-SS080 usb 0x04da 0x100f +# Hewlett Packard ScanJet 4850C +usb 0x03f0 0x1b05 + # Hewlett Packard ScanJet G4010 usb 0x03f0 0x4505 @@ -105,3 +108,9 @@ usb 0x03f0 0x4605 # Plustek OpticBook 3600 usb 0x07b3 0x0900 + +# Primax Electronics, Ltd Xerox 2400 Onetouch +usb 0x0461 0x038b + +#Hewlett Packard ScanJet N6310 +usb 0x03f0 0x4705 diff --git a/sane.d/gt68xx.conf b/sane.d/gt68xx.conf index 29b55619..dce5290e 100644 --- a/sane.d/gt68xx.conf +++ b/sane.d/gt68xx.conf @@ -1,5 +1,5 @@ -# gt68xx.conf: Configuration file for GT68XX based scanners (1.0.22) +# gt68xx.conf: Configuration file for GT68XX based scanners (1.0.23) # Read man sane-gt68xx for documentation # Put the firmware file into "/usr/share/sane/gt68xx/". diff --git a/sane.d/kodakaio.conf b/sane.d/kodakaio.conf new file mode 100644 index 00000000..57054526 --- /dev/null +++ b/sane.d/kodakaio.conf @@ -0,0 +1,80 @@ +### kodakaio.conf +### +### here are some examples for how to configure the kodakaio backend + +### Timeout settings: SNMP autodetection, Scan data read requests and other +### read requests. All values are given in milliseconds, +### i.e. 1000 is 1 second. + +# SNMP auto-detection waits 1.5 seconds +snmp-timeout 1500 + +# wait 15 seconds for scan data (scans may take several seconds to initialize, +# so we need to wait longer) +scan-data-timeout 7000 + +# Wait 5 seconds for all other data requests +request-timeout 5000 + + +### Network: Format is "net IP_ADDRESS [USB_ID]" or "net autodiscovery" +### if USB_ID is left out, SNMP is used to detect the device type +### Currently autodiscovery seems to not work +### So always use "net IP_ADDRESS [USB_ID]" as shown below +### You can find the printer's IP address on its control panel +### There is a list of USB_IDs at the end of this file + +net autodiscovery + +### The following is a kodak HERO 9.1 with explicit IP-Address +#net 10.0.0.5 0x4067 + +# kodak ESP5250 is usb 0x040a 0x4041 +#net 192.168.1.4 0x4041 +# kodak HERO 9.1 is usb 0x040a 0x4067 +#net 192.168.1.17 0x4067 + +### USB: format is "usb" for automatic (libusb) discovery, based on USB IDs, +### or "usb to force the use of a particular +### device (the backend has some additional checks and will not use +### non-kodak devices, though) + +usb + +### For libusb support for unknown scanners use the following command +### usb +### e.g.: + +# kodak ESP5250 is usb 0x040a 0x4041 +#usb 0x040a 0x4041 +# kodak HERO 9.1 is usb 0x040a 0x4067 +#usb 0x040a 0x4067 + +### List of USB device IDs +# 0x4059, /* kodak ESP 2150 */ +# 0x4066, /* kodak ESP 2170 */ +# 0x4043, /* kodak ESP 3200 */ +# 0x4031, /* kodak ESP 3300 */ +# 0x4053, /* kodak ESP 4100 */ +# 0x4028, /* kodak ESP 5000 */ +# 0x4025, /* kodak ESP 5100 */ +# 0x4041, /* kodak ESP 5200 */ +# 0x4026, /* kodak ESP 5300 */ +# 0x4027, /* kodak ESP 5500 */ +# 0x4054, /* kodak ESP 6100 */ +# 0x4056, /* kodak ESP 7200 */ +# 0x4065, /* kodak ESP 9200 */ +# 0x4032, /* kodak ESP 5 */ +# 0x403E, /* kodak ESP 7 */ +# 0x403F, /* kodak ESP 9 */ +# 0x4057, /* kodak ESP C110 */ +# 0x4058, /* kodak ESP C115 */ +# 0x405D, /* kodak ESP C310 */ +# 0x405E, /* kodak ESP C315 */ +# 0x4060, /* ADVENT WiFi AIO AW10 */ +# 0x406D, /* kodak Hero 3.1 */ +# 0x4064, /* kodak Hero 5.1 */ +# 0x4062, /* kodak Office Hero 6.1 */ +# 0x4063, /* kodak Hero 7.1 */ +# 0x4067, /* kodak Hero 9.1 */ + diff --git a/sane.d/saned.conf b/sane.d/saned.conf index ea8cc47d..664e4597 100644 --- a/sane.d/saned.conf +++ b/sane.d/saned.conf @@ -22,8 +22,8 @@ #scan-client.somedomain.firm #192.168.0.1 #192.168.0.1/29 -#[2001:7a8:185e::42:12] -#[2001:7a8:185e::42:12]/64 +#[2001:db8:185e::42:12] +#[2001:db8:185e::42:12]/64 # NOTE: /etc/inetd.conf (or /etc/xinetd.conf) and # /etc/services must also be properly configured to start diff --git a/sane.d/xerox_mfp.conf b/sane.d/xerox_mfp.conf index ffc4c4c0..a089ee99 100644 --- a/sane.d/xerox_mfp.conf +++ b/sane.d/xerox_mfp.conf @@ -18,6 +18,9 @@ usb 0x04e8 0x341b #Samsung SCX4725-FN usb 0x04e8 0x341f +#Samsung CLX-216x Series +usb 0x04e8 0x3425 + #Samsung SCX-4500 usb 0x04e8 0x3426 @@ -27,18 +30,30 @@ usb 0x04e8 0x342b # Samsung SCX-4824 usb 0x04e8 0x342c +# Samsung SCX-4828FN or SCX-4x28 Series +usb 0x04e8 0x342d + # Samsung SCX-4300 usb 0x04e8 0x342e # Samsung SCX-4600 usb 0x04e8 0x3433 +# Samsung CLX 3185 +usb 0x04e8 0x343d + +# Samsung SCX-3205W +usb 0x04e8 0x3441 + #Xerox WorkCentre 3119 Series usb 0x0924 0x4265 #Samsung SCX-4623 usb 0x04e8 0x3434 +#Samsung SCX-4623FW +usb 0x04e8 0x3440 + # Samsung SCX-4825FN usb 0x04e8 0x343c diff --git a/shadow b/shadow index 93025fe6..f652cc07 100644 --- a/shadow +++ b/shadow @@ -51,3 +51,4 @@ postgres:!:15371:::::: memcached:!:15566:::::: polkitd:!:15634:::::: backuppc:!:15706:::::: +saned:!:15734:::::: diff --git a/shadow- b/shadow- index 3edfa87e..93025fe6 100644 --- a/shadow- +++ b/shadow- @@ -50,3 +50,4 @@ hsqldb:!:15356:::::: postgres:!:15371:::::: memcached:!:15566:::::: polkitd:!:15634:::::: +backuppc:!:15706:::::: diff --git a/texmf/ls-R b/texmf/ls-R index 66ffaf37..7c91452d 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -66,8 +66,8 @@ language.texlive-langgerman.def 80jadetex.cnf ./updmap.d: -.keep_app-text_texlive-core-0 00updmap.cfg +.keep_app-text_texlive-core-0 texlive-basic.cfg texlive-context.cfg texlive-fontsextra.cfg @@ -85,8 +85,8 @@ texlive-pictures.cfg texlive-science.cfg ./web2c: -.keep_app-text_texlive-core-0 fmtutil.cnf +.keep_app-text_texlive-core-0 texmf.cnf updmap.cfg diff --git a/udev/hwdb.bin b/udev/hwdb.bin new file mode 100644 index 00000000..69351bfe Binary files /dev/null and b/udev/hwdb.bin differ diff --git a/udev/rules.d/.keep_sys-fs_udev-0 b/udev/rules.d/.keep_sys-fs_udev-0 deleted file mode 100644 index e69de29b..00000000 diff --git a/udev/rules.d/80-net-name-slot.rules b/udev/rules.d/80-net-name-slot.rules new file mode 100644 index 00000000..7244c87f --- /dev/null +++ b/udev/rules.d/80-net-name-slot.rules @@ -0,0 +1,39 @@ +# +# Udev 197 and above has implemented predictable network interface names +# for hardware network interfaces. This new scheme does not affect +# stacked network interfaces such as bonds, bridges or vlans. +# +# This file is here to prevent your interfaces from being renamed automatically, +# because the new names will be drastically different from the eth*, wlan*, etc +# names you are used to working with. +# +# To activate this function, move this file to a name that doesn't end in.rules, +# or remove it then reboot your system. +# +# If you want to deactivate this function, install a udev rules file as +# /etc/udev/rules.d/80-net-name-slot.rules then reboot your system. +# +# This functionality has not been tested with gentoo. In fact, we are aware that +# things will break if you activate it. +# +# If you are not comfortable testing this, leave this file as is. We will +# publish a news item when you can migrate. +# +# If you do want to activate and help us come up with a migration plan, feel +# free to do so and report bugs. +# Your bugs should block the following tracker: +# https://bugs.gentoo.org/show_bug.cgi?id=450938 +# +# Before you activate this function, it is important that you fully understand +# the following documentation: +# +# http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames +# +# Also, be aware that you can get the attributes of your network interface that +# would be used to name the interface in the new scheme by doing the following +# with this version of udev running: +# +# udevadm test-builtin net_id /sys/class/net/ifname 2> /dev/null +# +# for example, on my system, I can find that eth0's new name would be enp1s5. +# diff --git a/udev/udev.conf b/udev/udev.conf index f6f592e7..f39253eb 100644 --- a/udev/udev.conf +++ b/udev/udev.conf @@ -1,5 +1,3 @@ -# The initial syslog(3) priority: "err", "info", "debug" or its -# numerical equivalent. For runtime debugging, the daemons internal -# state can be changed with: "udevadm control --log-priority=". -udev_log="err" -# If you need to change mount-options, do it in /etc/fstab +# see udev(7) for details + +#udev_log="info" diff --git a/xinetd.d/saned b/xinetd.d/saned new file mode 100644 index 00000000..4b3e228e --- /dev/null +++ b/xinetd.d/saned @@ -0,0 +1,10 @@ +service sane-port +{ + socket_type = stream + server = /usr/sbin/saned + protocol = tcp + user = saned + group = scanner + wait = no + disable = yes +}