Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6118dcf3375db91467b713a4f1a3dce24f03df47)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6118dcf3375db91467b713a4f1a3dce24f03df47)
  • Date: Fri, 5 Aug 2016 14:54:12 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/glibc/DETAILS | 4 --
libs/glibc/HISTORY | 7 +++
libs/glibc/PRE_BUILD | 1
libs/glibc/glibc-2.23_gcc6.patch | 74
---------------------------------------
libs/glibc/glibc.gpg |binary
5 files changed, 8 insertions(+), 78 deletions(-)

New commits:
commit 6118dcf3375db91467b713a4f1a3dce24f03df47
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glibc-2.24 SECURITY FIX++

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 674aac8..5953fce 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -29,15 +29,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.23
- SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=3.17.4
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 1694d27..f58805b 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2016-08-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.24
+ SECURITY_PATCH++
+ fixes CVE-2016-3075 CVE-2016-3706 CVE-2016-1234 CVE-2016-4429
CVE-2016-5417
+ * glibc.gpg: add A25340F8 "Carlos O'Donell <carlos AT systemhalted.org>"
+ * PRE_BUILD, glibc-2.23_gcc6.patch: remove unneeded patch
+
2016-06-01 Eric Sandall <sandalle AT sourcemage.org>
* init.d/nscd: Add standard restart() command (just calls reload)

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 9591335..8a08cfc 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -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/glibc-2.23_gcc6.patch
&&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/glibc-2.23_gcc6.patch
b/libs/glibc/glibc-2.23_gcc6.patch
deleted file mode 100644
index bc0c427..0000000
--- a/libs/glibc/glibc-2.23_gcc6.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-2016-04-20 Yvan Roux <yvan.roux AT linaro.org>
-
- * stdlib/setenv.c (unsetenv): Fix ambiguous 'else'.
- * nis/nis_call.c (nis_server_cache_add): Likewise.
-
-Index: glibc-2.23/nis/nis_call.c
-===================================================================
---- glibc-2.23.orig/nis/nis_call.c
-+++ glibc-2.23/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name nam
- /* Choose which entry should be evicted from the cache. */
- loc = &nis_server_cache[0];
- if (*loc != NULL)
-- for (i = 1; i < 16; ++i)
-- if (nis_server_cache[i] == NULL)
-- {
-+ {
-+ for (i = 1; i < 16; ++i)
-+ if (nis_server_cache[i] == NULL)
-+ {
-+ loc = &nis_server_cache[i];
-+ break;
-+ }
-+ else if ((*loc)->uses > nis_server_cache[i]->uses
-+ || ((*loc)->uses == nis_server_cache[i]->uses
-+ && (*loc)->expires > nis_server_cache[i]->expires))
- loc = &nis_server_cache[i];
-- break;
-- }
-- else if ((*loc)->uses > nis_server_cache[i]->uses
-- || ((*loc)->uses == nis_server_cache[i]->uses
-- && (*loc)->expires > nis_server_cache[i]->expires))
-- loc = &nis_server_cache[i];
-+ }
- old = *loc;
- *loc = new;
-
-Index: glibc-2.23/stdlib/setenv.c
-===================================================================
---- glibc-2.23.orig/stdlib/setenv.c
-+++ glibc-2.23/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
- ep = __environ;
- if (ep != NULL)
- while (*ep != NULL)
-- if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-- {
-- /* Found it. Remove this pointer by moving later ones back. */
-- char **dp = ep;
-+ {
-+ if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+ {
-+ /* Found it. Remove this pointer by moving later ones back. */
-+ char **dp = ep;
-
-- do
-- dp[0] = dp[1];
-- while (*dp++);
-- /* Continue the loop in case NAME appears again. */
-- }
-- else
-- ++ep;
-+ do
-+ dp[0] = dp[1];
-+ while (*dp++);
-+ /* Continue the loop in case NAME appears again. */
-+ }
-+ else
-+ ++ep;
-+ }
-
- UNLOCK;
-
-
diff --git a/libs/glibc/glibc.gpg b/libs/glibc/glibc.gpg
index 6b34a7e..35b0563 100644
Binary files a/libs/glibc/glibc.gpg and b/libs/glibc/glibc.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6118dcf3375db91467b713a4f1a3dce24f03df47), Treeve Jelbert, 08/05/2016

Archive powered by MHonArc 2.6.24.

Top of Page