Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (d6fa9a280336ba05a8f46526faff8262ddbe6c14)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (d6fa9a280336ba05a8f46526faff8262ddbe6c14)
  • Date: Tue, 24 May 2016 07:48:50 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

libs/glibc/HISTORY | 3 +
libs/glibc/PRE_BUILD | 1
libs/glibc/glibc-2.23_gcc6.patch | 74
+++++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+)

New commits:
commit d6fa9a280336ba05a8f46526faff8262ddbe6c14
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

glibc: patched to build with gcc6

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7dffb22..040c807 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2016-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, glibc-2.23_gcc6.patch: patched to build with gcc6
+
2016-02-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.23, SECURITY_PATCH++, (CVE-2015-7547,
CVE-2015-8776, CVE-2015-8777, CVE-2015-8778, CVE-2015-8779,
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 8a08cfc..9591335 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -92,6 +92,7 @@ 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
new file mode 100644
index 0000000..bc0c427
--- /dev/null
+++ b/libs/glibc/glibc-2.23_gcc6.patch
@@ -0,0 +1,74 @@
+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;
+
+



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (d6fa9a280336ba05a8f46526faff8262ddbe6c14), Remko van der Vossen, 05/24/2016

Archive powered by MHonArc 2.6.24.

Top of Page