[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, December 12, 2020 @ 12:46:13
Author: heftig
Revision: 404093
3.60-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-12 10:44:22 UTC (rev 404092)
+++ PKGBUILD2020-12-12 12:46:13 UTC (rev 404093)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.59
+pkgver=3.60
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24'
+sha256sums=('84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, October 17, 2020 @ 16:33:29
Author: heftig
Revision: 398515
3.58-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-10-17 14:48:22 UTC (rev 398514)
+++ PKGBUILD2020-10-17 16:33:29 UTC (rev 398515)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.57
+pkgver=3.58
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382'
+sha256sums=('9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, September 19, 2020 @ 09:56:20
Author: heftig
Revision: 396314
3.57-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-18 23:46:03 UTC (rev 396313)
+++ PKGBUILD2020-09-19 09:56:20 UTC (rev 396314)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.56
+pkgver=3.57
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c'
+sha256sums=('55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, August 21, 2020 @ 17:10:49
Author: heftig
Revision: 394483
3.56-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-21 17:06:18 UTC (rev 394482)
+++ PKGBUILD2020-08-21 17:10:49 UTC (rev 394483)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.55
-pkgrel=2
+pkgver=3.56
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('fc692e3db45a082ee6328cd989e795c171a00df9c518df090937f7604f850004'
+sha256sums=('f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Sunday, July 26, 2020 @ 22:54:49
Author: heftig
Revision: 392564
3.55-2
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-26 20:58:47 UTC (rev 392563)
+++ PKGBUILD2020-07-26 22:54:49 UTC (rev 392564)
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.55
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('a02c0bb1b91199600f9b7b45a9dd2feb8a0e3fafd3fc11ca7c5a3f0103bb76d2'
+sha256sums=('fc692e3db45a082ee6328cd989e795c171a00df9c518df090937f7604f850004'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, July 25, 2020 @ 19:34:08
Author: heftig
Revision: 392535
3.55-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-25 19:28:42 UTC (rev 392534)
+++ PKGBUILD2020-07-25 19:34:08 UTC (rev 392535)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.54
+pkgver=3.55
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,16 +13,15 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43'
+sha256sums=('a02c0bb1b91199600f9b7b45a9dd2feb8a0e3fafd3fc11ca7c5a3f0103bb76d2'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
prepare() {
mkdir certs
+ ln -srt certs nss-$pkgver/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h}
cd nss-$pkgver
- ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
- ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
build() {
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, June 27, 2020 @ 17:06:49
Author: heftig
Revision: 390524
3.54-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-27 16:56:19 UTC (rev 390523)
+++ PKGBUILD2020-06-27 17:06:49 UTC (rev 390524)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.53.1
+pkgver=3.54
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('2dccde67079b25c4e95ac3121f11b2819c37cf8c48ca263a45d8f83f7a315316'
+sha256sums=('dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, June 17, 2020 @ 14:16:44
Author: heftig
Revision: 389429
3.53.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-17 12:38:45 UTC (rev 389428)
+++ PKGBUILD2020-06-17 14:16:44 UTC (rev 389429)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.53
+pkgver=3.53.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('08d36dc1a56325f02e626626d4eeab9c4d126dbd99dfaf419b91d0a696f58917'
+sha256sums=('2dccde67079b25c4e95ac3121f11b2819c37cf8c48ca263a45d8f83f7a315316'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Sunday, May 31, 2020 @ 02:52:40
Author: heftig
Revision: 387944
3.53-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD | 16
1 file changed, 12 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-31 01:16:18 UTC (rev 387943)
+++ PKGBUILD2020-05-31 02:52:40 UTC (rev 387944)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.52.1
-pkgrel=2
+pkgver=3.53
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278'
+sha256sums=('08d36dc1a56325f02e626626d4eeab9c4d126dbd99dfaf419b91d0a696f58917'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
@@ -33,7 +33,13 @@
./bundle.sh
cd nss-$pkgver/nss
- ./build.sh -v --opt --system-sqlite --system-nspr --enable-libpkix
--disable-tests
+ ./build.sh \
+--target x64 \
+--opt \
+--system-sqlite \
+--system-nspr \
+--enable-libpkix \
+--disable-tests
}
package_nss() {
@@ -88,3 +94,5 @@
install -Dm644 ca-bundle.trust.p11-kit \
"$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit"
}
+
+# vim:set sw=2 et:
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, May 20, 2020 @ 01:45:32 Author: heftig Revision: 386978 3.52.1-2: FS#66715 bad package signature Modified: nss/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-20 01:45:24 UTC (rev 386977) +++ PKGBUILD2020-05-20 01:45:32 UTC (rev 386978) @@ -4,7 +4,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) pkgver=3.52.1 -pkgrel=1 +pkgrel=2 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS; arch=(x86_64)
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, May 20, 2020 @ 01:34:19
Author: heftig
Revision: 386975
3.52.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD | 51 +--
1 file changed, 25 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-20 01:32:36 UTC (rev 386974)
+++ PKGBUILD2020-05-20 01:34:19 UTC (rev 386975)
@@ -1,19 +1,19 @@
-# Maintainer: Jan de Groot
+# Maintainer: Jan Alexander Steffens (heftig)
+# Contributor: Jan de Groot
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.52
+pkgver=3.52.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
license=(MPL GPL)
-_nsprver=4.25
-depends=("nspr>=${_nsprver}" sqlite zlib sh 'p11-kit>=0.23.19')
+depends=(nspr sqlite zlib sh '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;
certdata2pem.py bundle.sh)
-sha256sums=('0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561'
+sha256sums=('bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
@@ -37,25 +37,29 @@
}
package_nss() {
- local vmajor vminor vpatch
cd nss-$pkgver
- { read vmajor; read vminor; read vpatch; } \
-< <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
-
+ local libdir=/usr/lib nsprver="$(pkg-config --modversion nspr)"
sed nss/pkg/pkg-config/nss.pc.in \
--e "s,%libdir%,/usr/lib,g" \
+-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,%NSPR_VERSION%,$nsprver,g" \
-e "s,%NSS_VERSION%,$pkgver,g" |
-install -Dm644 /dev/stdin "$pkgdir/usr/lib/pkgconfig/nss.pc"
+install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc"
- ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
+ ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc"
+ install -Dt "$pkgdir$libdir" dist/Release/lib/*.so
+ install -Dt "$pkgdir$libdir" -m644 dist/Release/lib/*.chk
+
+ local vmajor vminor vpatch
+ { read vmajor; read vminor; read vpatch; } \
+< <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
+
sed nss/pkg/pkg-config/nss-config.in \
--e "s,@libdir@,/usr/lib,g" \
+-e "s,@libdir@,$libdir,g" \
-e "s,@prefix@,/usr/bin,g" \
-e "s,@exec_prefix@,/usr/bin,g" \
-e "s,@includedir@,/usr/include/nss,g" \
@@ -64,22 +68,17 @@
-e "s,@MOD_PATCH_VERSION@,$vpatch,g" |
install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
- cd nss/doc/nroff
- install -Dt "$pkgdir/usr/share/man/man1" -m644 *util.1 signtool.1 signver.1
ssltap.1
+ install -Dt "$pkgdir/usr/bin" \
+dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap}
- cd ../../../dist
- install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h
+ install -Dt "$pkgdir/usr/include/nss" -m644 dist/public/nss/*.h
- cd Release/bin
- install -Dt "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+ install -Dt "$pkgdir/usr/share/man/man1" -m644 \
+nss/doc/nroff/{*util,signtool,signver,ssltap}.1
- cd ../lib
- install -Dt "$pkgdir/usr/lib" *.so
- install -Dt "$pkgdir/usr/lib" -m644 *.chk
-
# Replace built-in trust with p11-kit connection
- ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/p11-kit-trust.so"
- ln -sf p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so"
+ ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so"
+ ln -sf p11-kit-trust.so "$pkgdir$libdir/libnssckbi.so"
}
package_ca-certificates-mozilla() {
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, May 2, 2020 @ 20:55:52
Author: heftig
Revision: 382180
3.52-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-02 20:48:31 UTC (rev 382179)
+++ PKGBUILD2020-05-02 20:55:52 UTC (rev 382180)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.51.1
+pkgver=3.52
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78'
+sha256sums=('0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, April 9, 2020 @ 07:55:18
Author: heftig
Revision: 379920
FS#66066 missing soname link
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-09 07:44:30 UTC (rev 379919)
+++ PKGBUILD2020-04-09 07:55:18 UTC (rev 379920)
@@ -78,7 +78,8 @@
install -Dt "$pkgdir/usr/lib" -m644 *.chk
# Replace built-in trust with p11-kit connection
- ln -sf pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so"
+ ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/p11-kit-trust.so"
+ ln -sf p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so"
}
package_ca-certificates-mozilla() {
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, April 9, 2020 @ 07:44:30
Author: heftig
Revision: 379919
3.51.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-09 06:59:27 UTC (rev 379918)
+++ PKGBUILD2020-04-09 07:44:30 UTC (rev 379919)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.51
+pkgver=3.51.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c'
+sha256sums=('085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, March 7, 2020 @ 02:15:25
Author: heftig
Revision: 376873
3.51-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-03-06 21:27:58 UTC (rev 376872)
+++ PKGBUILD2020-03-07 02:15:25 UTC (rev 376873)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.50
+pkgver=3.51
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7'
+sha256sums=('75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, February 8, 2020 @ 02:10:27
Author: heftig
Revision: 374994
3.50-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-02-07 23:16:39 UTC (rev 374993)
+++ PKGBUILD2020-02-08 02:10:27 UTC (rev 374994)
@@ -2,18 +2,18 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.49.2
-pkgrel=3
+pkgver=3.50
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
license=(MPL GPL)
-_nsprver=4.24
+_nsprver=4.25
depends=("nspr>=${_nsprver}" sqlite zlib sh '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;
certdata2pem.py bundle.sh)
-sha256sums=('faa7502c3ce9240d4be2aa88f63d88cf7d1cc512060e63ef21a7813c236160b2'
+sha256sums=('185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, January 29, 2020 @ 18:23:45 Author: bpiotrowski Revision: 374251 3.49.2-3 Modified: nss/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-01-29 18:15:52 UTC (rev 374250) +++ PKGBUILD2020-01-29 18:23:45 UTC (rev 374251) @@ -3,7 +3,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) pkgver=3.49.2 -pkgrel=2 +pkgrel=3 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS; arch=(x86_64)
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, January 24, 2020 @ 21:56:56
Author: heftig
Revision: 373887
3.49.2-2: FS#64401 Drop the custom libnssckbi and use p11-kit-trust proper
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-24 21:07:39 UTC (rev 373886)
+++ PKGBUILD2020-01-24 21:56:56 UTC (rev 373887)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.49.2
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -78,7 +78,7 @@
install -Dt "$pkgdir/usr/lib" -m644 *.chk
# Replace built-in trust with p11-kit connection
- ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
+ ln -sf pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so"
}
package_ca-certificates-mozilla() {
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, January 24, 2020 @ 10:02:12
Author: heftig
Revision: 373874
3.49.2-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-24 08:20:18 UTC (rev 373873)
+++ PKGBUILD2020-01-24 10:02:12 UTC (rev 373874)
@@ -2,8 +2,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.49.1
-pkgrel=2
+pkgver=3.49.2
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e'
+sha256sums=('faa7502c3ce9240d4be2aa88f63d88cf7d1cc512060e63ef21a7813c236160b2'
'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD certdata2pem.py)
Date: Wednesday, January 22, 2020 @ 09:15:47
Author: heftig
Revision: 373785
3.49.1-2: p11-kit 0.23.19
Modified:
nss/trunk/PKGBUILD
nss/trunk/certdata2pem.py
-+
PKGBUILD| 10 +-
certdata2pem.py | 15 +++
2 files changed, 20 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-22 09:13:10 UTC (rev 373784)
+++ PKGBUILD2020-01-22 09:15:47 UTC (rev 373785)
@@ -3,18 +3,18 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.49.1
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
license=(MPL GPL)
-_nsprver=4.20
-depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
+_nsprver=4.24
+depends=("nspr>=${_nsprver}" sqlite zlib sh '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;
certdata2pem.py bundle.sh)
sha256sums=('d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e'
-'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
+'d2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
prepare() {
@@ -83,7 +83,7 @@
package_ca-certificates-mozilla() {
pkgdesc="Mozilla's set of trusted CA certificates"
- depends=(ca-certificates-utils)
+ depends=('ca-certificates-utils>=20181109-3')
install -Dm644 ca-bundle.trust.p11-kit \
"$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit"
Modified: certdata2pem.py
===
--- certdata2pem.py 2020-01-22 09:13:10 UTC (rev 373784)
+++ certdata2pem.py 2020-01-22 09:15:47 UTC (rev 373785)
@@ -177,6 +177,11 @@
"CKA_TRUST_EMAIL_PROTECTION": "emailProtection",
}
+cert_distrust_types = {
+ "CKA_NSS_SERVER_DISTRUST_AFTER": "nss-server-distrust-after",
+ "CKA_NSS_EMAIL_DISTRUST_AFTER": "nss-email-distrust-after",
+}
+
for tobj in objects:
if tobj['CKA_CLASS'] == 'CKO_NSS_TRUST':
key = tobj['CKA_LABEL'] + printable_serial(tobj)
@@ -369,6 +374,16 @@
f.write("nss-mozilla-ca-policy: true\n")
f.write("modifiable: false\n");
+# requires p11-kit >= 0.23.19
+for t in list(cert_distrust_types.keys()):
+if t in obj:
+value = obj[t]
+if value == 'CK_FALSE':
+value = bytearray(1)
+f.write(cert_distrust_types[t] + ": \"")
+f.write(urllib.parse.quote(value));
+f.write("\"\n")
+
f.write("-BEGIN CERTIFICATE-\n")
temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, January 15, 2020 @ 10:27:11
Author: heftig
Revision: 373495
3.49.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-15 10:04:51 UTC (rev 373494)
+++ PKGBUILD2020-01-15 10:27:11 UTC (rev 373495)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.49
+pkgver=3.49.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('6738094dc4fd63061118a122bf3999a64fe8c7117fc52f6e81c2279181bde71d'
+sha256sums=('d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD nss-3.47-certdb-temp-cert.patch)
Date: Tuesday, January 7, 2020 @ 20:10:40
Author: heftig
Revision: 372769
3.49-1
Modified:
nss/trunk/PKGBUILD
Deleted:
nss/trunk/nss-3.47-certdb-temp-cert.patch
-+
PKGBUILD|9 +
nss-3.47-certdb-temp-cert.patch | 68 --
2 files changed, 2 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-07 20:01:26 UTC (rev 372768)
+++ PKGBUILD2020-01-07 20:10:40 UTC (rev 372769)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.48
+pkgver=3.49
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -12,10 +12,8 @@
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
makedepends=(perl python 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
certdata2pem.py bundle.sh)
-sha256sums=('3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac'
-'bd16ba87e5ea736888f76dd54dff18b25ca6608245c0195fb85bad3d782db73c'
+sha256sums=('6738094dc4fd63061118a122bf3999a64fe8c7117fc52f6e81c2279181bde71d'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
@@ -25,9 +23,6 @@
cd nss-$pkgver
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
-
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
- patch -d nss -Np1 < ../nss-3.47-certdb-temp-cert.patch
}
build() {
Deleted: nss-3.47-certdb-temp-cert.patch
===
--- nss-3.47-certdb-temp-cert.patch 2020-01-07 20:01:26 UTC (rev 372768)
+++ nss-3.47-certdb-temp-cert.patch 2020-01-07 20:10:40 UTC (rev 372769)
@@ -1,68 +0,0 @@
-From 9530978d1552674792e281391100269305a38c47 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno
-Date: Fri, 6 Dec 2019 10:47:01 +0100
-Subject: [PATCH] Bug 1593167, certdb: propagate trust information if trust
- module is loaded afterwards, r=rrelyea,keeler
-
-Summary:
-When the builtin trust module is loaded after some temp certs being created,
these temp certs are usually not accompanied by trust information. This causes
a problem in Firefox as it loads the module from a separate thread while
accessing the network cache which populates temp certs.
-
-This change makes it properly roll up the trust information, if a temp cert
doesn't have trust information.
-
-Reviewers: rrelyea, keeler
-
-Reviewed By: rrelyea, keeler
-
-Subscribers: reviewbot, heftig
-
-Bug #: 1593167
-
-Differential Revision: https://phabricator.services.mozilla.com/D54726
- lib/pki/pki3hack.c | 30 ++
- 1 file changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/lib/pki/pki3hack.c b/lib/pki/pki3hack.c
-index 29d2fb5a40..eac4a5705e 100644
a/lib/pki/pki3hack.c
-+++ b/lib/pki/pki3hack.c
-@@ -921,14 +921,28 @@ stan_GetCERTCertificate(NSSCertificate *c, PRBool
forceUpdate)
- }
- if (!cc->nssCertificate || forceUpdate) {
- fill_CERTCertificateFields(c, cc, forceUpdate);
--} else if (CERT_GetCertTrust(cc, ) != SECSuccess &&
-- !c->object.cryptoContext) {
--/* if it's a perm cert, it might have been stored before the
-- * trust, so look for the trust again. But a temp cert can be
-- * ignored.
-- */
--CERTCertTrust *trust = NULL;
--trust = nssTrust_GetCERTCertTrustForCert(c, cc);
-+} else if (CERT_GetCertTrust(cc, ) != SECSuccess) {
-+CERTCertTrust *trust;
-+if (!c->object.cryptoContext) {
-+/* If it's a perm cert, it might have been stored before the
-+ * trust, so look for the trust again.
-+ */
-+trust = nssTrust_GetCERTCertTrustForCert(c, cc);
-+} else {
-+/* If it's a temp cert, it might have been stored before the
-+ * builtin trust module is loaded, so look for the trust
-+ * again, but don't set the empty trust if it is not found.
-+ */
-+NSSTrust *t =
nssTrustDomain_FindTrustForCertificate(c->object.cryptoContext->td, c);
-+if (!t) {
-+goto loser;
-+}
-+trust = cert_trust_from_stan_trust(t, cc->arena);
-+nssTrust_Destroy(t);
-+if (!trust) {
-+goto loser;
-+}
-+}
-
- CERT_LockCertTrust(cc);
- cc->trust = trust;
---
-2.24.0
-
[arch-commits] Commit in nss/trunk (PKGBUILD nss-3.47-certdb-temp-cert.patch)
Date: Friday, December 6, 2019 @ 20:10:23
Author: heftig
Revision: 370482
3.48-1
Modified:
nss/trunk/PKGBUILD
nss/trunk/nss-3.47-certdb-temp-cert.patch
-+
PKGBUILD|8
nss-3.47-certdb-temp-cert.patch | 23 ++-
2 files changed, 18 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-06 20:09:55 UTC (rev 370481)
+++ PKGBUILD2019-12-06 20:10:23 UTC (rev 370482)
@@ -2,8 +2,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.47.1
-pkgrel=5
+pkgver=3.48
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -14,8 +14,8 @@
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
nss-3.47-certdb-temp-cert.patch
certdata2pem.py bundle.sh)
-sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
-'e4d7c7d6ac8c8cccd5bb23c217402922aafc1c104e46ae17a39f3c13b0e96002'
+sha256sums=('3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac'
+'bd16ba87e5ea736888f76dd54dff18b25ca6608245c0195fb85bad3d782db73c'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
Modified: nss-3.47-certdb-temp-cert.patch
===
--- nss-3.47-certdb-temp-cert.patch 2019-12-06 20:09:55 UTC (rev 370481)
+++ nss-3.47-certdb-temp-cert.patch 2019-12-06 20:10:23 UTC (rev 370482)
@@ -1,10 +1,8 @@
-# HG changeset patch
-# User Daiki Ueno
-# Date 1575450841 -3600
-# Wed Dec 04 10:14:01 2019 +0100
-# Node ID 017097f0a0eaea1a3d849f3de79475c9bc28fcc2
-# Parent d64102b76a437f24d98a20480dcc9f1655143e7c
-Bug 1593167, certdb: propagate trust information if trust module is loaded
afterwards
+From 9530978d1552674792e281391100269305a38c47 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno
+Date: Fri, 6 Dec 2019 10:47:01 +0100
+Subject: [PATCH] Bug 1593167, certdb: propagate trust information if trust
+ module is loaded afterwards, r=rrelyea,keeler
Summary:
When the builtin trust module is loaded after some temp certs being created,
these temp certs are usually not accompanied by trust information. This causes
a problem in Firefox as it loads the module from a separate thread while
accessing the network cache which populates temp certs.
@@ -13,7 +11,7 @@
Reviewers: rrelyea, keeler
-Reviewed By: rrelyea
+Reviewed By: rrelyea, keeler
Subscribers: reviewbot, heftig
@@ -20,11 +18,15 @@
Bug #: 1593167
Differential Revision: https://phabricator.services.mozilla.com/D54726
+---
+ lib/pki/pki3hack.c | 30 ++
+ 1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/lib/pki/pki3hack.c b/lib/pki/pki3hack.c
+index 29d2fb5a40..eac4a5705e 100644
--- a/lib/pki/pki3hack.c
+++ b/lib/pki/pki3hack.c
-@@ -921,14 +921,28 @@ stan_GetCERTCertificate(NSSCertificate *
+@@ -921,14 +921,28 @@ stan_GetCERTCertificate(NSSCertificate *c, PRBool
forceUpdate)
}
if (!cc->nssCertificate || forceUpdate) {
fill_CERTCertificateFields(c, cc, forceUpdate);
@@ -61,3 +63,6 @@
CERT_LockCertTrust(cc);
cc->trust = trust;
+--
+2.24.0
+
[arch-commits] Commit in nss/trunk (PKGBUILD nss-3.47-certdb-temp-cert.patch)
Date: Wednesday, December 4, 2019 @ 14:52:57
Author: heftig
Revision: 370381
3.47.1-5
Modified:
nss/trunk/PKGBUILD
nss/trunk/nss-3.47-certdb-temp-cert.patch
-+
PKGBUILD|4 ++--
nss-3.47-certdb-temp-cert.patch | 29 ++---
2 files changed, 16 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-04 12:43:52 UTC (rev 370380)
+++ PKGBUILD2019-12-04 14:52:57 UTC (rev 370381)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.47.1
-pkgrel=4
+pkgrel=5
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -15,7 +15,7 @@
nss-3.47-certdb-temp-cert.patch
certdata2pem.py bundle.sh)
sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
-'d2a0631328883bdee211d02f0748c97d72ef1462f28415e85efcfb0a6d066dd3'
+'e4d7c7d6ac8c8cccd5bb23c217402922aafc1c104e46ae17a39f3c13b0e96002'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
Modified: nss-3.47-certdb-temp-cert.patch
===
--- nss-3.47-certdb-temp-cert.patch 2019-12-04 12:43:52 UTC (rev 370380)
+++ nss-3.47-certdb-temp-cert.patch 2019-12-04 14:52:57 UTC (rev 370381)
@@ -1,20 +1,15 @@
# HG changeset patch
# User Daiki Ueno
-# Date 1575381287 -3600
-# Tue Dec 03 14:54:47 2019 +0100
-# Node ID 5ad40d3c760edac96d22b99e4e3e916b74f903fe
+# Date 1575450841 -3600
+# Wed Dec 04 10:14:01 2019 +0100
+# Node ID 017097f0a0eaea1a3d849f3de79475c9bc28fcc2
# Parent d64102b76a437f24d98a20480dcc9f1655143e7c
-Bug 1593167, certdb: prefer perm certs over temp certs when trust is not
available
+Bug 1593167, certdb: propagate trust information if trust module is loaded
afterwards
Summary:
-When a builtin root module is loaded after some temp certs being
-loaded, our certificate lookup logic preferred those temp certs over
-perm certs stored on the root module. This was a problem because such
-temp certs are usually not accompanied with trust information.
+When the builtin trust module is loaded after some temp certs being created,
these temp certs are usually not accompanied by trust information. This causes
a problem in Firefox as it loads the module from a separate thread while
accessing the network cache which populates temp certs.
-This makes the certificate lookup logic capable of handling such
-situations by checking if the trust information is attached to temp
-certs and otherwise falling back to perm certs.
+This change makes it properly roll up the trust information, if a temp cert
doesn't have trust information.
Reviewers: rrelyea, keeler
@@ -29,7 +24,7 @@
diff --git a/lib/pki/pki3hack.c b/lib/pki/pki3hack.c
--- a/lib/pki/pki3hack.c
+++ b/lib/pki/pki3hack.c
-@@ -921,14 +921,24 @@ stan_GetCERTCertificate(NSSCertificate *
+@@ -921,14 +921,28 @@ stan_GetCERTCertificate(NSSCertificate *
}
if (!cc->nssCertificate || forceUpdate) {
fill_CERTCertificateFields(c, cc, forceUpdate);
@@ -49,9 +44,9 @@
+ */
+trust = nssTrust_GetCERTCertTrustForCert(c, cc);
+} else {
-+/* If it's a temp cert, it might have been stored before
-+ * the builtin module is loaded, so look for the trust
-+ * again, but not set the empty trust if not found.
++/* If it's a temp cert, it might have been stored before the
++ * builtin trust module is loaded, so look for the trust
++ * again, but don't set the empty trust if it is not found.
+ */
+NSSTrust *t =
nssTrustDomain_FindTrustForCertificate(c->object.cryptoContext->td, c);
+if (!t) {
@@ -58,6 +53,10 @@
+goto loser;
+}
+trust = cert_trust_from_stan_trust(t, cc->arena);
++nssTrust_Destroy(t);
++if (!trust) {
++goto loser;
++}
+}
CERT_LockCertTrust(cc);
[arch-commits] Commit in nss/trunk (PKGBUILD nss-3.47-certdb-temp-cert.patch)
Date: Tuesday, December 3, 2019 @ 15:06:30
Author: heftig
Revision: 370312
3.47.1-4: update temp cert patch
Modified:
nss/trunk/PKGBUILD
nss/trunk/nss-3.47-certdb-temp-cert.patch
-+
PKGBUILD|4 +-
nss-3.47-certdb-temp-cert.patch | 61 --
2 files changed, 54 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-03 14:57:12 UTC (rev 370311)
+++ PKGBUILD2019-12-03 15:06:30 UTC (rev 370312)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.47.1
-pkgrel=3
+pkgrel=4
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -15,7 +15,7 @@
nss-3.47-certdb-temp-cert.patch
certdata2pem.py bundle.sh)
sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
-'82d7924d7c3491de04f42c240fef6dd6e80fc5004ab44f55e6f03571d2d02e58'
+'d2a0631328883bdee211d02f0748c97d72ef1462f28415e85efcfb0a6d066dd3'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
Modified: nss-3.47-certdb-temp-cert.patch
===
--- nss-3.47-certdb-temp-cert.patch 2019-12-03 14:57:12 UTC (rev 370311)
+++ nss-3.47-certdb-temp-cert.patch 2019-12-03 15:06:30 UTC (rev 370312)
@@ -1,7 +1,35 @@
+# HG changeset patch
+# User Daiki Ueno
+# Date 1575381287 -3600
+# Tue Dec 03 14:54:47 2019 +0100
+# Node ID 5ad40d3c760edac96d22b99e4e3e916b74f903fe
+# Parent d64102b76a437f24d98a20480dcc9f1655143e7c
+Bug 1593167, certdb: prefer perm certs over temp certs when trust is not
available
+
+Summary:
+When a builtin root module is loaded after some temp certs being
+loaded, our certificate lookup logic preferred those temp certs over
+perm certs stored on the root module. This was a problem because such
+temp certs are usually not accompanied with trust information.
+
+This makes the certificate lookup logic capable of handling such
+situations by checking if the trust information is attached to temp
+certs and otherwise falling back to perm certs.
+
+Reviewers: rrelyea, keeler
+
+Reviewed By: rrelyea
+
+Subscribers: reviewbot, heftig
+
+Bug #: 1593167
+
+Differential Revision: https://phabricator.services.mozilla.com/D54726
+
diff --git a/lib/pki/pki3hack.c b/lib/pki/pki3hack.c
--- a/lib/pki/pki3hack.c
+++ b/lib/pki/pki3hack.c
-@@ -921,11 +921,11 @@
+@@ -921,14 +921,24 @@ stan_GetCERTCertificate(NSSCertificate *
}
if (!cc->nssCertificate || forceUpdate) {
fill_CERTCertificateFields(c, cc, forceUpdate);
@@ -10,12 +38,27 @@
-/* if it's a perm cert, it might have been stored before the
- * trust, so look for the trust again. But a temp cert can be
- * ignored.
+- */
+-CERTCertTrust *trust = NULL;
+-trust = nssTrust_GetCERTCertTrustForCert(c, cc);
+} else if (CERT_GetCertTrust(cc, ) != SECSuccess) {
-+/* If it's a perm cert, it might have been stored before the
-+ * trust, so look for the trust again. If it's a temp cert, it
-+ * might have been stored before the builtin module is loaded,
-+ * so still need to look for the trust again.
- */
- CERTCertTrust *trust = NULL;
- trust = nssTrust_GetCERTCertTrustForCert(c, cc);
-
++CERTCertTrust *trust;
++if (!c->object.cryptoContext) {
++/* If it's a perm cert, it might have been stored before the
++ * trust, so look for the trust again.
++ */
++trust = nssTrust_GetCERTCertTrustForCert(c, cc);
++} else {
++/* If it's a temp cert, it might have been stored before
++ * the builtin module is loaded, so look for the trust
++ * again, but not set the empty trust if not found.
++ */
++NSSTrust *t =
nssTrustDomain_FindTrustForCertificate(c->object.cryptoContext->td, c);
++if (!t) {
++goto loser;
++}
++trust = cert_trust_from_stan_trust(t, cc->arena);
++}
+
+ CERT_LockCertTrust(cc);
+ cc->trust = trust;
[arch-commits] Commit in nss/trunk (PKGBUILD nss-3.47-certdb-temp-cert.patch)
Date: Tuesday, December 3, 2019 @ 14:13:46
Author: heftig
Revision: 370266
3.47.1-3: update temp cert patch
Modified:
nss/trunk/PKGBUILD
nss/trunk/nss-3.47-certdb-temp-cert.patch
-+
PKGBUILD|4
nss-3.47-certdb-temp-cert.patch | 249 +++---
2 files changed, 22 insertions(+), 231 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-03 14:11:58 UTC (rev 370265)
+++ PKGBUILD2019-12-03 14:13:46 UTC (rev 370266)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.47.1
-pkgrel=2
+pkgrel=3
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -15,7 +15,7 @@
nss-3.47-certdb-temp-cert.patch
certdata2pem.py bundle.sh)
sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
-'dd9d9ba4091a5f24e5bb9d6e97658d9cb62b7926ff888373435e08e3bec9147b'
+'82d7924d7c3491de04f42c240fef6dd6e80fc5004ab44f55e6f03571d2d02e58'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
Modified: nss-3.47-certdb-temp-cert.patch
===
--- nss-3.47-certdb-temp-cert.patch 2019-12-03 14:11:58 UTC (rev 370265)
+++ nss-3.47-certdb-temp-cert.patch 2019-12-03 14:13:46 UTC (rev 370266)
@@ -1,230 +1,21 @@
-# HG changeset patch
-# User Daiki Ueno
-# Date 1574953499 -3600
-# Thu Nov 28 16:04:59 2019 +0100
-# Node ID f1f705bd0528713216e16867233825c299d3e3b2
-# Parent 10722c590949819ed4d971ad5ae213bc8b11a1bf
-Bug 1593167, certdb: prefer perm certs over temp certs when trust is not
available
+diff --git a/lib/pki/pki3hack.c b/lib/pki/pki3hack.c
+--- a/lib/pki/pki3hack.c
b/lib/pki/pki3hack.c
+@@ -921,11 +921,11 @@
+ }
+ if (!cc->nssCertificate || forceUpdate) {
+ fill_CERTCertificateFields(c, cc, forceUpdate);
+-} else if (CERT_GetCertTrust(cc, ) != SECSuccess &&
+- !c->object.cryptoContext) {
+-/* if it's a perm cert, it might have been stored before the
+- * trust, so look for the trust again. But a temp cert can be
+- * ignored.
++} else if (CERT_GetCertTrust(cc, ) != SECSuccess) {
++/* If it's a perm cert, it might have been stored before the
++ * trust, so look for the trust again. If it's a temp cert, it
++ * might have been stored before the builtin module is loaded,
++ * so still need to look for the trust again.
+ */
+ CERTCertTrust *trust = NULL;
+ trust = nssTrust_GetCERTCertTrustForCert(c, cc);
-Summary:
-When a builtin root module is loaded after some temp certs being
-loaded, our certificate lookup logic preferred those temp certs over
-perm certs stored on the root module. This was a problem because such
-temp certs are usually not accompanied with trust information.
-
-This makes the certificate lookup logic capable of handling such
-situations by checking if the trust information is attached to temp
-certs and otherwise falling back to perm certs.
-
-Reviewers: rrelyea, keeler
-
-Reviewed By: rrelyea
-
-Subscribers: heftig
-
-Bug #: 1593167
-
-Differential Revision: https://phabricator.services.mozilla.com/D54726
-
-diff --git a/lib/certdb/stanpcertdb.c b/lib/certdb/stanpcertdb.c
a/lib/certdb/stanpcertdb.c
-+++ b/lib/certdb/stanpcertdb.c
-@@ -340,6 +340,91 @@ CERT_AddTempCertToPerm(CERTCertificate *
- return __CERT_AddTempCertToPerm(cert, nickname, trust);
- }
-
-+static CERTCertificate *
-+find_cert_by_der_cert(CERTCertDBHandle *handle, SECItem *derCert)
-+{
-+CERTCertificate *cc;
-+NSSCryptoContext *context;
-+NSSCertificate *cert = NULL;
-+NSSCertificate *tempCert = NULL;
-+NSSCertificate *permCert = NULL;
-+NSSDER encoding;
-+nssCertificateStoreTrace lockTrace = { NULL, NULL, PR_FALSE, PR_FALSE };
-+nssCertificateStoreTrace unlockTrace = { NULL, NULL, PR_FALSE, PR_FALSE };
-+
-+/* We retrieve a certificate instance for derCert in this order:
-+ * 1. Look up a temp cert in the crypto context. If it is found
-+ *and has a trust object associated, use it.
-+ * 2. Look up a perm cert in the trust domain. If it is found,
-+ *use it. Otherwise, use the temp cert.
-+ */
-+NSSITEM_FROM_SECITEM(, derCert);
-+context = STAN_GetDefaultCryptoContext();
-+
-+/* First, see if it is already a temp cert */
-+tempCert = NSSCryptoContext_FindCertificateByEncodedCertificate(context,
-+
);
-+if (tempCert) {
-+NSSTrust *trust;
-+
-+trust = nssCryptoContext_FindTrustForCertificate(context, tempCert);
-+if (trust) {
-+
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, November 29, 2019 @ 09:09:07
Author: heftig
Revision: 369899
3.47.1-2
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-28 22:00:38 UTC (rev 369898)
+++ PKGBUILD2019-11-29 09:09:07 UTC (rev 369899)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.47.1
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -12,8 +12,10 @@
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
makedepends=(perl python 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
certdata2pem.py bundle.sh)
sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
+'dd9d9ba4091a5f24e5bb9d6e97658d9cb62b7926ff888373435e08e3bec9147b'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
@@ -23,6 +25,9 @@
cd nss-$pkgver
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
+ patch -d nss -Np1 < ../nss-3.47-certdb-temp-cert.patch
}
build() {
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, November 20, 2019 @ 09:22:37
Author: heftig
Revision: 369462
3.47.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-20 07:22:58 UTC (rev 369461)
+++ PKGBUILD2019-11-20 09:22:37 UTC (rev 369462)
@@ -2,8 +2,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.47
-pkgrel=2
+pkgver=3.47.1
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('6cd0c4438b616bdacc0b5f25ff1506b0d07ee97ea6c95d514c5487200a155fa7'
+sha256sums=('1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, November 13, 2019 @ 16:10:44 Author: foutrelis Revision: 368155 [core] mass rebuild Modified: nss/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-13 16:09:40 UTC (rev 368154) +++ PKGBUILD2019-11-13 16:10:44 UTC (rev 368155) @@ -3,7 +3,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) pkgver=3.47 -pkgrel=1 +pkgrel=2 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS; arch=(x86_64)
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, October 19, 2019 @ 10:26:04
Author: heftig
Revision: 365210
3.47-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-19 08:22:14 UTC (rev 365209)
+++ PKGBUILD2019-10-19 10:26:04 UTC (rev 365210)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.46.1
+pkgver=3.47
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('3bf7e0ed7db98803f134c527c436cc68415ff17257d34bd75de14e9a09d13651'
+sha256sums=('6cd0c4438b616bdacc0b5f25ff1506b0d07ee97ea6c95d514c5487200a155fa7'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, October 3, 2019 @ 10:34:36
Author: heftig
Revision: 363684
3.46.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-03 08:58:27 UTC (rev 363683)
+++ PKGBUILD2019-10-03 10:34:36 UTC (rev 363684)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.46
+pkgver=3.46.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef'
+sha256sums=('3bf7e0ed7db98803f134c527c436cc68415ff17257d34bd75de14e9a09d13651'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD bundle.sh certdata2pem.py)
Date: Friday, September 20, 2019 @ 15:36:00
Author: heftig
Revision: 363158
simplify
Modified:
nss/trunk/PKGBUILD
nss/trunk/bundle.sh (properties)
nss/trunk/certdata2pem.py (properties)
-+
PKGBUILD| 15 ---
bundle.sh |1 +
certdata2pem.py |1 +
3 files changed, 10 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-09-20 15:28:06 UTC (rev 363157)
+++ PKGBUILD2019-09-20 15:36:00 UTC (rev 363158)
@@ -10,7 +10,7 @@
license=(MPL GPL)
_nsprver=4.20
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
-makedepends=(perl python python2 gyp)
+makedepends=(perl python gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
sha256sums=('6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef'
@@ -18,8 +18,7 @@
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
prepare() {
- mkdir certs path
- ln -s /usr/bin/python2 path/python
+ mkdir certs
cd nss-$pkgver
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
@@ -27,12 +26,14 @@
}
build() {
- ( cd certs; python ../certdata2pem.py; )
- sh bundle.sh
+ cd certs
+ ../certdata2pem.py
+ cd ..
+ ./bundle.sh
+
cd nss-$pkgver/nss
- PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
---opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
+ ./build.sh -v --opt --system-sqlite --system-nspr --enable-libpkix
--disable-tests
}
package_nss() {
Index: nss/trunk/bundle.sh
===
--- bundle.sh 2019-09-20 15:28:06 UTC (rev 363157)
+++ bundle.sh 2019-09-20 15:36:00 UTC (rev 363158)
Property changes on: nss/trunk/bundle.sh
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: nss/trunk/certdata2pem.py
===
--- certdata2pem.py 2019-09-20 15:28:06 UTC (rev 363157)
+++ certdata2pem.py 2019-09-20 15:36:00 UTC (rev 363158)
Property changes on: nss/trunk/certdata2pem.py
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, August 30, 2019 @ 18:03:20
Author: heftig
Revision: 361432
3.46-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-30 12:55:32 UTC (rev 361431)
+++ PKGBUILD2019-08-30 18:03:20 UTC (rev 361432)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.45
+pkgver=3.46
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('112f05223d1fde902c170966bfc6f011b24a838be16969b110ecf2bb7bc24e8b'
+sha256sums=('6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, July 9, 2019 @ 04:15:46
Author: heftig
Revision: 357413
3.45-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-09 04:11:51 UTC (rev 357412)
+++ PKGBUILD2019-07-09 04:15:46 UTC (rev 357413)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.44.1
+pkgver=3.45
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('fce4cb80c989cde35416ecbe55920856015a35151c4f21be64470e4dd4de12f8'
+sha256sums=('112f05223d1fde902c170966bfc6f011b24a838be16969b110ecf2bb7bc24e8b'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, June 22, 2019 @ 16:33:41
Author: heftig
Revision: 356777
3.44.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-06-22 16:00:49 UTC (rev 356776)
+++ PKGBUILD2019-06-22 16:33:41 UTC (rev 356777)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.44
+pkgver=3.44.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('a5620e59b6eeedfd5a12c9298b50ad92e9898b223e214eb675e36f4ffb5b6aff'
+sha256sums=('fce4cb80c989cde35416ecbe55920856015a35151c4f21be64470e4dd4de12f8'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, May 11, 2019 @ 13:15:15
Author: heftig
Revision: 352841
3.44-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-05-11 12:46:34 UTC (rev 352840)
+++ PKGBUILD2019-05-11 13:15:15 UTC (rev 352841)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.43
+pkgver=3.44
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('f30bc1b7330887b75de9fec37dbc173001758dc43fb095ffbc45dac4093fe2ca'
+sha256sums=('a5620e59b6eeedfd5a12c9298b50ad92e9898b223e214eb675e36f4ffb5b6aff'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Sunday, March 17, 2019 @ 13:51:24
Author: heftig
Revision: 348571
3.43-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-17 13:51:13 UTC (rev 348570)
+++ PKGBUILD2019-03-17 13:51:24 UTC (rev 348571)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.42.1
+pkgver=3.43
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6'
+sha256sums=('f30bc1b7330887b75de9fec37dbc173001758dc43fb095ffbc45dac4093fe2ca'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, January 31, 2019 @ 20:10:17
Author: heftig
Revision: 344976
3.42.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-31 18:56:25 UTC (rev 344975)
+++ PKGBUILD2019-01-31 20:10:17 UTC (rev 344976)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.42
+pkgver=3.42.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('5d3ce489f11803c66a7fba773c3f9b9a428ff3e5fe67a974e88b5e9095072f13'
+sha256sums=('087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, January 29, 2019 @ 08:12:30
Author: heftig
Revision: 344914
3.42-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-29 07:59:47 UTC (rev 344913)
+++ PKGBUILD2019-01-29 08:12:30 UTC (rev 344914)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.41.1
+pkgver=3.42
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('f2f6336ce63aa1c487b7f17abd378c0c25f93750b872d4937da60e7260441830'
+sha256sums=('5d3ce489f11803c66a7fba773c3f9b9a428ff3e5fe67a974e88b5e9095072f13'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, January 24, 2019 @ 13:05:31
Author: heftig
Revision: 344649
3.41.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-24 12:46:12 UTC (rev 344648)
+++ PKGBUILD2019-01-24 13:05:31 UTC (rev 344649)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.41
+pkgver=3.41.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('ab2e18f5d0dd0079c0005396f9beb9a41e9a1bbc7e6c1d0a99affcef0471712d'
+sha256sums=('f2f6336ce63aa1c487b7f17abd378c0c25f93750b872d4937da60e7260441830'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, December 7, 2018 @ 18:26:34
Author: heftig
Revision: 341231
3.41-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-07 18:23:46 UTC (rev 341230)
+++ PKGBUILD2018-12-07 18:26:34 UTC (rev 341231)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.40.1
+pkgver=3.41
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('5e0e6bae2a79c86e506684955d736bfe875ec5a8e95ed3e4ba0852d1aec2c8f1'
+sha256sums=('ab2e18f5d0dd0079c0005396f9beb9a41e9a1bbc7e6c1d0a99affcef0471712d'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, December 1, 2018 @ 11:30:23
Author: heftig
Revision: 340892
3.40.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-01 09:35:55 UTC (rev 340891)
+++ PKGBUILD2018-12-01 11:30:23 UTC (rev 340892)
@@ -2,8 +2,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.40
-pkgrel=2
+pkgver=3.40.1
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -13,7 +13,7 @@
makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
-sha256sums=('0562087b8bda072bf5964f8acf851f9c0997a59c384f4887cb517b3b628b32dd'
+sha256sums=('5e0e6bae2a79c86e506684955d736bfe875ec5a8e95ed3e4ba0852d1aec2c8f1'
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD certdata2pem.py)
Date: Friday, November 9, 2018 @ 21:46:53
Author: heftig
Revision: 338618
3.40-2: Update to current Fedora master
https://src.fedoraproject.org/rpms/ca-certificates/tree/f4842fa2d8bdcfd872fe6113a8d66d2d9f8fb8ee
Modified:
nss/trunk/PKGBUILD
nss/trunk/certdata2pem.py
-+
PKGBUILD| 13 ++-
certdata2pem.py | 90 +-
2 files changed, 59 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 21:46:39 UTC (rev 338617)
+++ PKGBUILD2018-11-09 21:46:53 UTC (rev 338618)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.40
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
@@ -10,29 +10,24 @@
license=(MPL GPL)
_nsprver=4.20
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
-makedepends=(perl python2 gyp)
+makedepends=(perl python python2 gyp)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz;
certdata2pem.py bundle.sh)
sha256sums=('0562087b8bda072bf5964f8acf851f9c0997a59c384f4887cb517b3b628b32dd'
-'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
+'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
prepare() {
mkdir certs path
-
ln -s /usr/bin/python2 path/python
cd nss-$pkgver
-
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
build() {
- cd certs
- python2 ../certdata2pem.py
-
- cd ..
+ ( cd certs; python ../certdata2pem.py; )
sh bundle.sh
cd nss-$pkgver/nss
Modified: certdata2pem.py
===
--- certdata2pem.py 2018-11-09 21:46:39 UTC (rev 338617)
+++ certdata2pem.py 2018-11-09 21:46:53 UTC (rev 338618)
@@ -26,17 +26,17 @@
import re
import sys
import textwrap
-import urllib
+import urllib.request, urllib.parse, urllib.error
import subprocess
objects = []
def printable_serial(obj):
- return ".".join(map(lambda x:str(ord(x)), obj['CKA_SERIAL_NUMBER']))
+ return ".".join([str(x) for x in obj['CKA_SERIAL_NUMBER']])
# Dirty file parser.
in_data, in_multiline, in_obj = False, False, False
-field, type, value, obj = None, None, None, dict()
+field, ftype, value, binval, obj = None, None, None, bytearray(), dict()
for line in open('certdata.txt', 'r'):
# Ignore the file header.
if not in_data:
@@ -56,14 +56,16 @@
continue
if in_multiline:
if not line.startswith('END'):
-if type == 'MULTILINE_OCTAL':
+if ftype == 'MULTILINE_OCTAL':
line = line.strip()
for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
-value += chr(int(i.group(1), 8))
+integ = int(i.group(1), 8)
+binval.extend((integ).to_bytes(1, sys.byteorder))
+obj[field] = binval
else:
value += line
+obj[field] = value
continue
-obj[field] = value
in_multiline = False
continue
if line.startswith('CKA_CLASS'):
@@ -70,19 +72,20 @@
in_obj = True
line_parts = line.strip().split(' ', 2)
if len(line_parts) > 2:
-field, type = line_parts[0:2]
+field, ftype = line_parts[0:2]
value = ' '.join(line_parts[2:])
elif len(line_parts) == 2:
-field, type = line_parts
+field, ftype = line_parts
value = None
else:
-raise NotImplementedError, 'line_parts < 2 not supported.\n' + line
-if type == 'MULTILINE_OCTAL':
+raise NotImplementedError('line_parts < 2 not supported.\n' + line)
+if ftype == 'MULTILINE_OCTAL':
in_multiline = True
value = ""
+binval = bytearray()
continue
obj[field] = value
-if len(obj.items()) > 0:
+if len(list(obj.items())) > 0:
objects.append(obj)
# Build up trust database.
@@ -92,7 +95,7 @@
continue
key = obj['CKA_LABEL'] + printable_serial(obj)
trustmap[key] = obj
-print " added trust", key
+print(" added trust", key)
# Build up cert database.
certmap = dict()
@@ -101,7 +104,7 @@
continue
key = obj['CKA_LABEL'] + printable_serial(obj)
certmap[key] = obj
-print " added cert", key
+print(" added cert", key)
def obj_to_filename(obj):
label = obj['CKA_LABEL'][1:-1]
@@ -110,7 +113,18 @@
.replace('(', '=')\
.replace(')', '=')\
.replace(',', '_')
-label = re.sub(r'\\x[0-9a-fA-F]{2}', lambda m:chr(int(m.group(0)[2:],
16)), label)
+labelbytes = bytearray()
+i = 0
+imax = len(label)
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, October 24, 2018 @ 11:19:44
Author: heftig
Revision: 337214
3.40-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-24 11:08:54 UTC (rev 337213)
+++ PKGBUILD2018-10-24 11:19:44 UTC (rev 337214)
@@ -2,7 +2,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.39
+pkgver=3.40
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -11,10 +11,9 @@
_nsprver=4.20
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
makedepends=(perl python2 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)
-sha256sums=('6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b'
+sha256sums=('0562087b8bda072bf5964f8acf851f9c0997a59c384f4887cb517b3b628b32dd'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, September 1, 2018 @ 19:50:03
Author: heftig
Revision: 333184
3.39-1
Modified:
nss/trunk/PKGBUILD(contents, properties)
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-01 19:48:47 UTC (rev 333183)
+++ PKGBUILD2018-09-01 19:50:03 UTC (rev 333184)
@@ -1,21 +1,20 @@
-# $Id$
# Maintainer: Jan de Groot
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.38
+pkgver=3.39
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
license=(MPL GPL)
-_nsprver=4.19
+_nsprver=4.20
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
makedepends=(perl python2 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)
-sha256sums=('2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62'
+sha256sums=('6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
Property changes on: nss/trunk/PKGBUILD
___
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, June 27, 2018 @ 04:30:42
Author: heftig
Revision: 327666
sha256sum changed (tar contents identical)
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-06-27 02:11:39 UTC (rev 327665)
+++ PKGBUILD2018-06-27 04:30:42 UTC (rev 327666)
@@ -15,7 +15,7 @@
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)
-sha256sums=('b7d9270c44d62e681af68f09d30d242f80fd38be634b8cc863da26276b0f6a1d'
+sha256sums=('2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, June 22, 2018 @ 22:31:23
Author: heftig
Revision: 327478
3.38-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-06-22 19:05:28 UTC (rev 327477)
+++ PKGBUILD2018-06-22 22:31:23 UTC (rev 327478)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.37.3
+pkgver=3.38
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be'
+sha256sums=('b7d9270c44d62e681af68f09d30d242f80fd38be634b8cc863da26276b0f6a1d'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, June 5, 2018 @ 19:47:49
Author: heftig
Revision: 325939
3.37.3-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-06-05 17:22:21 UTC (rev 325938)
+++ PKGBUILD2018-06-05 19:47:49 UTC (rev 325939)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.37.1
+pkgver=3.37.3
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405'
+sha256sums=('9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, May 24, 2018 @ 09:38:05
Author: heftig
Revision: 324910
3.37.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-24 09:37:02 UTC (rev 324909)
+++ PKGBUILD2018-05-24 09:38:05 UTC (rev 324910)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.37
+pkgver=3.37.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('5821969e85d241833e96cb82bd4211ddea6d87003f2e25e0eab4aefa6268'
+sha256sums=('097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, May 12, 2018 @ 11:49:08
Author: heftig
Revision: 324009
3.37-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-12 11:43:51 UTC (rev 324008)
+++ PKGBUILD2018-05-12 11:49:08 UTC (rev 324009)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.36.1
+pkgver=3.37
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff'
+sha256sums=('5821969e85d241833e96cb82bd4211ddea6d87003f2e25e0eab4aefa6268'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
[arch-commits] Commit in nss/trunk (PKGBUILD enable-libpkix.patch)
Date: Tuesday, April 24, 2018 @ 14:36:59
Author: heftig
Revision: 322913
3.36.1-1: FS#58332: Replace patch
Modified:
nss/trunk/PKGBUILD
Deleted:
nss/trunk/enable-libpkix.patch
--+
PKGBUILD |9 +++--
enable-libpkix.patch | 12
2 files changed, 3 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-24 14:31:05 UTC (rev 322912)
+++ PKGBUILD2018-04-24 14:36:59 UTC (rev 322913)
@@ -14,11 +14,10 @@
makedepends=(perl python2 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 enable-libpkix.patch)
+certdata2pem.py bundle.sh)
sha256sums=('6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
-'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
-'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
+'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
prepare() {
mkdir certs path
@@ -27,8 +26,6 @@
cd nss-$pkgver
- patch -Np1 -i ../enable-libpkix.patch
-
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
@@ -42,7 +39,7 @@
cd nss-$pkgver/nss
PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
---opt --system-sqlite --system-nspr --disable-tests
+--opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
}
package_nss() {
Deleted: enable-libpkix.patch
===
--- enable-libpkix.patch2018-04-24 14:31:05 UTC (rev 322912)
+++ enable-libpkix.patch2018-04-24 14:36:59 UTC (rev 322913)
@@ -1,12 +0,0 @@
-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=()
-
[arch-commits] Commit in nss/trunk (PKGBUILD nss-config.in nss-config.xml nss.pc.in)
Date: Friday, April 13, 2018 @ 17:50:49
Author: heftig
Revision: 321680
FS#58206 use shipped templates; simplify
Modified:
nss/trunk/PKGBUILD
Deleted:
nss/trunk/nss-config.in
nss/trunk/nss-config.xml
nss/trunk/nss.pc.in
+
PKGBUILD | 33 +---
nss-config.in | 145 ---
nss-config.xml | 132 --
nss.pc.in | 11
4 files changed, 14 insertions(+), 307 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-13 17:43:59 UTC (rev 321679)
+++ PKGBUILD2018-04-13 17:50:49 UTC (rev 321680)
@@ -9,18 +9,15 @@
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(x86_64)
license=(MPL GPL)
-_nsprver=4.15
+_nsprver=4.19
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
-makedepends=(perl python2 xmlto docbook-xsl gyp)
+makedepends=(perl python2 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)
+certdata2pem.py bundle.sh enable-libpkix.patch)
sha256sums=('6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
-'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
-'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
-'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
prepare() {
@@ -28,10 +25,6 @@
ln -s /usr/bin/python2 path/python
- echo -n "$(date +"%e %B %Y")" >date.xml
- echo -n "$pkgver" >version.xml
- xmlto man nss-config.xml
-
cd nss-$pkgver
patch -Np1 -i ../enable-libpkix.patch
@@ -53,31 +46,32 @@
}
package_nss() {
+ local vmajor vminor vpatch
cd nss-$pkgver
- { read _vmajor; read _vminor; read _vpatch; } \
+ { read vmajor; read vminor; read vpatch; } \
< <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
- sed ../nss.pc.in \
+ sed nss/pkg/pkg-config/nss.pc.in \
-e "s,%libdir%,/usr/lib,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" |
+-e "s,%NSPR_VERSION%,$_nsprver,g" \
+-e "s,%NSS_VERSION%,$pkgver,g" |
install -Dm644 /dev/stdin "$pkgdir/usr/lib/pkgconfig/nss.pc"
+
ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
- sed ../nss-config.in \
+ sed nss/pkg/pkg-config/nss-config.in \
-e "s,@libdir@,/usr/lib,g" \
-e "s,@prefix@,/usr/bin,g" \
-e "s,@exec_prefix@,/usr/bin,g" \
-e "s,@includedir@,/usr/include/nss,g" \
--e "s,@MOD_MAJOR_VERSION@,${_vmajor},g" \
--e "s,@MOD_MINOR_VERSION@,${_vminor},g" \
--e "s,@MOD_PATCH_VERSION@,${_vpatch},g" |
+-e "s,@MOD_MAJOR_VERSION@,$vmajor,g" \
+-e "s,@MOD_MINOR_VERSION@,$vminor,g" \
+-e "s,@MOD_PATCH_VERSION@,$vpatch,g" |
install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
- install -Dt "$pkgdir/usr/share/man/man1" -m644 ../nss-config.1
cd nss/doc/nroff
install -Dt "$pkgdir/usr/share/man/man1" -m644 *util.1 signtool.1 signver.1
ssltap.1
@@ -92,6 +86,7 @@
install -Dt "$pkgdir/usr/lib" *.so
install -Dt "$pkgdir/usr/lib" -m644 *.chk
+ # Replace built-in trust with p11-kit connection
ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
}
Deleted: nss-config.in
===
--- nss-config.in 2018-04-13 17:43:59 UTC (rev 321679)
+++ nss-config.in 2018-04-13 17:50:49 UTC (rev 321680)
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
---prefix=*)
- prefix=$optarg
- ;;
---prefix)
- echo_prefix=yes
- ;;
---exec-prefix=*)
- exec_prefix=$optarg
- ;;
---exec-prefix)
- echo_exec_prefix=yes
- ;;
---includedir=*)
- includedir=$optarg
- ;;
---includedir)
- echo_includedir=yes
- ;;
---libdir=*)
- libdir=$optarg
- ;;
---libdir)
- echo_libdir=yes
- ;;
---version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
---cflags)
- echo_cflags=yes
-
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, April 11, 2018 @ 16:14:56
Author: heftig
Revision: 321560
3.36.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-11 15:58:25 UTC (rev 321559)
+++ PKGBUILD2018-04-11 16:14:56 UTC (rev 321560)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.36
+pkgver=3.36.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('a33cc7b8299b5ce3acf03f617c7896932ae26927ff9fb7c71c1b69a200c30095'
+sha256sums=('6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, March 9, 2018 @ 23:56:29
Author: heftig
Revision: 318377
3.36-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-09 23:56:01 UTC (rev 318376)
+++ PKGBUILD2018-03-09 23:56:29 UTC (rev 318377)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.35
+pkgver=3.36
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa'
+sha256sums=('a33cc7b8299b5ce3acf03f617c7896932ae26927ff9fb7c71c1b69a200c30095'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD no-plt.diff)
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
===
--- PKGBUILD2018-03-01 15:28:54 UTC (rev 317680)
+++ PKGBUILD2018-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@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
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, January 18, 2018 @ 21:44:24
Author: heftig
Revision: 315119
3.35-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-18 21:12:01 UTC (rev 315118)
+++ PKGBUILD2018-01-18 21:44:24 UTC (rev 315119)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.34.1
+pkgver=3.35
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('a3c15d367caf784f33d96dbafbdffc16a8e42fb8c8aedfce97bf92a9f918dda0'
+sha256sums=('f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, November 25, 2017 @ 19:25:47
Author: heftig
Revision: 310921
3.34.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-11-25 19:05:36 UTC (rev 310920)
+++ PKGBUILD2017-11-25 19:25:47 UTC (rev 310921)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.34
+pkgver=3.34.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5'
+sha256sums=('a3c15d367caf784f33d96dbafbdffc16a8e42fb8c8aedfce97bf92a9f918dda0'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD bug1400603.patch)
Date: Tuesday, November 14, 2017 @ 10:42:11
Author: heftig
Revision: 309918
3.34-1
Modified:
nss/trunk/PKGBUILD
Deleted:
nss/trunk/bug1400603.patch
--+
PKGBUILD | 14
bug1400603.patch | 942 -
2 files changed, 5 insertions(+), 951 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-11-14 09:51:07 UTC (rev 309917)
+++ PKGBUILD2017-11-14 10:42:11 UTC (rev 309918)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.33
-pkgrel=2
+pkgver=3.34
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
@@ -14,8 +14,8 @@
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 bug1400603.patch)
-sha256sums=('98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4'
+certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml
enable-libpkix.patch no-plt.diff)
+sha256sums=('0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
@@ -22,8 +22,7 @@
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
-'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
-'c2a477710a53738e91712a7a203b84d65a514af62d8efffaa977070843a7794a')
+'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
prepare() {
mkdir certs path
@@ -41,9 +40,6 @@
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
-
- cd nss
- patch -Np0 -i ../../bug1400603.patch
}
build() {
Deleted: bug1400603.patch
===
--- bug1400603.patch2017-11-14 09:51:07 UTC (rev 309917)
+++ bug1400603.patch2017-11-14 10:42:11 UTC (rev 309918)
@@ -1,942 +0,0 @@
-commit e84403331d99
-Author: Daiki Ueno
-Date: Fri Sep 22 11:27:34 2017 +0200
-
-Bug 1400603 - freebl: Reorganize AES-GCM source code based on hw/sw
implementation, r=franziskus
-
-Reviewers: franziskus
-
-Reviewed By: franziskus
-
-Bug #: 1400603
-
-Differential Revision: https://phabricator.services.mozilla.com/D65
- lib/freebl/Makefile | 4 +-
- lib/freebl/aes-x86.c | 157 +
- lib/freebl/freebl.gyp | 65 ++---
- lib/freebl/gcm-x86.c | 127 ++
- lib/freebl/gcm.c | 162 +--
- lib/freebl/gcm.h | 14
- lib/freebl/rijndael.c | 188 --
- lib/freebl/rijndael.h | 18 -
- 8 files changed, 436 insertions(+), 299 deletions(-)
-
-diff --git lib/freebl/Makefile lib/freebl/Makefile
-index d50e18696b..bc1ea86a5e 100644
lib/freebl/Makefile
-+++ lib/freebl/Makefile
-@@ -110,7 +110,9 @@ endif
- # NSS_X86_OR_X64 means the target is either x86 or x64
- ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
- DEFINES += -DNSS_X86_OR_X64
--CFLAGS += -mpclmul -maes
-+EXTRA_SRCS += gcm-x86.c aes-x86.c
-+$(OBJDIR)/gcm-x86.o: CFLAGS += -mpclmul -maes
-+$(OBJDIR)/aes-x86.o: CFLAGS += -mpclmul -maes
- ifneq (,$(USE_64)$(USE_X32))
- DEFINES += -DNSS_X64
- else
-diff --git lib/freebl/aes-x86.c lib/freebl/aes-x86.c
-new file mode 100644
-index 00..830b4782fe
/dev/null
-+++ lib/freebl/aes-x86.c
-@@ -0,0 +1,157 @@
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifdef FREEBL_NO_DEPEND
-+#include "stubs.h"
-+#endif
-+#include "rijndael.h"
-+#include "secerr.h"
-+
-+#include /* aes-ni */
-+
-+#define EXPAND_KEY128(k, rcon, res) \
-+tmp_key = _mm_aeskeygenassist_si128(k, rcon); \
-+tmp_key = _mm_shuffle_epi32(tmp_key, 0xFF); \
-+tmp = _mm_xor_si128(k, _mm_slli_si128(k, 4)); \
-+tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \
-+tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \
-+res = _mm_xor_si128(tmp, tmp_key)
-+
-+static void
-+native_key_expansion128(AESContext *cx,
[arch-commits] Commit in nss/trunk (PKGBUILD bug1400603.patch)
Date: Thursday, October 5, 2017 @ 20:50:53
Author: jgc
Revision: 306865
upgpkg: nss 3.33-2
Fix SSE2 usage on i686 (FS#55668)
Added:
nss/trunk/bug1400603.patch
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD | 10
bug1400603.patch | 942 +
2 files changed, 949 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-05 20:37:51 UTC (rev 306864)
+++ PKGBUILD2017-10-05 20:50:53 UTC (rev 306865)
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.33
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
@@ -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 no-plt.diff bug1400603.patch)
sha256sums=('98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
@@ -22,7 +22,8 @@
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
-'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
+'c2a477710a53738e91712a7a203b84d65a514af62d8efffaa977070843a7794a')
prepare() {
mkdir certs path
@@ -40,6 +41,9 @@
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
+
+ cd nss
+ patch -Np0 -i ../../bug1400603.patch
}
build() {
Added: bug1400603.patch
===
--- bug1400603.patch(rev 0)
+++ bug1400603.patch2017-10-05 20:50:53 UTC (rev 306865)
@@ -0,0 +1,942 @@
+commit e84403331d99
+Author: Daiki Ueno
+Date: Fri Sep 22 11:27:34 2017 +0200
+
+Bug 1400603 - freebl: Reorganize AES-GCM source code based on hw/sw
implementation, r=franziskus
+
+Reviewers: franziskus
+
+Reviewed By: franziskus
+
+Bug #: 1400603
+
+Differential Revision: https://phabricator.services.mozilla.com/D65
+---
+ lib/freebl/Makefile | 4 +-
+ lib/freebl/aes-x86.c | 157 +
+ lib/freebl/freebl.gyp | 65 ++---
+ lib/freebl/gcm-x86.c | 127 ++
+ lib/freebl/gcm.c | 162 +--
+ lib/freebl/gcm.h | 14
+ lib/freebl/rijndael.c | 188 --
+ lib/freebl/rijndael.h | 18 -
+ 8 files changed, 436 insertions(+), 299 deletions(-)
+
+diff --git lib/freebl/Makefile lib/freebl/Makefile
+index d50e18696b..bc1ea86a5e 100644
+--- lib/freebl/Makefile
lib/freebl/Makefile
+@@ -110,7 +110,9 @@ endif
+ # NSS_X86_OR_X64 means the target is either x86 or x64
+ ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
+ DEFINES += -DNSS_X86_OR_X64
+-CFLAGS += -mpclmul -maes
++EXTRA_SRCS += gcm-x86.c aes-x86.c
++$(OBJDIR)/gcm-x86.o: CFLAGS += -mpclmul -maes
++$(OBJDIR)/aes-x86.o: CFLAGS += -mpclmul -maes
+ ifneq (,$(USE_64)$(USE_X32))
+ DEFINES += -DNSS_X64
+ else
+diff --git lib/freebl/aes-x86.c lib/freebl/aes-x86.c
+new file mode 100644
+index 00..830b4782fe
+--- /dev/null
lib/freebl/aes-x86.c
+@@ -0,0 +1,157 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++#ifdef FREEBL_NO_DEPEND
++#include "stubs.h"
++#endif
++#include "rijndael.h"
++#include "secerr.h"
++
++#include /* aes-ni */
++
++#define EXPAND_KEY128(k, rcon, res) \
++tmp_key = _mm_aeskeygenassist_si128(k, rcon); \
++tmp_key = _mm_shuffle_epi32(tmp_key, 0xFF); \
++tmp = _mm_xor_si128(k, _mm_slli_si128(k, 4)); \
++tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \
++tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \
++res = _mm_xor_si128(tmp, tmp_key)
++
++static void
++native_key_expansion128(AESContext *cx, const unsigned char *key)
++{
++__m128i *keySchedule = cx->keySchedule;
++pre_align __m128i tmp_key post_align;
++pre_align
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, September 28, 2017 @ 18:59:52
Author: heftig
Revision: 306452
3.33-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-28 18:52:15 UTC (rev 306451)
+++ PKGBUILD2017-09-28 18:59:52 UTC (rev 306452)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.32
+pkgver=3.33
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
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)
-sha256sums=('35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335'
+sha256sums=('98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
@@ -50,7 +50,8 @@
sh bundle.sh
cd nss-$pkgver/nss
- PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr
--disable-tests
+ PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+--opt --system-sqlite --system-nspr --disable-tests
}
package_nss() {
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, July 29, 2017 @ 11:31:08
Author: heftig
Revision: 301395
3.32-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-07-29 11:29:55 UTC (rev 301394)
+++ PKGBUILD2017-07-29 11:31:08 UTC (rev 301395)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.31
-pkgrel=3
+pkgver=3.32
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
@@ -15,7 +15,7 @@
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)
-sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
+sha256sums=('35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD no-plt.diff)
Date: Thursday, July 20, 2017 @ 22:00:32
Author: heftig
Revision: 300878
fix no-plt on i686
Added:
nss/trunk/no-plt.diff
Modified:
nss/trunk/PKGBUILD
-+
PKGBUILD|6 --
no-plt.diff | 48
2 files changed, 52 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-07-20 21:44:39 UTC (rev 300877)
+++ PKGBUILD2017-07-20 22:00:32 UTC (rev 300878)
@@ -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)
+certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml
enable-libpkix.patch no-plt.diff)
sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
@@ -21,7 +21,8 @@
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
-'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
+'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
+'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
prepare() {
mkdir certs path
@@ -35,6 +36,7 @@
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/
Added: no-plt.diff
===
--- no-plt.diff (rev 0)
+++ no-plt.diff 2017-07-20 22:00:32 UTC (rev 300878)
@@ -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
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, June 9, 2017 @ 17:36:41
Author: heftig
Revision: 298498
syntax
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-09 17:28:53 UTC (rev 298497)
+++ PKGBUILD2017-06-09 17:36:41 UTC (rev 298498)
@@ -13,7 +13,7 @@
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
makedepends=(perl python2 xmlto docbook-xsl gyp)
options=(!strip !makeflags staticlibs)
-source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
+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)
sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
@@ -40,7 +40,6 @@
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
-
build() {
cd certs
python2 ../certdata2pem.py
[arch-commits] Commit in nss/trunk (PKGBUILD enable-libpkix.patch)
Date: Friday, June 9, 2017 @ 17:28:53
Author: heftig
Revision: 298497
3.31-3: FS#54387 Fix Chromium
Added:
nss/trunk/enable-libpkix.patch
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD | 19 ---
enable-libpkix.patch | 12
2 files changed, 24 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-09 17:21:04 UTC (rev 298496)
+++ PKGBUILD2017-06-09 17:28:53 UTC (rev 298497)
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.31
-pkgrel=2
+pkgrel=3
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
@@ -14,13 +14,14 @@
makedepends=(perl python2 xmlto docbook-xsl gyp)
options=(!strip !makeflags staticlibs)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
-certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
+certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml
enable-libpkix.patch)
sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
-'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1')
+'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
+'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
prepare() {
mkdir certs path
@@ -33,6 +34,8 @@
cd nss-$pkgver
+ patch -Np1 -i ../enable-libpkix.patch
+
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
@@ -46,7 +49,7 @@
sh bundle.sh
cd nss-$pkgver/nss
- PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr -v
+ PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr
--disable-tests
}
package_nss() {
@@ -74,14 +77,16 @@
-e "s,@MOD_MINOR_VERSION@,${_vminor},g" \
-e "s,@MOD_PATCH_VERSION@,${_vpatch},g" |
install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
+ install -Dt "$pkgdir/usr/share/man/man1" -m644 ../nss-config.1
- install -Dt "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1
../nss-config.1
+ cd nss/doc/nroff
+ install -Dt "$pkgdir/usr/share/man/man1" -m644 *util.1 signtool.1 signver.1
ssltap.1
- cd dist
+ cd ../../../dist
install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h
cd Release/bin
- install -Dt "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver
ssltap vfychain vfyserv
+ install -Dt "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
cd ../lib
install -Dt "$pkgdir/usr/lib" *.so
Added: enable-libpkix.patch
===
--- enable-libpkix.patch(rev 0)
+++ enable-libpkix.patch2017-06-09 17:28:53 UTC (rev 298497)
@@ -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=()
+
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, June 9, 2017 @ 12:08:20
Author: heftig
Revision: 298482
3.31-2: Use gyp to build, as requested by upstream
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD | 73 +
1 file changed, 26 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-09 11:33:16 UTC (rev 298481)
+++ PKGBUILD2017-06-09 12:08:20 UTC (rev 298482)
@@ -4,15 +4,15 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.31
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
-license=('MPL' 'GPL')
-_nsprver=4.12
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
-makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl')
-options=('!strip' '!makeflags' 'staticlibs')
+license=(MPL GPL)
+_nsprver=4.15
+depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
+makedepends=(perl python2 xmlto docbook-xsl gyp)
+options=(!strip !makeflags staticlibs)
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
@@ -23,17 +23,16 @@
'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1')
prepare() {
- mkdir certs
+ mkdir certs path
+ ln -s /usr/bin/python2 path/python
+
echo -n "$(date +"%e %B %Y")" >date.xml
echo -n "$pkgver" >version.xml
+ xmlto man nss-config.xml
cd nss-$pkgver
- # Respect LDFLAGS
- sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
- -i nss/coreconf/rules.mk
-
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
@@ -40,8 +39,6 @@
build() {
- xmlto man nss-config.xml
-
cd certs
python2 ../certdata2pem.py
@@ -49,31 +46,15 @@
sh bundle.sh
cd nss-$pkgver/nss
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSS_ALLOW_SSLKEYLOGFILE=1
- export NSS_ENABLE_ECC=1
- export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
- export NSPR_LIB_DIR="`nspr-config --libdir`"
- export XCFLAGS="${CFLAGS} -Wno-error=int-in-bool-context"
-
- [[ $CARCH == x86_64 ]] && export USE_64=1
-
- make -C coreconf
- make -C lib/dbm
- make
- make clean_docs build_docs
+ PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr -v
}
package_nss() {
cd nss-$pkgver
- install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig,share/man/man1}
+ { read _vmajor; read _vminor; read _vpatch; } \
+< <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
- 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 ../nss.pc.in \
-e "s,%libdir%,/usr/lib,g" \
-e "s,%prefix%,/usr,g" \
@@ -80,8 +61,8 @@
-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/lib/pkgconfig/nss.pc"
+-e "s,%NSS_VERSION%,${pkgver},g" |
+install -Dm644 /dev/stdin "$pkgdir/usr/lib/pkgconfig/nss.pc"
ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
sed ../nss-config.in \
@@ -89,26 +70,24 @@
-e "s,@prefix@,/usr/bin,g" \
-e "s,@exec_prefix@,/usr/bin,g" \
-e "s,@includedir@,/usr/include/nss,g" \
--e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
--e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
--e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-> "$pkgdir/usr/bin/nss-config"
- chmod 755 "$pkgdir/usr/bin/nss-config"
+-e "s,@MOD_MAJOR_VERSION@,${_vmajor},g" \
+-e "s,@MOD_MINOR_VERSION@,${_vminor},g" \
+-e "s,@MOD_PATCH_VERSION@,${_vpatch},g" |
+install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
- install -t "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1
../nss-config.1
+ install -Dt "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1
../nss-config.1
cd dist
- install -t "$pkgdir/usr/include/nss" -m644 public/nss/*.h
+ install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h
- cd *.OBJ/bin
- install -t "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver
ssltap vfychain vfyserv
+ cd Release/bin
+ install -Dt "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver
ssltap vfychain vfyserv
cd ../lib
- install -t "$pkgdir/usr/lib" *.so
- install -t "$pkgdir/usr/lib" -m644 *.chk libcrmf.a
+ install -Dt "$pkgdir/usr/lib" *.so
+ install -Dt "$pkgdir/usr/lib" -m644 *.chk
- rm "$pkgdir/usr/lib/libnssckbi.so"
- ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
+ ln -sf
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, June 8, 2017 @ 19:54:55
Author: heftig
Revision: 298441
3.31-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-08 17:51:10 UTC (rev 298440)
+++ PKGBUILD2017-06-08 19:54:55 UTC (rev 298441)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.30.2
+pkgver=3.31
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24'
+sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, May 30, 2017 @ 16:26:01
Author: heftig
Revision: 296753
FS#54192 GCC 7 fixup
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-05-30 15:42:04 UTC (rev 296752)
+++ PKGBUILD2017-05-30 16:26:01 UTC (rev 296753)
@@ -55,7 +55,7 @@
export NSS_ENABLE_ECC=1
export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
export NSPR_LIB_DIR="`nspr-config --libdir`"
- export XCFLAGS="${CFLAGS}"
+ export XCFLAGS="${CFLAGS} -Wno-error=int-in-bool-context"
[[ $CARCH == x86_64 ]] && export USE_64=1
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, April 21, 2017 @ 10:40:28
Author: heftig
Revision: 293795
3.30.2-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-21 10:36:16 UTC (rev 293794)
+++ PKGBUILD2017-04-21 10:40:28 UTC (rev 293795)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.30.1
+pkgver=3.30.2
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('1fa273a9a18611bfd22ecd61283172a5aa66af7d0783c7018f42d48000be5eb6'
+sha256sums=('0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, April 5, 2017 @ 20:52:03
Author: heftig
Revision: 292215
3.30.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-05 19:26:46 UTC (rev 292214)
+++ PKGBUILD2017-04-05 20:52:03 UTC (rev 292215)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.30
+pkgver=3.30.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('a8cdae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9'
+sha256sums=('1fa273a9a18611bfd22ecd61283172a5aa66af7d0783c7018f42d48000be5eb6'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, March 31, 2017 @ 18:29:51
Author: heftig
Revision: 291951
3.30-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-31 17:46:40 UTC (rev 291950)
+++ PKGBUILD2017-03-31 18:29:51 UTC (rev 291951)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.29.3
-pkgrel=2
+pkgver=3.30
+pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
@@ -13,9 +13,9 @@
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl')
options=('!strip' '!makeflags' 'staticlibs')
-source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('35ddcc31251ef829994efeee925011aa1414e32be7e388236970255aa3c8e1eb'
+sha256sums=('a8cdae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9'
'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD bundle.sh certdata2pem.py)
Date: Tuesday, March 7, 2017 @ 21:02:52
Author: heftig
Revision: 290105
3.29.3-2: Update using current ca-certificates code
Modified:
nss/trunk/PKGBUILD
nss/trunk/bundle.sh
nss/trunk/certdata2pem.py
-+
PKGBUILD| 12 +--
bundle.sh | 42 +--
certdata2pem.py | 198 +++---
3 files changed, 198 insertions(+), 54 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-07 20:23:57 UTC (rev 290104)
+++ PKGBUILD2017-03-07 21:02:52 UTC (rev 290105)
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.29.3
-pkgrel=1
+pkgrel=2
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
@@ -16,8 +16,8 @@
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
sha256sums=('35ddcc31251ef829994efeee925011aa1414e32be7e388236970255aa3c8e1eb'
-'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
-'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
+'512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
+'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1')
@@ -115,8 +115,6 @@
pkgdesc="Mozilla's set of trusted CA certificates"
depends=(ca-certificates-utils)
- local _certdir="$pkgdir/usr/share/ca-certificates/trust-source"
- install -Dm644 ca-bundle.trust.crt "$_certdir/mozilla.trust.crt"
- install -Dm644 ca-bundle.neutral-trust.crt
"$_certdir/mozilla.neutral-trust.crt"
- install -Dm644 ca-bundle.supplement.p11-kit
"$_certdir/mozilla.supplement.p11-kit"
+ install -Dm644 ca-bundle.trust.p11-kit \
+"$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit"
}
Modified: bundle.sh
===
--- bundle.sh 2017-03-07 20:23:57 UTC (rev 290104)
+++ bundle.sh 2017-03-07 21:02:52 UTC (rev 290105)
@@ -5,11 +5,8 @@
cat < ca-bundle.trust.crt
-for f in certs/*.crt; do
- echo "processing $f"
- tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f`
- distbits=`sed -n '/^# openssl-distrust/{s/^.*=//;p;}' $f`
- alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'`
- targs=""
- if [ -n "$tbits" ]; then
-for t in $tbits; do
- targs="${targs} -addtrust $t"
-done
- fi
- if [ -n "$distbits" ]; then
-for t in $distbits; do
- targs="${targs} -addreject $t"
-done
- fi
- if [ -n "$targs" ]; then
-echo "trust flags $targs for $f" >> info.trust
-openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >>
ca-bundle.trust.crt
- else
-echo "no trust flags for $f" >> info.notrust
-# p11-kit-trust defines empty trust lists as "rejected for all purposes".
-# That's why we use the simple file format
-# (BEGIN CERTIFICATE, no trust information)
-# because p11-kit-trust will treat it as a certificate with neutral trust.
-# This means we cannot use the -setalias feature for neutral trust certs.
-openssl x509 -text -in "$f" >> ca-bundle.neutral-trust.crt
- fi
-done
+) > ca-bundle.trust.p11-kit
-for p in certs/*.p11-kit; do
- cat "$p" >> ca-bundle.supplement.p11-kit
+for p in certs/*.tmp-p11-kit; do
+ cat "$p" >> ca-bundle.trust.p11-kit
done
Modified: certdata2pem.py
===
--- certdata2pem.py 2017-03-07 20:23:57 UTC (rev 290104)
+++ certdata2pem.py 2017-03-07 21:02:52 UTC (rev 290105)
@@ -27,6 +27,7 @@
import sys
import textwrap
import urllib
+import subprocess
objects = []
@@ -113,6 +114,17 @@
serial = printable_serial(obj)
return label + ":" + serial
+def write_cert_ext_to_file(f, oid, value, public_key):
+f.write("[p11-kit-object-v1]\n")
+f.write("label: ");
+f.write(tobj['CKA_LABEL'])
+f.write("\n")
+f.write("class: x-certificate-extension\n");
+f.write("object-id: " + oid + "\n")
+f.write("value: \"" + value + "\"\n")
+f.write("modifiable: false\n");
+f.write(public_key)
+
trust_types = {
"CKA_TRUST_DIGITAL_SIGNATURE": "digital-signature",
"CKA_TRUST_NON_REPUDIATION": "non-repudiation",
@@ -132,6 +144,18 @@
"CKA_TRUST_STEP_UP_APPROVED": "step-up-approved",
}
+legacy_trust_types = {
+ "LEGACY_CKA_TRUST_SERVER_AUTH": "server-auth",
+ "LEGACY_CKA_TRUST_CODE_SIGNING": "code-signing",
+ "LEGACY_CKA_TRUST_EMAIL_PROTECTION": "email-protection",
+}
+
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Monday, March 6, 2017 @ 21:36:03
Author: heftig
Revision: 290066
3.29.3-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-06 21:30:50 UTC (rev 290065)
+++ PKGBUILD2017-03-06 21:36:03 UTC (rev 290066)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.29.2
+pkgver=3.29.3
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('bc44302b624faf0ac187ec4b8b4c003c0ec465aa846744a085e6ac5ff3012891'
+sha256sums=('35ddcc31251ef829994efeee925011aa1414e32be7e388236970255aa3c8e1eb'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, March 4, 2017 @ 08:43:19
Author: heftig
Revision: 289967
3.29.2-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-04 06:53:24 UTC (rev 289966)
+++ PKGBUILD2017-03-04 08:43:19 UTC (rev 289967)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.29.1
+pkgver=3.29.2
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('47259bc5c4439d8228d7c577ea652ed140588f27eae8ebb39cc91057aea37366'
+sha256sums=('bc44302b624faf0ac187ec4b8b4c003c0ec465aa846744a085e6ac5ff3012891'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, February 17, 2017 @ 22:54:48
Author: heftig
Revision: 289121
3.29.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-17 22:42:18 UTC (rev 289120)
+++ PKGBUILD2017-02-17 22:54:48 UTC (rev 289121)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.29
+pkgver=3.29.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('ee19ebfe7b012dedb71f04a55dd06fa26f8dce435e5980531c790bd42673c6fa'
+sha256sums=('47259bc5c4439d8228d7c577ea652ed140588f27eae8ebb39cc91057aea37366'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, February 9, 2017 @ 19:08:37
Author: heftig
Revision: 288517
3.29-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-09 18:29:37 UTC (rev 288516)
+++ PKGBUILD2017-02-09 19:08:37 UTC (rev 288517)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.28.1
+pkgver=3.29
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad'
+sha256sums=('ee19ebfe7b012dedb71f04a55dd06fa26f8dce435e5980531c790bd42673c6fa'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Wednesday, January 25, 2017 @ 10:04:03
Author: heftig
Revision: 287407
3.28.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-25 09:50:19 UTC (rev 287406)
+++ PKGBUILD2017-01-25 10:04:03 UTC (rev 287407)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.27.2
+pkgver=3.28.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524'
+sha256sums=('58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, November 29, 2016 @ 20:17:38
Author: heftig
Revision: 282337
3.27.2-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-29 17:57:18 UTC (rev 282336)
+++ PKGBUILD2016-11-29 20:17:38 UTC (rev 282337)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.27.1
+pkgver=3.27.2
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b'
+sha256sums=('dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Monday, October 10, 2016 @ 22:10:36
Author: heftig
Revision: 278199
3.27.1-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-10-10 22:09:24 UTC (rev 278198)
+++ PKGBUILD2016-10-10 22:10:36 UTC (rev 278199)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.27
+pkgver=3.27.1
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
-sha256sums=('021aa936b06f5815474dd5c137f2325b3fe06caa38d9798ca53ec30b537301fa'
+sha256sums=('fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Saturday, October 1, 2016 @ 18:20:49
Author: heftig
Revision: 277518
3.27-1
Modified:
nss/trunk/PKGBUILD
Deleted:
nss/trunk/legacy-certs.patch
+
PKGBUILD | 13
legacy-certs.patch | 1089 ---
2 files changed, 4 insertions(+), 1098 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-10-01 18:15:37 UTC (rev 277517)
+++ PKGBUILD2016-10-01 18:20:49 UTC (rev 277518)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.26
+pkgver=3.27
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -14,14 +14,13 @@
makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl')
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
-certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml
legacy-certs.patch)
-sha256sums=('91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564'
+certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
+sha256sums=('021aa936b06f5815474dd5c137f2325b3fe06caa38d9798ca53ec30b537301fa'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
-'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
-'5f793af9c8558324e4188163862e0e70a5b069a44ad9e7817e0767093739f2a0')
+'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1')
prepare() {
mkdir certs
@@ -31,10 +30,6 @@
cd nss-$pkgver
- # Still needed - Evolution (Camel) and Telepathy-Gabble (Wocky) use
- # their own validation which doesn't work with trusted intermediates
- patch nss/lib/ckfw/builtins/certdata.txt ../legacy-certs.patch
-
# Respect LDFLAGS
sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
-i nss/coreconf/rules.mk
Deleted: legacy-certs.patch
===
--- legacy-certs.patch 2016-10-01 18:15:37 UTC (rev 277517)
+++ legacy-certs.patch 2016-10-01 18:20:49 UTC (rev 277518)
@@ -1,1089 +0,0 @@
certdata.txt 2016-02-26 22:21:17.016942918 +0100
-+++ certdata-legacy.txt2016-03-21 10:47:41.022763306 +0100
-@@ -70,6 +70,421 @@
- CKA_LABEL UTF8 "Mozilla Builtin Roots"
-
- #
-+# Certificate "GTE CyberTrust Global Root"
-+#
-+# Issuer: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions,
Inc.",O=GTE Corporation,C=US
-+# Serial Number: 421 (0x1a5)
-+# Subject: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions,
Inc.",O=GTE Corporation,C=US
-+# Not Valid Before: Thu Aug 13 00:29:00 1998
-+# Not Valid After : Mon Aug 13 23:59:00 2018
-+# Fingerprint (MD5): CA:3D:D3:68:F1:03:5C:D0:32:FA:B8:2B:59:E8:5A:DB
-+# Fingerprint (SHA1):
97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "GTE CyberTrust Global Root"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-+\141\154\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-+\141\154\040\122\157\157\164
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\002\001\245
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\002\132\060\202\001\303\002\002\001\245\060\015\006\011
-+\052\206\110\206\367\015\001\001\004\005\000\060\165\061\013\060
-+\011\006\003\125\004\006\023\002\125\123\061\030\060\026\006\003
-+\125\004\012\023\017\107\124\105\040\103\157\162\160\157\162\141
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, August 6, 2016 @ 20:54:23
Author: heftig
Revision: 273428
3.26-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-08-06 18:30:38 UTC (rev 273427)
+++ PKGBUILD2016-08-06 20:54:23 UTC (rev 273428)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.25
+pkgver=3.26
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml
legacy-certs.patch)
-sha256sums=('5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359'
+sha256sums=('91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
[arch-commits] Commit in nss/trunk (PKGBUILD nss-config.xml nss.pc.in)
Date: Saturday, June 25, 2016 @ 22:32:21
Author: heftig
Revision: 270653
3.25-1
Added:
nss/trunk/nss-config.xml
Modified:
nss/trunk/PKGBUILD
nss/trunk/nss.pc.in
+
PKGBUILD | 42 ++---
nss-config.xml | 132 +++
nss.pc.in |2
3 files changed, 159 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-06-25 17:43:20 UTC (rev 270652)
+++ PKGBUILD2016-06-25 22:32:21 UTC (rev 270653)
@@ -3,28 +3,32 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.24
-pkgrel=2
-pkgdesc="Mozilla Network Security Services"
+pkgver=3.25
+pkgrel=1
+pkgdesc="Network Security Services"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/;
license=('MPL' 'GPL')
_nsprver=4.12
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
-makedepends=('perl' 'python2')
+makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl')
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
-certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed'
+certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml
legacy-certs.patch)
+sha256sums=('5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
-'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
+'98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
'5f793af9c8558324e4188163862e0e70a5b069a44ad9e7817e0767093739f2a0')
prepare() {
mkdir certs
+ echo -n "$(date +"%e %B %Y")" >date.xml
+ echo -n "$pkgver" >version.xml
+
cd nss-$pkgver
# Still needed - Evolution (Camel) and Telepathy-Gabble (Wocky) use
@@ -41,6 +45,8 @@
build() {
+ xmlto man nss-config.xml
+
cd certs
python2 ../certdata2pem.py
@@ -56,17 +62,19 @@
export NSPR_LIB_DIR="`nspr-config --libdir`"
export XCFLAGS="${CFLAGS}"
- [ "$CARCH" = "x86_64" ] && export USE_64=1
+ [[ $CARCH == x86_64 ]] && export USE_64=1
make -C coreconf
make -C lib/dbm
make
+ make clean_docs build_docs
}
package_nss() {
cd nss-$pkgver
- install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
+ install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig,share/man/man1}
+
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}')
@@ -92,16 +100,18 @@
> "$pkgdir/usr/bin/nss-config"
chmod 755 "$pkgdir/usr/bin/nss-config"
- cd dist/*.OBJ/bin
- install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+ install -t "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1
../nss-config.1
+ cd dist
+ install -t "$pkgdir/usr/include/nss" -m644 public/nss/*.h
+
+ cd *.OBJ/bin
+ install -t "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver
ssltap vfychain vfyserv
+
cd ../lib
install -t "$pkgdir/usr/lib" *.so
- install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk
+ install -t "$pkgdir/usr/lib" -m644 *.chk libcrmf.a
- cd ../../public/nss
- install -t "$pkgdir/usr/include/nss" -m644 *.h
-
rm "$pkgdir/usr/lib/libnssckbi.so"
ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
}
Added: nss-config.xml
===
--- nss-config.xml (rev 0)
+++ nss-config.xml 2016-06-25 22:32:21 UTC (rev 270653)
@@ -0,0 +1,132 @@
+
+http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd; [
+
+
+]>
+
+
+
+
+
+Network Security Services
+nss
+
+
+
+
+nss-config
+1
+
+
+
+nss-config
+Return meta information about nss libraries
+
+
+
+
+ nss-config
+ --prefix
+ --exec-prefix
+ --includedir
+ --libs
+ --cflags
+ --libdir
+ --version
+
+
+
+
+Description
+
+nss-config is a shell scrip
+tool which can be used to obtain gcc options for building client pacakges
of nspt.
+
+
+
+
+Options
+
+
+
+--prefix
+Returns the top level system directory under which
the nss libraries are installed.
+
+
+
+--exec-prefix
+returns the
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, June 16, 2016 @ 18:01:34 Author: heftig Revision: 270022 3.24-2 Modified: nss/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-06-16 16:19:48 UTC (rev 270021) +++ PKGBUILD2016-06-16 18:01:34 UTC (rev 270022) @@ -4,7 +4,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) pkgver=3.24 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/; @@ -50,6 +50,7 @@ cd nss-$pkgver/nss export BUILD_OPT=1 export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ALLOW_SSLKEYLOGFILE=1 export NSS_ENABLE_ECC=1 export NSPR_INCLUDE_DIR="`nspr-config --includedir`" export NSPR_LIB_DIR="`nspr-config --libdir`"
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Monday, May 23, 2016 @ 19:09:21
Author: heftig
Revision: 268514
3.24-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-23 17:07:36 UTC (rev 268513)
+++ PKGBUILD2016-05-23 17:09:21 UTC (rev 268514)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.23
-pkgrel=4
+pkgver=3.24
+pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf'
+sha256sums=('2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Monday, March 21, 2016 @ 10:55:53 Author: heftig Revision: 262144 Update to Fedora legacy ca-certificates 2.7 Modified: nss/trunk/PKGBUILD nss/trunk/legacy-certs.patch + PKGBUILD |4 legacy-certs.patch | 1534 --- 2 files changed, 15 insertions(+), 1523 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 262143:262144 to see the changes.
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Wednesday, March 16, 2016 @ 17:31:30 Author: heftig Revision: 261919 3.23-2 Added: nss/trunk/legacy-certs.patch Modified: nss/trunk/PKGBUILD + PKGBUILD | 14 legacy-certs.patch | 2597 +++ 2 files changed, 2607 insertions(+), 4 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 261918:261919 to see the changes.
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Monday, March 7, 2016 @ 10:29:29 Author: jgc Revision: 261152 upgpkg: nss 3.23-1 Remove legacy certs, should not be needed with recent OpenSSL and glib-networking anymore Modified: nss/trunk/PKGBUILD Deleted: nss/trunk/legacy-certs.patch + PKGBUILD | 15 legacy-certs.patch | 1137 --- 2 files changed, 4 insertions(+), 1148 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 261151:261152 to see the changes.
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Saturday, February 20, 2016 @ 11:47:24
Author: heftig
Revision: 260070
3.22.1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-20 10:43:09 UTC (rev 260069)
+++ PKGBUILD2016-02-20 10:47:24 UTC (rev 260070)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.22
+pkgver=3.22.1
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611'
+sha256sums=('89e1fc7074e5c325962821289f4cd7d8207ae95af2308ba881215ed9ca68fa4f'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, February 5, 2016 @ 13:42:09
Author: heftig
Revision: 258900
3.22
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-05 09:55:54 UTC (rev 258899)
+++ PKGBUILD2016-02-05 12:42:09 UTC (rev 258900)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.21
+pkgver=3.22
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239'
+sha256sums=('30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Friday, December 18, 2015 @ 14:31:46 Author: heftig Revision: 256741 3.21 with Fedora legacy ca-certificates 2.6 Modified: nss/trunk/PKGBUILD nss/trunk/legacy-certs.patch + PKGBUILD |6 legacy-certs.patch | 1119 ++- 2 files changed, 1118 insertions(+), 7 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 256740:256741 to see the changes.
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, November 3, 2015 @ 08:50:24
Author: foutrelis
Revision: 250047
upgpkg: nss 3.20.1-1
New upstream release.
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-03 07:37:30 UTC (rev 250046)
+++ PKGBUILD2015-11-03 07:50:24 UTC (rev 250047)
@@ -3,19 +3,19 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.20
+pkgver=3.20.1
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/;
license=('MPL' 'GPL')
-_nsprver=4.10.8
+_nsprver=4.10.10
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
makedepends=('perl' 'python2')
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c'
+sha256sums=('ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Thursday, August 20, 2015 @ 12:52:53
Author: jgc
Revision: 244427
upgpkg: nss 3.20-1
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-08-20 10:46:44 UTC (rev 244426)
+++ PKGBUILD2015-08-20 10:52:53 UTC (rev 244427)
@@ -3,19 +3,19 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.19.2
-pkgrel=2
+pkgver=3.20
+pkgrel=1
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
url=http://www.mozilla.org/projects/security/pki/nss/;
license=('MPL' 'GPL')
-_nsprver=4.10.7
+_nsprver=4.10.8
depends=(nspr=${_nsprver} 'sqlite' 'zlib' 'sh' 'p11-kit')
makedepends=('perl' 'python2')
options=('!strip' '!makeflags' 'staticlibs')
source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae'
+sha256sums=('5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Sunday, June 28, 2015 @ 00:49:16
Author: heftig
Revision: 241303
FS#45479: Reenable two legacy certs
Added:
nss/trunk/legacy-certs.patch
(from rev 240589, nss/trunk/legacy-certs.patch)
Modified:
nss/trunk/PKGBUILD
+
PKGBUILD | 12 +---
legacy-certs.patch | 26 ++
2 files changed, 35 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-27 20:34:18 UTC (rev 241302)
+++ PKGBUILD2015-06-27 22:49:16 UTC (rev 241303)
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.19.2
-pkgrel=1
+pkgrel=2
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
url=http://www.mozilla.org/projects/security/pki/nss/;
@@ -14,12 +14,13 @@
makedepends=('perl' 'python2')
options=('!strip' '!makeflags' 'staticlibs')
source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
-certdata2pem.py bundle.sh nss.pc.in nss-config.in)
+certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
sha256sums=('1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae'
'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
-'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9')
+'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
+'22330fcde2dac5fa4733f7d77bffbbd31d91cbaa338738afdc2a8ebfccb61184')
prepare() {
mkdir certs
@@ -26,6 +27,11 @@
cd nss-$pkgver
+ # FS#45479: Reenable two weak Verisign certificates used by login.live.com
+ # Otherwise, accessing this site via Epiphany (GnuTLS) or Skype (OpenSSL)
fails
+ # Also see https://gist.github.com/grawity/15eabf67191e17080241
+ patch nss/lib/ckfw/builtins/certdata.txt ../legacy-certs.patch
+
# Respect LDFLAGS
sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
-i nss/coreconf/rules.mk
Copied: nss/trunk/legacy-certs.patch (from rev 240589,
nss/trunk/legacy-certs.patch)
===
--- legacy-certs.patch (rev 0)
+++ legacy-certs.patch 2015-06-27 22:49:16 UTC (rev 241303)
@@ -0,0 +1,26 @@
+--- certdata.txt 2015-06-27 23:31:01.419795911 +0200
certdata-legacy-less.txt 2015-06-27 23:57:47.106199639 +0200
+@@ -577,9 +577,9 @@
+ \002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314
+ \272\277
+ END
+-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+ #
+@@ -17186,9 +17186,9 @@
+ \002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277
+ \022\276
+ END
+-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+ #
[arch-commits] Commit in nss/trunk (PKGBUILD certdata2pem.py)
Date: Sunday, June 28, 2015 @ 01:14:04
Author: heftig
Revision: 241305
certdata2pem.py: Close the file
Modified:
nss/trunk/PKGBUILD
nss/trunk/certdata2pem.py
-+
PKGBUILD|2 +-
certdata2pem.py |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-27 22:51:14 UTC (rev 241304)
+++ PKGBUILD2015-06-27 23:14:04 UTC (rev 241305)
@@ -16,7 +16,7 @@
source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
sha256sums=('1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae'
-'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
+'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
Modified: certdata2pem.py
===
--- certdata2pem.py 2015-06-27 22:51:14 UTC (rev 241304)
+++ certdata2pem.py 2015-06-27 23:14:04 UTC (rev 241305)
@@ -196,4 +196,5 @@
if (tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED') or
(tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED') or
(tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED'):
f.write(x-distrusted: true\n)
f.write(\n\n)
+f.close()
print - written as '%s', trust = %s, openssl-trust = %s, distrust =
%s, openssl-distrust = %s % (fname, trustbits, openssl_trustflags,
distrustbits, openssl_distrustflags)
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, June 23, 2015 @ 06:32:41
Author: foutrelis
Revision: 241218
upgpkg: nss 3.19.2-1
New upstream release.
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-23 01:07:59 UTC (rev 241217)
+++ PKGBUILD2015-06-23 04:32:41 UTC (rev 241218)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.19.1
-pkgrel=2
+pkgver=3.19.2
+pkgrel=1
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
url=http://www.mozilla.org/projects/security/pki/nss/;
@@ -15,7 +15,7 @@
options=('!strip' '!makeflags' 'staticlibs')
source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py bundle.sh nss.pc.in nss-config.in)
-sha256sums=('b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff'
+sha256sums=('1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae'
'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Thursday, June 11, 2015 @ 17:46:11 Author: heftig Revision: 240590 Drop legacy certs - goes with openssl 1.0.2.b Modified: nss/trunk/PKGBUILD Deleted: nss/trunk/legacy-certs.patch + PKGBUILD | 17 legacy-certs.patch | 1125 --- 2 files changed, 3 insertions(+), 1139 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 240589:240590 to see the changes.
[arch-commits] Commit in nss/trunk (PKGBUILD ssl-renegotiate-transitional.patch)
Date: Friday, May 29, 2015 @ 00:12:59
Author: heftig
Revision: 239865
3.19.1
Modified:
nss/trunk/PKGBUILD
Deleted:
nss/trunk/ssl-renegotiate-transitional.patch
+
PKGBUILD | 10 ++
ssl-renegotiate-transitional.patch | 21 -
2 files changed, 2 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-28 21:41:45 UTC (rev 239864)
+++ PKGBUILD2015-05-28 22:12:59 UTC (rev 239865)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.18.1
+pkgver=3.19.1
pkgrel=1
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
@@ -18,14 +18,12 @@
bundle.sh
nss.pc.in
nss-config.in
-ssl-renegotiate-transitional.patch
legacy-certs.patch)
-sha256sums=('10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70'
+sha256sums=('b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff'
'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
-'12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97'
'e5531e1620317b73a84e6526b9348c9bf93ec51c336ea4644fdf94ab60e76bc7')
prepare() {
@@ -33,14 +31,10 @@
cd nss-$pkgver
- # Adds transitional SSL renegotiate support - patch from Debian
- patch -Np3 -i ../ssl-renegotiate-transitional.patch
-
# Temporarily reenable several weak certificates until OpenSSL
# and GnuTLS manage to handle multiple intermediates
# https://bugzilla.redhat.com/show_bug.cgi?id=1144808
# https://gist.github.com/grawity/15eabf67191e17080241
- # Altered again to readd trust removed in 3.17.3
patch nss/lib/ckfw/builtins/certdata.txt ../legacy-certs.patch
# Respect LDFLAGS
Deleted: ssl-renegotiate-transitional.patch
===
--- ssl-renegotiate-transitional.patch 2015-05-28 21:41:45 UTC (rev 239864)
+++ ssl-renegotiate-transitional.patch 2015-05-28 22:12:59 UTC (rev 239865)
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c
b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
- PR_FALSE, /* noLocks*/
- PR_FALSE, /* enableSessionTickets */
- PR_FALSE, /* enableDeflate */
--2, /* enableRenegotiation (default: requires extension) */
-+3, /* enableRenegotiation (default: transitional) */
- PR_FALSE, /* requireSafeNegotiation */
- };
-
[arch-commits] Commit in nss/trunk (PKGBUILD legacy-certs.patch)
Date: Tuesday, May 12, 2015 @ 16:15:03
Author: heftig
Revision: 239152
3.18.1
Modified:
nss/trunk/PKGBUILD
nss/trunk/legacy-certs.patch
+
PKGBUILD |8
legacy-certs.patch | 16 ++--
2 files changed, 6 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-12 14:14:48 UTC (rev 239151)
+++ PKGBUILD2015-05-12 14:15:03 UTC (rev 239152)
@@ -3,8 +3,8 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.18
-pkgrel=3
+pkgver=3.18.1
+pkgrel=1
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
url=http://www.mozilla.org/projects/security/pki/nss/;
@@ -20,13 +20,13 @@
nss-config.in
ssl-renegotiate-transitional.patch
legacy-certs.patch)
-sha256sums=('618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40'
+sha256sums=('10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70'
'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
'12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97'
-'dd02d70e64852fa8f9ac975a94eda0674a67e2ded35b35b79ab8ffb16fa2bea1')
+'e5531e1620317b73a84e6526b9348c9bf93ec51c336ea4644fdf94ab60e76bc7')
prepare() {
mkdir certs
Modified: legacy-certs.patch
===
--- legacy-certs.patch 2015-05-12 14:14:48 UTC (rev 239151)
+++ legacy-certs.patch 2015-05-12 14:15:03 UTC (rev 239152)
@@ -1,5 +1,5 @@
certdata3.18.txt 2015-03-27 22:36:53.453135734 +0100
-+++ certdataf.txt 2015-03-27 22:47:07.574011222 +0100
+--- certdata3.18.1.txt 2015-05-12 16:12:29.042014594 +0200
certdata.txt 2015-05-12 16:14:10.048341007 +0200
@@ -70,6 +70,421 @@
CKA_LABEL UTF8 Mozilla Builtin Roots
@@ -422,18 +422,6 @@
# Certificate Equifax Secure CA
#
# Issuer: OU=Equifax Secure Certificate Authority,O=Equifax,C=US
-@@ -187,9 +602,9 @@
- CKA_SERIAL_NUMBER MULTILINE_OCTAL
- \002\004\065\336\364\317
- END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- # Distrust Distrust a pb.com certificate that does not comply with the
baseline requirements.
@@ -577,9 +992,9 @@
\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314
\272\277
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Tuesday, May 12, 2015 @ 16:32:01
Author: foutrelis
Revision: 239157
upgpkg: nss 3.18.1-1
New upstream release.
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-12 14:16:10 UTC (rev 239156)
+++ PKGBUILD2015-05-12 14:32:01 UTC (rev 239157)
@@ -13,7 +13,7 @@
depends=(nspr=${_nsprver} 'sqlite' 'zlib' 'sh' 'p11-kit')
makedepends=('perl' 'python2')
options=('!strip' '!makeflags' 'staticlibs')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
+source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz;
certdata2pem.py
bundle.sh
nss.pc.in
[arch-commits] Commit in nss/trunk (PKGBUILD nss.install)
Date: Monday, March 30, 2015 @ 16:52:03
Author: foutrelis
Revision: 235277
upgpkg: nss 3.18-3
Use libnssckbi-p11-kit.so as a libnssckbi.so replacement.
(libnssckbi-p11-kit.so was added in p11-kit 0.23.1-2.)
Added:
nss/trunk/nss.install
Modified:
nss/trunk/PKGBUILD
-+
PKGBUILD|6 --
nss.install | 13 +
2 files changed, 17 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-30 14:39:22 UTC (rev 235276)
+++ PKGBUILD2015-03-30 14:52:03 UTC (rev 235277)
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.18
-pkgrel=2
+pkgrel=3
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
url=http://www.mozilla.org/projects/security/pki/nss/;
@@ -75,6 +75,8 @@
}
package_nss() {
+ install=nss.install
+
cd nss-$pkgver
install -d $pkgdir/usr/{bin,include/nss,lib/pkgconfig}
@@ -114,7 +116,7 @@
install -t $pkgdir/usr/include/nss -m644 *.h
rm $pkgdir/usr/lib/libnssckbi.so
- ln -s pkcs11/p11-kit-trust.so $pkgdir/usr/lib/libnssckbi.so
+ ln -s libnssckbi-p11-kit.so $pkgdir/usr/lib/libnssckbi.so
}
package_ca-certificates-mozilla() {
Added: nss.install
===
--- nss.install (rev 0)
+++ nss.install 2015-03-30 14:52:03 UTC (rev 235277)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ if (($(vercmp $2 3.18-3) 0)); then
+# This symlink was created by ldconfig because we linked to
+# pkcs11/p11-kit-trust.so from libnssckbi.so; the chain was:
+# p11-kit-trust.so - libnssckbi.so - pkcs11/p11-kit-trust.so
+# Now we have:
+# libnssckbi.so - libnssckbi-p11-kit.so
+# which no longer creates an incorrect p11-kit-trust.so symlink
+if [[ $(readlink usr/lib/p11-kit-trust.so) == libnssckbi.so ]]; then
+ rm usr/lib/p11-kit-trust.so
+fi
+ fi
+}
[arch-commits] Commit in nss/trunk (PKGBUILD)
Date: Friday, March 27, 2015 @ 12:02:05
Author: heftig
Revision: 235177
3.18
Modified:
nss/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-27 09:24:31 UTC (rev 235176)
+++ PKGBUILD2015-03-27 11:02:05 UTC (rev 235177)
@@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.17.4
+pkgver=3.18
pkgrel=1
pkgdesc=Mozilla Network Security Services
arch=(i686 x86_64)
@@ -20,7 +20,7 @@
nss-config.in
ssl-renegotiate-transitional.patch
legacy-certs.patch)
-sha256sums=('1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79'
+sha256sums=('618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40'
'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
