diff --git a/nss-3.72-sw.patch b/nss-3.72-sw.patch new file mode 100755 index 0000000000000000000000000000000000000000..cd3c9f326109ff4eca22637f9076c50e25f52bd1 --- /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 9f331b8db871a9bc931b8017f745208d968c7983..f52bd48dfad7557f0f89720d4ddf2c5131621876 100644 --- a/nss.spec +++ b/nss.spec @@ -14,7 +14,7 @@ Summary: Network Security Services Name: nss Version: %{nss_version} -Release: 3 +Release: 4 License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Provides: nss-system-init @@ -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,8 +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 @@ -194,6 +199,9 @@ mkdir -p ./dist/docs/nroff cp ./nss/doc/nroff/* ./dist/docs/nroff # Set up our package files +%ifarch sw_64 +sed -i 's/lib64/lib/g' %{SOURCE1} %{SOURCE3} %{SOURCE8} +%endif mkdir -p ./dist/pkgconfig for m in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE8} %{SOURCE9} %{SOURCE16}; do cp ${m} ./dist/pkgconfig @@ -549,6 +557,9 @@ update-crypto-policies &>/dev/null||: %doc %{_mandir}/man* %changelog +* Wed Oct 26 2022 wuzx - 3.72.0-4 +- Add sw64 architecture + * Thu Aug 04 2022 renhongxun - 3.72.0-3 - remove nss-help from Requires of nss and nss-util