Source: nss Version: 2:3.19.2-1 Followup-For: Bug #699217 Attached patch rebased for the current version, and simplified.
Please *do* apply! -- System Information: Debian Release: stretch/sid APT prefers unreleased APT policy: (500, 'unreleased'), (500, 'buildd-unstable'), (500, 'unstable') Architecture: x32 (x86_64) Foreign Architectures: i386, amd64 Kernel: Linux 4.0.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/lksh Init: sysvinit (via /sbin/init)
diff -Nru nss-3.19.2/debian/changelog nss-3.19.2/debian/changelog --- nss-3.19.2/debian/changelog 2015-06-20 23:30:17.000000000 +0200 +++ nss-3.19.2/debian/changelog 2015-07-13 17:33:37.000000000 +0200 @@ -1,3 +1,13 @@ +nss (2:3.19.2-1+x32.1) unreleased; urgency=medium + + * Non-maintainer upload. + * (Closes: #699217) + + [ Daniel Schepler ] + * Set USE_X32=1 for x32 builds. + + -- Thorsten Glaser <[email protected]> Mon, 13 Jul 2015 17:33:21 +0200 + nss (2:3.19.2-1) unstable; urgency=medium * New upstream release. diff -Nru nss-3.19.2/debian/rules nss-3.19.2/debian/rules --- nss-3.19.2/debian/rules 2015-06-20 23:27:31.000000000 +0200 +++ nss-3.19.2/debian/rules 2015-07-13 17:32:18.000000000 +0200 @@ -28,8 +28,12 @@ ifneq (,$(filter 64 alpha amd64 ia64 s390x,$(shell dpkg-architecture -qDEB_HOST_ARCH_BITS 2> /dev/null || dpkg-architecture -qDEB_HOST_ARCH))) USE_64 := USE_64=1 else +ifeq (x32,$(shell dpkg-architecture -qDEB_HOST_ARCH)) +USE_64 := USE_X32=1 +else USE_64 := endif +endif TOOLCHAIN := @@ -182,8 +186,11 @@ # Check FIPS mode correctly works mkdir debian/tmp LD_LIBRARY_PATH=debian/libnss3/usr/lib/$(DEB_HOST_MULTIARCH):debian/libnss3/usr/lib/$(DEB_HOST_MULTIARCH)/nss debian/libnss3-tools/usr/bin/modutil -create -dbdir debian/tmp < /dev/null +# skip test on x32 - see https://bugzilla.mozilla.org/show_bug.cgi?id=1062903 +ifneq (x32,$(shell dpkg-architecture -qDEB_HOST_ARCH)) LD_LIBRARY_PATH=debian/libnss3/usr/lib/$(DEB_HOST_MULTIARCH):debian/libnss3/usr/lib/$(DEB_HOST_MULTIARCH)/nss debian/libnss3-tools/usr/bin/modutil -fips true -dbdir debian/tmp < /dev/null endif +endif override_dh_makeshlibs: /usr/share/debhelper/autoscripts/postinst-makeshlibs /usr/share/debhelper/autoscripts/postrm-makeshlibs dh_makeshlibs -a -- -c4
