Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2c1305bf3fbe4c32365a2b89b81f2f02674ae187)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (2c1305bf3fbe4c32365a2b89b81f2f02674ae187)
  • Date: Mon, 15 Aug 2022 02:15:25 +0000

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

libs/glibc/BUILD | 15 +++++++--------
libs/glibc/DETAILS | 8 ++++----
libs/glibc/HISTORY | 11 ++++++++++-
libs/glibc/INSTALL | 4 +++-
libs/glibc/Makefile.patch | 12 ------------
libs/glibc/PRE_BUILD | 1 -
6 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 2c1305bf3fbe4c32365a2b89b81f2f02674ae187
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

libs/glibc: version 2.36, SECURITY_PATCH++

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index d64abfe..b3471fb 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -34,19 +34,13 @@ export CPPFLAGS="$CPPFLAGS
-I$GLIBC_HEADERS_DIR/usr/include" &&
#
cd $SOURCE_DIRECTORY.bld &&

-#
-# Install all libs into /lib
-# Fixes installing glibc on x86_64 without a lib64 symlink/dir
-# Bug #441
-#
-echo -e "slibdir=/lib" > configparms &&
-
# security-related options
OPTS+=" --enable-bind-now" &&
OPTS+=" --enable-stack-protector=strong" &&
OPTS+=" --enable-stackguard-randomization" &&
OPTS+=" $GLIBC_CET" &&

+
#
# Configure glibc to use the sanitised headers
# http://bugs.sourcemage.org/show_bug.cgi?id=7560
@@ -64,5 +58,10 @@ $SOURCE_DIRECTORY/configure --host=$HOST
\
--disable-werror \
--with-headers=$GLIBC_HEADERS_DIR/usr/include \
--disable-multi-arch \
+ libc_cv_slibdir=/lib \
$OPTS &&
-default_build_make
+default_build_make &&
+
+# fake install
+mkdir -p "${SOURCE_DIRECTORY}.bld/INSTALL_ROOT" &&
+make install install_root="${SOURCE_DIRECTORY}.bld/INSTALL_ROOT"
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index fc06a8a..2ea7736 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.33
- SECURITY_PATCH=17
+ VERSION=2.36
+ SECURITY_PATCH=18
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
@@ -20,7 +20,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_IGNORE=signature
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=5.10.12
+ HEADERS_VERSION=5.19
HEADERS_MAJOR_VERSION=$(echo $HEADERS_VERSION|cut -f1 -d.)
SOURCE3=linux-${HEADERS_VERSION}.tar.xz
SOURCE6=linux-${HEADERS_VERSION}.tar.sign
@@ -30,7 +30,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE6_URL[0]="$KERNEL_URL/pub/linux/kernel/v${HEADERS_MAJOR_VERSION}.x/$SOURCE6"
else
local LINUX_DIRECTORY
- LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
+ LINUX_DIRECTORY=$(gaze -q where -path linux)
. $LINUX_DIRECTORY/latest.defaults

case $(uname -r) in
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 3012c45..e2568bc 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,12 @@
+2022-08-14 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.36, SECURITY_PATCH++, HEADERS_VERSION=5.19,
simplified
+ gaze call in sanitized kernel headers option
+ * BUILD: added fake installation, necessary for smooth transition,
install
+ all libs in /lib always (kudos to LFS)
+ * INSTALL: modified accoringly to just tar/untar everything in a
subshell
+ (kudos to our binutils spell)
+ * PRE_BUILD, Makefile.patch: dropped the patch
+
2022-05-12 Florian Franzmann <bwlf AT bandrate.org>
* BUILD: set --disable-werror to work around compile error with gcc
12.1
@@ -7,7 +16,7 @@
SECURITY_PATCH++ fixes: CVE-2021-3326 CVE-2020-27618
CVE-2020-29562 CVE-2019-25013
* BUILD: remove obsolete option
* PRE_BUILD: do not build/instal manuals
- don\'t install manuals, as texinfo seems to be broken on my systems.
+ don\'t install manuals, as texinfo seems to be broken on my systems.
This happens in BUILD.
'make install' tries to build the manuals, but the breakage happens
after the previous glibc has lready been removed.
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index 6a1488b..6629dc8 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -32,7 +32,9 @@ done &&
#
# install
#
-make install install_root="${INSTALL_ROOT}" &&
+cd "${SOURCE_DIRECTORY}.bld/INSTALL_ROOT" &&
+tar -cf- . | (cd "$INSTALL_ROOT/" && tar -xvf-)
+
if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 || ${SMGL_COMPAT_ARCHS[1]} == em64t
]]; then
[ -d /lib64 -a ! -f /lib64/ld-linux-x86-64.so.2 -a -f
/lib/ld-linux-x86-64.so.2 ] &&
ln -s $TRACK_ROOT/lib/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
diff --git a/libs/glibc/Makefile.patch b/libs/glibc/Makefile.patch
deleted file mode 100644
index eff43b7..0000000
--- a/libs/glibc/Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile~ 2004-10-23 22:10:40.000000000 +0200
-+++ Makefile 2005-02-05 14:24:34.432207398 +0100
-@@ -110,6 +110,9 @@
- install: install-symbolic-link
- .PHONY: install-symbolic-link
- install-symbolic-link: subdir_install
-+ -test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
-+ $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
-+ $(slibdir) $(libdir)
- $(symbolic-link-prog) $(symbolic-link-list)
- rm -f $(symbolic-link-list)
-
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index b6f8494..e1a8409 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -62,7 +62,6 @@ sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl
$(common-objpfx)::' $S
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/Makefile.patch &&
# no idea why or how this is missing from configure
# patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&




  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2c1305bf3fbe4c32365a2b89b81f2f02674ae187), Pavel Vinogradov, 08/14/2022

Archive powered by MHonArc 2.6.24.

Top of Page