[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, August 19, 2022 @ 15:37:57
Author: heftig
Revision: 1270944
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 1270943,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1270943, lib32-nss/trunk/PKGBUILD)
+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++
PKGBUILD | 67 +++
2 files changed, 124 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1270943,
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
2022-08-19 15:37:57 UTC (rev 1270944)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1270943,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-08-19 15:37:57 UTC (rev 1270944)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.82
+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=dba0f1c0f2388f75f345ba188cbb99cf04ded59f
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, July 22, 2022 @ 05:17:09
Author: heftig
Revision: 1255174
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 1255173,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1255173, lib32-nss/trunk/PKGBUILD)
+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++
PKGBUILD | 67 +++
2 files changed, 124 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1255173,
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
2022-07-22 05:17:09 UTC (rev 1255174)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1255173,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-07-22 05:17:09 UTC (rev 1255174)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Thursday, June 23, 2022 @ 22:13:00
Author: heftig
Revision: 1239294
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 1239293,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1239293, lib32-nss/trunk/PKGBUILD)
+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++
PKGBUILD | 67 +++
2 files changed, 124 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1239293,
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
2022-06-23 22:13:00 UTC (rev 1239294)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1239293,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-06-23 22:13:00 UTC (rev 1239294)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.80
+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=9fb4de4bec24f23c7b5580d7c53607e432a4520d
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, May 27, 2022 @ 18:14:03
Author: heftig
Revision: 1210866
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 1210865,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1210865, lib32-nss/trunk/PKGBUILD)
+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++
PKGBUILD | 67 +++
2 files changed, 124 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1210865,
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
2022-05-27 18:14:03 UTC (rev 1210866)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1210865,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-05-27 18:14:03 UTC (rev 1210866)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.79
+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=3463596523bee515266f572dc73e6724e68f6afd
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, April 29, 2022 @ 01:31:08
Author: heftig
Revision: 1191736
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 1191735,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1191735, lib32-nss/trunk/PKGBUILD)
+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++
PKGBUILD | 67 +++
2 files changed, 124 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1191735,
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
2022-04-29 01:31:08 UTC (rev 1191736)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1191735,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-04-29 01:31:08 UTC (rev 1191736)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.78
+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)
+options=(debug)
+_revision=30fe50c80e23ac81bcc53ef6695e98715bb2d420
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, April 1, 2022 @ 17:25:01
Author: heftig
Revision: 1180616
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 1180615,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1180615, lib32-nss/trunk/PKGBUILD)
+
0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++
PKGBUILD | 67 +++
2 files changed, 124 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch
(from rev 1180615,
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
2022-04-01 17:25:01 UTC (rev 1180616)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1180615,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-04-01 17:25:01 UTC (rev 1180616)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.76.1
+pkgrel=2
+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)
+options=(debug)
+_revision=0e6c67470eed5044ace519e2405ddfa7186f0dc2
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Tuesday, March 29, 2022 @ 18:18:20
Author: heftig
Revision: 1177666
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 1177665,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1177665, 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 1177665,
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
2022-03-29 18:18:20 UTC (rev 1177666)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1177665,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-03-29 18:18:20 UTC (rev 1177666)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.76.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=0e6c67470eed5044ace519e2405ddfa7186f0dc2
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, March 4, 2022 @ 15:29:33
Author: heftig
Revision: 1141707
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 1141706,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1141706, 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 1141706,
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
2022-03-04 15:29:33 UTC (rev 1141707)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1141706,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-03-04 15:29:33 UTC (rev 1141707)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.76
+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=b5b9832a38988f8b6ad58c81235ee85a62bdc8e0
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Saturday, February 5, 2022 @ 14:01:22
Author: heftig
Revision: 1126439
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 1126438,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1126438, 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 1126438,
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
2022-02-05 14:01:22 UTC (rev 1126439)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1126438,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-02-05 14:01:22 UTC (rev 1126439)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.75
+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=27194d9a9ebdeac520fc1d15dcfe82af6873435a
+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 | 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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Thursday, January 6, 2022 @ 16:19:29
Author: heftig
Revision: 1094739
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 1094738,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1094738, 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 1094738,
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
2022-01-06 16:19:29 UTC (rev 1094739)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1094738,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2022-01-06 16:19:29 UTC (rev 1094739)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.74
+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=83d13f65aff55bba36016fbe81095d02e006dd1f
+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 | 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:
[arch-commits] Commit in lib32-nss/repos (3 files)
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 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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/PKGBUILD2021-12-16 11:56:15 UTC (rev 1074343)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Wednesday, December 1, 2021 @ 17:19:02
Author: heftig
Revision: 1060627
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 1060626,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1060626, 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 1060626,
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-01 17:19:02 UTC (rev 1060627)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1060626,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-12-01 17:19:02 UTC (rev 1060627)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.73
+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=a2050bd67f05e8af5984baca03078d69b3874b85
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Tuesday, November 23, 2021 @ 17:16:40
Author: heftig
Revision: 1054496
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 1054495,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1054495, 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 1054495,
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-11-23 17:16:40 UTC (rev 1054496)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1054495,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-11-23 17:16:40 UTC (rev 1054496)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.72
+pkgrel=2
+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=('6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Sunday, October 31, 2021 @ 19:44:49
Author: heftig
Revision: 1035124
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 1035123,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1035123, 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 1035123,
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-10-31 19:44:49 UTC (rev 1035124)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1035123,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-10-31 19:44:49 UTC (rev 1035124)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.72
+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=('6848428fa18be2f05b7f1ed0696fc853b4cfa2c0c3ac3d3cfbb4a5ca7429e7f4'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, October 1, 2021 @ 18:05:05
Author: heftig
Revision: 1026507
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 1026506,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1026506, 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 1026506,
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-10-01 18:05:05 UTC (rev 1026507)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1026506,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-10-01 18:05:05 UTC (rev 1026507)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.71
+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=('99acd315d9af35419cda4a6960f00a7d446bd231bd407174a7b07cb3dba0c253'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Sunday, September 5, 2021 @ 18:48:35
Author: heftig
Revision: 1011830
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 1011829,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1011829, 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 1011829,
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-09-05 18:48:35 UTC (rev 1011830)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1011829,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-09-05 18:48:35 UTC (rev 1011830)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.70
+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=('2b89abb8601ee405be8ac5b5703d71f1fb38a51c3a64a3d834387f78b325511b'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Wednesday, September 1, 2021 @ 09:04:51
Author: heftig
Revision: 1010261
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 1010260,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1010260, 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 1010260,
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-09-01 09:04:51 UTC (rev 1010261)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 1010260,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-09-01 09:04:51 UTC (rev 1010261)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.69.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')
+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=('bbdbd248c25e2faf498edbdd2ffd5896b54cfa35bd2e450813b491f805c754e0'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, August 6, 2021 @ 23:46:07
Author: heftig
Revision: 994623
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 994622,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 994622, 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 994622,
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-08-06 23:46:07 UTC (rev 994623)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 994622,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-08-06 23:46:07 UTC (rev 994623)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.69
+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=('c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Monday, July 12, 2021 @ 21:50:28
Author: heftig
Revision: 976709
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 976708,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 976708, 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 976708,
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-07-12 21:50:28 UTC (rev 976709)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 976708,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-07-12 21:50:28 UTC (rev 976709)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.68
+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=('c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, June 11, 2021 @ 15:49:31
Author: heftig
Revision: 962815
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 962814,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 962814, 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 962814,
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-06-11 15:49:31 UTC (rev 962815)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 962814,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-06-11 15:49:31 UTC (rev 962815)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.67
+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=('f6549a9148cd27b394b40c77fa73111d5ea23cdb51d796665de1b7458f88ce7f'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
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 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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/PKGBUILD2021-05-29 17:35:41 UTC (rev 950173)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Saturday, May 15, 2021 @ 13:53:32
Author: heftig
Revision: 934646
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 934645,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 934645, 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 934645,
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-15 13:53:32 UTC (rev 934646)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 934645,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-05-15 13:53:32 UTC (rev 934646)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.65
+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=('32170f6c188212a78bf9fdacffa2eeed0d564ef8faae63fd8ae971b208e8c637'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, April 16, 2021 @ 13:55:22
Author: heftig
Revision: 919425
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 919424,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 919424, 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 919424,
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-04-16 13:55:22 UTC (rev 919425)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 919424,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-04-16 13:55:22 UTC (rev 919425)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.64
+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=('d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Thursday, March 18, 2021 @ 23:15:11
Author: heftig
Revision: 894529
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 894528,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 894528, 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 894528,
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-03-18 23:15:11 UTC (rev 894529)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 894528,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-03-18 23:15:11 UTC (rev 894529)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.63
+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=('182d2fef629102ae9423aabf2c192242b565cf5098e82c5a26cf70c5e4ea2221'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Friday, February 19, 2021 @ 21:55:35
Author: heftig
Revision: 866339
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 866338,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 866338, 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 866338,
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-02-19 21:55:35 UTC (rev 866339)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 866338,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-02-19 21:55:35 UTC (rev 866339)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.62
+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=('86d6df7cece25b8d4efa53e4c19af903c484eb79871163f37b5232bb406a5478'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Saturday, January 23, 2021 @ 23:54:34
Author: heftig
Revision: 827129
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 827127,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 827127, 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 827127,
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-01-23 23:54:34 UTC (rev 827129)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 827127,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-01-23 23:54:34 UTC (rev 827129)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.61
+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=('312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370'
+'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:
[arch-commits] Commit in lib32-nss/repos (3 files)
Date: Thursday, January 7, 2021 @ 15:47:30
Author: heftig
Revision: 812089
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 812088,
lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 812088, 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 812088,
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-01-07 15:47:30 UTC (rev 812089)
@@ -0,0 +1,57 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+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
++.globlthunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globlthunk.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 812088,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2021-01-07 15:47:30 UTC (rev 812089)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.60.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')
+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=('2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d'
+'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:
