From: Frank Brehm Date: Tue, 4 Dec 2012 10:46:15 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=edeca2dbfae8c69ea5626ee22488c86f22e5b30b;p=config%2Fbruni%2Fetc.git Current state --- diff --git a/X11/mwm/system.mwmrc b/X11/mwm/system.mwmrc index d530bac6..4a518b66 100644 --- a/X11/mwm/system.mwmrc +++ b/X11/mwm/system.mwmrc @@ -1,37 +1,24 @@ ! -! @OPENGROUP_COPYRIGHT@ -! COPYRIGHT NOTICE -! Copyright (c) 1990, 1991, 1992, 1993 Open Software Foundation, Inc. -! Copyright (c) 1996, 1997, 1998, 1999, 2000 The Open Group -! ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for -! the full copyright text. -! -! This software is subject to an open license. It may only be -! used on, with or for operating systems which are themselves open -! source systems. You must contact The Open Group for a license -! allowing distribution and sublicensing of this software on, with, -! or for operating systems which are not Open Source programs. -! -! See http://www.opengroup.org/openmotif/license for full -! details of the license agreement. Any use, reproduction, or -! distribution of the program constitutes recipient's acceptance of -! this agreement. -! -! EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -! PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -! KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY -! WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -! OR FITNESS FOR A PARTICULAR PURPOSE -! -! EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -! NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, -! INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -! DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED -! AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -! ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -! EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGES. +! Motif +! +! Copyright (c) 1987-2012, The Open Group. All rights reserved. +! +! These libraries and programs are free software; you can +! redistribute them and/or modify them under the terms of the GNU +! Lesser General Public License as published by the Free Software +! Foundation; either version 2 of the License, or (at your option) +! any later version. +! +! These libraries and programs are distributed in the hope that +! they will be useful, but WITHOUT ANY WARRANTY; without even the +! implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +! PURPOSE. See the GNU Lesser General Public License for more +! details. +! +! You should have received a copy of the GNU Lesser General Public +! License along with these librararies and programs; if not, write +! to the Free Software Foundation, Inc., 51 Franklin Street, Fifth +! Floor, Boston, MA 02110-1301 USA ! ! $XConsortium: system.mwmrc /main/9 1996/10/25 11:45:42 drk $ ! diff --git a/conf.d/consolefont b/conf.d/consolefont index b2fa635e..e01ae842 100644 --- a/conf.d/consolefont +++ b/conf.d/consolefont @@ -1,9 +1,10 @@ +# The consolefont service is not activated by default. If you need to +# use it, you should run "rc-update add consolefont boot" as root. +# # consolefont specifies the default font that you'd like Linux to use on the # console. You can find a good selection of fonts in /usr/share/consolefonts; # you shouldn't specify the trailing ".psf.gz", just the font name below. # To use the default console font, comment out the CONSOLEFONT setting below. -# This setting is used by the /etc/init.d/consolefont script (NOTE: if you do -# not want to use it, run "rc-update del consolefont boot" as root). consolefont="default8x16" # consoletranslation is the charset map file to use. Leave commented to use diff --git a/conf.d/dmesg b/conf.d/dmesg index eb065f2f..cd4b8b36 100644 --- a/conf.d/dmesg +++ b/conf.d/dmesg @@ -1,3 +1,3 @@ # Sets the level at which logging of messages is done to the -# console. See dmesg(8) for more info. +# console. See dmesg(1) for more info. dmesg_level="1" diff --git a/conf.d/hsqldb b/conf.d/hsqldb new file mode 100644 index 00000000..47bb5264 --- /dev/null +++ b/conf.d/hsqldb @@ -0,0 +1,126 @@ +# $Id: sample-hsqldb.cfg,v 1.15 2005/07/23 19:54:17 unsaved Exp $ + +# Sample configuration file for HSQLDB database server. +# See the "UNIX Quick Start" chapter of the Hsqldb User Guide. + +# N.b.!!!! You must place this in the right location for your type of UNIX. +# See the init script "hsqldb" to see where this must be placed and +# what it should be renamed to. + +# This file is "sourced" by a Bourne shell, so use Bourne shell syntax. + +# This file WILL NOT WORK until you set (at least) the non-commented +# variables to the appropriate values for your system. +# Life will be easier if you avoid all filepaths with spaces or any other +# funny characters. Don't ask for support if you ignore this advice. + +# Thanks to Meikel Bisping for his contributions. -- Blaine + +JAVA_EXECUTABLE=/usr/bin/java + +# Unless you copied a hsqldb.jar file from another system, this typically +# resides at $HSQLDB_HOME/lib/hsqldb.jar, where $HSQLDB_HOME is your HSQLDB +# software base directory. +HSQLDB_JAR_PATH=/usr/share/hsqldb/lib/hsqldb.jar + +# Where the file "server.properties" resides. +SERVER_HOME=/var/lib/hsqldb + +# What UNIX user the server will run as. +# (The shutdown client is always run as root or the invoker of the init script). +# Runs as root by default, but you should take the time to set database file +# ownerships to another user and set that user name here. +HSQLDB_OWNER=hsqldb + +# The HSQLDB jar file specified in HSQLDB_JAR_PATH above will automatically +# be in the class path. This arg specifies additional classpath elements. +# To embed your own application, add your jar file(s) or class base +# directories here, and add your main class to the INVOC_ADDL_ARGS setting +# below. +#SERVER_ADDL_CLASSPATH=/usr/local/dist/currencybank.jar + +# We require all Server/WebServer instances to be accessible within +# $MAX_START_SECS from when the Server/WebServer is started. +# Defaults to 60. +# Raise this is you are running lots of DB instances or have a slow server. +#MAX_START_SECS=200 + +# Time to allow for JVM to die after all HSQLDB instances stopped. +# Defaults to 1. +#MAX_TERMINATE_SECS=0 + +# These are "urlid" values from a SqlTool authentication file +# ** IN ADDITION TO THOSE IN YOUR server.properties OR webserver.properties ** +# file. All server.urlid.X values from your properties file will automatically +# be started/stopped/tested. $SHUTDOWN_URLIDS is for additional urlids which +# will stopped. (Therefore, most users will not set this at all). +# Separate multiple values with white space. NO OTHER SPECIAL CHARACTERS! +# Make sure to quote the entire value if it contains white space separator(s). +# Defaults to none (i.e., only urlids set in properties file will be stopped). +#SHUTDOWN_URLIDS='sa mygms' + +# SqlTool authentication file used only for shutdown. +# The default value will be sqltool.rc in root's home directory, since it is +# root who runs the init script. +# (See the SqlTool chapter of the HSQLDB User Guide if you don't understand +# this). +AUTH_FILE=${SERVER_HOME}/sqltool.rc + +# Set this to either 'WebServer' or 'Server'. Defaults to Server. +# The JVM that is started can invoke many classes (see the following item +# about that), but this is the Server that is used (1) to check status, +# (2) to shut down the JVM, (3) to get urlids for #1 from the +# server's server/webserver.properties file. +#TARGET_CLASS=WebServer +# Note that you don't specify the org.hsqldb package, since you have no +# choice in the matter (you can only run org.hsqldb.Server or +# org.hsqldb.WebServer). If you specify additional classes with +# INVOC_ADDL_ARGS (described next), you do need to specify the +# full class name with package name. + +# This is where you specify exactly what your HSQLDB JVM will run. +# The class org.hsqldb.util.MainInvoker will run the TARGET_CLASS +# specified above with any arguments supplied here + any other classes +# and arguments. Every additional class (in addition to the TARGET_CLASS) +# must be preceded with an empty string, so that MainInvoker will know +# you are giving a class name. MainInvoker will invoke the normal +# static main(String[]) method of each such class. +# By default, MainInvoker will just run TARGET_CLASS with no args. +# Example that runs just the TARGET_CLASS with the specified arguments: +#INVOC_ADDL_ARGS='-silent false' +# Example that runs the TARGET_CLASS plus a WebServer: +#INVOC_ADDL_ARGS='"" org.hsqldb.WebServer' +# Note the empty string preceding the class name. +# Example that starts TARGET_CLASS with an argument + a WebServer + +# your own application with its args (i.e., the HSQLDB Servers are +# "embedded" in your application). (Set SERVER_ADDL_CLASSPATH too).: +#INVOC_ADDL_ARGS='-silent false "" org.hsqldb.WebServer "" com.acme.Stone --env prod localhost' +# Example to run a non-TLS server in same JVM with a TLS server. In this +# case, TARGET_CLASS is Server which will run in TLS mode by virtue of +# setting TLS_KEYSTORE and TLS_PASSWORD above. The "additional" Server +# here overrides the 'tls' and 'port' settings: +#INVOC_ADDL_ARGS="'' org.hsqldb.Server -port 9002 -tls false" +# Note that you use nested quotes to group arguments and to specify the +# empty-string delimiter. + +# For TLS encryption for your Server, set these two variables. +# N.b.: If you set these, then make this file unreadable to non-root users!!!! +# See the TLS chapter of the HSQLDB User Guide, paying attention to the +# security warning(s). +# If you are running with a private server cert, then you will also need to +# set "truststore" in the your SqlTool config file (location is set by the +# AUTH_FILE variable in this file, or it must be at the default location for +# HSQLDB_OWNER). +#TLS_KEYSTORE=/path/to/jks/server.store +#TLS_PASSWORD=password + +# Any JVM args for the invocation of the JDBC client used to verify DB +# instances and to shut them down (SqlToolSprayer). +# This example specifies the location of a private trust store for TLS +# encryption. +# For multiple args, put quotes around entire value. +#CLIENT_JVMARGS=-Djavax.net.debug=ssl + +# Any JVM args for the server. +# For multiple args, put quotes around entire value. +#SERVER_JVMARGS=-Xmx512m diff --git a/conf.d/hwclock b/conf.d/hwclock index e1dff136..db790a26 100644 --- a/conf.d/hwclock +++ b/conf.d/hwclock @@ -1,22 +1,20 @@ # Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as -# Greenwich Mean Time). If that clock is set to the local time, then -# set CLOCK to "local". Note that if you dual boot with Windows, then +# Greenwich Mean Time). If that clock is set to the local time, then +# set CLOCK to "local". Note that if you dual boot with Windows, then # you should set it to "local". clock="UTC" -# If you want to set the Hardware Clock to the current System Time -# (software clock) during shutdown, then say "YES" here. -# You normally don't need to do this if you run a ntp daemon. +# If you want the hwclock script to set the system time (software clock) +# to match the current hardware clock during bootup, leave this +# commented out. +# However, you can set this to "NO" ifyou are running a modern kernel +# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC. +clock_hctosys="YES" + +# If you do not want to set the hardware clock to the current system +# time (software clock) during shutdown, set this to no. clock_systohc="YES" -# If you want to set the system time to the current hardware clock -# during bootup, then say "YES" here. You do not need this if you are -# running a modern kernel with CONFIG_RTC_HCTOSYS set to y. -# Also, be aware that if you set this to "NO", the system time will -# never be saved to the hardware clock unless you set -# clock_systohc="YES" above. -clock_hctosys="YES" - # If you wish to pass any other arguments to hwclock during bootup, # you may do so here. Alpha users may wish to use --arc or --srm here. clock_args="" diff --git a/conf.d/ip6tables b/conf.d/ip6tables index 93c0bc89..3bb36989 100644 --- a/conf.d/ip6tables +++ b/conf.d/ip6tables @@ -9,3 +9,11 @@ SAVE_RESTORE_OPTIONS="-c" # Save state on stopping iptables SAVE_ON_STOP="yes" + +# If you need to log iptables messages as soon as iptables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff --git a/conf.d/iptables b/conf.d/iptables index 91287deb..7225374c 100644 --- a/conf.d/iptables +++ b/conf.d/iptables @@ -9,3 +9,11 @@ SAVE_RESTORE_OPTIONS="-c" # Save state on stopping iptables SAVE_ON_STOP="yes" + +# If you need to log iptables messages as soon as iptables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff --git a/conf.d/keymaps b/conf.d/keymaps index 002b2d40..6debfc95 100644 --- a/conf.d/keymaps +++ b/conf.d/keymaps @@ -13,7 +13,7 @@ windowkeys="YES" extended_keymaps="" #extended_keymaps="backspace keypad euro2" -# Tell dumpkeys(1) to interpret character action codes to be +# Tell dumpkeys(1) to interpret character action codes to be # from the specified character set. # This only matters if you set unicode="yes" in /etc/rc.conf. # For a list of valid sets, run `dumpkeys --help` diff --git a/conf.d/netmount b/conf.d/netmount new file mode 100644 index 00000000..7df2c8d7 --- /dev/null +++ b/conf.d/netmount @@ -0,0 +1,20 @@ +# Depending on how mounting your network file systems behaves when your +# network interfaces are down, you may need to set the netmount script to +# require specific network interfaces to be active. This file gives +# examples of how to do this: +# +# If you are using newnet and configuring the interface with a static +# address with the network script: +# rc_need="network" +# +# If you are using oldnet, you must list the specific net.* services you +# need: +# +# rc_need="net.eth0" +# rc_need="net.eth1 net.eth2" +# +# If you are using a dynamic network management tool like +# networkmanager, dhcpcd, etc, you should list that tool here. +# +# rc_need="networkmanager" +# rc_need="dhcpcd" diff --git a/conf.d/postgresql-9.1 b/conf.d/postgresql-9.1 deleted file mode 100644 index 54cf5cc7..00000000 --- a/conf.d/postgresql-9.1 +++ /dev/null @@ -1,58 +0,0 @@ -# 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.1' 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.1/" - -# Where the data directory is located/to be created -DATA_DIR="/var/lib/postgresql/9.1/data" - -# Additional options to pass to initdb. -# See `man initdb' for available options. -#PG_INITDB_OPTS="--locale=en_US.UTF-8" diff --git a/conf.d/postgresql-9.2 b/conf.d/postgresql-9.2 new file mode 100644 index 00000000..2902e212 --- /dev/null +++ b/conf.d/postgresql-9.2 @@ -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.2' 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.2/" + +# Where the data directory is located/to be created +DATA_DIR="/var/lib/postgresql/9.2/data" + +# Additional options to pass to initdb. +# See `man initdb' for available options. +#PG_INITDB_OPTS="--locale=en_US.UTF-8" diff --git a/conf.d/tmpfiles b/conf.d/tmpfiles new file mode 100644 index 00000000..c3f208fe --- /dev/null +++ b/conf.d/tmpfiles @@ -0,0 +1,3 @@ +# Extra options for tmpfiles.sh +#tmpfiles_opts="--verbose" +tmpfiles_opts="" diff --git a/config-archive/etc/conf.d/hwclock.dist b/config-archive/etc/conf.d/hwclock.dist new file mode 100644 index 00000000..59bb732d --- /dev/null +++ b/config-archive/etc/conf.d/hwclock.dist @@ -0,0 +1,20 @@ +# Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as +# Greenwich Mean Time). If that clock is set to the local time, then +# set CLOCK to "local". Note that if you dual boot with Windows, then +# you should set it to "local". +clock="UTC" + +# If you want the hwclock script to set the system time (software clock) +# to match the current hardware clock during bootup, leave this +# commented out. +# However, you can set this to "NO" ifyou are running a modern kernel +# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC. +#clock_hctosys="YES" + +# If you do not want to set the hardware clock to the current system +# time (software clock) during shutdown, set this to no. +#clock_systohc="YES" + +# If you wish to pass any other arguments to hwclock during bootup, +# you may do so here. Alpha users may wish to use --arc or --srm here. +clock_args="" diff --git a/config-archive/etc/conf.d/hwclock.dist.new b/config-archive/etc/conf.d/hwclock.dist.new deleted file mode 100644 index 4e66ff95..00000000 --- a/config-archive/etc/conf.d/hwclock.dist.new +++ /dev/null @@ -1,22 +0,0 @@ -# Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as -# Greenwich Mean Time). If that clock is set to the local time, then -# set CLOCK to "local". Note that if you dual boot with Windows, then -# you should set it to "local". -clock="UTC" - -# If you want to set the Hardware Clock to the current System Time -# (software clock) during shutdown, then say "YES" here. -# You normally don't need to do this if you run a ntp daemon. -clock_systohc="NO" - -# If you want to set the system time to the current hardware clock -# during bootup, then say "YES" here. You do not need this if you are -# running a modern kernel with CONFIG_RTC_HCTOSYS set to y. -# Also, be aware that if you set this to "NO", the system time will -# never be saved to the hardware clock unless you set -# clock_systohc="YES" above. -clock_hctosys="YES" - -# If you wish to pass any other arguments to hwclock during bootup, -# you may do so here. Alpha users may wish to use --arc or --srm here. -clock_args="" diff --git a/config-archive/etc/conf.d/keymaps.dist b/config-archive/etc/conf.d/keymaps.dist new file mode 100644 index 00000000..35d5b892 --- /dev/null +++ b/config-archive/etc/conf.d/keymaps.dist @@ -0,0 +1,23 @@ +# Use keymap to specify the default console keymap. There is a complete tree +# of keymaps in /usr/share/keymaps to choose from. +keymap="us" + +# Should we first load the 'windowkeys' console keymap? Most x86 users will +# say "yes" here. Note that non-x86 users should leave it as "no". +# Loading this keymap will enable VT switching (like ALT+Left/Right) +# using the special windows keys on the linux console. +windowkeys="YES" + +# The maps to load for extended keyboards. Most users will leave this as is. +extended_keymaps="" +#extended_keymaps="backspace keypad euro2" + +# Tell dumpkeys(1) to interpret character action codes to be +# from the specified character set. +# This only matters if you set unicode="yes" in /etc/rc.conf. +# For a list of valid sets, run `dumpkeys --help` +dumpkeys_charset="" + +# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro € +# To fix this, set to "yes" +fix_euro="NO" diff --git a/config-archive/etc/conf.d/keymaps.dist.new b/config-archive/etc/conf.d/keymaps.dist.new deleted file mode 100644 index 430383df..00000000 --- a/config-archive/etc/conf.d/keymaps.dist.new +++ /dev/null @@ -1,23 +0,0 @@ -# Use keymap to specify the default console keymap. There is a complete tree -# of keymaps in /usr/share/keymaps to choose from. -keymap="us" - -# Should we first load the 'windowkeys' console keymap? Most x86 users will -# say "yes" here. Note that non-x86 users should leave it as "no". -# Loading this keymap will enable VT switching (like ALT+Left/Right) -# using the special windows keys on the linux console. -windowkeys="YES" - -# The maps to load for extended keyboards. Most users will leave this as is. -extended_keymaps="" -#extended_keymaps="backspace keypad euro2" - -# Tell dumpkeys(1) to interpret character action codes to be -# from the specified character set. -# This only matters if you set unicode="yes" in /etc/rc.conf. -# For a list of valid sets, run `dumpkeys --help` -dumpkeys_charset="" - -# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro € -# To fix this, set to "yes" -fix_euro="NO" diff --git a/config-archive/etc/rc.conf.dist b/config-archive/etc/rc.conf.dist new file mode 100644 index 00000000..f0058cd2 --- /dev/null +++ b/config-archive/etc/rc.conf.dist @@ -0,0 +1,162 @@ +# Global OpenRC configuration settings + +# Set to "YES" if you want the rc system to try and start services +# in parallel for a slight speed improvement. When running in parallel we +# prefix the service output with its name as the output will get +# jumbled up. +# WARNING: whilst we have improved parallel, it can still potentially lock +# the boot process. Don't file bugs about this unless you can supply +# patches that fix it without breaking other things! +#rc_parallel="NO" + +# Set rc_interactive to "YES" and you'll be able to press the I key during +# boot so you can choose to start specific services. Set to "NO" to disable +# this feature. This feature is automatically disabled if rc_parallel is +# set to YES. +#rc_interactive="YES" + +# If we need to drop to a shell, you can specify it here. +# If not specified we use $SHELL, otherwise the one specified in /etc/passwd, +# otherwise /bin/sh +# Linux users could specify /sbin/sulogin +rc_shell=/sbin/sulogin + +# Do we allow any started service in the runlevel to satisfy the dependency +# or do we want all of them regardless of state? For example, if net.eth0 +# and net.eth1 are in the default runlevel then with rc_depend_strict="NO" +# both will be started, but services that depend on 'net' will work if either +# one comes up. With rc_depend_strict="YES" we would require them both to +# come up. +#rc_depend_strict="YES" + +# rc_hotplug is a list of services that we allow to be hotplugged. +# By default we do not allow hotplugging. +# A hotplugged service is one started by a dynamic dev manager when a matching +# hardware device is found. +# This service is intrinsically included in the boot runlevel. +# To disable services, prefix with a ! +# Example - rc_hotplug="net.wlan !net.*" +# This allows net.wlan and any service not matching net.* to be plugged. +# Example - rc_hotplug="*" +# This allows all services to be hotplugged +#rc_hotplug="*" + +# rc_logger launches a logging daemon to log the entire rc process to +# /var/log/rc.log +# NOTE: Linux systems require the devfs service to be started before +# logging can take place and as such cannot log the sysinit runlevel. +#rc_logger="YES" + +# Through rc_log_path you can specify a custom log file. +# The default value is: /var/log/rc.log +#rc_log_path="/var/log/rc.log" + +# By default we filter the environment for our running scripts. To allow other +# variables through, add them here. Use a * to allow all variables through. +#rc_env_allow="VAR1 VAR2" + +# By default we assume that all daemons will start correctly. +# However, some do not - a classic example is that they fork and return 0 AND +# then child barfs on a configuration error. Or the daemon has a bug and the +# child crashes. You can set the number of milliseconds start-stop-daemon +# waits to check that the daemon is still running after starting here. +# The default is 0 - no checking. +#rc_start_wait=100 + +# rc_nostop is a list of services which will not stop when changing runlevels. +# This still allows the service itself to be stopped when called directly. +#rc_nostop="" + +# rc will attempt to start crashed services by default. +# However, it will not stop them by default as that could bring down other +# critical services. +#rc_crashed_stop=NO +#rc_crashed_start=YES + +############################################################################## +# MISC CONFIGURATION VARIABLES +# There variables are shared between many init scripts + +# Set unicode to YES to turn on unicode support for keyboards and screens. +unicode="YES" + +# Below is the default list of network fstypes. +# +# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs +# nfs nfs4 ocfs2 shfs smbfs +# +# If you would like to add to this list, you can do so by adding your +# own fstypes to the following variable. +#extra_net_fs_list="" + +############################################################################## +# SERVICE CONFIGURATION VARIABLES +# These variables are documented here, but should be configured in +# /etc/conf.d/foo for service foo and NOT enabled here unless you +# really want them to work on a global basis. +# If your service has characters in its name which are not legal in +# shell variable names and you configure the variables for it in this +# file, those characters should be replaced with underscores in the +# variable names as shown below. + +# Some daemons are started and stopped via start-stop-daemon. +# We can set some things on a per service basis, like the nicelevel. +#export SSD_NICELEVEL="-19" + +# Pass ulimit parameters +#rc_ulimit="-u 30" + +# It's possible to define extra dependencies for services like so +#rc_config="/etc/foo" +#rc_need="openvpn" +#rc_use="net.eth0" +#rc_after="clock" +#rc_before="local" +#rc_provide="!net" + +# You can also enable the above commands here for each service. Below is an +# example for service foo. +#rc_foo_config="/etc/foo" +#rc_foo_need="openvpn" +#rc_foo_after="clock" + +# Below is an example for service foo-bar. Note that the '-' is illegal +# in a shell variable name, so we convert it to an underscore. +# example for service foo-bar. +#rc_foo_bar_config="/etc/foo-bar" +#rc_foo_bar_need="openvpn" +#rc_foo_bar_after="clock" + +# You can also remove dependencies. +# This is mainly used for saying which servies do NOT provide net. +#rc_net_tap0_provide="!net" + +############################################################################## +# LINUX SPECIFIC OPTIONS + +# This is the subsystem type. Valid options on Linux: +# "" - nothing special +# "lxc" - Linux Containers +# "openvz" - Linux OpenVZ +# "prefix" - Prefix +# "uml" - Usermode Linux +# "vserver" - Linux vserver +# "xen0" - Xen0 Domain +# "xenU" - XenU Domain +# If this is commented out, automatic detection will be used. +# +# This should be set to the value representing the environment this file is +# PRESENTLY in, not the virtualization the environment is capable of. +#rc_sys="" + +# This is the number of tty's used in most of the rc-scripts (like +# consolefont, numlock, etc ...) +rc_tty_number=12 + +# If you have cgroups turned on in your kernel, this switch controls +# whether or not a group for each controler is mounted under +# /sys/fs/cgroup. +# Support for process management by cgroups is planned in the future, +# so if you turn this off, be aware that you may not be able to use that +# feature. +#rc_controller_cgroups="YES" diff --git a/config-archive/etc/rc.conf.dist.new b/config-archive/etc/rc.conf.dist.new deleted file mode 100644 index d3f5eb93..00000000 --- a/config-archive/etc/rc.conf.dist.new +++ /dev/null @@ -1,135 +0,0 @@ -# Global OpenRC configuration settings - -# Set rc_interactive to "YES" and you'll be able to press the I key during -# boot so you can choose to start specific services. Set to "NO" to disable -# this feature. -#rc_interactive="YES" - -# If we need to drop to a shell, you can specify it here. -# If not specified we use $SHELL, otherwise the one specified in /etc/passwd, -# otherwise /bin/sh -# Linux users could specify /sbin/sulogin -rc_shell=/sbin/sulogin - -# Do we allow any started service in the runlevel to satisfy the dependency -# or do we want all of them regardless of state? For example, if net.eth0 -# and net.eth1 are in the default runlevel then with rc_depend_strict="NO" -# both will be started, but services that depend on 'net' will work if either -# one comes up. With rc_depend_strict="YES" we would require them both to -# come up. -#rc_depend_strict="YES" - -# rc_hotplug is a list of services that we allow to be hotplugged. -# By default we do not allow hotplugging. -# A hotplugged service is one started by a dynamic dev manager when a matching -# hardware device is found. -# This service is intrinsically included in the boot runlevel. -# To disable services, prefix with a ! -# Example - rc_hotplug="net.wlan !net.*" -# This allows net.wlan and any service not matching net.* to be plugged. -# Example - rc_hotplug="*" -# This allows all services to be hotplugged -#rc_hotplug="*" - -# rc_logger launches a logging daemon to log the entire rc process to -# /var/log/rc.log -# NOTE: Linux systems require the devfs service to be started before -# logging can take place and as such cannot log the sysinit runlevel. -#rc_logger="YES" - -# Through rc_log_path you can specify a custom log file. -# The default value is: /var/log/rc.log -#rc_log_path="/var/log/rc.log" - -# By default we filter the environment for our running scripts. To allow other -# variables through, add them here. Use a * to allow all variables through. -#rc_env_allow="VAR1 VAR2" - -# By default we assume that all daemons will start correctly. -# However, some do not - a classic example is that they fork and return 0 AND -# then child barfs on a configuration error. Or the daemon has a bug and the -# child crashes. You can set the number of milliseconds start-stop-daemon -# waits to check that the daemon is still running after starting here. -# The default is 0 - no checking. -#rc_start_wait=100 - -# rc_nostop is a list of services which will not stop when changing runlevels. -# This still allows the service itself to be stopped when called directly. -#rc_nostop="" - -# rc will attempt to start crashed services by default. -# However, it will not stop them by default as that could bring down other -# critical services. -#rc_crashed_stop=NO -#rc_crashed_start=YES - -############################################################################## -# MISC CONFIGURATION VARIABLES -# There variables are shared between many init scripts - -# Set unicode to YES to turn on unicode support for keyboards and screens. -unicode="YES" - -# Below is the default list of network fstypes. -# -# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs -# nfs nfs4 ocfs2 shfs smbfs -# -# If you would like to add to this list, you can do so by adding your -# own fstypes to the following variable. -#extra_net_fs_list="" - -############################################################################## -# SERVICE CONFIGURATION VARIABLES -# These variables are documented here, but should be configured in -# /etc/conf.d/foo for service foo and NOT enabled here unless you -# really want them to work on a global basis. - -# Some daemons are started and stopped via start-stop-daemon. -# We can set some things on a per service basis, like the nicelevel. -#export SSD_NICELEVEL="-19" - -# Pass ulimit parameters -#rc_ulimit="-u 30" - -# It's possible to define extra dependencies for services like so -#rc_config="/etc/foo" -#rc_need="openvpn" -#rc_use="net.eth0" -#rc_after="clock" -#rc_before="local" -#rc_provide="!net" - -# You can also enable the above commands here for each service. Below is an -# example for service foo. -#rc_foo_config="/etc/foo" -#rc_foo_need="openvpn" -#rc_foo_after="clock" - -# You can also remove dependencies. -# This is mainly used for saying which servies do NOT provide net. -#rc_net_tap0_provide="!net" - -############################################################################## -# LINUX SPECIFIC OPTIONS - -# This is the subsystem type. Valid options on Linux: -# "" - nothing special -# "lxc" - Linux Containers -# "openvz" - Linux OpenVZ -# "prefix" - Prefix -# "uml" - Usermode Linux -# "vserver" - Linux vserver -# "xen0" - Xen0 Domain -# "xenU" - XenU Domain -# If this is commented out, automatic detection will be attempted. -# Note that autodetection will not work in a prefix environment or in a -# linux container. -# -# This should be set to the value representing the environment this file is -# PRESENTLY in, not the virtualization the environment is capable of. -#rc_sys="" - -# This is the number of tty's used in most of the rc-scripts (like -# consolefont, numlock, etc ...) -rc_tty_number=12 diff --git a/config-archive/usr/share/config/kdm/kdmrc.dist.new b/config-archive/usr/share/config/kdm/kdmrc.dist.new index 8749e300..1c1d3a6b 100644 --- a/config-archive/usr/share/config/kdm/kdmrc.dist.new +++ b/config-archive/usr/share/config/kdm/kdmrc.dist.new @@ -449,7 +449,7 @@ FaceDir=/var/lib/kdm/faces # Random seed for forging saved session types, etc. of unknown users. # This value should be random but constant across the login domain. # Default is 0 -ForgingSeed=1348094161 +ForgingSeed=1353971086 # Specify conversation plugins for the login dialog. Each plugin can be # specified as a base name (which expands to $kde_modulesdir/kgreet_$base) # or as a full pathname. diff --git a/courier/authlib/authdaemonrc b/courier/authlib/authdaemonrc index afd6adf3..c3824474 100644 --- a/courier/authlib/authdaemonrc +++ b/courier/authlib/authdaemonrc @@ -1,4 +1,4 @@ -##VERSION: $Id: authdaemonrc.in,v 1.13 2005/10/05 00:07:32 mrsam Exp $ +##VERSION: $Id: authdaemonrc.in 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authdaemonrc.dist b/courier/authlib/authdaemonrc.dist index b1b26700..e66f6350 100644 --- a/courier/authlib/authdaemonrc.dist +++ b/courier/authlib/authdaemonrc.dist @@ -1,4 +1,4 @@ -##VERSION: $Id: authdaemonrc.in,v 1.13 2005/10/05 00:07:32 mrsam Exp $ +##VERSION: $Id: authdaemonrc.in 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authldaprc b/courier/authlib/authldaprc index 79bfa94b..6ff1d1b5 100644 --- a/courier/authlib/authldaprc +++ b/courier/authlib/authldaprc @@ -1,4 +1,4 @@ -##VERSION: $Id: authldaprc,v 1.25 2005/10/05 00:07:32 mrsam Exp $ +##VERSION: $Id: authldaprc 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2004 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authldaprc.dist b/courier/authlib/authldaprc.dist index 79bfa94b..6ff1d1b5 100644 --- a/courier/authlib/authldaprc.dist +++ b/courier/authlib/authldaprc.dist @@ -1,4 +1,4 @@ -##VERSION: $Id: authldaprc,v 1.25 2005/10/05 00:07:32 mrsam Exp $ +##VERSION: $Id: authldaprc 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2004 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authmysqlrc b/courier/authlib/authmysqlrc index dd645e11..c2640c54 100644 --- a/courier/authlib/authmysqlrc +++ b/courier/authlib/authmysqlrc @@ -1,4 +1,4 @@ -##VERSION: $Id: authmysqlrc,v 1.20 2007/10/07 02:50:45 mrsam Exp $ +##VERSION: $Id: authmysqlrc 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2007 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authmysqlrc.dist b/courier/authlib/authmysqlrc.dist index dd645e11..c2640c54 100644 --- a/courier/authlib/authmysqlrc.dist +++ b/courier/authlib/authmysqlrc.dist @@ -1,4 +1,4 @@ -##VERSION: $Id: authmysqlrc,v 1.20 2007/10/07 02:50:45 mrsam Exp $ +##VERSION: $Id: authmysqlrc 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2007 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authpgsqlrc b/courier/authlib/authpgsqlrc index 2e449999..ab85c8e0 100644 --- a/courier/authlib/authpgsqlrc +++ b/courier/authlib/authpgsqlrc @@ -1,4 +1,4 @@ -##VERSION: $Id: authpgsqlrc,v 1.13 2008/12/18 12:08:25 mrsam Exp $ +##VERSION: $Id: authpgsqlrc 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2004 Double Precision, Inc. See COPYING for # distribution information. diff --git a/courier/authlib/authpgsqlrc.dist b/courier/authlib/authpgsqlrc.dist index 2e449999..ab85c8e0 100644 --- a/courier/authlib/authpgsqlrc.dist +++ b/courier/authlib/authpgsqlrc.dist @@ -1,4 +1,4 @@ -##VERSION: $Id: authpgsqlrc,v 1.13 2008/12/18 12:08:25 mrsam Exp $ +##VERSION: $Id: authpgsqlrc 17 2011-04-04 02:07:37Z mrsam $ # # Copyright 2000-2004 Double Precision, Inc. See COPYING for # distribution information. diff --git a/csh.env b/csh.env index 029193ed..145f2214 100644 --- a/csh.env +++ b/csh.env @@ -3,7 +3,7 @@ # GO INTO /etc/csh.cshrc NOT /etc/csh.env setenv ANT_HOME '/usr/share/ant' -setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt /usr/share/config /usr/share/openvpn/easy-rsa' +setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config /usr/share/openvpn/easy-rsa' setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' setenv EDITOR '/usr/bin/vim' setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.0-r1/html' @@ -29,7 +29,8 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/' +setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin' diff --git a/cups/printers.conf b/cups/printers.conf index 563cbe23..53fd9da9 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-11-25 13:06 +# Written by cupsd on 2012-12-03 17:22 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4 diff --git a/drirc b/drirc new file mode 100644 index 00000000..cf13cdb8 --- /dev/null +++ b/drirc @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index 7148a1f9..476e7c4a 100644 --- a/env.d/04gcc-x86_64-pc-linux-gnu +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -3,3 +3,4 @@ ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4" GCC_SPECS="" MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man" INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info" +MULTIOSDIRS="../lib64:../lib32" diff --git a/env.d/35hsqldb b/env.d/35hsqldb new file mode 100644 index 00000000..7ea66e04 --- /dev/null +++ b/env.d/35hsqldb @@ -0,0 +1 @@ +CONFIG_PROTECT="/var/lib/hsqldb" diff --git a/env.d/50postgresql b/env.d/50postgresql index 259200c0..e71633db 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.1/lib64/" -MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/" +LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.2/lib64/" +MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/" diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 b/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 index db1beee9..d6e7ec1a 100644 --- a/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 @@ -2,4 +2,7 @@ LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4:/usr/lib/gcc/x86_64-pc-linux-gnu/ MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man" INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info" STDCXX_INCDIR="g++-v4" +CTARGET="x86_64-pc-linux-gnu" +GCC_SPECS="" +MULTIOSDIRS="../lib64:../lib32" GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4" diff --git a/eselect/postgresql/active b/eselect/postgresql/active index 28a21864..1a2c3557 100644 --- a/eselect/postgresql/active +++ b/eselect/postgresql/active @@ -1 +1 @@ -9.1 +9.2 diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links index bda58f2c..19d6011e 100644 --- a/eselect/postgresql/active.links +++ b/eselect/postgresql/active.links @@ -4,23 +4,23 @@ /usr/include/libpq /usr/include/postgres_ext.h /usr/lib64/postgresql -/usr/lib64/libpq.so.5.4 /usr/lib64/libecpg_compat.so.3 /usr/lib64/libpgtypes.so.3 -/usr/lib64/libecpg_compat.so.3.3 /usr/lib64/libpq.so.5 /usr/lib64/libpgport.a /usr/lib64/libecpg.a /usr/lib64/libecpg.so.6 +/usr/lib64/libecpg.so.6.4 /usr/lib64/libecpg.so /usr/lib64/libpq.so -/usr/lib64/libecpg.so.6.3 /usr/lib64/libpqwalreceiver.so +/usr/lib64/libecpg_compat.so.3.4 +/usr/lib64/libpgtypes.so.3.3 /usr/lib64/libpgtypes.so /usr/lib64/libpgtypes.a /usr/lib64/libpq.a -/usr/lib64/libpgtypes.so.3.2 /usr/lib64/libecpg_compat.a +/usr/lib64/libpq.so.5.5 /usr/lib64/libecpg_compat.so /usr/bin/pg_standby /usr/bin/pg_basebackup @@ -41,6 +41,7 @@ /usr/bin/pgbench /usr/bin/initdb /usr/bin/createdb +/usr/bin/pg_test_timing /usr/bin/pg_controldata /usr/bin/createuser /usr/bin/postgres @@ -49,6 +50,7 @@ /usr/bin/ecpg /usr/bin/clusterdb /usr/bin/pg_archivecleanup +/usr/bin/pg_receivexlog /usr/bin/pg_resetxlog /usr/bin/dropdb /usr/share/postgresql diff --git a/eselect/postgresql/active.links91 b/eselect/postgresql/active.links91 deleted file mode 100644 index 360b8997..00000000 --- a/eselect/postgresql/active.links91 +++ /dev/null @@ -1,29 +0,0 @@ -/usr/bin/pg_standby91 -/usr/bin/pg_basebackup91 -/usr/bin/pg_test_fsync91 -/usr/bin/pg_ctl91 -/usr/bin/postmaster91 -/usr/bin/droplang91 -/usr/bin/pg_dump91 -/usr/bin/pg_restore91 -/usr/bin/pg_config91 -/usr/bin/vacuumlo91 -/usr/bin/dropuser91 -/usr/bin/pg_dumpall91 -/usr/bin/oid2name91 -/usr/bin/reindexdb91 -/usr/bin/vacuumdb91 -/usr/bin/createlang91 -/usr/bin/pgbench91 -/usr/bin/initdb91 -/usr/bin/createdb91 -/usr/bin/pg_controldata91 -/usr/bin/createuser91 -/usr/bin/postgres91 -/usr/bin/pg_upgrade91 -/usr/bin/psql91 -/usr/bin/ecpg91 -/usr/bin/clusterdb91 -/usr/bin/pg_archivecleanup91 -/usr/bin/pg_resetxlog91 -/usr/bin/dropdb91 diff --git a/eselect/postgresql/active.links92 b/eselect/postgresql/active.links92 new file mode 100644 index 00000000..458ec5d3 --- /dev/null +++ b/eselect/postgresql/active.links92 @@ -0,0 +1,31 @@ +/usr/bin/pg_standby92 +/usr/bin/pg_basebackup92 +/usr/bin/pg_test_fsync92 +/usr/bin/pg_ctl92 +/usr/bin/postmaster92 +/usr/bin/droplang92 +/usr/bin/pg_dump92 +/usr/bin/pg_restore92 +/usr/bin/pg_config92 +/usr/bin/vacuumlo92 +/usr/bin/dropuser92 +/usr/bin/pg_dumpall92 +/usr/bin/oid2name92 +/usr/bin/reindexdb92 +/usr/bin/vacuumdb92 +/usr/bin/createlang92 +/usr/bin/pgbench92 +/usr/bin/initdb92 +/usr/bin/createdb92 +/usr/bin/pg_test_timing92 +/usr/bin/pg_controldata92 +/usr/bin/createuser92 +/usr/bin/postgres92 +/usr/bin/pg_upgrade92 +/usr/bin/psql92 +/usr/bin/ecpg92 +/usr/bin/clusterdb92 +/usr/bin/pg_archivecleanup92 +/usr/bin/pg_receivexlog92 +/usr/bin/pg_resetxlog92 +/usr/bin/dropdb92 diff --git a/eselect/postgresql/slots/9.1/base b/eselect/postgresql/slots/9.1/base deleted file mode 100644 index 6906b087..00000000 --- a/eselect/postgresql/slots/9.1/base +++ /dev/null @@ -1 +0,0 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.5" diff --git a/eselect/postgresql/slots/9.1/docs b/eselect/postgresql/slots/9.1/docs deleted file mode 100644 index 1d8eb182..00000000 --- a/eselect/postgresql/slots/9.1/docs +++ /dev/null @@ -1 +0,0 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.5" diff --git a/eselect/postgresql/slots/9.1/server b/eselect/postgresql/slots/9.1/server deleted file mode 100644 index 2b99aaaa..00000000 --- a/eselect/postgresql/slots/9.1/server +++ /dev/null @@ -1 +0,0 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.5" diff --git a/eselect/postgresql/slots/9.2/base b/eselect/postgresql/slots/9.2/base new file mode 100644 index 00000000..3adf4669 --- /dev/null +++ b/eselect/postgresql/slots/9.2/base @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.2.1" diff --git a/eselect/postgresql/slots/9.2/docs b/eselect/postgresql/slots/9.2/docs new file mode 100644 index 00000000..087d50a8 --- /dev/null +++ b/eselect/postgresql/slots/9.2/docs @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.2.1" diff --git a/eselect/postgresql/slots/9.2/server b/eselect/postgresql/slots/9.2/server new file mode 100644 index 00000000..bb301634 --- /dev/null +++ b/eselect/postgresql/slots/9.2/server @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.2.1" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 977e2a24..76c5c75a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -430,7 +430,7 @@ - + @@ -4172,7 +4172,6 @@ - @@ -4180,25 +4179,21 @@ /mnt/floppy - - - - @@ -5871,7 +5866,7 @@ - + This key specifies the number of days' interval between diff --git a/ggz.modules b/ggz.modules index 7c31a237..3c04c50a 100644 --- a/ggz.modules +++ b/ggz.modules @@ -1,24 +1,10 @@ [Games] -*Engines* = Dots Gnect Iagno Go Reversi Battleship Gnibbles -Battleship = p6 -Dots = p1 -Gnect = p2 -Gnibbles = p7 -Go = p4 -Iagno = p3 -Reversi = p5 +*Engines* = Gnect Iagno Gnibbles +Gnect = p1 +Gnibbles = p3 +Iagno = p2 [p1] -Author = Matt Williams -CommandLine = ksquares -Frontend = kde -Homepage = http://games.kde.org/ -Name = KSquares -ProtocolEngine = Dots -ProtocolVersion = 4 -Version = 0.3 - -[p2] Author = The GNOME Project CommandLine = /usr/bin/gnect Frontend = gtk @@ -28,7 +14,7 @@ ProtocolEngine = Gnect ProtocolVersion = 1 Version = 2.28.2 -[p3] +[p2] Author = The GNOME Project CommandLine = /usr/bin/iagno Frontend = gtk @@ -38,37 +24,7 @@ ProtocolEngine = Iagno ProtocolVersion = 1 Version = 2.28.2 -[p4] -Author = Sascha Peilicke -CommandLine = kigo -Frontend = kde -Homepage = http://games.kde.org/kigo -Name = Kigo -ProtocolEngine = Go -ProtocolVersion = 1 -Version = 1.0 - -[p5] -Author = Mario Weilguni, Inge Wallin, Dmitry Suzdalev -CommandLine = kreversi -Frontend = kde -Homepage = http://games.kde.org/ -Name = KReversi -ProtocolEngine = Reversi -ProtocolVersion = 4 -Version = 2.0 - -[p6] -Author = Daniel Molkentin, Nikolas Zimmermann, Paolo Capriotti -CommandLine = kbattleship -Frontend = kde -Homepage = http://games.kde.org/ -Name = KBattleship -ProtocolEngine = Battleship -ProtocolVersion = 1 -Version = 2.0 - -[p7] +[p3] Author = The GNOME Project CommandLine = /usr/bin/gnibbles Frontend = gtk diff --git a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules index e53d59a2..64359db2 100644 --- a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules +++ b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules @@ -1,6 +1,6 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.10 +# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.12 # # ModulesPath = /root/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules # diff --git a/hsqldb/server.properties b/hsqldb/server.properties new file mode 100644 index 00000000..4827d1cb --- /dev/null +++ b/hsqldb/server.properties @@ -0,0 +1,20 @@ +# Hsqldb Server cfg file. +# See the UNIX Quick Start and the Advanced Topics chapters +# of the Hsqldb User Guide. + +server.database.0=file:/var/lib/hsqldb/db1 +server.urlid.0=localhost + +# Warning! +# When running hsqldb in Server mode, for each additional database +# the server.urlid.X entry must have a proper corresponding urlid +# section in the 'sqltool.rc' file. +# Otherwise you may have problems with shutting down the server. +# +# Note that each server can serve only up to 10 different +# databases simultaneously (with consecutive {0-9} suffixes). + +# An example of additional database. +#server.database.1=file:/var/lib/hsqldb/newdb/newdb +#server.dbname.1=newdb +#server.urlid.1=newdb diff --git a/hsqldb/sqltool.rc b/hsqldb/sqltool.rc new file mode 100644 index 00000000..9284be44 --- /dev/null +++ b/hsqldb/sqltool.rc @@ -0,0 +1,20 @@ +# $Id sqltool.rc,v 1.11 2004/07/18 21:34:35 unsaved Exp $ + +# This is a sample SqlTool configuration file, a.k.a. rc file. + +# This is for a hsqldb Server running with default settings on your local +# computer (and for which you have not changed the password for "sa"). +urlid localhost +url jdbc:hsqldb:hsql://localhost +username sa +password + +# Each urlid section in this file corresponds to one of the +# server.urlid.X entries in the 'server.properties' file. +# This is required by the hsqldb init script. + +# An example of additional database. +#urlid newdb +#url jdbc:hsqldb:hsql://localhost/newdb +#username sa +#password diff --git a/init.d/bootmisc b/init.d/bootmisc index 0e03938f..2b5248ef 100755 --- a/init.d/bootmisc +++ b/init.d/bootmisc @@ -10,11 +10,6 @@ depend() keyword -prefix -timeout } -dir_writable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - : ${wipe_tmp:=${WIPE_TMP:-yes}} : ${log_dmesg:=${LOG_DMESG:-yes}} @@ -25,7 +20,7 @@ cleanup_tmp_dir() if ! [ -d "$dir" ]; then mkdir -p "$dir" || return $? fi - dir_writable "$dir" || return 1 + checkpath -W "$dir" || return 1 chmod a+rwt "$dir" 2> /dev/null cd "$dir" || return 1 if yesno $wipe_tmp; then @@ -117,12 +112,12 @@ start() fi done - if [ "$RC_UNAME" = Linux -a -d /run ] && false; then + if [ "$RC_UNAME" = Linux -a -d /run ]; then migrate_to_run /var/lock /run/lock migrate_to_run /var/run /run fi - if dir_writable /var/run; then + if checkpath -W /var/run; then ebegin "Creating user login records" local xtra= [ "$RC_UNAME" = NetBSD ] && xtra=x @@ -164,7 +159,7 @@ start() cleanup_tmp_dir "$tmp" done - if dir_writable /tmp; then + if checkpath -W /tmp; then # Make sure our X11 stuff have the correct permissions # Omit the chown as bootmisc is run before network is up # and users may be using lame LDAP auth #139411 @@ -177,7 +172,7 @@ start() fi if yesno $log_dmesg; then - if $logw || dir_writable /var/log; then + if $logw || checkpath -W /var/log; then # Create an 'after-boot' dmesg log if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then dmesg > /var/log/dmesg @@ -186,7 +181,6 @@ start() fi fi - [ -w /etc/nologin ] && rm -f /etc/nologin return 0 } @@ -202,3 +196,5 @@ stop() return 0 } + +# vim: ft=sh diff --git a/init.d/consolefont b/init.d/consolefont index f989d2d2..9d212a08 100755 --- a/init.d/consolefont +++ b/init.d/consolefont @@ -54,7 +54,7 @@ start() eend $retval # Store the last font so we can use it ASAP on boot - if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then + if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then mkdir -p "$RC_LIBEXECDIR"/console for font in /usr/share/consolefonts/"$consolefont".*; do : diff --git a/init.d/devfs b/init.d/devfs index 5f5fb319..db80c04e 100755 --- a/init.d/devfs +++ b/init.d/devfs @@ -5,7 +5,8 @@ description="Mount system critical filesystems in /dev." depend() { - use dev + use dev-mount + before dev keyword -prefix -vserver } diff --git a/init.d/dmesg b/init.d/dmesg index d1203832..a4083d00 100755 --- a/init.d/dmesg +++ b/init.d/dmesg @@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot" depend() { before dev modules - keyword -vserver + keyword -lxc -prefix -vserver } start() diff --git a/init.d/fsck b/init.d/fsck index 9cf35b86..5869c061 100755 --- a/init.d/fsck +++ b/init.d/fsck @@ -71,7 +71,12 @@ start() done if [ "$RC_UNAME" = Linux ]; then - fsck_opts="$fsck_opts -C0 -T" + local skiptypes x + for x in $net_fs_list $extra_net_fs_list; do + skiptypes="${skiptypes}no${x}," + done + skiptypes="${skiptypes}noopts=_netdev" + fsck_opts="$fsck_opts -C0 -T -t $skiptypes" if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then fsck_args=${fsck_args--A -p} if echo 2>/dev/null >/.test.$$; then diff --git a/init.d/hsqldb b/init.d/hsqldb new file mode 100755 index 00000000..09553ea7 --- /dev/null +++ b/init.d/hsqldb @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/files/hsqldb,v 1.2 2007/12/19 21:58:05 caster Exp $ + +depend() { + use net +} + +start() { + ebegin "Starting HSQL Database" + hsqldb_enable=yes /var/lib/hsqldb/bin/hsqldb start + eend $? +} + +stop() { + ebegin "Stopping HSQL Database" + hsqldb_enable=yes /var/lib/hsqldb/bin/hsqldb stop + eend $? +} diff --git a/init.d/hwclock b/init.d/hwclock index 28d675a8..651590df 100755 --- a/init.d/hwclock +++ b/init.d/hwclock @@ -94,7 +94,7 @@ start() "$utc_cmd" != --utc -o \ -n "$clock_args" ]; then - if yesno $clock_hctosys; then + if yesno ${clock_hctosys:-YES}; then _hwclock --hctosys $utc_cmd $clock_args else _hwclock --systz $utc_cmd $clock_args @@ -111,7 +111,7 @@ stop() { # Don't tweak the hardware clock on LiveCD halt. [ -n "$CDBOOT" ] && return 0 - yesno $clock_systohc || return 0 + yesno ${clock_systohc:-YES} || return 0 local retval=0 errstr="" setupopts diff --git a/init.d/ip6tables b/init.d/ip6tables index 5c9cbb7d..6806bc9c 100755 --- a/init.d/ip6tables +++ b/init.d/ip6tables @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.11.init,v 1.2 2011/12/04 10:15:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.1 2012/09/14 17:58:26 axs Exp $ extra_commands="save panic" extra_started_commands="reload" @@ -21,7 +21,6 @@ esac depend() { before net - use logger } set_table_policy() { @@ -93,8 +92,8 @@ reload() { save() { ebegin "Saving ${iptables_name} state" - touch "${iptables_save}" - chmod 0600 "${iptables_save}" + checkpath -q -d "$(dirname "${iptables_save}")" + checkpath -q -m 0600 -f "${iptables_save}" ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" eend $? } diff --git a/init.d/iptables b/init.d/iptables index 5c9cbb7d..6806bc9c 100755 --- a/init.d/iptables +++ b/init.d/iptables @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.11.init,v 1.2 2011/12/04 10:15:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.1 2012/09/14 17:58:26 axs Exp $ extra_commands="save panic" extra_started_commands="reload" @@ -21,7 +21,6 @@ esac depend() { before net - use logger } set_table_policy() { @@ -93,8 +92,8 @@ reload() { save() { ebegin "Saving ${iptables_name} state" - touch "${iptables_save}" - chmod 0600 "${iptables_save}" + checkpath -q -d "$(dirname "${iptables_save}")" + checkpath -q -m 0600 -f "${iptables_save}" ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" eend $? } diff --git a/init.d/keymaps b/init.d/keymaps index 211fdd36..ea8be34c 100755 --- a/init.d/keymaps +++ b/init.d/keymaps @@ -63,7 +63,7 @@ start() fi # Save the keymapping for use immediately at boot - if [ -w "$RC_LIBEXECDIR" ]; then + if checkpath -W "$RC_LIBEXECDIR"; then mkdir -p "$RC_LIBEXECDIR"/console dumpkeys >"$RC_LIBEXECDIR"/console/keymap fi diff --git a/init.d/localmount b/init.d/localmount index 459a3766..7a20bbf4 100755 --- a/init.d/localmount +++ b/init.d/localmount @@ -33,6 +33,7 @@ start() stop() { + yesno $RC_GOINGDOWN || return 0 # We never unmount / or /dev or $RC_SVCDIR # Bug 381783 @@ -47,7 +48,7 @@ stop() done if [ "$RC_UNAME" = Linux ]; then - no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" + no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr" fi no_umounts_r="^($no_umounts_r)$" diff --git a/init.d/mount-ro b/init.d/mount-ro index 3ee45c86..69e64831 100755 --- a/init.d/mount-ro +++ b/init.d/mount-ro @@ -7,11 +7,13 @@ description="Re-mount filesytems read-only for a clean reboot." depend() { need killprocs savecache - keyword -prefix -openvz -vserver -lxc + keyword -openvz -prefix -vserver -lxc } start() { + local ret=0 + # Flush all pending disk writes now sync; sync @@ -23,7 +25,7 @@ start() # Bug 381783 local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g') - local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${rc_svcdir}" x= fs= + local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs= m="$m|/bin|/sbin|/lib(32|64)?|/libexec" # RC_NO_UMOUNTS is an env var that can be set by plugins local IFS="$IFS:" @@ -39,6 +41,9 @@ start() do_unmount "umount -r" \ --skip-point-regex "$m" \ "${fs:+--skip-fstype-regex}" $fs --nonetdev + ret=$? + eoutdent - eend $? + + eend $ret } diff --git a/init.d/net.lo b/init.d/net.lo index a9040a38..da7b3f4f 100755 --- a/init.d/net.lo +++ b/init.d/net.lo @@ -19,13 +19,18 @@ depend() local IFVAR=$(shell_var "${IFACE}") need localmount + if [ "$RC_UNAME" = Linux -a "$IFACE" != lo ]; then + need sysfs + fi after bootmisc - provide net keyword -jail -prefix -vserver case "${IFACE}" in - lo|lo0);; - *) after net.lo net.lo0 dbus;; + lo|lo0) ;; + *) + after net.lo net.lo0 dbus + provide net + ;; esac if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then @@ -37,6 +42,8 @@ depend() eval prov=\$rc_${dep}_${IFVAR} if [ -n "${prov}" ]; then ${dep} ${prov} + ewarn "rc_${dep}_${IFVAR} is deprecated." + ewarn "Please use rc_net_${IFVAR}_${dep} instead." fi done } @@ -101,7 +108,7 @@ _wait_for_carrier() _has_carrier && return 0 eval timeout=\$carrier_timeout_${IFVAR} - timeout=${timeout:-${carrier_timeout:-5}} + timeout=${timeout:-${carrier_timeout:-0}} # Incase users don't want this nice feature ... [ ${timeout} -le 0 ] && return 0 diff --git a/init.d/netmount b/init.d/netmount index 6a36d351..97959601 100755 --- a/init.d/netmount +++ b/init.d/netmount @@ -2,62 +2,26 @@ # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. -description="Mounts network shares according to /etc/fstab." - -need_portmap() -{ - local opts= - local IFS=" -" - set -- $(fstabinfo --options --fstype nfs,nfs4) - for opts; do - case ,$opts, in - *,noauto,*|*,nolock,*);; - *) return 0;; - esac - done - return 1 -} +description="Mounts network shares, other than NFS, according to /etc/fstab." +# We skip all NFS shares in this script because they require extra +# daemons to be running on the client in order to work correctly. +# It is best to allow nfs-utils to handle all nfs shares. depend() { - # Only have portmap as a dependency if there is a nfs mount in fstab - # that is set to mount at boot - local pmap= - if need_portmap; then - pmap="rpc.statd" - [ -x /etc/init.d/rpcbind ] \ - && pmap="$pmap rpcbind" \ - || pmap="$pmap portmap" - fi - config /etc/fstab - need net $pmap use afc-client amd autofs openvpn - use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd + use dns keyword -jail -prefix -vserver } start() { - local myneed= myuse= pmap="portmap" nfsmounts= - [ -x /etc/init.d/rpcbind ] && pmap="rpcbind" - local x= fs= rc= for x in $net_fs_list $extra_net_fs_list; do case "$x" in nfs|nfs4) - # If the nfsmount script took care of the nfs - # filesystems, then there's no point in trying - # them twice - service_started nfsmount && continue - - # Only try to mount NFS filesystems if portmap was - # started. This is to fix "hang" problems for new - # users who do not add portmap to the default runlevel. - if need_portmap && ! service_started "$pmap"; then - continue - fi + continue ;; esac fs="$fs${fs:+,}$x" @@ -82,7 +46,14 @@ stop() . "$RC_LIBEXECDIR"/sh/rc-mount.sh for x in $net_fs_list $extra_net_fs_list; do - fs="$fs${fs:+,}$x" + case "$x" in + nfs|nfs4) + continue + ;; + *) + fs="$fs${fs:+,}$x" + ;; + esac done if [ -n "$fs" ]; then umount -at $fs || eerror "Failed to simply unmount filesystems" @@ -91,7 +62,14 @@ stop() eindent fs= for x in $net_fs_list $extra_net_fs_list; do - fs="$fs${fs:+|}$x" + case "$x" in + nfs|nfs4) + continue + ;; + *) + fs="$fs${fs:+|}$x" + ;; + esac done [ -n "$fs" ] && fs="^($fs)$" do_unmount umount ${fs:+--fstype-regex} $fs --netdev diff --git a/init.d/network b/init.d/network deleted file mode 100755 index 7ba4f48c..00000000 --- a/init.d/network +++ /dev/null @@ -1,358 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2009 Roy Marples -# Released under the 2-clause BSD license. - -# This script was inspired by the equivalent rc.d network from NetBSD. - -description="Configures network interfaces." -__nl=" -" - -depend() -{ - need localmount - after bootmisc - provide net - keyword -jail -prefix -vserver -} - -uniqify() -{ - local result= i= - for i; do - case " $result " in - *" $i "*);; - *) result="$result $i";; - esac - done - echo "${result# *}" -} - -reverse() -{ - local result= i= - for i; do - result="$i $result" - done - echo "${result# *}" -} - -sys_interfaces() -{ - case "$RC_UNAME" in - Linux) - local w= rest= i= cmd=$1 - while read w rest; do - i=${w%%:*} - [ "$i" != "$w" ] || continue - if [ "$cmd" = u ]; then - ifconfig "$i" | grep -q "[ ]*UP" || continue - fi - printf "%s " "$i" - done /dev/null); do - for f in /etc/ifconfig.${c}[0-9]*; do - [ -f "$f" ] && printf "%s" "$f{##*.} " - done - done - ;; - *) - for f in /etc/ifconfig.*; do - [ -f "$f" ] && printf "%s" "${f##*.} " - done - for f in /etc/ip.*; do - [ -f "$f" ] && printf "%s" "${f##*.} " - done - ;; - esac - echo -} - -interfaces() -{ - uniqify $(sys_interfaces "$@") $interfaces $(auto_interfaces) -} - -dumpargs() -{ - local f="$1" - - shift - case "$@" in - '') [ -f "$f" ] && cat "$f";; - *"$__nl"*) echo "$@";; - *) - ( - set -o noglob - IFS=';'; set -- $@ - IFS="$__nl"; echo "$*" - );; - esac -} - -intup=false -runip() -{ - local int="$1" err= - shift - - # Ensure we have a valid broadcast address - case "$@" in - *" broadcast "*|*" brd "*) ;; - *:*) ;; # Ignore IPv6 - *) set -- "$@" brd +;; - esac - - err=$(LC_ALL=C ip address add "$@" dev "$int" 2>&1) - if [ -z "$err" ]; then - # ip does not bring up the interface when adding addresses - if ! $intup; then - ip link set "$int" up - intup=true - fi - return 0 - fi - if [ "$err" = "RTNETLINK answers: File exists" ]; then - ip address del "$@" dev "$int" 2>/dev/null - fi - # Localise the error - ip address add "$@" dev "$int" -} - -routeflush() -{ - if [ "$RC_UNAME" = Linux ]; then - if [ -x /sbin/ip ] || [ -x /bin/ip ]; then - ip route flush scope global - ip route delete default 2>/dev/null - else - # Sadly we also delete some link routes, but - # this cannot be helped - local dest= gate= net= flags= rest= - route -n | while read dest gate net flags rest; do - [ -z "$net" ] && continue - case "$dest" in - [0-9]*) ;; - *) continue;; - esac - local xtra= netmask="netmask $net" - case "$flags" in - U) continue;; - *H*) flags=-host; netmask=;; - *!*) flags=-net; xtra=reject;; - *) flags=-net;; - esac - route del $flags $dest $netmask $xtra - done - # Erase any default dev eth0 routes - route del default 2>/dev/null - fi - else - route -qn flush - fi -} - -runargs() -{ - dumpargs "$@" | while read -r args; do - case "$args" in - ''|"#"*) ;; - *) - ( - eval vebegin "${args#*!}" - eval "${args#*!}" - veend $? - );; - esac - done -} - -start() -{ - local cr=0 r= int= intv= cmd= args= upcmd= - - if [ -z "$domainname" -a -s /etc/defaultdomain ]; then - domainname=$(cat /etc/defaultdomain) - fi - if [ -n "$domainname" ]; then - ebegin "Setting NIS domainname: $domainname" - domainname "$domainname" - eend $? - fi - - ewarn - ewarn "The $RC_SVCNAME script is deprecated and will be" - ewarn "removed in the future." - ewarn "Please use the net.* scripts to manage your network interfaces." - ewarn - - einfo "Starting network" - routeflush - if [ "$RC_UNAME" = "Linux" ]; then - ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1 - route add -net 127.0.0.0 netmask 255.0.0.0 \ - gw 127.0.0.1 reject 2>/dev/null - else - ifconfig lo0 127.0.0.1 netmask 255.0.0.0 || cr=1 - route -q add -inet 127.0.0.0 -netmask 255.0.0.0 \ - 127.0.0.1 -reject || cr=1 - fi - eindent - for int in $(interfaces); do - local func= cf= - intv=$(shell_var "$int") - eval upcmd=\$ifup_$intv - for func in ip ifconfig; do - eval cmd=\$${func}_$intv - if [ -n "$cmd" -o -f /etc/"$func.$int" ]; then - cf=/etc/"$func.$int" - break - fi - done - [ -n "$cf" -o -n "$upcmd" -o \ - -f /etc/ifup."$int" -o -f "$cf" ] || continue - veinfo "$int" - case "$func" in - ip) func=runip; intup=false;; - esac - eindent - runargs /etc/ifup."$int" "$upcmd" - r=0 - dumpargs "$cf" "$cmd" | while read -r args; do - case "$args" in - ''|"#"*) ;; - "!"*) - ( - eval vebegin "${args#*!}" - eval "${args#*!}" - veend $? - );; - *) - ( - set -o noglob - eval set -- "$args" - vebegin "$@" - $func "$int" "$@" - veend $? - );; - esac - done - eoutdent - done - eoutdent - eend $cr - - # Wait for any inet6 tentative addresses - r=5 - while [ $r -gt 0 ]; do - tentative || break - [ $r = 5 ] && vebegin "Waiting for tentative addresses" - sleep 1 - : $(( r -= 1 )) - done - if [ $r != 5 ]; then - [ $r != 0 ] - veend $? - fi - - if [ -n "$defaultroute" ]; then - ebegin "Setting default route $defaultroute" - route add default $defaultroute - eend $? - elif [ -n "$defaultiproute" ]; then - ebegin "Setting default route $defaultiproute" - ip route add default $defaultiproute - eend $? - fi - - if [ -n "$defaultroute6" ]; then - ebegin "Setting default route $defaultroute6" - if [ "$RC_UNAME" = Linux ]; then - routecmd="route -A inet6 add" - else - routecmd="route -inet6 add" - fi - $routecmd default $defaultroute6 - eend $? - elif [ -n "$defaultiproute6" ]; then - ebegin "Setting default route $defaultiproute6" - ip -f inet6 route add default $defaultiproute6 - eend $? - fi - - return 0 -} - -stop() -{ - # Don't stop the network at shutdown. - # We don't use the noshutdown keyword so that we are started again - # correctly if we go back to multiuser. - yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0 - - local int= intv= cmd= downcmd= r= - einfo "Stopping network" - routeflush - eindent - for int in $(reverse $(interfaces u)); do - intv=$(shell_var "$int") - eval downcmd=\$ifdown_$intv - eval cmd=\$ip_$intv - [ -z "$cmd" ] && eval cmd=\$ifconfig_$intv - if [ -n "$cmd" -o -f /etc/ip."$int" -o \ - -f /etc/ifconfig."$int" -o \ - -n "$downcmd" -o -f /etc/ifdown."$int" ]; - then - veinfo "$int" - runargs /etc/ifdown."$int" "$downcmd" - if [ -x /sbin/ip ] || [ -x /bin/ip ]; then - # We need to do this, otherwise we may - # fail to add things correctly on restart - ip address flush dev "$int" 2>/dev/null - fi - ifconfig "$int" down 2>/dev/null - ifconfig "$int" destroy 2>/dev/null - fi - done - eoutdent - eend 0 -} diff --git a/init.d/postgresql-9.1 b/init.d/postgresql-9.1 deleted file mode 100755 index 5cac664d..00000000 --- a/init.d/postgresql-9.1 +++ /dev/null @@ -1,136 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 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 - need 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.1" - 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.1" - 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 0770 -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 \ - --exec /usr/lib/postgresql-9.1/bin/postgres \ - --env "PGPORT=${configured_port}" \ - ${extraenv} \ - --wait $((${START_TIMEOUT}*1000)) \ - --pidfile ${DATA_DIR%/}/postmaster.pid \ - -- -D ${PGDATA} --data-directory=${DATA_DIR} --silent-mode=true ${PGOPTS} - local retval=$? - - if [ $retval -ne 0 ] ; then - eerror "Check the log for a possible explanation of the above error." - eerror " ${DATA_DIR%/}/postmaster.log" - 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.1/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/postgresql-9.2 b/init.d/postgresql-9.2 new file mode 100755 index 00000000..f8d3eb67 --- /dev/null +++ b/init.d/postgresql-9.2 @@ -0,0 +1,136 @@ +#!/sbin/runscript +# Copyright 1999-2010 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 + need 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.2" + 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.2" + 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 0770 -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.2/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." + eerror " ${DATA_DIR%/}/postmaster.log" + 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.2/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/procfs b/init.d/procfs index 5254f4db..6efa34fb 100755 --- a/init.d/procfs +++ b/init.d/procfs @@ -20,23 +20,6 @@ start() [ -e /proc/filesystems ] || return 0 - # Check what USB fs the kernel support. Currently - # 2.5+ kernels, and later 2.4 kernels have 'usbfs', - # while older kernels have 'usbdevfs'. - if [ -d /proc/bus/usb -a ! -e /proc/bus/usb/devices ]; then - local usbfs=$(grep -Fow usbfs /proc/filesystems || - grep -Fow usbdevfs /proc/filesystems) - if [ -n "$usbfs" ]; then - ebegin "Mounting USB device filesystem [$usbfs]" - local usbgid="$(getent group usb | \ - sed -e 's/.*:.*:\(.*\):.*/\1/')" - mount -t $usbfs \ - -o ${usbgid:+devmode=0664,devgid=$usbgid,}noexec,nosuid \ - usbfs /proc/bus/usb - eend $? - fi - fi - # Setup Kernel Support for miscellaneous Binary Formats if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then if grep -qs binfmt_misc /proc/filesystems; then @@ -48,7 +31,7 @@ start() ebegin "Loading custom binary format handlers" fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \ /run/binfmt.d/*.conf \ - "/etc"/binfmt.d/*.conf \ + /etc/binfmt.d/*.conf \ ""/usr/lib/binfmt.d/*.conf) if [ -n "${fmts}" ]; then echo "${fmts}" > /proc/sys/fs/binfmt_misc/register @@ -58,6 +41,25 @@ start() fi fi + [ "$RC_SYS" = "OPENVZ" ] && return 0 + + # Check what USB fs the kernel support. Currently + # 2.5+ kernels, and later 2.4 kernels have 'usbfs', + # while older kernels have 'usbdevfs'. + if [ -d /proc/bus/usb -a ! -e /proc/bus/usb/devices ]; then + local usbfs=$(grep -Fow usbfs /proc/filesystems || + grep -Fow usbdevfs /proc/filesystems) + if [ -n "$usbfs" ]; then + ebegin "Mounting USB device filesystem [$usbfs]" + local usbgid="$(getent group usb | \ + sed -e 's/.*:.*:\(.*\):.*/\1/')" + mount -t $usbfs \ + -o ${usbgid:+devmode=0664,devgid=$usbgid,}noexec,nosuid \ + usbfs /proc/bus/usb + eend $? + fi + fi + # Setup Kernel Support for SELinux if [ -d /selinux ] && ! mountinfo -q /selinux; then if grep -qs selinuxfs /proc/filesystems; then diff --git a/init.d/root b/init.d/root index 9a719b0a..04687c6e 100755 --- a/init.d/root +++ b/init.d/root @@ -13,20 +13,41 @@ depend() start() { case ",$(fstabinfo -o /)," in - *,ro,*) return 0;; + *,ro,*) + ;; + *) + # Check if the rootfs isn't already writable. + if checkpath -W /; then + rm -f /fastboot /forcefsck + else + ebegin "Remounting root filesystem read/write" + case "$RC_UNAME" in + Linux) + mount -n -o remount,rw / + ;; + *) + mount -u -o rw / + ;; + esac + eend $? "Root filesystem could not be mounted read/write" + if [ $? -eq 0 ]; then + rm -f /fastboot /forcefsck + fi + fi + ;; esac - if echo 2>/dev/null >/.test.$$; then - rm -f /.test.$$ /fastboot /forcefsck - return 0 - fi - - ebegin "Remounting root filesystem read/write" - case "$RC_UNAME" in - Linux) mount -n -o remount,rw /;; - *) mount -u -o rw /;; - esac - if eend $? "Root filesystem could not be mounted read/write"; then - rm -f /fastboot /forcefsck - fi + ebegin "Remounting filesystems" + local mountpoint + for mountpoint in $(fstabinfo); do + case "${mountpoint}" in + /) + ;; + /*) + mountinfo -q "${mountpoint}" && \ + fstabinfo --remount "${mountpoint}" + ;; + esac + done + eend 0 } diff --git a/init.d/savecache b/init.d/savecache index 355ebce8..5e59b25f 100755 --- a/init.d/savecache +++ b/init.d/savecache @@ -13,6 +13,14 @@ start() return 1 fi fi + if ! checkpath -W "$RC_LIBEXECDIR"; then + ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!" + if ! yesno "${RC_GOINGDOWN}"; then + ewarn "Unable to save deptree cache" + return 1 + fi + return 0 + fi ebegin "Saving dependency cache" local rc= if [ ! -d "$RC_LIBEXECDIR"/cache ]; then diff --git a/init.d/staticroute b/init.d/staticroute deleted file mode 100755 index 3a5d326a..00000000 --- a/init.d/staticroute +++ /dev/null @@ -1,109 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2009 Roy Marples -# Released under the 2-clause BSD license. - -# This script was inspired by the equivalent rc.d staticroute from NetBSD. - -description="Configures static routes." -__nl=" -" - -depend() -{ - provide net - use network - keyword -jail -prefix -vserver -} - -pre_flight_checks() -{ - route=route - [ -s /etc/route.conf ] && return 0 - - if [ -n "$staticiproute" ]; then - route="ip route" - staticroute="$staticiproute" - fi -} - -dump_args() -{ - # Route configuration file, as used by the NetBSD RC system - if [ -s /etc/route.conf ]; then - cat /etc/route.conf - return $? - fi - - case "$staticroute" in - *"$__nl"*) - echo "$staticroute" - ;; - *) - ( - set -o noglob - IFS=';'; set -- $staticroute - IFS="$__nl"; echo "$*" - ) - ;; - esac -} - -do_routes() -{ - local xtra= family= - [ "$RC_UNAME" != Linux ] && xtra=-q - - ebegin "$1 static routes" - eindent - pre_flight_checks - dump_args | while read args; do - [ -z "$args" ] && continue - case "$args" in - "#"*) - ;; - "+"*) - [ $2 = "add" ] && eval ${args#*+} - ;; - "-"*) - [ $2 = "del" -o $2 = "delete" ] && eval ${args#*-} - ;; - *) - veinfo "$args" - case "$route" in - "ip route") - ip route $2 $args - ;; - *) - # Linux route does cannot work it out ... - if [ "$RC_UNAME" = Linux ]; then - case "$args" in - *:*) family="-A inet6";; - *) family=;; - esac - fi - route $family $xtra $2 -$args - ;; - esac - veend $? - esac - done - eoutdent - eend 0 -} - -start() -{ - ewarn - ewarn "The $RC_SVCNAME script is deprecated and will be" - ewarn "removed in the future." - ewarn "Please use the net.* scripts to manage your network interfaces." - ewarn - do_routes "Adding" "add" -} - -stop() -{ - local cmd="delete" - [ "$RC_UNAME" = Linux ] && cmd="del" - do_routes "Deleting" "$cmd" -} diff --git a/init.d/swap b/init.d/swap index 9fcc1017..309d37b7 100755 --- a/init.d/swap +++ b/init.d/swap @@ -4,7 +4,7 @@ depend() { - need localmount + before localmount keyword -jail -openvz -prefix -vserver -lxc } @@ -12,6 +12,7 @@ start() { ebegin "Activating swap devices" case "$RC_UNAME" in + Linux) swapon -a -e >/dev/null;; NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; *) swapon -a >/dev/null;; esac @@ -23,7 +24,7 @@ stop() ebegin "Deactivating swap devices" # Try to unmount all tmpfs filesystems not in use, else a deadlock may - # occure. As $RC_SVCDIR may also be tmpfs we cd to it to lock it + # occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it cd "$RC_SVCDIR" umount -a -t tmpfs 2>/dev/null diff --git a/init.d/swapfiles b/init.d/swapfiles new file mode 100755 index 00000000..086f25e6 --- /dev/null +++ b/init.d/swapfiles @@ -0,0 +1,47 @@ +#!/sbin/runscript +# Copyright (c) 2007-2009 Roy Marples +# Released under the 2-clause BSD license. + +depend() +{ + need localmount + keyword -jail -openvz -prefix -vserver -lxc +} + +start() +{ + ebegin "Activating additional swap space" + case "$RC_UNAME" in + NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; + *) swapon -a >/dev/null;; + esac + eend 0 # If swapon has nothing todo it errors, so always return 0 +} + +stop() +{ + ebegin "Deactivating additional swap space" + + # Try to unmount all tmpfs filesystems not in use, else a deadlock may + # occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it + # fixme: Do we need this here since we are only unmounting swap files + # and loopback swap? + cd "$RC_SVCDIR" + umount -a -t tmpfs 2>/dev/null + + case "$RC_UNAME" in + Linux) + if [ -e /proc/swaps ]; then + while read filename type rest; do + case "$type" in + file) swapoff $filename >/dev/null;; + esac + case "$filename" in + /dev/loop*) swapoff $filename >/dev/null;; + esac + done < /proc/swaps + fi + ;; + esac + eend 0 +} diff --git a/init.d/sysctl b/init.d/sysctl index cb5d92ee..b94dcc4f 100755 --- a/init.d/sysctl +++ b/init.d/sysctl @@ -5,7 +5,7 @@ depend() { before bootmisc logger - keyword -prefix -vserver + keyword -lxc -prefix -vserver } start() @@ -15,12 +15,12 @@ start() ebegin "Configuring kernel parameters" eindent - for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do + for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do if [ -r "$conf" ]; then vebegin "applying $conf" - if ! err=$(sysctl -q -p "$conf" 2>&1) ; then + if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then errs="${errs} ${err}" - sysctl -q -e -p "${conf}" + sysctl -e -p "${conf}" >/dev/null fi veend $? || retval=1 fi diff --git a/init.d/sysfs b/init.d/sysfs index 50c98a98..d129fde8 100755 --- a/init.d/sysfs +++ b/init.d/sysfs @@ -6,7 +6,7 @@ description="Mount the sys filesystem." depend() { - keyword -prefix -vserver + keyword -lxc -prefix -vserver } mount_sys() @@ -74,9 +74,16 @@ mount_misc() mount_cgroups() { - yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \ mountinfo -q /sys/fs/cgroup || return 0 + local agent="/lib64/rc/sh/cgroup-release-agent.sh" + mkdir /sys/fs/cgroup/openrc + mount -n -t cgroup \ + -o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \ + openrc /sys/fs/cgroup/openrc + echo 1 > /sys/fs/cgroup/openrc/notify_on_release + + yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0 while read name hier groups enabled rest; do case "${enabled}" in 1) mkdir /sys/fs/cgroup/${name} diff --git a/init.d/termencoding b/init.d/termencoding index d7951d1e..b949b76b 100755 --- a/init.d/termencoding +++ b/init.d/termencoding @@ -9,8 +9,8 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { - keyword -openvz -prefix -uml -vserver -xenu - need root + keyword -lxc -openvz -prefix -uml -vserver -xenu + use root after bootmisc } @@ -35,7 +35,7 @@ start() done # Save the encoding for use immediately at boot - if [ -w "$RC_LIBEXECDIR" ]; then + if checkpath -W "$RC_LIBEXECDIR"; then mkdir -p "$RC_LIBEXECDIR"/console if yesno ${unicode:-${UNICODE}}; then echo "" > "$RC_LIBEXECDIR"/console/unicode diff --git a/init.d/tmpfiles.setup b/init.d/tmpfiles.setup new file mode 100755 index 00000000..fc744266 --- /dev/null +++ b/init.d/tmpfiles.setup @@ -0,0 +1,18 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Released under the 2-clause BSD license. + +description="set up tmpfiles.d entries" + +depend() +{ + need localmount +} + +start() +{ + ebegin "setting up tmpfiles.d entries" + /lib64/rc/sh/tmpfiles.sh --create --remove ${tmpfiles_opts} + eend $? + return 0 +} diff --git a/init.d/urandom b/init.d/urandom index 20e4325c..4bfecab4 100755 --- a/init.d/urandom +++ b/init.d/urandom @@ -8,7 +8,7 @@ description="Initializes the random number generator." depend() { need localmount - keyword -jail -openvz -prefix + keyword -jail -lxc -openvz -prefix } save_seed() diff --git a/init.d/xdm b/init.d/xdm index 539cac10..c7767383 100755 --- a/init.d/xdm +++ b/init.d/xdm @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-9,v 1.1 2012/11/11 01:49:30 chithanh Exp $ # This is here to serve as a note to myself, and future developers. # @@ -72,8 +72,8 @@ setup_dm() { PIDFILE=/var/run/kdm.pid ;; entrance*) - EXE=/usr/sbin/entranced - PIDFILE=/var/lib/entranced.pid + EXE=/usr/sbin/entrance + PIDFILE=/var/run/entrance.pid ;; gdm|gnome) EXE=/usr/bin/gdm diff --git a/ld.so.conf b/ld.so.conf index 88b39f3f..ab2e6e4b 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -18,7 +18,7 @@ include ld.so.conf.d/*.conf /usr/lib/qt4 /usr/lib/postgresql /usr/lib64/postgresql -/usr/lib64/postgresql-9.1/lib64/ +/usr/lib64/postgresql-9.2/lib64/ /usr/lib64/sidplay/builders /usr/lib/sidplay/builders /usr/games/lib64 diff --git a/make.conf b/make.conf index c06f21f2..32eb8aa1 100644 --- a/make.conf +++ b/make.conf @@ -116,5 +116,9 @@ CAMERAS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 \ soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z template \ topfield toshiba_pdrm11 tp6801" +LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ + pdfimport scripting-javascript" +# scripting-beanshell wiki-publisher + source /var/lib/layman/make.conf diff --git a/modprobe.d/usb-load-ehci-first.conf b/modprobe.d/usb-load-ehci-first.conf index 3b5db0e7..9b62fb40 100644 --- a/modprobe.d/usb-load-ehci-first.conf +++ b/modprobe.d/usb-load-ehci-first.conf @@ -1,2 +1,2 @@ -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS +softdep uhci_hcd pre: ehci_hcd +softdep ohci_hcd pre: ehci_hcd diff --git a/openldap/schema/authldap.schema b/openldap/schema/authldap.schema index 802b18c8..72a74948 100644 --- a/openldap/schema/authldap.schema +++ b/openldap/schema/authldap.schema @@ -1,4 +1,3 @@ -#$Id: authldap.schema,v 1.9 2009/12/18 04:24:20 mrsam Exp $ # # OID prefix: 1.3.6.1.4.1.10018 # diff --git a/portage/package.use b/portage/package.use index ce4745c7..e02aa6fb 100644 --- a/portage/package.use +++ b/portage/package.use @@ -23,7 +23,7 @@ app-misc/beagle chm ole thunderbird app-misc/strigi hyperestraier inotify app-misc/tomboy galago -app-office/libreoffice nlpsolver +app-office/libreoffice nlpsolver pdfimport presenter-console presenter-minimizer scripting-javascript app-portage/eix optimization strong-optimization diff --git a/postgresql-9.1/.keep_dev-db_postgresql-base-9.1 b/postgresql-9.1/.keep_dev-db_postgresql-base-9.1 deleted file mode 100644 index e69de29b..00000000 diff --git a/postgresql-9.2/.keep_dev-db_postgresql-base-9.2 b/postgresql-9.2/.keep_dev-db_postgresql-base-9.2 new file mode 100644 index 00000000..e69de29b diff --git a/profile.env b/profile.env index cca2010f..acf9b01b 100644 --- a/profile.env +++ b/profile.env @@ -3,7 +3,7 @@ # GO INTO /etc/profile NOT /etc/profile.env export ANT_HOME='/usr/share/ant' -export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config /usr/share/openvpn/easy-rsa' +export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config /usr/share/openvpn/easy-rsa' export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' export EDITOR='/usr/bin/vim' export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.0-r1/html' @@ -29,7 +29,8 @@ export LC_TIME='de_DE.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar' -export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/' +export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin' diff --git a/pulse/daemon.conf b/pulse/daemon.conf index ac69dccb..272a540c 100644 --- a/pulse/daemon.conf +++ b/pulse/daemon.conf @@ -75,6 +75,7 @@ ; default-sample-format = s16le ; default-sample-rate = 44100 +; alternate-sample-rate = 48000 ; default-sample-channels = 2 ; default-channel-map = front-left,front-right diff --git a/pulse/default.pa b/pulse/default.pa index 79cf27b2..cdb0ac7e 100644 --- a/pulse/default.pa +++ b/pulse/default.pa @@ -118,12 +118,15 @@ load-module module-suspend-on-idle .ifexists module-console-kit.so load-module module-console-kit .endif +.ifexists module-systemd-login.so +load-module module-systemd-login +.endif ### Enable positioned event sounds load-module module-position-event-sounds -### Cork music streams when a phone stream is active -load-module module-cork-music-on-phone +### Cork music/video streams when a phone stream is active +load-module module-role-cork ### Modules to allow autoloading of filters (such as echo cancellation) ### on demand. module-filter-heuristics tries to determine what filters @@ -153,6 +156,8 @@ load-module module-dbus-protocol #.fail #.endif +load-module module-switch-on-port-available + ### Make some devices default #set-default-sink output #set-default-source input diff --git a/rc.conf b/rc.conf index 9d8afee3..722c40a0 100644 --- a/rc.conf +++ b/rc.conf @@ -96,6 +96,10 @@ unicode="YES" # These variables are documented here, but should be configured in # /etc/conf.d/foo for service foo and NOT enabled here unless you # really want them to work on a global basis. +# If your service has characters in its name which are not legal in +# shell variable names and you configure the variables for it in this +# file, those characters should be replaced with underscores in the +# variable names as shown below. # Some daemons are started and stopped via start-stop-daemon. # We can set some things on a per service basis, like the nicelevel. @@ -118,6 +122,13 @@ unicode="YES" #rc_foo_need="openvpn" #rc_foo_after="clock" +# Below is an example for service foo-bar. Note that the '-' is illegal +# in a shell variable name, so we convert it to an underscore. +# example for service foo-bar. +#rc_foo_bar_config="/etc/foo-bar" +#rc_foo_bar_need="openvpn" +#rc_foo_bar_after="clock" + # You can also remove dependencies. # This is mainly used for saying which servies do NOT provide net. #rc_net_tap0_provide="!net" @@ -134,9 +145,7 @@ unicode="YES" # "vserver" - Linux vserver # "xen0" - Xen0 Domain # "xenU" - XenU Domain -# If this is commented out, automatic detection will be attempted. -# Note that autodetection will not work in a prefix environment or in a -# linux container. +# If this is commented out, automatic detection will be used. # # This should be set to the value representing the environment this file is # PRESENTLY in, not the virtualization the environment is capable of. @@ -146,3 +155,10 @@ rc_sys="" # consolefont, numlock, etc ...) rc_tty_number=12 +# If you have cgroups turned on in your kernel, this switch controls +# whether or not a group for each controler is mounted under +# /sys/fs/cgroup. +# Support for process management by cgroups is planned in the future, +# so if you turn this off, be aware that you may not be able to use that +# feature. +#rc_controller_cgroups="YES" diff --git a/resolv.conf b/resolv.conf index 9a19004e..2fa15003 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,6 @@ -# Generated by net-scripts for interface eth0 +# Hand made by Frank Brehm domain brehm-online.com -search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de -nameserver 10.12.11.1 +search brehm-online.com hennig-berlin.org uhu-banane.de profitbricks.localdomain dc1.de.profitbricks.net dc2.us.profitbricks.net pb.local +#nameserver 10.12.11.1 +nameserver 192.168.178.30 +nameserver 192.168.178.89 diff --git a/runlevels/boot/swapfiles b/runlevels/boot/swapfiles new file mode 120000 index 00000000..acbd6b64 --- /dev/null +++ b/runlevels/boot/swapfiles @@ -0,0 +1 @@ +/etc/init.d/swapfiles \ No newline at end of file diff --git a/runlevels/boot/tmpfiles.setup b/runlevels/boot/tmpfiles.setup new file mode 120000 index 00000000..4c1823ff --- /dev/null +++ b/runlevels/boot/tmpfiles.setup @@ -0,0 +1 @@ +/etc/init.d/tmpfiles.setup \ No newline at end of file diff --git a/runlevels/sysinit/sysfs b/runlevels/sysinit/sysfs new file mode 120000 index 00000000..887522b3 --- /dev/null +++ b/runlevels/sysinit/sysfs @@ -0,0 +1 @@ +/etc/init.d/sysfs \ No newline at end of file diff --git a/runlevels/sysinit/udev-mount b/runlevels/sysinit/udev-mount new file mode 120000 index 00000000..276036ed --- /dev/null +++ b/runlevels/sysinit/udev-mount @@ -0,0 +1 @@ +/etc/init.d/udev-mount \ No newline at end of file diff --git a/sysctl.d/README b/sysctl.d/README new file mode 100644 index 00000000..ca3e0303 --- /dev/null +++ b/sysctl.d/README @@ -0,0 +1,13 @@ +Kernel system variables configuration files + +Files found under the /etc/sysctl.d directory that end with .conf are +parsed within sysctl(8) at boot time. If you want to set kernel variables +you can either edit /etc/sysctl.conf or make a new file. + +The filename isn't important, but don't make it a package name as it may clash +with something the package builder needs later. The file name must end +with .conf, or it will not be read. + +The recommended location for local system settings is /etc/sysctl.d/local.conf +but as long as you follow the rules for the name of the file, anything will +work. see the sysctl.conf(5) man page for details of the format.