Related: rhbz#1972928

- fix relro support in nspr part of build
This commit is contained in:
Bob Relyea 2021-07-08 15:14:08 -07:00
parent 5a8798b5da
commit 449fc4a03c
1 changed files with 11 additions and 4 deletions

View File

@ -2,7 +2,10 @@
# NOTE: To avoid NVR clashes of nspr* packages: # NOTE: To avoid NVR clashes of nspr* packages:
# - reset %%{nspr_release} to 1, when updating %%{nspr_version} # - reset %%{nspr_release} to 1, when updating %%{nspr_version}
# - increment %%{nspr_version}, when updating the NSS part only # - increment %%{nspr_version}, when updating the NSS part only
%global nspr_release 4 # - put the nss_release number here next to nspr, as they both
# need to be updated on a given release
%global nspr_release 5
%global nss_release 8
%global nss_version 3.67.0 %global nss_version 3.67.0
# only need to update this as we added new # only need to update this as we added new
# algorithms under nss policy control # algorithms under nss policy control
@ -56,7 +59,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: %{nss_version} Version: %{nss_version}
Release: 7%{?dist} Release: %{nss_release}%{?dist}
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Requires: nspr >= %{nspr_version} Requires: nspr >= %{nspr_version}
@ -333,6 +336,8 @@ find nss/lib/libpkix -perm /u+x -type f -exec chmod -x {} \;
# adjustment in the NSS build process. # adjustment in the NSS build process.
mkdir -p nspr_build mkdir -p nspr_build
pushd nspr_build pushd nspr_build
export LDFLAGS="$RPM_LD_FLAGS"
export CFLAGS="$RPM_OPT_FLAGS"
../nspr/configure \ ../nspr/configure \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
@ -349,7 +354,6 @@ pushd nspr_build
--enable-optimize="$RPM_OPT_FLAGS" \ --enable-optimize="$RPM_OPT_FLAGS" \
--disable-debug --disable-debug
export LDFLAGS=$RPM_LD_FLAGS
# The assembly files are only for legacy atomics, to which we prefer GCC atomics # The assembly files are only for legacy atomics, to which we prefer GCC atomics
%ifarch i686 x86_64 %ifarch i686 x86_64
sed -i '/^PR_MD_ASFILES/d' config/autoconf.mk sed -i '/^PR_MD_ASFILES/d' config/autoconf.mk
@ -1072,6 +1076,9 @@ update-crypto-policies &> /dev/null || :
%changelog %changelog
* Thu Jul 8 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-8
- fix relro support in nspr part of build
* Tue Jul 6 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-7 * Tue Jul 6 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-7
- fix ssl alert regressions - fix ssl alert regressions