From 4123026cd8caab087d258e91237fb68abb7e2e2a Mon Sep 17 00:00:00 2001 From: wxiat Date: Tue, 27 Jun 2023 16:47:34 +0800 Subject: [PATCH] cherry-pick `add sw patch #ce8dbcf775a1bf3d6bd0d5de53d3688e7caa00db`. Signed-off-by: wxiat Signed-off-by: Weisson --- nss-add-sw.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ nss.spec | 9 +++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 nss-add-sw.patch diff --git a/nss-add-sw.patch b/nss-add-sw.patch new file mode 100644 index 0000000..45dda38 --- /dev/null +++ b/nss-add-sw.patch @@ -0,0 +1,50 @@ +From 43f5d373ecd297761a6c4b94ec0495266830f465 Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Tue, 27 Jun 2023 16:43:45 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + coreconf/Linux.mk | 5 +++++ + lib/dbm/include/mcom_db.h | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk +index 891086d..ee34ae3 100644 +--- a/coreconf/Linux.mk ++++ b/coreconf/Linux.mk +@@ -65,6 +65,10 @@ ifeq ($(OS_TEST),alpha) + OS_REL_CFLAGS = -D_ALPHA_ + CPU_ARCH = alpha + else ++ifeq ($(OS_TEST),sw_64) ++ OS_REL_CFLAGS = -D_SW_64_ ++ CPU_ARCH = sw_64 ++else + ifeq ($(OS_TEST),x86_64) + ifeq ($(USE_64),1) + CPU_ARCH = x86_64 +@@ -107,6 +111,7 @@ endif + endif + endif + endif ++endif + + + ifneq ($(OS_TARGET),Android) +diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h +index e961dd1..e8cea2d 100644 +--- a/lib/dbm/include/mcom_db.h ++++ b/lib/dbm/include/mcom_db.h +@@ -126,7 +126,7 @@ typedef PRUint32 uint32; + #include + #endif + +-#ifdef __alpha ++#if defined __alpha || defined __sw_64 + #ifndef WIN32 + #else + /* Alpha NT */ +-- +2.31.1 + diff --git a/nss.spec b/nss.spec index e590bee..bec462e 100644 --- a/nss.spec +++ b/nss.spec @@ -1,8 +1,9 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %global nspr_build_version 4.35.0-1 %global nspr_release -1 %global nspr_version 4.35.0 %global nss_version 3.90.0 + %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global saved_files_dir %{_libdir}/nss/saved %global dracutlibdir %{_prefix}/lib/dracut @@ -175,6 +176,8 @@ Patch64: nss-3.90-pbkdf2-indicator.patch #ems policy. needs to upstream Patch70: nss-3.90-add-ems-policy.patch +Patch71: nss-add-sw.patch + %description Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and @@ -315,7 +318,6 @@ cp %{SOURCE30} nss/lib/softoken/ find nss/lib/libpkix -perm /u+x -type f -exec chmod -x {} \; %build - export FREEBL_NO_DEPEND=1 # Must export FREEBL_LOWHASH=1 for nsslowhash.h so that it gets @@ -956,6 +958,9 @@ update-crypto-policies --no-reload &> /dev/null || : %changelog +* Wed Mar 20 2024 wxiat - 3.90.0-3.0.2 +- cherry-pick `add sw patch #ce8dbcf775a1bf3d6bd0d5de53d3688e7caa00db`. + * Mon Oct 10 2023 Zhao Hang - 3.90.0-3.0.1 - disable unit test -- Gitee