Skip to content

Commit 9fcbb5b

Browse files
authored
Upgrade: libsrtp version to 2.6.0 (microsoft#11061)
1 parent c28482e commit 9fcbb5b

File tree

4 files changed

+24
-65
lines changed

4 files changed

+24
-65
lines changed

SPECS-EXTENDED/libsrtp/libsrtp-2.3.0-shared-fix.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"libsrtp-2.3.0.tar.gz": "94093a5d04c5f4743e8d81182b76938374df6d393b45322f24960d250b0110e8"
3+
"libsrtp-2.6.0.tar.gz": "bf641aa654861be10570bfc137d1441283822418e9757dc71ebb69a6cf84ea6b"
44
}
55
}

SPECS-EXTENDED/libsrtp/libsrtp.spec

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3-
%global shortname srtp
4-
53
Name: libsrtp
6-
Version: 2.3.0
7-
Release: 3%{?dist}
4+
Version: 2.6.0
5+
Release: 1%{?dist}
86
Summary: An implementation of the Secure Real-time Transport Protocol (SRTP)
9-
License: BSD
7+
License: BSD-3-Clause
108
URL: https://github.com/cisco/libsrtp
119
Source0: https://github.com/cisco/libsrtp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
12-
BuildRequires: gcc, nss-devel, libpcap-devel
13-
# Fix shared lib so ldconfig doesn't complain
14-
Patch0: libsrtp-2.3.0-shared-fix.patch
10+
BuildRequires: gcc
11+
BuildRequires: doxygen
12+
BuildRequires: meson
13+
BuildRequires: procps-ng
14+
BuildRequires: pkgconfig(openssl)
15+
BuildRequires: pkgconfig(libpcap)
16+
Provides: libsrtp-tools = %{version}-%{release}
17+
Obsoletes: libsrtp-tools < 2.6.0-1
1518

1619
%description
1720
This package provides an implementation of the Secure Real-time
@@ -21,44 +24,36 @@ a supporting cryptographic kernel.
2124
%package devel
2225
Summary: Development files for %{name}
2326
Requires: %{name}%{?_isa} = %{version}-%{release}
24-
Requires: pkgconfig
2527

2628
%description devel
2729
The %{name}-devel package contains libraries and header files for
2830
developing applications that use %{name}.
2931

3032
%prep
3133
%setup -q -n %{name}-%{version}
32-
%patch 0 -p1 -b .sharedfix
33-
34-
%if 0%{?rhel} > 0
35-
%ifarch ppc64
36-
sed -i 's/-z noexecstack//' Makefile.in
37-
%endif
38-
%endif
3934

4035
%build
41-
export CFLAGS="%{optflags} -fPIC"
42-
%configure --enable-nss
43-
make %{?_smp_mflags} shared_library
44-
36+
%meson -Dcrypto-library=openssl -Dcrypto-library-kdf=disabled
37+
%meson_build
4538
%install
46-
make install DESTDIR=%{buildroot}
47-
find %{buildroot} -name '*.la' -exec rm -f {} ';'
48-
49-
%ldconfig_scriptlets
50-
39+
%meson_install
40+
%check
41+
%meson_test
5142
%files
5243
%license LICENSE
5344
%doc CHANGES README.md
5445
%{_libdir}/*.so.*
5546

5647
%files devel
57-
%{_includedir}/%{shortname}2/
48+
%{_includedir}/srtp2/
5849
%{_libdir}/pkgconfig/libsrtp2.pc
5950
%{_libdir}/*.so
6051

6152
%changelog
53+
* Tue Nov 12 2024 Sumit Jena <[email protected]> - 2.6.0-1
54+
- Update to version 2.6.0
55+
- License verified.
56+
6257
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 2.3.0-3
6358
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
6459

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11181,8 +11181,8 @@
1118111181
"type": "other",
1118211182
"other": {
1118311183
"name": "libsrtp",
11184-
"version": "2.3.0",
11185-
"downloadUrl": "https://github.com/cisco/libsrtp/archive/v2.3.0.tar.gz"
11184+
"version": "2.6.0",
11185+
"downloadUrl": "https://github.com/cisco/libsrtp/archive/v2.6.0.tar.gz"
1118611186
}
1118711187
}
1118811188
},

0 commit comments

Comments
 (0)