diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk index 954c3b81b4..aaae4ea51a 100644 --- a/packages/security/nss/package.mk +++ b/packages/security/nss/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nss" -PKG_VERSION="3.100" -PKG_SHA256="f806cee99be87d55f927e976316e1686b534b64f7a687ac05ba413da7e22d9ba" +PKG_VERSION="3.104" +PKG_SHA256="0ea8bab27345e4e0fc0ec0587d01bb54ba7eb46cb5b369c9ed59ee42baa78fa9" PKG_LICENSE="Mozilla Public License" PKG_SITE="http://ftp.mozilla.org/" PKG_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_VERSION//./_}_RTM/src/nss-${PKG_VERSION}-with-nspr-$(get_pkg_version nspr).tar.gz" diff --git a/packages/security/nss/patches/nss-11-allow-build-without-fips.patch b/packages/security/nss/patches/nss-11-allow-build-without-fips.patch deleted file mode 100644 index 313baaaff9..0000000000 --- a/packages/security/nss/patches/nss-11-allow-build-without-fips.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/nss/lib/pk11wrap/pk11util.c 2024-08-24 05:50:25.083922373 +0000 -+++ b/nss/lib/pk11wrap/pk11util.c 2024-08-24 05:50:08.147128674 +0000 -@@ -99,7 +99,11 @@ - PRBool - SECMOD_GetSystemFIPSEnabled(void) - { -+#ifdef NSS_FIPS_DISABLED -+ return PR_FALSE; -+#else - return NSS_GetSystemFIPSEnabled(); -+#endif - } - - /* diff --git a/packages/security/nss/patches/nss-12-fix-build-of-cmd-with-nssutil.patch b/packages/security/nss/patches/nss-12-fix-build-of-cmd-with-nssutil.patch new file mode 100644 index 0000000000..1b0ebb431a --- /dev/null +++ b/packages/security/nss/patches/nss-12-fix-build-of-cmd-with-nssutil.patch @@ -0,0 +1,18 @@ +--- a/nss/cmd/platlibs.mk 2024-08-24 11:00:43.573034453 +0000 ++++ b/nss/cmd/platlibs.mk 2024-08-24 11:00:46.506390708 +0000 +@@ -181,6 +181,7 @@ + -l$(SQLITE_LIB_NAME) \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -lnssutil \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ +@@ -226,6 +227,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -lnssutil \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \