libsrtp-2.6.0
This commit is contained in:
@@ -1,28 +1,24 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Licensed under the GNU General Public License, version 3.
|
# 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 autotools
|
||||||
from pisi.actionsapi import pisitools
|
from pisi.actionsapi import pisitools
|
||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
pisitools.cflags.add("-fPIC")
|
autotools.configure("--prefix=/usr --enable-nss --enable-openssl")
|
||||||
#autotools.autoreconf("-fiv")
|
|
||||||
autotools.configure("--enable-openssl \
|
|
||||||
--enable-nss")
|
|
||||||
|
|
||||||
def build():
|
def build():
|
||||||
autotools.make("all")
|
autotools.make("all")
|
||||||
autotools.make("shared_library")
|
autotools.make("shared_library")
|
||||||
|
|
||||||
|
|
||||||
def check():
|
def check():
|
||||||
autotools.make("test")
|
autotools.make("runtest")
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||||
|
|
||||||
pisitools.dodoc("LICENSE", "CHANGES", "README*")
|
pisitools.dodoc("LICENSE")
|
||||||
|
|||||||
@@ -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)
|
|
||||||
@@ -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
|
|
||||||
@@ -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 <stdint.h>
|
|
||||||
|
|
||||||
/* 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)
|
|
||||||
{
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lennart Grahl <lennart.grahl@gmail.com>
|
|
||||||
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;
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
<PISI>
|
<PISI>
|
||||||
<Source>
|
<Source>
|
||||||
<Name>libsrtp</Name>
|
<Name>libsrtp</Name>
|
||||||
@@ -8,33 +8,31 @@
|
|||||||
<Name>Pisi Linux Admins</Name>
|
<Name>Pisi Linux Admins</Name>
|
||||||
<Email>admin@pisilinux.org</Email>
|
<Email>admin@pisilinux.org</Email>
|
||||||
</Packager>
|
</Packager>
|
||||||
<License>BSD</License>
|
<License>BSDv3</License>
|
||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>An implementation of the Secure Real-time Transport Protocol (SRTP)</Summary>
|
<Summary>Secure Real-time Transport Protocol implementation.</Summary>
|
||||||
<Description>SRTP Kitaplığı (Güvenli Gerçek Zamanlı Aktarım Protokolü)</Description>
|
<Description>This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.</Description>
|
||||||
<Archive sha1sum="263a45a82cb1acb1a6c7beef64def31949496a02" type="targz">https://github.com/cisco/libsrtp/archive/refs/tags/v2.3.0.tar.gz</Archive>
|
<Archive sha1sum="28802cb78a4c389b048d33faf188eb341993136c" type="targz">https://github.com/cisco/libsrtp/archive/v2.6.0/libsrtp-2.6.0.tar.gz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>nss-devel</Dependency>
|
<Dependency>nss-devel</Dependency>
|
||||||
|
<Dependency>zlib-devel</Dependency>
|
||||||
<Dependency>libpcap-devel</Dependency>
|
<Dependency>libpcap-devel</Dependency>
|
||||||
<Dependency>openssl-devel</Dependency>
|
<Dependency>openssl-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">libsrtp-2.3.0-rtp-header.patch</Patch>
|
<!-- <Patch level="1"></Patch> -->
|
||||||
<Patch level="1">fedora/libsrtp-2.3.0-shared-fix.patch</Patch>
|
|
||||||
<Patch level="1">fedora/libsrtp-2.3.0-test-util.patch</Patch>
|
|
||||||
<Patch level="1">fedora/libsrtp-2.3.0-shared-test-fix.patch</Patch>
|
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
<Name>libsrtp</Name>
|
<Name>libsrtp</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
|
<Dependency>zlib</Dependency>
|
||||||
<Dependency>openssl</Dependency>
|
<Dependency>openssl</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
<Path fileType="data">/usr/share</Path>
|
<Path fileType="data">/usr/share</Path>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
@@ -42,15 +40,24 @@
|
|||||||
<Name>libsrtp-devel</Name>
|
<Name>libsrtp-devel</Name>
|
||||||
<Summary>Development files for libsrtp</Summary>
|
<Summary>Development files for libsrtp</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
|
<Dependency>zlib-devel</Dependency>
|
||||||
|
<Dependency>openssl-devel</Dependency>
|
||||||
<Dependency release="current">libsrtp</Dependency>
|
<Dependency release="current">libsrtp</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="header">/usr/include</Path>
|
<Path fileType="header">/usr/include</Path>
|
||||||
<Path fileType="library">/usr/lib/pkgconfig</Path>
|
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||||
</Files>
|
</Files>
|
||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2025-02-06</Date>
|
||||||
|
<Version>2.6.0</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Pisi Linux Admins</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="2">
|
<Update release="2">
|
||||||
<Date>2024-12-18</Date>
|
<Date>2024-12-18</Date>
|
||||||
<Version>2.3.0</Version>
|
<Version>2.3.0</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user