packages/sharutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1 backport patch from community

Browse Source 
Merge pull request !1 from chengquan/dev
This commit is contained in:
openeuler-ci-bot 2020-01-12 09:56:39 +08:00 committed by Gitee
commit 3d9e17fc20
2 changed files with 4 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
View File

@ -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 <eggert@cs.ucla.edu>
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 <eggert@cs.ucla.edu>
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ř <ppisar@redhat.com>
---
lib/fflush.c | 9 ++++++---
lib/fpurge.c | 3 ++-

5
sharutils.spec
View File

@ -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 <buildteam@openeuler.org> - 4.15.2-15
- Package init
* Thu Aug 22 2019 openEuler Buildteam <buildteam@openeuler.org> - 4.15.2-14
- Package init