Author: fernando Date: Wed Feb 3 09:22:58 2016 New Revision: 16900 Log: • mercurial-3.7: try to improve the text and minor reformats. • Update to nss-3.22. • Update to iso-codes-3.65.
Modified: trunk/BOOK/general.ent trunk/BOOK/general/genutils/iso-codes.xml trunk/BOOK/general/prog/mercurial.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/packages.ent trunk/BOOK/postlfs/security/nss.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Tue Feb 2 12:07:17 2016 (r16899) +++ trunk/BOOK/general.ent Wed Feb 3 09:22:58 2016 (r16900) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "02"> <!-- Always 2 digits --> +<!ENTITY day "03"> <!-- Always 2 digits --> <!ENTITY month "02"> <!-- Always 2 digits --> <!ENTITY year "2016"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "February 2nd &year;"> +<!ENTITY releasedate "February 3rd &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY lfs-version "development"> <!-- x.y|development] --> Modified: trunk/BOOK/general/genutils/iso-codes.xml ============================================================================== --- trunk/BOOK/general/genutils/iso-codes.xml Tue Feb 2 12:07:17 2016 (r16899) +++ trunk/BOOK/general/genutils/iso-codes.xml Wed Feb 3 09:22:58 2016 (r16900) @@ -4,12 +4,9 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; -<!-- -<!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz";> ---> - <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz";> + <!ENTITY iso-codes-download-http "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz";> <!ENTITY iso-codes-download-ftp " "> - <!ENTITY iso-codes-md5sum "01c02633ede9d6fdf4b5f99d5dbd47b2"> + <!ENTITY iso-codes-md5sum "890a08d4f962748e0a0758a8aa471896"> <!ENTITY iso-codes-size "3.6 MB"> <!ENTITY iso-codes-buildsize "111 MB (with tests)"> <!ENTITY iso-codes-time "0.2 SBU (with tests)"> Modified: trunk/BOOK/general/prog/mercurial.xml ============================================================================== --- trunk/BOOK/general/prog/mercurial.xml Tue Feb 2 12:07:17 2016 (r16899) +++ trunk/BOOK/general/prog/mercurial.xml Wed Feb 3 09:22:58 2016 (r16900) @@ -98,9 +98,10 @@ <screen><userinput>make doc</userinput></screen> - <para>Running the test suite is optional. If some thest fails, it can be - disabled. To test the results in the subdiretory <filename - class="directory">tests/tmp</filename>, skipping failing tests, + <para>Running the test suite is optional. Tests which fail may be disabled, + adding each one to <filename>tests/blacklists/failed-tests</filename>. In + order to execute the test suite using the temporary directory <filename + class="directory">tests/tmp</filename> and skipping the failing tests, issue:</para> <screen><userinput>cat > tests/blacklists/failed-tests << "EOF" @@ -109,7 +110,9 @@ test-convert-hg-svn.t test-gpg.t</literal> EOF + rm -rf tests/tmp && + TESTFLAGS="-j<replaceable><N></replaceable> --tmpdir tmp --blacklist blacklists/failed-tests" \ make check</userinput></screen> @@ -121,21 +124,25 @@ Running the following commands, you will execute only the tests that failed before:</para> -<screen><userinput>pushd tests && -rm -rf tmp && -./run-tests.py --debug --tmpdir tmp \ - test-convert-svn-source.t \ - test-convert-hg-svn.t \ - test-gpg.t && +<screen><userinput>pushd tests && + rm -rf tmp && + + ./run-tests.py --debug --tmpdir tmp \ + test-convert-svn-source.t \ + test-convert-hg-svn.t \ + test-gpg.t && popd</userinput></screen> - <para>Normally, failures will be repeated. However, if you add the switch - "--debug" before "--tmpdir", and run again, the failures are gone. Normally, - from now on, there will be no more failure whether you use the debug switch - or not. An interesting switch is "--time", which will generated at the end - of the test suite execution, a table with all executed tests and respective - start, end, user, system and real times. Notice that the switches may be - used with <command>make check</command>, in the + <para>Normally, the previous failures will be confirmed. However, if you add + the switch "--debug" before "--tmpdir", and run again, some failures are + gone, which seems to be a problem with the test suite. If this happens, + normally, from now on, there will be no more such failures whether you use + the debug switch or not.</para> + + <para>An interesting switch is "--time", which will generated at the end of + the test suite execution, a table with all executed tests and respective + start, end, user, system and real times. Notice that the switches may be + used with <command>make check</command>, including them in the <envar>TESTFLAGS</envar> environment variable.</para> <para>Install <application>Mercurial</application> by running the following @@ -153,7 +160,7 @@ <screen><userinput>cat >> ~/.hgrc << "EOF" <literal>[ui] -username = <user_name> <your@mail></literal> +username = <replaceable><user_name> <user@mail></replaceable></literal> EOF</userinput></screen> <para>where you must replace <user_name> and <your@mail> (mail @@ -184,21 +191,18 @@ <primary sortas="e-AA.hgrc">~/.hgrc</primary> </indexterm> - <para> - A great majority of extensions are disabled by default. Run <command>hg - help extensions</command> if you need to enable any, e.g. when - investigating test failures, and use one of the configuration files to - enable it. - </para> - - <para> - If you have installed the <xref linkend="cacerts"/> and you want - <application>Mercurial</application> to use them, as the - <systemitem class="username">root</systemitem> user: - </para> + <para>The great majority of extensions are disabled by default. Run + <command>hg help extensions</command> if you need to enable any, e.g. + when investigating test failures. You will obtain the lists of enabled and + disabled extensions, and more information, such as how to enable or + disable them using configuration files.</para> + + <para>If you have installed the <xref linkend="cacerts"/> and want + <application>Mercurial</application> to use them, as the <systemitem + class="username">root</systemitem> user, issue:</para> <screen role="root"><userinput>install -v -d -m755 /etc/mercurial && -cat > /etc/mercurial/hgrc << "EOF" +cat >> /etc/mercurial/hgrc << "EOF" <literal>[web] cacerts = /etc/ssl/ca-bundle.crt</literal> EOF</userinput></screen> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Tue Feb 2 12:07:17 2016 (r16899) +++ trunk/BOOK/introduction/welcome/changelog.xml Wed Feb 3 09:22:58 2016 (r16900) @@ -45,6 +45,20 @@ --> <listitem> + <para>February 3rd, 2016</para> + <itemizedlist> + <listitem> + <para>[fernando] - Update to iso-codes-3.65. Fixes + <ulink url="&blfs-ticket-root;7423 ">#7423 </ulink>.</para> + </listitem> + <listitem> + <para>[fernando] - Update to nss-3.22. Fixes + <ulink url="&blfs-ticket-root;7422 ">#7422 </ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>February 2nd, 2016</para> <itemizedlist> <listitem> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Tue Feb 2 12:07:17 2016 (r16899) +++ trunk/BOOK/packages.ent Wed Feb 3 09:22:58 2016 (r16900) @@ -24,7 +24,7 @@ <!ENTITY mitkrb-major-version "1.14"> <!ENTITY mitkrb-version "&mitkrb-major-version;"> <!ENTITY nettle-version "3.2"> -<!ENTITY nss-minor-version "21"> +<!ENTITY nss-minor-version "22"> <!-- normal <!ENTITY nss-micro-version "1"> <!ENTITY nss-version "3.&nss-minor-version;.&nss-micro-version;"> @@ -100,7 +100,7 @@ <!ENTITY icu-version "&icu-major;.&icu-minor;"><!-- .&icu-patch;--> <!ENTITY icu-dl-version "&icu-major;_&icu-minor;"><!-- _&icu-patch;--> -<!ENTITY iso-codes-version "3.64"> +<!ENTITY iso-codes-version "3.65"> <!ENTITY JS-version "17.0.0"> <!ENTITY JS2-version "24.2.0"> <!ENTITY json-c-version "0.12"> Modified: trunk/BOOK/postlfs/security/nss.xml ============================================================================== --- trunk/BOOK/postlfs/security/nss.xml Tue Feb 2 12:07:17 2016 (r16899) +++ trunk/BOOK/postlfs/security/nss.xml Wed Feb 3 09:22:58 2016 (r16900) @@ -14,7 +14,7 @@ <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";> <!--<!ENTITY nss-download-ftp "ftp://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";> --> - <!ENTITY nss-md5sum "3c8b2ed880dd3a8d86c9e0151afe6eba"> + <!ENTITY nss-md5sum "07dfe5bed80cf44caa9a06e8eb043742"> <!ENTITY nss-size "6.7 MB"> <!ENTITY nss-buildsize "91 MB"> <!ENTITY nss-time "0.9 SBU"> @@ -126,12 +126,13 @@ <screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch && cd nss && -make BUILD_OPT=1 \ + +make -j1 BUILD_OPT=1 \ NSPR_INCLUDE_DIR=/usr/include/nspr \ USE_SYSTEM_ZLIB=1 \ ZLIB_LIBS=-lz \ $([ $(uname -m) = x86_64 ] && echo USE_64=1) \ - $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) -j1</userinput></screen> + $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)</userinput></screen> <para> This package does not come with a test suite. @@ -141,14 +142,19 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>cd ../dist && -install -v -m755 Linux*/lib/*.so /usr/lib && -install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib && -install -v -m755 -d /usr/include/nss && -cp -v -RL {public,private}/nss/* /usr/include/nss && -chmod -v 644 /usr/include/nss/* && +<screen role="root"><userinput>cd ../dist && + +install -v -m755 Linux*/lib/*.so /usr/lib && +install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib && + +install -v -m755 -d /usr/include/nss && +cp -v -RL {public,private}/nss/* /usr/include/nss && +chmod -v 644 /usr/include/nss/* && + install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} /usr/bin && -install -v -m644 Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig</userinput></screen> + +install -v -m644 Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig +</userinput></screen> </sect2> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
