[arch-commits] Commit in lib32-nss/repos (3 files)

[Jan Steffens]

    Date: Saturday, May 29, 2021 @ 17:35:41
  Author: heftig
Revision: 950173

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 950172, lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
  lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
    (from rev 950172, lib32-nss/trunk/PKGBUILD)

------------------------------------------------+
 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch |   57 +++++++++++++++++++++
 PKGBUILD                                       |   62 +++++++++++++++++++++++
 2 files changed, 119 insertions(+)

Copied: lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (from rev 950172, 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-05-29 17:35:41 UTC (rev 950173)
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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 at GOTOFF(%ebx),\reg
++    call   thunk.ax
++    addl   $_GLOBAL_OFFSET_TABLE_, %eax
++    movl   \var at GOTOFF(%eax),\reg
+ .endm
+ .macro PUT   reg,var
+-    movl   \reg,\var at GOTOFF(%ebx)
++    call   thunk.dx
++    addl   $_GLOBAL_OFFSET_TABLE_, %edx
++    movl   \reg,\var at 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 950172, lib32-nss/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-testing-x86_64/PKGBUILD	2021-05-29 17:35:41 UTC (rev 950173)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at 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.66
+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"
+        0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
+sha256sums=('89a79e3a756cf0ac9ba645f4d4c0fc58d4133134401fb0b6c8a74c420bb4cdc9'
+            'e27a9fc2e7687ab9c1cb430917f13775ab29f9abf4c2032ea262a5a2a8b43ffa')
+
+prepare() {
+  cd nss-$pkgver/nss
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
+  patch -Np1 -i "$srcdir/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch"
+}
+
+build() {
+  cd nss-$pkgver/nss
+  ./build.sh \
+    --target ia32 \
+    --opt \
+    --system-sqlite \
+    --system-nspr \
+    --enable-libpkix \
+    --disable-tests
+}
+
+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
+
+  # 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: