Date: Tuesday, January 29, 2019 @ 08:51:23 Author: heftig Revision: 428385
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 428384, lib32-nss/trunk/PKGBUILD) lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 428384, lib32-nss/trunk/no-plt.diff) -------------+ PKGBUILD | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ no-plt.diff | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 428384, lib32-nss/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2019-01-29 08:51:23 UTC (rev 428385) @@ -0,0 +1,59 @@ +# Maintainer: 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.42 +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) +_nsprver=4.20 +depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss) +makedepends=(perl python2 gyp) +source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz" + no-plt.diff) +sha256sums=('5d3ce489f11803c66a7fba773c3f9b9a428ff3e5fe67a974e88b5e9095072f13' + 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa') + +prepare() { + mkdir path + + ln -s /usr/bin/python2 path/python + + cd nss-$pkgver + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942 + patch -Np2 -i ../no-plt.diff +} + +build() { + export PKG_CONFIG_PATH=/usr/lib32/pkgconfig + + cd nss-$pkgver/nss + PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \ + --m32 --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests +} + +package() { + cd nss-$pkgver + + sed nss/pkg/pkg-config/nss.pc.in \ + -e "s,%libdir%,/usr/lib32,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/usr/lib32/pkgconfig/nss.pc" + + ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc" + + cd dist/Release/lib + install -Dt "$pkgdir/usr/lib32" *.so + install -Dt "$pkgdir/usr/lib32" -m644 *.chk + + # Replace built-in trust with p11-kit connection + ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so" +} Copied: lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 428384, lib32-nss/trunk/no-plt.diff) =================================================================== --- multilib-testing-x86_64/no-plt.diff (rev 0) +++ multilib-testing-x86_64/no-plt.diff 2019-01-29 08:51:23 UTC (rev 428385) @@ -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