From: Frank Brehm Date: Fri, 17 May 2013 14:34:28 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=db77e10e533fd57b2a49cdb9aae3097c445c18bd;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/bash_completion.d/cpio b/bash_completion.d/cpio new file mode 120000 index 0000000..2c3dffb --- /dev/null +++ b/bash_completion.d/cpio @@ -0,0 +1 @@ +../../usr/share/bash-completion/cpio \ No newline at end of file diff --git a/bash_completion.d/eix b/bash_completion.d/eix new file mode 120000 index 0000000..e4aa83f --- /dev/null +++ b/bash_completion.d/eix @@ -0,0 +1 @@ +../../usr/share/bash-completion/eix \ No newline at end of file diff --git a/bash_completion.d/figlet b/bash_completion.d/figlet new file mode 120000 index 0000000..53d0f8d --- /dev/null +++ b/bash_completion.d/figlet @@ -0,0 +1 @@ +../../usr/share/bash-completion/figlet \ No newline at end of file diff --git a/bash_completion.d/fuse b/bash_completion.d/fuse new file mode 120000 index 0000000..4cb39f7 --- /dev/null +++ b/bash_completion.d/fuse @@ -0,0 +1 @@ +../../usr/share/bash-completion/fuse \ No newline at end of file diff --git a/bash_completion.d/genlop b/bash_completion.d/genlop new file mode 120000 index 0000000..3ceb237 --- /dev/null +++ b/bash_completion.d/genlop @@ -0,0 +1 @@ +../../usr/share/bash-completion/genlop \ No newline at end of file diff --git a/bash_completion.d/gpg2 b/bash_completion.d/gpg2 new file mode 120000 index 0000000..aefe1c5 --- /dev/null +++ b/bash_completion.d/gpg2 @@ -0,0 +1 @@ +../../usr/share/bash-completion/gpg2 \ No newline at end of file diff --git a/bash_completion.d/imagemagick b/bash_completion.d/imagemagick new file mode 120000 index 0000000..b39e61b --- /dev/null +++ b/bash_completion.d/imagemagick @@ -0,0 +1 @@ +../../usr/share/bash-completion/imagemagick \ No newline at end of file diff --git a/bash_completion.d/info b/bash_completion.d/info new file mode 120000 index 0000000..4432048 --- /dev/null +++ b/bash_completion.d/info @@ -0,0 +1 @@ +../../usr/share/bash-completion/info \ No newline at end of file diff --git a/bash_completion.d/iptables b/bash_completion.d/iptables new file mode 120000 index 0000000..0b433ad --- /dev/null +++ b/bash_completion.d/iptables @@ -0,0 +1 @@ +../../usr/share/bash-completion/iptables \ No newline at end of file diff --git a/bash_completion.d/ipv6calc b/bash_completion.d/ipv6calc new file mode 120000 index 0000000..b3e9d2d --- /dev/null +++ b/bash_completion.d/ipv6calc @@ -0,0 +1 @@ +../../usr/share/bash-completion/ipv6calc \ No newline at end of file diff --git a/bash_completion.d/lvm b/bash_completion.d/lvm new file mode 120000 index 0000000..f7da84f --- /dev/null +++ b/bash_completion.d/lvm @@ -0,0 +1 @@ +../../usr/share/bash-completion/lvm \ No newline at end of file diff --git a/bash_completion.d/make b/bash_completion.d/make new file mode 120000 index 0000000..9efd534 --- /dev/null +++ b/bash_completion.d/make @@ -0,0 +1 @@ +../../usr/share/bash-completion/make \ No newline at end of file diff --git a/bash_completion.d/ncftp b/bash_completion.d/ncftp new file mode 120000 index 0000000..61b4ac0 --- /dev/null +++ b/bash_completion.d/ncftp @@ -0,0 +1 @@ +../../usr/share/bash-completion/ncftp \ No newline at end of file diff --git a/bash_completion.d/nmap b/bash_completion.d/nmap new file mode 120000 index 0000000..222e1fe --- /dev/null +++ b/bash_completion.d/nmap @@ -0,0 +1 @@ +../../usr/share/bash-completion/nmap \ No newline at end of file diff --git a/bash_completion.d/postgresql b/bash_completion.d/postgresql new file mode 120000 index 0000000..90cefb4 --- /dev/null +++ b/bash_completion.d/postgresql @@ -0,0 +1 @@ +../../usr/share/bash-completion/postgresql \ No newline at end of file diff --git a/bash_completion.d/procps b/bash_completion.d/procps new file mode 120000 index 0000000..13ea167 --- /dev/null +++ b/bash_completion.d/procps @@ -0,0 +1 @@ +../../usr/share/bash-completion/procps \ No newline at end of file diff --git a/bash_completion.d/rcs b/bash_completion.d/rcs new file mode 120000 index 0000000..a05b823 --- /dev/null +++ b/bash_completion.d/rcs @@ -0,0 +1 @@ +../../usr/share/bash-completion/rcs \ No newline at end of file diff --git a/bash_completion.d/sqlite3 b/bash_completion.d/sqlite3 new file mode 120000 index 0000000..4678721 --- /dev/null +++ b/bash_completion.d/sqlite3 @@ -0,0 +1 @@ +../../usr/share/bash-completion/sqlite3 \ No newline at end of file diff --git a/bash_completion.d/sshfs b/bash_completion.d/sshfs new file mode 120000 index 0000000..b6d8dac --- /dev/null +++ b/bash_completion.d/sshfs @@ -0,0 +1 @@ +../../usr/share/bash-completion/sshfs \ No newline at end of file diff --git a/bash_completion.d/subversion b/bash_completion.d/subversion new file mode 120000 index 0000000..d695b86 --- /dev/null +++ b/bash_completion.d/subversion @@ -0,0 +1 @@ +../../usr/share/bash-completion/subversion \ No newline at end of file diff --git a/bash_completion.d/unrar b/bash_completion.d/unrar new file mode 120000 index 0000000..d40496b --- /dev/null +++ b/bash_completion.d/unrar @@ -0,0 +1 @@ +../../usr/share/bash-completion/unrar \ No newline at end of file diff --git a/conf.d/dmcrypt b/conf.d/dmcrypt new file mode 100644 index 0000000..35a1fd2 --- /dev/null +++ b/conf.d/dmcrypt @@ -0,0 +1,98 @@ +# /etc/conf.d/dmcrypt + +# For people who run dmcrypt on top of some other layer (like raid), +# use rc_need to specify that requirement. See the runscript(8) man +# page for more information. + +#-------------------- +# Instructions +#-------------------- + +# Note regarding the syntax of this file. This file is *almost* bash, +# but each line is evaluated separately. Separate swaps/targets can be +# specified. The init-script which reads this file assumes that a +# swap= or target= line starts a new section, similar to lilo or grub +# configuration. + +# Note when using gpg keys and /usr on a separate partition, you will +# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly +# and ensure that gpg has been compiled statically. +# See http://bugs.gentoo.org/90482 for more information. + +# Note that the init-script which reads this file detects whether your +# partition is LUKS or not. No mkfs is run unless you specify a makefs +# option. + +# Global options: +#---------------- + +# Max number of checks to perform (1 per second) +#dmcrypt_max_timeout=120 + +# Arguments: +#----------- +# target= == Mapping name for partition. +# swap= == Mapping name for swap partition. +# source='' == Real device for partition. +# key='[:]' == Fullpath from / or from inside removable media. +# remdev='' == Device that will be assigned to removable media. +# gpg_options='' == Default are --quiet --decrypt +# options='' == cryptsetup, for LUKS you can only use --readonly +# loop_file='' == Loopback file. +# pre_mount='cmds' == commands to execute before mounting partition. +# post_mount='cmds' == commands to execute after mounting partition. +#----------- +# Supported Modes +# gpg == decrypt and pipe key into cryptsetup. +# Note: new-line character must not be part of key. +# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' + +#-------------------- +# dm-crypt examples +#-------------------- + +## swap +# Swap partitions. These should come first so that no keys make their +# way into unencrypted swap. +# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom +# If no makefs is given then mkswap will be assumed +#swap=crypt-swap +#source='/dev/hda2' + +## /home with passphrase +#target=crypt-home +#source='/dev/hda5' + +## /home with regular keyfile +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey' + +## /home with gpg protected key +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey:gpg' + +## /home with regular keyfile on removable media(such as usb-stick) +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey' +#remdev='/dev/sda1' + +##/home with gpg protected key on removable media(such as usb-stick) +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey:gpg' +#remdev='/dev/sda1' + +##/tmp with regular keyfile +#target=crypt-tmp +#source='/dev/hda6' +#key='/full/path/to/tmpkey' +#pre_mount='/sbin/mkreiserfs -f -f ${dev}' +#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' + +## Loopback file example +#mount='crypt-loop-home' +#source='/dev/loop0' +#loop_file='/mnt/crypt/home' diff --git a/conf.d/ipmievd b/conf.d/ipmievd new file mode 100644 index 0000000..ee4dd67 --- /dev/null +++ b/conf.d/ipmievd @@ -0,0 +1,23 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd,v 1.1 2007/09/23 06:03:42 robbat2 Exp $ +# /etc/conf.d/ipmievd + +# Interfaces: +# open Linux OpenIPMI Interface +# imb Intel IMB Interface +# bmc IPMI v2.0 BMC interface +# lan IPMI v1.5 LAN Interface +# lanplus IPMI v2.0 RMCP+ LAN Interface + +INTERFACE="open" + +# Commands: +# open Use OpenIPMI for asyncronous notification of events +# sel Poll SEL for notification of events + +COMMAND="open" + +# Options. + +OPTIONS="" diff --git a/conf.d/udev b/conf.d/udev index 667cc8b..41f6b9b 100644 --- a/conf.d/udev +++ b/conf.d/udev @@ -11,6 +11,15 @@ # in /etc/conf.d/rc: rc_plug_services="!*" #rc_coldplug="YES" +# We can create a /dev/root symbolic link to point to the root device in +# some situations. This is on by default because some software relies on +# it,. However, this software should be fixed to not do this. +# For more information, see +# https://bugs.gentoo.org/show_bug.cgi?id=438380. +# If you are not using any affected software, you do not need this, so +# feel free to turn it off. +#rc_dev_root_symlink="YES" + # Expert options: # Timeout in seconds to wait for processing of uevents at boot. diff --git a/config-archive/etc/logrotate.d/elog-save-summary b/config-archive/etc/logrotate.d/elog-save-summary new file mode 100644 index 0000000..029a5a0 --- /dev/null +++ b/config-archive/etc/logrotate.d/elog-save-summary @@ -0,0 +1,10 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Rotate the log created by the save_summary elog module. + +/var/log/portage/elog/summary.log { + #su portage portage + missingok + nocreate + delaycompress +} diff --git a/config-archive/etc/logrotate.d/elog-save-summary.dist.new b/config-archive/etc/logrotate.d/elog-save-summary.dist.new new file mode 100644 index 0000000..f2cfc66 --- /dev/null +++ b/config-archive/etc/logrotate.d/elog-save-summary.dist.new @@ -0,0 +1,10 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Rotate the log created by the save_summary elog module. + +/var/log/portage/elog/summary.log { + su portage portage + missingok + nocreate + delaycompress +} diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index c7e3299..94f9fa5 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-12-18 11:19 -NextSubscriptionId 8 +# Written by cupsd on 2013-05-16 13:08 +NextSubscriptionId 9 diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index 08a5e93..69dc39a 100644 --- a/cups/subscriptions.conf.O +++ b/cups/subscriptions.conf.O @@ -1,11 +1,11 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-12-17 11:19 -NextSubscriptionId 8 - +# Written by cupsd on 2013-05-15 13:10 +NextSubscriptionId 9 + Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress Owner fbrehm LeaseDuration 86400 Interval 0 -ExpirationTime 1355825944 -NextEventId 4 +ExpirationTime 1368702457 +NextEventId 5 diff --git a/dbus-1/system.d/org.freedesktop.UDisks2.conf b/dbus-1/system.d/org.freedesktop.UDisks2.conf new file mode 100644 index 0000000..7e176d3 --- /dev/null +++ b/dbus-1/system.d/org.freedesktop.UDisks2.conf @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/dbus-1/system.d/org.gnome.CPUFreqSelector.conf b/dbus-1/system.d/org.gnome.CPUFreqSelector.conf new file mode 100644 index 0000000..331b6bc --- /dev/null +++ b/dbus-1/system.d/org.gnome.CPUFreqSelector.conf @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/env.d/50gtk2 b/env.d/50gtk2 deleted file mode 100644 index 078151c..0000000 --- a/env.d/50gtk2 +++ /dev/null @@ -1 +0,0 @@ -GDK_USE_XFT=1 diff --git a/env.d/99polkit-kde b/env.d/99polkit-kde new file mode 100644 index 0000000..d6646ad --- /dev/null +++ b/env.d/99polkit-kde @@ -0,0 +1 @@ +CONFIG_PROTECT="/usr/share/polkit-1/actions" diff --git a/eselect/postgresql/slots/9.2/base b/eselect/postgresql/slots/9.2/base index b5f9c30..286352f 100644 --- a/eselect/postgresql/slots/9.2/base +++ b/eselect/postgresql/slots/9.2/base @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.2.3-r1" +postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.2.4" diff --git a/eselect/postgresql/slots/9.2/server b/eselect/postgresql/slots/9.2/server index 58b5479..3de77a0 100644 --- a/eselect/postgresql/slots/9.2/server +++ b/eselect/postgresql/slots/9.2/server @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.2.3-r1" +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.2.4" diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 1abe77d..cf4e49d 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -7,6 +7,25 @@ Legt fest, ob die Tastenkombinationen deaktiviert sein sollen + + + + + Der Wert 0 bedeutet, dass der Prozessortakt angezeigt wird, der Wert 1 dass der Takt und die Einheiten angezeigt und der Wert 2 dass ein Prozentwert anstatt des Taktes angezeigt wird. + + + + + Der Wert 0 bedeutet, dass das Applet im Grafikmodus (nur Bilder), der Wert 1 dass das Applet im Textmodus (ohne Grafiken) und der Wert 2 dass das Applet im Grafik- und Textmodus angezeigt wird. + + + + + Den zu überwachenden Prozessor festlegen. In einem Ein-Prozessorsystem kann dieser Wert nicht geändert werden. + + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index a57c949..5d5aefd 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -7,6 +7,25 @@ Whether to disable the keyboard shortcuts + + + + + A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. + + + + + A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. + + + + + Set the CPU to monitor. In a single processor system you don't have to change it. + + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index c9f5775..3d708ce 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -7,6 +7,25 @@ Отключить комбинации клавиш или нет + + + + + 0 - показывать частоту ЦП, 1 - частоту и единицы, 2 - проценты вместо частоты. + + + + + 0 - показывать апплет в графическом режиме (только изображение), 1 - текстовый режим (не показывать изображение), 2 - показывать и текст, и изображение. + + + + + Устанавливает отслеживаемый процессор. На однопроцессорной системе изменять не надо. + + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index c2fa662..2e3ffec 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -320,13 +320,13 @@ - - - - - - - + + + + + + + @@ -350,21 +350,21 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + @@ -1487,90 +1487,90 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -2196,6 +2196,28 @@ Whether to disable the keyboard shortcuts + + + + + + A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. + + + + + + A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. + + + + + + Set the CPU to monitor. In a single processor system you don't have to change it. + + + + @@ -4152,7 +4174,7 @@ - + @@ -4163,7 +4185,7 @@ - + @@ -4175,7 +4197,7 @@ - + @@ -4187,7 +4209,7 @@ - + @@ -4196,7 +4218,7 @@ - + @@ -4205,7 +4227,7 @@ - + @@ -4213,7 +4235,7 @@ - + @@ -4366,197 +4388,197 @@ - + gnome-system-monitor.desktop - + #000000 - + #FF6700 - + #C65000 - + #000000 - + #d50000 - + #000000 - + #8b00c3 - + #000000 - + #c4a000 - + #edd400 - + #fce94f - + #000000 - + #AAF5D0 - + #00ff82 - + #00e675 - + #00b35b - + #000000 - + #002f3d - + #00a3ff - + #0092e6 - + #0072b3 - + For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs. - + - + - + - + - + - + - + @@ -4565,37 +4587,37 @@ - + Empty notes are always deleted without confirmation. - + If this option is enabled, selecting the desktop in any way will automatically hide all the open notes. - + If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored. - + If this option is disabled, a custom font can be used as the default font for all sticky notes. - + If this option is disabled, a custom color can be used as the default color for all sticky notes. - + %x @@ -4603,13 +4625,13 @@ By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid. - + Specifies whether the sticky notes are locked (non-editable) or not. - + Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not. @@ -4617,7 +4639,7 @@ - + Sans 10 @@ -4625,7 +4647,7 @@ Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10". - + #000000 @@ -4633,7 +4655,7 @@ Default font color for new sticky notes. This should be in html hex specification, for example "#000000". - + #ECF833 @@ -4641,13 +4663,13 @@ Default color for new sticky notes. This should be in html hex specification, for example "#30FF50". - + Default height for new sticky notes in pixels. - + Default width for new sticky notes in pixels. @@ -4657,7 +4679,7 @@ - + @@ -4665,17 +4687,17 @@ - + - + - + @@ -4684,34 +4706,34 @@ - + - + /mnt/floppy - + - + - + - + Time in seconds between status updates @@ -4721,17 +4743,17 @@ - + List of strings containing the available palettes. - + The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet. - + @@ -11366,7 +11388,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl>0 @@ -11379,7 +11401,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl>minus @@ -11392,7 +11414,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl>plus @@ -11405,7 +11427,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + F1 @@ -11418,7 +11440,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key for switch to tab 12. Expressed as a string @@ -11428,7 +11450,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key for switch to tab 11. Expressed as a string @@ -11438,7 +11460,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>0 @@ -11451,7 +11473,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>9 @@ -11464,7 +11486,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>8 @@ -11477,7 +11499,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>7 @@ -11490,7 +11512,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>6 @@ -11503,7 +11525,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>5 @@ -11516,7 +11538,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>4 @@ -11529,7 +11551,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>3 @@ -11542,7 +11564,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>2 @@ -11555,7 +11577,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Alt>1 @@ -11568,7 +11590,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Accelerator key to detach current tab. Expressed as a string @@ -11578,7 +11600,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>Page_Down @@ -11591,7 +11613,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>Page_Up @@ -11604,7 +11626,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Control>Page_Down @@ -11617,7 +11639,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Control>Page_Up @@ -11630,7 +11652,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key to reset and clear the terminal. Expressed as a string @@ -11640,7 +11662,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key to reset the terminal. Expressed as a string @@ -11650,7 +11672,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key to set the terminal title. Expressed as a string @@ -11660,7 +11682,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key to toggle the visibility of the menubar. Expressed as a string @@ -11670,7 +11692,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + F11 @@ -11683,7 +11705,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>v @@ -11697,7 +11719,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>c @@ -11711,7 +11733,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>q @@ -11724,7 +11746,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>w @@ -11737,7 +11759,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + disabled @@ -11750,7 +11772,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Keyboard shortcut key for bringing up the dialog for profile @@ -11761,7 +11783,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>n @@ -11774,7 +11796,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + <Ctrl><Shift>t @@ -11790,7 +11812,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Popup a dialog when an S/Key challenge response query is @@ -11799,7 +11821,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11809,7 +11831,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11818,7 +11840,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + escape-sequence @@ -11833,7 +11855,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + ascii-del @@ -11848,7 +11870,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11860,7 +11882,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11870,7 +11892,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11880,7 +11902,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + solid @@ -11893,7 +11915,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Monospace 12 @@ -11903,7 +11925,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + #2E2E34343636:#CCCC00000000:#4E4E9A9A0606:#C4C4A0A00000:#34346565A4A4:#757550507B7B:#060698209A9A:#D3D3D7D7CFCF:#555557575353:#EFEF29292929:#8A8AE2E23434:#FCFCE9E94F4F:#72729F9FCFCF:#ADAD7F7FA8A8:#3434E2E2E2E2:#EEEEEEEEECEC @@ -11916,7 +11938,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11926,7 +11948,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11937,7 +11959,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + block @@ -11948,7 +11970,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + system @@ -11959,7 +11981,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11968,7 +11990,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -11977,16 +11999,16 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + If true, the command inside the terminal will be launched as a login shell. (argv[0] will have a hyphen in front of it.) - + close @@ -11997,7 +12019,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12006,7 +12028,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12014,7 +12036,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12025,7 +12047,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12036,7 +12058,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + right @@ -12047,7 +12069,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12056,7 +12078,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12065,7 +12087,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12074,7 +12096,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + -A-Za-z0-9,./?%&#:_=+@~ @@ -12087,7 +12109,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12096,7 +12118,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12105,7 +12127,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Terminal @@ -12133,7 +12155,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + replace @@ -12148,7 +12170,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12157,7 +12179,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + #000000 @@ -12170,7 +12192,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + #FFFFDD @@ -12182,7 +12204,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + #000000 @@ -12194,7 +12216,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12203,7 +12225,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Default @@ -12231,7 +12253,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12240,7 +12262,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -12300,7 +12322,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12311,7 +12333,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12321,7 +12343,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Default @@ -12332,7 +12354,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16492,7 +16514,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Toggle hamster application window @@ -16500,7 +16522,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Toggle visibility of the hamster application window. - + hamster-time-tracker toggle @@ -16508,7 +16530,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Command for toggling visibility of the hamster application window. - + @@ -19790,13 +19812,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19804,7 +19826,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -19812,13 +19834,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19826,7 +19848,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -19834,13 +19856,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19848,7 +19870,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -19856,13 +19878,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19870,7 +19892,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -19878,13 +19900,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19892,7 +19914,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -19900,13 +19922,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19914,7 +19936,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -19922,13 +19944,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19936,7 +19958,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -19988,13 +20010,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20002,7 +20024,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. @@ -20390,9 +20412,9 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + @@ -21188,39 +21210,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -21233,9 +21255,9 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + diff --git a/gconf/schemas/cpufreq-applet.schemas b/gconf/schemas/cpufreq-applet.schemas new file mode 100644 index 0000000..876dbfc --- /dev/null +++ b/gconf/schemas/cpufreq-applet.schemas @@ -0,0 +1,81 @@ + + + + + /schemas/apps/cpufreq-applet/prefs/cpu + cpufreq-applet + int + 0 + + CPU to Monitor + Set the CPU to monitor. In a single processor system you don't have to change it. + + + + Zu überwachender Prozessor + Den zu überwachenden Prozessor festlegen. In einem Ein-Prozessorsystem kann dieser Wert nicht geändert werden. + + + + CPU to Monitor + Set the CPU to monitor. In a single processor system you don't have to change it. + + + + Отслеживаемый процессор + Устанавливает отслеживаемый процессор. На однопроцессорной системе изменять не надо. + + + + /schemas/apps/cpufreq-applet/prefs/show_mode + cpufreq-applet + int + 2 + + Mode to show cpu usage + A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. + + + + Modus zur Anzeige der Prozessorlast + Der Wert 0 bedeutet, dass das Applet im Grafikmodus (nur Bilder), der Wert 1 dass das Applet im Textmodus (ohne Grafiken) und der Wert 2 dass das Applet im Grafik- und Textmodus angezeigt wird. + + + + Mode to show cpu usage + A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. + + + + Режим показа использования ЦП + 0 - показывать апплет в графическом режиме (только изображение), 1 - текстовый режим (не показывать изображение), 2 - показывать и текст, и изображение. + + + + /schemas/apps/cpufreq-applet/prefs/show_text_mode + cpufreq-applet + int + 1 + + The type of text to display (if the text is enabled). + A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. + + + + Die Art des anzuzeigenden Textes (falls der Text aktiviert ist). + Der Wert 0 bedeutet, dass der Prozessortakt angezeigt wird, der Wert 1 dass der Takt und die Einheiten angezeigt und der Wert 2 dass ein Prozentwert anstatt des Taktes angezeigt wird. + + + + The type of text to display (if the text is enabled). + A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. + + + + Тип отображаемого текста (если текст разрешён). + 0 - показывать частоту ЦП, 1 - частоту и единицы, 2 - проценты вместо частоты. + + + + + diff --git a/gconf/schemas/gnome-terminal.schemas b/gconf/schemas/gnome-terminal.schemas index 186daae..a101d84 100644 --- a/gconf/schemas/gnome-terminal.schemas +++ b/gconf/schemas/gnome-terminal.schemas @@ -836,7 +836,7 @@ /apps/gnome-terminal/profiles/Default/login_shell gnome-terminal bool - true + false Whether to launch the command in the terminal as a login shell diff --git a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules index 32adac6..d344d2d 100644 --- a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules +++ b/gtk-2.0/x86_64-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 from gtk+-2.24.12 +# Created by gtk-query-immodules-2.0 from gtk+-2.24.16 # # ModulesPath = /root/.gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib64/gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/2.10.0/immodules:/usr/lib64/gtk-2.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/immodules # diff --git a/init.d/dmcrypt b/init.d/dmcrypt new file mode 100755 index 0000000..130036b --- /dev/null +++ b/init.d/dmcrypt @@ -0,0 +1,346 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $ + +depend() { + before checkfs fsck +} + +# We support multiple dmcrypt instances based on $SVCNAME +execute_hook="dm_crypt_execute_dmcrypt" +# XXX: Should we drop this ? +# execute_hook="dm_crypt_execute_localmount" +conf_file="/etc/conf.d/${SVCNAME}" + +# Get splash helpers if available. +if [ -e /sbin/splash-functions.sh ] ; then + . /sbin/splash-functions.sh +fi + +# Setup mappings for an individual target/swap +# Note: This relies on variables localized in the main body below. +dm_crypt_execute_dmcrypt() { + local dev ret mode foo + + if [ -n "${target}" ] ; then + # let user set options, otherwise leave empty + : ${options:=' '} + elif [ -n "${swap}" ] ; then + if cryptsetup isLuks ${source} 2>/dev/null ; then + ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup." + return + fi + target=${swap} + # swap contents do not need to be preserved between boots, luks not required. + # suspend2 users should have initramfs's init handling their swap partition either way. + : ${options:='-c aes -h sha1 -d /dev/urandom'} + : ${pre_mount:='mkswap ${dev}'} + else + return + fi + if [ -z "${source}" ] && [ ! -e "${source}" ] ; then + ewarn "source \"${source}\" for ${target} missing, skipping..." + return + fi + + if [ -n "${loop_file}" ] ; then + dev="/dev/mapper/${target}" + ebegin " Setting up loop device ${source}" + losetup ${source} ${loop_file} + fi + + # cryptsetup: + # luksOpen # is $source + # create # is $target + local arg1="create" arg2="${target}" arg3="${source}" luks=0 + + cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; } + + # Older versions reported: + # ${target} is active: + # Newer versions report: + # ${target} is active[ and is in use.] + if cryptsetup status ${target} | egrep -q ' is active' ; then + einfo "dm-crypt mapping ${target} is already configured" + return + fi + splash svc_input_begin ${SVCNAME} >/dev/null 2>&1 + + # Handle keys + if [ -n "${key}" ] ; then + read_abort() { + # some colors + local ans savetty resettty + [ -z "${NORMAL}" ] && eval $(eval_ecolors) + einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) " + shift + # This is ugly as s**t. But POSIX doesn't provide `read -t`, so + # we end up having to implement our own crap with stty/etc... + savetty=$(stty -g) + resettty='stty ${savetty}; trap - EXIT HUP INT TERM' + trap 'eval "${resettty}"' EXIT HUP INT TERM + stty -icanon + [ "${1}" = -t ] && stty min 0 time "$(( $2 * 10 ))" + ans=$(dd count=1 bs=1 2>/dev/null) || ans='' + eval "${resettty}" + if [ -z "${ans}" ] ; then + printf '\r' + else + echo + fi + case ${ans} in + [yY]) return 0;; + *) return 1;; + esac + } + + # Notes: sed not used to avoid case where /usr partition is encrypted. + mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg + key=${key/:*/} + case "${mode}" in + gpg|reg) + # handle key on removable device + if [ -n "${remdev}" ] ; then + # temp directory to mount removable device + local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$" + if [ ! -d "${mntrem}" ] ; then + if ! mkdir -p "${mntrem}" ; then + ewarn "${source} will not be decrypted ..." + einfo "Reason: Unable to create temporary mount point '${mntrem}'" + return + fi + fi + i=0 + einfo "Please insert removable device for ${target}" + while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do + foo="" + if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then + # keyfile exists? + if [ ! -e "${mntrem}${key}" ] ; then + umount -n "${mntrem}" + rmdir "${mntrem}" + einfo "Cannot find ${key} on removable media." + read_abort "Abort" ${read_timeout:--t 1} && return + else + key="${mntrem}${key}" + break + fi + else + [ -e "${remdev}" ] \ + && foo="mount failed" \ + || foo="mount source not found" + fi + : $((i += 1)) + read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return + done + else # keyfile ! on removable device + if [ ! -e "${key}" ] ; then + ewarn "${source} will not be decrypted ..." + einfo "Reason: keyfile ${key} does not exist." + return + fi + fi + ;; + *) + ewarn "${source} will not be decrypted ..." + einfo "Reason: mode ${mode} is invalid." + return + ;; + esac + else + mode=none + fi + ebegin " ${target} using: ${options} ${arg1} ${arg2} ${arg3}" + if [ "${mode}" = "gpg" ] ; then + : ${gpg_options:='-q -d'} + # gpg available ? + if type -p gpg >/dev/null ; then + for i in 0 1 2 ; do + # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected. + # save stdin stdout stderr "values" + gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3} + ret=$? + [ ${ret} -eq 0 ] && break + done + eend ${ret} "failure running cryptsetup" + else + ewarn "${source} will not be decrypted ..." + einfo "Reason: cannot find gpg application." + einfo "You have to install app-crypt/gnupg first." + einfo "If you have /usr on its own partition, try copying gpg to /bin ." + fi + else + if [ "${mode}" = "reg" ] ; then + cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3} + ret=$? + eend ${ret} "failure running cryptsetup" + else + cryptsetup ${options} ${arg1} ${arg2} ${arg3} + ret=$? + eend ${ret} "failure running cryptsetup" + fi + fi + if [ -d "${mntrem}" ] ; then + umount -n ${mntrem} 2>/dev/null >/dev/null + rmdir ${mntrem} 2>/dev/null >/dev/null + fi + splash svc_input_end ${SVCNAME} >/dev/null 2>&1 + + if [ ${ret} -ne 0 ] ; then + cryptfs_status=1 + else + if [ -n "${pre_mount}" ] ; then + dev="/dev/mapper/${target}" + ebegin " pre_mount: ${pre_mount}" + eval "${pre_mount}" > /dev/null + ewend $? || cryptfs_status=1 + fi + fi +} + +# Run any post_mount commands for an individual mount +# +# Note: This relies on variables localized in the main body below. +dm_crypt_execute_localmount() { + local mount_point + + [ -z "${target}" ] && [ -z "${post_mount}" ] && return + + if ! cryptsetup status ${target} | egrep -q '\/dev/null + eend $? || cryptfs_status=1 + fi +} + +# Lookup optional bootparams +get_bootparam_val() { + # We're given something like: + # foo=bar=cow + # Return the "bar=cow" part. + case $1 in + *\=*) + local key=$(echo "$1" | cut -f1 -d=) + echo "$1" | cut -c $(( ${#key} + 2 )) + ;; + esac +} + +start() { + local header=true cryptfs_status=0 + local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev + + local x + for x in $(cat /proc/cmdline) ; do + case "${x}" in + key_timeout\=*) + local KEY_TIMEOUT=$(get_bootparam_val "${x}") + if [ ${KEY_TIMEOUT} -gt 0 ] ; then + read_timeout="-t ${KEY_TIMEOUT}" + fi + ;; + esac + done + + while read -u 3 targetline ; do + case ${targetline} in + # skip comments and blank lines + ""|"#"*) continue ;; + # skip service-specific openrc configs #377927 + rc_*) continue ;; + esac + + ${header} && ebegin "Setting up dm-crypt mappings" + header=false + + # check for the start of a new target/swap + case ${targetline} in + target=*|swap=*) + # If we have a target queued up, then execute it + ${execute_hook} + + # Prepare for the next target/swap by resetting variables + unset gpg_options key loop_file target options pre_mount post_mount source swap remdev + ;; + + gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*) + if [ -z "${target}${swap}" ] ; then + ewarn "Ignoring setting outside target/swap section: ${targetline}" + continue + fi + ;; + + dmcrypt_max_timeout=*) + # ignore global options + continue + ;; + + *) + ewarn "Skipping invalid line in ${conf_file}: ${targetline}" + ;; + esac + + # Queue this setting for the next call to dm_crypt_execute_xxx + eval "${targetline}" + done 3< ${conf_file} + + # If we have a target queued up, then execute it + ${execute_hook} + + ewend ${cryptfs_status} "Failed to setup dm-crypt devices" +} + +stop() { + local line header + + # Break down all mappings + header=true + egrep "^(target|swap)=" ${conf_file} | \ + while read line ; do + ${header} && einfo "Removing dm-crypt mappings" + header=false + + target= swap= + eval ${line} + + [ -n "${swap}" ] && target=${swap} + if [ -z "${target}" ] ; then + ewarn "invalid line in ${conf_file}: ${line}" + continue + fi + + ebegin " ${target}" + cryptsetup remove ${target} + eend $? + done + + # Break down loop devices + header=true + grep '^source=./dev/loop' ${conf_file} | \ + while read line ; do + ${header} && einfo "Detaching dm-crypt loop devices" + header=false + + source= + eval ${line} + + ebegin " ${source}" + losetup -d "${source}" + eend $? + done + + return 0 +} diff --git a/init.d/ipmievd b/init.d/ipmievd new file mode 100755 index 0000000..5dd4ef1 --- /dev/null +++ b/init.d/ipmievd @@ -0,0 +1,25 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd,v 1.1 2007/09/23 06:03:42 robbat2 Exp $ +# /etc/init.d/ipmievd + +depend() { + use logger +} +PN="ipmievd" + +start() { + /sbin/modprobe -sq ipmi_msghandler + /sbin/modprobe -sq ipmi_devintf + /sbin/modprobe -sq ipmi_si + ebegin "Starting ${PN}" + start-stop-daemon --start --pidfile /var/run/${PN}.pid0 --exec /usr/sbin/${PN} -- -I ${INTERFACE} ${OPTIONS} ${COMMAND} + eend $? +} + +stop() { + ebegin "Stopping ${PN}" + start-stop-daemon --stop --pidfile /var/run/${PN}.pid0 + eend $? +} diff --git a/init.d/udev b/init.d/udev index af0a40e..8f07d8f 100755 --- a/init.d/udev +++ b/init.d/udev @@ -7,11 +7,9 @@ description="udev manages device permissions and symbolic links in /dev" extra_started_commands="reload" description_reload="Reload the udev rules and databases" -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} -udev_debug="${udev_debug:-no}" udev_monitor="${udev_monitor:-no}" -udev_monitor_keep_running="${udev_monitor_keep_running:-no}" -udev_settle_timeout="${udev_settle_timeout:-60}" +udevmonitor_log=/run/udevmonitor.log +udevmonitor_pid=/run/udevmonitor.pid depend() { @@ -53,7 +51,7 @@ start_pre() fi fi - if yesno "${udev_debug}"; then + if yesno "${udev_debug:-NO}"; then command_args="${command_args} --debug 2> /run/udevdebug.log" fi @@ -89,9 +87,6 @@ start_udevmonitor() { yesno "${udev_monitor}" || return 0 - udevmonitor_log=/run/udevmonitor.log - udevmonitor_pid=/run/udevmonitor.pid - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events" start-stop-daemon --start --stdout "${udevmonitor_log}" \ --make-pidfile --pidfile "${udevmonitor_pid}" \ @@ -100,23 +95,28 @@ start_udevmonitor() populate_dev() { - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" + if yesno ${rc_dev_root_symlink:-yes}; then + ebegin "Generating a rule to create a /dev/root symlink" + /lib/udev/dev-root-link.sh + eend $? fi - ebegin "Populating /dev with existing devices through uevents" - if ! yesno "${rc_coldplug}"; then - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 + get_bootparam "nocoldplug" && rc_coldplug="no" + if ! yesno ${rc_coldplug:-${RC_COLDPLUG:-yes}}; then + einfo "Setting /dev permissions and symbolic links" + udevadm trigger --attr-match=dev --action=add + ewarn "Skipping udev coldplug sequence" + return 0 fi + + ebegin "Populating /dev with existing devices through uevents" udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add eend $? + ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout} + udevadm settle --timeout=${udev_settle_timeout:-60} eend $? - udevadm control --property=do_not_run_plug_service= return 0 } @@ -124,7 +124,7 @@ stop_udevmonitor() { yesno "${udev_monitor}" || return 0 - if yesno "${udev_monitor_keep_running}"; then + if yesno "${udev_monitor_keep_running:-no}"; then ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" else einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" diff --git a/portage/package.keywords b/portage/package.keywords index b3b2301..b1fbce9 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -51,13 +51,18 @@ dev-python/fbrehm-libs dev-python/pb-base dev-python/pb-logging ~dev-python/python-debian-0.1.21 +~dev-python/stevedore-0.8 +~dev-python/virtualenv-clone-0.2.4 ~dev-python/virtualenvwrapper-3.2 +~dev-python/virtualenvwrapper-3.7 ~dev-ruby/dnsruby-1.53 ~dev-ruby/zonecheck-3.0.4 ~dev-util/kbuild-0.1.9998_pre20120806 +~dev-vcs/gitg-0.2.7 + mail-client/thunderbird ~media-gfx/gimp-2.8.2 diff --git a/portage/package.use b/portage/package.use index b4245bf..22c2b0e 100644 --- a/portage/package.use +++ b/portage/package.use @@ -37,7 +37,7 @@ app-text/djvu doc threads app-text/docbook-sgml-utils jadetex app-text/enchant aspell -zemberek app-text/evince djvu dvi t1lib -app-text/texlive context cyrillic detex dvi2tty dvipdfm extra games graphics humanities jadetex music omega pdfannotextractor pstricks publishers science tex4ht xetex xindy +app-text/texlive context cyrillic detex dvi2tty dvipdfm epspdf extra games graphics humanities jadetex metapost music omega pdfannotextractor pstricks publishers science tex4ht texi2html xetex xindy app-text/texlive-core xetex dev-cpp/gtkmm accessibility @@ -56,7 +56,7 @@ dev-java/sun-jdk -doc jce dev-lang/perl ithreads perlsuid dev-lang/php bcmath cgi embed filter force-cgi-redirect enchant fpm gd hash intl json -ldap-sasl mysqlnd -oci8 -recode reflection sharedext suhosin -threads tokenizer xmlreader xmlwriter -xpm zip -dev-lang/python berkdb tk +dev-lang/python berkdb lang tk dev-libs/boost tools dev-libs/cyrus-sasl openldap sample @@ -78,12 +78,46 @@ dev-perl/Sysadm-Install hammer dev-perl/Task-Moose cli async declare instancetype logging other strict traits types utilroles utils dev-perl/Template-Toolkit latex -dev-python/ipython gnuplot smp wxwidgets -dev-python/jinja -doc i18n -dev-python/pyopenssl -doc -# dev-python/PyQt4 assistant declarative multimedia phonon qt3support sql webkit xmlpatterns -dev-python/PyQt4 assistant declarative multimedia qt3support script sql webkit xmlpatterns +dev-python/beautifulsoup doc +dev-python/configobj doc +dev-python/cython doc +dev-python/dbus-python doc +dev-python/epydoc doc +dev-python/fbrehm-libs doc +dev-python/foolscap doc +dev-python/gnome-vfs-python doc +dev-python/gnuplot-py doc +dev-python/imaging doc +dev-python/ipython doc gnuplot smp wxwidgets +dev-python/jinja doc i18n +dev-python/lxml doc +dev-python/m2crypto doc +dev-python/nevow doc +dev-python/numpy doc +dev-python/paramiko doc +dev-python/pb-base doc dev-python/pb-dbhandler doc +dev-python/pb-logging doc +dev-python/pexpect doc +dev-python/pycairo doc +dev-python/pycrypto doc +dev-python/pycups doc +dev-python/pygments doc +dev-python/pygtk doc +dev-python/pygtksourceview doc +dev-python/pyopenssl doc +dev-python/pyparsing doc +# dev-python/PyQt4 assistant declarative doc multimedia phonon qt3support sql webkit xmlpatterns +dev-python/PyQt4 assistant declarative doc multimedia qt3support script sql webkit xmlpatterns +dev-python/python-ldap doc +dev-python/pyxml doc +dev-python/reportlab doc +dev-python/sip doc +dev-python/six doc +dev-python/sqlalchemy doc +dev-python/suds doc +dev-python/virtualenv doc +dev-python/wxpython doc # move x11-libs/qt-core dev-qt/qtcore dev-qt/qtcore optimized-qmake @@ -240,7 +274,7 @@ net-misc/iputils caps gnutls net-misc/networkmanager dhcpcd net-misc/ntp parse-clocks -zeroconf net-misc/openssh X509 sftplogging -net-misc/openvpn eurephia iproute2 passwordsave +net-misc/openvpn down-root eurephia iproute2 passwordsave net-misc/rdesktop rdpusb net-misc/spice-gtk -gtk3 -pulseaudio # net-misc/vnc server @@ -272,6 +306,7 @@ sys-apps/vcb-python development vcb sys-auth/consolekit policykit sys-auth/pambase mktemp pam_krb5 pam_ssh +sys-block/lsitools doc sys-block/parted device-mapper sys-devel/gcc libffi mudflap objc objc-gc objc++ diff --git a/revdep-rebuild/61-icedtea-bin-6 b/revdep-rebuild/61-icedtea-bin-6 index dccd7c5..9919480 100644 --- a/revdep-rebuild/61-icedtea-bin-6 +++ b/revdep-rebuild/61-icedtea-bin-6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.2" +SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.4" diff --git a/texmf/ls-R b/texmf/ls-R index 5882c9c..cd14e71 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -66,8 +66,8 @@ language.texlive-langgerman.def 80jadetex.cnf ./updmap.d: -00updmap.cfg .keep_app-text_texlive-core-0 +00updmap.cfg texlive-basic.cfg texlive-context.cfg texlive-fontsextra.cfg @@ -84,8 +84,8 @@ texlive-pictures.cfg texlive-science.cfg ./web2c: -fmtutil.cnf .keep_app-text_texlive-core-0 +fmtutil.cnf texmf.cnf updmap.cfg