Rebase to strace 6.7

Fix post-rebase issues
- Add 0175-src-xlat-remove-remnants-of-unnecessary-idx-usage-in.patch (v5.18-5-g2bf0696 "src/xlat: remove remnants of unnecessary idx usage in xlookup") - Add 0176-strauss-tips-whitespace-and-phrasing-cleanups.patch (v5.18-7-ge604d7b "strauss: tips whitespace and phrasing cleanups") - Add 0177-strauss-fix-off-by-one-error-in-strauss-array-access.patch (v5.18-8-g968789d "strauss: fix off-by-one error in strauss array access") - Add 0178-util-add-offs-sanity-check-to-print_clock_t.patch (v5.18-9-g6d3e97e "util: add offs sanity check to print_clock_t") - Add 0179-secontext-print-context-of-Unix-socket-s-sun_path-fi.patch (v5.18-13-g960e78f "secontext: print context of Unix socket's sun_path field") - Add 0180-pathtrace-util-do-not-print-deleted-as-part-of-the-p.patch (v5.18-18-g676979f "pathtrace, util: do not print " (deleted)" as part of the path") - Add 0181-secontext-fix-expected-SELinux-context-check-for-unl.patch )v5.18-19-g3f0e534 "secontext: fix expected SELinux context check for unlinked FDs") - Add 0182-tests-bpf-fix-sloppy-low-FD-number-usage.patch (v5.18-21-g5338636 "tests/bpf: fix sloppy low FD number usage") * 0175-src-xlat-remove-remnants-of-unnecessary-idx-usage-in.patch: New patch. * 0176-strauss-tips-whitespace-and-phrasing-cleanups.patch: Likewise. * 0177-strauss-fix-off-by-one-error-in-strauss-array-access.patch: Likewise. * 0178-util-add-offs-sanity-check-to-print_clock_t.patch: Likewise. * 0179-secontext-print-context-of-Unix-socket-s-sun_path-fi.patch: Likewise. * 0180-pathtrace-util-do-not-print-deleted-as-part-of-the-p.patch: Likewise. * 0181-secontext-fix-expected-SELinux-context-check-for-unl.patch: Likewise. * 0182-tests-bpf-fix-sloppy-low-FD-number-usage.patch: Likewise. * strace.spec (Release): Bump to 2. (Patch175, Patch176, Patch177, Patch178, Patch179, Patch180, Patch181, Patch182): Add. (%prep): Apply them. (%changelog): New record about 5.18-2. Resolves: #2087693 Resolves: #2103068 Resolves: #2103032 Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
2024-02-10 04:53:29 +00:00 · 2022-07-13 13:15:01 +02:00
4 changed files with 155 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 /strace-5.18.tar.xz
+/strace-6.7.tar.xz
--- a/.strace.metadata
+++ b/.strace.metadata
@ -0,0 +1 @@
+79197572177df591d180a1484045901fcdc02f2c strace-6.7.tar.xz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (strace-5.18.tar.xz) = 99418b84a5e2049cb6fe32eed19ddcb61bbefb25220550c67d92cd7bc3d44ae5d87ac228b3e1c207166b9bfdae55c624a0f4e603004599fb7ea3143bbccc749e
+SHA512 (strace-6.7.tar.xz) = da28fd9fb987044782e6fd6f5e90e2cea2ab8e536cbd3893ef4c9b11c9b3185f073ca3d8ca0eade49e9a2af8efbda8c2b66b8988be7ebc463dc45e8f48ca1256
--- a/strace.spec
+++ b/strace.spec
@ -1,9 +1,95 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 5.18
+Version: 6.7
 Release: 1%{?dist}
