Compare commits
21 Commits
Author | SHA1 | Date |
---|---|---|
Daiki Ueno | a92ce2d962 | |
Daiki Ueno | 58aff80c03 | |
Daiki Ueno | 28f68c85f5 | |
Daiki Ueno | 64a48cd997 | |
Daiki Ueno | 36aa0b239b | |
Daiki Ueno | 7de08121a4 | |
Daiki Ueno | 86f33dd63a | |
Daiki Ueno | fad8bd4953 | |
Daiki Ueno | 66df6d2135 | |
Daiki Ueno | 4521183f36 | |
Daiki Ueno | 0bcbceb525 | |
Daiki Ueno | c4a7ff31ec | |
Daiki Ueno | b1121a2732 | |
Daiki Ueno | b8c5640659 | |
Daiki Ueno | 7c3430f24f | |
Daiki Ueno | 77ddabc0b0 | |
Kai Engert | 06167b3620 | |
Daiki Ueno | 7ac2515ded | |
Daiki Ueno | a141d8c1c5 | |
Daiki Ueno | 5837b7b917 | |
Daiki Ueno | 30cca25c10 |
|
@ -35,17 +35,3 @@ TestUser51.cert
|
|||
/nss-3.42.tar.gz
|
||||
/nss-3.42.1.tar.gz
|
||||
/nss-3.43.tar.gz
|
||||
/nss-3.44.tar.gz
|
||||
/nss-3.44.1.tar.gz
|
||||
/nss-3.45.tar.gz
|
||||
/nss-3.46.tar.gz
|
||||
/nss-3.46.1.tar.gz
|
||||
/nss-3.47.tar.gz
|
||||
/nss-3.47.1.tar.gz
|
||||
/nss-3.48.tar.gz
|
||||
/nss-3.49.tar.gz
|
||||
/nss-3.49.2.tar.gz
|
||||
/nss-3.50.tar.gz
|
||||
/nss-3.51.tar.gz
|
||||
/nss-3.51.1.tar.gz
|
||||
/nss-3.52.tar.gz
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
diff -up ./lib/util/pkcs11n.h.aes_gcm_pkcs11_v2 ./lib/util/pkcs11n.h
|
||||
--- ./lib/util/pkcs11n.h.aes_gcm_pkcs11_v2 2020-05-13 13:44:11.312405744 -0700
|
||||
+++ ./lib/util/pkcs11n.h 2020-05-13 13:45:23.951723660 -0700
|
||||
@@ -605,7 +605,7 @@ typedef struct CK_NSS_GCM_PARAMS {
|
||||
typedef CK_NSS_GCM_PARAMS CK_PTR CK_NSS_GCM_PARAMS_PTR;
|
||||
|
||||
/* deprecated #defines. Drop in future NSS releases */
|
||||
-#ifdef NSS_PKCS11_2_0_COMPAT
|
||||
+#ifndef NSS_PKCS11_3_0_STRICT
|
||||
|
||||
/* defines that were changed between NSS's PKCS #11 and the Oasis headers */
|
||||
#define CKF_EC_FP CKF_EC_F_P
|
||||
@@ -664,7 +664,7 @@ typedef CK_NSS_GCM_PARAMS CK_PTR CK_GCM_
|
||||
#define CKT_NETSCAPE_VALID CKT_NSS_VALID
|
||||
#define CKT_NETSCAPE_VALID_DELEGATOR CKT_NSS_VALID_DELEGATOR
|
||||
#else
|
||||
-/* use the new CK_GCM_PARAMS if NSS_PKCS11_2_0_COMPAT is not defined */
|
||||
+/* use the new CK_GCM_PARAMS if NSS_PKCS11_3_0_STRICT is defined */
|
||||
typedef struct CK_GCM_PARAMS_V3 CK_GCM_PARAMS;
|
||||
typedef CK_GCM_PARAMS_V3 CK_PTR CK_GCM_PARAMS_PTR;
|
||||
#endif
|
|
@ -1,31 +0,0 @@
|
|||
Index: nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
||||
===================================================================
|
||||
--- nss.orig/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
||||
+++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
||||
@@ -56,9 +56,10 @@ typedef const char *Prims_string;
|
||||
!defined(__clang__)
|
||||
#include <emmintrin.h>
|
||||
typedef __m128i FStar_UInt128_uint128;
|
||||
-#elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
|
||||
+#elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
|
||||
(defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
|
||||
- (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)))
|
||||
+ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
|
||||
+ defined(__s390x__))
|
||||
typedef unsigned __int128 FStar_UInt128_uint128;
|
||||
#elif !defined(KRML_VERIFIED_UINT128) && defined(_MSC_VER) && defined(__clang__)
|
||||
typedef __uint128_t FStar_UInt128_uint128;
|
||||
Index: nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
||||
===================================================================
|
||||
--- nss.orig/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
||||
+++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
||||
@@ -26,7 +26,8 @@
|
||||
|
||||
#if !defined(KRML_VERIFIED_UINT128) && (!defined(_MSC_VER) || defined(__clang__)) && \
|
||||
(defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
|
||||
- (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)))
|
||||
+ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
|
||||
+ defined(__s390x__))
|
||||
|
||||
/* GCC + using native unsigned __int128 support */
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
name=p11-kit-proxy
|
||||
library=p11-kit-proxy.so
|
||||
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
diff --git a/cmd/modutil/install.c b/cmd/modutil/install.c
|
||||
--- a/cmd/modutil/install.c
|
||||
+++ b/cmd/modutil/install.c
|
||||
@@ -825,17 +825,20 @@ rm_dash_r(char *path)
|
||||
|
||||
dir = PR_OpenDir(path);
|
||||
if (!dir) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Recursively delete all entries in the directory */
|
||||
while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL) {
|
||||
- sprintf(filename, "%s/%s", path, entry->name);
|
||||
+ if (snprintf(filename, sizeof(filename), "%s/%s", path, entry->name) >= sizeof(filename)) {
|
||||
+ PR_CloseDir(dir);
|
||||
+ return -1;
|
||||
+ }
|
||||
if (rm_dash_r(filename)) {
|
||||
PR_CloseDir(dir);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (PR_CloseDir(dir) != PR_SUCCESS) {
|
||||
return -1;
|
||||
diff --git a/cmd/signtool/util.c b/cmd/signtool/util.c
|
||||
--- a/cmd/signtool/util.c
|
||||
+++ b/cmd/signtool/util.c
|
||||
@@ -132,17 +132,20 @@ rm_dash_r(char *path)
|
||||
if (!dir) {
|
||||
PR_fprintf(errorFD, "Error: Unable to open directory %s.\n", path);
|
||||
errorCount++;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Recursively delete all entries in the directory */
|
||||
while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL) {
|
||||
- sprintf(filename, "%s/%s", path, entry->name);
|
||||
+ if (snprintf(filename, sizeof(filename), "%s/%s", path, entry->name) >= sizeof(filename)) {
|
||||
+ errorCount++;
|
||||
+ return -1;
|
||||
+ }
|
||||
if (rm_dash_r(filename))
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (PR_CloseDir(dir) != PR_SUCCESS) {
|
||||
PR_fprintf(errorFD, "Error: Could not close %s.\n", path);
|
||||
errorCount++;
|
||||
return -1;
|
||||
diff --git a/lib/libpkix/pkix/util/pkix_list.c b/lib/libpkix/pkix/util/pkix_list.c
|
||||
--- a/lib/libpkix/pkix/util/pkix_list.c
|
||||
+++ b/lib/libpkix/pkix/util/pkix_list.c
|
||||
@@ -1530,17 +1530,17 @@ cleanup:
|
||||
*/
|
||||
PKIX_Error *
|
||||
PKIX_List_SetItem(
|
||||
PKIX_List *list,
|
||||
PKIX_UInt32 index,
|
||||
PKIX_PL_Object *item,
|
||||
void *plContext)
|
||||
{
|
||||
- PKIX_List *element;
|
||||
+ PKIX_List *element = NULL;
|
||||
|
||||
PKIX_ENTER(LIST, "PKIX_List_SetItem");
|
||||
PKIX_NULLCHECK_ONE(list);
|
||||
|
||||
if (list->immutable){
|
||||
PKIX_ERROR(PKIX_OPERATIONNOTPERMITTEDONIMMUTABLELIST);
|
||||
}
|
||||
|
||||
diff --git a/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c b/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c
|
||||
--- a/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c
|
||||
+++ b/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c
|
||||
@@ -102,17 +102,17 @@ cleanup:
|
||||
*/
|
||||
static PKIX_Error *
|
||||
pkix_pl_OID_Equals(
|
||||
PKIX_PL_Object *first,
|
||||
PKIX_PL_Object *second,
|
||||
PKIX_Boolean *pResult,
|
||||
void *plContext)
|
||||
{
|
||||
- PKIX_Int32 cmpResult;
|
||||
+ PKIX_Int32 cmpResult = 0;
|
||||
|
||||
PKIX_ENTER(OID, "pkix_pl_OID_Equals");
|
||||
PKIX_NULLCHECK_THREE(first, second, pResult);
|
||||
|
||||
PKIX_CHECK(pkix_pl_OID_Comparator
|
||||
(first, second, &cmpResult, plContext),
|
||||
PKIX_OIDCOMPARATORFAILED);
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
-b /lib{,64}/libfreeblpriv3.so
|
||||
-b /lib{,64}/libsoftokn3.so
|
||||
-b /lib{,64}/libnssdbm3.so
|
||||
-b /usr/lib{,64}/libfreeblpriv3.so
|
||||
-b /usr/lib{,64}/libsoftokn3.so
|
||||
-b /usr/lib{,64}/libnssdbm3.so
|
214
nss.spec
214
nss.spec
|
@ -1,13 +1,13 @@
|
|||
%global nspr_version 4.25.0
|
||||
%global nss_version 3.52.0
|
||||
%global nspr_version 4.21.0
|
||||
%global nss_version 3.43.0
|
||||
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
||||
%global saved_files_dir %{_libdir}/nss/saved
|
||||
%global prelink_conf_dir %{_sysconfdir}/prelink.conf.d/
|
||||
%global dracutlibdir %{_prefix}/lib/dracut
|
||||
%global dracut_modules_dir %{dracutlibdir}/modules.d/05nss-softokn/
|
||||
%global dracut_conf_dir %{dracutlibdir}/dracut.conf.d
|
||||
|
||||
%bcond_without tests
|
||||
%bcond_without dbm
|
||||
|
||||
# Produce .chk files for the final stripped binaries
|
||||
#
|
||||
|
@ -25,7 +25,7 @@
|
|||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
|
||||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreeblpriv3.so \
|
||||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
|
||||
%{?with_dbm:$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so} \
|
||||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
|
||||
%{nil}
|
||||
|
||||
# The upstream omits the trailing ".0", while we need it for
|
||||
|
@ -44,7 +44,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
|
|||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: %{nss_version}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Requires: nspr >= %{nspr_version}
|
||||
|
@ -53,6 +53,9 @@ Requires: nss-util >= %{nss_version}
|
|||
Requires: nss-softokn%{_isa} >= %{nss_version}
|
||||
Requires: nss-system-init
|
||||
Requires: p11-kit-trust
|
||||
# This is only to revert the faulty crypto-policies configuration
|
||||
# generated by the previously installed F28 package:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1619573#c55
|
||||
Requires: crypto-policies
|
||||
BuildRequires: nspr-devel >= %{nspr_version}
|
||||
# for shlibsign
|
||||
|
@ -64,13 +67,13 @@ BuildRequires: gawk
|
|||
BuildRequires: psmisc
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: quilt
|
||||
|
||||
Source0: https://ftp.mozilla.org/pub/security/nss/releases/%{nss_release_tag}/src/%{name}-%{nss_archive_version}.tar.gz
|
||||
Source1: nss-util.pc.in
|
||||
Source2: nss-util-config.in
|
||||
Source3: nss-softokn.pc.in
|
||||
Source4: nss-softokn-config.in
|
||||
Source5: nss-softokn-prelink.conf
|
||||
Source6: nss-softokn-dracut-module-setup.sh
|
||||
Source7: nss-softokn-dracut.conf
|
||||
Source8: nss.pc.in
|
||||
|
@ -90,7 +93,6 @@ Source24: cert9.db.xml
|
|||
Source25: key3.db.xml
|
||||
Source26: key4.db.xml
|
||||
Source27: secmod.db.xml
|
||||
Source28: nss-p11-kit.config
|
||||
|
||||
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
|
||||
Patch2: nss-539183.patch
|
||||
|
@ -106,14 +108,6 @@ Patch2: nss-539183.patch
|
|||
# Once the buildroot aha been bootstrapped the patch may be removed
|
||||
# but it doesn't hurt to keep it.
|
||||
Patch4: iquote.patch
|
||||
Patch12: nss-signtool-format.patch
|
||||
# https://github.com/FStarLang/kremlin/issues/166
|
||||
Patch13: nss-kremlin-ppc64le.patch
|
||||
%if 0%{?fedora} < 34
|
||||
%if 0%{?rhel} < 9
|
||||
Patch20: nss-gcm-param-default-pkcs11v2.patch
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
Network Security Services (NSS) is a set of libraries designed to
|
||||
|
@ -141,7 +135,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 = %{version}-%{release}
|
||||
Requires(post): coreutils, sed
|
||||
|
||||
%description sysinit
|
||||
|
@ -208,6 +202,7 @@ Requires: nspr >= 4.12
|
|||
# For NSS_SecureMemcmpZero() from nss-util >= 3.33
|
||||
Requires: nss-util >= 3.33
|
||||
Conflicts: nss < 3.12.2.99.3-5
|
||||
Conflicts: prelink < 0.4.3
|
||||
Conflicts: filesystem < 3
|
||||
|
||||
%description softokn-freebl
|
||||
|
@ -241,14 +236,11 @@ Header and library files for doing development with Network Security Services.
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -N -S quilt -n %{name}-%{nss_archive_version}
|
||||
%setup -q -n %{name}-%{nss_archive_version}
|
||||
pushd nss
|
||||
%autopatch -p1
|
||||
popd
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1247353
|
||||
find nss/lib/libpkix -perm /u+x -type f -exec chmod -x {} \;
|
||||
|
||||
|
||||
%build
|
||||
|
||||
|
@ -275,12 +267,6 @@ export BUILD_OPT=1
|
|||
# Generate symbolic info for debuggers
|
||||
export XCFLAGS=$RPM_OPT_FLAGS
|
||||
|
||||
# Work around false-positive warnings with gcc 10:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1803029
|
||||
%ifarch s390x
|
||||
export XCFLAGS="$XCFLAGS -Wno-error=maybe-uninitialized"
|
||||
%endif
|
||||
|
||||
export LDFLAGS=$RPM_LD_FLAGS
|
||||
|
||||
export DSO_LDOPTS=$RPM_LD_FLAGS
|
||||
|
@ -295,19 +281,15 @@ export NSS_USE_SYSTEM_SQLITE=1
|
|||
|
||||
export NSS_ALLOW_SSLKEYLOGFILE=1
|
||||
|
||||
%if %{with dbm}
|
||||
%else
|
||||
export NSS_DISABLE_DBM=1
|
||||
%endif
|
||||
|
||||
%ifnarch noarch
|
||||
%if 0%{__isa_bits} == 64
|
||||
export USE_64=1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%{__make} -C ./nss/coreconf
|
||||
%{__make} -C ./nss/lib/dbm
|
||||
##### phase 2: build the rest of nss
|
||||
make -C ./nss/coreconf
|
||||
make -C ./nss/lib/dbm
|
||||
|
||||
# Set the policy file location
|
||||
# if set NSS will always check for the policy file and load if it exists
|
||||
|
@ -315,11 +297,11 @@ export POLICY_FILE="nss.config"
|
|||
# location of the policy file
|
||||
export POLICY_PATH="/etc/crypto-policies/back-ends"
|
||||
|
||||
%{__make} -C ./nss
|
||||
make -C ./nss
|
||||
|
||||
# build the man pages clean
|
||||
pushd ./nss
|
||||
%{__make} clean_docs build_docs
|
||||
make clean_docs build_docs
|
||||
popd
|
||||
|
||||
# and copy them to the dist directory for %%install to find them
|
||||
|
@ -500,7 +482,35 @@ pushd nss/tests
|
|||
HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
|
||||
popd
|
||||
|
||||
# Normally, the grep exit status is 0 if selected lines are found and 1 otherwise,
|
||||
# Grep exits with status greater than 1 if an error ocurred.
|
||||
# If there are test failures we expect TEST_FAILURES > 0 and GREP_EXIT_STATUS = 0,
|
||||
# With no test failures we expect TEST_FAILURES = 0 and GREP_EXIT_STATUS = 1, whereas
|
||||
# GREP_EXIT_STATUS > 1 would indicate an error in grep such as failure to find the log file.
|
||||
killall $RANDSERV || :
|
||||
|
||||
TEST_FAILURES=$(grep -c -- '- FAILED$' ./tests_results/security/localhost.1/output.log) || GREP_EXIT_STATUS=$?
|
||||
|
||||
if [ ${GREP_EXIT_STATUS:-0} -eq 1 ]; then
|
||||
echo "okay: test suite detected no failures"
|
||||
else
|
||||
if [ ${GREP_EXIT_STATUS:-0} -eq 0 ]; then
|
||||
# while a situation in which grep return status is 0 and it doesn't output
|
||||
# anything shouldn't happen, set the default to something that is
|
||||
# obviously wrong (-1)
|
||||
echo "error: test suite had ${TEST_FAILURES:--1} test failure(s)"
|
||||
exit 1
|
||||
else
|
||||
if [ ${GREP_EXIT_STATUS:-0} -eq 2 ]; then
|
||||
echo "error: grep has not found log file"
|
||||
exit 1
|
||||
else
|
||||
echo "error: grep failed with exit code: ${GREP_EXIT_STATUS}"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
echo "test suite completed"
|
||||
%endif
|
||||
|
||||
%install
|
||||
|
@ -514,9 +524,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}
|
|||
mkdir -p $RPM_BUILD_ROOT/%{unsupported_tools_directory}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
|
||||
mkdir -p $RPM_BUILD_ROOT/%{saved_files_dir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{prelink_conf_dir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{dracut_modules_dir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{dracut_conf_dir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
|
||||
%if %{defined rhel}
|
||||
# not needed for rhel and its derivatives only fedora
|
||||
%else
|
||||
|
@ -524,6 +534,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
|
|||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/nss-tools
|
||||
%endif
|
||||
|
||||
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{prelink_conf_dir}
|
||||
install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{dracut_modules_dir}/module-setup.sh
|
||||
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{dracut_conf_dir}/50-nss-softokn.conf
|
||||
|
||||
|
@ -531,7 +542,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
|
|||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
|
||||
|
||||
# Copy the binary libraries we want
|
||||
for file in libnssutil3.so libsoftokn3.so %{?with_dbm:libnssdbm3.so} libfreebl3.so libfreeblpriv3.so libnss3.so libnsssysinit.so libsmime3.so libssl3.so
|
||||
for file in libnssutil3.so libsoftokn3.so libnssdbm3.so libfreebl3.so libfreeblpriv3.so libnss3.so libnsssysinit.so libsmime3.so libssl3.so
|
||||
do
|
||||
install -p -m 755 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
|
||||
done
|
||||
|
@ -572,7 +583,7 @@ do
|
|||
done
|
||||
|
||||
# Copy some freebl include files we also want
|
||||
for file in blapi.h alghmac.h cmac.h
|
||||
for file in blapi.h alghmac.h
|
||||
do
|
||||
install -p -m 644 dist/private/nss/$file $RPM_BUILD_ROOT/%{_includedir}/nss3
|
||||
done
|
||||
|
@ -625,19 +636,19 @@ for f in cert8.db cert9.db key3.db key4.db secmod.db; do
|
|||
install -c -m 644 ${f}.5 $RPM_BUILD_ROOT%{_mandir}/man5/${f}.5
|
||||
done
|
||||
|
||||
# Copy the crypto-policies configuration file
|
||||
install -p -m 644 %{SOURCE28} $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
|
||||
|
||||
%triggerpostun -n nss-sysinit -- nss-sysinit < 3.12.8-3
|
||||
# Reverse unwanted disabling of sysinit by faulty preun sysinit scriplet
|
||||
# from previous versions of nss.spec
|
||||
/usr/bin/setup-nsssysinit.sh on
|
||||
|
||||
# These are only to revert the faulty crypto-policies configuration
|
||||
# generated by the previously installed F28 package:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1619573#c55
|
||||
%post
|
||||
update-crypto-policies &> /dev/null || :
|
||||
update-crypto-policies
|
||||
|
||||
%postun
|
||||
update-crypto-policies &> /dev/null || :
|
||||
update-crypto-policies
|
||||
|
||||
|
||||
%files
|
||||
|
@ -653,7 +664,6 @@ update-crypto-policies &> /dev/null || :
|
|||
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
|
||||
%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
|
||||
%doc %{_mandir}/man5/cert8.db.5*
|
||||
%doc %{_mandir}/man5/key3.db.5*
|
||||
%doc %{_mandir}/man5/secmod.db.5*
|
||||
|
@ -834,10 +844,8 @@ update-crypto-policies &> /dev/null || :
|
|||
%{_includedir}/nss3/templates/templates.c
|
||||
|
||||
%files softokn
|
||||
%if %{with dbm}
|
||||
%{_libdir}/libnssdbm3.so
|
||||
%{_libdir}/libnssdbm3.chk
|
||||
%endif
|
||||
%{_libdir}/libsoftokn3.so
|
||||
%{_libdir}/libsoftokn3.chk
|
||||
# shared with nss-tools
|
||||
|
@ -858,6 +866,8 @@ update-crypto-policies &> /dev/null || :
|
|||
%{_libdir}/libfreeblpriv3.so
|
||||
%{_libdir}/libfreeblpriv3.chk
|
||||
#shared
|
||||
%dir %{prelink_conf_dir}
|
||||
%{prelink_conf_dir}/nss-softokn-prelink.conf
|
||||
%dir %{dracut_modules_dir}
|
||||
%{dracut_modules_dir}/module-setup.sh
|
||||
%{dracut_conf_dir}/50-nss-softokn.conf
|
||||
|
@ -867,7 +877,6 @@ update-crypto-policies &> /dev/null || :
|
|||
%{_includedir}/nss3/blapi.h
|
||||
%{_includedir}/nss3/blapit.h
|
||||
%{_includedir}/nss3/alghmac.h
|
||||
%{_includedir}/nss3/cmac.h
|
||||
%{_includedir}/nss3/lowkeyi.h
|
||||
%{_includedir}/nss3/lowkeyti.h
|
||||
|
||||
|
@ -892,97 +901,6 @@ update-crypto-policies &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed May 13 2020 Bob Relyea <rrelyea@redhat.com> - 3.52.0-2
|
||||
- Delay CK_GCM_PARAMS semantics until fedora 34
|
||||
|
||||
* Mon May 11 2020 Daiki Ueno <dueno@redhat.com> - 3.52.0-1
|
||||
- Update to NSS 3.52
|
||||
|
||||
* Sat Apr 25 2020 Daiki Ueno <dueno@redhat.com> - 3.51.1-2
|
||||
- Temporarily revert DBM disablement for kernel build failure (#1827902)
|
||||
|
||||
* Mon Apr 20 2020 Daiki Ueno <dueno@redhat.com> - 3.51.1-1
|
||||
- Update to NSS 3.51.1
|
||||
- Disable building DBM backend
|
||||
|
||||
* Tue Apr 7 2020 Daiki Ueno <dueno@redhat.com> - 3.51.0-1
|
||||
- Update to NSS 3.51
|
||||
|
||||
* Thu Mar 26 2020 Tom Stellard <tstellar@redhat.com> - 3.50.0-3
|
||||
- Use __make macro to invoke make
|
||||
|
||||
* Thu Mar 5 2020 Daiki Ueno <dueno@redhat.com> - 3.50.0-2
|
||||
- Apply CMAC fixes from upstream
|
||||
|
||||
* Mon Feb 17 2020 Daiki Ueno <dueno@redhat.com> - 3.50.0-1
|
||||
- Update to NSS 3.50
|
||||
|
||||
* Fri Feb 14 2020 Daiki Ueno <dueno@redhat.com> - 3.49.2-3
|
||||
- Ignore false-positive compiler warnings with gcc 10
|
||||
- Fix build with gcc 10
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.49.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 27 2020 Daiki Ueno <dueno@redhat.com> - 3.49.2-1
|
||||
- Update to NSS 3.49.2
|
||||
- Don't enable TLS 1.3 by default (#1794814)
|
||||
|
||||
* Fri Jan 10 2020 Daiki Ueno <dueno@redhat.com> - 3.49.0-1
|
||||
- Update to NSS 3.49
|
||||
- Fix build on armv7hl with the patch proposed in upstream
|
||||
|
||||
* Fri Jan 3 2020 Daiki Ueno <dueno@redhat.com> - 3.48.0-1
|
||||
- Update to NSS 3.48
|
||||
|
||||
* Tue Dec 3 2019 Daiki Ueno <dueno@redhat.com> - 3.47.1-4
|
||||
- Update nss-3.47-certdb-temp-cert.patch to avoid setting empty trust value
|
||||
|
||||
* Tue Dec 3 2019 Daiki Ueno <dueno@redhat.com> - 3.47.1-3
|
||||
- Update nss-3.47-certdb-temp-cert.patch to the final version
|
||||
|
||||
* Thu Nov 28 2019 Daiki Ueno <dueno@redhat.com> - 3.47.1-2
|
||||
- Fix intermittent SEC_ERROR_UNKNOWN_ISSUER (#1752303, #1648617)
|
||||
|
||||
* Fri Nov 22 2019 Daiki Ueno <dueno@redhat.com> - 3.47.1-1
|
||||
- Update to NSS 3.47.1
|
||||
|
||||
* Mon Nov 4 2019 Bob Relyea <rrelyea@redhat.com> - 3.47.0-3
|
||||
- Include ike mechanism fix
|
||||
|
||||
* Wed Oct 23 2019 Daiki Ueno <dueno@redhat.com> - 3.47.0-2
|
||||
- Install cmac.h required by blapi.h (#1764513)
|
||||
|
||||
* Tue Oct 22 2019 Daiki Ueno <dueno@redhat.com> - 3.47.0-1
|
||||
- Update to NSS 3.47
|
||||
|
||||
* Mon Oct 21 2019 Daiki Ueno <dueno@redhat.com> - 3.46.1-1
|
||||
- Update to NSS 3.46.1
|
||||
|
||||
* Tue Sep 3 2019 Daiki Ueno <dueno@redhat.com> - 3.46.0-1
|
||||
- Update to NSS 3.46
|
||||
|
||||
* Thu Aug 29 2019 Daiki Ueno <dueno@redhat.com> - 3.45.0-1
|
||||
- Update to NSS 3.45
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.44.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jul 2 2019 Daiki Ueno <dueno@redhat.com> - 3.44.1-1
|
||||
- Update to NSS 3.44.1
|
||||
|
||||
* Mon May 20 2019 Daiki Ueno <dueno@redhat.com> - 3.44.0-2
|
||||
- Skip TLS 1.3 tests under FIPS mode
|
||||
|
||||
* Fri May 17 2019 Daiki Ueno <dueno@redhat.com> - 3.44.0-1
|
||||
- Update to NSS 3.44
|
||||
|
||||
* Mon May 6 2019 Daiki Ueno <dueno@redhat.com> - 3.43.0-3
|
||||
- Fix PKCS#11 module leak if C_GetSlotInfo() failed
|
||||
|
||||
* Tue Mar 26 2019 Elio Maldonado <elio.maldonado.batiz@gmail.com> - 3.43.0-2
|
||||
- Update %%{nspr_version} to 4.21.0 and remove obsolete comment
|
||||
|
||||
* Thu Mar 21 2019 Daiki Ueno <dueno@redhat.com> - 3.43.0-1
|
||||
- Update to NSS 3.43
|
||||
|
||||
|
@ -992,26 +910,16 @@ update-crypto-policies &> /dev/null || :
|
|||
* Fri Feb 8 2019 Daiki Ueno <dueno@redhat.com> - 3.42.0-1
|
||||
- Update to NSS 3.42
|
||||
|
||||
* Fri Feb 8 2019 Daiki Ueno <dueno@redhat.com> - 3.41.0-5
|
||||
- Simplify test failure detection in %%check
|
||||
* Fri Dec 14 2018 Daiki Ueno <dueno@redhat.com> - 3.41.0-3
|
||||
- Restore %%post / %%postun scriptlets
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.41.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jan 11 2019 Daiki Ueno <dueno@redhat.com> - 3.41.0-3
|
||||
- Remove prelink.conf as prelink was removed in F24, suggested by
|
||||
Harald Reindl
|
||||
- Use quilt for %%autopatch
|
||||
- Make sysinit require arch-dependent nss, suggested by Igor Gnatenko
|
||||
- Silence %%post/%%postun scriptlets, suggested by Ian Collier
|
||||
* Thu Dec 13 2018 Daiki Ueno <dueno@redhat.com> - 3.41.0-2
|
||||
- Revert p11-kit-proxy configuration, mistakenly merged from F29
|
||||
|
||||
* Mon Dec 10 2018 Daiki Ueno <dueno@redhat.com> - 3.41.0-1
|
||||
- Update to NSS 3.41
|
||||
|
||||
* Thu Dec 6 2018 Daiki Ueno <dueno@redhat.com> - 3.40.1-3
|
||||
- Remove unnecessary patches
|
||||
|
||||
* Thu Dec 6 2018 Daiki Ueno <dueno@redhat.com> - 3.40.1-2
|
||||
* Thu Dec 6 2018 Daiki Ueno <dueno@redhat.com> - 3.40.1-1.0
|
||||
- Update to NSS 3.40.1
|
||||
|
||||
* Wed Nov 14 2018 Daiki Ueno <dueno@redhat.com> - 3.39.0-4
|
||||
|
|
2
sources
2
sources
|
@ -3,4 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403
|
|||
SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c
|
||||
SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
|
||||
SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310
|
||||
SHA512 (nss-3.52.tar.gz) = a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6
|
||||
SHA512 (nss-3.43.tar.gz) = e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
|
||||
|
|
Loading…
Reference in New Issue