gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 19:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

MultiLib: Merge changes from trunk

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11828 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2020-05-02 09:15:09 +00:00
parent 0ce8c189d3
commit 0af87a35f1
5 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
chapter01/changelog.xml
View File

@ -44,6 +44,48 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem. appropriate for the entry or if needed the entire day's listitem.
--> -->
<listitem>
<para>2020-05-01</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to tzdata-2020a. Fixes
<ulink url="&lfs-ticket-root;4644">#4644</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to meson-0.54.1. Fixes
<ulink url="&lfs-ticket-root;4646">#4646</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20200429. Fixes
<ulink url="&lfs-ticket-root;4645">#4645</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.6.8. Fixes
<ulink url="&lfs-ticket-root;4630">#4630</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2020-04-23</para>
<itemizedlist>
<listitem>
<para>[ken] - Update to openssl-1.1.1g (Security Fix). Fixes
<ulink url="&lfs-ticket-root;4643">#4643</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2020-04-23</para>
<itemizedlist>
<listitem>
<para>[ken] - Update to openssl-1.1.1g (Security Fix). Fixes
<ulink url="&lfs-ticket-root;4643">#4643</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2020-04-20</para> <para>2020-04-20</para>
<itemizedlist> <itemizedlist>

8
chapter01/whatsnew.xml
View File

@ -122,9 +122,9 @@
<!--<listitem> <!--<listitem>
<para>Gzip-&gzip-version;</para> <para>Gzip-&gzip-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>IANA-Etc-&iana-etc-version;</para> <para>IANA-Etc-&iana-etc-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Inetutils-&inetutils-version;</para> <para>Inetutils-&inetutils-version;</para>
</listitem>--> </listitem>-->
@ -242,9 +242,9 @@
<!--<listitem> <!--<listitem>
<para>Texinfo-&texinfo-version;</para> <para>Texinfo-&texinfo-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Tzdata-&tzdata-version;</para> <para>Tzdata-&tzdata-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Util-Linux-&util-linux-version;</para> <para>Util-Linux-&util-linux-version;</para>
</listitem>--> </listitem>-->

12
chapter06/iana-etc.xml
View File

@ -41,17 +41,9 @@
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of Iana-Etc</title> <title>Installation of Iana-Etc</title>
<para>The following command converts the raw data provided by IANA into the <para>For this package, we only need to copy the files into place:</para>
correct formats for the <filename>/etc/protocols</filename> and
<filename>/etc/services</filename> data files:</para>
<screen><userinput remap="make">make</userinput></screen> <screen><userinput remap="install">cp services protocols /etc</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
</sect2> </sect2>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20200420"> <!ENTITY version "SVN-20200501">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; <!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases --> Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20200420-systemd"> <!ENTITY versiond "20200501-systemd">
<!ENTITY short-versiond "systemd"> <!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd"> <!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "April 20th, 2020"> <!ENTITY releasedate "May 1st, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->

28
packages.ent
View File

@ -327,12 +327,12 @@
<!ENTITY gzip-ch6-du "20 MB"> <!ENTITY gzip-ch6-du "20 MB">
<!ENTITY gzip-ch6-sbu "0.1 SBU"> <!ENTITY gzip-ch6-sbu "0.1 SBU">
<!ENTITY iana-etc-version "2.30"> <!ENTITY iana-etc-version "20200429">
<!ENTITY iana-etc-size "201 KB"> <!ENTITY iana-etc-size "574 KB">
<!ENTITY iana-etc-url "&anduin-sources;/iana-etc-&iana-etc-version;.tar.bz2"> <!ENTITY iana-etc-url "&anduin-sources;/iana-etc-&iana-etc-version;.tar.gz">
<!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8"> <!ENTITY iana-etc-md5 "f9f7cda56c0ebe6ac2fa69a0be5d5400">
<!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc"> <!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc">
<!ENTITY iana-etc-ch6-du "2.3 MB"> <!ENTITY iana-etc-ch6-du "4.7 MB">
<!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU"> <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
<!ENTITY inetutils-version "1.9.4"> <!ENTITY inetutils-version "1.9.4">
@ -433,12 +433,12 @@
<!ENTITY linux-major-version "5"> <!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "6"> <!ENTITY linux-minor-version "6">
<!ENTITY linux-patch-version "4"> <!ENTITY linux-patch-version "8">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "109,163 KB"> <!ENTITY linux-size "109,179 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "3edeb26984eecdf54a03a9dd1a832c16"> <!ENTITY linux-md5 "868fd09779cadda29cb27c93fd40466e">
<!ENTITY linux-home "https://www.kernel.org/"> <!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine, allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -497,10 +497,10 @@
<!ENTITY man-pages-ch6-du "31 MB"> <!ENTITY man-pages-ch6-du "31 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU"> <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
<!ENTITY meson-version "0.54.0"> <!ENTITY meson-version "0.54.1">
<!ENTITY meson-size "1,645 KB"> <!ENTITY meson-size "1,648 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "4968f07219c6bb4df2f83b12b94fe485"> <!ENTITY meson-md5 "1624d083535ec188adad71ba46d770b3">
<!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-ch6-du "31 MB"> <!ENTITY meson-ch6-du "31 MB">
<!ENTITY meson-ch6-sbu "less than 0.1 SBU"> <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@ -695,10 +695,10 @@
<!ENTITY texinfo-ch6-du "116 MB"> <!ENTITY texinfo-ch6-du "116 MB">
<!ENTITY texinfo-ch6-sbu "0.7 SBU"> <!ENTITY texinfo-ch6-sbu "0.7 SBU">
<!ENTITY tzdata-version "2019c"> <!ENTITY tzdata-version "2020a">
<!ENTITY tzdata-size "383 KB"> <!ENTITY tzdata-size "388 KB">
<!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz"> <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
<!ENTITY tzdata-md5 "f6987e6dfdb2eb83a1b5076a50b80894"> <!ENTITY tzdata-md5 "96a985bb8eeab535fb8aa2132296763a">
<!ENTITY tzdata-home "https://www.iana.org/time-zones"> <!ENTITY tzdata-home "https://www.iana.org/time-zones">
<!ENTITY udev-lfs-version "udev-lfs-20171102"> <!ENTITY udev-lfs-version "udev-lfs-20171102">