From 98e1e7a0b766abc65a8616b51f31c3ad9e111d41 Mon Sep 17 00:00:00 2001 From: Matti Kosola Date: Mon, 27 Jan 2020 18:15:52 +0200 Subject: [PATCH] Remove nss-prelink.conf. Signed-off-by: Matti Kosola --- rpm/nss-prelink.conf | 2 -- rpm/nss.spec | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 rpm/nss-prelink.conf diff --git a/rpm/nss-prelink.conf b/rpm/nss-prelink.conf deleted file mode 100644 index bcfef1f..0000000 --- a/rpm/nss-prelink.conf +++ /dev/null @@ -1,2 +0,0 @@ --b /lib{,64}/libfreebl3.so --b /lib{,64}/libsoftokn3.so diff --git a/rpm/nss.spec b/rpm/nss.spec index 3b28ca8..a8fc2b5 100644 --- a/rpm/nss.spec +++ b/rpm/nss.spec @@ -74,6 +74,7 @@ Source26: key4.db.xml Source27: secmod.db.xml Source28: nss-p11-kit.config + Patch1: nss-nolocalsql.patch Patch2: add-relro-linker-option.patch Patch3: renegotiate-transitional.patch @@ -585,10 +586,6 @@ done %{__install} -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key4.db %{__install} -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/pkcs11.txt -# prelink -#{__mkdir_p} $RPM_BUILD_ROOT/#{_sysconfdir}/prelink.conf.d -#{__install} -m 644 #{SOURCE14} $RPM_BUILD_ROOT/#{_sysconfdir}/prelink.conf.d/nss-prelink.conf - # Copy the development libraries we want for file in libcrmf.a libnssb.a libnssckfw.a do @@ -679,8 +676,6 @@ update-crypto-policies &> /dev/null || : %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/crypto-policies/local.d/nss-p11-kit.config -#dir #{_sysconfdir}/prelink.conf.d -#config #{_sysconfdir}/prelink.conf.d/nss-prelink.conf %dir %{unsupported_tools_directory} %{unsupported_tools_directory}/shlibsign