strace: Update to 5.11

In this release, most source files were moved under a src/ directory.

1 files changed, 274 insertions, 272 deletions

diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua
index 86401e3f..8004d9b7 100644
--- a/pkg/strace/gen.lua
+++ b/pkg/strace/gen.lua
@@ -1,9 +1,9 @@
 cflags{
 	'-D HAVE_CONFIG_H',
 	-- it is important that the arch-specific directory is searched first
-	'-I $srcdir/linux/x86_64',
-	'-I $srcdir/linux',
-	'-I $srcdir',
+	'-I $srcdir/src/linux/x86_64',
+	'-I $srcdir/src/linux/generic',
+	'-I $srcdir/src',
 	'-I $outdir',
 	'-isystem $builddir/pkg/linux-headers/include',
 }
@@ -13,7 +13,7 @@ build('cat', '$outdir/config.h', {
 	'$dir/config.h',
 })
 
-build('cpp', '$outdir/ioctl_iocdef.i', '$srcdir/ioctl_iocdef.c')
+build('cpp', '$outdir/ioctl_iocdef.i', '$srcdir/src/ioctl_iocdef.c')
 build('sed', '$outdir/ioctl_iocdef.h', '$outdir/ioctl_iocdef.i', {
 	expr=[[-n 's/^DEFINE HOST/#define /p']],
 })
@@ -22,18 +22,18 @@ sub('tools.ninja', function()
 	toolchain(config.host)
 	cflags{
 		'-D X86_64=1',
-		'-I $srcdir/linux/x86_64',
-		'-I $srcdir/linux',
+		'-I $srcdir/src/linux/x86_64',
+		'-I $srcdir/src/linux',
 		'-I $outdir',
 	}
 
 	for i = 0, 2 do
 		build('cat', '$outdir/ioctls_all'..i..'.h', {
-			'$srcdir/linux/x86_64/ioctls_inc'..i..'.h',
-			'$srcdir/linux/x86_64/ioctls_arch'..i..'.h',
+			'$srcdir/src/linux/x86_64/ioctls_inc'..i..'.h',
+			'$srcdir/src/linux/x86_64/ioctls_arch'..i..'.h',
 		})
 		build('cc', '$outdir/ioctlsort'..i..'.c.o', {
-			'$srcdir/ioctlsort.c',
+			'$srcdir/src/ioctlsort.c',
 			'|', '$outdir/ioctl_iocdef.h', '$outdir/ioctls_all'..i..'.h',
 		}, {cflags=string.format([[$cflags -D 'IOCTLSORT_INC="ioctls_all%d.h"']], i)})
 		exe('ioctlsort'..i, {'ioctlsort'..i..'.c.o'})
@@ -44,7 +44,7 @@ end)
 
 local mpers = lines('mpers.txt')
 for _, f in ipairs(mpers) do
