From 8c898cdc110ac9a50cb5eaeae5f4a51b5ee886b0 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 21 Aug 2017 16:44:07 +0200
Subject: [PATCH] Auto-sync with upstream master

Upstream commit: 2585d7b839559e665d5723734862fbe62264b25d

- assert: Support types without operator== (int) (#1483005)
---
 glibc-rh1315476-2.patch | 7 ++++---
 glibc.spec              | 9 +++++++--
 sources                 | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/glibc-rh1315476-2.patch b/glibc-rh1315476-2.patch
index f6430a8..f0ac3aa 100644
--- a/glibc-rh1315476-2.patch
+++ b/glibc-rh1315476-2.patch
@@ -14,7 +14,7 @@ Index: b/elf/Makefile
 ===================================================================
 --- a/elf/Makefile
 +++ b/elf/Makefile
-@@ -96,12 +96,8 @@ install-others	= $(inst_rtlddir)/$(rtld-
+@@ -97,12 +97,8 @@ install-others	= $(inst_rtlddir)/$(rtld-
  install-bin-script = ldd
  endif
  
@@ -28,13 +28,14 @@ Index: b/elf/Makefile
  
  ifeq (yes,$(use-ldconfig))
  ifeq (yes,$(build-shared))
-@@ -109,8 +105,16 @@ others-static	+= ldconfig
+@@ -110,9 +106,17 @@ others-static	+= ldconfig
  others		+= ldconfig
  install-rootsbin += ldconfig
  
 -ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs
 +ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs sln
  extra-objs	+= $(ldconfig-modules:=.o)
+ others-extras   = $(ldconfig-modules)
 +
 +# Install sln as a hard link to ldconfig.
 +install-others-programs += $(inst_rootsbindir)/sln
@@ -46,7 +47,7 @@ Index: b/elf/Makefile
  endif
  endif
  
-@@ -533,8 +537,6 @@ $(objpfx)ldd: ldd.bash.in $(common-objpf
+@@ -548,8 +552,6 @@ $(objpfx)ldd: ldd.bash.in $(common-objpf
  
  $(objpfx)sprof: $(libdl)
  
diff --git a/glibc.spec b/glibc.spec
index 9449ea0..5144a6c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.26-141-g2585d7b839
+%define glibcsrcdir  glibc-2.26-149-gb5889d25e9
 %define glibcversion 2.26.90
-%define glibcrelease 5%{?dist}
+%define glibcrelease 6%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2085,6 +2085,11 @@ fi
 %endif
 
 %changelog
+* Mon Aug 21 2017 Florian Weimer <fweimer@redhat.com> - 2.26.90-6
+- Auto-sync with upstream master,
+  commit b5889d25e9bf944a89fdd7bcabf3b6c6f6bb6f7c:
+- assert: Support types without operator== (int) (#1483005)
+
 * Mon Aug 21 2017 Florian Weimer <fweimer@redhat.com> - 2.26.90-5
 - Auto-sync with upstream master,
   commit 2585d7b839559e665d5723734862fbe62264b25d:
diff --git a/sources b/sources
index 5f22817..1f6d7a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.26-141-g2585d7b839.tar.gz) = 0bbf15389270223f4ec002bf2ecd8b411cf5d825866ff1b3e4158dc079e2620fa2f7a4c9656bc3f1b0c5f32b1a67282673394921e9d9c73c178415d41683e6be
+SHA512 (glibc-2.26-149-gb5889d25e9.tar.gz) = 7ae8518f8ff1fd76bba6a557c29dca2ca9c2927e0231e1bb754ccaa65fd736041ebd03e6050c55e0d83169a86c60bc006d43604e358966a0809c0530adc9549f