From cce9f2054f259ba83b744242a0a0c49779589552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 25 Jun 2022 21:43:24 +0700 Subject: [PATCH 1/2] nss: update to 3.80. --- srcpkgs/nss/patches/native-nsinstall-cflags.patch | 9 ++++----- srcpkgs/nss/template | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/nss/patches/native-nsinstall-cflags.patch b/srcpkgs/nss/patches/native-nsinstall-cflags.patch index e2734e700d4d..249d281becf4 100644 --- a/srcpkgs/nss/patches/native-nsinstall-cflags.patch +++ b/srcpkgs/nss/patches/native-nsinstall-cflags.patch @@ -1,11 +1,10 @@ ---- nss-3.68.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.68/nss/coreconf/nsinstall/Makefile -@@ -32,6 +32,8 @@ endif +--- nss-3.80.orig/nss/coreconf/nsinstall/Makefile ++++ nss-3.80/nss/coreconf/nsinstall/Makefile +@@ -32,6 +32,7 @@ endif ifdef NATIVE_FLAGS OS_CFLAGS=$(NATIVE_FLAGS) +XCFLAGS = $(NATIVE_FLAGS) -+LDFLAGS = $(LDFLAGS_FOR_BUILD) endif - include $(DEPTH)/coreconf/rules.mk + ifdef NATIVE_LDFLAGS diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 7ea39f1c3182..0d9c200fe637 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.34 pkgname=nss -version=3.79 +version=3.80 revision=1 hostmakedepends="perl which" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514 +checksum=c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a export NS_USE_GCC=1 export LIBRUNPATH= @@ -60,7 +60,9 @@ do_build() { export XCFLAGS="${CFLAGS}" make -C nss ${makejobs} \ ${CROSS_BUILD:+CROSS_COMPILE=1} OS_TEST="${_ARCH}" \ - NATIVE_CC="${BUILD_CC}" NATIVE_FLAGS="${BUILD_CFLAGS}" \ + NATIVE_CC="${CC_FOR_BUILD}" \ + NATIVE_FLAGS="${CFLAGS_FOR_BUILD}" \ + NATIVE_LDFLAGS="${LDFLAGS_FOR_BUILD}" \ CCC="$CXX" ${_use64} \ all } From 086d1a5284bd051e715347da78605893a2aed784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 26 Jun 2022 07:54:38 +0700 Subject: [PATCH 2/2] ca-certificates: update to 20211016+3.80. Close: #37682 --- srcpkgs/ca-certificates/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index eaa70fc7a22b..ca95efa092d7 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,6 +1,6 @@ # Template file for 'ca-certificates' pkgname=ca-certificates -version=20211016+3.77 +version=20211016+3.80 revision=1 _nss_version=${version#*+} bootstrap=yes @@ -8,7 +8,7 @@ conf_files="/etc/ca-certificates.conf" create_wrksrc=yes build_wrksrc="work" hostmakedepends="openssl" -depends="openssl<=2.0_1 run-parts" +depends="openssl run-parts" short_desc="Common CA certificates for SSL/TLS from Mozilla" maintainer="Orphaned " license="GPL-2.0-or-later, MPL-2.0" @@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz" checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 - 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd" + c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a" post_extract() { cp ${FILESDIR}/* $build_wrksrc/mozilla