Hello community,
here is the log from the commit of package glibc for openSUSE:Factory checked
in at 2016-05-12 09:32:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
and /work/SRC/openSUSE:Factory/.glibc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2016-04-22
16:16:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes
2016-05-12 09:32:18.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 25 08:55:47 UTC 2016 - jsl...@suse.com
+
+- glibc-gcc6.patch: Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+-------------------------------------------------------------------
glibc-utils.changes: same change
glibc.changes: same change
New:
----
glibc-gcc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.HIpH7y/_old 2016-05-12 09:32:20.000000000 +0200
+++ /var/tmp/diff_new_pack.HIpH7y/_new 2016-05-12 09:32:20.000000000 +0200
@@ -244,6 +244,8 @@
Patch1000: resolv-mem-leak.patch
# PATCH-FIX-UPSTREAM Don't use long double functions if NO_LONG_DOUBLE
Patch1001: no-long-double.patch
+# PATCH-FIX-UPSTREAM Suppress GCC 6 warning about ambiguous 'else' with
-Wparentheses
+Patch1002: glibc-gcc6.patch
###
# Patches awaiting upstream approval
@@ -468,6 +470,7 @@
%patch1000 -p1
%patch1001 -p1
+%patch1002 -p1
%patch2000 -p1
%patch2001 -p1
glibc-utils.spec: same change
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.HIpH7y/_old 2016-05-12 09:32:20.000000000 +0200
+++ /var/tmp/diff_new_pack.HIpH7y/_new 2016-05-12 09:32:20.000000000 +0200
@@ -244,6 +244,8 @@
Patch1000: resolv-mem-leak.patch
# PATCH-FIX-UPSTREAM Don't use long double functions if NO_LONG_DOUBLE
Patch1001: no-long-double.patch
+# PATCH-FIX-UPSTREAM Suppress GCC 6 warning about ambiguous 'else' with
-Wparentheses
+Patch1002: glibc-gcc6.patch
###
# Patches awaiting upstream approval
@@ -468,6 +470,7 @@
%patch1000 -p1
%patch1001 -p1
+%patch1002 -p1
%patch2000 -p1
%patch2001 -p1
++++++ glibc-gcc6.patch ++++++
From: Yvan Roux <yvan.r...@linaro.org>
Date: Fri, 15 Apr 2016 13:29:26 +0200
Subject: Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses
Patch-mainline: yes
Git-commit: df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
ChangeLog | 5 +++++
nis/nis_call.c | 20 +++++++++++---------
stdlib/setenv.c | 24 +++++++++++++-----------
3 files changed, 29 insertions(+), 20 deletions(-)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-15 Yvan Roux <yvan.r...@linaro.org>
+
+ * stdlib/setenv.c (unsetenv): Fix ambiguous 'else'.
+ * nis/nis_call.c (nis_server_cache_add): Likewise.
+
2016-02-18 Adhemerval Zanella <adhemerval.zane...@linaro.org>
* version.h (RELEASE): Set to "stable".
--- a/nis/nis_call.c
+++ b/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;
--- a/stdlib/setenv.c
+++ b/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;
