Browse Source

[multilib-testing] -> [multilib] 'lib32-nss-3.81-1' move

master
Nathan Owens 3 weeks ago
parent
commit
efd5104cb4
Signed by: ndowens
GPG Key ID: DC5A6F8092641E2D
  1. 57
      lib32-nss/x86_64/multilib-testing/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
  2. 67
      lib32-nss/x86_64/multilib-testing/PKGBUILD
  3. 4
      lib32-nss/x86_64/multilib/PKGBUILD

57
lib32-nss/x86_64/multilib-testing/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch

@ -1,57 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@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 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

67
lib32-nss/x86_64/multilib-testing/PKGBUILD

@ -1,67 +0,0 @@
# Maintainer: Nathan Owens <ndowens@artixlinux.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.81
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>=4.34' lib32-sqlite lib32-zlib 'lib32-p11-kit>=0.23.19' nss)
makedepends=(perl python gyp mercurial)
options=(debug)
_revision=01d45a3c6d270940f4514cebdeed150f972b4f2b
source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision"
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
sha256sums=('SKIP'
'e95b3fea802aba8ae1cfff45fa7881ec0e8d092d58a10f098caae4d5f878305e')
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 et:

4
lib32-nss/x86_64/multilib/PKGBUILD

@ -4,7 +4,7 @@
# Contributor: Ionut Biru <ibiru at archlinux dot org>
pkgname=lib32-nss
pkgver=3.80
pkgver=3.81
pkgrel=1
pkgdesc="Network Security Services (32-bit)"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
@ -13,7 +13,7 @@ license=(MPL GPL)
depends=('lib32-nspr>=4.34' lib32-sqlite lib32-zlib 'lib32-p11-kit>=0.23.19' nss)
makedepends=(perl python gyp mercurial)
options=(debug)
_revision=9fb4de4bec24f23c7b5580d7c53607e432a4520d
_revision=01d45a3c6d270940f4514cebdeed150f972b4f2b
source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision"
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
sha256sums=('SKIP'

Loading…
Cancel
Save