From 910d7cb00ed7b14947c99063d2b1abebdb15830c Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 14 Aug 2018 00:45:00 +0000
Subject: [PATCH] 4.24-1

- v4.23 -> v4.24.
---
 .gitignore  |  2 +-
 sources     |  2 +-
 strace.spec | 72 +++++++++++++++++++----------------------------------
 3 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45002b7..59432c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/strace-4.23.tar.xz
+/strace-4.24.tar.xz
diff --git a/sources b/sources
index 23aca90..bbafe55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (strace-4.23.tar.xz) = b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
+SHA512 (strace-4.24.tar.xz) = 69cbf8b2c32c7ea90ebe5955bc71b454316a3494ae6975203fe61ce1f42ec539438cec5ba8ee7f529f89661d964b4aa53656712706aacff6bf018304b7a09813
diff --git a/strace.spec b/strace.spec
index f79c470..3de5dcb 100644
--- a/strace.spec
+++ b/strace.spec
@@ -1,25 +1,31 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.23
-Release: 2%{?dist}
-License: BSD
-Group: Development/Debuggers
+Version: 4.24
+Release: 1%{?dist}
+License: BSD%{?suse_version:-3-Clause}
+Group: Development%{?suse_version:/Tools}/Debuggers
 URL: https://strace.io
 Source: https://strace.io/files/%{version}/strace-%{version}.tar.xz
-BuildRequires: gcc
+BuildRequires: gcc gzip
+
+# Install Bluetooth headers for AF_BLUETOOTH sockets decoding.
 %if 0%{?fedora} >= 18 || 0%{?centos} >= 8 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1200
 BuildRequires: pkgconfig(bluez)
 %endif
+
+# Install elfutils-devel or libdw-devel to enable strace -k option.
+# Install binutils-devel to enable symbol demangling.
 %if 0%{?fedora} >= 20 || 0%{?centos} >= 6 || 0%{?rhel} >= 6
 %define buildrequires_stacktrace BuildRequires: elfutils-devel binutils-devel
 %endif
 %if 0%{?suse_version} >= 1100
 %define buildrequires_stacktrace BuildRequires: libdw-devel binutils-devel
 %endif
-# for -k option
 %{?buildrequires_stacktrace}
-%define strace64_arches ppc64 sparc64
+
+# OBS compatibility
 %{?!buildroot:BuildRoot: %_tmppath/buildroot-%name-%version-%release}
+%define maybe_use_defattr %{?suse_version:%%defattr(-,root,root)}
 
 %description
 The strace program intercepts and records the system calls called and
@@ -31,30 +37,11 @@ purposes.
 Install strace if you need a tool to track the system calls made and
 received by a process.
 
-%ifarch %{strace64_arches}
-%package -n strace64
-Summary: Tracks and displays system calls associated with a running process.
-Group: Development/Debuggers
-
-%description -n strace64
-The strace program intercepts and records the system calls called and
-received by a running process.  Strace can print a record of each
-system call, its arguments and its return value.  Strace is useful for
-diagnosing problems and debugging, as well as for instructional
-purposes.
-
-Install strace if you need a tool to track the system calls made and
-received by a process.
-
-This package provides the `strace64' program to trace 64-bit processes.
-The `strace' program in the `strace' package is for 32-bit processes.
-%endif
-
 %prep
 %setup -q
 echo -n %version-%release > .tarball-version
 echo -n 2018 > .year
-echo -n 2018-06-13 > .strace.1.in.date
+echo -n 2018-07-07 > .strace.1.in.date
 
 %build
 echo 'BEGIN OF BUILD ENVIRONMENT INFORMATION'
@@ -63,10 +50,12 @@ libc="$(ldd /bin/sh |sed -n 's|^[^/]*\(/[^ ]*/libc\.so[^ ]*\).*|\1|p' |head -1)"
 $libc |head -1
 file -L /bin/sh
 gcc --version |head -1
-kver="$(echo -e '#include <linux/version.h>\nLINUX_VERSION_CODE' | gcc -E -P -)"
+ld --version |head -1
+kver="$(printf '%%s\n%%s\n' '#include <linux/version.h>' 'LINUX_VERSION_CODE' | gcc -E -P -)"
 printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256))
 echo 'END OF BUILD ENVIRONMENT INFORMATION'
 
+CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD
 %configure --enable-mpers=check
 make %{?_smp_mflags}
 
@@ -76,16 +65,11 @@ make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
-%define copy64 ln
-%if 0%{?rhel}
-%if 0%{?rhel} < 6
-%endif
-%define copy64 cp -p
-%endif
-
-%ifarch %{strace64_arches}
-%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
-%endif
+# some say uncompressed changelog files are too big
+for f in ChangeLog ChangeLog-CVS; do
+	gzip -9n < "$f" > "$f".gz &
+done
+wait
 
 %check
 %{buildroot}%{_bindir}/strace -V
@@ -97,19 +81,15 @@ find tests* -type f -name '*.log' -print0 |
 echo 'END OF TEST SUITE INFORMATION'
 
 %files
-%doc CREDITS ChangeLog ChangeLog-CVS COPYING NEWS README
+%maybe_use_defattr
+%doc CREDITS ChangeLog.gz ChangeLog-CVS.gz COPYING NEWS README
 %{_bindir}/strace
 %{_bindir}/strace-log-merge
 %{_mandir}/man1/*
 
-%ifarch %{strace64_arches}
-%files -n strace64
-%{_bindir}/strace64
-%endif
-
 %changelog
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Aug 14 2018 Dmitry V. Levin <ldv@altlinux.org> - 4.24-1
+- v4.23 -> v4.24.
 
 * Thu Jun 14 2018 Dmitry V. Levin <ldv@altlinux.org> - 4.23-1
 - v4.22 -> v4.23.