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

[Jan Steffens]

    Date: Thursday, March 1, 2018 @ 15:33:50
  Author: heftig
Revision: 317681

Remove an i686-only patch ( https://bugzilla.mozilla.org/show_bug.cgi?id=1382942 )

Modified:
  nss/trunk/PKGBUILD
Deleted:
  nss/trunk/no-plt.diff

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-01 15:28:54 UTC (rev 317680)
+++ PKGBUILD	2018-03-01 15:33:50 UTC (rev 317681)
@@ -14,7 +14,7 @@
 makedepends=(perl python2 xmlto docbook-xsl gyp)
 options=(!strip !makeflags staticlibs)
 source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
-        certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml enable-libpkix.patch no-plt.diff)
+        certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml enable-libpkix.patch)
 sha256sums=('f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa'
             '512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
             '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
@@ -21,8 +21,7 @@
             'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
             'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
             '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
-            '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
-            'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+            '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
 
 prepare() {
   mkdir certs path
@@ -36,7 +35,6 @@
   cd nss-$pkgver
 
   patch -Np1 -i ../enable-libpkix.patch
-  patch -Np2 -i ../no-plt.diff
 
   ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
   ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/

Deleted: no-plt.diff
===================================================================
--- no-plt.diff	2018-03-01 15:28:54 UTC (rev 317680)
+++ no-plt.diff	2018-03-01 15:33:50 UTC (rev 317681)
@@ -1,48 +0,0 @@
-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