Auto-sync with upstream branch release/2.26/master

Upstream commit: 069c3dd05abc91fced6e1e119e425c361ad97644

- bash no longer has job control under systemd-nspawn (via mock) (#1468837)
- CVE-2017-1000409: Count in expanded path in _dl_init_path (#1524867)
- CVE-2017-1000408: Compute correct array size in _dl_init_paths (#1524867)
This commit is contained in:
Florian Weimer 2017-12-22 16:18:34 +01:00
parent 8cca31a681
commit 0265fb3327
3 changed files with 14 additions and 7 deletions

View File

@ -18,12 +18,12 @@ Date: Mon Aug 28 11:31:23 2017 +0200
available as long as glibc has a record for those system calls.
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index dbe6a36c57ced626..0c8a009b5e900b01 100644
index b1fe960d0080b01f..69edb75209702dfc 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -52,74 +52,48 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
tst-quota tst-sync_file_range test-errno-linux tst-sysconf-iov_max
@@ -53,74 +53,48 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
test-errno-linux
-# Generate the list of SYS_* macros for the system calls (__NR_* macros).
-

View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.26-107-g73a9236361
%define glibcsrcdir glibc-2.26-123-g069c3dd05a
%define glibcversion 2.26
%define glibcrelease 20%{?dist}
%define glibcrelease 21%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -2283,6 +2283,13 @@ rm -f *.filelist*
%endif
%changelog
* Fri Dec 22 2017 Florian Weimer <fweimer@redhat.com> - 2.26-21
- bash no longer has job control under systemd-nspawn (via mock) (#1468837)
- Auto-sync with upstream branch release/2.26/master,
commit 069c3dd05abc91fced6e1e119e425c361ad97644:
- CVE-2017-1000409: Count in expanded path in _dl_init_path (#1524867)
- CVE-2017-1000408: Compute correct array size in _dl_init_paths (#1524867)
* Wed Dec 06 2017 Florian Weimer <fweimer@redhat.com> - 2.26-20
- Auto-sync with upstream branch release/2.26/master,
commit 73a92363619e52c458146e903dfb9b1ba823aa40:

View File

@ -1 +1 @@
SHA512 (glibc-2.26-107-g73a9236361.tar.gz) = 2035c11c168680b70393ff453f2a5c38b660af39f1fdde3a9bcd2c2cf4673e2b7a9823335197cd9705ce9a3fe51dcc0680083305cd9c7d91b08a2aeb94f4935c
SHA512 (glibc-2.26-123-g069c3dd05a.tar.gz) = b82e3f144d6d3e0a9c2834a2ccbdd99935929366d1130873932557ae550544c31daa008f7120fd4324124a2cbcee377021a6d190c4d267bc9fce95aa35e20d8d