Author: cjg Date: Sun Oct 5 18:57:30 2014 New Revision: 14511 Log: Merge more updates from trunk.
Modified: branches/systemd/general/prog/mercurial.xml branches/systemd/packages.ent branches/systemd/postlfs/security/p11-kit.xml branches/systemd/x/installing/xcb-util-keysyms.xml Modified: branches/systemd/general/prog/mercurial.xml ============================================================================== --- branches/systemd/general/prog/mercurial.xml Sun Oct 5 18:39:49 2014 (r14510) +++ branches/systemd/general/prog/mercurial.xml Sun Oct 5 18:57:30 2014 (r14511) @@ -6,10 +6,10 @@ <!ENTITY mercurial-download-http "http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz";> <!ENTITY mercurial-download-ftp " "> - <!ENTITY mercurial-md5sum "5a530bb472b3cb306b757c8f5df91358"> - <!ENTITY mercurial-size "3.8 MB"> - <!ENTITY mercurial-buildsize "31 MB (additional 250 MB for the tests and 2 MB for docs generation)"> - <!ENTITY mercurial-time "0.1 SBU (additional 8.8 SBU for tests)"> + <!ENTITY mercurial-md5sum "72a79798de828d6d6fb055273f91201a"> + <!ENTITY mercurial-size "3.9 MB"> + <!ENTITY mercurial-buildsize "44 MB (additional 250 MB for the tests and 2 MB for docs generation)"> + <!ENTITY mercurial-time "0.1 SBU (additional 9 SBU for tests)"> ]> <sect1 id="mercurial" xreflabel="Mercurial-&mercurial-version;"> @@ -112,8 +112,17 @@ TESTFLAGS="--tmpdir tmp --blacklist blacklists/test-failed" \ make check</userinput></screen> - <para>Tests may be run in parallel, just add - <quote>-j$(getconf _NPROCESSORS_ONLN)</quote> to TESTFLAGS.</para> + <para>More failing tests might be added to that file, if necessary. Tests + may be run in parallel, just add <quote>-j$(getconf + _NPROCESSORS_ONLN)</quote> to TESTFLAGS. In order to investigate a + particular apparently failing test, e.g <quote>test-parse-date.t</quote>, + issue the following commands (notice that omitting <option>--debug</option> + sometimes modifies the result):</para> + +<screen><userinput>pushd tests && +rm -rf tmp && +./run-tests.py --debug --tmpdir tmp test-parse-date.t && +popd</userinput></screen> <para>Install <application>Mercurial</application> by running the following command (as <systemitem class="username">root</systemitem>):</para> Modified: branches/systemd/packages.ent ============================================================================== --- branches/systemd/packages.ent Sun Oct 5 18:39:49 2014 (r14510) +++ branches/systemd/packages.ent Sun Oct 5 18:57:30 2014 (r14511) @@ -30,7 +30,7 @@ <!ENTITY nss-version "3.&nss-minor-version;"> <!ENTITY openssh-version "6.6p1"> <!ENTITY openssl-version "1.0.1i"> -<!ENTITY p11-kit-version "0.20.7"> <!-- Even minors only --> +<!ENTITY p11-kit-version "0.22.0"> <!-- Even minors only --> <!ENTITY polkit-version "0.112"> <!ENTITY shadow-version "4.2.1"> <!ENTITY ssh-askpass-version "&openssh-version;"> @@ -261,7 +261,7 @@ <!ENTITY librep-version "0.92.3"> <!ENTITY llvm-version "3.5.0"> <!ENTITY lua-version "5.2.3"> -<!ENTITY mercurial-version "3.1.1"> +<!ENTITY mercurial-version "3.1.2"> <!ENTITY nasm-version "2.11.05"> <!ENTITY npapi-sdk-version "0.27.2"> <!ENTITY php-version "5.6.0"> @@ -436,7 +436,7 @@ <!ENTITY mesalib-version "10.3.0"> <!ENTITY xcb-util-version "0.3.9"> <!ENTITY xcb-util-image-version "0.3.9"> -<!ENTITY xcb-util-keysyms-version "0.3.9"> +<!ENTITY xcb-util-keysyms-version "0.4.0"> <!ENTITY xcb-util-renderutil-version "0.3.9"> <!ENTITY xcb-util-wm-version "0.4.1"> <!ENTITY xorg-server-version "1.16.1"> Modified: branches/systemd/postlfs/security/p11-kit.xml ============================================================================== --- branches/systemd/postlfs/security/p11-kit.xml Sun Oct 5 18:39:49 2014 (r14510) +++ branches/systemd/postlfs/security/p11-kit.xml Sun Oct 5 18:57:30 2014 (r14511) @@ -6,10 +6,10 @@ <!ENTITY p11-kit-download-http "http://p11-glue.freedesktop.org/releases/p11-kit-&p11-kit-version;.tar.gz";> <!ENTITY p11-kit-download-ftp " "> - <!ENTITY p11-kit-md5sum "6648cad01a3080b685b8b3bf7372c91a"> + <!ENTITY p11-kit-md5sum "2799d5d2817c895227d59cbf8516b7ff"> <!ENTITY p11-kit-size "964 KB"> - <!ENTITY p11-kit-buildsize "38.9 MB (additional 7.6 MB for tests)"> - <!ENTITY p11-kit-time "0.4 SBU (additional 0.1 SBU for tests)"> + <!ENTITY p11-kit-buildsize "82 MB (additional 5 MB for tests)"> + <!ENTITY p11-kit-time "0.5 SBU"> ]> <sect1 id="p11-kit" xreflabel="p11-kit-&p11-kit-version;"> Modified: branches/systemd/x/installing/xcb-util-keysyms.xml ============================================================================== --- branches/systemd/x/installing/xcb-util-keysyms.xml Sun Oct 5 18:39:49 2014 (r14510) +++ branches/systemd/x/installing/xcb-util-keysyms.xml Sun Oct 5 18:57:30 2014 (r14511) @@ -7,8 +7,8 @@ <!ENTITY xcb-util-keysyms-download-http "http://xcb.freedesktop.org/dist/xcb-util-keysyms-&xcb-util-keysyms-version;.tar.bz2";> <!ENTITY xcb-util-keysyms-download-ftp " "> - <!ENTITY xcb-util-keysyms-md5sum "64e4aad2d48cd4a92e2da13b9f35bfd2"> - <!ENTITY xcb-util-keysyms-size "280 KB"> + <!ENTITY xcb-util-keysyms-md5sum "1022293083eec9e62d5659261c29e367"> + <!ENTITY xcb-util-keysyms-size "284 KB"> <!ENTITY xcb-util-keysyms-buildsize "2.2 MB"> <!ENTITY xcb-util-keysyms-time "less than 0.1 SBU"> ]> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
