Date: Wednesday, May 20, 2020 @ 01:34:33 Author: heftig Revision: 630365
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-nss/repos/multilib-testing-x86_64/ lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 630364, lib32-nss/trunk/PKGBUILD) lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 630364, lib32-nss/trunk/no-plt.diff) -------------+ PKGBUILD | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ no-plt.diff | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 630364, lib32-nss/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2020-05-20 01:34:33 UTC (rev 630365) @@ -0,0 +1,56 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: kfgz <kfgz at interia pl> +# Contributor: Ionut Biru <ibiru at archlinux dot org> + +pkgname=lib32-nss +pkgver=3.52.1 +pkgrel=1 +pkgdesc="Network Security Services (32-bit)" +url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" +arch=(x86_64) +license=(MPL GPL) +depends=(lib32-nspr lib32-sqlite lib32-zlib 'lib32-p11-kit>=0.23.19') +makedepends=(perl python gyp) +source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz" + no-plt.diff) +sha256sums=('bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278' + 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa') + +prepare() { + cd nss-$pkgver + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942 + patch -Np2 -i ../no-plt.diff +} + +build() { + cd nss-$pkgver/nss + ./build.sh -v --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests --m32 +} + +package() { + depends+=(nss) + + cd nss-$pkgver + + local libdir=/usr/lib32 nsprver="$(i686-pc-linux-gnu-pkg-config --modversion nspr)" + sed nss/pkg/pkg-config/nss.pc.in \ + -e "s,%libdir%,$libdir,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,$nsprver,g" \ + -e "s,%NSS_VERSION%,$pkgver,g" | + install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc" + + ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc" + + install -Dt "$pkgdir$libdir" dist/Release/lib/*.so + install -Dt "$pkgdir$libdir" -m644 dist/Release/lib/*.chk + + + # Replace built-in trust with p11-kit connection + ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so" + ln -sf p11-kit-trust.so "$pkgdir$libdir/libnssckbi.so" +} Copied: lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 630364, lib32-nss/trunk/no-plt.diff) =================================================================== --- multilib-testing-x86_64/no-plt.diff (rev 0) +++ multilib-testing-x86_64/no-plt.diff 2020-05-20 01:34:33 UTC (rev 630365) @@ -0,0 +1,48 @@ +diff --git i/security/nss/lib/freebl/mpi/mpi_x86.s w/security/nss/lib/freebl/mpi/mpi_x86.s +index 8f7e2130c3264754..b3ca1ce5b41b3771 100644 +--- i/security/nss/lib/freebl/mpi/mpi_x86.s ++++ w/security/nss/lib/freebl/mpi/mpi_x86.s +@@ -22,22 +22,41 @@ is_sse: .long -1 + # + .ifndef NO_PIC + .macro GET var,reg +- movl \var@GOTOFF(%ebx),\reg ++ call thunk.ax ++ addl $_GLOBAL_OFFSET_TABLE_, %eax ++ movl \var@GOTOFF(%eax),\reg + .endm + .macro PUT reg,var +- movl \reg,\var@GOTOFF(%ebx) ++ call thunk.dx ++ addl $_GLOBAL_OFFSET_TABLE_, %edx ++ movl \reg,\var@GOTOFF(%edx) + .endm + .else + .macro GET var,reg + movl \var,\reg + .endm + .macro PUT reg,var + movl \reg,\var + .endm + .endif + + .text + ++.ifndef NO_PIC ++.globl thunk.ax ++.hidden thunk.ax ++.type thunk.ax, @function ++thunk.ax: ++ movl (%esp),%eax ++ ret ++ ++.globl thunk.dx ++.hidden thunk.dx ++.type thunk.dx, @function ++thunk.dx: ++ movl (%esp),%edx ++ ret ++.endif + + # ebp - 36: caller's esi + # ebp - 32: caller's edi