Hello community, here is the log from the commit of package strace for openSUSE:Factory checked in at 2018-08-07 09:40:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/strace (Old) and /work/SRC/openSUSE:Factory/.strace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "strace" Tue Aug 7 09:40:22 2018 rev:68 rq:626905 version:4.23 Changes: -------- --- /work/SRC/openSUSE:Factory/strace/strace.changes 2018-06-27 10:14:31.959074488 +0200 +++ /work/SRC/openSUSE:Factory/.strace.new/strace.changes 2018-08-07 09:40:25.289032382 +0200 @@ -1,0 +2,6 @@ +Wed Aug 1 13:19:36 UTC 2018 - sch...@suse.de + +- statx-redefinition.patch: Workaround incompatibility between + <sys/stat.h> and <asm/stat.h> + +------------------------------------------------------------------- New: ---- statx-redefinition.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strace.spec ++++++ --- /var/tmp/diff_new_pack.wGA0rB/_old 2018-08-07 09:40:25.885033420 +0200 +++ /var/tmp/diff_new_pack.wGA0rB/_new 2018-08-07 09:40:25.889033428 +0200 @@ -29,6 +29,7 @@ Source2: https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc Source3: %{name}.keyring Source4: baselibs.conf +Patch1: statx-redefinition.patch BuildRequires: haveged BuildRequires: libacl-devel BuildRequires: libaio-devel @@ -58,6 +59,7 @@ %prep %setup -q +%patch1 -p1 %build %configure \ ++++++ statx-redefinition.patch ++++++ >From 3dbffb74cc2b4323016ba8ba05380a6aba5f3a8f Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" <l...@altlinux.org> Date: Sun, 15 Jul 2018 22:14:29 +0000 Subject: [PATCH] tests: fix build with fresh glibc Workaround additional incompatibility between <sys/stat.h> and <asm/stat.h> introduced by glibc-2.27.9000-566-gfd70af4. * tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion of <sys/stat.h> to avoid conflicts between definitions provided by the linux kernel headers and the GNU libc. --- tests/xstatx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/xstatx.c b/tests/xstatx.c index 7fb9326589..441f4a8305 100644 --- a/tests/xstatx.c +++ b/tests/xstatx.c @@ -64,10 +64,14 @@ typedef off_t libc_off_t; # define stat libc_stat # define stat64 libc_stat64 +# define statx libc_statx +# define statx_timestamp libc_statx_timestamp # include <fcntl.h> # include <sys/stat.h> -# undef stat +# undef statx_timestamp +# undef statx # undef stat64 +# undef stat # undef st_atime # undef st_mtime -- 2.18.0
