Hello community, here is the log from the commit of package sharutils for openSUSE:Factory checked in at 2018-08-10 09:47:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sharutils (Old) and /work/SRC/openSUSE:Factory/.sharutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sharutils" Fri Aug 10 09:47:24 2018 rev:27 rq:627963 version:4.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sharutils/sharutils.changes 2018-03-19 23:30:25.514567332 +0100 +++ /work/SRC/openSUSE:Factory/.sharutils.new/sharutils.changes 2018-08-10 09:47:25.642042916 +0200 @@ -1,0 +2,6 @@ +Mon Aug 6 08:54:30 UTC 2018 - sch...@suse.de + +- gnulib-libio.patch: Update gnulib for libio.h removal +- Use %license for COPYING + +------------------------------------------------------------------- New: ---- gnulib-libio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sharutils.spec ++++++ --- /var/tmp/diff_new_pack.lJDumt/_old 2018-08-10 09:47:26.290043958 +0200 +++ /var/tmp/diff_new_pack.lJDumt/_new 2018-08-10 09:47:26.290043958 +0200 @@ -20,7 +20,7 @@ Version: 4.15.2 Release: 0 Summary: GNU shar utilities -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Archiving/Compression Url: http://www.gnu.org/software/sharutils Source0: ftp://ftp.gnu.org/gnu/sharutils/sharutils-%{version}.tar.xz @@ -28,6 +28,7 @@ Source2: %{name}.keyring Patch0: sharutils-testsuite.diff Patch1: sharutils-CVE-2018-1000097-fix_buffer_overflow.patch +Patch2: gnulib-libio.patch BuildRequires: libopenssl-devel BuildRequires: mailx BuildRequires: xz @@ -58,6 +59,7 @@ %setup -q %patch0 %patch1 +%patch2 -p1 chmod +w src/scripts.x %build @@ -87,7 +89,8 @@ %files %defattr(-, root, root) -%doc README COPYING NEWS THANKS +%doc README NEWS THANKS +%license COPYING %{_bindir}/* %{_infodir}/*.gz %{_mandir}/*/*.gz ++++++ gnulib-libio.patch ++++++ 2018-03-05 Paul Eggert <egg...@cs.ucla.edu> 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. Index: sharutils-4.15.2/lib/fflush.c =================================================================== --- sharutils-4.15.2.orig/lib/fflush.c +++ sharutils-4.15.2/lib/fflush.c @@ -33,7 +33,7 @@ #undef fflush -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ static void @@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) #endif -#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) +#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ @@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) if (stream == NULL || ! freading (stream)) return fflush (stream); -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ clear_ungetc_buffer_preserving_position (stream); Index: sharutils-4.15.2/lib/fpurge.c =================================================================== --- sharutils-4.15.2.orig/lib/fpurge.c +++ sharutils-4.15.2/lib/fpurge.c @@ -62,7 +62,7 @@ fpurge (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_IO_read_end = fp->_IO_read_ptr; fp->_IO_write_ptr = fp->_IO_write_base; /* Avoid memory leak when there is an active ungetc buffer. */ Index: sharutils-4.15.2/lib/freading.c =================================================================== --- sharutils-4.15.2.orig/lib/freading.c +++ sharutils-4.15.2/lib/freading.c @@ -31,7 +31,7 @@ freading (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ return ((fp->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); Index: sharutils-4.15.2/lib/fseeko.c =================================================================== --- sharutils-4.15.2.orig/lib/fseeko.c +++ sharutils-4.15.2/lib/fseeko.c @@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when #endif /* These tests are based on fpurge.c. */ -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ if (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) @@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when return -1; } -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ Index: sharutils-4.15.2/lib/stdio-impl.h =================================================================== --- sharutils-4.15.2.orig/lib/stdio-impl.h +++ sharutils-4.15.2/lib/stdio-impl.h @@ -18,6 +18,12 @@ the same implementation of stdio extension API, except that some fields have different naming conventions, or their access requires some casts. */ +/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this + problem by defining it ourselves. FIXME: Do not rely on glibc + internals. */ +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN +# define _IO_IN_BACKUP 0x100 +#endif /* BSD stdio derived implementations. */
