[packages/libsrtp2] - updated to 2.1.0 (note: AES 256 ICM/AES GCM ciphers for RTCP are compatible with 1.6 but not 1.5/2

qboosh qboosh at pld-linux.org
Sat Dec 23 12:22:24 CET 2017 

commit 43fb5af7d7837f1b5ada6ca3455801160c2234d3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 23 12:23:50 2017 +0100

    - updated to 2.1.0 (note: AES 256 ICM/AES GCM ciphers for RTCP are compatible with 1.6 but not 1.5/2.0)
    - removed obsolete headers,doxygen patches

 libsrtp2-doxygen.patch | 139 -------------------------------------------------
 libsrtp2-headers.patch |  65 -----------------------
 libsrtp2.spec          |  16 ++----
 3 files changed, 4 insertions(+), 216 deletions(-)
---
diff --git a/libsrtp2.spec b/libsrtp2.spec
index fb41472..d389c79 100644
--- a/libsrtp2.spec
+++ b/libsrtp2.spec
@@ -1,14 +1,12 @@
 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.0.0
+Version:	2.1.0
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/cisco/libsrtp/archive/v%{version}/libsrtp-%{version}.tar.gz
-# Source0-md5:	54b7fbc8ed45aa3c1c02511ee8976dd9
-Patch0:		%{name}-headers.patch
-Patch1:		%{name}-doxygen.patch
+# Source0-md5:	49e2b9973c6fe77de46100e4c9547426
 URL:		https://github.com/cisco/libsrtp
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -16,10 +14,6 @@ BuildRequires:	doxygen
 BuildRequires:	libpcap-devel
 BuildRequires:	openssl-devel >= 1.0.1
 BuildRequires:	pkgconfig
-BuildRequires:	texlive-latex
-BuildRequires:	texlive-latex-extend
-BuildRequires:	texlive-latex-wasysym
-BuildRequires:	texlive-pdftex
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,8 +54,6 @@ Statyczna biblioteka SRTP.
 
 %prep
 %setup -q -n libsrtp-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
@@ -87,12 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES LICENSE README TODO
+%doc CHANGES LICENSE README.md
 %attr(755,root,root) %{_libdir}/libsrtp2.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/{*.txt,*.pdf}
+%doc doc/html/*
 %attr(755,root,root) %{_libdir}/libsrtp2.so
 %{_pkgconfigdir}/libsrtp2.pc
 %{_includedir}/srtp2
diff --git a/libsrtp2-doxygen.patch b/libsrtp2-doxygen.patch
deleted file mode 100644
index 45d75bf..0000000
--- a/libsrtp2-doxygen.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- libsrtp-2.0.0/doc/header.template.orig	2016-03-31 21:54:16.950123873 +0200
-+++ libsrtp-2.0.0/doc/header.template	2016-03-31 21:54:51.610122419 +0200
-@@ -4,31 +4,116 @@
- % file generated by doxygen, with the initial chapters of the 
- % original libSRTP documentation tacked on
- % 
--\documentclass[letterpaper]{book}
--\usepackage{makeidx}
--\usepackage{fancyhdr}
-+\documentclass[twoside]{book}
-+% Packages required by doxygen
-+\usepackage{fixltx2e}
-+\usepackage{calc}
-+\usepackage{doxygen}
- \usepackage{graphicx}
-+\usepackage[utf8]{inputenc}
-+\usepackage{makeidx}
- \usepackage{multicol}
--\usepackage{float}
-+\usepackage{multirow}
-+\PassOptionsToPackage{warn}{textcomp}
- \usepackage{textcomp}
--\usepackage{alltt}
--\usepackage{times}
--\usepackage{graphicx}
--\ifx\pdfoutput\undefined
--\usepackage[ps2pdf,
--            pagebackref=true,
--            colorlinks=true,
--            linkcolor=blue
--           ]{hyperref}
-+\usepackage[nointegrals]{wasysym}
-+\usepackage[table]{xcolor}
-+
-+% Font selection
-+\usepackage[T1]{fontenc}
-+\usepackage{mathptmx}
-+\usepackage[scaled=.90]{helvet}
-+\usepackage{courier}
-+\usepackage{amssymb}
-+\usepackage{sectsty}
-+\renewcommand{\familydefault}{\sfdefault}
-+\allsectionsfont{%
-+  \fontseries{bc}\selectfont%
-+  \color{darkgray}%
-+}
-+\renewcommand{\DoxyLabelFont}{%
-+  \fontseries{bc}\selectfont%
-+  \color{darkgray}%
-+}
-+\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
-+
-+% Page & text layout
-+\usepackage{geometry}
-+\geometry{%
-+  letterpaper,%
-+  top=2.5cm,%
-+  bottom=2.5cm,%
-+  left=2.5cm,%
-+  right=2.5cm%
-+}
-+\tolerance=750
-+\hfuzz=15pt
-+\hbadness=750
-+\setlength{\emergencystretch}{15pt}
-+\setlength{\parindent}{0cm}
-+\setlength{\parskip}{0.2cm}
-+\makeatletter
-+\renewcommand{\paragraph}{%
-+  \@startsection{paragraph}{4}{0ex}{-1.0ex}{1.0ex}{%
-+    \normalfont\normalsize\bfseries\SS at parafont%
-+  }%
-+}
-+\renewcommand{\subparagraph}{%
-+  \@startsection{subparagraph}{5}{0ex}{-1.0ex}{1.0ex}{%
-+    \normalfont\normalsize\bfseries\SS at subparafont%
-+  }%
-+}
-+\makeatother
-+
-+% Headers & footers
-+\usepackage{fancyhdr}
-+\pagestyle{fancyplain}
-+\fancyhead[LE]{\fancyplain{}{\bfseries\thepage}}
-+\fancyhead[CE]{\fancyplain{}{}}
-+\fancyhead[RE]{\fancyplain{}{\bfseries\leftmark}}
-+\fancyhead[LO]{\fancyplain{}{\bfseries\rightmark}}
-+\fancyhead[CO]{\fancyplain{}{}}
-+\fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
-+\fancyfoot[LE]{\fancyplain{}{}}
-+\fancyfoot[CE]{\fancyplain{}{}}
-+\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Mar 31 2016 21\+:45\+:34 for lib\+S\+R\+T\+P by Doxygen }}
-+\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Mar 31 2016 21\+:45\+:34 for lib\+S\+R\+T\+P by Doxygen }}
-+\fancyfoot[CO]{\fancyplain{}{}}
-+\fancyfoot[RO]{\fancyplain{}{}}
-+\renewcommand{\footrulewidth}{0.4pt}
-+\renewcommand{\chaptermark}[1]{%
-+  \markboth{#1}{}%
-+}
-+\renewcommand{\sectionmark}[1]{%
-+  \markright{\thesection\ #1}%
-+}
-+
-+% Indices & bibliography
-+\usepackage{natbib}
-+\usepackage[titles]{tocloft}
-+\setcounter{tocdepth}{3}
-+\setcounter{secnumdepth}{5}
-+\makeindex
-+
-+% Hyperlinks (required, but should be loaded last)
-+\usepackage{ifpdf}
-+\ifpdf
-+  \usepackage[pdftex,pagebackref=true]{hyperref}
- \else
--\usepackage[pdftex,
--            pagebackref=true,
--            colorlinks=true,
--            linkcolor=blue
--           ]{hyperref}
-+  \usepackage[ps2pdf,pagebackref=true]{hyperref}
- \fi
--\usepackage{doxygen}
--\makeindex
-+\hypersetup{%
-+  colorlinks=true,%
-+  linkcolor=blue,%
-+  citecolor=blue,%
-+  unicode%
-+}
-+
-+% Custom commands
-+\newcommand{\clearemptydoublepage}{%
-+  \newpage{\pagestyle{empty}\cleardoublepage}%
-+}
-+
- \setcounter{tocdepth}{1}
- \renewcommand{\footrulewidth}{0.4pt}
- 
diff --git a/libsrtp2-headers.patch b/libsrtp2-headers.patch
deleted file mode 100644
index 639ae5a..0000000
--- a/libsrtp2-headers.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- libsrtp-1.5.2/include/rtp.h.orig	2015-03-11 15:02:12.000000000 +0100
-+++ libsrtp-1.5.2/include/rtp.h	2015-08-05 20:52:03.448242500 +0200
-@@ -54,6 +54,8 @@
- #ifndef RTP_H
- #define RTP_H
- 
-+#include "config.h"
-+
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>
- #elif defined HAVE_WINSOCK2_H
---- libsrtp-1.5.2/crypto/include/datatypes.h.orig	2015-03-11 15:02:12.000000000 +0100
-+++ libsrtp-1.5.2/crypto/include/datatypes.h	2015-08-05 20:49:25.094915812 +0200
-@@ -47,6 +47,7 @@
- #ifndef _DATATYPES_H
- #define _DATATYPES_H
- 
-+#include "config.h"
- #include "integers.h"           /* definitions of uint32_t, et cetera   */
- #include "alloc.h"
- 
---- libsrtp-1.5.2/crypto/include/err.h.orig	2015-03-11 15:02:12.000000000 +0100
-+++ libsrtp-1.5.2/crypto/include/err.h	2015-08-05 20:49:42.271581757 +0200
-@@ -46,6 +46,8 @@
- #ifndef ERR_H
- #define ERR_H
- 
-+#include "config.h"
-+
- #include <stdio.h>
- #include <stdarg.h>
- 
---- libsrtp-1.5.2/crypto/include/hmac.h.orig	2015-03-11 15:02:12.000000000 +0100
-+++ libsrtp-1.5.2/crypto/include/hmac.h	2015-08-05 20:50:02.894914225 +0200
-@@ -46,6 +46,7 @@
- #ifndef HMAC_H
- #define HMAC_H
- 
-+#include "config.h"
- #include "auth.h"
- #include "sha1.h"
- 
---- libsrtp-1.5.2/crypto/include/integers.h.orig	2015-03-11 15:02:12.000000000 +0100
-+++ libsrtp-1.5.2/crypto/include/integers.h	2015-08-05 20:50:14.444913741 +0200
-@@ -47,6 +47,7 @@
- #ifndef INTEGERS_H
- #define INTEGERS_H
- 
-+#include "config.h"
- 
- #ifdef SRTP_KERNEL
- 
---- libsrtp-1.5.2/crypto/include/sha1.h.orig	2015-08-05 20:34:49.334952564 +0200
-+++ libsrtp-1.5.2/crypto/include/sha1.h	2015-08-05 20:51:23.068244194 +0200
-@@ -47,9 +47,7 @@
- #ifndef SHA1_H
- #define SHA1_H
- 
--#ifdef HAVE_CONFIG_H
--    #include <config.h>
--#endif
-+#include "config.h"
- 
- #include "err.h"
- #ifdef OPENSSL
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsrtp2.git/commitdiff/43fb5af7d7837f1b5ada6ca3455801160c2234d3

More information about the pld-cvs-commit mailing list