-# The test suite is GPLv2+, all the rest is LGPLv2.1+.
-License: LGPL-2.1+ and GPL-2.0+
+# The test suite is GPLv2+, the bundled headers are GPLv2 with Linux syscall
+# exception, all the rest is LGPLv2.1+.
+# https://docs.fedoraproject.org/en-US/legal/license-field/#_no_effective_license_analysis
+# BSD-2-Clause:
+#   bundled/linux/include/uapi/linux/tee.h
+# BSD-3-Clause:
+#   bundled/linux/include/uapi/linux/quota.h
+# GPL-1.0-or-later WITH Linux-syscall-note:
+#   bundled/linux/include/uapi/linux/if_bonding.h
+#   bundled/linux/include/uapi/linux/loop.h
+# GPL-2.0-or-later WITH Linux-syscall-note:
+#   bundled/linux/include/uapi/linux/dm-ioctl.h
+#   bundled/linux/include/uapi/linux/hiddev.h
+#   bundled/linux/include/uapi/linux/if_alg.h
+#   bundled/linux/include/uapi/linux/if_bridge.h
+#   bundled/linux/include/uapi/linux/in6.h
+#   bundled/linux/include/uapi/linux/in.h
+#   bundled/linux/include/uapi/linux/keyctl.h
+#   bundled/linux/include/uapi/linux/mptcp.h
+#   bundled/linux/include/uapi/linux/ptp_clock.h
+#   bundled/linux/include/uapi/linux/tcp.h
+#   bundled/linux/include/uapi/mtd/mtd-abi.h
+#   bundled/linux/include/uapi/mtd/ubi-user.h
+# LGPL-2.0-or-later WITH Linux-syscall-note:
+#   bundled/linux/include/uapi/linux/dm-ioctl.h
+# LGPL-2.1-or-later WITH Linux-syscall-note:
+#   bundled/linux/include/uapi/linux/dqblk_xfs.h
+#   bundled/linux/include/uapi/linux/mqueue.h
+# (GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB:
+#   bundled/linux/include/uapi/linux/tls.h
+#   bundled/linux/include/uapi/rdma/ib_user_verbs.h
+# (GPL-2.0-only WITH Linux-syscall-note) OR MIT:
+#   bundled/linux/include/uapi/linux/io_uring.h
+# (GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause:
+#   bundled/linux/include/uapi/linux/v4l2-common.h
+#   bundled/linux/include/uapi/linux/v4l2-controls.h
+#   bundled/linux/include/uapi/linux/videodev2.h
+# GPL-2.0-only WITH Linux-syscall-note:
+#   bundled/linux/include/uapi/asm-generic/hugetlb_encode.h (no explicit license in the file)
+#   bundled/linux/include/uapi/linux/mount.h (no explicit license in the file)
+#   bundled/linux/include/uapi/linux/netfilter/nfnetlink_osf.h (no explicit license in the file)
+#   bundled/linux/include/uapi/linux/version.h (no explicit license in the file)
+#   bundled/linux/include/uapi/asm/hugetlb_encode.h (no explicit license in the file)
+#   the rest of bundled/linux
+# ISC:
+#   bundled/linux/include/uapi/linux/nfc.h
+# X11:
+#   build-aux/install-sh (dist only)
+# LGPL-2.1-or-later:
+#   build-aux/copyright-year-gen
+#   build-aux/file-date-gen
+#   m4/ax_code_coverage.m4
+#   m4/mpers.m4
+#   m4/st_demangle.m4
+#   m4/st_esyscmd_s.m4
+#   m4/st_libdw.m4
+#   m4/st_libunwind.m4
+#   m4/st_save_restore_var.m4
+#   m4/st_selinux.m4
+#   m4/st_stacktrace.m4
+#   m4/st_warn_cflags.m4
+# GPL-2.0-or-later:
+#   build-aux/ar-lib (dist only)
+#   build-aux/compile (dist only)
+#   build-aux/depcomp (dist only)
+#   build-aux/missing (dist only)
+#   build-aux/test-driver (dist only)
+# GPL-3.0-or-later:
+#   build-aux/config.guess (dist only)
+#   build-aux/config.sub (dist only)
+#   build-aux/git-version-gen
+# FSFAP:
+#   README-configure
+#   m4/ax_prog_cc_for_build.m4
+#   m4/ax_valgrind_check.m4
+# FSFUL:
+#   configure (dist only)
+# FSFULLR:
+#   m4/warnings.m4
+# FSFULLRWD:
+#   aclocal.m4 (dist only)
+#   Makefile.in (dist only)
+#   bundled/Makefile.in (dist only)
+#   src/Makefile.in (dist only)
+#   tests/Makefile.in (dist only)
+#   tests-m32/Makefile.in (dist only)
+#   tests-mx32/Makefile.in (dist only)
+License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-1.0-or-later WITH Linux-syscall-note) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND (GPL-2.0-only WITH Linux-syscall-note) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ISC AND X11 AND FSFAP AND FSFUL AND FSFULLR AND FSFULLRWD
 # Some distros require Group tag to be present,
 # some require Group tag to be absent,
 # some do not care about Group tag at all,
@ -68,6 +154,28 @@ BuildRequires: pkgconfig(bluez)
 #Patch173: 0173-tests-secontext-eliminate-separate-secontext_format-.patch
 #Patch174: 0174-tests-linkat-reset-context-to-the-expected-one-if-a-.patch

