- rel 10; fixes CVE-2017-15671

diff --git a/glibc-nss_include_dirs.patch b/glibc-nss_include_dirs.patch
index 5e602f1519235311e5c9587fbc921ff40d5ae490..8090f1cf1051b7c75ca294275ba9edac3e34338d 100644 (file)
--- a/glibc-nss_include_dirs.patch
+++ b/glibc-nss_include_dirs.patch
@@ -1,6 +1,6 @@
---- configure.ac.orig  2014-09-27 12:55:02.445395745 +0200
-+++ configure.ac       2014-09-27 12:55:39.848729357 +0200
-@@ -277,10 +277,7 @@
+--- glibc-2.26/configure.ac~   2017-12-04 08:35:08.000000000 +0100
++++ glibc-2.26/configure.ac    2017-12-04 08:40:44.267900240 +0100
+@@ -326,14 +326,7 @@ AC_ARG_ENABLE([nss-crypt],
              [nss_crypt=$enableval],
              [nss_crypt=no])
  if test x$nss_crypt = xyes; then
@@ -8,22 +8,22 @@
 -  if test $? -ne 0; then
 -    AC_MSG_ERROR([cannot find include directory with nss-config])
 -  fi
+-  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
+-  if test $? -ne 0; then
+-    AC_MSG_ERROR([cannot find include directory with nspr-config])
+-  fi
 +  nss_includes='-I/usr/include/nss -I/usr/include/nspr'
    old_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS $nss_includes"
+   CFLAGS="$CFLAGS $nss_includes $nspr_includes"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef int PRBool;
---- crypt/Makefile.orig        2014-09-27 13:04:28.422466311 +0200
-+++ crypt/Makefile     2014-09-27 13:05:00.672466567 +0200
-@@ -37,9 +37,9 @@
- endif
+--- glibc-2.26/crypt/Makefile~ 2017-12-04 08:35:09.000000000 +0100
++++ glibc-2.26/crypt/Makefile  2017-12-04 08:41:17.325468766 +0100
+@@ -38,7 +38,7 @@ endif
  
  ifeq ($(nss-crypt),yes)
--CPPFLAGS-sha256-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir)
--CPPFLAGS-sha512-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir)
--CPPFLAGS-md5-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir)
-+CPPFLAGS-sha256-crypt.c = -DUSE_NSS -I/usr/include/nss -I/usr/include/nspr
-+CPPFLAGS-sha512-crypt.c = -DUSE_NSS -I/usr/include/nss -I/usr/include/nspr
-+CPPFLAGS-md5-crypt.c = -DUSE_NSS -I/usr/include/nss -I/usr/include/nspr
- LDLIBS-crypt.so = -lfreebl3
- else
- libcrypt-routines += md5 sha256 sha512
+ nss-cpp-flags := -DUSE_NSS \
+-  -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir)
++  -I/usr/include/nss -I/usr/include/nspr
+ CPPFLAGS-sha256-crypt.c = $(nss-cpp-flags)
+ CPPFLAGS-sha512-crypt.c = $(nss-cpp-flags)
+ CPPFLAGS-md5-crypt.c = $(nss-cpp-flags)

diff --git a/glibc.spec b/glibc.spec
index 2e38e96272bc7c289d5631cef9a29d028a1bfbaf..5e36b8f54425665fb80d9908521314fe57949d07 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -41,7 +41,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       9
+Release:       10
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -58,7 +58,7 @@ Source7:      %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:                glibc-git.patch
-# Patch0-md5:  4559fc842715d9badbeb1c99eb919ede
+# Patch0-md5:  24fc47a581875faa11954a5c045030b1
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -960,7 +960,7 @@ exit 1
 %patch6 -p1
 
 %patch8 -p1
-%patch9 -p0
+%patch9 -p1
 
 %patch10 -p1
 %patch11 -p1