commit e4b721b66112e47fdf529b67143dab468eed27ce
Author: Jakub Bogusz <[email protected]>
Date: Sat Apr 2 07:44:20 2022 +0200
- updated to 2.4.2
- updated test-build patch
libsrtp2.spec | 20 ++++++++++++--------
test-build.patch | 11 +++++------
2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/libsrtp2.spec b/libsrtp2.spec
index 7f33943..a6fa2a9 100644
--- a/libsrtp2.spec
+++ b/libsrtp2.spec
@@ -1,23 +1,26 @@
Summary: Open-source implementation of Secure Real-time Transport
Protocol
Summary(pl.UTF-8): Otwarta implementacja protokołu Secure Real-time
Transport Protocol
Name: libsrtp2
-Version: 2.3.0
-Release: 2
+Version: 2.4.2
+Release: 1
License: BSD
Group: Libraries
#Source0Download: https://github.com/cisco/libsrtp/releases
Source0:
https://github.com/cisco/libsrtp/archive/v%{version}/libsrtp-%{version}.tar.gz
-# Source0-md5: da38ee5d9c31be212a12964c22d7f795
+# Source0-md5: 253ededcbfad5335efc0825f7ef0c6cc
Patch0: test-build.patch
URL: https://github.com/cisco/libsrtp
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libpcap-devel
-BuildRequires: openssl-devel >= 1.0.1
+# also supported: nspr>=4+nss>=3 or mbedtls (the last only in cmake build)
+BuildRequires: openssl-devel >= 1.0.2i
BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
BuildRequires: zlib-devel
-Obsoletes: srtp
+Requires: openssl >= 1.0.2i
+Obsoletes: srtp < 2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -34,9 +37,9 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki SRTP
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libpcap-devel
-Requires: openssl-devel >= 1.0.1
+Requires: openssl-devel >= 1.0.2i
Requires: zlib-devel
-Obsoletes: srtp-devel
+Obsoletes: srtp-devel < 2
%description devel
Header files for SRTP library.
@@ -49,7 +52,7 @@ Summary: Static SRTP library
Summary(pl.UTF-8): Statyczna biblioteka SRTP
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
-Obsoletes: srtp-static
+Obsoletes: srtp-static < 2
%description static
Static SRTP library.
@@ -87,6 +90,7 @@ cp -a /usr/share/automake/ar-lib .
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
diff --git a/test-build.patch b/test-build.patch
index 7c21c5f..744cd4a 100644
--- a/test-build.patch
+++ b/test-build.patch
@@ -1,16 +1,15 @@
-diff -ur libsrtp-2.3.0/test/util.c libsrtp-2.3.0-build/test/util.c
---- libsrtp-2.3.0/test/util.c 2019-12-23 10:58:25.000000000 +0100
-+++ libsrtp-2.3.0-build/test/util.c 2021-10-16 23:09:56.357524543 +0200
+--- libsrtp-2.4.2/test/util.c.orig 2021-09-20 16:13:26.000000000 +0200
++++ libsrtp-2.4.2/test/util.c 2022-04-02 07:36:44.355835655 +0200
@@ -49,7 +49,7 @@
#include <stdint.h>
/* include space for null terminator */
--char bit_string[MAX_PRINT_STRING_LEN + 1];
-+char test_bit_string[MAX_PRINT_STRING_LEN + 1];
+-static char bit_string[MAX_PRINT_STRING_LEN + 1];
++static char test_bit_string[MAX_PRINT_STRING_LEN + 1];
static inline int hex_char_to_nibble(uint8_t c)
{
-@@ -157,11 +157,11 @@
+@@ -157,11 +157,11 @@ char *octet_string_hex_string(const void
}
for (i = 0; i < length; i += 2) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsrtp2.git/commitdiff/e4b721b66112e47fdf529b67143dab468eed27ce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
