From 21847a0d5542da8fce8fe3f6cd726a86eef1e1a6 Mon Sep 17 00:00:00 2001
From: Jiri Slachta <jiri@slachta.eu>
Date: Wed, 1 Nov 2017 11:59:29 +0100
Subject: [PATCH] libsrtp2: update to 2.1.0

Signed-off-by: Jiri Slachta <jiri@slachta.eu>
---
 libs/libsrtp2/Makefile                        |  4 +-
 .../patches/1007_update_Doxyfile.patch        | 94 -------------------
 libs/libsrtp2/patches/1008_shared-lib.patch   | 15 ---
 3 files changed, 2 insertions(+), 111 deletions(-)
 delete mode 100644 libs/libsrtp2/patches/1007_update_Doxyfile.patch
 delete mode 100644 libs/libsrtp2/patches/1008_shared-lib.patch

diff --git a/libs/libsrtp2/Makefile b/libs/libsrtp2/Makefile
index 42e99d3..baf715d 100644
--- a/libs/libsrtp2/Makefile
+++ b/libs/libsrtp2/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsrtp2
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=12ea269db3e4e9af7ce5de524fe07312fa6e035b
+PKG_SOURCE_VERSION:=93aba3e767502343c255fad8962dbf0ff29c4ca6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/libs/libsrtp2/patches/1007_update_Doxyfile.patch b/libs/libsrtp2/patches/1007_update_Doxyfile.patch
deleted file mode 100644
index 8108d7d..0000000
--- a/libs/libsrtp2/patches/1007_update_Doxyfile.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: Update Doxyfile and header template
-Author: Jonas Smedegaard <dr@jones.dk>
-Last-Update: 2010-02-28
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -25,6 +25,7 @@ libsrtpdoc: 
- 		echo "*** Sorry, can't build doc outside source dir"; exit 1; \
- 	fi
- 	sed 's/LIBSRTPVERSION/$(version)/' header.template > header.tex
-+	doxygen -u
- 	doxygen
- 	sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp
- 	mv latex/index.tmp latex/index.tex
-@@ -38,7 +39,7 @@ cryptodoc: clean
- 	cp latex/refman.pdf crypto.pdf
- 
- clean:
--	rm -rf latex/ header.tex
-+	rm -rf latex/ header.tex Doxyfile.bak
- 	for a in * ; do			                \
-               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
-         done;
---- a/doc/header.template
-+++ b/doc/header.template
-@@ -6,28 +6,40 @@
- % 
- \documentclass[letterpaper]{book}
- \usepackage{makeidx}
--\usepackage{fancyhdr}
- \usepackage{graphicx}
- \usepackage{multicol}
- \usepackage{float}
-+\usepackage{listings}
-+\usepackage{color}
-+\usepackage{ifthen}
-+\usepackage[table]{xcolor}
- \usepackage{textcomp}
- \usepackage{alltt}
--\usepackage{times}
--\usepackage{graphicx}
--\ifx\pdfoutput\undefined
--\usepackage[ps2pdf,
-+\usepackage{ifpdf}
-+\ifpdf
-+\usepackage[pdftex,
-             pagebackref=true,
-             colorlinks=true,
--            linkcolor=blue
-+            linkcolor=blue,
-+            unicode
-            ]{hyperref}
- \else
--\usepackage[pdftex,
-+\usepackage[ps2pdf,
-             pagebackref=true,
-             colorlinks=true,
--            linkcolor=blue
-+            linkcolor=blue,
-+            unicode
-            ]{hyperref}
-+\usepackage{pspicture}
- \fi
-+\usepackage[utf8]{inputenc}
-+\usepackage{mathptmx}
-+\usepackage[scaled=.90]{helvet}
-+\usepackage{courier}
-+\usepackage{sectsty}
-+\usepackage[titles]{tocloft}
- \usepackage{doxygen}
-+\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=3,numbers=left }
- \makeindex
- \setcounter{tocdepth}{1}
- \renewcommand{\footrulewidth}{0.4pt}
-@@ -59,7 +71,9 @@
- \selectfont
- 
- 
-+\renewcommand{\familydefault}{\sfdefault}
- \begin{document}
-+\hypersetup{pageanchor=false}
- \begin{titlepage}
- \vspace*{4cm}
- %\begin{center}
-@@ -107,9 +121,6 @@ This reference material in this documena
- \clearemptydoublepage
- \pagenumbering{roman}
- \tableofcontents
--%\clearemptydoublepage
--
- \clearemptydoublepage
- \pagenumbering{arabic}
--
--
-+\hypersetup{pageanchor=true}
diff --git a/libs/libsrtp2/patches/1008_shared-lib.patch b/libs/libsrtp2/patches/1008_shared-lib.patch
deleted file mode 100644
index 5451bb9..0000000
--- a/libs/libsrtp2/patches/1008_shared-lib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Hack build routines to compile shared library
-Author: loki_val and solar
-Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
-Last-Update: 2010-03-19
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -19,7 +19,7 @@
- 
- .PHONY: all test build_table_apps
- 
--all: test 
-+all: shared_library test
- 
- runtest: build_table_apps test
- 	@echo "running libsrtp test applications..."