Package: release.debian.org Severity: normal Tags: bullseye User: release.debian....@packages.debian.org Usertags: pu
[ Reason ] An extraneous #endif in import.h makes using it impossible. This was fixed upstream, in unstable & testing. [ Impact ] C extension modules that include import.h can't be built. [ Tests ] Autopkgtests pass, but they do not exercise import.h. Manually confirmed the issue in the existing binary package, and verified that the new version resolves the issue. [ Risks ] Trivial change in a rarely-touched file, upstream. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Changes ] Remove the extra #endif.
diff -Nru pypy3-7.3.5+dfsg/debian/changelog pypy3-7.3.5+dfsg/debian/changelog --- pypy3-7.3.5+dfsg/debian/changelog 2021-06-03 15:59:21.000000000 -0400 +++ pypy3-7.3.5+dfsg/debian/changelog 2021-12-25 11:54:46.000000000 -0400 @@ -1,3 +1,9 @@ +pypy3 (7.3.5+dfsg-2+deb11u1) bullseye; urgency=medium + + * Patch: Remove extraneous #endif from import.h (Closes: #1001519) + + -- Stefano Rivera <stefa...@debian.org> Sat, 25 Dec 2021 11:54:46 -0400 + pypy3 (7.3.5+dfsg-2) unstable; urgency=medium * Upload to unstable. diff -Nru pypy3-7.3.5+dfsg/debian/patches/import-h-endif pypy3-7.3.5+dfsg/debian/patches/import-h-endif --- pypy3-7.3.5+dfsg/debian/patches/import-h-endif 1969-12-31 20:00:00.000000000 -0400 +++ pypy3-7.3.5+dfsg/debian/patches/import-h-endif 2021-12-25 11:54:46.000000000 -0400 @@ -0,0 +1,23 @@ +From: Matti Picus <matti.pi...@gmail.com> +Date: Sat, 25 Dec 2021 11:50:49 -0400 +Subject: cpyext: typo in import.h + +Bug-Debian: https://bugs.debian.org/1001519 +Origin: upstream, https://foss.heptapod.net/pypy/pypy/-/commit/f8d0f6ad0832af43ef0cd0feabad9f0f408b0110 +--- + pypy/module/cpyext/include/import.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/pypy/module/cpyext/include/import.h b/pypy/module/cpyext/include/import.h +index f03457b..7460c0a 100644 +--- a/pypy/module/cpyext/include/import.h ++++ b/pypy/module/cpyext/include/import.h +@@ -18,8 +18,6 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel( + #define PyImport_ImportModuleEx(n, g, l, f) \ + PyImport_ImportModuleLevel(n, g, l, f, 0) + +-#endif +- + #ifdef __cplusplus + } + #endif diff -Nru pypy3-7.3.5+dfsg/debian/patches/series pypy3-7.3.5+dfsg/debian/patches/series --- pypy3-7.3.5+dfsg/debian/patches/series 2021-06-03 15:59:21.000000000 -0400 +++ pypy3-7.3.5+dfsg/debian/patches/series 2021-12-25 11:54:46.000000000 -0400 @@ -21,3 +21,4 @@ tkinter-import noise python3-sphinx +import-h-endif
