Changeset 32cea200


Ignore:
Timestamp:
04/27/2021 03:07:07 PM (6 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/usr-move
Children:
15c2f37
Parents:
c2c41b1 (diff), c461bd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into xry111/usr-move

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • INSTALL

    rc2c41b1 r32cea200  
    77submission to the lfs-book or lfs-dev mailing lists, then you do not need this
    88document.  Instead, you need to read the LFS Editor's Manual.  See the LFS
    9 website at http://www.linuxfromscratch.org for more information.
     9website at https://www.linuxfromscratch.org for more information.
    1010
    1111-------------------------------------------------------------------------------
     
    1414
    1515* libxml2
    16   - http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html
     16  - https://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html
    1717
    1818* libxslt
    19   - http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html
     19  - https://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html
    2020
    2121* DocBook DTD
    22   - http://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html
     22  - https://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html
    2323
    2424* DocBook XSL Stylesheets
    25   - http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
     25  - https://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
    2626
    2727* HTMLTidy
    28   - http://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html
     28  - https://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html
    2929
    3030-------------------------------------------------------------------------------
     
    3434
    3535* lynx
    36   - http://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html
     36  - https://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html
    3737
    3838-------------------------------------------------------------------------------
     
    4242
    4343* JDK
    44   - http://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html
     44  - https://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html
    4545
    4646* FOP and JAI
    47   - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
     47  - https://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
  • chapter01/changelog.xml

    rc2c41b1 r32cea200  
    4545
    4646    <listitem>
     47      <para>2021-04-26</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[bdubbs] - Update to vim-8.2.2812. Addresses
     51          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[bdubbs] - Update to iana-etc-20210407. Addresses
     55          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[bdubbs] - Update to Python3-3.9.4. Fixes
     59          <ulink url="&lfs-ticket-root;4843">#4843</ulink>.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[bdubbs] - Update to meson-0.57.2. Fixes
     63          <ulink url="&lfs-ticket-root;4846">#4846</ulink>.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[bdubbs] - Update to linux-5.11.16. Addresses
     67          <ulink url="&lfs-ticket-root;4840">#4840</ulink>.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[bdubbs] - Update to less-581. Fixes
     71          <ulink url="&lfs-ticket-root;4849">#4849</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Update to file-5.40. Fixes
     75          <ulink url="&lfs-ticket-root;4839">#4839</ulink>.</para>
     76        </listitem>
     77        <listitem>
     78          <para>[bdubbs] - Update to bc-4.0.1. Fixes
     79          <ulink url="&lfs-ticket-root;4845">#4845</ulink>.</para>
     80        </listitem>
     81      </itemizedlist>
     82    </listitem>
     83
     84    <listitem>
    4785      <para>2021-04-22</para>
    4886      <itemizedlist>
  • chapter01/resources.xml

    rc2c41b1 r32cea200  
    6868    <para>For additional information on the packages, useful tips are
    6969    available in the LFS Package Reference page located at <ulink
    70     url="http://www.linuxfromscratch.org/~matthew/LFS-references.html"/>.</para>
     70    url="https://www.linuxfromscratch.org/~matthew/LFS-references.html"/>.</para>
    7171
    7272  </sect2>  -->
  • chapter01/whatsnew.xml

    rc2c41b1 r32cea200  
    8585       <para>Expect-&expect-version;</para>
    8686    </listitem>-->
    87     <!--<listitem>
     87    <listitem>
    8888       <para>File-&file-version;</para>
    89     </listitem>-->
     89    </listitem>
    9090    <!--<listitem>
    9191      <para>Findutils-&findutils-version;</para>
     
    145145      <para>Kmod-&kmod-version;</para>
    146146    </listitem>-->
    147     <!--<listitem>
     147    <listitem>
    148148      <para>Less-&less-version;</para>
    149     </listitem>-->
     149    </listitem>
    150150    <!--<listitem>
    151151      <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     
    181181      <para>Man-pages-&man-pages-version;</para>
    182182    </listitem>
    183     <!--<listitem>
     183    <listitem>
    184184      <para>Meson-&meson-version;</para>
    185     </listitem>-->
     185    </listitem>
    186186    <!--<listitem>
    187187      <para>MPC-&mpc-version;</para>
     
    214214      <para>Psmisc-&psmisc-version;</para>
    215215    </listitem>-->
    216     <!--<listitem>
     216    <listitem>
    217217      <para>Python-&python-version;</para>
    218     </listitem>-->
     218    </listitem>
    219219    <!--<listitem>
    220220      <para>Readline-&readline-version;</para>
  • chapter03/introduction.xml

    rc2c41b1 r32cea200  
    6161      <para>For stable versions of the book, a tarball of all the needed files
    6262      can be downloaded from one of the LFS files mirrors listed at
    63       <ulink url="http://www.linuxfromscratch.org/mirrors.html#files"/>.</para>
     63      <ulink url="https://www.linuxfromscratch.org/mirrors.html#files"/>.</para>
    6464    </listitem>
    6565    <listitem>
  • chapter08/pkgmgt.xml

    rc2c41b1 r32cea200  
    7272      use the new library version. You should not remove the previous
    7373      libraries unless all the dependent packages are recompiled.</para>
    74       </listitem> </itemizedlist>
     74      </listitem>
     75
     76      <listitem> <para>If a package containing a shared library is updated,
     77      and the name of library doesn't change, but the version number of the
     78      library <emphasis role="bold">file</emphasis> decreases (for example,
     79      the name of the library is kept named
     80      <filename class='libraryfile'>libfoo.so.1</filename>,
     81      but the name of library file is changed from
     82      <filename class='libraryfile'>libfoo.so.1.25</filename> to
     83      <filename class='libraryfile'>libfoo.so.1.24</filename>),
     84      you should remove the library file from the previously installed version
     85      (<filename class='libraryfile'>libfoo.so.1.25</filename> in the case).
     86      Or, a <command>ldconfig</command> run (by yourself using a command
     87      line, or by the installation of some package) will reset the symlink
     88      <filename class='libraryfile'>libfoo.so.1</filename> to point to
     89      the old library file because it seems having a <quote>newer</quote>
     90      version, as its version number is larger.  This situation may happen if
     91      you have to downgrade a package, or the package changes the versioning
     92      scheme of library files suddenly.</para> </listitem>
     93
     94    </itemizedlist>
    7595
    7696  </sect2>
  • chapter08/python.xml

    rc2c41b1 r32cea200  
    8989
    9090    <para>Some tests requiring a network connection or additional packages are
    91     skipped. The test named test_normalization is known to fail. For
     91    skipped. The tests test_unicodedata and test_curses tests are known to fail. For
    9292    more comprehensive results, the tests can be rerun when Python 3 is
    9393    reinstalled in BLFS.</para>
  • chapter11/reboot.xml

    rc2c41b1 r32cea200  
    2525    will allow you to easily view the BLFS book in one virtual terminal, while
    2626    building packages in another.</para></listitem>
     27
     28    <listitem><para>The
     29    <ulink url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
     30    will allow you to set up local trusted anchor certificates, allowing
     31    the system to verify SSL certificates provided by remote servers (for
     32    example, a website using HTTPS).</para></listitem>
    2733
    2834    <listitem><para>The <ulink
  • general.ent

    rc2c41b1 r32cea200  
    2121<!ENTITY generic-versiond "systemd">
    2222
    23 <!ENTITY lfs-root        "https://rivendell.linuxfromscratch.org/">
     23<!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
    2424<!ENTITY blfs-root       "&lfs-root;blfs/">
    2525<!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
     
    3939<!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
    4040
    41 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
     41<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
    4242
    4343<!ENTITY anduin-sources  "http://anduin.linuxfromscratch.org/LFS">
  • lfs-latest-git.php

    rc2c41b1 r32cea200  
    381381   global $dirs;
    382382
    383    $to      = "lfs-book@lists4.linuxfromscratch.org";
    384    $from    = "bdubbs@rivendell.linuxfromscratch.org";
     383   $to      = "lfs-book@lists.linuxfromscratch.org";
     384   $from    = "bdubbs@linuxfromscratch.org";
    385385   $subject = "LFS Package Currency Check - $date GMT";
    386    $headers = "From: bdubbs@rivendell.linuxfromscratch.org";
     386   $headers = "From: bdubbs@linuxfromscratch.org";
    387387
    388388   $message = "Package         LFS      Upstream  Flag\n\n";
  • packages.ent

    rc2c41b1 r32cea200  
    5858<!ENTITY bash-fin-sbu "1.6 SBU">
    5959
    60 <!ENTITY bc-version "3.3.4">
    61 <!ENTITY bc-size "228 KB">
     60<!ENTITY bc-version "4.0.1">
     61<!ENTITY bc-size "230 KB">
    6262<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
    63 <!ENTITY bc-md5 "1b6dd492cc1f04e3df4d83493f362768">
     63<!ENTITY bc-md5 "2e0906471bbde64d165a2f01aacd6e8a">
    6464<!ENTITY bc-home "https://git.yzena.com/gavin/bc">
    6565<!ENTITY bc-fin-du "6.7 MB">
     
    180180<!ENTITY expect-tmp-sbu "0.2 SBU">
    181181
    182 <!ENTITY file-version "5.39">
    183 <!ENTITY file-size "932 KB">
     182<!ENTITY file-version "5.40">
     183<!ENTITY file-size "981 KB">
    184184<!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
    185 <!ENTITY file-md5 "1c450306053622803a25647d88f80f25">
     185<!ENTITY file-md5 "72540ea1cc8c6e1dee35d6100ec66589">
    186186<!ENTITY file-home "https://www.darwinsys.com/file/">
    187187<!ENTITY file-tmp-du "31 MB">
     
    321321<!ENTITY gzip-fin-sbu "0.1 SBU">
    322322
    323 <!ENTITY iana-etc-version "20210304">
    324 <!ENTITY iana-etc-size "578 KB">
     323<!ENTITY iana-etc-version "20210407">
     324<!ENTITY iana-etc-size "579 KB">
    325325<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
    326 <!ENTITY iana-etc-md5 "db2d94cf0d1115c0107ae2aed966dbee">
     326<!ENTITY iana-etc-md5 "71c8c5c3f761e27a00c917bc14e765fd">
    327327<!ENTITY iana-etc-home "https://www.iana.org/protocols">
    328328<!ENTITY iana-etc-fin-du "4.7 MB">
     
    369369<!ENTITY kmod-fin-sbu "0.1 SBU">
    370370
    371 <!ENTITY less-version "563">
    372 <!ENTITY less-size "328 KB">
     371<!ENTITY less-version "581">
     372<!ENTITY less-size "341 KB">
    373373<!ENTITY less-url "https://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
    374 <!ENTITY less-md5 "1ee44fa71447a845f6eef5b3f38d2781">
     374<!ENTITY less-md5 "6201df5b9dae2af9767fc220471471b3">
    375375<!ENTITY less-home "https://www.greenwoodsoftware.com/less/">
    376376<!ENTITY less-fin-du "4.1 MB">
     
    419419<!ENTITY linux-major-version "5">
    420420<!ENTITY linux-minor-version "11">
    421 <!ENTITY linux-patch-version "10">
     421<!ENTITY linux-patch-version "16">
    422422<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    423423<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    424 <!ENTITY linux-size "114,888 KB">
     424<!ENTITY linux-size "114,893 KB">
    425425<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    426 <!ENTITY linux-md5 "a74b23a7d91e3d155062c71573d5381b">
     426<!ENTITY linux-md5 "c7536df1e1e3d03621092d732c8a5b6e">
    427427<!ENTITY linux-home "https://www.kernel.org/">
    428428<!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
     
    474474<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
    475475
    476 <!ENTITY meson-version "0.57.1">
    477 <!ENTITY meson-size "1,806 KB">
     476<!ENTITY meson-version "0.57.2">
     477<!ENTITY meson-size "1,811 KB">
    478478<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    479 <!ENTITY meson-md5 "fbd744560351491892478a36a1586815">
     479<!ENTITY meson-md5 "4a07b6d42d7a46a6b6e9604fae7da9aa">
    480480<!ENTITY meson-home "https://mesonbuild.com">
    481481<!ENTITY meson-fin-du "37 MB">
     
    575575     meson pages will be needed: python3.6 and python3.6m -->
    576576
    577 <!ENTITY python-version "3.9.2">
     577<!ENTITY python-version "3.9.4">
    578578<!ENTITY python-minor "3.9">
    579 <!ENTITY python-size "18,477 KB">
     579<!ENTITY python-size "18,458 KB">
    580580<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    581 <!ENTITY python-md5 "f0dc9000312abeb16de4eccce9a870ab">
     581<!ENTITY python-md5 "2a3dba5fc75b695c45cf1806156e1a97">
    582582<!ENTITY python-home "https://www.python.org/">
    583583<!ENTITY python-tmp-du "374 MB">
     
    586586<!ENTITY python-fin-sbu "2.8 SBU">
    587587<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    588 <!ENTITY python-docs-md5 "719cd64a4c5768b646b716df20229400">
    589 <!ENTITY python-docs-size "6,659 KB">
     588<!ENTITY python-docs-md5 "a225c583da4533c5bf98ba3555f50c7b">
     589<!ENTITY python-docs-size "6,672 KB">
    590590
    591591<!ENTITY readline-version "8.1">
     
    703703<!ENTITY util-linux-fin-sbu "1.1 SBU">
    704704
    705 <!ENTITY vim-version "8.2.2604">
     705<!ENTITY vim-version "8.2.2813">
    706706<!ENTITY vim-majmin "82">
    707707<!ENTITY vim-docdir "vim/vim82">
    708 <!ENTITY vim-size "15,084 KB">
     708<!ENTITY vim-size "15,136 KB">
    709709<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
    710710<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
    711 <!ENTITY vim-md5 "b9b50ddd0327cef5f1985b0222b8473f">
     711<!ENTITY vim-md5 "9b67782bfedb874a39eed51be65e3310">
    712712<!ENTITY vim-home "https://www.vim.org">
    713713<!ENTITY vim-fin-du "208 MB">
  • prologue/architecture.xml

    rc2c41b1 r32cea200  
    4545straightforward base Linux system. Some LFS/BLFS editors maintain a fork
    4646of LFS for multilib, which is accessible at <ulink
    47 url="http://www.linuxfromscratch.org/~thomas/multilib/index.html"/>. But it
     47url="https://www.linuxfromscratch.org/~thomas/multilib/index.html"/>. But it
    4848is an advanced topic.</para>
    4949
Note: See TracChangeset for help on using the changeset viewer.