Current state

diff --git a/cups/printers.conf b/cups/printers.conf
index f009e8fbb8a69ffb8bb855d5030b0ccf03c64037..8abb40e9a22bd999f99acda8a681d08c002f8a10 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.6.4
-# Written by cupsd on 2014-02-09 17:40
+# Written by cupsd on 2014-02-11 00:05
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 6ea85611507aed3c117d5ce2b786aac726d91c37..18c17e2d863c79808adb1105967f240563a99e61 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2944,39 +2944,39 @@
                        </dir>
                        <dir name="url-handlers">
                                <dir name="ymsgr">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
                                </dir>
                                <dir name="xmpp">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
                                </dir>
                                <dir name="sip">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
                                </dir>
                                <dir name="msnim">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
                                </dir>
                                <dir name="irc">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
                                </dir>
                                <dir name="icq">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
                                </dir>
                                <dir name="gg">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
                                </dir>
                                <dir name="icyx">
                                        <entry name="enabled" mtime="1359455568" schema="/schemas/desktop/gnome/url-handlers/icyx/enabled"/>
@@ -3049,9 +3049,9 @@
                                        <entry name="enabled" mtime="1348087078" schema="/schemas/desktop/gnome/url-handlers/callto/enabled"/>
                                </dir>
                                <dir name="aim">
-                                       <entry name="needs_terminal" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
-                                       <entry name="command" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
-                                       <entry name="enabled" mtime="1391014470" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
+                                       <entry name="command" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
+                                       <entry name="enabled" mtime="1392039648" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
                                </dir>
                                <dir name="mailto">
                                        <entry name="needs_terminal" mtime="1348087078" schema="/schemas/desktop/gnome/url-handlers/mailto/needs_terminal"/>
@@ -18190,13 +18190,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18206,13 +18204,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18222,13 +18218,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18238,13 +18232,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18254,13 +18246,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18270,13 +18260,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18286,13 +18274,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18302,13 +18288,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18318,13 +18302,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18334,13 +18316,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18350,13 +18330,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18366,13 +18344,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18382,13 +18358,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18398,13 +18372,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18414,13 +18386,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18430,13 +18400,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18446,13 +18414,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18462,13 +18428,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18478,13 +18442,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18494,13 +18456,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18510,13 +18470,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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="1391260280" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20244,13 +20202,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                                <dir name="url-handlers">
                                        <dir name="ymsgr">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;ymsgr&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20258,7 +20216,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;ymsgr&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;ymsgr&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;ymsgr&quot; URLs.</longdesc>
@@ -20266,13 +20224,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="xmpp">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;xmpp&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20280,7 +20238,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;xmpp&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;xmpp&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;xmpp&quot; URLs.</longdesc>
@@ -20288,13 +20246,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="sip">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;sip&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20302,7 +20260,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;sip&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;sip&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;sip&quot; URLs.</longdesc>
@@ -20310,13 +20268,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="msnim">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;msnim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20324,7 +20282,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;msnim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;msnim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;msnim&quot; URLs.</longdesc>
@@ -20332,13 +20290,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="irc">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;irc&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20346,7 +20304,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;irc&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;irc&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;irc&quot; URLs.</longdesc>
@@ -20354,13 +20312,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="icq">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;icq&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20368,7 +20326,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;icq&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;icq&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;icq&quot; URLs.</longdesc>
@@ -20376,13 +20334,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="gg">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;gg&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20390,7 +20348,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;gg&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;gg&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;gg&quot; URLs.</longdesc>
@@ -20676,13 +20634,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="aim">
-                                               <entry name="needs_terminal" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1391014470" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1392039648" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;aim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20690,7 +20648,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;aim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1391014470" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1392039648" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;aim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;aim&quot; URLs.</longdesc>