+### https://bugzilla.redhat.com/2103068 covscan fixes
+## v5.18-5-g2bf0696 "src/xlat: remove remnants of unnecessary idx usage in xlookup"
+#Patch175: 0175-src-xlat-remove-remnants-of-unnecessary-idx-usage-in.patch
+## v5.18-7-ge604d7b "strauss: tips whitespace and phrasing cleanups"
+#Patch176: 0176-strauss-tips-whitespace-and-phrasing-cleanups.patch
+## v5.18-8-g968789d "strauss: fix off-by-one error in strauss array access"
+#Patch177: 0177-strauss-fix-off-by-one-error-in-strauss-array-access.patch
+## v5.18-9-g6d3e97e "util: add offs sanity check to print_clock_t"
+#Patch178: 0178-util-add-offs-sanity-check-to-print_clock_t.patch
+
+### https://bugzilla.redhat.com/2087693
+## v5.18-13-g960e78f "secontext: print context of Unix socket's sun_path field"
+#Patch179: 0179-secontext-print-context-of-Unix-socket-s-sun_path-fi.patch
+## v5.18-18-g676979f "pathtrace, util: do not print " (deleted)" as part of the path"
+#Patch180: 0180-pathtrace-util-do-not-print-deleted-as-part-of-the-p.patch
+## v5.18-19-g3f0e534 "secontext: fix expected SELinux context check for unlinked FDs"
+#Patch181: 0181-secontext-fix-expected-SELinux-context-check-for-unl.patch
+
+### https://bugzilla.redhat.com/2103137
+## v5.18-21-g5338636 "tests/bpf: fix sloppy low FD number usage"
+#Patch182: 0182-tests-bpf-fix-sloppy-low-FD-number-usage.patch
+
 # Fallback definitions for make_build/make_install macros
 %{?!__make:       %global __make %_bindir/make}
 %{?!__install:    %global __install %_bindir/install}
@ -104,10 +212,21 @@ received by a process.
 #%patch173 -p1
 #%patch174 -p1

+#%patch175 -p1
+#%patch176 -p1
+#%patch177 -p1
+#%patch178 -p1
+#%patch179 -p1
+#%patch180 -p1
+#%patch181 -p1
+#%patch182 -p1
+
+chmod a+x tests/*.test
+
 echo -n %version-%release > .tarball-version
-echo -n 2022 > .year
-echo -n 2022-06-22 > doc/.strace.1.in.date
-echo -n 2022-06-22 > doc/.strace-log-merge.1.in.date
+echo -n 2024 > .year
+echo -n 2024-02-01 > doc/.strace.1.in.date
+echo -n 2024-02-01 > doc/.strace-log-merge.1.in.date

 %build
 echo 'BEGIN OF BUILD ENVIRONMENT INFORMATION'
@ -118,7 +237,7 @@ file -L /bin/sh
 gcc --version |head -1
 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))
+printf 'kernel-headers %%s.%%s.%%s\n' $((kver/65536)) $((kver/256%%256)) $((kver%%256))
 echo 'END OF BUILD ENVIRONMENT INFORMATION'

 CFLAGS="$RPM_OPT_FLAGS $LDFLAGS"
@ -132,7 +251,7 @@ CPPFLAGS="-isystem %{_includedir} %{optflags}"
 export CPPFLAGS

 CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD
-%configure --enable-mpers=check
+%configure --enable-mpers=check --enable-bundled=yes
 %make_build

 %install
@ -145,13 +264,21 @@ done
 wait

 %check
-%{buildroot}%{_bindir}/strace -V
-%make_build -k check VERBOSE=1
-echo 'BEGIN OF TEST SUITE INFORMATION'
-tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
-find tests* -type f -name '*.log' -print0 |
-	xargs -r0 grep -H '^KERNEL BUG:' -- ||:
-echo 'END OF TEST SUITE INFORMATION'
+width=$(echo __LONG_WIDTH__ |%__cc -E -P -)
+skip_32bit=0
+%if 0%{?fedora} >= 35 || 0%{?rhel} > 9
+skip_32bit=1
+%endif
+
+if [ "${width}" != 32 ] || [ "${skip_32bit}" != 1 ]; then
+	%{buildroot}%{_bindir}/strace -V
+	%make_build -k check VERBOSE=1
+	echo 'BEGIN OF TEST SUITE INFORMATION'
+	tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
+	find tests* -type f -name '*.log' -print0 |
+		xargs -r0 grep -H '^KERNEL BUG:' -- ||:
+	echo 'END OF TEST SUITE INFORMATION'
+fi

 %files
 %maybe_use_defattr
@ -161,6 +288,16 @@ echo 'END OF TEST SUITE INFORMATION'
 %{_mandir}/man1/*

 %changelog
+* Wed Feb 01 2024 Eugene Syromiatnikov <esyr@redhat.com> - 6.7-1
+- Rebase to v6.7; drop upstream patches on top of 5.18 (RHEL-8646).
+- Updated the SPDX license expression.
+
+* Mon Jul 11 2022 Eugene Syromiatnikov <esyr@redhat.com> - 5.18-2
+- Fix the issues reported by covscan (#2103068).
+- Fix SELinux context matching for the deleted paths (#2087693).
+- Fix sloppy FD usage in the bpf test (#2103137).
+- Cater for RHEL 9 license requirement idiosyncrasies (#2103032).
+
 * Wed Jun 22 2022 Eugene Syromiatnikov <esyr@redhat.com> - 5.18-1
 - Rebase to v5.18; drop upstream patches on top of 5.13 (#2084002).
				`@ -0,0 +1 @@`
				`79197572177df591d180a1484045901fcdc02f2c strace-6.7.tar.xz`