From: Frank Brehm Date: Wed, 18 Sep 2013 19:49:13 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4c4fac9d93fabc621ec14620fb9305e9b2bd688b;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/GeoIP.conf b/GeoIP.conf new file mode 100644 index 0000000..75775cb --- /dev/null +++ b/GeoIP.conf @@ -0,0 +1,26 @@ +# If you purchase a subscription to the GeoIP database, +# then you will obtain a license key which you can +# use to automatically obtain updates. +# for more details, please go to +# http://www.maxmind.com/en/geolocation_landing + +# HowTo configure geoipupdate +# http://www.maxmind.com/en/license_key + +# customer find the user_id and license key here: +# https://www.maxmind.com/en/my_license_key +# +# UserId, and available ProductIds + +# Enter your license key here +# customers should insert their license key and user_id +# free GeoLite users should use 000000000000 as license key +LicenseKey YOUR_LICENSE_KEY_HERE + +# Enter your User ID here ( GeoLite only users should use 999999 as user_id ) +UserId YOUR_USER_ID_HERE + +# Enter the Product ID(s) of the database(s) you would like to update +# By default 106 (MaxMind GeoIP Country) is listed below +ProductIds 106 + diff --git a/conf.d/saslauthd b/conf.d/saslauthd index 3f2653c..1eeaa48 100644 --- a/conf.d/saslauthd +++ b/conf.d/saslauthd @@ -1,25 +1,21 @@ -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf,v 1.2 2007/04/07 13:03:55 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf,v 1.1 2013/07/13 12:01:10 pacho Exp $ -# Config file for /etc/init.d/saslauthd +# Config file for /etc/init.d/saslauthd and systemd unit -# Initial (empty) options. -SASLAUTHD_OPTS="" +# PLEASE READ THIS IF YOU ARE USING SYSTEMD +# Please note that systemd does not expand shell variables +# thus, something like FOO="${FOO} bar" won't work. # Specify the authentications mechanism. # **NOTE** For a list see: saslauthd -v # Since 2.1.19, add "-r" to options for old behavior, # ie. reassemble user and realm to user@realm form. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r" -SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam" - -# Specify the hostname for remote IMAP server. -# **NOTE** Only needed if rimap auth mechanism is used. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost" - -# Specify the number of worker processes to create. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5" - -# Enable credential cache, set cache size and timeout. -# **NOTE** Size is measured in kilobytes. -# Timeout is measured in seconds. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30" +# +# Specify the hostname for remote IMAP server using: +# "-O localhost". +# Specify the number of worker processes to create using: +# "-n ". +# Enable credential cache, set cache size and timeout using: +# "-c -s -t ". +# +SASLAUTHD_OPTS="-a pam" diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng index 170862f..6a437d1 100644 --- a/conf.d/syslog-ng +++ b/conf.d/syslog-ng @@ -1,5 +1,41 @@ # Config file for /etc/init.d/syslog-ng +# If you are not using network logging, this entire section should be +# commented out. Otherwise, choose one of the settings below based on +# how you are configuring your network. +# +# If you are using the net.* scripts to configure your network, you should +# set rc_need to match the interface through which your logging server +# can be reached. +#rc_need="net.eth0" +# +# If you are using an interface manager like wicd, dhcpcd in standalone +# mode, networkmanager, etc to control your interfaces, set rc_need to +# the name of that service. +# rc_need="dhcpcd" +#rc_need="networkmanager" +# +# If you are using newnet and configuring your interface statically with +# the network script, you should use this setting. +#rc_need="network" +# +# You can use this setting, but I do not recommend relying on it. +#rc_need="net" +# +# You may also want to uncomment the following if you are using network +# logging. +#rc_use="stunnel" + +# For very customized setups these variables can be adjusted as needed +# but for most situations they should remain commented: +# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf +# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng +# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist +# SYSLOG_NG_PIDFILE_DIR=/var/run +# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid +# SYSLOG_NG_GROUP=root +# SYSLOG_NG_USER=root + # Put any additional options for syslog-ng here. # See syslog-ng(8) for more information. diff --git a/config-archive/etc/aiccu.conf b/config-archive/etc/aiccu.conf new file mode 100644 index 0000000..df00d9c --- /dev/null +++ b/config-archive/etc/aiccu.conf @@ -0,0 +1,83 @@ +# AICCU Configuration + +# Login information (defaults: none) +#username +#password +username FBT6-SIXXS +password EMsiWgsus + +# Protocol and server to use for setting up the tunnel (defaults: none) +#protocol +#server +protocol tic +server tic.sixxs.net + +# Interface names to use (default: aiccu) +# ipv6_interface is the name of the interface that will be used as a tunnel interface. +# On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels +# or tunX (eg tun0) for AYIYA tunnels. +ipv6_interface sixxs + +# The tunnel_id to use (default: none) +# (only required when there are multiple tunnels in the list) +#tunnel_id Txxxx +tunnel_id T84158 + +# Be verbose? (default: false) +verbose false + +# Daemonize? (default: true) +# Set to false if you want to see any output +# When true output goes to syslog +# +# WARNING: never run AICCU from DaemonTools or a similar automated +# 'restart' tool/script. When AICCU does not start, it has a reason +# not to start which it gives on either the stdout or in the (sys)log +# file. The TIC server *will* automatically disable accounts which +# are detected to run in this mode. +# +daemonize true + +# Automatic Login and Tunnel activation? +automatic true + +# Require TLS? +# When set to true, if TLS is not supported on the server +# the TIC transaction will fail. +# When set to false, it will try a starttls, when that is +# not supported it will continue. +# In any case if AICCU is build with TLS support it will +# try to do a 'starttls' to the TIC server to see if that +# is supported. +requiretls false + +# PID File +#pidfile /var/run/aiccu.pid + +# Add a default route (default: true) +defaultroute true + +# Script to run after setting up the interfaces (default: none) +#setupscript /usr/local/etc/aiccu-subnets.sh + +# Make heartbeats (default true) +# In general you don't want to turn this off +# Of course only applies to AYIYA and heartbeat tunnels not to static ones +#makebeats true + +# Don't configure anything (default: false) +#noconfigure true + +# Behind NAT (default: false) +# Notify the user that a NAT-kind network is detected +behindnat true + +# Local IPv4 Override (default: none) +# Overrides the IPv4 parameter received from TIC +# This allows one to configure a NAT into "DMZ" mode and then +# forwarding the proto-41 packets to an internal host. +# +# This is only needed for static proto-41 tunnels! +# AYIYA and heartbeat tunnels don't require this. +#local_ipv4_override + diff --git a/config-archive/etc/aiccu.conf.dist.new b/config-archive/etc/aiccu.conf.dist.new new file mode 100644 index 0000000..71e8c6c --- /dev/null +++ b/config-archive/etc/aiccu.conf.dist.new @@ -0,0 +1,78 @@ +# AICCU Configuration + +# Login information (defaults: none) +#username +#password + +# Protocol and server to use for setting up the tunnel (defaults: none) +#protocol +#server + +# Interface names to use (default: aiccu) +# ipv6_interface is the name of the interface that will be used as a tunnel interface. +# On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels +# or tunX (eg tun0) for AYIYA tunnels. +ipv6_interface sixxs + +# The tunnel_id to use (default: none) +# (only required when there are multiple tunnels in the list) +#tunnel_id Txxxx + +# Be verbose? (default: false) +verbose false + +# Daemonize? (default: true) +# Set to false if you want to see any output +# When true output goes to syslog +# +# WARNING: never run AICCU from DaemonTools or a similar automated +# 'restart' tool/script. When AICCU does not start, it has a reason +# not to start which it gives on either the stdout or in the (sys)log +# file. The TIC server *will* automatically disable accounts which +# are detected to run in this mode. +# +daemonize true + +# Automatic Login and Tunnel activation? +automatic true + +# Require TLS? +# When set to true, if TLS is not supported on the server +# the TIC transaction will fail. +# When set to false, it will try a starttls, when that is +# not supported it will continue. +# In any case if AICCU is build with TLS support it will +# try to do a 'starttls' to the TIC server to see if that +# is supported. +requiretls false + +# PID File +#pidfile /var/run/aiccu.pid + +# Add a default route (default: true) +#defaultroute true + +# Script to run after setting up the interfaces (default: none) +#setupscript /usr/local/etc/aiccu-subnets.sh + +# Make heartbeats (default true) +# In general you don't want to turn this off +# Of course only applies to AYIYA and heartbeat tunnels not to static ones +#makebeats true + +# Don't configure anything (default: false) +#noconfigure true + +# Behind NAT (default: false) +# Notify the user that a NAT-kind network is detected +#behindnat true + +# Local IPv4 Override (default: none) +# Overrides the IPv4 parameter received from TIC +# This allows one to configure a NAT into "DMZ" mode and then +# forwarding the proto-41 packets to an internal host. +# +# This is only needed for static proto-41 tunnels! +# AYIYA and heartbeat tunnels don't require this. +#local_ipv4_override + diff --git a/config-archive/etc/conf.d/apache2 b/config-archive/etc/conf.d/apache2 new file mode 100644 index 0000000..5ada27e --- /dev/null +++ b/config-archive/etc/conf.d/apache2 @@ -0,0 +1,74 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# When you install a module it is easy to activate or deactivate the modules +# and other features of apache using the APACHE2_OPTS line. Every module should +# install a configuration in /etc/apache2/modules.d. In that file will have an +# directive where NNN is the option to enable that module. +# +# Here are the options available in the default configuration: +# +# AUTH_DIGEST Enables mod_auth_digest +# AUTHNZ_LDAP Enables authentication through mod_ldap (available if USE=ldap) +# CACHE Enables mod_cache +# DAV Enables mod_dav +# ERRORDOCS Enables default error documents for many languages. +# INFO Enables mod_info, a useful module for debugging +# LANGUAGE Enables content-negotiation based on language and charset. +# LDAP Enables mod_ldap (available if USE=ldap) +# MANUAL Enables /manual/ to be the apache manual (available if USE=docs) +# MEM_CACHE Enables default configuration mod_mem_cache +# PROXY Enables mod_proxy +# SSL Enables SSL (available if USE=ssl) +# STATUS Enabled mod_status, a useful module for statistics +# SUEXEC Enables running CGI scripts (in USERDIR) through suexec. +# USERDIR Enables /~username mapping to /home/username/public_html +# +# +# The following two options provide the default virtual host for the HTTP and +# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache +# will not listen for incomming connections on the approriate port. +# +# DEFAULT_VHOST Enables name-based virtual hosts, with the default +# virtual host being in /var/www/localhost/htdocs +# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this +# when you enable SSL) +# +APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D MANUAL -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE" + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/var/run/apache2.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# ServerRoot setting +#SERVERROOT=/usr/lib64/apache2 + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/config-archive/etc/conf.d/apache2.dist.new b/config-archive/etc/conf.d/apache2.dist.new new file mode 100644 index 0000000..5826d36 --- /dev/null +++ b/config-archive/etc/conf.d/apache2.dist.new @@ -0,0 +1,74 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# When you install a module it is easy to activate or deactivate the modules +# and other features of apache using the APACHE2_OPTS line. Every module should +# install a configuration in /etc/apache2/modules.d. In that file will have an +# directive where NNN is the option to enable that module. +# +# Here are the options available in the default configuration: +# +# AUTH_DIGEST Enables mod_auth_digest +# AUTHNZ_LDAP Enables authentication through mod_ldap (available if USE=ldap) +# CACHE Enables mod_cache +# DAV Enables mod_dav +# ERRORDOCS Enables default error documents for many languages. +# INFO Enables mod_info, a useful module for debugging +# LANGUAGE Enables content-negotiation based on language and charset. +# LDAP Enables mod_ldap (available if USE=ldap) +# MANUAL Enables /manual/ to be the apache manual (available if USE=docs) +# MEM_CACHE Enables default configuration mod_mem_cache +# PROXY Enables mod_proxy +# SSL Enables SSL (available if USE=ssl) +# STATUS Enabled mod_status, a useful module for statistics +# SUEXEC Enables running CGI scripts (in USERDIR) through suexec. +# USERDIR Enables /~username mapping to /home/username/public_html +# +# +# The following two options provide the default virtual host for the HTTP and +# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache +# will not listen for incomming connections on the approriate port. +# +# DEFAULT_VHOST Enables name-based virtual hosts, with the default +# virtual host being in /var/www/localhost/htdocs +# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this +# when you enable SSL) +# +APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE" + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/var/run/apache2.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# ServerRoot setting +#SERVERROOT=/usr/lib64/apache2 + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/config-archive/etc/logrotate.d/syslog-ng b/config-archive/etc/logrotate.d/syslog-ng new file mode 100644 index 0000000..ebd4997 --- /dev/null +++ b/config-archive/etc/logrotate.d/syslog-ng @@ -0,0 +1,58 @@ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate,v 1.3 2008/10/15 20:46:12 mr_bones_ Exp $ +# +# Syslog-ng logrotate snippet for Gentoo Linux +# contributed by Michael Sterrett +# + +#/var/log/messages { +# missingok +# sharedscripts +# postrotate +# /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true +# endscript +#} + +script syslog-reload + /etc/init.d/syslog-ng reload >/dev/null || true +endscript + +/var/log/messages { + daily + olddir /var/log/.old/%Y-%m + size 1024K + postrotate syslog-reload + maxage 2y +} +/var/log/syslog { + daily + olddir /var/log/.old/%Y-%m + size 4M + postrotate syslog-reload + maxage 1y +} + +/var/log/syslog.d/* { + daily + olddir /var/log/syslog.d/.old/%Y-%m + size 1024K + postrotate syslog-reload + maxage 1y +} + +/var/log/debug { + daily + olddir /var/log/.old/%Y-%m + size 4M + postrotate syslog-reload + maxage 6m +} + +/var/log/all { + daily + olddir /var/log/.old/%Y-%m + size 10M + postrotate syslog-reload + maxage 2m +} + +# vim: ts=4 filetype=conf diff --git a/config-archive/etc/logrotate.d/syslog-ng.dist.new b/config-archive/etc/logrotate.d/syslog-ng.dist.new new file mode 100644 index 0000000..e982686 --- /dev/null +++ b/config-archive/etc/logrotate.d/syslog-ng.dist.new @@ -0,0 +1,13 @@ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate,v 1.3 2008/10/15 20:46:12 mr_bones_ Exp $ +# +# Syslog-ng logrotate snippet for Gentoo Linux +# contributed by Michael Sterrett +# + +/var/log/messages { + missingok + sharedscripts + postrotate + /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true + endscript +} diff --git a/config-archive/etc/portage/make.conf b/config-archive/etc/portage/make.conf new file mode 100644 index 0000000..9c96218 --- /dev/null +++ b/config-archive/etc/portage/make.conf @@ -0,0 +1,102 @@ +# 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" +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. + +USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ + bazaar bluray calendar caps cddb cdparanoia cgi cpudetection cscope \ + css ctype curl curlwrappers cvs dbase dga djvu dv dvb dvdread \ + examples expat fastcgi ffmpeg fftw fits flatfile fltk fontconfig \ + foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep \ + gphoto2 graphviz gsl gsm gtk3 gtkhtml handbook highlight hscolour html icu id3 \ + id3tag idea idn ieee1394 imagemagick imap imlib inifile jabber jack \ + java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \ + kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex \ + libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo \ + meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \ + musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \ + nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \ + plotutils posix postgres postscript projectm python quicktime rdesktop \ + rle sasl semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \ + soap sockets sox speex sqlite sqlite3 srtp \ + sse sse2 ssh subversion sysvipc tetex theora threads thumbnail tidy \ + timidity tools twolame v4l v4l2 vcd video vim-syntax wav wavpack \ + wddx webdav webkit wma wmf xattr xcomposite xface xft xine xmlrpc \ + xmp xosd xpm xprint xscreensaver xsl xulrunner yahoo yaz yv12 zeroconf" + +GENTOO_MIRRORS="http://mirror.opteamax.de/gentoo/ http://mirror.netcologne.de/gentoo/" + +PORTDIR_OVERLAY="/usr/local/portage" + +PORT_LOGDIR=/var/log/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 \ + AdobeFlash-11.x \ + skype-eula \ + skype-4.0.0.7-copyright \ + Oracle-BCLA-JavaSE \ +" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +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 \ +" + +MAKEOPTS="-j3" +#MAKEOPTS="-j1" + +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=2 --load-average=10" + +FEATURES="parallel-fetch userpriv usersandbox" + +LINGUAS="de en en_GB en_US ru" + +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" + +source /var/lib/layman/make.conf diff --git a/config-archive/etc/portage/make.conf.dist b/config-archive/etc/portage/make.conf.dist new file mode 100644 index 0000000..875f71e --- /dev/null +++ b/config-archive/etc/portage/make.conf.dist @@ -0,0 +1,108 @@ +# 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" +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. + +USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ + bazaar bluray calendar caps cddb cdparanoia cgi cpudetection cscope \ + css ctype curl curlwrappers cvs dbase dga djvu dv dvb dvdread \ + examples expat fastcgi ffmpeg fftw fits flatfile fltk fontconfig \ + foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep \ + gphoto2 graphviz gsl gsm gtk3 gtkhtml handbook highlight hscolour html icu id3 \ + id3tag idea idn ieee1394 imagemagick imap imlib inifile jabber jack \ + java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \ + kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex \ + libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo \ + meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \ + musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \ + nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \ + plotutils posix postgres postscript projectm python quicktime rdesktop \ + rle sasl semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \ + soap sockets sox speex sqlite sqlite3 srtp \ + sse sse2 ssh subversion sysvipc tetex theora threads thumbnail tidy \ + timidity tools twolame v4l v4l2 vcd video vim-syntax wav wavpack \ + wddx webdav webkit wma wmf xattr xcomposite xface xft xine xmlrpc \ + xmp xosd xpm xprint xscreensaver xsl xulrunner yahoo yaz yv12 zeroconf" + +GENTOO_MIRRORS="http://mirror.opteamax.de/gentoo/ http://mirror.netcologne.de/gentoo/" + +PORTDIR_OVERLAY="/usr/local/portage" + +PORT_LOGDIR=/var/log/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 \ + AdobeFlash-11.x \ + skype-eula \ + skype-4.0.0.7-copyright \ + Oracle-BCLA-JavaSE \ +" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +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 \ +" + +MAKEOPTS="-j3" +#MAKEOPTS="-j1" + +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=2 --load-average=10" + +FEATURES="parallel-fetch userpriv usersandbox" + +LINGUAS="de en en_GB en_US ru" + +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" + +source /var/lib/layman/make.conf + +# Set PORTDIR for backward compatibility with various tools: +# gentoo-bashcomp - bug #478444 +# euse - bug #474574 +# euses and ufed - bug #478318 +PORTDIR="/usr/portage" diff --git a/config-archive/etc/portage/repos.conf/gentoo.conf.dist b/config-archive/etc/portage/repos.conf/gentoo.conf.dist new file mode 100644 index 0000000..8c657da --- /dev/null +++ b/config-archive/etc/portage/repos.conf/gentoo.conf.dist @@ -0,0 +1,7 @@ +[DEFAULT] +main-repo = gentoo + +[gentoo] +location = /usr/portage +sync-type = rsync +sync-uri = rsync://rsync.gentoo.org/gentoo-portage diff --git a/config-archive/etc/postfix/main.cf.dist.new b/config-archive/etc/postfix/main.cf.dist.new index 91b548c..e533f7d 100644 --- a/config-archive/etc/postfix/main.cf.dist.new +++ b/config-archive/etc/postfix/main.cf.dist.new @@ -656,4 +656,3 @@ sample_directory = /etc/postfix readme_directory = no inet_protocols = ipv4 home_mailbox = .maildir/ -smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf b/config-archive/etc/syslog-ng/syslog-ng.conf index 0b6799e..2f18f9c 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf +++ b/config-archive/etc/syslog-ng/syslog-ng.conf @@ -85,8 +85,8 @@ log { source(src); filter(f_warnings); destination(d_console_12); }; log { source(src); filter(f_alarm); destination(d_console); }; log { source(src); filter(f_emergency); destination(d_console_all); }; log { source(src); filter(f_syslog); destination(d_syslog); }; -log { source(src); filter(f_debug); destination(d_debug); }; -log { source(src); destination(d_all); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +#log { source(src); destination(d_all); }; #log { source(src); destination(messages); }; #log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1 new file mode 100644 index 0000000..0b6799e --- /dev/null +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.1 @@ -0,0 +1,92 @@ +@version: 3.2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $ +# +# Syslog-ng default configuration file for Gentoo Linux + +options { + long_hostnames(off); + chain_hostnames(no); + flush_lines(0); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark_freq(3600); + + frac_digits(3); + ts_format(iso); +}; + +source src { + unix-stream("/dev/log" max-connections(256)); + internal(); + file("/proc/kmsg"); +}; + +######################################################### +# Logging-Ziele + +destination d_syslog { file("/var/log/syslog"); }; +destination d_fac { file("/var/log/syslog.d/$FACILITY"); }; +destination d_debug { file("/var/log/debug"); }; +destination d_all { file("/var/log/all"); }; +destination d_messages { file("/var/log/messages"); }; + +destination d_console { usertty("root"); }; +destination d_console_all { usertty("*"); }; +#destination loghost { udp("loghost" port(999)); }; + + +#destination messages { file("/var/log/messages"); }; + +# By default messages are logged to tty12... +#destination console_all { file("/dev/tty12"); }; +destination d_console_12 { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#destination d_xconsole { pipe("/dev/console"); }; + +######################################################### +# Filter-Definitionen + +filter f_syslog { not facility(authpriv, mail); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..emerg) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_warnings { level(warn..emerg) + and not facility( mail, news); }; + +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_alarm { level(crit, alert); }; + +######################################################## +# Log-Definitionen + +log { source(src); destination(d_fac); }; + +log { source(src); filter(f_messages); destination(d_messages); }; +#log { source(src); filter(f_messages); destination(d_xconsole); }; +log { source(src); filter(f_warnings); destination(d_console_12); }; +log { source(src); filter(f_alarm); destination(d_console); }; +log { source(src); filter(f_emergency); destination(d_console_all); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); destination(d_all); }; + +#log { source(src); destination(messages); }; +#log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist b/config-archive/etc/syslog-ng/syslog-ng.conf.dist new file mode 100644 index 0000000..e8d3b4f --- /dev/null +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.dist @@ -0,0 +1,37 @@ +@version: 3.4 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ +# +# Syslog-ng default configuration file for Gentoo Linux + +# https://bugs.gentoo.org/show_bug.cgi?id=426814 +@include "scl.conf" + +options { + threaded(yes); + chain_hostnames(no); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark_freq(3600); +}; + +source src { system(); internal(); }; + +destination messages { file("/var/log/messages"); }; + +# By default messages are logged to tty12... +destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +log { source(src); destination(messages); }; +log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new b/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new deleted file mode 100644 index 2589f2f..0000000 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new +++ /dev/null @@ -1,37 +0,0 @@ -@version: 3.2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $ -# -# Syslog-ng default configuration file for Gentoo Linux - -options { - chain_hostnames(no); - - # The default action of syslog-ng is to log a STATS line - # to the file every 10 minutes. That's pretty ugly after a while. - # Change it to every 12 hours so you get a nice daily update of - # how many messages syslog-ng missed (0). - stats_freq(43200); - # The default action of syslog-ng is to log a MARK line - # to the file every 20 minutes. That's seems high for most - # people so turn it down to once an hour. Set it to zero - # if you don't want the functionality at all. - mark_freq(3600); -}; - -source src { - unix-stream("/dev/log" max-connections(256)); - internal(); - file("/proc/kmsg"); -}; - -destination messages { file("/var/log/messages"); }; - -# By default messages are logged to tty12... -destination console_all { file("/dev/tty12"); }; -# ...if you intend to use /dev/console for programs like xconsole -# you can comment out the destination line above that references /dev/tty12 -# and uncomment the line below. -#destination console_all { file("/dev/console"); }; - -log { source(src); destination(messages); }; -log { source(src); destination(console_all); }; diff --git a/env.d/05binutils b/env.d/05binutils index bf004d1..40c7c1f 100644 --- a/env.d/05binutils +++ b/env.d/05binutils @@ -1,2 +1,2 @@ -MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man -INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info +MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man +INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info diff --git a/env.d/binutils/config-x86_64-pc-linux-gnu b/env.d/binutils/config-x86_64-pc-linux-gnu index 11427ca..930d9b8 100644 --- a/env.d/binutils/config-x86_64-pc-linux-gnu +++ b/env.d/binutils/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=2.22 +CURRENT=2.23.1 diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.22 b/env.d/binutils/x86_64-pc-linux-gnu-2.22 deleted file mode 100644 index aac9c13..0000000 --- a/env.d/binutils/x86_64-pc-linux-gnu-2.22 +++ /dev/null @@ -1,4 +0,0 @@ -TARGET="x86_64-pc-linux-gnu" -VER="2.22" -LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.22" -FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 b/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 new file mode 100644 index 0000000..d9ce38f --- /dev/null +++ b/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 @@ -0,0 +1,4 @@ +TARGET="x86_64-pc-linux-gnu" +VER="2.23.1" +LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.23.1" +FAKE_TARGETS="x86_64-pc-linux-gnu" diff --git a/etckeeper/commit.d/99push b/etckeeper/commit.d/99push new file mode 100755 index 0000000..9a5d81e --- /dev/null +++ b/etckeeper/commit.d/99push @@ -0,0 +1,8 @@ +#!/bin/sh +if [ -n "$PUSH_REMOTE" ]; then + if [ "$VCS" = git ] && [ -d .git ]; then + git push "$PUSH_REMOTE" master || true + else + echo "PUSH_REMOTE not yet supported for $VCS" >&2 + fi +fi diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf index b910c8a..9492c8f 100644 --- a/etckeeper/etckeeper.conf +++ b/etckeeper/etckeeper.conf @@ -30,7 +30,7 @@ DARCS_COMMIT_OPTIONS="-a" #AVOID_COMMIT_BEFORE_INSTALL=1 # The high-level package manager that's being used. -# (apt, pacman-g2, yum etc) +# (apt, pacman-g2, yum, zypper etc) # For gentoo this is emerge HIGHLEVEL_PACKAGE_MANAGER=emerge @@ -38,3 +38,7 @@ HIGHLEVEL_PACKAGE_MANAGER=emerge # (dpkg, rpm, pacman-g2, etc) # For gentoo this is qlist LOWLEVEL_PACKAGE_MANAGER=qlist + +# To push each commit to a remote, put the name of the remote here. +# (eg, "origin" for git). +PUSH_REMOTE="" diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index 455429a..d445db1 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -81,14 +81,16 @@ generate_metadata() { if (exists $uidcache{$want}) { return $uidcache{$want}; } - return $uidcache{$want}=scalar getpwuid($want); + my $name=scalar getpwuid($want); + return $uidcache{$want}=defined $name ? $name : $want; } sub gidname { my $want=shift; if (exists $gidcache{$want}) { return $gidcache{$want}; } - return $gidcache{$want}=scalar getgrgid($want); + my $name=scalar getgrgid($want); + return $gidcache{$want}=defined $name ? $name : $want; } chomp; my @stat=stat($_); diff --git a/etckeeper/uninit.d/50vcs-uninit b/etckeeper/uninit.d/50vcs-uninit index 803b0b5..b61abfd 100755 --- a/etckeeper/uninit.d/50vcs-uninit +++ b/etckeeper/uninit.d/50vcs-uninit @@ -21,9 +21,9 @@ if ! grep -q "$managed_by_etckeeper" "$file"; then exit 0 else realfile="$file" - if [ -n "`type -p tempfile`" ]; then + if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif [ -n "`type -p mktemp`" ]; then + elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore index 46d8162..d59ad14 100755 --- a/etckeeper/update-ignore.d/01update-ignore +++ b/etckeeper/update-ignore.d/01update-ignore @@ -149,6 +149,7 @@ writefile () { ignore "openvpn/openvpn-status.log" ignore "cups/subscriptions.conf" ignore "cups/subscriptions.conf.O" + ignore "fake-hwclock.data" nl comment "editor temp files" @@ -174,9 +175,9 @@ if [ -e "$file" ]; then fi fi realfile="$file" - if [ -n "`type -p tempfile`" ]; then + if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif [ -n "`type -p mktemp`" ]; then + elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index ee4be3a..f342c8e 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -16291,7 +16291,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16302,7 +16302,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16311,7 +16311,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16319,7 +16319,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + client @@ -16332,7 +16332,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16341,7 +16341,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16353,7 +16353,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16365,7 +16365,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16382,7 +16382,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16393,7 +16393,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16403,7 +16403,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16413,7 +16413,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16426,7 +16426,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16436,7 +16436,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16447,7 +16447,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -19861,13 +19861,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
    • - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19875,7 +19875,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -19883,13 +19883,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19897,7 +19897,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -19905,13 +19905,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19919,7 +19919,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -19927,13 +19927,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19941,7 +19941,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -19949,13 +19949,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19963,7 +19963,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -19971,13 +19971,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19985,7 +19985,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -19993,13 +19993,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20007,7 +20007,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20059,13 +20059,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20073,7 +20073,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. @@ -20436,21 +20436,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -21271,39 +21271,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -21316,9 +21316,9 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + diff --git a/i3status.conf b/i3status.conf index 5233041..6b1d2d7 100644 --- a/i3status.conf +++ b/i3status.conf @@ -1,3 +1,11 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + general { colors = true interval = 5 @@ -11,7 +19,7 @@ order += "wireless wlan0" order += "ethernet eth0" order += "battery 0" order += "load" -order += "time" +order += "tztime local" wireless wlan0 { format_up = "W: (%quality at %essid) %ip" @@ -36,7 +44,7 @@ run_watch VPN { pidfile = "/var/run/vpnc/pid" } -time { +tztime local { format = "%Y-%m-%d %H:%M:%S" } @@ -45,5 +53,5 @@ load { } disk "/" { - format = "%free (or: %percentage_used used, %percentage_used_of_avail used of avail, %percentage_free free, %percentage_avail avail)" + format = "%free" } diff --git a/init.d/cpufrequtils b/init.d/cpufrequtils index adb71b0..a17c4a4 100755 --- a/init.d/cpufrequtils +++ b/init.d/cpufrequtils @@ -1,39 +1,16 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-006,v 1.2 2011/07/21 19:47:14 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-007,v 1.2 2013/05/06 11:09:09 lxnay Exp $ change() { - local c ret=0 opts="$1" - shift - ebegin "Running cpufreq-set ${opts}" - for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do - cpufreq-set -c ${c} ${opts} - : $(( ret += $? )) - done - eend ${ret} - - if [ $# -gt 0 ] ; then - c=1 - einfo "Setting extra options: $*" - if cd /sys/devices/system/cpu/cpufreq ; then - local o v - for o in "$@" ; do - v=${o#*=} - o=${o%%=*} - echo ${v} > ${o} || break - done - c=0 - fi - eend ${c} - : $(( ret += c )) - fi - - return ${ret} + ebegin "Running cpufreq-set ${*}" + /usr/libexec/cpufrequtils-change.sh "${@}" > /dev/null + eend $? } start() { - change "${START_OPTS}" ${SYSFS_EXTRA} + change ${START_OPTS} -- ${SYSFS_EXTRA} } stop() { diff --git a/init.d/g15daemon b/init.d/g15daemon index b8e8cd6..9bb09dd 100755 --- a/init.d/g15daemon +++ b/init.d/g15daemon @@ -1,31 +1,35 @@ #!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd,v 1.1 2007/12/19 17:38:30 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd,v 1.2 2013/03/18 17:49:55 polynomial-c Exp $ # Init script for g15daemon +pidfile="/var/run/g15daemon.pid" +command="/usr/sbin/g15daemon" +command_args="" +start_stop_daemon_args="--background --pidfile ${pidfile}" + depend() { after hotplug after usb after modules } -start() { - ebegin "Starting g15daemon" - +start_pre() { # Does the input device already exist? - if [ -e /proc/modules -a ! -e /dev/input/uinput ]; then - # We can load modules, but uinput device does not exist - einfo "Loading uinput module" - /sbin/modprobe uinput > /dev/null 2> /dev/null + if [ -e "/proc/modules" ] ; then + if [ ! -e "/dev/input/uinput" ] && [ ! -e "/dev/uinput" ] ; then + # We can load modules, but uinput device does not exist + einfo "Loading uinput module" + /sbin/modprobe uinput > /dev/null 2> /dev/null + fi fi local SWITCHKEY="" - [ "${CLIENT_SWITCH_L1}" = "yes" ] && SWITCHKEY="--switch" - start-stop-daemon --start --background --pidfile /var/run/g15daemon.pid \ - --exec /usr/sbin/g15daemon -- ${SWITCHKEY} - eend $? "Failed to start g15daemon." + [ "${CLIENT_SWITCH_L1}" = "yes" ] && command_args="--switch" + + return 0 } stop() { @@ -34,8 +38,6 @@ stop() { if [ $BACKLIGHT_OFF = "yes" ]; then KILLOPT="-K" fi - /usr/sbin/g15daemon ${KILLOPT} &>/dev/null - sleep 1 - start-stop-daemon -R 5 --stop --quiet --pidfile /var/run/g15daemon.pid + start-stop-daemon -R 5 --exec ${command} -- ${KILLOPT} eend $? } diff --git a/init.d/saslauthd b/init.d/saslauthd index a5e9a44..d6b453e 100755 --- a/init.d/saslauthd +++ b/init.d/saslauthd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc6,v 1.7 2007/04/07 13:03:55 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc7,v 1.1 2013/07/13 12:01:10 pacho Exp $ depend() { need net @@ -16,6 +16,6 @@ start() { stop() { ebegin "Stopping saslauthd" - start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/saslauthd.pid + start-stop-daemon --stop --quiet --pidfile /run/saslauthd/saslauthd.pid eend $? } diff --git a/init.d/syslog-ng b/init.d/syslog-ng index e41d874..318b3a8 100755 --- a/init.d/syslog-ng +++ b/init.d/syslog-ng @@ -1,61 +1,59 @@ #!/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/app-admin/syslog-ng/files/syslog-ng.rc6.3,v 1.5 2011/12/04 09:53:39 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.5 2013/05/08 20:12:59 mr_bones_ Exp $ +SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} +SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} +SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} +SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run} +SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} + +SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root} +SYSLOG_NG_USER=${SYSLOG_NG_USER:-root} + +command="syslog-ng" +command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}" extra_commands="checkconfig" extra_started_commands="reload" +pidfile="${SYSLOG_NG_PIDFILE}" +start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\"" +description="Syslog-ng is a syslog replacement with advanced filtering features." +description_checkconfig="Check the configuration file that will be used by \"start\"" +description_reload="Reload the configuration without exiting" +required_files="${SYSLOG_NG_CONFIGFILE}" +required_dirs="${SYSLOG_NG_PIDFILE_DIR}" depend() { - # Make networking dependency conditional on configuration - case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in - *source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*) - need net - use stunnel ;; - esac - - config /etc/syslog-ng/syslog-ng.conf use clock need hostname localmount + after bootmisc provide logger } checkconfig() { - if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then - eerror "You need to create /etc/syslog-ng/syslog-ng.conf first." - eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample" - return 1 - fi - syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf - - # the start and reload functions have their own eends so - # avoid calling this twice when there are no problems - [ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)" + ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" + syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" + eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" } -start() { - checkconfig || return 1 - ebegin "Starting syslog-ng" - [ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}" - start-stop-daemon --start --pidfile /var/run/syslog-ng.pid --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS} - eend $? "Failed to start syslog-ng" +start_pre() { + checkconfig || return 1 + checkpath \ + -d \ + --mode 0700 \ + --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \ + "${SYSLOG_NG_STATEFILE_DIR}" } -stop() { - ebegin "Stopping syslog-ng" - start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid - eend $? "Failed to stop syslog-ng" - sleep 1 # needed for syslog-ng to stop in case we're restarting +stop_pre() { + [ "$RC_CMD" = restart ] && sleep 1 + return 0 } reload() { - if [ ! -f /var/run/syslog-ng.pid ]; then - eerror "syslog-ng isn't running" - return 1 - fi checkconfig || return 1 ebegin "Reloading configuration and re-opening log files" - start-stop-daemon --signal HUP \ - --pidfile /var/run/syslog-ng.pid + start-stop-daemon --signal HUP --pidfile "${pidfile}" eend $? } diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf index 47da520..af4493e 100644 --- a/libvirt/libvirtd.conf +++ b/libvirt/libvirtd.conf @@ -155,6 +155,15 @@ #auth_tls = "none" +# Change the API access control scheme +# +# By default an authenticated user is allowed access +# to all APIs. Access drivers can place restrictions +# on this. By default the 'nop' driver is enabled, +# meaning no access control checks are done once a +# client has authenticated with libvirtd +# +#access_drivers = [ "polkit" ] ################################################################# # diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf index 0f0a24c..cdf1ec4 100644 --- a/libvirt/qemu.conf +++ b/libvirt/qemu.conf @@ -153,6 +153,12 @@ #remote_display_port_min = 5900 #remote_display_port_max = 65535 +# VNC WebSocket port policies, same rules apply as with remote display +# ports. VNC WebSockets use similar display <-> port mappings, with +# the exception being that ports starts from 5700 instead of 5900. +# +#remote_websocket_port_min = 5700 +#remote_websocket_port_max = 65535 # The default security driver is SELinux. If SELinux is disabled # on the host, then the security driver will automatically disable diff --git a/portage/make.conf b/portage/make.conf index 9c96218..875f71e 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -100,3 +100,9 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ pdfimport scripting-javascript" source /var/lib/layman/make.conf + +# Set PORTDIR for backward compatibility with various tools: +# gentoo-bashcomp - bug #478444 +# euse - bug #474574 +# euses and ufed - bug #478318 +PORTDIR="/usr/portage" diff --git a/portage/package.use b/portage/package.use index 91cdebd..2a10f9c 100644 --- a/portage/package.use +++ b/portage/package.use @@ -93,6 +93,7 @@ dev-python/ipython doc gnuplot smp wxwidgets dev-python/jinja doc i18n dev-python/lxml doc dev-python/m2crypto doc +dev-python/nagios-plugin doc smart dev-python/nevow doc dev-python/numpy doc dev-python/paramiko doc diff --git a/portage/repos.conf/gentoo.conf b/portage/repos.conf/gentoo.conf new file mode 100644 index 0000000..8c657da --- /dev/null +++ b/portage/repos.conf/gentoo.conf @@ -0,0 +1,7 @@ +[DEFAULT] +main-repo = gentoo + +[gentoo] +location = /usr/portage +sync-type = rsync +sync-uri = rsync://rsync.gentoo.org/gentoo-portage diff --git a/resolv.conf b/resolv.conf index 77f917d..c683edf 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,5 +1,5 @@ # Generated by net-scripts for interface eth0 domain pb.local search pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de -nameserver 192.168.178.30 nameserver 192.168.178.89 +nameserver 192.168.178.30 diff --git a/revdep-rebuild/61-icedtea-bin-6 b/revdep-rebuild/61-icedtea-bin-6 index c0eed0b..6aa5fac 100644 --- a/revdep-rebuild/61-icedtea-bin-6 +++ b/revdep-rebuild/61-icedtea-bin-6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.5" +SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.6" diff --git a/sasl2/libvirt.conf b/sasl2/libvirt.conf index bfa056f..5e2528d 100644 --- a/sasl2/libvirt.conf +++ b/sasl2/libvirt.conf @@ -27,5 +27,5 @@ mech_list: digest-md5 # If using digest-md5 for username/passwds, then this is the file # containing the passwds. Use 'saslpasswd2 -a libvirt [username]' -# to add entries, and 'sasldblistusers2 -a libvirt' to browse it +# to add entries, and 'sasldblistusers2 -f [sasldb_path]' to browse it sasldb_path: /etc/libvirt/passwd.db diff --git a/smartd.conf b/smartd.conf index 7605d5c..5ef85b1 100644 --- a/smartd.conf +++ b/smartd.conf @@ -2,7 +2,7 @@ # Home page is: http://smartmontools.sourceforge.net -# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ +# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ # smartd will re-read the configuration file if it receives a HUP # signal @@ -83,10 +83,11 @@ DEVICESCAN #/dev/twa0 -d 3ware,1 -a -s L/../../2/03 # Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which -# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays +# uses the 3w-sas driver (Linux). Start long self-tests Tuesdays # between 1-2 and 3-4 am. +# On FreeBSD /dev/tws0 should be used instead #/dev/twl0 -d 3ware,0 -a -s L/../../2/01 -#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 +#/dev/twl0 -d 3ware,1 -a -s L/../../2/03 # Same as above for Windows. Option '-d 3ware,N' is not necessary, # disk (port) number is specified in device name. diff --git a/smartd_warning.sh b/smartd_warning.sh new file mode 100755 index 0000000..91f4f89 --- /dev/null +++ b/smartd_warning.sh @@ -0,0 +1,214 @@ +#! /bin/sh +# +# smartd warning script +# +# Copyright (C) 2012-13 Christian Franke +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# You should have received a copy of the GNU General Public License +# (for example COPYING); If not, see . +# +# $Id: smartd_warning.sh.in 3784 2013-03-06 22:02:54Z chrfranke $ +# + +set -e + +# Set by config.status +PACKAGE="smartmontools" +VERSION="6.1" +prefix="/usr" +sysconfdir="/etc" + +# Default mailer +os_mailer="mail" + +# Plugin directory +plugindir="$sysconfdir/smartd_warning.d" + +# Parse options +dryrun= +case $1 in + --dryrun) dryrun=t; shift ;; +esac + +if [ $# != 0 ]; then + cat <&2 + exit 1 +fi + +# Get host and domain names +for cmd in 'hostname' 'uname -n' 'echo "${HOSTNAME?unset}"' 'echo "[Unknown]"'; do + hostname=`eval $cmd 2>/dev/null` || continue + test -n "$hostname" || continue + break +done + +dnsdomain=${hostname#*.} +if [ "$dnsdomain" != "$hostname" ]; then + # BSD 'hostname' prints FQDN + hostname=${hostname%%.*} +else + # Linux Cygwin + for cmd in 'dnsdomainname' 'echo "${USERDNSDOMAIN?unset}"' 'echo'; do + dnsdomain=`eval $cmd 2>/dev/null` || continue + break + done +fi + +for cmd in 'nisdomainname' 'ypdomainname' 'domainname' 'echo'; do + nisdomain=`eval $cmd 2>/dev/null` || continue + break +done +test "$nisdomain" != "(none)" || nisdomain= + +case $OS in + Windows*) windomain=$USERDOMAIN ;; + *) windomain= ;; +esac + +# Format subject +export SMARTD_SUBJECT="SMART error (${SMARTD_FAILTYPE-[SMARTD_FAILTYPE]}) detected on host: $hostname" + +# Format message +fullmessage=` + echo "This message was generated by the smartd daemon running on:" + echo + echo " host name: $hostname" + echo " DNS domain: ${dnsdomain:-[Empty]}" + test -z "$nisdomain" || + echo " NIS domain: $nisdomain" + test -z "$windomain" || + echo " Win domain: $windomain" + echo + echo "The following warning/error was logged by the smartd daemon:" + echo + echo "${SMARTD_MESSAGE-[SMARTD_MESSAGE]}" + echo + echo "Device info:" + echo "${SMARTD_DEVICEINFO-[SMARTD_DEVICEINFO]}" + echo + echo "For details see host's SYSLOG." + if [ "$SMARTD_FAILTYPE" != "EmailTest" ]; then + echo + echo "You can also use the smartctl utility for further investigation." + test "$SMARTD_PREVCNT" = "0" || + echo "The original message about this issue was sent at ${SMARTD_TFIRST-[SMARTD_TFIRST]}" + case $SMARTD_NEXTDAYS in + '') echo "No additional messages about this problem will be sent." ;; + 1) echo "Another message will be sent in 24 hours if the problem persists." ;; + *) echo "Another message will be sent in $SMARTD_NEXTDAYS days if the problem persists." ;; + esac + fi +` + +# Export message with trailing newline +export SMARTD_FULLMESSAGE="$fullmessage +" + +# Run plugin scripts if requested +case " $SMARTD_ADDRESS" in + *\ @*) + if [ -n "$dryrun" ]; then + echo "export SMARTD_SUBJECT='$SMARTD_SUBJECT'" + echo "export SMARTD_FULLMESSAGE='$SMARTD_FULLMESSAGE'" + fi + + # Run ALL scripts if requested + case " $SMARTD_ADDRESS " in + *\ @ALL\ *) + for cmd in "$plugindir"/*; do + if [ -f "$cmd" ] && [ -x "$cmd" ]; then + if [ -n "$dryrun" ]; then + echo "$cmd &2 + fi + ;; + *) + SMARTD_ADDRESS="${SMARTD_ADDRESS:+ }$ad" + ;; + esac + done + + # Send email to remaining addresses + test -n "$SMARTD_ADDRESS" || exit 0 + ;; +esac + +# Send mail or run command +if [ -n "$SMARTD_ADDRESS" ]; then + + # Send mail, use platform mailer by default + test -n "$SMARTD_MAILER" || SMARTD_MAILER=$os_mailer + if [ -n "$dryrun" ]; then + echo "exec '$SMARTD_MAILER' -s '$SMARTD_SUBJECT' $SMARTD_ADDRESS <