summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2020-11-06 17:52:09 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2020-11-06 17:52:09 +0100
commit13cc3c5a08376f70aab3fc56ed303a452efc5bcb (patch)
tree5d06cc8c2615c0968ff666c550586d9805aeb28f
parente5f2a2a84a1fae132bc9b514370528fa7d8572b4 (diff)
downloadpackages-13cc3c5a08376f70aab3fc56ed303a452efc5bcb.tar.xz
core/nss: redone no-plt patch
-rw-r--r--core/nss/PKGBUILD6
-rw-r--r--core/nss/nss-3.58-no-plt.patch (renamed from core/nss/no-plt.diff)16
2 files changed, 8 insertions, 14 deletions
diff --git a/core/nss/PKGBUILD b/core/nss/PKGBUILD
index a82c4a3b..3b83d0c6 100644
--- a/core/nss/PKGBUILD
+++ b/core/nss/PKGBUILD
@@ -1,12 +1,12 @@
# bring back changes of 617b84f70caf
-source+=(no-plt.diff)
-sha256sums+=('ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+source+=(nss-3.58-no-plt.patch)
+sha256sums+=('3d08665a7d693f495bd965e4f629cbf4671d4cf00567a391fd0b2e0e40153d57')
eval "$(
declare -f prepare | \
sed '
- /cd nss-/a patch -Np2 -i "$srcdir/no-plt.diff"
+ /cd nss-/a patch -Np2 -i "$srcdir/nss-3.58-no-plt.patch"
'
)"
diff --git a/core/nss/no-plt.diff b/core/nss/nss-3.58-no-plt.patch
index 9014f8b7..cd9183af 100644
--- a/core/nss/no-plt.diff
+++ b/core/nss/nss-3.58-no-plt.patch
@@ -1,8 +1,7 @@
-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
+diff -rauN nss-3.58/nss/lib/freebl/mpi/mpi_x86.s nss-3.58-no-plt-patch/nss/lib/freebl/mpi/mpi_x86.s
+--- nss-3.58/nss/lib/freebl/mpi/mpi_x86.s 2020-10-16 16:50:49.000000000 +0200
++++ nss-3.58-no-plt-patch/nss/lib/freebl/mpi/mpi_x86.s 2020-11-06 17:46:18.822061734 +0100
+@@ -22,10 +22,14 @@
#
.ifndef NO_PIC
.macro GET var,reg
@@ -19,12 +18,7 @@ index 8f7e2130c3264754..b3ca1ce5b41b3771 100644
.endm
.else
.macro GET var,reg
- movl \var,\reg
- .endm
- .macro PUT reg,var
- movl \reg,\var
- .endm
- .endif
+@@ -38,6 +42,21 @@
.text