From 5d74b30790cc4d5b1fae513a36aa9e09db45ad80 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 7 Nov 2023 11:51:34 +0000 Subject: [PATCH] import UBI libsrtp-2.3.0-8.el9 --- SOURCES/libsrtp-2.3.0-nss-3.63-fix.patch | 24 ++++++++++++++++++++++++ SPECS/libsrtp.spec | 10 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 SOURCES/libsrtp-2.3.0-nss-3.63-fix.patch diff --git a/SOURCES/libsrtp-2.3.0-nss-3.63-fix.patch b/SOURCES/libsrtp-2.3.0-nss-3.63-fix.patch new file mode 100644 index 0000000..b4713e2 --- /dev/null +++ b/SOURCES/libsrtp-2.3.0-nss-3.63-fix.patch @@ -0,0 +1,24 @@ +diff -up libsrtp-2.3.0/crypto/include/aes_gcm.h.nssfix libsrtp-2.3.0/crypto/include/aes_gcm.h +--- libsrtp-2.3.0/crypto/include/aes_gcm.h.nssfix 2021-04-15 13:47:08.667150587 -0400 ++++ libsrtp-2.3.0/crypto/include/aes_gcm.h 2021-04-15 13:47:26.991294515 -0400 +@@ -66,6 +66,8 @@ typedef struct { + + #ifdef NSS + ++#define NSS_PKCS11_2_0_COMPAT 1 ++ + #include + #include + +diff -up libsrtp-2.3.0/crypto/include/aes_icm_ext.h.nssfix libsrtp-2.3.0/crypto/include/aes_icm_ext.h +--- libsrtp-2.3.0/crypto/include/aes_icm_ext.h.nssfix 2021-04-15 13:47:36.617370124 -0400 ++++ libsrtp-2.3.0/crypto/include/aes_icm_ext.h 2021-04-15 13:59:50.074073286 -0400 +@@ -65,6 +65,8 @@ typedef struct { + + #ifdef NSS + ++#define NSS_PKCS11_2_0_COMPAT 1 ++ + #include + #include + diff --git a/SPECS/libsrtp.spec b/SPECS/libsrtp.spec index a4a1c0f..1a5cb4f 100644 --- a/SPECS/libsrtp.spec +++ b/SPECS/libsrtp.spec @@ -2,7 +2,7 @@ Name: libsrtp Version: 2.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An implementation of the Secure Real-time Transport Protocol (SRTP) License: BSD URL: https://github.com/cisco/libsrtp @@ -15,6 +15,9 @@ Patch0: libsrtp-2.3.0-shared-fix.patch Patch1: libsrtp-2.3.0-test-util.patch # Link test binaries against shared lib Patch2: libsrtp-2.3.0-shared-test-fix.patch +# Fix issue with NSS 3.63 incompatibility +# credit to George Joseph +Patch3: libsrtp-2.3.0-nss-3.63-fix.patch %description This package provides an implementation of the Secure Real-time @@ -42,6 +45,7 @@ Tools for testing and decoding SRTP %patch0 -p1 -b .sharedfix %patch1 -p1 -b .utilfix %patch2 -p1 -b .test-shared-fix +%patch3 -p1 -b .nssfix %if 0%{?rhel} > 0 %ifarch ppc64 @@ -84,6 +88,10 @@ install -D -p -m 0755 test/test_srtp %{buildroot}%{_bindir}/test_srtp %{_bindir}/* %changelog +* Thu Jul 06 2023 Wim Taymans - 2.3.0-8 +- fix NSS incompatibility, thanks to George Joseph + Resolves: rhbz#2211526 + * Mon Aug 09 2021 Mohan Boddu - 2.3.0-7 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688