From 81f727aca6b200a85c7fd3700d8aa54c01bc9232 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 28 Jan 2024 17:44:24 +0800 Subject: [PATCH 01/12] chapter07/python: Work around a puzzling punctuation in quote Here no file name starts with "python." (including the dot). Slightly reword to prevent the punctuation from following the quote or being quoted. --- chapter07/python.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter07/python.xml b/chapter07/python.xml index 3729c6ccf..8268df8e4 100644 --- a/chapter07/python.xml +++ b/chapter07/python.xml @@ -44,8 +44,8 @@ Installation of Python - There are two package files whose name starts with - python. The one to extract from is + There are two package files whose name starts with the + python prefix. The one to extract from is Python-&python-version;.tar.xz (notice the uppercase first letter). From 84974486d96fac6f86cff344a77cee52fe1081eb Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 28 Jan 2024 18:36:16 +0800 Subject: [PATCH 02/12] locale: Replace with for locale specifiers Prevent ambigious quoted punctuations. --- chapter09/locale.xml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/chapter09/locale.xml b/chapter09/locale.xml index c5e55d0da..fa8508828 100644 --- a/chapter09/locale.xml +++ b/chapter09/locale.xml @@ -50,19 +50,21 @@ locale -a - Charmaps can have a number of aliases, e.g., ISO-8859-1 - is also referred to as iso8859-1 and iso88591. + Charmaps can have a number of aliases, e.g., + ISO-8859-1 is also referred to as + iso8859-1 and iso88591. Some applications cannot handle the various synonyms correctly (e.g., require - that UTF-8 is written as UTF-8, not + that UTF-8 is written as UTF-8, not utf8), so it is the safest in most cases to choose the canonical name for a particular locale. To determine the canonical name, run the following command, where <locale name> is the output given by locale -a for - your preferred locale (en_GB.iso88591 in our example). + your preferred locale (en_GB.iso88591 in our + example). LC_ALL=<locale name> locale charmap - For the en_GB.iso88591 locale, the above command + For the en_GB.iso88591 locale, the above command will print: ISO-8859-1 @@ -120,14 +122,16 @@ EOF doesn't work in the chroot environment. It can only be used after the LFS system is booted with systemd. - The C (default) and en_US (the recommended - one for United States English users) locales are different. C + The C (default) and en_US + (the recommended one for United States English users) locales are + different. C uses the US-ASCII 7-bit character set, and treats bytes with the high bit set as invalid characters. That's why, e.g., the ls command substitutes them with question marks in that locale. Also, an attempt to send mail with such characters from Mutt or Pine results in non-RFC-conforming - messages being sent (the charset in the outgoing mail is indicated as unknown - 8-bit). It's suggested that you use the C locale only + messages being sent (the charset in the outgoing mail is indicated as + unknown 8-bit). It's suggested that you + use the C locale only if you are certain that you will never need 8-bit characters. - - + diff --git a/chapter09/locale.xml b/chapter09/locale.xml index fa8508828..803978267 100644 --- a/chapter09/locale.xml +++ b/chapter09/locale.xml @@ -5,18 +5,25 @@ %general-entities; ]> - + Configuring the System Locale - /etc/locale.conf + /etc/profile - The /etc/locale.conf file below sets some - environment variables necessary for native language support. Setting - them properly results in: + + /etc/locale.conf + + + The /etc/locale.conf file + below sets some environment variables necessary for native language + support. Setting them properly results in: + + Some environment variables are necessary for native language + support. Setting them properly results in: @@ -97,30 +104,103 @@ LC_ALL=<locale name> locale int_prefix In those cases, investigating how other Linux distributions support your locale might provide some useful information. - Once the proper locale settings have been determined, create the - /etc/locale.conf file: + Once the proper locale settings have been + determined, create the /etc/locale.conf file: -cat > /etc/locale.conf << "EOF" +cat > /etc/locale.conf << "EOF" LANG=<ll>_<CC>.<charmap><@modifiers> EOF - Note that you can modify /etc/locale.conf with the + The shell program /bin/bash (here after referred + as the shell) uses a collection of startup files to help + create the environment to run in. Each file has a specific use and may + affect login and interactive environments differently. The files in the + /etc directory provide global + settings. If equivalent files exist in the home directory, they + may override the global settings. + + An interactive login shell is started after a successful login, + using /bin/login, by reading the + /etc/passwd file. An interactive non-login shell is + started at the command-line (e.g. + [prompt]$/bin/bash). A + non-interactive shell is usually present when a shell script is running. + It is non-interactive because it is processing a script and not waiting + for user input between commands. + + The login shells are often unaffected by + the settings in /etc/locale.conf. Create the + /etc/profile + once the proper locale settings have been + determined to set the desired localeto read the locale settings from + /etc/locale.conf and export them, + but set the C locale instead if running in the Linux + console (to prevent programs from outputting characters that the Linux + console is unable to render): + +cat > /etc/profile << "EOF" +# Begin /etc/profile + +for i in $(locale); do + unset ${i%=*} +done + +if [[ "$TERM" = linux ]]; then + export LANG=C +else + source /etc/locale.conf + + for i in $(locale); do + key=${i%=*} + if [[ -v $key ]]; then + export $key + fi + done +fi + +# End /etc/profile +EOF + +cat > /etc/profile << "EOF" +# Begin /etc/profile + +for i in $(locale); do + unset ${i%=*} +done + +if [[ "$TERM" = linux ]]; then + for i in $(locale); do + unset ${i%=*} + done + + export LANG=C +else + export LANG=<ll>_<CC>.<charmap><@modifiers> +fi + +# End /etc/profile +EOF + + Note that you can modify /etc/locale.conf with the systemd localectl utility. To use localectl for the example above, run: -localectl set-locale LANG="<ll>_<CC>.<charmap><@modifiers>" +localectl set-locale LANG="<ll>_<CC>.<charmap><@modifiers>" - You can also specify other language specific environment variables such - as LANG, LC_CTYPE, LC_NUMERIC or - any other environment variable from locale output. Just - separate them with a space. An example where LANG is set as + You can also specify other language specific + environment variables such as LANG, + LC_CTYPE, LC_NUMERIC or any other + environment variable from locale output. Just separate + them with a space. An example where LANG is set as en_US.UTF-8 but LC_CTYPE is set as just en_US is: -localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US" +localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US" - Please note that the localectl command - doesn't work in the chroot environment. It can only - be used after the LFS system is booted with systemd. + Please note that the + localectl command doesn't work in the chroot + environment. It can only be used after the LFS system is booted with + systemd. The C (default) and en_US (the recommended one for United States English users) locales are @@ -134,10 +214,4 @@ EOF use the C locale only if you are certain that you will never need 8-bit characters. - - diff --git a/chapter09/profile.xml b/chapter09/profile.xml deleted file mode 100644 index 55cc5dbb0..000000000 --- a/chapter09/profile.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - %general-entities; -]> - - - - - The Bash Shell Startup Files - - - /etc/profile - - - The shell program /bin/bash (hereafter referred to - as the shell) uses a collection of startup files to help - create the environment to run in. Each file has a specific use and may affect - login and interactive environments differently. The files in the /etc directory provide global settings. If - equivalent files exist in the home directory, they may override the global - settings. - - An interactive login shell is started after a successful login, using - /bin/login, by reading the /etc/passwd - file. An interactive non-login shell is started at the command-line (e.g., - [prompt]$/bin/bash). A non-interactive - shell is usually present when a shell script is running. It is non-interactive - because it is processing a script and not waiting for user input between - commands. - -For more information, see the Bash Startup Files and - Interactive Shells sections in the Bash - Features chapter of the Bash info pages (info bash). - - The files /etc/profile and - ~/.bash_profile are read when the shell is - invoked as an interactive login shell. - - The base /etc/profile below sets some - environment variables necessary for native language support. Setting - them properly results in: - - - - The output of programs translated into the native language - - - Correct classification of characters into letters, digits and other - classes. This is necessary for bash to properly accept - non-ASCII characters in command lines in non-English locales - - - The correct alphabetical sorting order for the country - - - Appropriate default paper size - - - Correct formatting of monetary, time, and date values - - - - Replace <ll> below with the two-letter code - for the desired language (e.g., en) and - <CC> with the two-letter code for the appropriate - country (e.g., GB). <charmap> should - be replaced with the canonical charmap for your chosen locale. Optional - modifiers such as @euro may also be present. - - The list of all locales supported by Glibc can be obtained by running - the following command: - -locale -a - - Charmaps can have a number of aliases, e.g., ISO-8859-1 - is also referred to as iso8859-1 and iso88591. - Some applications cannot handle the various synonyms correctly (e.g., require - that UTF-8 is written as UTF-8, not - utf8), so it is safest in most - cases to choose the canonical name for a particular locale. To determine - the canonical name, run the following command, where <locale - name> is the output given by locale -a for - your preferred locale (en_GB.iso88591 in our example). - -LC_ALL=<locale name> locale charmap - - For the en_GB.iso88591 locale, the above command - will print: - -ISO-8859-1 - - This results in a final locale setting of en_GB.ISO-8859-1. - It is important that the locale found using the heuristic above is tested before - it is added to the Bash startup files: - -LC_ALL=<locale name> locale language -LC_ALL=<locale name> locale charmap -LC_ALL=<locale name> locale int_curr_symbol -LC_ALL=<locale name> locale int_prefix - - The above commands should print the language name, the character - encoding used by the locale, the local currency, and the prefix to dial - before the telephone number in order to get into the country. If any of the - commands above fail with a message similar to the one shown below, this means - that your locale was either not installed in - or is not supported by the default installation of Glibc. - -locale: Cannot set LC_* to default locale: No such file or directory - - If this happens, you should either install the desired locale using the - localedef command, or consider choosing a different locale. - Further instructions assume that there are no such error messages from - Glibc. - - Other packages may also function incorrectly (but will not necessarily - display any error messages) if the locale name does not meet their expectations. - In such cases, investigating how other Linux distributions support your locale - might provide some useful information. - - Once the proper locale settings have been determined, create the - /etc/profile file: - -cat > /etc/profile << "EOF" -# Begin /etc/profile - -export LANG=<ll>_<CC>.<charmap><@modifiers> - -# End /etc/profile -EOF - - The C (default) and en_US.utf8 (the recommended - one for United States English users) locales are different. C - uses the US-ASCII 7-bit character set, and treats bytes with the high-order bit set - on as invalid characters. That's why, e.g., the ls command - displays them as question marks in that locale. Also, an attempt to send - mail with such characters from Mutt or Pine results in non-RFC-conforming - messages being sent (the charset in the outgoing mail is indicated as unknown - 8-bit). So you can only use the C locale if you are sure - you will never need 8-bit characters. - - UTF-8 based locales are not supported well by some programs. - Work is in progress to document and, if possible, fix such problems. See - . - - From ee950a5e0dd576887096d9ee50cd9e551aaa9202 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 28 Jan 2024 20:53:47 +0800 Subject: [PATCH 04/12] More clean up Use instead of '"' if possible. Use , , etc. instead of if possible. Replace alpha with a UTF-8 Greek alpha character. BTW decorate ".link" with . --- chapter02/hostreqs.xml | 7 ++++--- chapter02/mounting.xml | 2 +- chapter07/python.xml | 4 ++-- chapter08/coreutils.xml | 4 ++-- chapter08/expect.xml | 4 ++-- chapter08/stripping.xml | 2 +- chapter09/networkd.xml | 9 +++++---- chapter09/usage.xml | 2 +- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml index 546555e9b..3dc451856 100644 --- a/chapter02/hostreqs.xml +++ b/chapter02/hostreqs.xml @@ -29,9 +29,10 @@ minimum versions indicated. This should not be an issue for most modern Linux distributions. Also note that many distributions will place software headers into separate packages, often in the form of - <package-name>-devel or - <package-name>-dev. Be sure to install those if - your distribution provides them. + <package-name>-devel + or + <package-name>-dev. + Be sure to install those if your distribution provides them. Earlier versions of the listed software packages may work, but have not been tested. diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml index 60e5cdc62..4db0f5bfc 100644 --- a/chapter02/mounting.xml +++ b/chapter02/mounting.xml @@ -16,7 +16,7 @@ LFS environment variable described in the previous section. - Strictly speaking, one cannot "mount a partition." One mounts the file + Strictly speaking, one cannot mount a partition. One mounts the file system embedded in that partition. But since a single partition can't contain more than one file system, people often speak of the partition and the associated file system as if they were one and the same. diff --git a/chapter07/python.xml b/chapter07/python.xml index 8268df8e4..872cf4a36 100644 --- a/chapter07/python.xml +++ b/chapter07/python.xml @@ -84,8 +84,8 @@ Some Python 3 modules can't be built now because the dependencies are not installed yet. For the ssl module, - a message Python requires a OpenSSL 1.1.1 or - newer is outputted. + a message Python requires a OpenSSL 1.1.1 or + newer is outputted. The message should be ignored. Just make sure the toplevel make command has not failed. The optional modules are not needed now and they will be built in diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 3357fabc5..96c46996d 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -1261,8 +1261,8 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8 yes - Repeatedly outputs y, or a given string, until - killed + Repeatedly outputs y or a given string, + until killed yes diff --git a/chapter08/expect.xml b/chapter08/expect.xml index 95dc8beae..810bc55a2 100644 --- a/chapter08/expect.xml +++ b/chapter08/expect.xml @@ -92,8 +92,8 @@ make test If any test fails with the message - The system has no more ptys. Ask your system - administrator to create more, it indicates + The system has no more ptys. Ask your system + administrator to create more, it indicates you've not mounted the devpts file system correctly. You need to exit from the chroot environment, read diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml index 6c3cc7c98..5ce0235d3 100644 --- a/chapter08/stripping.xml +++ b/chapter08/stripping.xml @@ -52,7 +52,7 @@ The ELF loader's name is ld-linux-x86-64.so.2 on 64-bit systems and ld-linux.so.2 on 32-bit systems. The construct below selects the correct name for the current architecture, excluding anything ending - with g, in case the commands below have already been + with g, in case the commands below have already been run. diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml index 363e8d883..6c2935de1 100644 --- a/chapter09/networkd.xml +++ b/chapter09/networkd.xml @@ -91,7 +91,8 @@ - Mask udev's .link file for the default policy: + Mask udev's .link file + for the default policy: ln -s /dev/null /etc/systemd/network/99-default.link @@ -101,9 +102,9 @@ Create a manual naming scheme, for example by naming the interfaces something like internet0, dmz0, or lan0. - To do that, create .link files in /etc/systemd/network/ that - select an explicit name or a better naming scheme for your - network interfaces. For example: + To do that, create .link + files in /etc/systemd/network/ that select an explicit name or a + better naming scheme for your network interfaces. For example: cat > /etc/systemd/network/10-ether0.link << "EOF" diff --git a/chapter09/usage.xml b/chapter09/usage.xml index 85b35d16d..7c4f18600 100644 --- a/chapter09/usage.xml +++ b/chapter09/usage.xml @@ -526,7 +526,7 @@ EOF languages, because there accents are added to unaccented ASCII characters, or two ASCII characters are composed together. However, in UTF-8 mode it is a problem; e.g., for the Greek language, where one - sometimes needs to put an accent on the letter alpha. + sometimes needs to put an accent on the letter α. The solution is either to avoid the use of UTF-8, or to install the X window system, which doesn't have this limitation, in its input handling. From 5dd707361faeaa09bc9ebd45329cfd167b8472af Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 28 Jan 2024 21:04:30 +0800 Subject: [PATCH 05/12] locale: Dedup --- chapter09/locale.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chapter09/locale.xml b/chapter09/locale.xml index 803978267..ee45a1f4a 100644 --- a/chapter09/locale.xml +++ b/chapter09/locale.xml @@ -18,10 +18,6 @@ /etc/locale.conf - The /etc/locale.conf file - below sets some environment variables necessary for native language - support. Setting them properly results in: - Some environment variables are necessary for native language support. Setting them properly results in: From 7c630340c2813897c6424670edefa3a98e970ab7 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 28 Jan 2024 21:06:19 +0800 Subject: [PATCH 06/12] locale: Dedup in /etc/profile --- chapter09/locale.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chapter09/locale.xml b/chapter09/locale.xml index ee45a1f4a..92a71ee6e 100644 --- a/chapter09/locale.xml +++ b/chapter09/locale.xml @@ -166,10 +166,6 @@ for i in $(locale); do done if [[ "$TERM" = linux ]]; then - for i in $(locale); do - unset ${i%=*} - done - export LANG=C else export LANG=<ll>_<CC>.<charmap><@modifiers> From 4ecfc55ddba0e6ffae4c2f74ad773eea8d290364 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 29 Jan 2024 01:47:41 +0800 Subject: [PATCH 07/12] Use C.UTF-8 instead of C in console, and set the consolefont for it --- chapter09/consoled.xml | 14 ++++++++++++++ chapter09/locale.xml | 6 +++--- chapter09/usage.xml | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/chapter09/consoled.xml b/chapter09/consoled.xml index f35a586fe..fe1744ddc 100644 --- a/chapter09/consoled.xml +++ b/chapter09/consoled.xml @@ -74,6 +74,20 @@ + We'll use C.UTF-8 as the locale for interactive + sessions in the Linux console in The only console font shipped by + the Kbd package containing the glyphs for + all characters from the program messages in the C.UTF-8 + locale is Lat2-Terminus16 (the other shipped console + fonts lack glyphs of some characters like the Unicode left/right + quotation marks and the Unicode English dash). So set + Lat2-Terminus16 as the default console font: + + +echo FONT=Lat2-Terminus16 > /etc/vconsole.conf + An example for a German keyboard and console is given below: +cat > /etc/sysconfig/console << "EOF" +# Begin /etc/sysconfig/console + +UNICODE="1" +FONT="Lat2-Terminus16" + +# End /etc/sysconfig/console +EOF + + For a non-Unicode setup, only the KEYMAP and FONT variables are From 40cd8a18016e92e48454bf24e2c4d853d1b2b3a9 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 29 Jan 2024 23:45:33 +0800 Subject: [PATCH 08/12] glibc: Drop --with-headers=/usr/include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Glibc INSTALL file says: ‘--with-headers=DIRECTORY’ Look for kernel header files in DIRECTORY, not ‘/usr/include’. ... So --with-headers=/usr/include seems just doing nothing. --- chapter08/glibc.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 1c365ccb1..f82c86d5b 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -73,7 +73,6 @@ cd build --disable-werror \ --enable-kernel=&min-kernel; \ --enable-stack-protector=strong \ - --with-headers=/usr/include \ --disable-nscd \ libc_cv_slibdir=/usr/lib From 39b5bb69894f9b54c8d605b6ac3382531b4c214f Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 30 Jan 2024 12:10:13 +0800 Subject: [PATCH 09/12] console font: Add more "working for C.UTF-8" console fonts --- chapter09/consoled.xml | 15 ++++++++++----- chapter09/usage.xml | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/chapter09/consoled.xml b/chapter09/consoled.xml index fe1744ddc..ce922d6a8 100644 --- a/chapter09/consoled.xml +++ b/chapter09/consoled.xml @@ -76,13 +76,18 @@ We'll use C.UTF-8 as the locale for interactive sessions in the Linux console in The only console font shipped by + linkend='ch-config-locale'/> The console fonts shipped by the Kbd package containing the glyphs for all characters from the program messages in the C.UTF-8 - locale is Lat2-Terminus16 (the other shipped console - fonts lack glyphs of some characters like the Unicode left/right - quotation marks and the Unicode English dash). So set - Lat2-Terminus16 as the default console font: + locale are LatArCyrHeb*.psfu.gz, + LatGrkCyr*.psfu.gz, + Lat2-Terminus16.psfu.gz, and + pancyrillic.f16.psfu.gz in + /usr/share/consolefonts (the other + shipped console fonts lack glyphs of some characters like the Unicode + left/right quotation marks and the Unicode English dash). So set one of + them, for example Lat2-Terminus16.psfu.gz as the + default console font: diff --git a/chapter09/usage.xml b/chapter09/usage.xml index 73f92ebef..6b5441bba 100644 --- a/chapter09/usage.xml +++ b/chapter09/usage.xml @@ -437,14 +437,19 @@ EOF We'll use C.UTF-8 as the locale for interactive sessions in the Linux console in so we should set - UNICODE to 1. And the only - console font shipped by the Kbd package + UNICODE to 1. And the console + fonts shipped by the Kbd package containing the glyphs for all characters from the program messages - in the C.UTF-8 locale is - Lat2-Terminus16 (the other shipped console - fonts lack glyphs of some characters like the Unicode left/right - quotation marks and the Unicode English dash). So set - Lat2-Terminus16 as the default console + in the C.UTF-8 locale are + LatArCyrHeb*.psfu.gz, + LatGrkCyr*.psfu.gz, + Lat2-Terminus16.psfu.gz, and + pancyrillic.f16.psfu.gz in + /usr/share/consolefonts (the + other shipped console fonts lack glyphs of some characters like the + Unicode left/right quotation marks and the Unicode English dash). + So set one of them, for example + Lat2-Terminus16.psfu.gz as the default console font: From bbcac389a3e239ba034b9a63b80e1b9376b72aee Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 31 Jan 2024 16:16:14 +0800 Subject: [PATCH 10/12] glibc: Update upstream fixes patch To include fixes for CVE-2023-6246, CVE-2023-6779, and CVE-2023-6780. --- patches.ent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches.ent b/patches.ent index d27c717de..bad5abff6 100644 --- a/patches.ent +++ b/patches.ent @@ -14,9 +14,9 @@ - - - + + + From bed3894b899f05fb586cdcb407de635b71bdf97f Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 31 Jan 2024 17:35:03 +0800 Subject: [PATCH 11/12] glibc: Add more rationale about --enable-stack-protector, and remove the stale explanation of --with-headers --- chapter08/glibc.xml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index f82c86d5b..ae4856581 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -102,15 +102,10 @@ cd build This option increases system security by adding extra code to check for buffer overflows, such as stack - smashing attacks. - - - - - --with-headers=/usr/include - - This option tells the build system where to find the - kernel API headers. + smashing attacks. Note that Glibc always explicitly overrides + the default of GCC, so this option is still needed even though + we've already specified for + GCC. From cdf280e3373c65b8979a3d152d9b2b39003c39ff Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 31 Jan 2024 08:42:20 -0600 Subject: [PATCH 12/12] Package updates. Update to openssl-3.2.1. Update to zlib-1.3.1. Update to xz-5.4.6. Update to linux-6.7.2. Update to iana-etc-20240125. Update to binutils-2.42. Update to acl-2.3.2. Update upstream fixes for readline-8.2. Apply upstream fix for bash-5.2.21. --- chapter01/changelog.xml | 42 +++++++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 12 +++++++---- chapter03/patches.xml | 10 +++++----- chapter08/bash.xml | 4 ++++ chapter08/binutils.xml | 2 +- packages.ent | 44 ++++++++++++++++++++--------------------- patches.ent | 10 +++++++--- 7 files changed, 89 insertions(+), 35 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index aba69a0de..d16a6181b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,48 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-02-01 + + + [bdubbs] - Update to openssl-3.2.1. Fixes + #5425. + + + [bdubbs] - Update to zlib-1.3.1. Fixes + #5419. + + + [bdubbs] - Update to xz-5.4.6. Fixes + #5423. + + + [bdubbs] - Update to linux-6.7.2. Fixes + #5422. + + + [bdubbs] - Update to iana-etc-20240125. Addresses + #5006. + + + [bdubbs] - Update to binutils-2.42. Fixes + #5424. + + + [bdubbs] - Update to acl-2.3.2. Fixes + #5421. + + + [bdubbs] - Update upstream fixes for readline-8.2. Fixes + #5420. + + + [bdubbs] - Apply upstream fix for bash-5.2.21. Fixes + #5420. + + + + 2024-01-21 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2dd0a8d02..ceca1c108 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -26,9 +26,9 @@ - + Attr-&attr-version; @@ -44,9 +44,9 @@ Bc-&bc-version; - + @@ -290,6 +290,10 @@ Added: + + &bash-upstream-fixes-patch; + + setuptools-&setuptools-version; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 50ff56a6f..106527518 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -27,14 +27,14 @@ --> - + Install the package: diff --git a/packages.ent b/packages.ent index cfdbd2790..22e143878 100644 --- a/packages.ent +++ b/packages.ent @@ -13,10 +13,10 @@ *-knl-* Package info for Kernel stuff --> - - + + - + @@ -65,10 +65,10 @@ - - + + - + @@ -317,10 +317,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - + - + diff --git a/patches.ent b/patches.ent index bad5abff6..c2f957aad 100644 --- a/patches.ent +++ b/patches.ent @@ -2,6 +2,10 @@ + + + + @@ -26,9 +30,9 @@ - - - + + +