Changeset d445316


Ignore:
Timestamp:
05/03/2020 02:20:59 AM (2 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
10.0, 10.1, 11.0, 11.1, lazarus, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
3a833af
Parents:
8ddf6d5
Message:

Update to Mercurial-5.4 (and convert it to Python3)
Update to NSS-3.52

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23066 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • general/prog/mercurial.xml

    r8ddf6d5 rd445316  
    77  <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
    88  <!ENTITY mercurial-download-ftp  " ">
    9   <!ENTITY mercurial-md5sum        "824b839a6e948844b81c757968f888bc">
    10   <!ENTITY mercurial-size          "7.2 MB">
    11   <!ENTITY mercurial-buildsize     "78 MB (with docs, add 1.0 GB for tests)">
    12   <!ENTITY mercurial-time          "0.5 SBU (with docs, add 11 SBU for tests using -j4)">
     9  <!ENTITY mercurial-md5sum        "0859029d0bb54bcf7c583c55680573cb">
     10  <!ENTITY mercurial-size          "7.4 MB">
     11  <!ENTITY mercurial-buildsize     "112 MB (with docs, add 1.1 GB for tests)">
     12  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 17 SBU for tests using -j4)">
    1313]>
    1414
     
    7676    <bridgehead renderas="sect3">Mercurial Dependencies</bridgehead>
    7777
     78    <!--
    7879    <bridgehead renderas="sect4">Required</bridgehead>
    7980    <para role="required">
    8081      <xref linkend="python2"/>
    8182    </para>
     83    -->
    8284
    8385    <bridgehead renderas="sect4">Optional</bridgehead>
     
    9092      (runtime, to access ssh://... repositories),
    9193    <xref linkend="pygments"/>,
     94    <xref linkend="rust"/>,
    9295    <xref linkend="subversion"/> (with Python bindings),
    9396    <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
    9497    <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
    9598    <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
    96     <ulink url="https://github.com/pyca/pyopenssl">pyOpenSSL</ulink>
     99    <ulink url="https://www.pyopenssl.org/en/stable/">pyOpenSSL</ulink>
    97100
    98101    </para>
     
    105108  <sect2 role="installation">
    106109    <title>Installation of Mercurial</title>
    107     <!-- seems to have a development rust port -->
     110    <!-- Rust port is now part of the standard tests -->
     111
     112    <para>
     113      First, force the build system to use Python 3:
     114    </para>
     115
     116<screen><userinput remap="pre">export PYTHON=python3</userinput></screen>
    108117
    109118    <para>
     
    118127    </para>
    119128
    120 <screen remap="doc"><userinput>2to3 -w doc/hgmanpage.py &amp;&amp;
    121 PYTHON=python3 make doc</userinput></screen>
     129<screen remap="doc"><userinput>make doc</userinput></screen>
    122130
    123131    <para>
    124132      To run the test suite, issue:
    125133    </para>
    126 <screen remap="test"><userinput>rm -rf tests/tmp &amp;&amp;
    127 TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
     134<screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
    128135<!-- The blacklists have to be checked every release of Mercurial, do a listing
    129136     of tests/blacklists, but do not include the makefile. -->
     
    150157      seems to be a problem with the test suite. If this happens, normally,
    151158      from now on, there will be no more such failures whether you use the
    152       debug switch or not. Three tests, test-alias.t, test-install.t, and
    153       test-bundle2-exchange.t (intermittently), are known to fail.
     159      debug switch or not. One test, test-doctest.py, is known to fail.
    154160    </para>
    155161
     
    176182<screen role="root"
    177183        remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
     184
     185    <para>
     186      Next, clean up the environment variable set earlier:
     187    </para>
     188
     189<screen><userinput>unset PYTHON</userinput></screen>
    178190
    179191    <para>
     
    198210  </sect2>
    199211
     212<!--
    200213  <sect2 role="commands">
    201214    <title>Command Explanations</title>
     
    207220      </para>
    208221
    209   </sect2>
     222   </sect2>
     223-->
     224   
    210225  <sect2 role="configuration">
    211226    <title>Configuring Mercurial</title>
     
    265280        <seg>
    266281          several internal modules under
    267           /usr/lib/python&python2-majorver;/site-packages/mercurial
     282          /usr/lib/python&python3-majorver;/site-packages/mercurial
    268283        </seg>
    269284        <seg>
    270285          /etc/mercurial and
    271           /usr/lib/python&python2-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
     286          /usr/lib/python&python3-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
    272287        </seg>
    273288      </seglistitem>
  • introduction/welcome/changelog.xml

    r8ddf6d5 rd445316  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[renodr] - Update to Mercurial-5.4. Fixes
     49          <ulink url="&blfs-ticket-root;13491">#13491</ulink>.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[renodr] - Update to nss-3.52. Fixes
     53          <ulink url="&blfs-ticket-root;13489">#13489</ulink>.</para>
     54        </listitem>
     55        <listitem>
    4856          <para>[thomas] - Upgrade xterm-355. Fixes
    4957          <ulink url="&blfs-ticket-root;13492">#13492</ulink>.</para>
  • packages.ent

    r8ddf6d5 rd445316  
    2929
    3030<!ENTITY nss-minor-version            "51">
    31 <!ENTITY nss-micro-version            "1">
    32 <!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">
    33 <!--<!ENTITY nss-version                  "3.&nss-minor-version;">-->
     31<!ENTITY nss-micro-version            "0">
     32<!--<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">-->
     33<!ENTITY nss-version                  "3.&nss-minor-version;">
    3434<!ENTITY openssh-version              "8.2p1">
    3535<!-- <!ENTITY openssl-version              "1.1.0g"> -->
     
    338338<!ENTITY lua-version                  "5.3.5">
    339339<!ENTITY lua52-version                "5.2.4">
    340 <!ENTITY mercurial-version            "5.3.2">
     340<!ENTITY mercurial-version            "5.4">
    341341<!ENTITY nasm-version                 "2.14.02">
    342342<!ENTITY ninja-version                "1.9.0">
  • postlfs/security/nss.xml

    r8ddf6d5 rd445316  
    99
    1010<!-- micro versions -->
    11 <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
    12 
    13 <!-- no micro versions
    14 <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
     11<!--<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">-->
     12
     13<!-- no micro versions -->
     14  <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
    1515
    1616  <!ENTITY nss-download-ftp " ">
    17   <!ENTITY nss-md5sum        "6acaf1ddff69306ae30a908881c6f233">
     17  <!ENTITY nss-md5sum        "b28ac9330eefd5b25be661748aad75c0">
    1818  <!ENTITY nss-size          "75 MB">
    1919  <!-- 50 MB increase is due to new test files, see #12187 -->
    20   <!ENTITY nss-buildsize     "268 MB">
    21   <!ENTITY nss-time          "4.2 SBU">
     20  <!ENTITY nss-buildsize     "294 MB">
     21  <!ENTITY nss-time          "5.2 SBU">
    2222]>
    2323
     
    252252        <seg>
    253253          libcrmf.a, libfreebl3.so, libfreeblpriv3.so, libgtest1.so,
    254           libgtestutil.so, libnss3.so, libnssckbi.so, libnssdbm3.so,
    255           libnsssysinit.so, libnssutil3.so, libsmime3.so, libsoftokn3.so,
     254          libgtestutil.so, libnss3.so, libnssckbi.so, libnssckbi-testlib.so,
     255          libnssdbm3.so, libnsssysinit.so, libnssutil3.so,
     256          libpkcs11testmodule.so, libsmime3.so, libsoftokn3.so,
    256257          and libssl3.so
    257258        </seg>
Note: See TracChangeset for help on using the changeset viewer.