From 5caf6916905ef993779586afca69648066f0579c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 29 Jan 2014 09:38:28 +0100 Subject: [PATCH] Current state --- dhcpcd.conf | 20 ++- gconf/gconf.xml.defaults/%gconf-tree.xml | 210 ++++++++++++++--------- hotplug/usb/libsane.usermap | 2 +- libvirt/qemu.conf | 45 ++++- portage/package.keywords/common | 3 + portage/package.use | 1 + sandbox.d/20icedtea-7 | 1 - sgml/catalog | 2 +- texmf/ls-R | 4 +- 9 files changed, 192 insertions(+), 96 deletions(-) delete mode 100644 sandbox.d/20icedtea-7 diff --git a/dhcpcd.conf b/dhcpcd.conf index eb625a7..96eaf52 100644 --- a/dhcpcd.conf +++ b/dhcpcd.conf @@ -3,10 +3,20 @@ # Inform the DHCP server of our hostname for DDNS. hostname -# To share the DHCP lease across OSX and Windows a ClientID is needed. -# Enabling this may get a different lease than the kernel DHCP client. -# Some upstream DHCP servers may also require a ClientID, such as FRITZ!Box. + +# Use the hardware address of the interface for the Client ID. #clientid +# or +# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361. +duid + +# Persist interface configuration when dhcpcd exits. +persistent + +# Rapid commit support. +# Safe to enable by default because it requires the equivalent option set +# on the server to actually work. +option rapid_commit # A list of options to request from the DHCP server. option domain_name_servers, domain_name, domain_search, host_name @@ -14,7 +24,9 @@ option classless_static_routes # Most distributions have NTP support. option ntp_servers # Respect the network MTU. -option interface_mtu +# Some interface drivers reset when changing the MTU so disabled by default. +#option interface_mtu + # A ServerID is required by RFC2131. require dhcp_server_identifier diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index fffa858..b3c84c3 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -17164,44 +17164,50 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + @@ -18894,254 +18900,290 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + @@ -20849,16 +20891,16 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - + + - - + + - - + + @@ -21333,76 +21375,76 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap index 47f1c70..8a46755 100644 --- a/hotplug/usb/libsane.usermap +++ b/hotplug/usb/libsane.usermap @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24 on Mon Jan 20 20:41:41 2014 +# by sane-desc 3.5 from sane-backends 1.0.24 on Tue Jan 28 19:52:35 2014 # # The entries below are used to detect a USB device and change owner # and permissions on the "device node" used by libusb. diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf index 5fd6263..17f1b10 100644 --- a/libvirt/qemu.conf +++ b/libvirt/qemu.conf @@ -140,6 +140,22 @@ #spice_password = "XYZ12345" +# Enable use of SASL encryption on the SPICE server. This requires +# a SPICE client which supports the SASL protocol extension. +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +#spice_sasl = 1 + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +#spice_sasl_dir = "/some/directory/sasl2" + + # By default, if no graphical front end is configured, libvirt will disable # QEMU audio output since directly talking to alsa/pulseaudio may not work # with various security settings. If you know what you're doing, enable @@ -269,17 +285,23 @@ # saving a domain in order to save disk space; the list above is in descending # order by performance and ascending order by compression ratio. # -# save_image_format is used when you use 'virsh save' at scheduled -# saving, and it is an error if the specified save_image_format is -# not valid, or the requested compression program can't be found. +# save_image_format is used when you use 'virsh save' or 'virsh managedsave' +# at scheduled saving, and it is an error if the specified save_image_format +# is not valid, or the requested compression program can't be found. # # dump_image_format is used when you use 'virsh dump' at emergency # crashdump, and if the specified dump_image_format is not valid, or # the requested compression program can't be found, this falls # back to "raw" compression. # +# snapshot_image_format specifies the compression algorithm of the memory save +# image when an external snapshot of a domain is taken. This does not apply +# on disk image format. It is an error if the specified format isn't valid, +# or the requested compression program can't be found. +# #save_image_format = "raw" #dump_image_format = "raw" +#snapshot_image_format = "raw" # When a domain is configured to be auto-dumped when libvirtd receives a # watchdog event from qemu guest, libvirtd will save dump files in directory @@ -424,3 +446,20 @@ # Defaults to -1. # #seccomp_sandbox = 1 + + + +# Override the listen address for all incoming migrations. Defaults to +# 0.0.0.0, or :: if both host and qemu are capable of IPv6. +#migration_address = "127.0.0.1" + + +# Override the port range used for incoming migrations. +# +# Minimum must be greater than 0, however when QEMU is not running as root, +# setting the minimum to be lower than 1024 will not work. +# +# Maximum must not be greater than 65535. +# +#migration_port_min = 49152 +#migration_port_max = 49215 diff --git a/portage/package.keywords/common b/portage/package.keywords/common index d72e9b9..e620b1f 100644 --- a/portage/package.keywords/common +++ b/portage/package.keywords/common @@ -1,4 +1,5 @@ +~app-admin/eselect-java-0.1.0 ~app-admin/ulogd-1.24 ~app-emulation/emul-linux-x86-baselibs-20120520 @@ -27,8 +28,10 @@ app-text/docbook2odf-xsl-stylesheets ~dev-java/icedtea-7.2.0 ~dev-java/icedtea-7.2.3.6 +~dev-java/icedtea-7.2.4.3 ~dev-java/icedtea-web-1.1.4 ~dev-java/icedtea-web-1.3.1 +~dev-java/icedtea-web-1.4.1 ~dev-java/java-sdk-docs-1.7.0.2 ~dev-java/oracle-jdk-bin-1.7.0.2 =dev-java/oracle-jdk-bin-1.7* diff --git a/portage/package.use b/portage/package.use index a55a31f..af05582 100644 --- a/portage/package.use +++ b/portage/package.use @@ -240,6 +240,7 @@ net-analyzer/nagios-nrpe command-args net-analyzer/nagios-plugins nagios-dns nagios-ntp nagios-ping nagios-ssh net-analyzer/net-snmp diskio elf extensible mfd-rewrites sendmail smux net-analyzer/nmap ncat ndiff nping +net-analyzer/pb-nagios-plugins nrpe perl net-analyzer/wireshark adns doc-pdf gcrypt profile -qt4 smi net-dns/avahi autoipd howl-compat mdnsresponder-compat diff --git a/sandbox.d/20icedtea-7 b/sandbox.d/20icedtea-7 deleted file mode 100644 index 3001f3c..0000000 --- a/sandbox.d/20icedtea-7 +++ /dev/null @@ -1 +0,0 @@ -SANDBOX_PREDICT="/proc/self/coredump_filter" diff --git a/sgml/catalog b/sgml/catalog index b8ab77f..55f29f3 100644 --- a/sgml/catalog +++ b/sgml/catalog @@ -8,9 +8,9 @@ CATALOG "/etc/sgml/xml-docbook-4.3.cat" CATALOG "/etc/sgml/xml-docbook-4.4.cat" CATALOG "/etc/sgml/xml-docbook-4.5.cat" CATALOG "/etc/sgml/xhtml1.cat" -CATALOG "/etc/sgml/openjade-1.3.2.cat" CATALOG "/etc/sgml/sgml-docbook-4.1.cat" CATALOG "/etc/sgml/sgml-docbook-3.1.cat" CATALOG "/etc/sgml/sgml-docbook-4.0.cat" CATALOG "/etc/sgml/xml-simple-docbook-4.1.2.4.cat" CATALOG "/etc/sgml/xml-simple-docbook-1.0.cat" +CATALOG "/etc/sgml/openjade-1.3.2.cat" diff --git a/texmf/ls-R b/texmf/ls-R index cd14e71..5882c9c 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -66,8 +66,8 @@ language.texlive-langgerman.def 80jadetex.cnf ./updmap.d: -.keep_app-text_texlive-core-0 00updmap.cfg +.keep_app-text_texlive-core-0 texlive-basic.cfg texlive-context.cfg texlive-fontsextra.cfg @@ -84,8 +84,8 @@ texlive-pictures.cfg texlive-science.cfg ./web2c: -.keep_app-text_texlive-core-0 fmtutil.cnf +.keep_app-text_texlive-core-0 texmf.cnf updmap.cfg -- 2.39.5