From f2ab0c5d056c1cf7a8a16cd43936fa0cc2ac5b0b Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Wed, 3 Nov 2021 17:36:07 +0100 Subject: [PATCH 1/4] Fix issue building findutils on a 32bit system Cherry picked from the multilib branch --- chapter08/findutils.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml index 092be0c96..ea0de93de 100644 --- a/chapter08/findutils.xml +++ b/chapter08/findutils.xml @@ -45,7 +45,10 @@ Prepare Findutils for compilation: -./configure --prefix=/usr --localstatedir=/var/lib/locate +case $(uname -m) in + i?86) TIME_T_32_BIT_OK=yes ./configure --prefix=/usr --localstatedir=/var/lib/locate ;; + x86_64) ./configure --prefix=/usr --localstatedir=/var/lib/locate ;; +esac The meaning of the configure options: From a844ebe9651e26f650750995f44a7972afd9a268 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 14 Dec 2021 13:46:50 +0100 Subject: [PATCH 2/4] Update the changelog for findutils The preceding cherry-picked commit did not have a changelog entry --- chapter01/changelog.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index abcfc1305..a6cc87fe5 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2021-12-14 + + + [thomas] - Allow building findutils on 32 bit systems. + Cherry-picked from multilib branch by [pierre]. + + + + 2021-12-01 From 4b4f934b9c5f2ffcc6ad6f3e0ce5efd7775b7619 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 14 Dec 2021 13:48:09 +0100 Subject: [PATCH 3/4] Update the command explanations in findutils --- chapter08/findutils.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml index ea0de93de..c37f3aab0 100644 --- a/chapter08/findutils.xml +++ b/chapter08/findutils.xml @@ -53,6 +53,13 @@ esac The meaning of the configure options: + + TIME_32_BIT_OK=yes + + This setting is needed for building on a 32 bit system. + + + --localstatedir From 05dcee7980f0ed17e75c3df09d5b5b87a4688d8f Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 14 Dec 2021 17:33:39 -0600 Subject: [PATCH 4/4] Package updates. Update to python3-3.10.1. Update to openssl-1.1.1m. Update to linux-5.15.7. Update to libcap-2.62. --- chapter01/changelog.xml | 22 ++++++++++++++++++++++ chapter01/whatsnew.xml | 4 ++-- packages.ent | 28 ++++++++++++++-------------- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a6cc87fe5..b317f9008 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,28 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2021-12-15 + + + [bdubbs] - Update to python3-3.10.1. Fixes + #4963. + + + [bdubbs] - Update to openssl-1.1.1m. Fixes + #4966. + + + [bdubbs] - Update to linux-5.15.7. Fixes + #4964. + + + [bdubbs] - Update to libcap-2.62. Fixes + #4965. + + + + 2021-12-14 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e186e74dd..6633d5743 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -201,9 +201,9 @@ - + diff --git a/packages.ent b/packages.ent index 2c035eb03..712c4c192 100644 --- a/packages.ent +++ b/packages.ent @@ -394,10 +394,10 @@ - - + + - + @@ -428,12 +428,12 @@ - + - + - + - + - + - + - - + +