[arch-commits] Commit in lib32-nss/repos (4 files)
Date: Monday, November 2, 2020 @ 15:41:38
Author: heftig
Revision: 739893
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-nss/repos/multilib-testing-x86_64/
lib32-nss/repos/multilib-testing-x86_64/0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch
(from rev 739892,
lib32-nss/trunk/0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch)
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 739892, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-testing-x86_64/no-plt.diff
(from rev 739892, lib32-nss/trunk/no-plt.diff)
-+
0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch | 159
++
PKGBUILD| 69
no-plt.diff | 48 +++
3 files changed, 276 insertions(+)
Copied:
lib32-nss/repos/multilib-testing-x86_64/0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch
(from rev 739892,
lib32-nss/trunk/0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch)
===
---
multilib-testing-x86_64/0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch
(rev 0)
+++
multilib-testing-x86_64/0001-Bug-1672703-always-tolerate-the-first-CCS-in-TLS-1.3.patch
2020-11-02 15:41:38 UTC (rev 739893)
@@ -0,0 +1,159 @@
+From Mon Sep 17 00:00:00 2001
+From: Daiki Ueno
+Date: Mon, 26 Oct 2020 06:46:11 +0100
+Subject: [PATCH] Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
+
+Summary:
+This flips the meaning of the flag for checking excessive CCS
+messages, so it only rejects multiple CCS messages while the first CCS
+message is always accepted.
+
+Reviewers: mt
+
+Reviewed By: mt
+
+Bug #: 1672703
+
+Differential Revision: https://phabricator.services.mozilla.com/D94603
+---
+ gtests/ssl_gtest/ssl_tls13compat_unittest.cc | 18 +-
+ lib/ssl/ssl3con.c| 20 +++-
+ lib/ssl/sslimpl.h| 5 +
+ 3 files changed, 17 insertions(+), 26 deletions(-)
+
+diff --git a/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
b/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
+index dcede798cc..645f84ff02 100644
+--- a/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
b/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
+@@ -348,59 +348,59 @@ TEST_F(TlsConnectStreamTls13,
ChangeCipherSpecBeforeClientHelloTwice) {
+ client_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT);
+ }
+
+-// The server rejects a ChangeCipherSpec if the client advertises an
+-// empty session ID.
++// The server accepts a ChangeCipherSpec even if the client advertises
++// an empty session ID.
+ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
+ EnsureTlsSetup();
+ ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+
+ StartConnect();
+ client_->Handshake(); // Send ClientHello
+ client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs))); // Send
CCS
+
+- server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
+- server_->Handshake(); // Consume ClientHello and CCS
+- server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
++ Handshake();
++ CheckConnected();
+ }
+
+ // The server rejects multiple ChangeCipherSpec even if the client
+ // indicates compatibility mode with non-empty session ID.
+ TEST_F(Tls13CompatTest, ChangeCipherSpecAfterClientHelloTwice) {
+ EnsureTlsSetup();
+ ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+ EnableCompatMode();
+
+ StartConnect();
+ client_->Handshake(); // Send ClientHello
+ // Send CCS twice in a row
+ client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+ client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+
+ server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
+ server_->Handshake(); // Consume ClientHello and CCS.
+ server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
+ }
+
+-// The client rejects a ChangeCipherSpec if it advertises an empty
++// The client accepts a ChangeCipherSpec even if it advertises an empty
+ // session ID.
+ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
+ EnsureTlsSetup();
+ ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+
+ // To replace Finished with a CCS below
+ auto filter = MakeTlsFilter(server_);
+ filter->SetHandshakeTypes({kTlsHandshakeFinished});
+ filter->EnableDecryption();
+
+ StartConnect();
+ client_->Handshake(); // Send ClientHello
+ server_->Handshake(); // Consume ClientHello, and
+ // send ServerHello..CertificateVerify
+ // Send CCS
+ server_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+- client_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
+- client_->Handshake(); /
[arch-commits] Commit in lib32-nss/repos (4 files)
Date: Friday, December 6, 2019 @ 20:10:56
Author: heftig
Revision: 536060
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-nss/repos/multilib-testing-x86_64/
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 536059, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-testing-x86_64/no-plt.diff
(from rev 536059, lib32-nss/trunk/no-plt.diff)
lib32-nss/repos/multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch
(from rev 536059, lib32-nss/trunk/nss-3.47-certdb-temp-cert.patch)
-+
PKGBUILD| 64 +++
no-plt.diff | 48 ++
nss-3.47-certdb-temp-cert.patch | 68 ++
3 files changed, 180 insertions(+)
Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 536059,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2019-12-06 20:10:56 UTC (rev 536060)
@@ -0,0 +1,64 @@
+# Maintainer: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.48
+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)
+_nsprver=4.20
+depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
+makedepends=(perl python2 gyp)
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz";
+nss-3.47-certdb-temp-cert.patch
+no-plt.diff)
+sha256sums=('3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac'
+'bd16ba87e5ea736888f76dd54dff18b25ca6608245c0195fb85bad3d782db73c'
+'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+
+prepare() {
+ mkdir path
+
+ ln -s /usr/bin/python2 path/python
+
+ cd nss-$pkgver
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
+ patch -Np2 -i ../no-plt.diff
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
+ patch -d nss -Np1 < ../nss-3.47-certdb-temp-cert.patch
+}
+
+build() {
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+ cd nss-$pkgver/nss
+ PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+--m32 --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
+}
+
+package() {
+ cd nss-$pkgver
+
+ sed nss/pkg/pkg-config/nss.pc.in \
+-e "s,%libdir%,/usr/lib32,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/usr/lib32/pkgconfig/nss.pc"
+
+ ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+
+ cd dist/Release/lib
+ install -Dt "$pkgdir/usr/lib32" *.so
+ install -Dt "$pkgdir/usr/lib32" -m644 *.chk
+
+ # Replace built-in trust with p11-kit connection
+ ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Copied: lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 536059,
lib32-nss/trunk/no-plt.diff)
===
--- multilib-testing-x86_64/no-plt.diff (rev 0)
+++ multilib-testing-x86_64/no-plt.diff 2019-12-06 20:10:56 UTC (rev 536060)
@@ -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@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/nss-3.47-certdb-temp-cert.patch
(from rev 536059, lib32-nss/trunk/nss-3.47-certdb-temp-cert.patch)
===
--- multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch
(rev 0)
+++ multilib-testing-x86_64/nss-3.47-certdb-temp-cer
[arch-commits] Commit in lib32-nss/repos (4 files)
Date: Wednesday, December 4, 2019 @ 14:53:09
Author: heftig
Revision: 535209
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-nss/repos/multilib-testing-x86_64/
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 535208, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-testing-x86_64/no-plt.diff
(from rev 535208, lib32-nss/trunk/no-plt.diff)
lib32-nss/repos/multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch
(from rev 535208, lib32-nss/trunk/nss-3.47-certdb-temp-cert.patch)
-+
PKGBUILD| 64 ++
no-plt.diff | 48
nss-3.47-certdb-temp-cert.patch | 63 +
3 files changed, 175 insertions(+)
Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 535208,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2019-12-04 14:53:09 UTC (rev 535209)
@@ -0,0 +1,64 @@
+# Maintainer: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.47.1
+pkgrel=5
+pkgdesc="Network Security Services (32-bit)"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
+arch=(x86_64)
+license=(MPL GPL)
+_nsprver=4.20
+depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
+makedepends=(perl python2 gyp)
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz";
+nss-3.47-certdb-temp-cert.patch
+no-plt.diff)
+sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
+'e4d7c7d6ac8c8cccd5bb23c217402922aafc1c104e46ae17a39f3c13b0e96002'
+'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+
+prepare() {
+ mkdir path
+
+ ln -s /usr/bin/python2 path/python
+
+ cd nss-$pkgver
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
+ patch -Np2 -i ../no-plt.diff
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
+ patch -d nss -Np1 < ../nss-3.47-certdb-temp-cert.patch
+}
+
+build() {
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+ cd nss-$pkgver/nss
+ PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+--m32 --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
+}
+
+package() {
+ cd nss-$pkgver
+
+ sed nss/pkg/pkg-config/nss.pc.in \
+-e "s,%libdir%,/usr/lib32,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/usr/lib32/pkgconfig/nss.pc"
+
+ ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+
+ cd dist/Release/lib
+ install -Dt "$pkgdir/usr/lib32" *.so
+ install -Dt "$pkgdir/usr/lib32" -m644 *.chk
+
+ # Replace built-in trust with p11-kit connection
+ ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Copied: lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 535208,
lib32-nss/trunk/no-plt.diff)
===
--- multilib-testing-x86_64/no-plt.diff (rev 0)
+++ multilib-testing-x86_64/no-plt.diff 2019-12-04 14:53:09 UTC (rev 535209)
@@ -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@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/nss-3.47-certdb-temp-cert.patch
(from rev 535208, lib32-nss/trunk/nss-3.47-certdb-temp-cert.patch)
===
--- multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch
(rev 0)
+++ multilib-testing-x86_64/nss-3.47-certdb
[arch-commits] Commit in lib32-nss/repos (4 files)
Date: Friday, November 29, 2019 @ 09:11:48
Author: heftig
Revision: 534324
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-nss/repos/multilib-testing-x86_64/
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 534323, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-testing-x86_64/no-plt.diff
(from rev 534323, lib32-nss/trunk/no-plt.diff)
lib32-nss/repos/multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch
(from rev 534323, lib32-nss/trunk/nss-3.47-certdb-temp-cert.patch)
-+
PKGBUILD| 64 ++
no-plt.diff | 48 +++
nss-3.47-certdb-temp-cert.patch | 230 ++
3 files changed, 342 insertions(+)
Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 534323,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2019-11-29 09:11:48 UTC (rev 534324)
@@ -0,0 +1,64 @@
+# Maintainer: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.47.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)
+_nsprver=4.20
+depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
+makedepends=(perl python2 gyp)
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz";
+nss-3.47-certdb-temp-cert.patch
+no-plt.diff)
+sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
+'dd9d9ba4091a5f24e5bb9d6e97658d9cb62b7926ff888373435e08e3bec9147b'
+'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+
+prepare() {
+ mkdir path
+
+ ln -s /usr/bin/python2 path/python
+
+ cd nss-$pkgver
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
+ patch -Np2 -i ../no-plt.diff
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
+ patch -d nss -Np1 < ../nss-3.47-certdb-temp-cert.patch
+}
+
+build() {
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+ cd nss-$pkgver/nss
+ PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+--m32 --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
+}
+
+package() {
+ cd nss-$pkgver
+
+ sed nss/pkg/pkg-config/nss.pc.in \
+-e "s,%libdir%,/usr/lib32,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/usr/lib32/pkgconfig/nss.pc"
+
+ ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+
+ cd dist/Release/lib
+ install -Dt "$pkgdir/usr/lib32" *.so
+ install -Dt "$pkgdir/usr/lib32" -m644 *.chk
+
+ # Replace built-in trust with p11-kit connection
+ ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Copied: lib32-nss/repos/multilib-testing-x86_64/no-plt.diff (from rev 534323,
lib32-nss/trunk/no-plt.diff)
===
--- multilib-testing-x86_64/no-plt.diff (rev 0)
+++ multilib-testing-x86_64/no-plt.diff 2019-11-29 09:11:48 UTC (rev 534324)
@@ -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@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/nss-3.47-certdb-temp-cert.patch
(from rev 534323, lib32-nss/trunk/nss-3.47-certdb-temp-cert.patch)
===
--- multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch
(rev 0)
+++ multilib-testing-x86_64/nss-3.47-certdb-temp-cert.patch 2019-11-29
09:11:48 UTC (rev
[arch-commits] Commit in lib32-nss/repos (4 files)
Date: Friday, June 9, 2017 @ 17:55:14
Author: heftig
Revision: 235671
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-nss/repos/multilib-testing-x86_64/
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 235670, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-testing-x86_64/enable-libpkix.patch
(from rev 235670, lib32-nss/trunk/enable-libpkix.patch)
lib32-nss/repos/multilib-testing-x86_64/nss.pc.in
(from rev 235670, lib32-nss/trunk/nss.pc.in)
--+
PKGBUILD | 58 +
enable-libpkix.patch | 12 ++
nss.pc.in| 11 +
3 files changed, 81 insertions(+)
Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 235670,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2017-06-09 17:55:14 UTC (rev 235671)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+pkgname=lib32-nss
+pkgver=3.31
+pkgrel=3
+pkgdesc="Network Security Services (32-bit)"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
+arch=(x86_64)
+license=(MPL GPL)
+_nsprver=4.15
+depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
+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'
+'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
+'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
+
+prepare() {
+ mkdir path
+
+ ln -s /usr/bin/python2 path/python
+
+ cd nss-$pkgver
+
+ patch -Np1 -i ../enable-libpkix.patch
+}
+
+build() {
+ 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
+}
+
+package() {
+ cd nss-$pkgver
+
+ sed ../nss.pc.in \
+-e "s,%libdir%,/usr/lib32,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/usr/lib32/pkgconfig/nss.pc"
+ ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+
+ cd dist/Release/lib
+ install -Dt "$pkgdir/usr/lib32" *.so
+ install -Dt "$pkgdir/usr/lib32" -m644 *.chk
+
+ ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Copied: lib32-nss/repos/multilib-testing-x86_64/enable-libpkix.patch (from rev
235670, lib32-nss/trunk/enable-libpkix.patch)
===
--- multilib-testing-x86_64/enable-libpkix.patch
(rev 0)
+++ multilib-testing-x86_64/enable-libpkix.patch2017-06-09 17:55:14 UTC
(rev 235671)
@@ -0,0 +1,12 @@
+diff -u -r nss-3.31/nss/build.sh nss-3.31-libpkix/nss/build.sh
+--- nss-3.31/nss/build.sh 2017-06-08 12:53:01.0 +0200
nss-3.31-libpkix/nss/build.sh 2017-06-09 19:11:21.746133040 +0200
+@@ -52,7 +52,7 @@
+ no_local_nspr=0
+ armhf=0
+
+-gyp_params=(--depth="$cwd" --generator-output=".")
++gyp_params=(--depth="$cwd" --generator-output="." -Ddisable_libpkix=0)
+ nspr_params=()
+ ninja_params=()
+
Copied: lib32-nss/repos/multilib-testing-x86_64/nss.pc.in (from rev 235670,
lib32-nss/trunk/nss.pc.in)
===
--- multilib-testing-x86_64/nss.pc.in (rev 0)
+++ multilib-testing-x86_64/nss.pc.in 2017-06-09 17:55:14 UTC (rev 235671)
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
[arch-commits] Commit in lib32-nss/repos (4 files)
Date: Wednesday, August 27, 2014 @ 21:45:22
Author: heftig
Revision: 117984
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-nss/repos/multilib-testing-x86_64/
lib32-nss/repos/multilib-testing-x86_64/PKGBUILD
(from rev 117983, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-testing-x86_64/nss.pc.in
(from rev 117983, lib32-nss/trunk/nss.pc.in)
lib32-nss/repos/multilib-testing-x86_64/ssl-renegotiate-transitional.patch
(from rev 117983, lib32-nss/trunk/ssl-renegotiate-transitional.patch)
+
PKGBUILD | 82 +++
nss.pc.in | 11
ssl-renegotiate-transitional.patch | 21
3 files changed, 114 insertions(+)
Copied: lib32-nss/repos/multilib-testing-x86_64/PKGBUILD (from rev 117983,
lib32-nss/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2014-08-27 19:45:22 UTC (rev 117984)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Daniel Wallace
+# Contributor: kfgz
+# Contributor: Ionut Biru
+
+_pkgbasename=nss
+pkgname=lib32-${_pkgbasename}
+pkgver=3.17
+pkgrel=1
+pkgdesc="Mozilla Network Security Services (32-bit)"
+arch=('x86_64')
+url="http://www.mozilla.org/projects/security/pki/nss/";
+
+#download_url=ftp://ftp.mozilla.org/pub/security/nss/releases/
+#alternative download link
+#ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
+
+license=('MPL' 'GPL')
+_nsprver=4.10.7
+depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite>=3.6.17' "${_pkgbasename}"
'lib32-zlib' 'lib32-p11-kit')
+makedepends=('gcc-multilib' 'perl')
+options=('!strip' '!makeflags' staticlibs)
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
+nss.pc.in
+ssl-renegotiate-transitional.patch)
+sha256sums=('3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81'
+'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+'12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97')
+
+prepare() {
+ cd "${srcdir}"/${_pkgbasename}-${pkgver}/
+
+ # Adds transitional SSL renegotiate support - patch from Debian
+ patch -Np3 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+
+ # Respect LDFLAGS
+ sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
+ -i nss/coreconf/rules.mk
+}
+
+build(){
+ cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename
+
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+ export BUILD_OPT=1
+ export NSS_USE_SYSTEM_SQLITE=1
+ export NSS_ENABLE_ECC=1
+ export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
+ export NSPR_LIB_DIR="`nspr-config --libdir`"
+ export XCFLAGS="${CFLAGS}"
+
+ make -C coreconf
+ make -C lib/dbm
+ make
+}
+
+package() {
+ cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename
+ install -d "$pkgdir"/usr/lib32/pkgconfig
+
+ NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
+ NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
+ NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}')
+
+ sed $srcdir/nss.pc.in \
+-e "s,%libdir%,/usr/lib32,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" \
+> "$pkgdir/usr/lib32/pkgconfig/nss.pc"
+ ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+
+
+ cd "${srcdir}"/${_pkgbasename}-${pkgver}/dist/*.OBJ/lib
+ install -t "$pkgdir/usr/lib32" *.so
+ install -t "$pkgdir/usr/lib32" -m644 libcrmf.a *.chk
+
+ rm "$pkgdir/usr/lib32/libnssckbi.so"
+ ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Copied: lib32-nss/repos/multilib-testing-x86_64/nss.pc.in (from rev 117983,
lib32-nss/trunk/nss.pc.in)
===
--- multilib-testing-x86_64/nss.pc.in (rev 0)
+++ multilib-testing-x86_64/nss.pc.in 2014-08-27 19:45:22 UTC (rev 117984)
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
Copied:
lib32-nss/repos/multilib-testing-x86_64/ssl-renegotiate-transitional.patch
(from rev 117983, lib32-nss/trunk/ssl-renegotiate-transitional.patch)
===
--- multilib-testing-x86_64/ssl-renegotiate-transitional.patch
(rev 0)
+++ multilib-testing-x86_64/ssl-renegotiate-transitional.patch 2014-08-27
19:45:22 U
