From: Frank Brehm Date: Wed, 30 Jan 2013 10:00:14 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=97b35a0fd95a744babe8cdce826e68a8ca2183a2;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index 0ab71eb..96a2713 100755 --- a/.etckeeper +++ b/.etckeeper @@ -30,6 +30,7 @@ mkdir -p './ssh/ca' mkdir -p './sudoers.d' mkdir -p './texmf/dvipdfm/config' mkdir -p './texmf/dvips.d' +mkdir -p './udev/hwdb.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' maybe chmod 0700 './.etckeeper' @@ -131,6 +132,8 @@ maybe chmod 0644 './X11/xorg.conf.d/20-evdev.conf' maybe chmod 0755 './abcde' maybe chmod 0644 './abcde/abcde.conf' maybe chmod 0755 './acpi' +maybe chmod 0755 './acpi/actions' +maybe chmod 0755 './acpi/actions/powerbtn.sh' maybe chmod 0755 './acpi/default.sh' maybe chmod 0755 './acpi/events' maybe chmod 0644 './acpi/events/default' @@ -330,6 +333,8 @@ maybe chmod 0644 './config-archive/etc/conf.d/modules' maybe chmod 0644 './config-archive/etc/conf.d/modules.dist.new' maybe chmod 0644 './config-archive/etc/conf.d/slapd' maybe chmod 0644 './config-archive/etc/conf.d/slapd.dist' +maybe chmod 0644 './config-archive/etc/conf.d/udev' +maybe chmod 0644 './config-archive/etc/conf.d/udev.dist' maybe chmod 0644 './config-archive/etc/conf.d/xdm' maybe chmod 0644 './config-archive/etc/conf.d/xdm.dist.new' maybe chmod 0755 './config-archive/etc/cron.daily' @@ -403,6 +408,7 @@ maybe chmod 0644 './config-archive/etc/ksysguarddrc' maybe chmod 0644 './config-archive/etc/ksysguarddrc.dist' maybe chmod 0755 './config-archive/etc/layman' maybe chmod 0644 './config-archive/etc/layman/layman.cfg' +maybe chmod 0644 './config-archive/etc/layman/layman.cfg.1' maybe chmod 0644 './config-archive/etc/layman/layman.cfg.dist' maybe chmod 0755 './config-archive/etc/libvirt' maybe chmod 0644 './config-archive/etc/libvirt/libvirt.conf' @@ -421,6 +427,9 @@ maybe chmod 0644 './config-archive/etc/logrotate.d/openrc' maybe chmod 0644 './config-archive/etc/logrotate.d/openrc.dist.new' maybe chmod 0644 './config-archive/etc/lynx.cfg' maybe chmod 0644 './config-archive/etc/lynx.cfg.dist' +maybe chmod 0755 './config-archive/etc/mail' +maybe chmod 0644 './config-archive/etc/mail/aliases' +maybe chmod 0644 './config-archive/etc/mail/aliases.dist.new' maybe chmod 0644 './config-archive/etc/mke2fs.conf' maybe chmod 0644 './config-archive/etc/mke2fs.conf.dist' maybe chmod 0644 './config-archive/etc/nilfs_cleanerd.conf' @@ -699,6 +708,10 @@ maybe chmod 0660 './courier/authlib/authpgsqlrc' maybe chown mail './courier/authlib/authpgsqlrc.dist' maybe chgrp mail './courier/authlib/authpgsqlrc.dist' maybe chmod 0660 './courier/authlib/authpgsqlrc.dist' +maybe chmod 0640 './courier/authlib/authsqliterc' +maybe chown mail './courier/authlib/authsqliterc.dist' +maybe chgrp mail './courier/authlib/authsqliterc.dist' +maybe chmod 0660 './courier/authlib/authsqliterc.dist' maybe chmod 0755 './cron.d' maybe chmod 0644 './cron.d/.keep_sys-process_vixie-cron-0' maybe chmod 0750 './cron.daily' @@ -821,7 +834,6 @@ maybe chmod 0644 './env.d/20java-config' maybe chmod 0644 './env.d/20php5.4' maybe chmod 0644 './env.d/22javacc' maybe chmod 0644 './env.d/30gnupg' -maybe chmod 0644 './env.d/30sane' maybe chmod 0644 './env.d/30xdg-data-local' maybe chmod 0644 './env.d/35hsqldb' maybe chmod 0644 './env.d/37fontconfig' @@ -868,6 +880,7 @@ maybe chmod 0644 './env.d/cblas/lib64/gsl' maybe chmod 0755 './env.d/gcc' maybe chmod 0644 './env.d/gcc/config-x86_64-pc-linux-gnu' maybe chmod 0644 './env.d/gcc/x86_64-pc-linux-gnu-4.5.4' +maybe chmod 0644 './env.d/gcc/x86_64-pc-linux-gnu-4.6.3' maybe chmod 0755 './env.d/python' maybe chmod 0644 './env.d/python/.keep_app-admin_eselect-python-0' maybe chmod 0644 './env.d/python/config' @@ -1172,6 +1185,8 @@ maybe chmod 0644 './gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules' maybe chmod 0755 './gtk-3.0' maybe chmod 0644 './gtk-3.0/im-multipress.conf' maybe chmod 0644 './gtk-3.0/settings.ini' +maybe chmod 0755 './highlight' +maybe chmod 0644 './highlight/filetypes.conf' maybe chmod 0644 './host.conf' maybe chmod 0644 './hosts' maybe chmod 0755 './hotplug' @@ -1282,6 +1297,7 @@ maybe chmod 0755 './init.d/procfs' maybe chmod 0755 './init.d/pwcheck' maybe chmod 0755 './init.d/pydoc-2.7' maybe chmod 0755 './init.d/pydoc-3.2' +maybe chmod 0755 './init.d/qemu-binfmt' maybe chmod 0755 './init.d/reboot.sh' maybe chmod 0755 './init.d/rfcomm' maybe chmod 0755 './init.d/root' @@ -1314,7 +1330,6 @@ maybe chmod 0755 './init.d/tmpfiles.setup' maybe chmod 0755 './init.d/twistd' maybe chmod 0755 './init.d/udev' maybe chmod 0755 './init.d/udev-mount' -maybe chmod 0755 './init.d/udev-postmount' maybe chmod 0755 './init.d/ulogd' maybe chmod 0755 './init.d/urandom' maybe chmod 0755 './init.d/vde' @@ -1361,6 +1376,8 @@ maybe chmod 0644 './krb5.conf.example' maybe chmod 0644 './ksysguarddrc' maybe chmod 0755 './layman' maybe chmod 0644 './layman/layman.cfg' +maybe chmod 0755 './layman/overlays' +maybe chmod 0644 './layman/overlays/.keep_app-portage_layman-0' maybe chmod 0644 './ld.so.cache' maybe chmod 0644 './ld.so.conf' maybe chmod 0755 './ld.so.conf.d' @@ -1439,7 +1456,6 @@ maybe chmod 0755 './mail' maybe chmod 0644 './mail/aliases' maybe chmod 0644 './mail/aliases.db' maybe chmod 0644 './mailcap' -maybe chmod 0644 './make.conf' maybe chmod 0644 './make.conf.catalyst' maybe chmod 0644 './man.conf' maybe chmod 0644 './mdadm.conf' @@ -1449,11 +1465,8 @@ maybe chmod 0644 './mlocate-cron.conf' maybe chmod 0755 './modprobe.d' maybe chmod 0644 './modprobe.d/aliases.conf' maybe chmod 0644 './modprobe.d/alsa.conf' -maybe chmod 0644 './modprobe.d/blacklist.conf' maybe chmod 0644 './modprobe.d/i386.conf' -maybe chmod 0644 './modprobe.d/pnp-aliases.conf' maybe chmod 0644 './modprobe.d/ppp.conf' -maybe chmod 0644 './modprobe.d/usb-load-ehci-first.conf' maybe chmod 0644 './motd' maybe chmod 0644 './motd.tail' maybe chmod 0644 './mtab' @@ -1618,9 +1631,6 @@ maybe chmod 0644 './pm/config.d/gentoo' maybe chmod 0755 './pm/power.d' maybe chmod 0755 './pm/sleep.d' maybe chmod 0755 './polkit-1' -maybe chmod 0700 './polkit-1/localauthority' -maybe chmod 0755 './polkit-1/localauthority/10-vendor.d' -maybe chmod 0644 './polkit-1/localauthority/10-vendor.d/01-org.freedesktop.NetworkManager.settings.modify.system.pkla' maybe chown polkitd './polkit-1/rules.d' maybe chmod 0700 './polkit-1/rules.d' maybe chown polkitd './polkit-1/rules.d/50-default.rules' @@ -1638,6 +1648,7 @@ maybe chmod 0755 './portage/env/x11-libs' maybe chmod 0644 './portage/env/x11-libs/cairo' maybe chmod 0755 './portage/env/x11-misc' maybe chmod 0644 './portage/env/x11-misc/google-gadgets' +maybe chmod 0644 './portage/make.conf' maybe chmod 0644 './portage/package.keywords' maybe chmod 0644 './portage/package.use' maybe chmod 0755 './portage/postsync.d' @@ -1763,6 +1774,7 @@ maybe chmod 0644 './sane.d/hpsj5s.conf' maybe chmod 0644 './sane.d/hs2p.conf' maybe chmod 0644 './sane.d/ibm.conf' maybe chmod 0644 './sane.d/kodak.conf' +maybe chmod 0644 './sane.d/kodakaio.conf' maybe chmod 0644 './sane.d/leo.conf' maybe chmod 0644 './sane.d/lexmark.conf' maybe chmod 0644 './sane.d/ma1509.conf' @@ -2015,10 +2027,12 @@ maybe chmod 0755 './texmf/xdvi' maybe chmod 0644 './texmf/xdvi/xdvi.cfg' maybe chmod 0644 './timidity.cfg' maybe chmod 0755 './udev' +maybe chmod 0444 './udev/hwdb.bin' +maybe chmod 0755 './udev/hwdb.d' maybe chmod 0755 './udev/rules.d' -maybe chmod 0644 './udev/rules.d/.keep_sys-fs_udev-0' maybe chmod 0644 './udev/rules.d/70-persistent-cd.rules' maybe chmod 0644 './udev/rules.d/70-persistent-net.rules' +maybe chmod 0644 './udev/rules.d/80-net-name-slot.rules' maybe chmod 0644 './udev/udev.conf' maybe chmod 0600 './ulogd.conf' maybe chmod 0755 './unixODBC' @@ -2115,6 +2129,7 @@ maybe chmod 0644 './xinetd.d/ftp-sensor' maybe chmod 0644 './xinetd.d/git-daemon' maybe chmod 0644 './xinetd.d/kpropd' maybe chmod 0644 './xinetd.d/rsyncd' +maybe chmod 0644 './xinetd.d/saned' maybe chmod 0644 './xinetd.d/svnserve' maybe chmod 0644 './xinetd.d/swat' maybe chmod 0644 './xinetd.d/tcpmux-server' diff --git a/NetworkManager/dispatcher.d/10-openrc-status b/NetworkManager/dispatcher.d/10-openrc-status index 9788410..c216b16 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/xinit/xinitrc.d/11-xdg-menu-kde-4 b/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 index 1f06e4d..2374fba 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 0000000..39a3d9b --- /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 9fe26a1..8be6f3e 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/bash_completion.d/git-prompt b/bash_completion.d/git-prompt new file mode 120000 index 0000000..30cedda --- /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 302e046..fd6092a 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 321f622..787ef4f 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 6e75b2b..4bcb02d 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 fe5333f..2dfab3c 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 75b4216..db77de5 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/libvirtd b/conf.d/libvirtd index d2634bd..48ab125 100644 --- a/conf.d/libvirtd +++ b/conf.d/libvirtd @@ -1,5 +1,11 @@ # /etc/conf.d/libvirtd +# Startup dependency +# libvirtd typically requires all networks to be up and settled which +# is what rc_need="net" provides. However if you only use specific networks +# for libvirtd, you may override this. Or if you only use libvirtd locally. +rc_need="net" + # LIBVIRTD_OPTS # You may want to add '--listen' to have libvirtd listen for tcp/ip connections # if you want to use libvirt for remote control diff --git a/conf.d/net b/conf.d/net index e64053d..be0687a 100644 --- a/conf.d/net +++ b/conf.d/net @@ -3,10 +3,10 @@ # please review /usr/share/doc/openrc*/net.example* and save your configuration # in /etc/conf.d/net (this file :]!). -config_eth0="192.168.178.88/24" +config_eth0="192.168.88.88/24" -routes_eth0="default via 192.168.178.254" +routes_eth0="default via 192.168.88.254" dns_domain_eth0="profitbricks.localdomain" dns_servers_eth0="192.168.178.30 192.168.178.89" -dns_search_eth0="profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de" +dns_search_eth0="pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de" diff --git a/conf.d/udev b/conf.d/udev index 0f6d944..667cc8b 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" +#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/conf.d/udev b/config-archive/etc/conf.d/udev new file mode 100644 index 0000000..0f6d944 --- /dev/null +++ b/config-archive/etc/conf.d/udev @@ -0,0 +1,52 @@ +# /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. +# Set rc_coldplug="NO" if you don't want this. +# If you want module coldplugging but not coldplugging of services then you +# can disable service coldplugging in baselayout/openrc config files. +# The setting is named different in different versions. +# in /etc/rc.conf: rc_hotplug="!*" or +# in /etc/conf.d/rc: rc_plug_services="!*" +#rc_coldplug="YES" + + + + +# Expert options: + +# Timeout in seconds to wait for processing of uevents at boot. +# There should be no need to change this. +#udev_settle_timeout="60" + +# Add extra command line options to udevd, use with care +# udevd --help for possible values +#udev_opts="" + +# Run udevd --debug and write output to $RUNDIR/udev.log +# Should not be kept on as it fills diskspace slowly +udev_debug="YES" + +# Run udevadmin monitor to get a log of all events +# in $RUNDIR/udevmonitor.log +#udev_monitor="YES" + +# Keep udevmonitor running after populating /dev. +#udev_monitor_keep_running="no" + +# Set cmdline options for udevmonitor. +# could be some of --env --kernel --udev +#udev_monitor_opts="--env" + diff --git a/config-archive/etc/conf.d/udev.dist b/config-archive/etc/conf.d/udev.dist new file mode 100644 index 0000000..667cc8b --- /dev/null +++ b/config-archive/etc/conf.d/udev.dist @@ -0,0 +1,38 @@ +# /etc/conf.d/udev: config file for udev + +# 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. +# Set rc_coldplug="NO" if you don't want this. +# If you want module coldplugging but not coldplugging of services then you +# can disable service coldplugging in baselayout/openrc config files. +# The setting is named different in different versions. +# in /etc/rc.conf: rc_hotplug="!*" or +# in /etc/conf.d/rc: rc_plug_services="!*" +#rc_coldplug="YES" + +# Expert options: + +# Timeout in seconds to wait for processing of uevents at boot. +# There should be no need to change this. +#udev_settle_timeout="60" + +# Add extra command line options to udevd, use with care +# udevd --help for possible values +#udev_opts="" + +# 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 /run/udevmonitor.log +#udev_monitor="YES" + +# Keep udevmonitor running after populating /dev. +#udev_monitor_keep_running="no" + +# Set cmdline options for udevmonitor. +# could be some of --env --kernel --udev +#udev_monitor_opts="--env" + diff --git a/config-archive/etc/layman/layman.cfg b/config-archive/etc/layman/layman.cfg index eeeb5a8..caa49ec 100644 --- a/config-archive/etc/layman/layman.cfg +++ b/config-archive/etc/layman/layman.cfg @@ -43,9 +43,17 @@ overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml #----------------------------------------------------------- # Strict checking of overlay definitions # -# Set either to "yes" or "no". If "no" layman will issue -# warnings if an overlay definition is missing either -# description or contact information. +# The nocheck option is a bit confusing, for historical reasons. +# Hopefully this description eases the double negation trouble: +# +# nocheck : yes +# - Accepts completene overlay entries without warnings +# - Lists overlays of type foo (say Git) even with no foo installed +# +# nocheck : no +# - Checks overlay entries for missing description or contact +# information and issue warnings as needed +# - Hides overlays of type foo (say Git) if foo not not installed # nocheck : yes diff --git a/config-archive/etc/layman/layman.cfg.1 b/config-archive/etc/layman/layman.cfg.1 new file mode 100644 index 0000000..eeeb5a8 --- /dev/null +++ b/config-archive/etc/layman/layman.cfg.1 @@ -0,0 +1,82 @@ +[MAIN] + +#----------------------------------------------------------- +# Defines the directory where overlays should be installed + +storage : /var/lib/layman + +#----------------------------------------------------------- +# Remote overlay lists will be stored here +# layman will append _md5(url).xml to each filename + +cache : %(storage)s/cache + +#----------------------------------------------------------- +# The list of locally installed overlays + +local_list: %(storage)s/overlays.xml + +#----------------------------------------------------------- +# 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 +# local overlay definitions +# +#overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml +# http://dev.gentoo.org/~wrobel/layman/global-overlays.xml +# http://mydomain.org/my-layman-list.xml +# file:///var/lib/layman/my-list.xml + +overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml + http://10.1.1.1/gentoo/overlay-repos.xml + +#----------------------------------------------------------- +# Proxy support +# If unset, layman will use the http_proxy environment variable. +# +#proxy : http://[user:pass@]www.my-proxy.org:3128 + +#----------------------------------------------------------- +# Strict checking of overlay definitions +# +# Set either to "yes" or "no". If "no" layman will issue +# warnings if an overlay definition is missing either +# description or contact information. +# +nocheck : yes + +#----------------------------------------------------------- +# Umask settings +# +# layman should usually work with a umask of 0022. You should +# only change this setting if you are absolutely certain that +# you know what you are doing. +# +#umask : 0022 + +#----------------------------------------------------------- +# Command overrides +# +# You can have commands point to either a binary at a different +# location, e.g. +# +# /home/you/local/bin/git +# +# or just the command, e.g. +# +# git +# +# to use PATH-based resolution of the binary to call. +# +#bzr_command : /usr/bin/bzr +#cvs_command : /usr/bin/cvs +#darcs_command : /usr/bin/darcs +#git_command : /usr/bin/git +#mercurial_command : /usr/bin/hg +#rsync_command : /usr/bin/rsync +#svn_command : /usr/bin/svn +#tar_command : /bin/tar diff --git a/config-archive/etc/layman/layman.cfg.dist b/config-archive/etc/layman/layman.cfg.dist index ea68e66..e5c7c72 100644 --- a/config-archive/etc/layman/layman.cfg.dist +++ b/config-archive/etc/layman/layman.cfg.dist @@ -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/config-archive/etc/mail/aliases b/config-archive/etc/mail/aliases new file mode 100644 index 0000000..7e1e68c --- /dev/null +++ b/config-archive/etc/mail/aliases @@ -0,0 +1,48 @@ +# 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 + +# Persönliche Aliase + +# Frank Brehm +frank: frank.brehm@profitbricks.com +fbr: frank +brehm: frank +fbrehm: frank +f.brehm: frank +f-brehm: frank +frank.brehm: frank +frank-brehm: frank + +root: frank + diff --git a/config-archive/etc/mail/aliases.dist.new b/config-archive/etc/mail/aliases.dist.new new file mode 100644 index 0000000..ea83505 --- /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/courier/authlib/authdaemonrc b/courier/authlib/authdaemonrc index c382447..4b758be 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 e66f635..4645640 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 0000000..2826fff --- /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 0000000..2826fff --- /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 9421a7b..31d630a 100644 --- a/csh.env +++ b/csh.env @@ -4,7 +4,7 @@ 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.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.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/vi' setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.0-r1/html' setenv GCC_SPECS '' @@ -29,7 +29,7 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/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 PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin' @@ -42,8 +42,6 @@ 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 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/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf index 15b11b7..7df1c8e 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/20java-config b/env.d/20java-config index d435733..1128b5d 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 e06f69f..0000000 --- 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/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 0000000..c2da4f8 --- /dev/null +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 @@ -0,0 +1,10 @@ +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_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3" +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" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 7c2330a..1e48f4e 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -566,31 +566,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2339,388 +2339,388 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -2948,49 +2948,49 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3098,7 +3098,7 @@ - + Whether to disable the keyboard shortcuts @@ -6429,12 +6429,12 @@ - + - + @@ -6442,7 +6442,7 @@ - + @@ -6450,13 +6450,13 @@ - + Whether to disable the plugins in the user's home directory - + @@ -6464,7 +6464,7 @@ Default location for the "Take Screenshot" dialogs, default is the Pictures directory - + @@ -6472,7 +6472,7 @@ Default location for the "Open..." dialogs, default is the current directory - + UTF-8 @@ -6498,7 +6498,7 @@ - + Sans Bold 20 @@ -6506,13 +6506,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: @@ -6522,7 +6522,7 @@ "3" for extra large. - + @@ -6535,27 +6535,27 @@ - + - + - + - + - + Approximate network connection speed, used to select quality on media over the network: @@ -6573,39 +6573,39 @@ "11" for Intranet/LAN. - + - + - + - + - + - + goom - + @@ -6613,7 +6613,7 @@ - + @@ -17526,1344 +17526,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 - + @@ -19922,17 +19922,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19941,17 +19941,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19960,17 +19960,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19979,17 +19979,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19998,17 +19998,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20017,17 +20017,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20036,17 +20036,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20055,17 +20055,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -20074,17 +20074,17 @@ 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 0000000..4a51ba1 --- /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/usb/libsane.usermap b/hotplug/usb/libsane.usermap index f360764..6eab478 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 Mon Feb 20 07:44:12 2012 +# by sane-desc 3.5 from sane-backends 1.0.23 on Tue Jan 29 19:30:47 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 9280f93..7328cd2 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 0b62d66..404c269 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/libvirtd b/init.d/libvirtd index 0585287..93d407a 100755 --- a/init.d/libvirtd +++ b/init.d/libvirtd @@ -6,8 +6,8 @@ description_halt="Stops the libvirt daemon without stopping your VMs" description_reload="Restarts the libvirt daemon without stopping your VMs" depend() { - need net - after ntp-client ntpd nfs iscsid nfsmount portmap rpc.statd iptables ip6tables ebtables ceph corosync sanlock cgconfig + use avahi-daemon dbus + after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig } libvirtd_virsh() { diff --git a/init.d/lvm b/init.d/lvm index d840e7b..a06aa0b 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/qemu-binfmt b/init.d/qemu-binfmt new file mode 100755 index 0000000..d2c0b73 --- /dev/null +++ b/init.d/qemu-binfmt @@ -0,0 +1,136 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd-r1,v 1.1 2013/01/19 03:42:06 cardoe Exp $ + +# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel + +depend() { + after procfs +} + +start() { + ebegin "Registering qemu-user binaries" + + if [[ ! -d /proc/sys/fs/binfmt_misc ]] ; then + /sbin/modprobe binfmt_misc + fi + + if [[ ! -d /proc/sys/fs/binfmt_misc ]] ; then + eerror "You need \"binfmt_misc\" support in your kernel." + eend 1 + return 1 + fi + + if [[ ! -f /proc/sys/fs/binfmt_misc/register ]] ; then + mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &> /dev/null + local result=$? + + if [[ $result -ne 0 ]] ; then + eend $result + return $result + fi + fi + + # probe cpu type + cpu=`uname -m` + case "$cpu" in + i386|i486|i586|i686|i86pc|BePC|x86_64) + cpu="i386" + ;; + m68k) + cpu="m68k" + ;; + mips*) + cpu="mips" + ;; + "Power Macintosh"|ppc|ppc64) + cpu="ppc" + ;; + armv[4-9]*) + cpu="arm" + ;; + sparc*) + cpu="sparc" + ;; + esac + + # register the interpreter for each cpu except for the native one + if [ $cpu != "i386" -a -x "/usr/bin/qemu-i386" ] ; then + echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register + echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "alpha" -a -x "/usr/bin/qemu-alpha" ] ; then + echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "arm" -a -x "/usr/bin/qemu-arm" ] ; then + echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "arm" -a -x "/usr/bin/qemu-armeb" ] ; then + echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "sparc" -a -x "/usr/bin/qemu-sparc" ] ; then + echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "ppc" -a -x "/usr/bin/qemu-ppc" ] ; then + echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "m68k" -a -x "/usr/bin/qemu-m68k" ] ; then + echo 'Please check cpu value and header information for m68k!' + echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips" ] ; then + # FIXME: We could use the other endianness on a MIPS host. + echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsel" ] ; then + echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32" ] ; then + echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32el" ] ; then + echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64" ] ; then + echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64el" ] ; then + echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4" ] ; then + echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4eb" ] ; then + echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "s390x" -a -x "/usr/local/bin/qemu-s390x" ] ; then + echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:P' > /proc/sys/fs/binfmt_misc/register + fi + eend $? +} + +stop() { + ebegin "Unregistering qemu-user binaries" + local arches + + arches="${arches} i386 i486" + arches="${arches} alpha" + arches="${arches} arm armeb" + arches="${arches} sparc" + arches="${arches} ppc" + arches="${arches} m68k" + arches="${arches} mips mipsel mipsn32 mipsn32el mips64 mips64el" + arches="${arches} sh4 sh4eb" + arches="${arches} s390x" + + for a in ${arches}; do + if [[ -f /proc/sys/fs/binfmt_misc/$a ]] ; then + echo '-1' > /proc/sys/fs/binfmt_misc/$a + fi + done + + eend $? +} + +# vim: ts=4 : diff --git a/init.d/udev b/init.d/udev index 1912c8b..6b69044 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 f870039..a868340 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 d689681..0000000 --- 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 caa49ec..466c25b 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 @@ -34,6 +40,15 @@ make_conf : %(storage)s/make.conf overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml http://10.1.1.1/gentoo/overlay-repos.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. @@ -47,7 +62,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 @@ -66,6 +81,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 # @@ -88,3 +129,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 0000000..e69de29 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 cc44c05..e853b9d 100644 --- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf +++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf @@ -1,2 +1,4 @@ +/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4 diff --git a/lvm/lvm.conf b/lvm/lvm.conf index cec2578..de3077e 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 9c6f94a..0000000 --- a/make.conf +++ /dev/null @@ -1,99 +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="-j3" -#MAKEOPTS="-j1" - -PORT_LOGDIR=/var/log/portage - -PORTDIR_OVERLAY="/usr/local/portage" - -PORTAGE_NICENESS=3 -AUTOCLEAN="yes" - -ACCEPT_LICENSE=" \ - DOOM3 \ - PUEL \ - RTCW \ - RTCW-ETEULA \ - dlj-1.1 \ - sun-bcla-java-vm \ - AdobeFlash-10 \ - AdobeFlash-10.3 \ - AdobeFlash-10.1 \ - 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 \ -" - -FEATURES="parallel-fetch userpriv usersandbox" - -LINGUAS="de en en_GB en_US ru" - -# 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 \ - amr ao 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 fuse gconf gd gd-external ggi \ - gif gimp git glade glib gmp gnome gnome-keyring \ - gnustep gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml \ - idn ieee1394 imagemagick imap imlib inifile ithreads java javascript \ - handbook hal hscolour html iconv icu id3 id3tag idea \ - jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kde kdeenablefinal kdeprefix kerberos \ - keyring kig-scripting kpathsea lame latex lcms ldap \ - 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 ntlm numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf \ - perl plasma plotutils png policykit posix postgres postscript ppds projectm pulseaudio python quicktime real \ - rdesktop rle 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" - -# apache2 gnutls perlsuid php rle samba -# aqua darcs kate qt3 qt4 skey - -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" - -QEMU_SOFTMMU_TARGETS="i386 x86_64" -QEMU_USER_TARGETS="i386 x86_64" - -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 90bc234..0000000 --- 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 3675fbb..0000000 --- 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 9b62fb4..0000000 --- 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 50a3c2e..833d8ae 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 bc297fa..67b804b 100644 --- a/passwd +++ b/passwd @@ -43,3 +43,4 @@ colord:x:113:982:added by portage for colord:/var/lib/colord:/sbin/nologin qemu:x:77:984:added by portage for libvirt:/dev/null:/sbin/nologin memcached:x:114:2:added by portage for memcached:/dev/null:/sbin/nologin polkitd:x:115:981:added by portage for polkit:/var/lib/polkit-1:/sbin/nologin +saned:x:116:989:added by portage for sane-backends:/dev/null:/sbin/nologin 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 d443327..0000000 --- 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 0000000..b9cda7e --- /dev/null +++ b/portage/make.conf @@ -0,0 +1,99 @@ +# 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="-j3" +#MAKEOPTS="-j1" + +PORT_LOGDIR=/var/log/portage + +PORTDIR_OVERLAY="/usr/local/portage" + +PORTAGE_NICENESS=3 +AUTOCLEAN="yes" + +ACCEPT_LICENSE=" \ + DOOM3 \ + PUEL \ + RTCW \ + RTCW-ETEULA \ + dlj-1.1 \ + sun-bcla-java-vm \ + AdobeFlash-10 \ + AdobeFlash-10.3 \ + AdobeFlash-10.1 \ + 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 \ +" + +FEATURES="parallel-fetch userpriv usersandbox" + +LINGUAS="de en en_GB en_US ru" + +# 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 \ + amr ao 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 fuse gconf gd gd-external ggi \ + gif gimp git glade glib gmp gnome gnome-keyring \ + gnustep gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml \ + idn ieee1394 imagemagick imap imlib inifile ithreads java javascript \ + handbook hal hscolour html iconv icu id3 id3tag idea \ + jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kde kdeenablefinal kdeprefix kerberos \ + keyring kig-scripting kpathsea lame latex lcms ldap \ + 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 ntlm numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf \ + perl plasma plotutils png policykit posix postgres postscript ppds projectm pulseaudio python quicktime real \ + rdesktop rle 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" + +# apache2 gnutls perlsuid php rle samba +# aqua darcs kate qt3 qt4 skey + +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" + +QEMU_SOFTMMU_TARGETS="i386 x86_64" +QEMU_USER_TARGETS="i386 x86_64" + +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 04557ee..8878341 100644 --- a/portage/package.use +++ b/portage/package.use @@ -93,7 +93,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 @@ -230,12 +230,13 @@ net-libs/libvncserver gcrypt gnutls net-libs/xulrunner system-sqlite wifi net-misc/curl libssh2 +net-misc/iputils caps gnutls net-misc/networkmanager dhcpcd net-misc/ntp parse-clocks -zeroconf net-misc/openssh X509 sftplogging net-misc/openvpn eurephia iproute2 passwordsave net-misc/rdesktop rdpusb -net-misc/spice-gtk -gtk3 +net-misc/spice-gtk -gtk3 -pulseaudio # net-misc/vnc server net-misc/vpnc hybrid-auth diff --git a/postfix/main.cf b/postfix/main.cf index 210fdd5..01dcbc7 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -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,6 +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 -inet_protocols = ipv4 +readme_directory = /usr/share/doc/postfix-2.9.5/readme home_mailbox = .maildir/ diff --git a/profile.env b/profile.env index 543bf4f..8d8cd87 100644 --- a/profile.env +++ b/profile.env @@ -4,7 +4,7 @@ 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.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.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/vi' export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.0-r1/html' export GCC_SPECS='' @@ -29,7 +29,7 @@ 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.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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/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 PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin' @@ -42,8 +42,6 @@ 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 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 8db3416..d0004dc 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,6 +1,6 @@ # Generated by net-scripts for interface eth0 domain pb.local #search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de -search pb.local ri.pb.local profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net uhu-banane.de +search pb.local ri.pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net uhu-banane.de nameserver 192.168.178.30 nameserver 192.168.178.89 diff --git a/revdep-rebuild/61-sun-jdk-1.6 b/revdep-rebuild/61-sun-jdk-1.6 index b221cbb..530aeea 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 57e4dba..2e3ee7f 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/sane.d/dll.conf b/sane.d/dll.conf index 61c9908..6d184a8 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 645533e..329bf1c 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 fd2cd68..55ab231 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 29b5561..dce5290 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 0000000..5705452 --- /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 ea8cc47..664e459 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 ffc4c4c..a089ee9 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/sasl2/libvirt.conf b/sasl2/libvirt.conf index e24a130..bfa056f 100644 --- a/sasl2/libvirt.conf +++ b/sasl2/libvirt.conf @@ -18,9 +18,12 @@ mech_list: digest-md5 # qemu+tcp://hostname/system?auth=sasl.gssapi #mech_list: digest-md5 gssapi -# MIT kerberos ignores this option & needs KRB5_KTNAME env var. -# May be useful for other non-Linux OS though.... -keytab: /etc/libvirt/krb5.tab +# Some older builds of MIT kerberos on Linux ignore this option & +# instead need KRB5_KTNAME env var. +# For modern Linux, and other OS, this should be sufficient +# +# There is no default value here, uncomment if you need this +#keytab: /etc/libvirt/krb5.tab # If using digest-md5 for username/passwds, then this is the file # containing the passwds. Use 'saslpasswd2 -a libvirt [username]' diff --git a/shadow b/shadow index e13880e..331327f 100644 --- a/shadow +++ b/shadow @@ -42,3 +42,4 @@ colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: polkitd:!:15633:::::: +saned:!:15734:::::: diff --git a/shadow- b/shadow- index c5df427..e13880e 100644 --- a/shadow- +++ b/shadow- @@ -37,7 +37,7 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15716:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15733:::::: colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: diff --git a/texmf/ls-R b/texmf/ls-R index cd14e71..5882c9c 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 @@ -84,8 +84,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 0000000..69351bf 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 e69de29..0000000 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 0000000..7244c87 --- /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 f6f592e..f39253e 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 0000000..4b3e228 --- /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 +}