sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (fabd9e78e5df781966800cabff0ca20fbfabd36a)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (fabd9e78e5df781966800cabff0ca20fbfabd36a)
Date: Thu, 20 Oct 2022 03:21:40 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

libs/glibc/HISTORY | 7
libs/glibc/PRE_BUILD | 2
libs/glibc/PRE_INSTALL | 5
libs/glibc/glibc-2.20-fhs-1.patch | 72
----------
libs/glibc/patches/0001-Disable-ldconfig-during-install.patch | 31 ++++
libs/glibc/patches/glibc-2.20-fhs-1.patch | 72
++++++++++
6 files changed, 114 insertions(+), 75 deletions(-)

New commits:
commit fabd9e78e5df781966800cabff0ca20fbfabd36a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/glibc: reorganized patching, added the patch to disable ldconfig call
during our fake install, refactored old libraries backup code

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index b241f52..16c86ea 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2022-10-19 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/{0001-Disable-ldconfig-during-install,
+ glibc-2.20-fhs-1}.patch: reorganized patching + added Gentoo patch
+ to disable ldconfig execution durung fake installation phase
+ * PRE_INSTALL: refactored old libraries backup code, now it avoids
overriding
+ of existing files
+
2022-10-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: adapt to linux 6.x

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index e1a8409..a5a5fba 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -65,7 +65,7 @@ cd $SOURCE_DIRECTORY &&
# no idea why or how this is missing from configure
# patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&

