commit: 0f9c8fdf3a715fb6aed2575e7cc3f872e3698c52 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Tue Nov 18 18:11:27 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Nov 18 18:11:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9c8fdf
dev-libs/nss: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> ...cted-error-code-in-pkg12util-pbmac1-tests.patch | 49 ---- ...9-align-sftkdb_known_attributes_size-type.patch | 76 ------ dev-libs/nss/files/nss-3.53-gentoo-fixups.patch | 290 --------------------- 3 files changed, 415 deletions(-) diff --git a/dev-libs/nss/files/nss-3.101.3-update-expected-error-code-in-pkg12util-pbmac1-tests.patch b/dev-libs/nss/files/nss-3.101.3-update-expected-error-code-in-pkg12util-pbmac1-tests.patch deleted file mode 100644 index db3b6a33008d..000000000000 --- a/dev-libs/nss/files/nss-3.101.3-update-expected-error-code-in-pkg12util-pbmac1-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ - -# HG changeset patch -# User John Schanck <[email protected]> -# Date 1731689351 0 -# Node ID 74feb03fe4f9efc0d5e5018b9a34376fc1261404 -# Parent 98e011fd3a24428abb886525630caacffabe01eb -Bug 1927096 - update expected error code in pk12util pbmac1 tests. r=rrelyea - -Differential Revision: https://phabricator.services.mozilla.com/D227894 - -diff --git a/tests/tools/tools.sh b/tests/tools/tools.sh ---- a/tests/tools/tools.sh -+++ b/tests/tools/tools.sh -@@ -539,31 +539,31 @@ tools_p12_import_pbmac1_samples() - ${BINDIR}/pk12util -i ${TOOLSDIR}/data/pbmac1-valid-sha512.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 - ret=$? - html_msg $ret 0 "Importing private key pbmac1 hmac-sha-512 from PKCS#12 file" - check_tmpfile - - echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" - ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 - ret=$? -- html_msg $ret 19 "Fail to list private key with bad iterator" -+ html_msg $ret 17 "Fail to list private key with bad iterator" - check_tmpfile - - echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" - ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 - ret=$? - echo "Fail to list private key with bad salt val=$ret" -- html_msg $ret 19 "Fail to import private key with bad salt" -+ html_msg $ret 17 "Fail to import private key with bad salt" - check_tmpfile - - echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" - ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 - ret=$? - echo "Fail to import private key with no length val=$ret" -- html_msg $ret 19 "Fail to import private key with no length" -+ html_msg $ret 17 "Fail to import private key with no length" - check_tmpfile - } - - ############################## tools_p12 ############################### - # local shell function to test basic functionality of pk12util - ######################################################################## - tools_p12() - { - diff --git a/dev-libs/nss/files/nss-3.115-bmo-1983399-align-sftkdb_known_attributes_size-type.patch b/dev-libs/nss/files/nss-3.115-bmo-1983399-align-sftkdb_known_attributes_size-type.patch deleted file mode 100644 index 2254ec095f68..000000000000 --- a/dev-libs/nss/files/nss-3.115-bmo-1983399-align-sftkdb_known_attributes_size-type.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/lib/softoken/sdb.c b/lib/softoken/sdb.c ---- a/lib/softoken/sdb.c -+++ b/lib/softoken/sdb.c -@@ -156,11 +156,11 @@ - CKA_NSS_TRUST_STEP_UP_APPROVED, CKA_NSS_CERT_SHA1_HASH, - CKA_NSS_CERT_MD5_HASH, CKA_NSS_DB, - }; - // clang-format on - --const int sftkdb_known_attributes_size = PR_ARRAY_SIZE(sftkdb_known_attributes); -+const size_t sftkdb_known_attributes_size = PR_ARRAY_SIZE(sftkdb_known_attributes); - - /* - * Note on use of sqlReadDB: Only one thread at a time may have an actual - * operation going on given sqlite3 * database. An operation is defined as - * the time from a sqlite3_prepare() until the sqlite3_finalize(). -@@ -2022,12 +2022,12 @@ - sqlite3_finalize(stmt); - return CKR_OK; - } - /* we have more attributes than in the database, so we know things - * are missing, find what was missing */ -- for (int i = 0; i < sftkdb_known_attributes_size; i++) { -- char *typeString = sqlite3_mprintf("a%x", sftkdb_known_attributes[i]); -+ for (size_t i = 0; i < sftkdb_known_attributes_size; i++) { -+ char *typeString = sqlite3_mprintf("a%lx", sftkdb_known_attributes[i]); - PRBool found = PR_FALSE; - /* this one index is important, we skip the first column (id), since - * it will never match, starting at zero isn't a bug, - * just inefficient */ - for (int j = 1; j < columnCount; j++) { -@@ -2070,11 +2070,10 @@ - - CK_RV - sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate, - int *newInit, int inFlags, PRUint32 accessOps, SDB **pSdb) - { -- int i; - char *initStr = NULL; - char *newStr; - char *queryStr = NULL; - int inTransaction = 0; - SDB *sdb = NULL; -@@ -2134,12 +2133,13 @@ - if (flags != SDB_CREATE) { - error = sdb_mapSQLError(type, SQLITE_CANTOPEN); - goto loser; - } - initStr = sqlite3_mprintf(""); -- for (i = 0; initStr && i < sftkdb_known_attributes_size; i++) { -- newStr = sqlite3_mprintf("%s, a%x", initStr, sftkdb_known_attributes[i]); -+ for (size_t i = 0; initStr && i < sftkdb_known_attributes_size; i++) { -+ newStr = sqlite3_mprintf("%s, a%lx", initStr, -+ sftkdb_known_attributes[i]); - sqlite3_free(initStr); - initStr = newStr; - } - if (initStr == NULL) { - error = CKR_HOST_MEMORY; -diff --git a/lib/softoken/sftkdbti.h b/lib/softoken/sftkdbti.h ---- a/lib/softoken/sftkdbti.h -+++ b/lib/softoken/sftkdbti.h -@@ -25,11 +25,11 @@ - PRBool updateDBIsInit; - PRBool usesLegacyStorage; - }; - - extern const CK_ATTRIBUTE_TYPE sftkdb_known_attributes[]; --extern unsigned int sftkdb_known_attributes_size; -+extern size_t sftkdb_known_attributes_size; - - #define SFTK_KEYDB_TYPE 0x40000000 - #define SFTK_CERTDB_TYPE 0x00000000 - #define SFTK_OBJ_TYPE_MASK 0xc0000000 - #define SFTK_OBJ_ID_MASK (~SFTK_OBJ_TYPE_MASK) - diff --git a/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch deleted file mode 100644 index 2d8bdb6f5a31..000000000000 --- a/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 1b3c48499abb000d708abe5f05413c1f4155e086 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <[email protected]> -Date: Mon, 8 Jun 2020 12:22:29 -0500 -Subject: [PATCH] Add pkg-config and nss-config for Gentoo - ---- - Makefile | 15 +---- - config/Makefile | 40 ++++++++++++ - config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++ - config/nss.pc.in | 12 ++++ - manifest.mn | 2 +- - 5 files changed, 200 insertions(+), 14 deletions(-) - create mode 100644 config/Makefile - create mode 100644 config/nss-config.in - create mode 100644 config/nss.pc.in - -diff --git a/Makefile b/Makefile -index eb4ed1a..f979d90 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,6 +4,8 @@ - # 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/. - -+default: nss_build_all -+ - ####################################################################### - # (1) Include initial platform-independent assignments (MANDATORY). # - ####################################################################### -@@ -48,12 +50,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk - ####################################################################### - - nss_build_all: -- $(MAKE) build_nspr - $(MAKE) all -- $(MAKE) latest - - nss_clean_all: -- $(MAKE) clobber_nspr - $(MAKE) clobber - - NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status -@@ -138,16 +137,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) - --prefix='$(NSS_GYP_PREFIX)' - endif - --build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests -- --install_nspr: build_nspr -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber -- - build_docs: - $(MAKE) -C $(CORE_DEPTH)/doc - -diff --git a/config/Makefile b/config/Makefile -new file mode 100644 -index 0000000..aaf1991 ---- /dev/null -+++ b/config/Makefile -@@ -0,0 +1,40 @@ -+CORE_DEPTH = .. -+DEPTH = .. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = $(shell grep -F "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}') -+NSS_MINOR_VERSION = $(shell grep -F "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}') -+NSS_PATCH_VERSION = $(shell grep -F "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}') -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@exec_prefix@,\$${prefix}," \ -+ -e "s,@libdir@,\$${prefix}/lib64," \ -+ -e "s,@includedir@,\$${prefix}/include/nss," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss.pc.in > nss.pc -+ chmod 0644 nss.pc -+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../config/nss-config $(DIST)/bin -+ -+libs: -+ -+dummy: all export libs -+ -diff --git a/config/nss-config.in b/config/nss-config.in -new file mode 100644 -index 0000000..3a957b8 ---- /dev/null -+++ b/config/nss-config.in -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <<EOF -+Usage: nss-config [OPTIONS] [LIBRARIES] -+Options: -+ [--prefix[=DIR]] -+ [--exec-prefix[=DIR]] -+ [--includedir[=DIR]] -+ [--libdir[=DIR]] -+ [--version] -+ [--libs] -+ [--cflags] -+Dynamic Libraries: -+ nss -+ ssl -+ smime -+ nssutil -+EOF -+ exit $1 -+} -+ -+if test $# -eq 0; then -+ usage 1 1>&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 -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "${exec_prefix}"; then -+ exec_prefix=$(pkg-config --variable=exec_prefix nss) -+fi -+if test -z "${includedir}"; then -+ includedir=$(pkg-config --variable=includedir nss) -+fi -+if test -z "${libdir}"; then -+ libdir=$(pkg-config --variable=libdir nss) -+fi -+ -+if test "${echo_prefix}" = "yes"; then -+ echo ${prefix} -+fi -+ -+if test "${echo_exec_prefix}" = "yes"; then -+ echo ${exec_prefix} -+fi -+ -+if test "${echo_includedir}" = "yes"; then -+ echo ${includedir} -+fi -+ -+if test "${echo_libdir}" = "yes"; then -+ echo ${libdir} -+fi -+ -+if test "${echo_cflags}" = "yes"; then -+ echo -I${includedir} -+fi -+ -+if test "${echo_libs}" = "yes"; then -+ libdirs="" -+ if test -n "${lib_ssl}"; then -+ libdirs="${libdirs} -lssl${major_version}" -+ fi -+ if test -n "${lib_smime}"; then -+ libdirs="${libdirs} -lsmime${major_version}" -+ fi -+ if test -n "${lib_nss}"; then -+ libdirs="${libdirs} -lnss${major_version}" -+ fi -+ if test -n "${lib_nssutil}"; then -+ libdirs="${libdirs} -lnssutil${major_version}" -+ fi -+ echo ${libdirs} -+fi -+ -diff --git a/config/nss.pc.in b/config/nss.pc.in -new file mode 100644 -index 0000000..03f1e39 ---- /dev/null -+++ b/config/nss.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSS -+Description: Network Security Services -+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.25 -+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -+Cflags: -I${includedir} -+ -diff --git a/manifest.mn b/manifest.mn -index dada8ab..72dc9b3 100644 ---- a/manifest.mn -+++ b/manifest.mn -@@ -10,7 +10,7 @@ IMPORTS = nspr20/v4.8 \ - - RELEASE = nss - --DIRS = coreconf lib cmd cpputil gtests -+DIRS = coreconf lib cmd cpputil config - - lib: coreconf - cmd: lib --- -2.26.2 -
