Date: Thursday, December 16, 2021 @ 11:56:15 Author: heftig Revision: 1074343
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-nss/repos/multilib-testing-x86_64/ lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (from rev 1074342, lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch) lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 1074342, lib32-nss/trunk/PKGBUILD) ------------------------------------------------+ 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++++++++++++++++++ PKGBUILD | 66 +++++++++++++++++++++++ 2 files changed, 123 insertions(+) Copied: lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (from rev 1074342, lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch) =================================================================== --- multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (rev 0) +++ multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch 2021-12-16 11:56:15 UTC (rev 1074343) @@ -0,0 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sat, 12 Dec 2020 13:43:54 +0100 +Subject: [PATCH] Hack mpi_x64.s to work with -fno-plt + +--- + lib/freebl/mpi/mpi_x86.s | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +diff --git a/lib/freebl/mpi/mpi_x86.s b/lib/freebl/mpi/mpi_x86.s +index 8f7e2130c3..b3ca1ce5b4 100644 +--- a/lib/freebl/mpi/mpi_x86.s ++++ b/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 Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 1074342, lib32-nss/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2021-12-16 11:56:15 UTC (rev 1074343) @@ -0,0 +1,66 @@ +# 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.73.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' nss) +makedepends=(perl python gyp mercurial) +_revision=69c5a0c748ad36772a3ce03c60f8a1fa353776dc +source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision" + 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch) +sha256sums=('SKIP' + 'e27a9fc2e7687ab9c1cb430917f13775ab29f9abf4c2032ea262a5a2a8b43ffa') + +pkgver() { + cd nss + hg id -t | sed 's/^NSS_//;s/_RTM$//;s/_/./g' +} + +prepare() { + cd nss + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942 + patch -Np1 -i ../0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch +} + +build() { + cd nss + ./build.sh \ + --target ia32 \ + --opt \ + --system-sqlite \ + --system-nspr \ + --enable-libpkix \ + --disable-tests +} + +package() { + local nsprver="$(i686-pc-linux-gnu-pkg-config --modversion nspr)" + local libdir=/usr/lib32 + + 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 + + # 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" +} + +# vim:set sw=2 et: