From d2031f415b855f0d33a5aac7fd0363f12cd903cf Mon Sep 17 00:00:00 2001 From: uglyside Date: Thu, 6 Feb 2025 23:37:56 +0300 Subject: [PATCH] libsrtp-2.6.0 --- network/library/libsrtp/actions.py | 14 +++----- .../fedora/libsrtp-2.3.0-shared-fix.patch | 36 ------------------- .../libsrtp-2.3.0-shared-test-fix.patch | 13 ------- .../fedora/libsrtp-2.3.0-test-util.patch | 12 ------- .../files/libsrtp-2.3.0-rtp-header.patch | 24 ------------- network/library/libsrtp/pspec.xml | 29 +++++++++------ 6 files changed, 23 insertions(+), 105 deletions(-) delete mode 100644 network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-fix.patch delete mode 100644 network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-test-fix.patch delete mode 100644 network/library/libsrtp/files/fedora/libsrtp-2.3.0-test-util.patch delete mode 100644 network/library/libsrtp/files/libsrtp-2.3.0-rtp-header.patch diff --git a/network/library/libsrtp/actions.py b/network/library/libsrtp/actions.py index 846b52f3d1..3df4fb7392 100644 --- a/network/library/libsrtp/actions.py +++ b/network/library/libsrtp/actions.py @@ -1,28 +1,24 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - pisitools.cflags.add("-fPIC") - #autotools.autoreconf("-fiv") - autotools.configure("--enable-openssl \ - --enable-nss") + autotools.configure("--prefix=/usr --enable-nss --enable-openssl") def build(): autotools.make("all") autotools.make("shared_library") - def check(): - autotools.make("test") + autotools.make("runtest") def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("LICENSE", "CHANGES", "README*") + pisitools.dodoc("LICENSE") diff --git a/network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-fix.patch b/network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-fix.patch deleted file mode 100644 index 4ad0d34c02..0000000000 --- a/network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up libsrtp-2.3.0/Makefile.in.sharedfix libsrtp-2.3.0/Makefile.in ---- libsrtp-2.3.0/Makefile.in.sharedfix 2020-01-07 09:48:36.004217062 -0500 -+++ libsrtp-2.3.0/Makefile.in 2020-01-07 09:53:08.117725096 -0500 -@@ -106,12 +106,14 @@ bindir = @bindir@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libsrtp2.pc - --SHAREDLIBVERSION = 1 -+SHAREDLIBMINIVER = 1 -+SHAREDLIBVERSION = $(SHAREDLIBMINIVER).0.0 - ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@))) - SHAREDLIB_DIR = $(libdir) --SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ - SHAREDLIBSUFFIXNOVER = so -+SHAREDLIBMINISUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBMINIVER) - SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION) -+SHAREDLIB_LDFLAGS = -shared -Wl,-soname,libsrtp2.$(SHAREDLIBMINISUFFIX) - else ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@))) - SHAREDLIB_DIR = $(bindir) - SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp2.dll.a -@@ -166,6 +168,7 @@ libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj) - $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ - $^ $(LDFLAGS) $(LIBS) - if [ -n "$(SHAREDLIBVERSION)" ]; then \ -+ ln -sfn $@ libsrtp2.$(SHAREDLIBMINISUFFIX); \ - ln -sfn $@ libsrtp2.$(SHAREDLIBSUFFIXNOVER); \ - fi - -@@ -288,6 +291,7 @@ install: - cp libsrtp2.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \ - if [ -n "$(SHAREDLIBVERSION)" ]; then \ - ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBSUFFIXNOVER); \ -+ ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBMINISUFFIX); \ - fi; \ - fi - $(INSTALL) -d $(DESTDIR)$(pkgconfigdir) diff --git a/network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-test-fix.patch b/network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-test-fix.patch deleted file mode 100644 index 3300034384..0000000000 --- a/network/library/libsrtp/files/fedora/libsrtp-2.3.0-shared-test-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up libsrtp-2.3.0/Makefile.in.test-shared libsrtp-2.3.0/Makefile.in ---- libsrtp-2.3.0/Makefile.in.test-shared 2020-10-12 16:00:39.065842309 -0400 -+++ libsrtp-2.3.0/Makefile.in 2020-10-12 16:01:11.244097667 -0400 -@@ -196,7 +196,7 @@ ifeq (1, $(HAVE_PCAP)) - testapp += test/rtp_decoder$(EXE) - endif - --$(testapp): libsrtp2.a -+$(testapp): libsrtp2.$(SHAREDLIBSUFFIX) - - test/rtpw$(EXE): test/rtpw.c test/rtp.c test/util.c test/getopt_s.c \ - crypto/math/datatypes.c -diff -up libsrtp-2.3.0/Makefile.test-shared libsrtp-2.3.0/Makefile diff --git a/network/library/libsrtp/files/fedora/libsrtp-2.3.0-test-util.patch b/network/library/libsrtp/files/fedora/libsrtp-2.3.0-test-util.patch deleted file mode 100644 index 2ca37a50b0..0000000000 --- a/network/library/libsrtp/files/fedora/libsrtp-2.3.0-test-util.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -u libsrtp-2.3.0.orig/test/util.c libsrtp-2.3.0/test/util.c ---- libsrtp-2.3.0.orig/test/util.c 2019-12-23 10:58:25.000000000 +0100 -+++ libsrtp-2.3.0/test/util.c 2020-10-09 11:56:31.455502870 +0200 -@@ -49,7 +49,7 @@ - #include - - /* include space for null terminator */ --char bit_string[MAX_PRINT_STRING_LEN + 1]; -+static char bit_string[MAX_PRINT_STRING_LEN + 1]; - - static inline int hex_char_to_nibble(uint8_t c) - { diff --git a/network/library/libsrtp/files/libsrtp-2.3.0-rtp-header.patch b/network/library/libsrtp/files/libsrtp-2.3.0-rtp-header.patch deleted file mode 100644 index 096b19e8f3..0000000000 --- a/network/library/libsrtp/files/libsrtp-2.3.0-rtp-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001 -From: Lennart Grahl -Date: Mon, 18 May 2020 18:01:08 +0200 -Subject: [PATCH] Fix two-byte RTP header extension encryption - -Also ignores the application bits as required by RFC 8285, sec 4.3 -Fixes #490 ---- - srtp/srtp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/srtp/srtp.c b/srtp/srtp.c -index b45cee0f..176b01f0 100644 ---- a/srtp/srtp.c -+++ b/srtp/srtp.c -@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption( - xtn_hdr_data++; - } - } -- } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) { -+ } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) { - /* RFC 5285, section 4.3. Two-Byte Header */ - while (xtn_hdr_data + 1 < xtn_hdr_end) { - uint8_t xid = *xtn_hdr_data; diff --git a/network/library/libsrtp/pspec.xml b/network/library/libsrtp/pspec.xml index 26d628a02d..eca593a98a 100644 --- a/network/library/libsrtp/pspec.xml +++ b/network/library/libsrtp/pspec.xml @@ -1,5 +1,5 @@ - + libsrtp @@ -8,33 +8,31 @@ Pisi Linux Admins admin@pisilinux.org - BSD + BSDv3 library - An implementation of the Secure Real-time Transport Protocol (SRTP) - SRTP Kitaplığı (Güvenli Gerçek Zamanlı Aktarım Protokolü) - https://github.com/cisco/libsrtp/archive/refs/tags/v2.3.0.tar.gz + Secure Real-time Transport Protocol implementation. + This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel. + https://github.com/cisco/libsrtp/archive/v2.6.0/libsrtp-2.6.0.tar.gz nss-devel + zlib-devel libpcap-devel openssl-devel - libsrtp-2.3.0-rtp-header.patch - fedora/libsrtp-2.3.0-shared-fix.patch - fedora/libsrtp-2.3.0-test-util.patch - fedora/libsrtp-2.3.0-shared-test-fix.patch + libsrtp + zlib openssl /usr/lib /usr/share - /usr/share/doc @@ -42,15 +40,24 @@ libsrtp-devel Development files for libsrtp + zlib-devel + openssl-devel libsrtp /usr/include - /usr/lib/pkgconfig + /usr/lib/pkgconfig + + 2025-02-06 + 2.6.0 + Version bump. + Pisi Linux Admins + admin@pisilinux.org + 2024-12-18 2.3.0