diff -Nru abi-compliance-checker-2.3/debian/changelog abi-compliance-checker-2.3/debian/changelog --- abi-compliance-checker-2.3/debian/changelog 2019-12-22 17:08:00.000000000 +0000 +++ abi-compliance-checker-2.3/debian/changelog 2021-12-14 17:25:14.000000000 +0000 @@ -1,3 +1,21 @@ +abi-compliance-checker (2.3-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/oom-exec-helper.patch: fix bad syntax, 'next' not allowed + in a do {} while but is allowed in a while {}. + + -- Steve Langasek Tue, 14 Dec 2021 09:25:14 -0800 + +abi-compliance-checker (2.3-1) unstable; urgency=medium + + * d/patches: statx and statx_timestamp need to be skipped. Closes: #916294 + * d/control: Update location of source code + * d/control: Update new Vcs locations + * d/compat: Move to compat 10 + * d/control: Bumpt Std-Vers to 4.6.0 no changes needed + + -- Mathieu Malaterre Thu, 09 Dec 2021 07:55:56 +0100 + abi-compliance-checker (2.3-0.2ubuntu1) focal; urgency=medium * debian/patches/oom-exec-helper.patch: fix bad syntax, 'next' not allowed @@ -274,3 +292,4 @@ * Initial release (Closes: #540247) -- Ryan Niebur Thu, 06 Aug 2009 14:43:30 -0700 + diff -Nru abi-compliance-checker-2.3/debian/compat abi-compliance-checker-2.3/debian/compat --- abi-compliance-checker-2.3/debian/compat 2016-07-16 19:23:50.000000000 +0000 +++ abi-compliance-checker-2.3/debian/compat 2021-12-09 10:01:04.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru abi-compliance-checker-2.3/debian/control abi-compliance-checker-2.3/debian/control --- abi-compliance-checker-2.3/debian/control 2019-12-22 17:08:00.000000000 +0000 +++ abi-compliance-checker-2.3/debian/control 2021-12-14 17:25:14.000000000 +0000 @@ -1,12 +1,14 @@ Source: abi-compliance-checker Section: devel Priority: optional -Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), help2man +Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.1~), help2man Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Mathieu Malaterre -Standards-Version: 4.1.0 -Homepage: http://ispras.linux-foundation.org/index.php/ABI_compliance_checker +Standards-Version: 4.6.0 +Homepage: https://github.com/lvc/abi-compliance-checker/ XS-Testsuite: autopkgtest +Vcs-Browser: https://salsa.debian.org/debian/abi-compliance-checker +Vcs-Git: https://salsa.debian.org/debian/abi-compliance-checker.git Package: abi-compliance-checker Architecture: all diff -Nru abi-compliance-checker-2.3/debian/copyright abi-compliance-checker-2.3/debian/copyright --- abi-compliance-checker-2.3/debian/copyright 2018-07-19 18:57:41.000000000 +0000 +++ abi-compliance-checker-2.3/debian/copyright 2021-12-09 10:01:04.000000000 +0000 @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Source: http://ispras.linux-foundation.org/index.php/ABI_compliance_checker_Downloads +Upstream-Source: https://github.com/lvc/abi-compliance-checker/ Upstream-Name: ABI compliance checker Files: * diff -Nru abi-compliance-checker-2.3/debian/patches/0659b3b0a23e3535f41c6fd8dee5255ad8e29f7e.patch abi-compliance-checker-2.3/debian/patches/0659b3b0a23e3535f41c6fd8dee5255ad8e29f7e.patch --- abi-compliance-checker-2.3/debian/patches/0659b3b0a23e3535f41c6fd8dee5255ad8e29f7e.patch 1970-01-01 00:00:00.000000000 +0000 +++ abi-compliance-checker-2.3/debian/patches/0659b3b0a23e3535f41c6fd8dee5255ad8e29f7e.patch 2021-12-09 06:53:37.000000000 +0000 @@ -0,0 +1,49 @@ +From 0659b3b0a23e3535f41c6fd8dee5255ad8e29f7e Mon Sep 17 00:00:00 2001 +From: Kier Davis +Date: Mon, 13 Sep 2021 08:41:05 -0500 +Subject: [PATCH] add statx to list of ignored functions + +statx (like stat, wait, flock, sysinfo) is both the name of a function: + + /usr/include/bits/statx-generic.h:int statx (int __dirfd, const char *__restrict __path, int __flags, + /usr/include/bits/statx-generic.h: unsigned int __mask, struct statx *__restrict __buf) + +and a struct: + + /usr/include/linux/stat.h:struct statx { + ... + /usr/include/linux/stat.h:}; + +Typically `statx` always denotes the function and `struct statx` denotes the struct. + +When usage of the struct is encountered in C++ code, abi-compliance-checker generates this line in dump1.h: + + statx* tmp_add_class_66; + +which fails to compile: + + /tmp/qktDQcucCm/dump1.h:103:3: error: 'statx' does not name a type + statx* tmp_add_class_66; + ^~~~~ + +Ideally abi-compliance-checker should instead generate this in dump1.h: + + struct statx* tmp_add_class_66; + +but determining when the `struct` qualifier should/shouldn't be used seems non-trivial, so lets take the same approach as we do for other similarly overloaded names. +--- + modules/Internals/TUDump.pm | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/Internals/TUDump.pm b/modules/Internals/TUDump.pm +index 1bc72f3..4eb7d35 100644 +--- a/modules/Internals/TUDump.pm ++++ b/modules/Internals/TUDump.pm +@@ -45,6 +45,7 @@ my %C_Structure = map {$_=>1} ( + "stat64", + "_stat64", + "_stati64", ++ "statx", + "if_nameindex", + "usb_device", + "sigaltstack", diff -Nru abi-compliance-checker-2.3/debian/patches/series abi-compliance-checker-2.3/debian/patches/series --- abi-compliance-checker-2.3/debian/patches/series 2018-09-04 08:27:29.000000000 +0000 +++ abi-compliance-checker-2.3/debian/patches/series 2021-12-09 10:01:04.000000000 +0000 @@ -2,3 +2,4 @@ typos.patch oom-exec-helper.patch fpic-for-arm64.patch +0659b3b0a23e3535f41c6fd8dee5255ad8e29f7e.patch