[arch-commits] Commit in lib32-nss/trunk (PKGBUILD no-plt.diff)

[Jan Steffens]

    Date: Sunday, October 1, 2017 @ 09:43:13
  Author: heftig
Revision: 261157

3.33-1

Added:
  lib32-nss/trunk/no-plt.diff
Modified:
  lib32-nss/trunk/PKGBUILD

-------------+
 PKGBUILD    |   15 +++++++++------
 no-plt.diff |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-01 09:41:35 UTC (rev 261156)
+++ PKGBUILD	2017-10-01 09:43:13 UTC (rev 261157)
@@ -4,8 +4,8 @@
 # Contributor: Ionut Biru <ibiru at archlinux dot org>
 
 pkgname=lib32-nss
-pkgver=3.31
-pkgrel=3
+pkgver=3.33
+pkgrel=1
 pkgdesc="Network Security Services (32-bit)"
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 arch=(x86_64)
@@ -15,10 +15,11 @@
 makedepends=(gcc-multilib perl gyp)
 options=(!strip !makeflags staticlibs)
 source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
-        nss.pc.in enable-libpkix.patch)
-sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
+        nss.pc.in enable-libpkix.patch no-plt.diff)
+sha256sums=('98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4'
             'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
-            '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
+            '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
+            'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
 
 prepare() {
   mkdir path
@@ -28,6 +29,7 @@
   cd nss-$pkgver
 
   patch -Np1 -i ../enable-libpkix.patch
+  patch -Np2 -i ../no-plt.diff
 }
 
 build() {
@@ -34,7 +36,8 @@
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
 
   cd nss-$pkgver/nss
-  PATH="$srcdir/path:$PATH" ./build.sh --m32 --opt --system-sqlite --system-nspr --disable-tests
+  PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+    --m32 --opt --system-sqlite --system-nspr --disable-tests
 }
 
 package() {

Added: no-plt.diff
===================================================================
--- no-plt.diff	                        (rev 0)
+++ no-plt.diff	2017-10-01 09:43:13 UTC (rev 261157)
@@ -0,0 +1,48 @@
+diff --git i/security/nss/lib/freebl/mpi/mpi_x86.s w/security/nss/lib/freebl/mpi/mpi_x86.s
+index 8f7e2130c3264754..b3ca1ce5b41b3771 100644
+--- i/security/nss/lib/freebl/mpi/mpi_x86.s
++++ w/security/nss/lib/freebl/mpi/mpi_x86.s
+@@ -22,22 +22,41 @@ is_sse: .long	-1
+ #
+ .ifndef NO_PIC
+ .macro GET   var,reg
+-    movl   \var at GOTOFF(%ebx),\reg
++    call   thunk.ax
++    addl   $_GLOBAL_OFFSET_TABLE_, %eax
++    movl   \var at GOTOFF(%eax),\reg
+ .endm
+ .macro PUT   reg,var
+-    movl   \reg,\var at GOTOFF(%ebx)
++    call   thunk.dx
++    addl   $_GLOBAL_OFFSET_TABLE_, %edx
++    movl   \reg,\var at GOTOFF(%edx)
+ .endm
+ .else
+ .macro GET   var,reg
+     movl   \var,\reg
+ .endm
+ .macro PUT   reg,var
+     movl   \reg,\var
+ .endm
+ .endif
+ 
+ .text
+ 
++.ifndef NO_PIC
++.globl	thunk.ax
++.hidden	thunk.ax
++.type	thunk.ax, @function
++thunk.ax:
++       movl   (%esp),%eax
++       ret
++
++.globl	thunk.dx
++.hidden	thunk.dx
++.type	thunk.dx, @function
++thunk.dx:
++       movl   (%esp),%edx
++       ret
++.endif
+ 
+  #  ebp - 36:	caller's esi
+  #  ebp - 32:	caller's edi