Date: Friday, March 10, 2023 @ 12:24:59
Author: heftig
Revision: 1417218
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 1417217,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1417217, lib32-nss/trunk/PKGBUILD)
------------------------------------------------+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++++++++++++++
PKGBUILD | 82 +++++++++++++++++++++++
2 files changed, 139 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1417217,
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
2023-03-10 12:24:59 UTC (rev 1417218)
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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 8f7e2130c326..b3ca1ce5b41b 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 1417217,
lib32-nss/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2023-03-10 12:24:59 UTC (rev 1417218)
@@ -0,0 +1,82 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# 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.89
+pkgrel=1
+pkgdesc="Network Security Services (32-bit)"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
+arch=(x86_64)
+license=(
+ GPL
+ MPL
+)
+depends=(
+ 'lib32-nspr>=4.35'
+ 'lib32-p11-kit>=0.23.19'
+ lib32-sqlite
+ lib32-zlib
+ nss
+)
+makedepends=(
+ gyp
+ mercurial
+ perl
+ python
+)
+_revision=4e4ebb9ad0d4391035c76c26967682c148ff0fd7
+source=(
+ "hg+https://hg.mozilla.org/projects/nss#revision=$_revision";
+ 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
+)
+b2sums=('SKIP'
+
'733308e0a39d286cba2dc72478f95ca341bb357a8c61aba9dd79681a1210fafc93d8459d5014769f533b54fa987e9e9c5a49437fda5396d42b669d9567919cf4')
+
+pkgver() {
+ cd nss
+ hg id -t -r. | 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 sts=-1 et:
