diff -Nru nspr-4.35/debian/changelog nspr-4.35/debian/changelog --- nspr-4.35/debian/changelog 2022-09-17 21:29:06.000000000 +0000 +++ nspr-4.35/debian/changelog 2023-02-22 20:00:34.000000000 +0000 @@ -1,3 +1,10 @@ +nspr (2:4.35-1.1) unstable; urgency=medium + + * Non-maintainer upload + * Avoid libreswan build failures on mipsel (Closes: #854472) + + -- Daniel Kahn Gillmor Wed, 22 Feb 2023 15:00:34 -0500 + nspr (2:4.35-1) unstable; urgency=medium * New upstream release. diff -Nru nspr-4.35/debian/patches/0001-Avoid-libreswan-build-failures-on-mipsel-Closes-8544.patch nspr-4.35/debian/patches/0001-Avoid-libreswan-build-failures-on-mipsel-Closes-8544.patch --- nspr-4.35/debian/patches/0001-Avoid-libreswan-build-failures-on-mipsel-Closes-8544.patch 1970-01-01 00:00:00.000000000 +0000 +++ nspr-4.35/debian/patches/0001-Avoid-libreswan-build-failures-on-mipsel-Closes-8544.patch 2023-02-10 20:56:53.000000000 +0000 @@ -0,0 +1,30 @@ +From: Daniel Kahn Gillmor +Date: Fri, 10 Feb 2023 15:55:36 -0500 +Subject: Avoid libreswan build failures on mipsel (Closes: #854472) + +Forwarded: https://bugzilla.mozilla.org/show_bug.cgi?id=1815947 + +Bug 1815947 - Fix build failure with glibc and uclibc while including sgidefs.h + +Let's include glibc and uclibc while with musl let's include Linux +. +--- + nspr/pr/include/md/_linux.cfg | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/nspr/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg +index 2232820..009d5e5 100644 +--- a/nspr/pr/include/md/_linux.cfg ++++ b/nspr/pr/include/md/_linux.cfg +@@ -499,7 +499,11 @@ + #elif defined(__mips__) + + /* For _ABI64 */ ++#if defined(__GLIBC__) || defined(__UCLIBC__) ++#include ++#else + #include ++#endif + + #ifdef __MIPSEB__ + #define IS_BIG_ENDIAN 1 diff -Nru nspr-4.35/debian/patches/series nspr-4.35/debian/patches/series --- nspr-4.35/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ nspr-4.35/debian/patches/series 2023-02-10 20:56:53.000000000 +0000 @@ -0,0 +1 @@ +0001-Avoid-libreswan-build-failures-on-mipsel-Closes-8544.patch