-patch -p1 < $SPELL_DIRECTORY/glibc-2.20-fhs-1.patch &&
+apply_patch_dir patches &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 7debf58..15cbaf6 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -4,8 +4,9 @@ if [[ -z $INSTALL_ROOT ]]; then
message "${MESSAGE_COLOR}copying old libraries${DEFAULT_COLOR}" &&
local each &&
for each in /lib{,64,32}/*; do
- if test -f "$each"; then
- cp -a "$each" $SOURCE_DIRECTORY.bld/old.libs
+ local dest="${SOURCE_DIRECTORY}.bld/old.libs/${each##*/}" &&
+ if ! test -f "${dest}" && test -f "${each}"; then
+ cp -a "${each}" "${dest}"
fi
done &&
message "${MESSAGE_COLOR}Runnning ldconfig${DEFAULT_COLOR}" &&
diff --git a/libs/glibc/glibc-2.20-fhs-1.patch
b/libs/glibc/glibc-2.20-fhs-1.patch
deleted file mode 100644
index 4ac8d10..0000000
--- a/libs/glibc/glibc-2.20-fhs-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Submitted By: Armin K. <krejzi at email dot com>
-Date: 2013-02-11
-Initial Package Version: 2.17
-Upstream Status: Not Applicable
-Origin: Self
-Description: This patch removes references to /var/db directory
which is not part
- of FHS and replaces them with more suitable
directories in /var
- hierarchy - /var/cache/nscd for nscd and
/var/lib/nss_db for nss_db.
-
---- a/Makeconfig 2012-12-25 04:02:13.000000000 +0100
-+++ b/Makeconfig 2013-02-11 01:32:32.500667439 +0100
-@@ -250,7 +250,7 @@
-
- # Directory for the database files and Makefile for nss_db.
- ifndef vardbdir
--vardbdir = $(localstatedir)/db
-+vardbdir = $(localstatedir)/lib/nss_db
- endif
- inst_vardbdir = $(install_root)$(vardbdir)
-
---- a/nscd/nscd.h 2012-12-25 04:02:13.000000000 +0100
-+++ b/nscd/nscd.h 2013-02-11 01:32:32.500667439 +0100
-@@ -112,11 +112,11 @@
-
-
- /* Paths of the file for the persistent storage. */
--#define _PATH_NSCD_PASSWD_DB "/var/db/nscd/passwd"
--#define _PATH_NSCD_GROUP_DB "/var/db/nscd/group"
--#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts"
--#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services"
--#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup"
-+#define _PATH_NSCD_PASSWD_DB "/var/cache/nscd/passwd"
-+#define _PATH_NSCD_GROUP_DB "/var/cache/nscd/group"
-+#define _PATH_NSCD_HOSTS_DB "/var/cache/nscd/hosts"
-+#define _PATH_NSCD_SERVICES_DB "/var/cache/nscd/services"
-+#define _PATH_NSCD_NETGROUP_DB "/var/cache/nscd/netgroup"
-
- /* Path used when not using persistent storage. */
- #define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX"
---- a/nss/db-Makefile 2012-12-25 04:02:13.000000000 +0100
-+++ b/nss/db-Makefile 2013-02-11 01:32:32.500667439 +0100
-@@ -22,7 +22,7 @@
- /etc/rpc /etc/services /etc/shadow /etc/gshadow \
- /etc/netgroup)
-
--VAR_DB = /var/db
-+VAR_DB = /var/lib/nss_db
-
- AWK = awk
- MAKEDB = makedb --quiet
---- a/sysdeps/generic/paths.h 2012-12-25 04:02:13.000000000 +0100
-+++ b/sysdeps/generic/paths.h 2013-02-11 01:32:32.500667439 +0100
-@@ -68,7 +68,7 @@
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define _PATH_DEV "/dev/"
- #define _PATH_TMP "/tmp/"
--#define _PATH_VARDB "/var/db/"
-+#define _PATH_VARDB "/var/lib/nss_db/"
- #define _PATH_VARRUN "/var/run/"
- #define _PATH_VARTMP "/var/tmp/"
-
---- a/sysdeps/unix/sysv/linux/paths.h 2012-12-25 04:02:13.000000000 +0100
-+++ b/sysdeps/unix/sysv/linux/paths.h 2013-02-11 01:32:32.504000831 +0100
-@@ -68,7 +68,7 @@
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define _PATH_DEV "/dev/"
- #define _PATH_TMP "/tmp/"
--#define _PATH_VARDB "/var/db/"
-+#define _PATH_VARDB "/var/lib/nss_db/"
- #define _PATH_VARRUN "/var/run/"
- #define _PATH_VARTMP "/var/tmp/"
-
diff --git a/libs/glibc/patches/0001-Disable-ldconfig-during-install.patch
b/libs/glibc/patches/0001-Disable-ldconfig-during-install.patch
new file mode 100644
index 0000000..7bc6628
--- /dev/null
+++ b/libs/glibc/patches/0001-Disable-ldconfig-during-install.patch
@@ -0,0 +1,31 @@
+From 4917be423cb1a70a66e90e39a73e986b011d7687 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Tue, 3 Aug 2021 00:34:59 +0200
+Subject: [PATCH 01/12] Disable ldconfig during install
+
+Do not bother running ldconfig on DESTDIR. It's a waste of time as we
+won't use the result (portage will rebuild the cache after install).
+Also, the Gentoo sandbox does not currently catch chroot() behavior so
+we end up (incorrectly) flagging it as a violation as a write to /etc.
+
+http://sourceware.org/ml/libc-alpha/2012-08/msg00118.html
+https://bugs.gentoo.org/431038
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 179dd478ff..763d6a084a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -110,6 +110,7 @@ elf/ldso_install:
+ ifeq (no,$(cross-compiling))
+ ifeq (yes,$(build-shared))
+ install:
++dont-bother-with-destdir:
+ -test ! -x $(elf-objpfx)ldconfig || LC_ALL=C \
+ $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \
+ $(slibdir) $(libdir)
+--
+2.35.1
+
diff --git a/libs/glibc/patches/glibc-2.20-fhs-1.patch
b/libs/glibc/patches/glibc-2.20-fhs-1.patch
new file mode 100644
index 0000000..4ac8d10
--- /dev/null
+++ b/libs/glibc/patches/glibc-2.20-fhs-1.patch
@@ -0,0 +1,72 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2013-02-11
+Initial Package Version: 2.17
+Upstream Status: Not Applicable
+Origin: Self
+Description: This patch removes references to /var/db directory
which is not part
+ of FHS and replaces them with more suitable
directories in /var
+ hierarchy - /var/cache/nscd for nscd and
/var/lib/nss_db for nss_db.
+
+--- a/Makeconfig 2012-12-25 04:02:13.000000000 +0100
++++ b/Makeconfig 2013-02-11 01:32:32.500667439 +0100
+@@ -250,7 +250,7 @@
+
+ # Directory for the database files and Makefile for nss_db.
+ ifndef vardbdir
+-vardbdir = $(localstatedir)/db
++vardbdir = $(localstatedir)/lib/nss_db
+ endif
+ inst_vardbdir = $(install_root)$(vardbdir)
+
+--- a/nscd/nscd.h 2012-12-25 04:02:13.000000000 +0100
++++ b/nscd/nscd.h 2013-02-11 01:32:32.500667439 +0100
+@@ -112,11 +112,11 @@
+
+
+ /* Paths of the file for the persistent storage. */
+-#define _PATH_NSCD_PASSWD_DB "/var/db/nscd/passwd"
+-#define _PATH_NSCD_GROUP_DB "/var/db/nscd/group"
+-#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts"
+-#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services"
+-#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup"
++#define _PATH_NSCD_PASSWD_DB "/var/cache/nscd/passwd"
++#define _PATH_NSCD_GROUP_DB "/var/cache/nscd/group"
++#define _PATH_NSCD_HOSTS_DB "/var/cache/nscd/hosts"
++#define _PATH_NSCD_SERVICES_DB "/var/cache/nscd/services"
++#define _PATH_NSCD_NETGROUP_DB "/var/cache/nscd/netgroup"
+
+ /* Path used when not using persistent storage. */
+ #define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX"
+--- a/nss/db-Makefile 2012-12-25 04:02:13.000000000 +0100
++++ b/nss/db-Makefile 2013-02-11 01:32:32.500667439 +0100
+@@ -22,7 +22,7 @@
+ /etc/rpc /etc/services /etc/shadow /etc/gshadow \
+ /etc/netgroup)
+
+-VAR_DB = /var/db
++VAR_DB = /var/lib/nss_db
+
+ AWK = awk
+ MAKEDB = makedb --quiet
+--- a/sysdeps/generic/paths.h 2012-12-25 04:02:13.000000000 +0100
++++ b/sysdeps/generic/paths.h 2013-02-11 01:32:32.500667439 +0100
+@@ -68,7 +68,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define _PATH_DEV "/dev/"
+ #define _PATH_TMP "/tmp/"
+-#define _PATH_VARDB "/var/db/"
++#define _PATH_VARDB "/var/lib/nss_db/"
+ #define _PATH_VARRUN "/var/run/"
+ #define _PATH_VARTMP "/var/tmp/"
+
+--- a/sysdeps/unix/sysv/linux/paths.h 2012-12-25 04:02:13.000000000 +0100
++++ b/sysdeps/unix/sysv/linux/paths.h 2013-02-11 01:32:32.504000831 +0100
+@@ -68,7 +68,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define _PATH_DEV "/dev/"
+ #define _PATH_TMP "/tmp/"
+-#define _PATH_VARDB "/var/db/"
++#define _PATH_VARDB "/var/lib/nss_db/"
+ #define _PATH_VARRUN "/var/run/"
+ #define _PATH_VARTMP "/var/tmp/"
+

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (fabd9e78e5df781966800cabff0ca20fbfabd36a), Pavel Vinogradov, 10/19/2022