diff --git a/openvpn/hidrive/ca.drive.strato.com.crt b/openvpn/hidrive/ca.drive.strato.com.crt
new file mode 100644 (file)
index 0000000..f72c940
--- /dev/null
+++ b/openvpn/hidrive/ca.drive.strato.com.crt
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----\r
+MIIEOzCCAyOgAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJERTEP\r
+MA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xIDAeBgNVBAoTF1N0cmF0\r
+byBSZWNoZW56ZW50cnVtIEFHMSMwIQYDVQQDExpTdHJhdG8gUmVjaGVuemVudHJ1\r
+bSBBRyBDQTAeFw0wOTA5MTExMDQzMTFaFw0yOTA5MTExMDQzMTFaMHYxCzAJBgNV\r
+BAYTAkRFMQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjEgMB4GA1UE\r
+ChMXU3RyYXRvIFJlY2hlbnplbnRydW0gQUcxIzAhBgNVBAMTGlN0cmF0byBSZWNo\r
+ZW56ZW50cnVtIEFHIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\r
+0Pe72T2CTfhv9nNkpmMJuV/oEb7UCJO3f3Z47Hk3O8xd/rzyFvYjmOPFiHt5rHdj\r
+QcqmBiWUKGdvcWsC/brK9KfBx4BPKc/yUrlWx8Kscsc1omYdbCdcGOJFbxJLGkSB\r
+K8j3ebuUdb+Lx9EpzKrDvYcteCraI0X/VyT6Uwdaw6hpNvyNnzpcf3NzmF8X4Fug\r
+CDMUpe8YRg+leaQe++To6Ef73Ikia99R6guEk2NErO9HLwCLzlK55ICPMAenywAV\r
+uAvKP0gp0cywyjZ5pGjDNXFlsfUyKhQYdtsoGcs6I3qrCnu20Qdt2EPgttCtJcP0\r
+mcqzb7zrBjAbGNxqfgDOIQIDAQABo4HTMIHQMB0GA1UdDgQWBBQAGsZhcOA1JR9P\r
+oRII3HNb6eTIqDCBoAYDVR0jBIGYMIGVgBQAGsZhcOA1JR9PoRII3HNb6eTIqKF6\r
+pHgwdjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy\r
+bGluMSAwHgYDVQQKExdTdHJhdG8gUmVjaGVuemVudHJ1bSBBRzEjMCEGA1UEAxMa\r
+U3RyYXRvIFJlY2hlbnplbnRydW0gQUcgQ0GCAQAwDAYDVR0TBAUwAwEB/zANBgkq\r
+hkiG9w0BAQUFAAOCAQEAVPK504dvYp5n5tcejFNNdaoZi1+9uNqaBzJRrMRyZG0w\r
+ufZZy5hvtWThF+OfQscmdGXbsAN+eld+/c1S7xgpgCbFFjZIh+Yc3D8eUuTMniYH\r
+v6Ih+80BwfvWQ9ZekOyouoc/g7XvhZib7nzq0KIPIQbY/D5oFVPOjGqN0m2tU0Li\r
+h0o5L1p0ABPXKSyIPW7tFhxmnQId990RzB3NSqd9dkJKIm1OIdv9GFfbFHRDheYs\r
+66bv79XSkLxeF1/McNxtH76oB8DktSowzt1lcMgosa8KCcWUa4FxgS8Zn33lA6Q0\r
+SWuvizaQgM0AFFHk8s1nPlSeXRDu0+uPpMOpaQ50qg==\r
+-----END CERTIFICATE-----\r

diff --git a/openvpn/hidrive/frank.brehm.credentials b/openvpn/hidrive/frank.brehm.credentials
new file mode 100644 (file)
index 0000000..7ff0828
--- /dev/null
+++ b/openvpn/hidrive/frank.brehm.credentials
@@ -0,0 +1,2 @@
+frank.brehm
+5eZXG-Ec

diff --git a/openvpn/hidrive/hidrive.strato.com.ovpn b/openvpn/hidrive/hidrive.strato.com.ovpn
new file mode 100644 (file)
index 0000000..1d96f70
--- /dev/null
+++ b/openvpn/hidrive/hidrive.strato.com.ovpn
@@ -0,0 +1,8 @@
+dev tun\r
+client\r
+remote openvpn.hidrive.strato.com\r
+auth-user-pass /etc/openvpn/hidrive/frank.brehm.credentials\r
+auth-retry interact\r
+ca /etc/openvpn/hidrive/ca.drive.strato.com.crt\r
+tls-auth /etc/openvpn/hidrive/tls-auth.key\r
+ns-cert-type server\r

diff --git a/openvpn/hidrive/tls-auth.key b/openvpn/hidrive/tls-auth.key
new file mode 100644 (file)
index 0000000..396172c
--- /dev/null
+++ b/openvpn/hidrive/tls-auth.key
@@ -0,0 +1,21 @@
+#\r
+# 2048 bit OpenVPN static key\r
+#\r
+-----BEGIN OpenVPN Static key V1-----\r
+aa21c5facb594491bc40959f73ff1f79\r
+be815195f2b9b22d3c672e9580db574a\r
+ada6fa5e22a9be42c744b91fe988f4fc\r
+582480ae85ea00fd59b60757d7cf859d\r
+ceb3ca0f35b0ba9af1947521de78a917\r
+7947ffb55a1fef3d800779fac89d2879\r
+fe9f8fd87a99b1f82561ab9b2e91e5c2\r
+e788f92016f5f47ba1ff158897a26a5c\r
+79f627de5c48a9828c0ca4df34b5ef40\r
+eab016669f28e0c84ed6c7974a12ec19\r
+15a16e213d4a70832c85b59ccc74277f\r
+da3309006c90289f1fca2c726eada188\r
+3a86299a865149b7e178ad6235e1a153\r
+775896594296ff24d2ab63f881021a2b\r
+8a23e100df2153e332c0d0bb555185eb\r
+2da94fd9b2b1b950acd075044607eddf\r
+-----END OpenVPN Static key V1-----\r

diff --git a/portage/make.conf b/portage/make.conf
index 884ef1370329e854a235c15fcd64a08668dbdb2e..3c66d5f655784d7ef30289421ba68c4aab7fa8f6 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -40,7 +40,8 @@ ACCEPT_LICENSE=" \
        Oracle-BCLA-JavaSE \
 "
 
-EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=2 --load-average=8 --ignore-built-slot-operator-deps=y"
+#EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8"
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8 --ignore-built-slot-operator-deps=y"
 #EMERGE_DEFAULT_OPTS="--with-bdeps y --load-average=10 --ignore-built-slot-operator-deps=y"
 #EMERGE_DEFAULT_OPTS="--with-bdeps y"