From aaf3397a66c43830ea2b234891a488b76464585b Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Fri, 10 Mar 2023 12:37:17 +0100 Subject: [PATCH 1/9] Update NSS to 3.89.0 & remove unused patch Signed-off-by: Frantisek Krenzelok --- .gitignore | 1 + nss-3.85-fedora-rebuild-errors.patch | 24 ------------------------ nss.spec | 10 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 nss-3.85-fedora-rebuild-errors.patch diff --git a/.gitignore b/.gitignore index e89f80b..36c04a5 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ TestUser51.cert /nss-3.85.tar.gz /nss-3.87.tar.gz /nss-3.88.1.tar.gz +/nss-3.89.tar.gz diff --git a/nss-3.85-fedora-rebuild-errors.patch b/nss-3.85-fedora-rebuild-errors.patch deleted file mode 100644 index 266a394..0000000 --- a/nss-3.85-fedora-rebuild-errors.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./lib/ssl/ssl3exthandle.c.rebuild_errors ./lib/ssl/ssl3exthandle.c ---- ./lib/ssl/ssl3exthandle.c.rebuild_errors 2023-01-24 09:26:36.520183263 -0800 -+++ ./lib/ssl/ssl3exthandle.c 2023-01-24 09:27:07.715379228 -0800 -@@ -201,7 +201,7 @@ ssl3_FreeSniNameArray(TLSExtensionData * - * Clients sends a filled in session ticket if one is available, and otherwise - * sends an empty ticket. Servers always send empty tickets. - */ --PRInt32 -+SECStatus - ssl3_ClientSendSessionTicketXtn(const sslSocket *ss, TLSExtensionData *xtnData, - sslBuffer *buf, PRBool *added) - { -diff -up ./lib/ssl/sslsnce.c.rebuild_errors ./lib/ssl/sslsnce.c ---- ./lib/ssl/sslsnce.c.rebuild_errors 2023-01-24 09:44:52.714977837 -0800 -+++ ./lib/ssl/sslsnce.c 2023-01-24 09:46:20.993510435 -0800 -@@ -1820,7 +1820,7 @@ ssl_GetSelfEncryptKeyPair(SECKEYPublicKe - return SECSuccess; - } - --static PRBool -+static SECStatus - ssl_GenerateSelfEncryptKeys(void *pwArg, PRUint8 *keyName, - PK11SymKey **aesKey, PK11SymKey **macKey); - diff --git a/nss.spec b/nss.spec index 8d4c9a6..f99f80a 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,5 @@ %global nspr_version 4.35.0 -%global nss_version 3.88.1 +%global nss_version 3.89.0 # NOTE: To avoid NVR clashes of nspr* packages: # - reset %%{nspr_release} to 1, when updating %%{nspr_version} # - increment %%{nspr_version}, when updating the NSS part only @@ -7,7 +7,7 @@ %global nss_release %baserelease # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when # release number between nss and nspr are different. -%global nspr_release %[%baserelease+3] +%global nspr_release %[%baserelease+4] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20210118 @@ -134,9 +134,6 @@ Patch40: nss-no-dbm-man-page.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1774659 Patch51: nss-3.79-dbtool.patch -# fix rebuilds error -Patch52: nss-3.85-fedora-rebuild-errors.patch - Patch100: nspr-config-pc.patch Patch101: nspr-gcc-atomics.patch @@ -1094,6 +1091,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Fri Mar 10 2023 Frantisek Krenzelok - 3.89.0-1 +- Update NSS to 3.89.0 + * Fri Feb 10 2023 Frantisek Krenzelok - 3.88.1-1 - Update NSS to 3.88.1 diff --git a/sources b/sources index d91999e..1e9ca85 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 SHA512 (nspr-4.35.tar.gz) = 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f -SHA512 (nss-3.88.1.tar.gz) = d15289803a4c3caa1b7a8872b761a95b4f571688c8b8ffaf2a1478e032a356fbcf8a9239ebe1777561503329f63dd237384e1d8af9ca70fb48b40e70954b455a +SHA512 (nss-3.89.tar.gz) = 1db06d4575f2c16d2a0629007981211e714f99c014c0a6256dd33d0caf8c809ba8d5be204d018f9d1cc99b9fcd055ac1fb99b399486ed43c9cf3f55f2747de82 From 39d0b6e8df7ab5788eccf433a9c1eb2646cf375c Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Fri, 5 May 2023 15:13:05 +0200 Subject: [PATCH 2/9] Use %{nss_version} explicitly insted of %{version} Use nss_version explicitly as version is overiden by nspr_version durring execution of spec Signed-off-by: Frantisek Krenzelok --- nss.spec | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/nss.spec b/nss.spec index 5da7af5..7464ee6 100644 --- a/nss.spec +++ b/nss.spec @@ -147,7 +147,7 @@ v3 certificates, and other security standards. %package tools Summary: Tools for the Network Security Services -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{nss_version}-%{release} %description tools Network Security Services (NSS) is a set of libraries designed to @@ -164,7 +164,7 @@ Summary: System NSS Initialization # providing nss-system-init without version so that it can # be replaced by a better one, e.g. supplied by the os vendor Provides: nss-system-init -Requires: nss%{?_isa} = %{version}-%{release} +Requires: nss%{?_isa} = %{nss_version}-%{release} Requires(post): coreutils, sed %description sysinit @@ -175,8 +175,8 @@ any system or user configured modules. %package devel Summary: Development libraries for Network Security Services -Provides: nss-static = %{version}-%{release} -Requires: nss%{?_isa} = %{version}-%{release} +Provides: nss-static = %{nss_version}-%{release} +Requires: nss%{?_isa} = %{nss_version}-%{release} Requires: nss-util-devel Requires: nss-softokn-devel Requires: nspr-devel >= %{nspr_version} @@ -189,9 +189,9 @@ Header and Library files for doing development with Network Security Services. %package pkcs11-devel Summary: Development libraries for PKCS #11 (Cryptoki) using NSS -Provides: nss-pkcs11-devel-static = %{version}-%{release} -Requires: nss-devel = %{version}-%{release} -Requires: nss-softokn-freebl-devel = %{version}-%{release} +Provides: nss-pkcs11-devel-static = %{nss_version}-%{release} +Requires: nss-devel = %{nss_version}-%{release} +Requires: nss-softokn-freebl-devel = %{nss_version}-%{release} %description pkcs11-devel Library files for developing PKCS #11 modules using basic NSS @@ -207,7 +207,7 @@ Utilities for Network Security Services and the Softoken module %package util-devel Summary: Development libraries for Network Security Services Utilities -Requires: nss-util%{?_isa} = %{version}-%{release} +Requires: nss-util%{?_isa} = %{nss_version}-%{release} Requires: nspr-devel >= %{nspr_version} Requires: pkgconfig @@ -218,8 +218,8 @@ Header and library files for doing development with Network Security Services. %package softokn Summary: Network Security Services Softoken Module Requires: nspr >= %{nspr_version} -Requires: nss-util >= %{version}-%{release} -Requires: nss-softokn-freebl%{_isa} >= %{version}-%{release} +Requires: nss-util >= %{nss_version}-%{release} +Requires: nss-softokn-freebl%{_isa} >= %{nss_version}-%{release} %description softokn Network Security Services Softoken Cryptographic Module @@ -240,8 +240,8 @@ Install the nss-softokn-freebl package if you need the freebl library. %package softokn-freebl-devel Summary: Header and Library files for doing development with the Freebl library for NSS -Provides: nss-softokn-freebl-static = %{version}-%{release} -Requires: nss-softokn-freebl%{?_isa} = %{version}-%{release} +Provides: nss-softokn-freebl-static = %{nss_version}-%{release} +Requires: nss-softokn-freebl%{?_isa} = %{nss_version}-%{release} %description softokn-freebl-devel NSS Softoken Cryptographic Module Freebl Library Development Tools @@ -252,10 +252,10 @@ Developers should rely only on the officially supported NSS public API. %package softokn-devel Summary: Development libraries for Network Security Services -Requires: nss-softokn%{?_isa} = %{version}-%{release} -Requires: nss-softokn-freebl-devel%{?_isa} = %{version}-%{release} +Requires: nss-softokn%{?_isa} = %{nss_version}-%{release} +Requires: nss-softokn-freebl-devel%{?_isa} = %{nss_version}-%{release} Requires: nspr-devel >= %{nspr_version} -Requires: nss-util-devel >= %{version}-%{release} +Requires: nss-util-devel >= %{nss_version}-%{release} Requires: pkgconfig %description softokn-devel @@ -1091,6 +1091,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Fri May 5 2023 Frantisek Krenzelok - 3.89.0-1 +- replace %{version} with %{nss_version} as it version can be overiden. + * Fri Mar 10 2023 Frantisek Krenzelok - 3.89.0-1 - Update NSS to 3.89.0 From a515c1ef8a2d0d437e2c889427df63d1527adc87 Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Fri, 5 May 2023 18:14:19 +0200 Subject: [PATCH 3/9] Combine nss and nspr source togeather Mozilla provides a package that has both utilities Signed-off-by: Frantisek Krenzelok --- .gitignore | 1 + nss.spec | 12 ++++++------ sources | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 36c04a5..d85a5a4 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ TestUser51.cert /nss-3.87.tar.gz /nss-3.88.1.tar.gz /nss-3.89.tar.gz +/nss-3.89-with-nspr-4.35.tar.gz diff --git a/nss.spec b/nss.spec index 7464ee6..580ac12 100644 --- a/nss.spec +++ b/nss.spec @@ -57,6 +57,8 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM", string.gsub(rpm.expand("%nss_archive_version"), "%.", "_"))) } +%global nss_nspr_archive nss-%{nss_archive_version}-with-nspr-%{nspr_archive_version} + Summary: Network Security Services Name: nss Version: %{nss_version} @@ -82,7 +84,7 @@ BuildRequires: psmisc BuildRequires: perl-interpreter BuildRequires: gcc-c++ -Source0: https://ftp.mozilla.org/pub/security/nss/releases/%{nss_release_tag}/src/%{name}-%{nss_archive_version}.tar.gz +Source0: https://ftp.mozilla.org/pub/security/nss/releases/%{nss_release_tag}/src/%{nss_nspr_archive}.tar.gz Source1: nss-util.pc.in Source2: nss-util-config.in Source3: nss-softokn.pc.in @@ -112,7 +114,6 @@ Source27: secmod.db.xml %endif Source28: nss-p11-kit.config -Source100: nspr-%{nspr_archive_version}.tar.gz Source101: nspr-config.xml # This patch uses the GCC -iquote option documented at @@ -288,12 +289,8 @@ Conflicts: filesystem < 3 %description -n nspr-devel Header files for doing development with the Netscape Portable Runtime. - %prep -%setup -q -T -b 100 -n nspr-%{nspr_archive_version} - %setup -q -T -b 0 -n %{name}-%{nss_archive_version} -mv ../nspr-%{nspr_archive_version}/nspr . cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in %patch100 -p0 -b .flags @@ -1091,6 +1088,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Fri May 5 2023 Frantisek Krenzelok - 3.89.0-1 +- combine nss and nspr source togeather + * Fri May 5 2023 Frantisek Krenzelok - 3.89.0-1 - replace %{version} with %{nss_version} as it version can be overiden. diff --git a/sources b/sources index 1e9ca85..90039d1 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 -SHA512 (nspr-4.35.tar.gz) = 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f -SHA512 (nss-3.89.tar.gz) = 1db06d4575f2c16d2a0629007981211e714f99c014c0a6256dd33d0caf8c809ba8d5be204d018f9d1cc99b9fcd055ac1fb99b399486ed43c9cf3f55f2747de82 +SHA512 (nss-3.89-with-nspr-4.35.tar.gz) = 3c7fc3062baf577473001f6a2724bae14c809d725c4ae8d90a6de1ef84c6d1c2276efe09f4112241d7b3c32b0c6d529eb87739ca02b8002e3bed3081f06cdff4 From 83e6b23140c18ed80f0c65ef81bcfa3de58813db Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Mon, 5 Jun 2023 11:01:36 +0200 Subject: [PATCH 4/9] Update NSS to 3.90.0 Signed-off-by: Frantisek Krenzelok --- .gitignore | 1 + nss-signtool-format.patch | 4 ++-- nss.spec | 7 +++++-- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d85a5a4..9550e81 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ TestUser51.cert /nss-3.88.1.tar.gz /nss-3.89.tar.gz /nss-3.89-with-nspr-4.35.tar.gz +/nss-3.90-with-nspr-4.35.tar.gz diff --git a/nss-signtool-format.patch b/nss-signtool-format.patch index 5f146f1..f81d35c 100644 --- a/nss-signtool-format.patch +++ b/nss-signtool-format.patch @@ -10,7 +10,7 @@ diff --git a/cmd/modutil/install.c b/cmd/modutil/install.c /* Recursively delete all entries in the directory */ while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL) { -- sprintf(filename, "%s/%s", path, entry->name); +- snprintf(filename, sizeof(filename), "%s/%s", path, entry->name); + if (snprintf(filename, sizeof(filename), "%s/%s", path, entry->name) >= sizeof(filename)) { + PR_CloseDir(dir); + return -1; @@ -29,7 +29,7 @@ diff --git a/cmd/signtool/util.c b/cmd/signtool/util.c @@ -138,6 +138,12 @@ rm_dash_r(char *path) /* Recursively delete all entries in the directory */ while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL) { - sprintf(filename, "%s/%s", path, entry->name); + snprintf(filename, sizeof(filename), "%s/%s", path, entry->name); + if (snprintf(filename, sizeof(filename), "%s/%s", path, entry->name +) >= sizeof(filename)) { + errorCount++; diff --git a/nss.spec b/nss.spec index 580ac12..31bcc99 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,5 @@ %global nspr_version 4.35.0 -%global nss_version 3.89.0 +%global nss_version 3.90.0 # NOTE: To avoid NVR clashes of nspr* packages: # - reset %%{nspr_release} to 1, when updating %%{nspr_version} # - increment %%{nspr_version}, when updating the NSS part only @@ -7,7 +7,7 @@ %global nss_release %baserelease # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when # release number between nss and nspr are different. -%global nspr_release %[%baserelease+4] +%global nspr_release %[%baserelease+0] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20210118 @@ -1088,6 +1088,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Mon Jun 5 2023 Frantisek Krenzelok - 3.90.0-1 +- Update NSS to 3.90.0 + * Fri May 5 2023 Frantisek Krenzelok - 3.89.0-1 - combine nss and nspr source togeather diff --git a/sources b/sources index 90039d1..126d634 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 -SHA512 (nss-3.89-with-nspr-4.35.tar.gz) = 3c7fc3062baf577473001f6a2724bae14c809d725c4ae8d90a6de1ef84c6d1c2276efe09f4112241d7b3c32b0c6d529eb87739ca02b8002e3bed3081f06cdff4 +SHA512 (nss-3.90-with-nspr-4.35.tar.gz) = cbc75af3d3e1bf084011d435f0957d134cb3d3d66dcee45f9712ed22b470035ba1e808fc6457e8dc0d8d8e168d77d1117a4373d42905130f76ea58217ff88e30 From 1cf21376e78a7829f13f19cad1fda4174b1c94fa Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Mon, 5 Jun 2023 13:46:43 +0200 Subject: [PATCH 5/9] Update %patch syntax The syntax was changed from `%patch` to `%patch ` Signed-off-by: Frantisek Krenzelok --- nss.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nss.spec b/nss.spec index 31bcc99..f452485 100644 --- a/nss.spec +++ b/nss.spec @@ -293,9 +293,9 @@ Header files for doing development with the Netscape Portable Runtime. %setup -q -T -b 0 -n %{name}-%{nss_archive_version} cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in -%patch100 -p0 -b .flags +%patch 100 -p0 -b .flags pushd nspr -%patch101 -p1 -b .gcc-atomics +%patch 101 -p1 -b .gcc-atomics popd pushd nss @@ -1088,6 +1088,10 @@ update-crypto-policies &> /dev/null || : %changelog + +* Mon Jun 5 2023 Frantisek Krenzelok - 3.90.0-1 +- Update %patch syntax + * Mon Jun 5 2023 Frantisek Krenzelok - 3.90.0-1 - Update NSS to 3.90.0 From c9d01a43937e530ec77ccd66ee6cbd80dac3094f Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Tue, 6 Jun 2023 08:48:06 +0200 Subject: [PATCH 6/9] Fix: add condition for architecture specific assebly feature Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1836781 Additional bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 Signed-off-by: Frantisek Krenzelok --- nss-3.90-DisablingASM.patch | 36 ++++++++++++++++++++++++++++++++++++ nss.spec | 7 +++++++ 2 files changed, 43 insertions(+) create mode 100644 nss-3.90-DisablingASM.patch diff --git a/nss-3.90-DisablingASM.patch b/nss-3.90-DisablingASM.patch new file mode 100644 index 0000000..3574a47 --- /dev/null +++ b/nss-3.90-DisablingASM.patch @@ -0,0 +1,36 @@ +diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +--- a/lib/freebl/Makefile ++++ b/lib/freebl/Makefile +@@ -560,6 +560,9 @@ else + endif # Solaris for non-sparc family CPUs + endif # target == SunO + ++# As the result of the bug https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 ++# we currently totally removing the support of Vale implementation of Curve25519 ++SUPPORTS_VALE_CURVE25519 = 0 + ifdef USE_64 + # no __int128 at least up to lcc 1.23 (pretending to be gcc5) + # NB: CC_NAME is not defined here +@@ -568,7 +571,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null /dev/null || : %changelog +* Thu Jun 6 2023 Frantisek Krenzelok - 3.90.0-1 +- Add patch for https://bugzilla.mozilla.org/show_bug.cgi?id=1836781 & + https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 * Mon Jun 5 2023 Frantisek Krenzelok - 3.90.0-1 - Update %patch syntax From 7cf2a945243842d6a1ddc185af7719f6cda4db5d Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Tue, 6 Jun 2023 12:49:30 +0200 Subject: [PATCH 7/9] Hotfix: previous commit 2bdda3a Signed-off-by: Frantisek Krenzelok --- nss-3.90-DisablingASM.patch | 45 +++++++++++++++++++++++++++---------- nss.spec | 2 +- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/nss-3.90-DisablingASM.patch b/nss-3.90-DisablingASM.patch index 3574a47..7d1a17f 100644 --- a/nss-3.90-DisablingASM.patch +++ b/nss-3.90-DisablingASM.patch @@ -1,17 +1,8 @@ diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +index 74e8e65..8995752 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile -@@ -560,6 +560,9 @@ else - endif # Solaris for non-sparc family CPUs - endif # target == SunO - -+# As the result of the bug https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 -+# we currently totally removing the support of Vale implementation of Curve25519 -+SUPPORTS_VALE_CURVE25519 = 0 - ifdef USE_64 - # no __int128 at least up to lcc 1.23 (pretending to be gcc5) - # NB: CC_NAME is not defined here -@@ -568,7 +571,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null &1 >/dev/null /dev/null || : %changelog -* Thu Jun 6 2023 Frantisek Krenzelok - 3.90.0-1 +* Tue Jun 6 2023 Frantisek Krenzelok - 3.90.0-1 - Add patch for https://bugzilla.mozilla.org/show_bug.cgi?id=1836781 & https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 From 6daa59b62e4a077c96a06e5b4deccb344bb48e7d Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Wed, 7 Jun 2023 15:18:35 +0200 Subject: [PATCH 8/9] Bump nspr baserelease number --- nss.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nss.spec b/nss.spec index f3555b4..1d6343c 100644 --- a/nss.spec +++ b/nss.spec @@ -7,7 +7,7 @@ %global nss_release %baserelease # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when # release number between nss and nspr are different. -%global nspr_release %[%baserelease+0] +%global nspr_release %[%baserelease+5] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20210118 From cceb446af15fa740f9b9947393f5f86135337858 Mon Sep 17 00:00:00 2001 From: Frantisek Krenzelok Date: Wed, 7 Jun 2023 21:21:18 +0200 Subject: [PATCH 9/9] Bump the nspr version once more.. --- nss.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nss.spec b/nss.spec index 1d6343c..e52df88 100644 --- a/nss.spec +++ b/nss.spec @@ -7,7 +7,7 @@ %global nss_release %baserelease # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when # release number between nss and nspr are different. -%global nspr_release %[%baserelease+5] +%global nspr_release %[%baserelease+6] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20210118