From 34785a1e84d96ced476b58122fe6e23b48a0c4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=B3=E7=A2=A7=E6=B9=96=E7=9A=84=E7=A0=8D=E6=9F=B4?= =?UTF-8?q?=E4=BA=BA?= Date: Sat, 11 Jan 2020 17:35:55 +0800 Subject: [PATCH] backport patch from community --- ...adjust-to-glibc-2.28-libio.h-removal.patch | 56 ------------------- sharutils.spec | 5 +- 2 files changed, 4 insertions(+), 57 deletions(-) diff --git a/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch index 78e6564..4b6dbe8 100644 --- a/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch +++ b/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch @@ -6,62 +6,6 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Petr Písař: Ported to sharutils-4.15.2 from: - -commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e -Author: Paul Eggert -Date: Mon Mar 5 10:56:29 2018 -0800 - - fflush: adjust to glibc 2.28 libio.h removal - -Problem reported by Daniel P. Berrangé in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. - -commit 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad -Author: Paul Eggert -Date: Thu Mar 8 16:42:45 2018 -0800 - - fflush: be more paranoid about libio.h change - -Suggested by Eli Zaretskii in: -https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. - -This is needed for glibc-2.28 (First spotted with -glibc-2.27.9000-13.fc29 on Fedora). - -Signed-off-by: Petr Písař --- lib/fflush.c | 9 ++++++--- lib/fpurge.c | 3 ++- diff --git a/sharutils.spec b/sharutils.spec index 5114433..051a17c 100644 --- a/sharutils.spec +++ b/sharutils.spec @@ -1,6 +1,6 @@ Name: sharutils Version: 4.15.2 -Release: 14 +Release: 15 Summary: The set of GNU shar utilities License: GPLv3+ and (GPLv3+ and BSD) and (LGPLv3+ or BSD) and LGPLv2+ and Public Domain and GFDL URL: http://www.gnu.org/software/%{name}/ @@ -65,5 +65,8 @@ make check %{_mandir}/man* %changelog +* Sat Jan 11 2020 openEuler Buildteam - 4.15.2-15 +- Package init + * Thu Aug 22 2019 openEuler Buildteam - 4.15.2-14 - Package init -- Gitee