-	build('cpp', '$outdir/'..f..'.mpers.i', {'$srcdir/'..f, '|', '$outdir/config.h'}, {
+	build('cpp', '$outdir/'..f..'.mpers.i', {'$srcdir/src/'..f, '|', '$outdir/config.h'}, {
 		cflags='$cflags -DIN_MPERS_BOOTSTRAP',
 	})
 end
@@ -59,283 +59,285 @@ makempers('printers.h', 'printers.awk')
 makempers('native_printer_decls.h', 'printerdecls.awk')
 makempers('native_printer_defs.h', 'printerdefs.awk')
 
-build('cpp', '$outdir/syscallent.i', '$srcdir/linux/x86_64/syscallent.h')
+build('cpp', '$outdir/syscallent.i', '$srcdir/src/linux/x86_64/syscallent.h')
 build('awk', '$outdir/scno-syscallent.h', {'$outdir/syscallent.i', '|', '$dir/scno.awk'}, {
 	expr='-f $dir/scno.awk',
 })
-build('cat', '$outdir/scno.h', {'$srcdir/scno.head', '$outdir/scno-syscallent.h'})
+build('cat', '$outdir/scno.h', {'$srcdir/src/scno.head', '$outdir/scno-syscallent.h'})
 
 -- this seems to be enough syscall headers to build
-local syscalls = expand{'$srcdir/linux/', {
+local syscalls = expand{'$srcdir/src/linux/', {
 	'32/syscallent.h',
 	'64/syscallent.h',
 	'arm/syscallent.h',
 	'i386/syscallent.h',
 	'sparc/syscallent.h',
 	'sparc64/syscallent.h',
-	'subcall.h',
-	'syscallent-common.h',
+	'generic/subcallent.h',
+	'generic/syscallent-common.h',
 	'x86_64/syscallent.h',
 }}
 build('awk', '$outdir/sen.h', {syscalls, '|', '$dir/sen.awk'}, {
 	expr='-f $dir/sen.awk',
 })
 
-local srcs = {
-	'access.c',
-	'affinity.c',
-	'aio.c',
-	'alpha.c',
-	'basic_filters.c',
-	'bind.c',
-	'bjm.c',
-	'block.c',
-	'bpf.c',
-	'bpf_filter.c',
-	'bpf_seccomp_filter.c',
-	'bpf_sock_filter.c',
-	'btrfs.c',
-	'cacheflush.c',
-	'capability.c',
-	'chdir.c',
-	'chmod.c',
-	'clone.c',
-	'close_range.c',
-	'copy_file_range.c',
-	'count.c',
-	'delay.c',
-	'desc.c',
-	'dirent.c',
-	'dirent64.c',
-	'dirent_types.c',
-	'dm.c',
-	'dup.c',
-	'dyxlat.c',
-	'epoll.c',
-	'error_prints.c',
-	'evdev.c',
-	'evdev_mpers.c',
-	'eventfd.c',
-	'execve.c',
-	'fadvise.c',
-	'fallocate.c',
-	'fanotify.c',
-	'fchownat.c',
-	'fcntl.c',
-	'fetch_bpf_fprog.c',
-	'fetch_indirect_syscall_args.c',
-	'fetch_struct_flock.c',
-	'fetch_struct_keyctl_kdf_params.c',
-	'fetch_struct_mmsghdr.c',
-	'fetch_struct_msghdr.c',
-	'fetch_struct_stat.c',
-	'fetch_struct_stat64.c',
-	'fetch_struct_statfs.c',
-	'fetch_struct_xfs_quotastat.c',
-	'file_handle.c',
-	'file_ioctl.c',
-	'filter_qualify.c',
-	'filter_seccomp.c',
-	'flock.c',
-	'fs_x_ioctl.c',
-	'fsconfig.c',
-	'fsmount.c',
-	'fsopen.c',
-	'fspick.c',
-	'fstatfs.c',
-	'fstatfs64.c',
-	'futex.c',
-	'get_personality.c',
-	'get_robust_list.c',
-	'getcpu.c',
-	'getcwd.c',
-	'getpagesize.c',
-	'getpid.c',
-	'getrandom.c',
-	'hdio.c',
-	'hostname.c',
-	'inotify.c',
-	'inotify_ioctl.c',
-	'io.c',
-	'io_uring.c',
-	'ioctl.c',
-	'ioperm.c',
-	'iopl.c',
-	'ioprio.c',
-	'ipc.c',
-	'ipc_msg.c',
-	'ipc_msgctl.c',
-	'ipc_sem.c',
-	'ipc_semctl.c',
-	'ipc_shm.c',
-	'ipc_shmctl.c',
-	'kcmp.c',
-	'kexec.c',
-	'keyctl.c',
-	'kvm.c',
-	'ldt.c',
-	'link.c',
-	'listen.c',
-	'lookup_dcookie.c',
-	'loop.c',
-	'lseek.c',
-	'mem.c',
-	'membarrier.c',
-	'memfd_create.c',
-	'mknod.c',
-	'mmap_cache.c',
-	'mmap_notify.c',
-	'mmsghdr.c',
-	'mount.c',
-	'move_mount.c',
-	'mq.c',
-	'msghdr.c',
-	'mtd.c',
-	'nbd_ioctl.c',
-	'net.c',
-	'netlink.c',
-	'netlink_crypto.c',
-	'netlink_inet_diag.c',
-	'netlink_kobject_uevent.c',
-	'netlink_netfilter.c',
-	'netlink_netlink_diag.c',
-	'netlink_packet_diag.c',
-	'netlink_route.c',
-	'netlink_selinux.c',
-	'netlink_smc_diag.c',
-	'netlink_sock_diag.c',
-	'netlink_unix_diag.c',
-	'nlattr.c',
-	'nsfs.c',
-	'numa.c',
-	'number_set.c',
-	'oldstat.c',
-	'open.c',
-	'open_tree.c',
-	'or1k_atomic.c',
-	'pathtrace.c',
-	'perf.c',
-	'perf_ioctl.c',
-	'personality.c',
-	'pidfd_getfd.c',
-	'pidfd_open.c',
-	'pidns.c',
-	'pkeys.c',
-	'poll.c',
-	'prctl.c',
-	'print_aio_sigset.c',
-	'print_dev_t.c',
-	'print_group_req.c',
-	'print_ifindex.c',
-	'print_instruction_pointer.c',
-	'print_kernel_version.c',
-	'print_mac.c',
-	'print_mq_attr.c',
-	'print_msgbuf.c',
-	'print_sg_req_info.c',
-	'print_sigevent.c',
-	'print_statfs.c',
-	'print_struct_stat.c',
-	'print_syscall_number.c',
-	'print_time.c',
-	'print_timespec32.c',
-	'print_timespec64.c',
-	'print_timeval.c',
-	'print_timeval64.c',
-	'print_timex.c',
-	'printmode.c',
-	'printrusage.c',
-	'printsiginfo.c',
-	'process.c',
-	'process_vm.c',
-	'ptp.c',
-	'ptrace_syscall_info.c',
-	'quota.c',
-	'random_ioctl.c',
-	'readahead.c',
-	'readlink.c',
-	'reboot.c',
-	'renameat.c',
-	'resource.c',
-	'retval.c',
-	'riscv.c',
-	'rt_sigframe.c',
-	'rt_sigreturn.c',
-	'rtc.c',
-	'rtnl_addr.c',
-	'rtnl_addrlabel.c',
-	'rtnl_dcb.c',
-	'rtnl_link.c',
-	'rtnl_mdb.c',
-	'rtnl_neigh.c',
-	'rtnl_neightbl.c',
-	'rtnl_netconf.c',
-	'rtnl_nsid.c',
-	'rtnl_route.c',
-	'rtnl_rule.c',
-	'rtnl_tc.c',
-	'rtnl_tc_action.c',
-	's390.c',
-	'sched.c',
-	'scsi.c',
-	'seccomp.c',
-	'sendfile.c',
-	'sg_io_v3.c',
-	'sg_io_v4.c',
-	'shutdown.c',
-	'sigaltstack.c',
-	'signal.c',
-	'signalfd.c',
-	'sigreturn.c',
-	'sock.c',
-	'sockaddr.c',
-	'socketcall.c',
-	'socketutils.c',
-	'sparc.c',
-	'sram_alloc.c',
-	'stage_output.c',
-	'stat.c',
-	'stat64.c',
-	'statfs.c',
-	'statfs64.c',
-	'statx.c',
-	'string_to_uint.c',
-	'swapon.c',
-	'sync_file_range.c',
-	'sync_file_range2.c',
-	'syscall.c',
-	'sysctl.c',
-	'sysinfo.c',
-	'syslog.c',
-	'sysmips.c',
-	'tee.c',
-	'term.c',
-	'time.c',
-	'times.c',
-	'trie.c',
-	'truncate.c',
-	'ubi.c',
-	'ucopy.c',
-	'uid.c',
-	'uid16.c',
-	'umask.c',
-	'umount.c',
-	'uname.c',
-	'upeek.c',
-	'upoke.c',
-	'userfaultfd.c',
-	'ustat.c',
-	'util.c',
-	'utime.c',
-	'utimes.c',
-	'v4l2.c',
-	'wait.c',
-	'watchdog_ioctl.c',
-	'xattr.c',
-	'xgetdents.c',
-	'xlat.c',
-	'xmalloc.c',
-}
+local srcs = paths[[src/(
+	access.c
+	affinity.c
+	aio.c
+	alpha.c
+	basic_filters.c
+	bind.c
+	bjm.c
+	block.c
+	bpf.c
+	bpf_filter.c
+	bpf_seccomp_filter.c
+	bpf_sock_filter.c
+	btrfs.c
+	cacheflush.c
+	capability.c
+	chdir.c
+	chmod.c
+	clone.c
+	close_range.c
+	copy_file_range.c
+	count.c
+	delay.c
+	desc.c
+	dirent.c
+	dirent64.c
+	dirent_types.c
+	dm.c
+	dup.c
+	dyxlat.c
+	epoll.c
+	error_prints.c
+	evdev.c
+	evdev_mpers.c
+	eventfd.c
+	execve.c
+	fadvise.c
+	fallocate.c
+	fanotify.c
+	fchownat.c
+	fcntl.c
+	fetch_bpf_fprog.c
+	fetch_indirect_syscall_args.c
+	fetch_struct_flock.c
+	fetch_struct_keyctl_kdf_params.c
+	fetch_struct_mmsghdr.c
+	fetch_struct_msghdr.c
+	fetch_struct_stat.c
+	fetch_struct_stat64.c
+	fetch_struct_statfs.c
+	fetch_struct_xfs_quotastat.c
+	file_handle.c
+	filter_qualify.c
+	filter_seccomp.c
+	flock.c
+	fs_0x94_ioctl.c
+	fs_f_ioctl.c
+	fs_x_ioctl.c
+	fsconfig.c
+	fsmount.c
+	fsopen.c
+	fspick.c
+	fstatfs.c
+	fstatfs64.c
+	futex.c
+	get_personality.c
+	get_robust_list.c
+	getcpu.c
+	getcwd.c
+	getpagesize.c
+	getpid.c
+	getrandom.c
+	gpio_ioctl.c
+	hdio.c
+	hostname.c
+	inotify.c
+	inotify_ioctl.c
+	io.c
+	io_uring.c
+	ioctl.c
+	ioperm.c
+	ioprio.c
+	ipc.c
+	ipc_msg.c
+	ipc_msgctl.c
+	ipc_sem.c
+	ipc_semctl.c
+	ipc_shm.c
+	ipc_shmctl.c
+	kcmp.c
+	kexec.c
+	keyctl.c
+	kvm.c
+	ldt.c
+	link.c
+	listen.c
+	lookup_dcookie.c
+	loop.c
+	lseek.c
+	mem.c
+	membarrier.c
+	memfd_create.c
+	mknod.c
+	mmap_cache.c
+	mmap_notify.c
+	mmsghdr.c
+	mount.c
+	move_mount.c
+	mq.c
+	msghdr.c
+	mtd.c
+	nbd_ioctl.c
+	net.c
+	netlink.c
+	netlink_crypto.c
+	netlink_inet_diag.c
+	netlink_kobject_uevent.c
+	netlink_netfilter.c
+	netlink_netlink_diag.c
+	netlink_packet_diag.c
+	netlink_route.c
+	netlink_selinux.c
+	netlink_smc_diag.c
+	netlink_sock_diag.c
+	netlink_unix_diag.c
+	nlattr.c
+	nsfs.c
+	numa.c
+	number_set.c
+	oldstat.c
+	open.c
+	open_tree.c
+	or1k_atomic.c
+	pathtrace.c
+	perf.c
+	perf_ioctl.c
+	personality.c
+	pidfd_getfd.c
+	pidfd_open.c
+	pidns.c
+	pkeys.c
+	poke.c
+	poll.c
+	prctl.c
+	print_kernel_sigset.c
+	print_dev_t.c
+	print_group_req.c
+	print_ifindex.c
+	print_instruction_pointer.c
+	print_kernel_version.c
+	print_mac.c
+	print_mq_attr.c
+	print_msgbuf.c
+	print_sg_req_info.c
+	print_sigevent.c
+	print_statfs.c
+	print_struct_stat.c
+	print_syscall_number.c
+	print_time.c
+	print_timespec32.c
+	print_timespec64.c
+	print_timeval.c
+	print_timeval64.c
+	print_timex.c
+	printmode.c
+	printrusage.c
+	printsiginfo.c
+	process.c
+	process_vm.c
+	ptp.c
+	ptrace_syscall_info.c
+	quota.c
+	random_ioctl.c
+	readahead.c
+	readlink.c
+	reboot.c
+	renameat.c
+	resource.c
+	retval.c
+	riscv.c
+	rt_sigframe.c
+	rt_sigreturn.c
+	rtc.c
+	rtnl_addr.c
+	rtnl_addrlabel.c
+	rtnl_dcb.c
+	rtnl_link.c
+	rtnl_mdb.c
+	rtnl_neigh.c
+	rtnl_neightbl.c
+	rtnl_netconf.c
+	rtnl_nsid.c
+	rtnl_route.c
+	rtnl_rule.c
+	rtnl_tc.c
+	rtnl_tc_action.c
+	s390.c
+	sched.c
+	scsi.c
+	seccomp.c
+	sendfile.c
+	sg_io_v3.c
+	sg_io_v4.c
+	shutdown.c
+	sigaltstack.c
+	signal.c
+	signalfd.c
+	sigreturn.c
+	sock.c
+	sockaddr.c
+	socketcall.c
+	socketutils.c
+	sparc.c
+	sram_alloc.c
+	stage_output.c
+	stat.c
+	stat64.c
+	statfs.c
+	statfs64.c
+	statx.c
+	string_to_uint.c
+	swapon.c
+	sync_file_range.c
+	sync_file_range2.c
+	syscall.c
+	sysctl.c
+	sysinfo.c
+	syslog.c
+	sysmips.c
+	tee.c
+	term.c
+	time.c
+	times.c
+	trie.c
+	truncate.c
+	ubi.c
+	ucopy.c
+	uid.c
+	uid16.c
+	umask.c
+	umount.c
+	uname.c
+	upeek.c
+	upoke.c
+	userfaultfd.c
+	ustat.c
+	util.c
+	utime.c
+	utimes.c
+	v4l2.c
+	wait.c
+	watchdog_ioctl.c
+	xattr.c
+	xgetdents.c
+	xlat.c
+	xmalloc.c
+)]]
 
 build('sed', '$outdir/sys_func.h', expand{'$srcdir/', srcs}, {
 	expr=[[-n 's/^SYS_FUNC(.*/extern &;/p']],
@@ -356,8 +358,8 @@ pkg.deps = {
 }
 
 lib('libstrace.a', srcs)
-exe('strace', {'strace.c', 'libstrace.a'})
+exe('strace', {'src/strace.c', 'libstrace.a'})
 file('bin/strace', '755', '$outdir/strace')
-man{'strace.1'}
+man{'doc/strace.1'}
 
 fetch 'curl'