pool/findutils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 626930 from home:Andreas_Schwab:glibc:rebuild

Browse Source 
- gnulib-libio.patch: Update gnulib for libio.h removal
- sysmacros.patch: Include <sys/sysmacros.h> for makedev

OBS-URL: https://build.opensuse.org/request/show/626930
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=74
This commit is contained in:
Dirk Mueller 2018-08-02 06:57:24 +00:00 committed by Git OBS Bridge
parent 1407f63ea1
commit 94ee4ae3bc
4 changed files with 159 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
findutils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 1 14:09:38 UTC 2018 - schwab@suse.de
- gnulib-libio.patch: Update gnulib for libio.h removal
- sysmacros.patch: Include <sys/sysmacros.h> for makedev
-------------------------------------------------------------------
Thu Feb 22 15:10:31 UTC 2018 - fvogt@suse.com

9
findutils.spec
View File

@ -21,7 +21,7 @@ Url: http://www.gnu.org/software/findutils/
Version: 4.6.0
Release: 0
Summary: The GNU versions of find utilities (find and xargs)
License: GPL-3.0+
License: GPL-3.0-or-later
Group: Productivity/File utilities
# For upgrading you now just need to increase the version, remove the old
@ -37,6 +37,11 @@ Patch0: findutils-4.4.2-xautofs.patch
# Upstream patch, to be removed with version 4.7.0.
Patch100: sv-bug-48030-find-exec-plus-does-not-pass-all-arguments.patch
# Update gnulib for libio.h removal
Patch101: gnulib-libio.patch
# Update gnulib for <sys/sysmacros.h> requirement (simplified to avoid configure changes)
Patch102: sysmacros.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# BuildRequire dejagnu for 'runtest' to execute all tests.
BuildRequires: dejagnu
@ -67,6 +72,8 @@ useful for finding things on your system.
%setup -q
%patch0
%patch100
%patch101 -p1
%patch102 -p1
%build
%if 0%{?qemu_user_space_build}

132
gnulib-libio.patch Normal file
View File

@ -0,0 +1,132 @@
2018-03-05 Paul Eggert <eggert@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: findutils-4.6.0/gl/lib/fflush.c
===================================================================
--- findutils-4.6.0.orig/gl/lib/fflush.c
+++ findutils-4.6.0/gl/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: findutils-4.6.0/gl/lib/fpurge.c
===================================================================
--- findutils-4.6.0.orig/gl/lib/fpurge.c
+++ findutils-4.6.0/gl/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: findutils-4.6.0/gl/lib/freadahead.c
===================================================================
--- findutils-4.6.0.orig/gl/lib/freadahead.c
+++ findutils-4.6.0/gl/lib/freadahead.c
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#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_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
Index: findutils-4.6.0/gl/lib/freading.c
===================================================================
--- findutils-4.6.0.orig/gl/lib/freading.c
+++ findutils-4.6.0/gl/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: findutils-4.6.0/gl/lib/fseeko.c
===================================================================
--- findutils-4.6.0.orig/gl/lib/fseeko.c
+++ findutils-4.6.0/gl/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: findutils-4.6.0/gl/lib/stdio-impl.h
===================================================================
--- findutils-4.6.0.orig/gl/lib/stdio-impl.h
+++ findutils-4.6.0/gl/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. */

13
sysmacros.patch Normal file
View File

@ -0,0 +1,13 @@
Index: findutils-4.6.0/gl/lib/mountlist.c
===================================================================
--- findutils-4.6.0.orig/gl/lib/mountlist.c
+++ findutils-4.6.0/gl/lib/mountlist.c
@@ -37,6 +37,8 @@
# include <sys/param.h>
#endif
+#include <sys/sysmacros.h>
+
#if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */
# if HAVE_SYS_UCRED_H
# include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,