From: Frank Brehm Date: Mon, 27 Jan 2014 17:04:18 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=46f287f5297ae51ea7cdffbdb1639ca6ee075c85;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/DIR_COLORS b/DIR_COLORS index ca474ae..de64a03 100644 --- a/DIR_COLORS +++ b/DIR_COLORS @@ -1,7 +1,7 @@ # Configuration file for dircolors, a utility to help you set the # LS_COLORS environment variable used by GNU ls with the --color option. -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # Copying and distribution of this file, with or without modification, # are permitted provided the copyright notice and this notice are preserved. diff --git a/X11/Sessions/MATE b/X11/Sessions/MATE new file mode 100755 index 0000000..baa154b --- /dev/null +++ b/X11/Sessions/MATE @@ -0,0 +1,109 @@ +#!/bin/sh +# +# This file has bitrotted badly. Someone needs to clean this up. +# + +if [ -f /etc/xdg/menus/mate-applications.menu ] ; then + export XDG_MENU_PREFIX=mate- +fi + +for errfile in "$HOME/.materc-errors" "${TMPDIR-/tmp}/materc-$USER/tmp/materc-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done +# +# Distributors: +# You should modify the paths here to fit your distro +# If you need to do so, send me (jirka@5z.com) a patch +# and I'll try to make the script detect the distro stuff +# + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + +if [ -x "$HOME/.materc" ]; then + command="$HOME/.materc" +elif [ -x /etc/X11/gdm/materc ]; then + command="/etc/X11/gdm/materc" +else + # as fallback in case the config is screwed + command=`which mate-session` +fi + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec $command diff --git a/X11/WindowMaker/WMGLOBAL b/X11/WindowMaker/WMGLOBAL index 7f24b81..f087044 100644 --- a/X11/WindowMaker/WMGLOBAL +++ b/X11/WindowMaker/WMGLOBAL @@ -1,9 +1,9 @@ { - SystemFont = "Trebuchet MS,Luxi Sans"; - BoldSystemFont = "Trebuchet MS,Luxi Sans:bold"; + SystemFont = "Sans"; + BoldSystemFont = "Sans:bold"; DefaultFontSize = 11; AntialiasedText = Yes; - FloppyPath = "/floppy"; + FloppyPath = "/media/floppy"; DoubleClickTime = 250; MouseWheelUp = Button4; MouseWheelDown = Button5; diff --git a/X11/WindowMaker/WMRootMenu b/X11/WindowMaker/WMRootMenu index 574bc1b..aaf16d6 100644 --- a/X11/WindowMaker/WMRootMenu +++ b/X11/WindowMaker/WMRootMenu @@ -7,7 +7,7 @@ ("Process List", EXEC, "xterm -e top"), ("Manual Browser", EXEC, "xman") ), - ("Run...", SHEXEC, "%A(Run,Type command to run:)"), + ("Run...", SHEXEC, "%a(Run,Type command to run:)"), ("XTerm", EXEC, "xterm -sb"), ("Mozilla Firefox", EXEC, "firefox"), ("Workspaces", WORKSPACE_MENU), @@ -34,7 +34,7 @@ ("Xedit", EXEC, "xedit") ), ("Multimedia", - ("XMMS", + ("XMMS", ("XMMS", EXEC, "xmms"), ("XMMS play/pause", EXEC, "xmms -t"), ("XMMS stop", EXEC, "xmms -s") @@ -90,11 +90,11 @@ ("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") ), ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") - ), + ), ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), ("Preferences Utility", EXEC, "/usr/bin//WPrefs") - ), + ), ("Session", ("Save Session", SAVE_SESSION), ("Clear Session", CLEAR_SESSION), diff --git a/X11/WindowMaker/WMState b/X11/WindowMaker/WMState index c4d6b54..5df59cf 100644 --- a/X11/WindowMaker/WMState +++ b/X11/WindowMaker/WMState @@ -2,12 +2,12 @@ Dock = { Applications = ( { - Command = "-"; + Command = "/usr/bin/WPrefs"; Name = Logo.WMDock; AutoLaunch = No; Forced = No; Position = "0,0"; - DropCommand = "wmsetbg -u -t %d"; + Lock = Yes; }, { Command = xterm; @@ -15,14 +15,6 @@ AutoLaunch = No; Forced = No; Position = "0,1"; - }, - { - Command = "/usr/bin/WPrefs"; - Name = groupLeader.WPrefs; - AutoLaunch = No; - Forced = No; - Position = "0,2"; - Lock = Yes; } ); Position = "-64,0"; diff --git a/X11/WindowMaker/WMWindowAttributes b/X11/WindowMaker/WMWindowAttributes index 2f3b410..a27469b 100644 --- a/X11/WindowMaker/WMWindowAttributes +++ b/X11/WindowMaker/WMWindowAttributes @@ -4,7 +4,6 @@ Logo.WMClip = {Icon = clip.tiff;}; Dockit = {Icon = GNUstep.tiff;}; DockApp = {NoAppIcon = NO;}; - WSoundServer = {Icon = sound.tiff;}; panel.Panel = {NoAppIcon = YES;}; gmc.Gmc = {NoAppIcon = YES;}; XTerm = {Icon = Terminal.tiff;}; diff --git a/X11/WindowMaker/WindowMaker b/X11/WindowMaker/WindowMaker index 1080263..f4f3d63 100644 --- a/X11/WindowMaker/WindowMaker +++ b/X11/WindowMaker/WindowMaker @@ -12,8 +12,9 @@ "~/GNUstep/Library/Icons", "/usr/share/WindowMaker/Icons", "/usr/share/WindowMaker/Pixmaps", - "/usr/X11R6/include/X11/pixmaps", + "/usr/include/X11/pixmaps", "~/GNUstep/Library/WindowMaker/Pixmaps", + "~/GNUstep/Library/WindowMaker/CachedPixmaps", "/usr/share/icons", "/usr/local/share/pixmaps", "/usr/share/pixmaps" @@ -21,9 +22,10 @@ PixmapPath = ( "~/GNUstep/Library/WindowMaker/Pixmaps", "~/GNUstep/Library/WindowMaker/Backgrounds", + "~/GNUstep/Library/WindowMaker/CachedPixmaps", "/usr/share/WindowMaker/Pixmaps", "/usr/share/WindowMaker/Backgrounds", - "/usr/X11R6/include/X11/pixmaps", + "/usr/include/X11/pixmaps", "/usr/local/share/pixmaps", "/usr/share/pixmaps" ); @@ -38,9 +40,10 @@ ColormapSize = 4; DisableDithering = NO; ModifierKey = Mod1; - NewStyle = YES; + NewStyle = "new"; DisableDock = NO; DisableClip = NO; + DisableDrawers = NO; Superfluous = YES; StickyIcons = NO; SaveSessionOnExit = NO; @@ -99,18 +102,17 @@ MiniaturizeKey = "Mod1+M"; NextWorkspaceLayerKey = None; PrevWorkspaceLayerKey = None; - ClipLowerKey = None; - ClipRaiseKey = None; ConstrainWindowSize = NO; + DockRaiseLowerKey = None; ClipRaiseLowerKey = None; TitleJustify = center; - WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12"; - MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12"; - MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12"; - IconTitleFont = "Arial,Luxi Sans:pixelsize=9"; - ClipTitleFont = "Verdana:bold:pixelsize=10"; - DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12"; - LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24"; + WindowTitleFont = "Sans:bold:pixelsize=12"; + MenuTitleFont = "Sans:bold:pixelsize=12"; + MenuTextFont = "Sans:pixelsize=12"; + IconTitleFont = "Sans:pixelsize=9"; + ClipTitleFont = "Sans:bold:pixelsize=10"; + DisplayFont = "Sans:pixelsize=12"; + LargeDisplayFont = "Sans:pixelsize=24"; HighlightColor = white; HighlightTextColor = black; ClipTitleColor = black; @@ -130,4 +132,8 @@ MenuTitleBack = (solid, black); MenuTextBack = (solid, "rgb:aa/aa/aa"); IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); + ClipAutocollapseDelay = 1000; + ClipAutolowerDelay = 1000; + ClipAutoexpandDelay = 600; + ClipAutoraiseDelay = 600; } diff --git a/X11/dm/Sessions/wmaker.desktop b/X11/dm/Sessions/wmaker.desktop deleted file mode 100644 index 1bda476..0000000 --- a/X11/dm/Sessions/wmaker.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -# The names/descriptions should really be better -Name=GNUStep WindowMaker -Comment=Use this session to run WindowMaker as your desktop environment -Exec=/usr/bin/wmaker -Icon= -Type=Application diff --git a/X11/xinit/xinitrc.d/10-user-dirs-update-mate b/X11/xinit/xinitrc.d/10-user-dirs-update-mate new file mode 100755 index 0000000..35973aa --- /dev/null +++ b/X11/xinit/xinitrc.d/10-user-dirs-update-mate @@ -0,0 +1,10 @@ +#!/bin/sh + +# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. +# That file is read by glib to get XDG_PICTURES_DIR, etc + +if [ "$DESKTOP_SESSION" = "mate" ]; then + if type xdg-user-dirs-update >/dev/null 2>&1; then + xdg-user-dirs-update + fi +fi diff --git a/X11/xinit/xinitrc.d/10-xdg-menu-mate b/X11/xinit/xinitrc.d/10-xdg-menu-mate new file mode 100755 index 0000000..06a6a91 --- /dev/null +++ b/X11/xinit/xinitrc.d/10-xdg-menu-mate @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ] +then + export XDG_MENU_PREFIX=mate- +fi diff --git a/X11/xinit/xinitrc.d/15-xdg-data-mate b/X11/xinit/xinitrc.d/15-xdg-data-mate new file mode 100755 index 0000000..df360cf --- /dev/null +++ b/X11/xinit/xinitrc.d/15-xdg-data-mate @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "mate" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/ + else + export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS" + fi +fi diff --git a/conf.d/memcached b/conf.d/memcached index 7acf662..aad8078 100644 --- a/conf.d/memcached +++ b/conf.d/memcached @@ -1,35 +1,40 @@ -# Copyright 2003 Gentoo Technologies, Inc -# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/conf,v 1.1 2009/05/26 00:03:09 robbat2 Exp $ # memcached config file MEMCACHED_BINARY="/usr/bin/memcached" -#Specify memory usage in megabytes (do not use letters) -#64MB is default +# Specify memory usage in megabytes (do not use letters) +# 64MB is default MEMUSAGE="64" -#User to run as +# User to run as MEMCACHED_RUNAS="memcached" -#Specify maximum number of concurrent connections -#1024 is default +# Specify maximum number of concurrent connections +# 1024 is default MAXCONN="1024" -#Listen for connections on what address? +# Listen for connections on what address? # If this is empty, memcached will listen on 0.0.0.0 # be sure you have a firewall in place! LISTENON="" -#Listen for connections on what port? +# Listen for connections on what port? PORT="11211" # Listen for UDP connecitons on what port? 0 means turn off UDP UDPPORT="${PORT}" -#PID file location +# PID file location # '-${PORT}.${CONF}.pid' will be appended to this! # You do not normally need to change this. PIDBASE="/var/run/memcached/memcached" -#Other Options +# Socket to listen on +#SOCKET="/var/run/memcached/memcached.sock" + +# Socket mask +# 0700 is default +#SOCKET_MASK="0700" + +# Other Options MISC_OPTS="" diff --git a/conf.d/ntp-client b/conf.d/ntp-client index e85502c..786004d 100644 --- a/conf.d/ntp-client +++ b/conf.d/ntp-client @@ -14,3 +14,8 @@ NTPCLIENT_CMD="ntpdate" NTPCLIENT_OPTS="-s -b -u \ 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org \ 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + +# If you use hostnames above, then you should depend on dns +# being up & running before we try to run. Otherwise, you +# can disable this. +rc_use="dns" diff --git a/conf.d/postgresql-9.3 b/conf.d/postgresql-9.3 new file mode 100644 index 0000000..f792cd8 --- /dev/null +++ b/conf.d/postgresql-9.3 @@ -0,0 +1,58 @@ +# Which port and socket to bind PostgreSQL +PGPORT="5432" + +# How long to wait for server to start in seconds +START_TIMEOUT=10 + +# NICE_QUIT ignores new connections and wait for clients to disconnect from +# server before shutting down. NICE_TIMEOUT in seconds determines how long to +# wait for this to succeed. +NICE_TIMEOUT=60 + +# Forecfully disconnect clients from server and shut down. This is performed +# after NICE_QUIT. Terminated client connections have their open transactions +# rolled back. +# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds. +RUDE_QUIT="YES" +RUDE_TIMEOUT=30 + +# If the server still fails to shutdown, you can force it to quit by setting +# this to YES and a recover-run will execute on the next startup. +# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds. +FORCE_QUIT="NO" +FORCE_TIMEOUT=2 + +# Extra options to run postmaster with, e.g.: +# -N is the maximal number of client connections +# -B is the number of shared buffers and has to be at least 2x the value for -N +# Please read the man-page to postmaster for more options. Many of these +# options can be set directly in the configuration file. +#PGOPTS="-N 512 -B 1024" + +# Pass extra environment variables. If you have to export environment variables +# for the database process, this can be done here. +# Don't forget to escape quotes. +#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\"" + +############################################################################## +# +# The following values should not be arbitrarily changed. +# +# `emerge --config dev-db/postgresql-server:9.3' uses these values to +# determine where to create the data directory, where to place the +# configuration files, and any additional options to pass to initdb. +# +# The initscript also uses these variables to inform PostgreSQL where to find +# its data directory and configuration files. +# +############################################################################## + +# Location of configuration files +PGDATA="/etc/postgresql-9.3/" + +# Where the data directory is located/to be created +DATA_DIR="/var/lib/postgresql/9.3/data" + +# Additional options to pass to initdb. +# See `man initdb' for available options. +PG_INITDB_OPTS="--encoding=UTF8" diff --git a/conf.d/saned b/conf.d/saned new file mode 100644 index 0000000..adb1eab --- /dev/null +++ b/conf.d/saned @@ -0,0 +1,2 @@ +# The user saned should drop its privileges to after startup +#SANED_USER="" diff --git a/config-archive/etc/ssh/ssh_config b/config-archive/etc/ssh/ssh_config index c8afc3d..253075a 100644 --- a/config-archive/etc/ssh/ssh_config +++ b/config-archive/etc/ssh/ssh_config @@ -59,4 +59,4 @@ ServerAliveInterval 30 # PermitLocalCommand no # VisualHostKey no # ProxyCommand ssh -q -W %h:%p gateway.example.com - SendEnv LANG LC_* +# SendEnv LANG LC_* diff --git a/config-archive/etc/ssh/ssh_config.1 b/config-archive/etc/ssh/ssh_config.1 new file mode 100644 index 0000000..c8afc3d --- /dev/null +++ b/config-archive/etc/ssh/ssh_config.1 @@ -0,0 +1,62 @@ +# $OpenBSD$ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for some commonly used options. For a comprehensive +# list of available options, their meanings and defaults, please see the +# ssh_config(5) man page. + +# Host * +# ForwardAgent no +ForwardAgent yes +# ForwardX11 no +ForwardX11 yes +ServerAliveInterval 30 +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# GSSAPIAuthentication no +# GSSAPIDelegateCredentials no +# BatchMode no +# CheckHostIP yes +# AddressFamily any +# ConnectTimeout 0 +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc +# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 +# EscapeChar ~ +# AllowedCertPurpose sslserver +# MandatoryCRL no +# CACertificateFile /etc/ssh/ca/ca-bundle.crt +# CACertificatePath /etc/ssh/ca/crt +# CARevocationFile /etc/ssh/ca/ca-bundle.crl +# CARevocationPath /etc/ssh/ca/crl +# UserCACertificateFile ~/.ssh/ca-bundle.crt +# UserCACertificatePath ~/.ssh/crt +# UserCARevocationFile ~/.ssh/ca-bundle.crl +# UserCARevocationPath ~/.ssh/crl +# VAType none +# Tunnel no +# TunnelDevice any:any +# PermitLocalCommand no +# VisualHostKey no +# ProxyCommand ssh -q -W %h:%p gateway.example.com + SendEnv LANG LC_* diff --git a/config-archive/etc/ssh/ssh_config.dist b/config-archive/etc/ssh/ssh_config.dist new file mode 100644 index 0000000..fde6a76 --- /dev/null +++ b/config-archive/etc/ssh/ssh_config.dist @@ -0,0 +1,62 @@ +# $OpenBSD$ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for some commonly used options. For a comprehensive +# list of available options, their meanings and defaults, please see the +# ssh_config(5) man page. + +# Host * +# ForwardAgent no +# ForwardX11 no +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# GSSAPIAuthentication no +# GSSAPIDelegateCredentials no +# BatchMode no +# CheckHostIP yes +# AddressFamily any +# ConnectTimeout 0 +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc +# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 +# EscapeChar ~ +# AllowedCertPurpose sslserver +# MandatoryCRL no +# CACertificateFile /etc/ssh/ca/ca-bundle.crt +# CACertificatePath /etc/ssh/ca/crt +# CARevocationFile /etc/ssh/ca/ca-bundle.crl +# CARevocationPath /etc/ssh/ca/crl +# UserCACertificateFile ~/.ssh/ca-bundle.crt +# UserCACertificatePath ~/.ssh/crt +# UserCARevocationFile ~/.ssh/ca-bundle.crl +# UserCARevocationPath ~/.ssh/crl +# VAType none +# Tunnel no +# TunnelDevice any:any +# PermitLocalCommand no +# VisualHostKey no +# ProxyCommand ssh -q -W %h:%p gateway.example.com +# RekeyLimit 1G 1h + +# Send locale environment variables #367017 +SendEnv LANG LC_* diff --git a/config-archive/etc/ssh/ssh_config.dist.new b/config-archive/etc/ssh/ssh_config.dist.new deleted file mode 100644 index b632c25..0000000 --- a/config-archive/etc/ssh/ssh_config.dist.new +++ /dev/null @@ -1,58 +0,0 @@ -# $OpenBSD$ - -# This is the ssh client system-wide configuration file. See -# ssh_config(5) for more information. This file provides defaults for -# users, and the values can be changed in per-user configuration files -# or on the command line. - -# Configuration data is parsed as follows: -# 1. command line options -# 2. user-specific file -# 3. system-wide file -# Any configuration value is only changed the first time it is set. -# Thus, host-specific definitions should be at the beginning of the -# configuration file, and defaults at the end. - -# Site-wide defaults for some commonly used options. For a comprehensive -# list of available options, their meanings and defaults, please see the -# ssh_config(5) man page. - -# Host * -# ForwardAgent no -# ForwardX11 no -# RhostsRSAAuthentication no -# RSAAuthentication yes -# PasswordAuthentication yes -# HostbasedAuthentication no -# GSSAPIAuthentication no -# GSSAPIDelegateCredentials no -# BatchMode no -# CheckHostIP yes -# AddressFamily any -# ConnectTimeout 0 -# StrictHostKeyChecking ask -# IdentityFile ~/.ssh/identity -# IdentityFile ~/.ssh/id_rsa -# IdentityFile ~/.ssh/id_dsa -# Port 22 -# Protocol 2,1 -# Cipher 3des -# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc -# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 -# EscapeChar ~ -# AllowedCertPurpose sslserver -# MandatoryCRL no -# CACertificateFile /etc/ssh/ca/ca-bundle.crt -# CACertificatePath /etc/ssh/ca/crt -# CARevocationFile /etc/ssh/ca/ca-bundle.crl -# CARevocationPath /etc/ssh/ca/crl -# UserCACertificateFile ~/.ssh/ca-bundle.crt -# UserCACertificatePath ~/.ssh/crt -# UserCARevocationFile ~/.ssh/ca-bundle.crl -# UserCARevocationPath ~/.ssh/crl -# VAType none -# Tunnel no -# TunnelDevice any:any -# PermitLocalCommand no -# VisualHostKey no -# ProxyCommand ssh -q -W %h:%p gateway.example.com diff --git a/config-archive/etc/ssh/sshd_config.dist b/config-archive/etc/ssh/sshd_config.dist new file mode 100644 index 0000000..e818623 --- /dev/null +++ b/config-archive/etc/ssh/sshd_config.dist @@ -0,0 +1,214 @@ +# $OpenBSD$ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# "key type names" for X.509 certificates with RSA key +# Note first defined is used in signature operations! +#X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1 +#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5 + +# "key type names" for X.509 certificates with DSA key +# Note first defined is used in signature operations! +#X509KeyAlgorithm x509v3-sign-dss,dss-asn1 +#X509KeyAlgorithm x509v3-sign-dss,dss-raw + +# The intended use for the X509 client certificate. Without this option +# no chain verification will be done. Currently accepted uses are case +# insensitive: +# - "sslclient", "SSL client", "SSL_client" or "client" +# - "any", "Any Purpose", "Any_Purpose" or "AnyPurpose" +# - "skip" or ""(empty): don`t check purpose. +#AllowedCertPurpose sslclient + +# Specifies whether self-issued(self-signed) X.509 certificate can be +# allowed only by entry in AutorizedKeysFile that contain matching +# public key or certificate blob. +#KeyAllowSelfIssued no + +# Specifies whether CRL must present in store for all certificates in +# certificate chain with atribute "cRLDistributionPoints" +#MandatoryCRL no + +# A file with multiple certificates of certificate signers +# in PEM format concatenated together. +#CACertificateFile /etc/ssh/ca/ca-bundle.crt + +# A directory with certificates of certificate signers. +# The certificates should have name of the form: [HASH].[NUMBER] +# or have symbolic links to them of this form. +#CACertificatePath /etc/ssh/ca/crt + +# A file with multiple CRL of certificate signers +# in PEM format concatenated together. +#CARevocationFile /etc/ssh/ca/ca-bundle.crl + +# A directory with CRL of certificate signers. +# The CRL should have name of the form: [HASH].r[NUMBER] +# or have symbolic links to them of this form. +#CARevocationPath /etc/ssh/ca/crl + +# LDAP protocol version. +# Example: +# CAldapVersion 2 + +# Note because of OpenSSH options parser limitation +# use %3D instead of = ! +# LDAP initialization may require URL to be escaped, i.e. +# use %2C instead of ,(comma). Escaped URL don't depend from +# LDAP initialization method. +# Example: +# CAldapURL ldap://localhost:389/dc%3Dexample%2Cdc%3Dcom + +# SSH can use "Online Certificate Status Protocol"(OCSP) +# to validate certificate. Set VAType to +# - none : do not use OCSP to validate certificates; +# - ocspcert: validate only certificates that specify `OCSP +# Service Locator' URL; +# - ocspspec: use specified in the configuration 'OCSP Responder' +# to validate all certificates. +#VAType none + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Ciphers and keying +#RekeyLimit default none + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +#AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +PasswordAuthentication no +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes +#GSSAPIStrictAcceptorCheck yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +PrintMotd no +PrintLastLog no +#TCPKeepAlive yes +#UseLogin no +UsePrivilegeSeparation sandbox # Default for new installations. +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib64/misc/sftp-server + +# the following are HPN related configuration options +# tcp receive buffer polling. disable in non autotuning kernels +#TcpRcvBufPoll yes + +# disable hpn performance boosts +#HPNDisabled no + +# buffer size for hpn to non-hpn connections +#HPNBufferSize 2048 + + +# allow the use of the none cipher +#NoneEnabled no + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +# Allow client to pass locale environment variables #367017 +AcceptEnv LANG LC_* diff --git a/config-archive/etc/ssh/sshd_config.dist.new b/config-archive/etc/ssh/sshd_config.dist.new deleted file mode 100644 index 6a61721..0000000 --- a/config-archive/etc/ssh/sshd_config.dist.new +++ /dev/null @@ -1,202 +0,0 @@ -# $OpenBSD$ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -# The default requires explicit activation of protocol 1 -#Protocol 2 - -# HostKey for protocol version 1 -#HostKey /etc/ssh/ssh_host_key -# HostKeys for protocol version 2 -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_dsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key - -# "key type names" for X.509 certificates with RSA key -# Note first defined is used in signature operations! -#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5 -#X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1 - -# "key type names" for X.509 certificates with DSA key -# Note first defined is used in signature operations! -#X509KeyAlgorithm x509v3-sign-dss,dss-asn1 -#X509KeyAlgorithm x509v3-sign-dss,dss-raw - -# The intended use for the X509 client certificate. Without this option -# no chain verification will be done. Currently accepted uses are case -# insensitive: -# - "sslclient", "SSL client", "SSL_client" or "client" -# - "any", "Any Purpose", "Any_Purpose" or "AnyPurpose" -# - "skip" or ""(empty): don`t check purpose. -#AllowedCertPurpose sslclient - -# Specifies whether self-issued(self-signed) X.509 certificate can be -# allowed only by entry in AutorizedKeysFile that contain matching -# public key or certificate blob. -#KeyAllowSelfIssued no - -# Specifies whether CRL must present in store for all certificates in -# certificate chain with atribute "cRLDistributionPoints" -#MandatoryCRL no - -# A file with multiple certificates of certificate signers -# in PEM format concatenated together. -#CACertificateFile /etc/ssh/ca/ca-bundle.crt - -# A directory with certificates of certificate signers. -# The certificates should have name of the form: [HASH].[NUMBER] -# or have symbolic links to them of this form. -#CACertificatePath /etc/ssh/ca/crt - -# A file with multiple CRL of certificate signers -# in PEM format concatenated together. -#CARevocationFile /etc/ssh/ca/ca-bundle.crl - -# A directory with CRL of certificate signers. -# The CRL should have name of the form: [HASH].r[NUMBER] -# or have symbolic links to them of this form. -#CARevocationPath /etc/ssh/ca/crl - -# LDAP protocol version. -# Example: -# CAldapVersion 2 - -# Note because of OpenSSH options parser limitation -# use %3D instead of = ! -# LDAP initialization may require URL to be escaped, i.e. -# use %2C instead of ,(comma). Escaped URL don't depend from -# LDAP initialization method. -# Example: -# CAldapURL ldap://localhost:389/dc%3Dexample%2Cdc%3Dcom - -# SSH can use "Online Certificate Status Protocol"(OCSP) -# to validate certificate. Set VAType to -# - none : do not use OCSP to validate certificates; -# - ocspcert: validate only certificates that specify `OCSP -# Service Locator' URL; -# - ocspspec: use specified in the configuration 'OCSP Responder' -# to validate all certificates. -#VAType none - -# Lifetime and size of ephemeral version 1 server key -#KeyRegenerationInterval 1h -#ServerKeyBits 1024 - -# Logging -# obsoletes QuietMode and FascistLogging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -#PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#RSAAuthentication yes -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -#AuthorizedKeysFile .ssh/authorized_keys - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#RhostsRSAAuthentication no -# similar for protocol version 2 -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# RhostsRSAAuthentication and HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -PasswordAuthentication no -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -#ChallengeResponseAuthentication yes - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes -#GSSAPIStrictAcceptorCheck yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -PrintMotd no -PrintLastLog no -#TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10 -#PermitTunnel no -#ChrootDirectory none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib64/misc/sftp-server - -# the following are HPN related configuration options -# tcp receive buffer polling. disable in non autotuning kernels -#TcpRcvBufPoll yes - -# allow the use of the none cipher -#NoneEnabled no - -# disable hpn performance boosts. -#HPNDisabled no - -# buffer size for hpn to non-hpn connections -#HPNBufferSize 2048 - - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# ForceCommand cvs server diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index fa8539d..1af8d17 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,12 +1,3 @@ # Subscription configuration file for CUPS v1.6.4 -# Written by cupsd on 2014-01-20 15:18 +# Written by cupsd on 2014-01-20 16:43 NextSubscriptionId 14 - -Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped -Owner fbrehm -Recipient dbus:// -LeaseDuration 3600 -Interval 0 -ExpirationTime 1390231098 -NextEventId 1 - diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index e3002f3..f83e780 100644 --- a/cups/subscriptions.conf.O +++ b/cups/subscriptions.conf.O @@ -1,5 +1,5 @@ # Subscription configuration file for CUPS v1.6.4 -# Written by cupsd on 2014-01-20 14:20 +# Written by cupsd on 2014-01-20 16:17 NextSubscriptionId 14 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped @@ -7,6 +7,6 @@ Owner fbrehm Recipient dbus:// LeaseDuration 3600 Interval 0 -ExpirationTime 1390227598 +ExpirationTime 1390234598 NextEventId 1 diff --git a/dbus-1/system.d/org.mate.CPUFreqSelector.conf b/dbus-1/system.d/org.mate.CPUFreqSelector.conf new file mode 100644 index 0000000..c4b27a2 --- /dev/null +++ b/dbus-1/system.d/org.mate.CPUFreqSelector.conf @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf b/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf new file mode 100644 index 0000000..297f121 --- /dev/null +++ b/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/env.d/05binutils b/env.d/05binutils index 40c7c1f..7b6cfe5 100644 --- a/env.d/05binutils +++ b/env.d/05binutils @@ -1,2 +1,2 @@ -MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man -INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info +MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.2/man +INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.2/info diff --git a/env.d/50postgresql b/env.d/50postgresql index e71633d..8a0474e 100644 --- a/env.d/50postgresql +++ b/env.d/50postgresql @@ -1,4 +1,4 @@ # Configuration file for eselect # This file has been automatically generated. -LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.2/lib64/" -MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/" +LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.3/lib64/:/usr/lib64/postgresql-9.2/lib64/" +MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.3/man/:/usr/share/postgresql-9.2/man/" diff --git a/env.d/binutils/config-x86_64-pc-linux-gnu b/env.d/binutils/config-x86_64-pc-linux-gnu index 930d9b8..9abf957 100644 --- a/env.d/binutils/config-x86_64-pc-linux-gnu +++ b/env.d/binutils/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=2.23.1 +CURRENT=2.23.2 diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 b/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 deleted file mode 100644 index d9ce38f..0000000 --- a/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 +++ /dev/null @@ -1,4 +0,0 @@ -TARGET="x86_64-pc-linux-gnu" -VER="2.23.1" -LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.23.1" -FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.23.2 b/env.d/binutils/x86_64-pc-linux-gnu-2.23.2 new file mode 100644 index 0000000..6f49818 --- /dev/null +++ b/env.d/binutils/x86_64-pc-linux-gnu-2.23.2 @@ -0,0 +1,4 @@ +TARGET="x86_64-pc-linux-gnu" +VER="2.23.2" +LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.23.2" +FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/eselect/postgresql/active.links93 b/eselect/postgresql/active.links93 new file mode 100644 index 0000000..29de2be --- /dev/null +++ b/eselect/postgresql/active.links93 @@ -0,0 +1,33 @@ +usr/bin/pg_dumpall93 +usr/bin/pg_resetxlog93 +usr/bin/postmaster93 +usr/bin/dropdb93 +usr/bin/pg_ctl93 +usr/bin/createlang93 +usr/bin/pg_isready93 +usr/bin/pg_archivecleanup93 +usr/bin/pg_test_timing93 +usr/bin/pg_test_fsync93 +usr/bin/pg_upgrade93 +usr/bin/pg_basebackup93 +usr/bin/pgbench93 +usr/bin/ecpg93 +usr/bin/createdb93 +usr/bin/pg_controldata93 +usr/bin/pg_receivexlog93 +usr/bin/pg_standby93 +usr/bin/initdb93 +usr/bin/vacuumdb93 +usr/bin/dropuser93 +usr/bin/oid2name93 +usr/bin/createuser93 +usr/bin/droplang93 +usr/bin/clusterdb93 +usr/bin/reindexdb93 +usr/bin/pg_restore93 +usr/bin/psql93 +usr/bin/postgres93 +usr/bin/pg_config93 +usr/bin/pg_dump93 +usr/bin/vacuumlo93 +usr/bin/pg_xlogdump93 diff --git a/eselect/postgresql/slots/9.3/base b/eselect/postgresql/slots/9.3/base new file mode 100644 index 0000000..33756c8 --- /dev/null +++ b/eselect/postgresql/slots/9.3/base @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.3.2" diff --git a/eselect/postgresql/slots/9.3/server b/eselect/postgresql/slots/9.3/server new file mode 100644 index 0000000..3853b3b --- /dev/null +++ b/eselect/postgresql/slots/9.3/server @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.3.2" diff --git a/etckeeper/commit.d/50vcs-commit b/etckeeper/commit.d/50vcs-commit index 3a4c819..7c6173f 100755 --- a/etckeeper/commit.d/50vcs-commit +++ b/etckeeper/commit.d/50vcs-commit @@ -47,23 +47,29 @@ if [ "$VCS" = git ] && [ -d .git ]; then if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then if [ -z "$GIT_AUTHOR_NAME" ]; then GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.gitconfig" user.name)" || true + export GIT_AUTHOR_NAME fi if [ -z "$GIT_AUTHOR_EMAIL" ]; then GIT_AUTHOR_EMAIL="$(git config -f "$USER_HOME/.gitconfig" user.email)" || true + export GIT_AUTHOR_EMAIL fi fi if [ -z "$GIT_COMMITTER_EMAIL" ]; then GIT_COMMITER_EMAIL="$(git config --global user.email)" || true + export GIT_COMMITER_EMAIL fi if [ -z "$GIT_AUTHOR_NAME" ]; then - export GIT_AUTHOR_NAME="$USER" + GIT_AUTHOR_NAME="$USER" + export GIT_AUTHOR_NAME fi if [ -z "$GIT_AUTHOR_EMAIL" ]; then - export GIT_AUTHOR_EMAIL="$USER@$hostname" + GIT_AUTHOR_EMAIL="$USER@$hostname" + export GIT_AUTHOR_EMAIL fi if [ -z "$GIT_COMMITTER_EMAIL" ]; then - export GIT_COMMITTER_EMAIL=`whoami`"@$hostname" + GIT_COMMITTER_EMAIL=`whoami`"@$hostname" + export GIT_COMMITTER_EMAIL fi fi if [ -n "$logfile" ]; then @@ -73,10 +79,12 @@ if [ "$VCS" = git ] && [ -d .git ]; then fi elif [ "$VCS" = hg ] && [ -d .hg ]; then if [ -n "$USER" ]; then - export LOGNAME="$USER" + LOGNAME="$USER" + export LOGNAME fi if [ -z "$HGUSER" ]; then - export HGUSER="$USER@$hostname" + HGUSER="$USER@$hostname" + export HGUSER fi if [ -n "$logfile" ]; then hg commit $HG_COMMIT_OPTIONS -l "$logfile" @@ -85,7 +93,8 @@ elif [ "$VCS" = hg ] && [ -d .hg ]; then fi elif [ "$VCS" = bzr ] && [ -d .bzr ]; then if [ -z "$EMAIL" ] && [ -n "$USER" ]; then - export EMAIL="$USER <$USER@$hostname>" + EMAIL="$USER <$USER@$hostname>" + export EMAIL fi if [ -n "$logfile" ]; then bzr commit $BZR_COMMIT_OPTIONS -F "$logfile" diff --git a/etckeeper/commit.d/99push b/etckeeper/commit.d/99push index 9a5d81e..5aa8d21 100755 --- a/etckeeper/commit.d/99push +++ b/etckeeper/commit.d/99push @@ -2,6 +2,8 @@ if [ -n "$PUSH_REMOTE" ]; then if [ "$VCS" = git ] && [ -d .git ]; then git push "$PUSH_REMOTE" master || true + elif [ "$VCS" = hg ] && [ -d .hg ]; then + hg push "$PUSH_REMOTE" || true else echo "PUSH_REMOTE not yet supported for $VCS" >&2 fi diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore index caa1759..8a4d614 100755 --- a/etckeeper/update-ignore.d/01update-ignore +++ b/etckeeper/update-ignore.d/01update-ignore @@ -130,7 +130,6 @@ writefile () { ignore network/run ignore adjtime ignore lvm/cache - ignore lvm/backup ignore lvm/archive ignore "X11/xdm/authdir/authfiles/*" ignore ntp.conf.dhcp diff --git a/gai.conf b/gai.conf index ac31e38..4616ed0 100644 --- a/gai.conf +++ b/gai.conf @@ -55,21 +55,11 @@ # # scopev4 -# Add another rule to the RFC 3484 scope table for IPv4 addresses. -# The definitions in RFC 3484 are equivalent to: +# Add another rule to the RFC 6724 scope table for IPv4 addresses. +# By default the scope IDs described in section 3.2 in RFC 6724 are +# used. Changing these defaults should hardly ever be necessary. +# The defaults are equivalent to: # #scopev4 ::ffff:169.254.0.0/112 2 #scopev4 ::ffff:127.0.0.0/104 2 -#scopev4 ::ffff:10.0.0.0/104 5 -#scopev4 ::ffff:172.16.0.0/108 5 -#scopev4 ::ffff:192.168.0.0/112 5 #scopev4 ::ffff:0.0.0.0/96 14 -# -# For sites which use site-local IPv4 addresses behind NAT there is -# the problem that even if IPv4 addresses are preferred they do not -# have the same scope and are therefore not sorted first. To change -# this use only these rules: -# -scopev4 ::ffff:169.254.0.0/112 2 -scopev4 ::ffff:127.0.0.0/104 2 -scopev4 ::ffff:0.0.0.0/96 14 diff --git a/highlight/filetypes.conf b/highlight/filetypes.conf index 4a51ba1..1e43a85 100644 --- a/highlight/filetypes.conf +++ b/highlight/filetypes.conf @@ -3,6 +3,7 @@ FileMapping = { { Lang="ada", Extensions={"adb", "ads", "a", "gnad"} }, + { Lang="algol", Extensions={"alg"} }, { Lang="ampl", Extensions={"dat", "run"} }, { Lang="amtrix", Extensions={"s4", "s4t", "s4h", "hnd", "t4"} }, { Lang="asm", Extensions={"a51", "29k", "68s", "68x", "x86"} }, @@ -11,6 +12,7 @@ FileMapping = { { Lang="aspect", Extensions={"was", "wud"} }, { Lang="bat", Extensions={"cmd"} }, { Lang="c", Extensions={"c++", "cpp", "cxx", "cc", "h", "hh", "hxx", "hpp", "cu"} }, + { Lang="charmm", Extensions={"inp"} }, { Lang="coldfusion", Extensions={"cfc","cfm"} }, { Lang="cobol", Extensions={"cob", "cbl"} }, { Lang="diff", Extensions={"patch"} }, @@ -19,11 +21,13 @@ FileMapping = { { Lang="euphoria", Extensions={"ex", "exw", "wxu", "ew", "eu"} }, { Lang="fortran77", Extensions={"f", "for", "ftn"} }, { Lang="fortran90", Extensions={"f95", "f90"} }, + { Lang="gambas", Extensions={"class"} }, { Lang="haskell", Extensions={"hs"} }, { Lang="java", Extensions={"groovy", "grv"} }, + { Lang="limbo", Extensions={"b"} }, { Lang="lisp", Extensions={"cl", "clisp", "el", "lsp", "sbcl", "scom"} }, { Lang="make", Extensions={"mak", "mk"} }, - { Lang="smnp", Extensions={"mib","smi"} }, + { Lang="snmp", Extensions={"mib", "smi"} }, { Lang="ocaml", Extensions={"ml","mli"} }, { Lang="mod2", Extensions={"mod", "def"} }, { Lang="mod3", Extensions={"m3", "i3"} }, @@ -45,7 +49,7 @@ FileMapping = { { 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"} }, + "wml","vxml", "wml", "tld", "svg","xsl", "ecf", "jnlp", "xsd", "resx"} }, { Lang="fsharp", Extensions={"fs","fsx"} }, { Lang="informix", Extensions={"4gl"} }, { Lang="blitzbasic", Extensions={"bb"} }, @@ -76,14 +80,13 @@ FileMapping = { { Lang="autoit", Extensions={"au3"} }, { Lang="chill", Extensions={"chl"} }, { Lang="autohotkey", Extensions={"ahk"} }, - { Lang="fame", Extensions={"inp"} }, + { Lang="fame", Extensions={"fame"} }, { 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"} }, @@ -92,10 +95,17 @@ FileMapping = { { Lang="bibtex", Extensions={"bib"} }, { Lang="python", Extensions={"py"} }, { Lang="txt", Extensions={"text"} }, + { Lang="n3", Extensions={"ttl", "nt"} }, + { Lang="biferno", Extensions={"bfr"} }, + { Lang="scilab", Extensions={"sci", "sce"} }, - { 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]] }, - + { Lang="xml", Shebang=[[^\s*<\?xml\s+version=\"1\.0\"\s+[^(\?>)]*?>\s*$]] }, + { Lang="sh", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?([bd]ash|t?csh|[akz]?sh)]] }, + { Lang="make",Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?make]] }, + { Lang="awk", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?[gnm]?awk]] }, + { Lang="perl", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?perl]] }, + { Lang="python", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?python]] }, + { Lang="ruby", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?ruby]] }, + { Lang="php", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?php]] } } + diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap index c4da0b4..47f1c70 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.23 on Wed Dec 18 15:10:56 2013 +# by sane-desc 3.5 from sane-backends 1.0.24 on Mon Jan 20 20:41:41 2014 # # The entries below are used to detect a USB device and change owner # and permissions on the "device node" used by libusb. @@ -162,6 +162,8 @@ libusbscanner 0x0003 0x040a 0x4065 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 4.1 +libusbscanner 0x0003 0x040a 0x4069 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 @@ -556,6 +558,46 @@ libusbscanner 0x0003 0x04a9 0x175c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 PIXMA MP230 +libusbscanner 0x0003 0x04a9 0x175f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG2200 Series +libusbscanner 0x0003 0x04a9 0x1760 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA E510 +libusbscanner 0x0003 0x04a9 0x1761 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG3200 Series +libusbscanner 0x0003 0x04a9 0x1762 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG4200 Series +libusbscanner 0x0003 0x04a9 0x1763 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG5400 Series +libusbscanner 0x0003 0x04a9 0x1764 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG6300 Series +libusbscanner 0x0003 0x04a9 0x1765 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX390 Series +libusbscanner 0x0003 0x04a9 0x1766 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA E610 +libusbscanner 0x0003 0x04a9 0x1767 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX450 Series +libusbscanner 0x0003 0x04a9 0x1768 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX520 Series +libusbscanner 0x0003 0x04a9 0x1769 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX720 Series +libusbscanner 0x0003 0x04a9 0x176a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MX920 Series +libusbscanner 0x0003 0x04a9 0x176b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG2400 Series +libusbscanner 0x0003 0x04a9 0x176c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG2500 Series +libusbscanner 0x0003 0x04a9 0x176d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG3500 Series +libusbscanner 0x0003 0x04a9 0x176e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG6500 Series +libusbscanner 0x0003 0x04a9 0x176f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG6400 Series +libusbscanner 0x0003 0x04a9 0x1770 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG5500 Series +libusbscanner 0x0003 0x04a9 0x1771 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon PIXMA MG7100 Series +libusbscanner 0x0003 0x04a9 0x1772 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 @@ -570,6 +612,8 @@ libusbscanner 0x0003 0x04a9 0x1908 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04a9 0x1909 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan LiDE 210 libusbscanner 0x0003 0x04a9 0x190a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon CanoScan 9000F Mark II +libusbscanner 0x0003 0x04a9 0x190d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan fb630u | Canon CanoScan fb636u libusbscanner 0x0003 0x04a9 0x2204 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CanoScan N650U/N656U @@ -642,10 +686,26 @@ libusbscanner 0x0003 0x04a9 0x26ec 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 D420 +libusbscanner 0x0003 0x04a9 0x26ef 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon i-SENSYS MF5880dn +libusbscanner 0x0003 0x04a9 0x26f9 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon i-SENSYS MF6680dn +libusbscanner 0x0003 0x04a9 0x26fa 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 +# Canon i-SENSYS MF4550d +libusbscanner 0x0003 0x04a9 0x2736 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageCLASS MF4410 | Canon imageCLASS MF4430 libusbscanner 0x0003 0x04a9 0x2737 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageRUNNER 1133 +libusbscanner 0x0003 0x04a9 0x2742 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon i-SENSYS MF3010 +libusbscanner 0x0003 0x04a9 0x2759 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageCLASS MF4570dw +libusbscanner 0x0003 0x04a9 0x275a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon imageCLASS MF4770n +libusbscanner 0x0003 0x04a9 0x2774 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 @@ -742,8 +802,14 @@ libusbscanner 0x0003 0x04b8 0x013a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 +# EPSON ES-D350 | EPSON GT-S85 libusbscanner 0x0003 0x04b8 0x0144 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON DS-30 +libusbscanner 0x0003 0x04b8 0x0147 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON GT-F740 | EPSON GT-S640 | EPSON Perfection V37 | EPSON Perfection V370 Photo +libusbscanner 0x0003 0x04b8 0x014a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ES-G11000 | EPSON Expression 11000XL +libusbscanner 0x0003 0x04b8 0x014b 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 @@ -884,7 +950,7 @@ libusbscanner 0x0003 0x04b8 0x0864 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04b8 0x0865 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # 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 +# EPSON PX-1600F | EPSON WF-7510 Series 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 @@ -896,21 +962,23 @@ libusbscanner 0x0003 0x04b8 0x0871 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 +# EPSON Artisan 635 | 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 +# EPSON Artisan 730 Series | EPSON EP-804A | EPSON EP-804AR | EPSON EP-804AW | EPSON Stylus Photo PX730WD Series | EPSON Stylus Photo TX730WD Series libusbscanner 0x0003 0x04b8 0x087b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# EPSON PX-1700F +# EPSON PX-1700F | EPSON WF-7520 Series 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 +# EPSON PX-B750F | EPSON WP-4511 | EPSON WP-4515 | EPSON WP-4521 | EPSON WP-4525 | EPSON WP-4530 Series | EPSON WP-4540 Series libusbscanner 0x0003 0x04b8 0x087d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON WP-4590 Series +libusbscanner 0x0003 0x04b8 0x087e 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 +# EPSON ME OFFICE 570W Series | 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 +# EPSON ME OFFICE 535 | EPSON PX-404A | EPSON Stylus SX230 Series | 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 @@ -922,12 +990,58 @@ libusbscanner 0x0003 0x04b8 0x0885 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 +# EPSON PX-504A | EPSON Stylus Office BX535WD | EPSON Stylus NX530 Series | 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 +# EPSON LP-M5300 Series +libusbscanner 0x0003 0x04b8 0x0894 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-045A | EPSON XP-100 Series +libusbscanner 0x0003 0x04b8 0x0895 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME-301 | EPSON XP-200 Series +libusbscanner 0x0003 0x04b8 0x0896 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME-303 | EPSON PX-405A +libusbscanner 0x0003 0x04b8 0x0897 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME-401 | EPSON PX-435A | EPSON XP-300 Series | EPSON XP-400 Series +libusbscanner 0x0003 0x04b8 0x0898 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-605F | EPSON PX-675F | EPSON WF-3520 Series | EPSON WF-3530 Series | EPSON WF-3540 Series +libusbscanner 0x0003 0x04b8 0x0899 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-905F | EPSON XP-850 Series +libusbscanner 0x0003 0x04b8 0x089a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-905A | EPSON XP-800 Series +libusbscanner 0x0003 0x04b8 0x089b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-805A | EPSON EP-805AR | EPSON EP-805AW | EPSON XP-750 Series +libusbscanner 0x0003 0x04b8 0x089c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON XP-700 Series +libusbscanner 0x0003 0x04b8 0x089d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-775A | EPSON EP-775AW | EPSON XP-600 Series +libusbscanner 0x0003 0x04b8 0x089e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON EP-705A +libusbscanner 0x0003 0x04b8 0x089f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON ME-101 +libusbscanner 0x0003 0x04b8 0x08a0 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON L210 Series | EPSON L350 | EPSON L351 +libusbscanner 0x0003 0x04b8 0x08a1 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-505F | EPSON WF-2510 Series +libusbscanner 0x0003 0x04b8 0x08a5 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON PX-535F | EPSON WF-2520 Series | EPSON WF-2530 Series | EPSON WF-2540 Series +libusbscanner 0x0003 0x04b8 0x08a6 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON L355 | EPSON L358 +libusbscanner 0x0003 0x04b8 0x08a8 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON L550 +libusbscanner 0x0003 0x04b8 0x08a9 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON M200 Series +libusbscanner 0x0003 0x04b8 0x08aa 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON WF-M1560 Series +libusbscanner 0x0003 0x04b8 0x08ab 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON XP-211 | EPSON XP-212 | EPSON XP-215 +libusbscanner 0x0003 0x04b8 0x08ae 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON XP-310 Series +libusbscanner 0x0003 0x04b8 0x08af 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# EPSON XP-410 Series +libusbscanner 0x0003 0x04b8 0x08b0 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 @@ -1016,8 +1130,10 @@ libusbscanner 0x0003 0x04c5 0x11f3 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 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 +# Fujitsu fi-5950 libusbscanner 0x0003 0x04c5 0x1213 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Fujitsu ScanSnap iX500 +libusbscanner 0x0003 0x04c5 0x132b 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 @@ -1042,42 +1158,116 @@ libusbscanner 0x0003 0x04da 0x100e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x04da 0x100f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Panasonic KV-S1045C libusbscanner 0x0003 0x04da 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX-4216F +# Samsung SCX-4216F | Samsung SCX-4x16 libusbscanner 0x0003 0x04e8 0x3409 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX-4100 +# Samsung SCX-6x20 +libusbscanner 0x0003 0x04e8 0x340d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung MFP-560 +libusbscanner 0x0003 0x04e8 0x340e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung MFP-750 +libusbscanner 0x0003 0x04e8 0x340f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4x20 +libusbscanner 0x0003 0x04e8 0x3412 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4100 | Samsung SCX-4100 libusbscanner 0x0003 0x04e8 0x3413 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX-4521F +# Samsung SCX-4521F | Samsung SCX-4x21 libusbscanner 0x0003 0x04e8 0x3419 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-5x30 +libusbscanner 0x0003 0x04e8 0x341a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4200 | Samsung SCX-4200 libusbscanner 0x0003 0x04e8 0x341b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX4725-FN +# Samsung CLX-3160 +libusbscanner 0x0003 0x04e8 0x341c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-6x22 +libusbscanner 0x0003 0x04e8 0x341d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX4725 | Samsung SCX4725-FN libusbscanner 0x0003 0x04e8 0x341f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-6x45 +libusbscanner 0x0003 0x04e8 0x3420 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-8380 +libusbscanner 0x0003 0x04e8 0x3421 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 +# Samsung CLX-6200 +libusbscanner 0x0003 0x04e8 0x3427 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-6240 +libusbscanner 0x0003 0x04e8 0x3428 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-6x55 +libusbscanner 0x0003 0x04e8 0x3429 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-3170fn (CLX-3170 Series) | Samsung CLX-3175FW libusbscanner 0x0003 0x04e8 0x342a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4500W libusbscanner 0x0003 0x04e8 0x342b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX-4824 +# Samsung SCX-4824 (SCX-4x24 Series) libusbscanner 0x0003 0x04e8 0x342c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX-4828FN (4x28 Series) +# Samsung SCX-4828FN (SCX-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-5835_5935 +libusbscanner 0x0003 0x04e8 0x342f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-5635 +libusbscanner 0x0003 0x04e8 0x3430 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4x26 +libusbscanner 0x0003 0x04e8 0x3432 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4600 libusbscanner 0x0003 0x04e8 0x3433 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Samsung SCX-4623 libusbscanner 0x0003 0x04e8 0x3434 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -# Samsung SCX-4825FN +# Samsung MFP-65x +libusbscanner 0x0003 0x04e8 0x3435 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-6545 +libusbscanner 0x0003 0x04e8 0x3437 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-8385 +libusbscanner 0x0003 0x04e8 0x3439 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-6220 +libusbscanner 0x0003 0x04e8 0x343a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-6250 +libusbscanner 0x0003 0x04e8 0x343b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4825FN (SCX-4x25 Series) 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 CLX-8540 +libusbscanner 0x0003 0x04e8 0x343f 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 +# Samsung SCX-3205W (SCX-3200 Series) libusbscanner 0x0003 0x04e8 0x3441 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-6545X +libusbscanner 0x0003 0x04e8 0x3442 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-6x55X +libusbscanner 0x0003 0x04e8 0x3443 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-8385X +libusbscanner 0x0003 0x04e8 0x3444 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-5835_5935X +libusbscanner 0x0003 0x04e8 0x3446 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4833FD | Samsung SCX-4835FD +libusbscanner 0x0003 0x04e8 0x344b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-3400 +libusbscanner 0x0003 0x04e8 0x344f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SF-760 +libusbscanner 0x0003 0x04e8 0x3450 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4729FD +libusbscanner 0x0003 0x04e8 0x3453 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-6260 +libusbscanner 0x0003 0x04e8 0x3455 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-3300 Series +libusbscanner 0x0003 0x04e8 0x3456 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-470x +libusbscanner 0x0003 0x04e8 0x3457 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung CLX-4190 +libusbscanner 0x0003 0x04e8 0x345a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-4650 4x21S Series +libusbscanner 0x0003 0x04e8 0x345b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung M337x 387x 407x Series +libusbscanner 0x0003 0x04e8 0x3460 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung SCX-681x +libusbscanner 0x0003 0x04e8 0x3466 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Samsung C460 +libusbscanner 0x0003 0x04e8 0x3468 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 @@ -1498,6 +1688,8 @@ libusbscanner 0x0003 0x0924 0x4294 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x0a17 0x3210 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Portable Peripheral Co., Ltd. Q-Scan USB001 (A4 portable scanner) libusbscanner 0x0003 0x0a53 0x1000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Portable Peripheral Co., Ltd. Q-Scan USB201 (A6 portable scanner) +libusbscanner 0x0003 0x0a53 0x2000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Syscan TravelScan 460/464 | Ambir Visigo A4 libusbscanner 0x0003 0x0a82 0x4600 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Syscan DocketPort 465 @@ -1542,6 +1734,10 @@ libusbscanner 0x0003 0x1083 0x162b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x1083 0x1638 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Canon CR-135i libusbscanner 0x0003 0x1083 0x1639 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon P-215 +libusbscanner 0x0003 0x1083 0x1646 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Canon P-208 +libusbscanner 0x0003 0x1083 0x164c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Digital Dream l' espion XS libusbscanner 0x0003 0x1183 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # KONICA MINOLTA magicolor 1690MF @@ -1570,3 +1766,5 @@ libusbscanner 0x0003 0x413c 0x5105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0 libusbscanner 0x0003 0x413c 0x5124 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Dell 1600n libusbscanner 0x0003 0x413c 0x5250 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Dell Dell 1235cn +libusbscanner 0x0003 0x413c 0x5310 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 diff --git a/hp/hplip.conf b/hp/hplip.conf index b4ba962..1327044 100644 --- a/hp/hplip.conf +++ b/hp/hplip.conf @@ -1,15 +1,15 @@ # hplip.conf. Generated from hplip.conf.in by configure. [hplip] -version=3.13.9 +version=3.14.1 [dirs] home=/usr/share/hplip run=/var/run ppd=/usr/share/ppd/HP ppdbase=/usr/share/ppd -doc=/usr/share/doc/hplip-3.13.9 -html=/usr/share/doc/hplip-3.13.9/html +doc=/usr/share/doc/hplip-3.14.1 +html=/usr/share/doc/hplip-3.14.1/html icon=/usr/share/applications cupsbackend=/usr/libexec/cups/backend cupsfilter=/usr/libexec/cups/filter @@ -35,7 +35,7 @@ foomatic-rip-hplip-install=no hpcups-install=yes cups-drv-install=yes cups-ppd-install=no -internal-tag=3.13.9 +internal-tag=3.14.1 restricted-build=no ui-toolkit=qt4 qt3=no diff --git a/init.d/memcached b/init.d/memcached index facaf5c..dd181eb 100755 --- a/init.d/memcached +++ b/init.d/memcached @@ -1,78 +1,93 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/init,v 1.3 2012/12/23 18:05:21 robbat2 Exp $ CONF="${SVCNAME#*.}" CONFBASE="/etc/conf.d/memcached" -[ -z "${PIDBASE}" ] && PIDBASE="/var/run/memcached/memcached" -[ "${CONF}" = "memcached" ] && CONF='' +[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached" +[ "${CONF}" == "memcached" ] && CONF='' if [ -n "${CONF}" ]; then - PIDFILE="${PIDBASE}-${PORT}.${CONF}.pid" - CONFSRC="${CONFBASE}.${CONF}" - if [ -f "${CONFSRC}" ]; then - . "${CONFSRC}" - else - eerror "The configuration file $CONFSRC was not found!" - fi + PIDFILE="${PIDBASE}.${CONF}.pid" + CONFSRC="${CONFBASE}.${CONF}" + if [ -f "${CONFSRC}" ]; then + source "${CONFSRC}" + else + eerror "The configuration file $CONFSRC was not found!" + fi else - PIDFILE="${PIDBASE}-${PORT}.pid" - CONFSRC="${CONFBASE}" + PIDFILE="${PIDBASE}.pid" + CONFSRC="${CONFBASE}" fi depend() { + if [ -z "${SOCKET}" ]; then need net - # per bug #269022, accurate time is important for memcached! - # We include the full list of ways it might be set on boot. - after ntp-client ntpd rdate openrdate adjtimex hwclock + fi + # per bug #269022, accurate time is important for memcached! + # We include the full list of ways it might be set on boot. + after ntp-client ntpd rdate openrdate adjtimex hwclock } checkconfig() { - if [ -z "${LISTENON}" ]; then - ewarn "You should edit $CONFSRC and specify an address to listen on." - ewarn "Listening on any address (check your firewall!)" - fi + if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then + ewarn "You should edit $CONFSRC and specify an address or socket to listen on." + ewarn "Listening on any address (check your firewall!)" + fi } start() { - if [ -n "${CONF}" ]; then - ebegin "Starting memcached (${CONF})" - else - ebegin "Starting memcached" - fi - checkconfig - local dir="$(dirname ${PIDFILE})" - if [ ! -d "${dir}" ]; then - einfo " Creating ${dir}" - mkdir -p "${dir}" - fi - chown ${MEMCACHED_RUNAS} "${dir}" - if [ -f "${PIDFILE}" ]; then - einfo " Removing stale pidfile ${PIDFILE}" - rm -f "${PIDFILE}" 1>/dev/null + if [ -n "${CONF}" ]; then + ebegin "Starting memcached (${CONF})" + else + ebegin "Starting memcached" + fi + checkconfig + local dir="$(dirname ${PIDFILE})" + if [ ! -d "${dir}" ]; then + einfo " Creating ${dir}" + mkdir -p "${dir}" + fi + + chown ${MEMCACHED_RUNAS} "${dir}" + if [ -f "${PIDFILE}" ]; then + einfo " Removing stale pidfile ${PIDFILE}" + rm -f "${PIDFILE}" 1>/dev/null + fi + + + if [ -n "${SOCKET}" ]; then + CONNECTION="-s ${SOCKET}" + + if [ -n "${SOCKET_MASK}" ]; then + CONNECTION="${CONNECTION} -a ${SOCKET_MASK}" fi + else + CONNECTION="-p ${PORT} -U ${UDPPORT}" - if [ -z "${LISTENON}" ]; then - c_LISTENON="" - else - c_LISTENON="-l ${LISTENON}" + if [ -n "${LISTENON}" ]; then + CONNECTION="${CONNECTION} -l ${LISTENON}" fi + fi + + /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \ + --exec "${MEMCACHED_BINARY}" -- \ + -d ${CONNECTION} -m ${MEMUSAGE} \ + -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \ + ${MISC_OPTS} - /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \ - --exec "${MEMCACHED_BINARY}" -- \ - -d -p ${PORT} -U ${UDPPORT} ${c_LISTENON} -m ${MEMUSAGE} \ - -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \ - ${MISC_OPTS} - eend $? + eend $? } stop() { - if [ -n "${CONF}" ]; then - ebegin "Stopping memcached (${CONF})" - else - ebegin "Stopping memcached" - fi - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - rm -f "${PIDFILE}" - eend $? + if [ -n "${CONF}" ]; then + ebegin "Stopping memcached (${CONF})" + else + ebegin "Stopping memcached" + fi + + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" + + rm -f "${PIDFILE}" + + eend $? } diff --git a/init.d/nscd b/init.d/nscd deleted file mode 100755 index 04a7681..0000000 --- a/init.d/nscd +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.8 2012/12/16 22:28:41 vapier Exp $ - -depend() { - use dns ldap net slapd -} - -checkconfig() { - if [ ! -d /var/run/nscd ] ; then - checkpath -d -m 755 /var/run/nscd - fi - if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then - ewarn "nscd run dir is not world readable, you should reset the perms:" - ewarn "chmod 755 /var/run/nscd" - ewarn "chmod a+rw /var/run/nscd/socket" - ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd" - fi - - if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then - checkpath -d -m 700 /var/db/nscd - fi -} - -start() { - checkconfig - - ebegin "Starting Name Service Cache Daemon" - - local secure=`while read curline ; do - table=${curline%:*} - entries=${curline##$table:} - table=${table%%[!a-z]*} - case $table in - passwd*|group*|hosts) - for entry in $entries ; do - case $entry in - nisplus*) - nscd_nischeck $table || \ - echo "-S $table,yes" - ;; - esac - done - ;; - esac - done < /etc/nsswitch.conf` - - local pidfile="/var/run/nscd/nscd.pid" - mkdir -p "${pidfile%/*}" - - start-stop-daemon --start --quiet --background \ - --exec /usr/sbin/nscd --pidfile ${pidfile} \ - -- --foreground $secure - eend $? -} - -stop() { - local pidfile="/var/run/nscd/nscd.pid" - ebegin "Shutting down Name Service Cache Daemon" - start-stop-daemon --stop --quiet \ - --exec /usr/sbin/nscd --pidfile ${pidfile} - eend $? -} - -# vim:ts=4 diff --git a/init.d/ntp-client b/init.d/ntp-client index a50a6ef..3a8b15e 100755 --- a/init.d/ntp-client +++ b/init.d/ntp-client @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.12 2012/11/11 05:58:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.13 2013/12/24 11:01:52 vapier Exp $ depend() { before cron portmap @@ -10,7 +10,7 @@ depend() { } checkconfig() { - if ! type "${NTPCLIENT_CMD}" >/dev/null 2>/dev/null ; then + if ! type "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then eerror "Please edit /etc/conf.d/ntp-client" eerror "Unable to locate the client command ${NTPCLIENT_CMD}!" return 1 diff --git a/init.d/postgresql-9.3 b/init.d/postgresql-9.3 new file mode 100755 index 0000000..b82cc3b --- /dev/null +++ b/init.d/postgresql-9.3 @@ -0,0 +1,138 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +extra_started_commands="reload" + +get_config() { + [ -f ${PGDATA%/}/postgresql.conf ] || return 1 + + eval echo $(sed -e 's:#.*::' ${PGDATA%/}/postgresql.conf \ + | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }') +} + +depend() { + use net + provide postgresql + + if [ "$(get_config log_destination)" = "syslog" ]; then + use logger + fi +} + +configured_port=$(get_config port) +: ${configured_port:=${PGPORT}} +socket_path=$(get_config unix_socket_directory) +: ${socket_path:=/run/postgresql} + +checkconfig() { + # Check that DATA_DIR has been set + if [ -z ${DATA_DIR} ] ; then + eerror "DATA_DIR not set" + eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-9.3" + return 1 + fi + + # Check that DATA_DIR exists + if [ ! -d ${DATA_DIR} ] ; then + eerror "Directory not found: ${DATA_DIR}" + eerror "HINT: Ensure that DATA_DIR points to the right path." + eerror "HINT: Or perhaps you need to create the database cluster:" + eerror " emerge --config dev-db/postgresql-server:9.3" + return 1 + fi + + # Check for the existence of PostgreSQL's config files, and set the + # proper mode and ownership. + # Only three files should be checked as potentially other files + # may be in PGDATA that should not be touched. + local file + for file in postgresql pg_hba pg_ident ; do + file="${PGDATA%/}/${file}.conf" + if [ -f ${file} ] ; then + checkpath -f -m 0600 -o postgres:postgres ${file} + else + eerror "${file} not found" + eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}" + return 1 + fi + done + + # Set the proper permission for the socket path and create it if + # it doesn't exist. + checkpath -d -m 0775 -o postgres:postgres ${socket_path} + if [ -e ${socket_path%/}/.s.PGSQL.${configured_port} ] ; then + eerror "Socket conflict." + eerror "A server is already listening on:" + eerror " ${socket_path%/}/.s.PGSQL.${configured_port}" + eerror "HINT: Change PGPORT to listen on a different socket." + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting PostgreSQL" + + rm -f ${DATA_DIR%/}/postmaster.pid + + local extraenv + local x + for x in ${PG_EXTRA_ENV} ; do + extraenv="${extraenv} --env ${x}" + done + + start-stop-daemon --start \ + --user postgres \ + --env "PGPORT=${configured_port}" \ + ${extraenv} \ + --pidfile ${DATA_DIR%/}/postmaster.pid \ + --exec /usr/lib/postgresql-9.3/bin/pg_ctl \ + -- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \ + -D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}" + local retval=$? + + if [ $retval -ne 0 ] ; then + eerror "Check the log for a possible explanation of the above error. The log may be" + eerror " ${DATA_DIR%/}/postmaster.log" + eerror "Or wherever you configured PostgreSQL 9.3 log messages to be sent." + eend $retval + return $retval + fi + + eend $retval +} + +stop() { + local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) + ebegin "Stopping PostgreSQL (this can take up to ${seconds} seconds)" + + local retval + local retries=SIGTERM/${NICE_TIMEOUT} + + if [ "${RUDE_QUIT}" != "NO" ] ; then + einfo "RUDE_QUIT enabled." + retries="${retries}/SIGINT/${RUDE_TIMEOUT}" + fi + if [ "${FORCE_QUIT}" = "YES" ] ; then + einfo "FORCE_QUIT enabled." + ewarn "A recover-run might be executed on next startup." + retries="${retries}/SIGQUIT/${FORCE_TIMEOUT}" + fi + + # Loops through nice, rude, and force quit in one go. + start-stop-daemon --stop \ + --exec /usr/lib/postgresql-9.3/bin/postgres \ + --retry ${retries} \ + --pidfile ${DATA_DIR%/}/postmaster.pid + + eend +} + +reload() { + ebegin "Reloading PostgreSQL configuration" + kill -HUP $(head -n1 ${DATA_DIR%/}/postmaster.pid) + eend $? +} diff --git a/init.d/rfcomm b/init.d/rfcomm index d3b819e..18b0e1e 100755 --- a/init.d/rfcomm +++ b/init.d/rfcomm @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.1 2011/12/31 21:09:18 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.2 2013/12/23 23:05:20 eva Exp $ depend() { after coldplug @@ -23,5 +23,5 @@ start() { stop() { ebegin "Shutting down rfcomm" /usr/bin/rfcomm release all - eend $? + eend $? } diff --git a/init.d/saned b/init.d/saned new file mode 100755 index 0000000..26498dd --- /dev/null +++ b/init.d/saned @@ -0,0 +1,12 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/saned.initd,v 1.1 2013/03/15 08:15:52 phosphan Exp $ + +pidfile="/var/run/saned/saned.pid" +command="/usr/sbin/saned" +command_args="-a ${SANED_USER:-root}" + +start_pre() { + checkpath -d -o ${SANED_USER:-root} ${pidfile%/*} +} diff --git a/init.d/sshd b/init.d/sshd index c55116e..1b872bc 100755 --- a/init.d/sshd +++ b/init.d/sshd @@ -1,20 +1,41 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.3,v 1.2 2011/09/14 21:46:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.3 2013/04/24 03:13:03 vapier Exp $ -extra_commands="checkconfig gen_keys" +extra_commands="checkconfig" extra_started_commands="reload" -depend() { - use logger dns - need net -} - SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh} +SSHD_CONFIG=${SSHD_CONFIG:-${SSHD_CONFDIR}/sshd_config} SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid} SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd} +depend() { + use logger dns + if [ "${rc_need+set}" = "set" ]; then + : # Do nothing, the user has explicitly set rc_need + else + warn_addr='' + for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do + case "$x" in + 0.0.0.0|0.0.0.0:*) ;; + ::|\[::\]*) ;; + *) warn_addr="${warn_addr} $x" ;; + esac + done + unset x + if [ "${warn_addr:+set}" = "set" ]; then + need net + ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" + ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd" + ewarn "where FOO is the interface(s) providing the following address(es):" + ewarn "${warn_addr}" + fi + unset warn_addr + fi +} + checkconfig() { if [ ! -d /var/empty ] ; then mkdir -p /var/empty || return 1 @@ -26,7 +47,7 @@ checkconfig() { return 1 fi - gen_keys || return 1 + ssh-keygen -A || return 1 [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \ && SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}" @@ -36,25 +57,6 @@ checkconfig() { "${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1 } -gen_key() { - local type=$1 key ks - [ $# -eq 1 ] && ks="${type}_" - key="${SSHD_CONFDIR}/ssh_host_${ks}key" - if [ ! -e "${key}" ] ; then - ebegin "Generating ${type} host key" - ssh-keygen -t ${type} -f "${key}" -N '' - eend $? || return $? - fi -} - -gen_keys() { - if egrep -q '^[[:space:]]*Protocol[[:space:]]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then - gen_key rsa1 "" || return 1 - fi - gen_key dsa && gen_key rsa && gen_key ecdsa - return $? -} - start() { checkconfig || return 1 diff --git a/ld.so.conf b/ld.so.conf index ab2e6e4..7ba0612 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -18,6 +18,7 @@ include ld.so.conf.d/*.conf /usr/lib/qt4 /usr/lib/postgresql /usr/lib64/postgresql +/usr/lib64/postgresql-9.3/lib64/ /usr/lib64/postgresql-9.2/lib64/ /usr/lib64/sidplay/builders /usr/lib/sidplay/builders diff --git a/nscd.conf b/nscd.conf deleted file mode 100644 index 226dda3..0000000 --- a/nscd.conf +++ /dev/null @@ -1,45 +0,0 @@ -# -# /etc/nscd.conf -# -# An example Name Service Cache config file. This file is needed by nscd. -# -# Legal entries are: -# -# logfile -# debug-level -# threads <#threads to use> -# server-user -# server-user is ignored if nscd is started with -S parameters -# -# enable-cache -# positive-time-to-live