Current state

diff --git a/dhcpcd.conf b/dhcpcd.conf
index eb625a70cbe835cac5afd9b9ec5d1cf12647839f..96eaf523c4d161a677d44a44b1a9418bc572616a 100644 (file)
--- 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 fffa858812fc860803f9a5622255e0c7015e2100..b3c84c3826e72a967f2738c96c1e94e5a6c982b9 100644 (file)
--- 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
                                                </local_schema>
                                        </entry>
                                        <dir name="image@x-samsung-srw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-rw2">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nrw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18894,254 +18900,290 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-arw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-sr2">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-srf">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sigma-x3f">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-pentax-pef">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-raw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-olympus-orf">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nef">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-minolta-mrw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-kdc">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-k25">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-dcr">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-fuji-raf">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-cr2">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-crw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-adobe-dng">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-dcraw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="application@x-ufraw">
-                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1390946305" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1390946305" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20849,16 +20891,16 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                        <dir name="thumbnailers">
                                <entry name="disable_all" mtime="1362855473" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
                                <dir name="image@x-samsung-srw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-rw2">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nrw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable"/>
                                </dir>
                                <dir name="application@x-font-otf">
                                        <entry name="enable" mtime="1362858508" schema="/schemas/desktop/gnome/thumbnailers/application@x-font-otf/enable"/>
@@ -21333,76 +21375,76 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        <entry name="enable" mtime="1362855930" schema="/schemas/desktop/gnome/thumbnailers/image@vnd.djvu/enable"/>
                                </dir>
                                <dir name="image@x-sony-arw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
                                </dir>
                                <dir name="image@x-sony-sr2">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
                                </dir>
                                <dir name="image@x-sony-srf">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
                                </dir>
                                <dir name="image@x-sigma-x3f">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
                                </dir>
                                <dir name="image@x-pentax-pef">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-raw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
                                </dir>
                                <dir name="image@x-olympus-orf">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nef">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
                                </dir>
                                <dir name="image@x-minolta-mrw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
                                </dir>
                                <dir name="image@x-kodak-kdc">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
                                </dir>
                                <dir name="image@x-kodak-k25">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
                                </dir>
                                <dir name="image@x-kodak-dcr">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
                                </dir>
                                <dir name="image@x-fuji-raf">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
                                </dir>
                                <dir name="image@x-canon-cr2">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
                                </dir>
                                <dir name="image@x-canon-crw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
                                </dir>
                                <dir name="image@x-adobe-dng">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
                                </dir>
                                <dir name="image@x-dcraw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
                                </dir>
                                <dir name="application@x-ufraw">
-                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
-                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
+                                       <entry name="command" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
+                                       <entry name="enable" mtime="1390946305" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
                                </dir>
                        </dir>
                        <dir name="interface">

diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap
index 47f1c708b5d039b6d5faec7a3ce090c53e0974a6..8a4675554697b05e12e910c5c18f592b331cbc48 100644 (file)
--- 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 5fd6263c8fa73afc7cff74cf7b74817f862e9330..17f1b10afe1ffc2d48e4bc63ffd1d00eb769bba5 100644 (file)
--- 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 d72e9b939f68961d9d750790e37b3cb2735d041c..e620b1f6cad850674cc13aa44b49aaef5a78a40c 100644 (file)
--- 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 a55a31f6e4b1016cac4cd3f668fbb5ea6b1df207..af055820fcffcfebd6936884dbb2dba6f04b1da6 100644 (file)
--- 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 (file)
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 b8ab77fcb287b7928a632640083152806cce09a3..55f29f36f9a731c84571ee48d940b87b21c41c24 100644 (file)
--- 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 cd14e71d4a9e8080dfe808e4ae3b8f2371c06f65..5882c9c234b0136fcd36ff675a3d1be4e00b7105 100644 (file)
--- 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