From ff1ee1fee7e99c87a625304674b4acbc3cec39cb Mon Sep 17 00:00:00 2001 From: wzx <471319475@qq.com> Date: Fri, 22 Jul 2022 11:08:15 +0800 Subject: [PATCH] sw --- nss-3.72-sw.patch | 34 ++++++++++++++++++++++++++++++++++ nss.spec | 9 ++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100755 nss-3.72-sw.patch diff --git a/nss-3.72-sw.patch b/nss-3.72-sw.patch new file mode 100755 index 0000000..cd3c9f3 --- /dev/null +++ b/nss-3.72-sw.patch @@ -0,0 +1,34 @@ +diff -Nuar nss-3.72.org/nss/coreconf/Linux.mk nss-3.72.sw/nss/coreconf/Linux.mk +--- nss-3.72.org/nss/coreconf/Linux.mk 2022-07-20 07:53:12.030000000 +0000 ++++ nss-3.72.sw/nss/coreconf/Linux.mk 2022-07-20 07:57:27.470000000 +0000 +@@ -64,6 +64,10 @@ + 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 +@@ -101,6 +105,7 @@ + endif + endif + endif ++endif + endif + endif + endif +diff -Nuar nss-3.72.org/nss/lib/dbm/include/mcom_db.h nss-3.72.sw/nss/lib/dbm/include/mcom_db.h +--- nss-3.72.org/nss/lib/dbm/include/mcom_db.h 2022-07-20 07:53:12.350000000 +0000 ++++ nss-3.72.sw/nss/lib/dbm/include/mcom_db.h 2022-07-20 07:54:41.020000000 +0000 +@@ -126,7 +126,7 @@ + #include + #endif + +-#ifdef __alpha ++#if defined __alpha || defined __sw_64 + #ifndef WIN32 + #else + /* Alpha NT */ diff --git a/nss.spec b/nss.spec index efb5a47..d20114a 100644 --- a/nss.spec +++ b/nss.spec @@ -42,6 +42,7 @@ Source16: setup-nsssysinit.sh Patch0: nss-539183.patch Patch6000: backport-CVE-2021-43527.patch +Patch6001: nss-3.72-sw.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -128,9 +129,12 @@ Help document for NSS pushd nss %patch6000 -p1 popd +%patch6001 -p1 %build - +%ifarch sw_64 +export NSS_DISABLE_GTESTS=1 +%endif export NSS_FORCE_FIPS=1 # Enable compiler optimizations and disable debugging code @@ -549,6 +553,9 @@ update-crypto-policies &>/dev/null||: %doc %{_mandir}/man* %changelog +* Wed Jul 20 2022 wuzx - 3.72-3 +- add sw64 patch + * Tue Dec 28 2021 shangyibin - 3.72-2 - fix CVE-2021-43527 -- Gitee