Bug#699217: proposed NMU

[Adam Borowski]

Hi!
Besides the x32 FTBFS, I think it's a good idea to also grab the hppa patch
from #808990.  I don't know hppa, but the patch can't break any other
architecture.

Thus, I've prepared and scheduled for Friday a NMU with these two FTBFS
fixes, debdiff attached.  If you're not okay with this, please holler.

I have also re-tested x32 with the testsuite-enabling patch from #806639, it
passes that correctly.  Of course, I did not include that in the NMU.

I did not test the hppa fix, I'm assuming Helge Deller who submitted it did.

Meow!
-- 
A tit a day keeps the vet away.
-------------- next part --------------
diff -Nru nss-3.21/debian/changelog nss-3.21/debian/changelog
--- nss-3.21/debian/changelog	2015-11-25 01:49:43.000000000 +0100
+++ nss-3.21/debian/changelog	2016-02-14 14:47:23.000000000 +0100
@@ -1,3 +1,11 @@
+nss (2:3.21-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS on x32. Closes: #699217
+  * Fix FTBFS on hppa. Closes: #808990
+
+ -- Adam Borowski <kilobyte at angband.pl>  Sun, 14 Feb 2016 14:46:40 +0100
+
 nss (2:3.21-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru nss-3.21/debian/patches/38_hppa.patch nss-3.21/debian/patches/38_hppa.patch
--- nss-3.21/debian/patches/38_hppa.patch	1970-01-01 01:00:00.000000000 +0100
+++ nss-3.21/debian/patches/38_hppa.patch	2016-02-14 14:45:46.000000000 +0100
@@ -0,0 +1,15 @@
+Description: fix double definition of BYTE_ORDER on hppa
+Author: Helge Deller <deller at gmx.de>
+Bug-Debian: https://bugs.debian.org/808990
+
+--- nss-3.21.orig/nss/lib/dbm/include/mcom_db.h
++++ nss-3.21/nss/lib/dbm/include/mcom_db.h
+@@ -110,7 +110,7 @@ typedef PRUint32 uint32;
+ #endif /* !BYTE_ORDER */
+ #endif /* __sun */
+ 
+-#if defined(__hpux) || defined(__hppa)
++#if defined(__hpux)
+ #define BYTE_ORDER BIG_ENDIAN
+ #define BIG_ENDIAN      4321
+ #define LITTLE_ENDIAN   1234            /* LSB first: i386, vax, all NT risc */
diff -Nru nss-3.21/debian/patches/series nss-3.21/debian/patches/series
--- nss-3.21/debian/patches/series	2015-11-25 01:10:17.000000000 +0100
+++ nss-3.21/debian/patches/series	2016-02-14 14:44:37.000000000 +0100
@@ -2,3 +2,4 @@
 38_kbsd.patch
 80_security_tools.patch
 85_security_load.patch
+38_hppa.patch
diff -Nru nss-3.21/debian/rules nss-3.21/debian/rules
--- nss-3.21/debian/rules	2015-08-22 01:51:54.000000000 +0200
+++ nss-3.21/debian/rules	2016-02-14 14:46:21.000000000 +0100
@@ -63,6 +63,7 @@
 	DIST=$(DISTDIR) \
 	OBJDIR_NAME=OBJS \
 	$(and $(filter 64,$(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)),USE_64=1) \
+	$(and $(filter x32,$(shell dpkg-architecture -qDEB_HOST_ARCH)),USE_X32=1) \
 	$(NULL)
 
 NSS_TOOLS := \