diff --git a/info.yml b/info.yml index 0290b70..ae37938 100644 --- a/info.yml +++ b/info.yml @@ -1,6 +1,6 @@ name: nss description: Network Security Services -version: "3.127" +version: "3.129" revision: 1 url: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS license: MPL-2.0 @@ -23,4 +23,4 @@ downloads: - url: https://archive.mozilla.org/pub/security/nss/releases/NSS_${BPM_PKG_VERSION//./_}_RTM/src/nss-${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 5a899cad21ae2c9d3c5132de79726eda8df3b7fdf18eeb239fc544d43b87338b + checksum: 38baa3b0a18a3f674843473b549753c96419a0151abd1e7a9b214ce0493d0785 diff --git a/recipe.sh b/recipe.sh index d4e88b1..da039ac 100644 --- a/recipe.sh +++ b/recipe.sh @@ -10,6 +10,8 @@ prepare() { mkdir "$BPM_SOURCE"/certs ln -srft "$BPM_SOURCE"/certs "$BPM_SOURCE"/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} + + patch -i "$BPM_WORKDIR"/0001-fix-generating-nss.pc-with-system-nspr.patch "$BPM_SOURCE"/nss/build.sh } # The build function is executed in the source directory diff --git a/source-files/0001-fix-generating-nss.pc-with-system-nspr.patch b/source-files/0001-fix-generating-nss.pc-with-system-nspr.patch new file mode 100644 index 0000000..01af709 --- /dev/null +++ b/source-files/0001-fix-generating-nss.pc-with-system-nspr.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 10 Sep 2026 00:04:58 +0200 +Subject: [PATCH] Fix generating nss.pc with system-nspr + +--- + build.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build.sh b/build.sh +index 06d9678e36b9..41b59b83d5c6 100755 +--- a/build.sh ++++ b/build.sh +@@ -331,8 +331,10 @@ generate_pkg_config() + vpatch=$(sed -n 's/^#define NSS_VPATCH \([0-9]*\).*/\1/p' "$nss_h") + [ -n "$vmajor" ] || return 0 + +- nspr_version=$(sed -n 's/^Version: *//p' \ +- "$obj_dir/lib/pkgconfig/nspr.pc" 2>/dev/null) ++ if [ "$no_local_nspr" = 0 ]; then ++ nspr_version=$(sed -n 's/^Version: *//p' \ ++ "$obj_dir/lib/pkgconfig/nspr.pc" 2>/dev/null) ++ fi + : "${nspr_version:=4.32}" + + mkdir -p "$obj_dir/lib/pkgconfig"