Sync strace.spec and debian/changelog with packages
* debian/changelog: Sync with 4.11-1.
* strace.spec: Sync with 4.11.0.163.9720-2.
diff --git a/debian/changelog b/debian/changelog
index e8b3e3b..9678870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,12 @@
* New upstream version.
+ fixed decoding of path argument of umount2 syscall, closes: #785050
- -- Dmitry V. Levin <ldv@altlinux.org> Mon, 21 Dec 2015 20:21:22 +0000
+ [ Steve McIntyre ]
+ * Drop patches against old upstream - all upstream now.
+ * Add simple upstream patch to fix printing of 32-bit times syscall
+ return value on 64-bit architectures.
+
+ -- Steve McIntyre <93sam@debian.org> Fri, 08 Jan 2015 00:52:05 +0000
strace (4.10-3) unstable; urgency=medium
diff --git a/strace.spec b/strace.spec
index 1f14eb7..37fdd90 100644
--- a/strace.spec
+++ b/strace.spec
@@ -1,11 +1,12 @@
Summary: Tracks and displays system calls associated with a running process
Name: strace
-Version: 4.11
+Version: 4.11.0.163.9720
+%define srcname %name-4.11.0.163-9720
Release: 2%{?dist}
License: BSD
Group: Development/Debuggers
URL: http://sourceforge.net/projects/strace/
-Source: http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz
+Source: http://downloads.sourceforge.net/strace/%{srcname}.tar.xz
BuildRequires: time
%ifarch x86_64
# for experimental -k option
@@ -43,7 +44,7 @@
%endif
%prep
-%setup -q
+%setup -q -n %{srcname}
%build
%configure
@@ -67,7 +68,16 @@
%endif
%check
-make -k check VERBOSE=1
+uname -a |head -1
+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 -)"
+printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256))
+export SLEEP_A_BIT='sleep 0.1'
+make %{?_smp_mflags} -k check VERBOSE=1
+cat tests/test-suite.log tests/ksysent.log
%files
%doc CREDITS ChangeLog ChangeLog-CVS COPYING NEWS README
@@ -81,6 +91,13 @@
%endif
%changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0.163.9720-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 15 2016 Dmitry V. Levin <ldv@altlinux.org> - 4.11.0.163.9720-1
+- New upstream snapshot v4.11-163-g972018f:
+ + fixed decoding of syscalls unknown to the kernel on s390/s390x (#1298294).
+
* Wed Dec 23 2015 Dmitry V. Levin <ldv@altlinux.org> - 4.11-2
- Enabled experimental -k option on x86_64 (#1170296).
