Skip to Content.
Sympa Menu

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

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 (2d3a0fb982b41a7c973122fde884a9d723a6135d)
  • Date: Thu, 3 Aug 2017 01:14:21 +0000

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

libs/glibc/DETAILS | 4 +--
libs/glibc/HISTORY | 6 ++++
libs/glibc/PRE_BUILD | 3 --
libs/glibc/symver.patch | 63
------------------------------------------------
4 files changed, 9 insertions(+), 67 deletions(-)

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

libs/glibc: version 2.26, SECURITY_PATCH++

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index b28a3cd..ca23eb6 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -29,7 +29,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.25
+ VERSION=2.26
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
@@ -37,7 +37,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=3.17.4
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7348be3..1b4b348 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,9 @@
+2017-08-02 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.26, SECURITY_PATCH++,
+ (CVE-2017-12132, CVE-2017-1000366, CVE-2010-3192, CVE-2017-12133)
+ * PRE_BUILD, symver.patch: removed the patch, applied by upstream,
+ added a check for Kbuild file existance before sed
+
2017-07-29 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, symver.patch: added slightly modified patch from upstream
to fix building with binutils 2.29
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index d0111e0..f4bf63f 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -77,7 +77,7 @@ fi &&
# Remove kernel DRM headers
# Fixes Bug #15547
#
-sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
+[ -f "${GLIBC_HEADERS_DIR}/include/Kbuild" ] && sed -i '/^header-y +=
drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild ||
rm -rf $GLIBC_HEADERS_DIR/include/drm &&


@@ -92,7 +92,6 @@ patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&

patch -p1 <
$SPELL_DIRECTORY/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
&&
patch -p1 < $SPELL_DIRECTORY/glibc-2.20-fhs-1.patch
&&
-patch -p1 < "${SPELL_DIRECTORY}/symver.patch"
&&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/symver.patch b/libs/glibc/symver.patch
deleted file mode 100644
index 8c0b421..0000000
--- a/libs/glibc/symver.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 388b4f1a02f3a801965028bbfcd48d905638b797 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools AT gmail.com>
-Date: Fri, 23 Jun 2017 14:38:46 -0700
-Subject: [PATCH] Avoid .symver on common symbols [BZ #21666]
-
-The .symver directive on common symbol just creates a new common symbol,
-not an alias and the newer assembler with the bug fix for
-
-https://sourceware.org/bugzilla/show_bug.cgi?id=21661
-
-will issue an error. Before the fix, we got
-
-$ readelf -sW libc.so | grep "loc[12s]"
- 5109: 00000000003a0608 8 OBJECT LOCAL DEFAULT 36 loc1
- 5188: 00000000003a0610 8 OBJECT LOCAL DEFAULT 36 loc2
- 5455: 00000000003a0618 8 OBJECT LOCAL DEFAULT 36 locs
- 6575: 00000000003a05f0 8 OBJECT GLOBAL DEFAULT 36 locs AT GLIBC_2.2.5
- 7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1 AT GLIBC_2.2.5
- 7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2 AT GLIBC_2.2.5
-
-in libc.so. The versioned loc1, loc2 and locs have the wrong addresses.
-After the fix, we got
-
-$ readelf -sW libc.so | grep "loc[12s]"
- 6570: 000000000039e3b8 8 OBJECT GLOBAL DEFAULT 34 locs AT GLIBC_2.2.5
- 7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1 AT GLIBC_2.2.5
- 7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2 AT GLIBC_2.2.5
-
- [BZ #21666]
- * misc/regexp.c (loc1): Add __attribute__ ((nocommon));
- (loc2): Likewise.
- (locs): Likewise.
----
- misc/regexp.c | 9 +++++----
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/misc/regexp.c b/misc/regexp.c
-index 19d76c0..eaea7c3 100644
---- a/misc/regexp.c
-+++ b/misc/regexp.c
-@@ -29,14 +29,15 @@
-
- #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
-
--/* Define the variables used for the interface. */
--char *loc1;
--char *loc2;
-+/* Define the variables used for the interface. Avoid .symver on common
-+ symbol, which just creates a new common symbol, not an alias. */
-+char *loc1 __attribute__ ((nocommon));
-+char *loc2 __attribute__ ((nocommon));
- compat_symbol (libc, loc1, loc1, GLIBC_2_0);
- compat_symbol (libc, loc2, loc2, GLIBC_2_0);
-
- /* Although we do not support the use we define this variable as well. */
--char *locs;
-+char *locs __attribute__ ((nocommon));
- compat_symbol (libc, locs, locs, GLIBC_2_0);
-
-
---
-2.9.3
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2d3a0fb982b41a7c973122fde884a9d723a6135d), Pavel Vinogradov, 08/02/2017

Archive powered by MHonArc 2.6.24.

Top of Page