libsrtp: git20150922 -> 2.2.0

3 files changed, 25 insertions, 56 deletions

diff --git a/libsrtp/.footprint b/libsrtp/.footprint
index 026576d04..8fcedf22e 100644
--- a/libsrtp/.footprint
+++ b/libsrtp/.footprint
@@ -1,42 +1,11 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/srtp/
--rw-r--r--	root/root	usr/include/srtp/aes.h
--rw-r--r--	root/root	usr/include/srtp/aes_cbc.h
--rw-r--r--	root/root	usr/include/srtp/aes_icm.h
--rw-r--r--	root/root	usr/include/srtp/alloc.h
--rw-r--r--	root/root	usr/include/srtp/auth.h
--rw-r--r--	root/root	usr/include/srtp/cipher.h
--rw-r--r--	root/root	usr/include/srtp/config.h
--rw-r--r--	root/root	usr/include/srtp/crypto.h
--rw-r--r--	root/root	usr/include/srtp/crypto_kernel.h
--rw-r--r--	root/root	usr/include/srtp/crypto_math.h
--rw-r--r--	root/root	usr/include/srtp/crypto_types.h
--rw-r--r--	root/root	usr/include/srtp/cryptoalg.h
--rw-r--r--	root/root	usr/include/srtp/datatypes.h
--rw-r--r--	root/root	usr/include/srtp/ekt.h
--rw-r--r--	root/root	usr/include/srtp/err.h
--rw-r--r--	root/root	usr/include/srtp/getopt_s.h
--rw-r--r--	root/root	usr/include/srtp/gf2_8.h
--rw-r--r--	root/root	usr/include/srtp/hmac.h
--rw-r--r--	root/root	usr/include/srtp/integers.h
--rw-r--r--	root/root	usr/include/srtp/kernel_compat.h
--rw-r--r--	root/root	usr/include/srtp/key.h
--rw-r--r--	root/root	usr/include/srtp/null_auth.h
--rw-r--r--	root/root	usr/include/srtp/null_cipher.h
--rw-r--r--	root/root	usr/include/srtp/prng.h
--rw-r--r--	root/root	usr/include/srtp/rand_source.h
--rw-r--r--	root/root	usr/include/srtp/rdb.h
--rw-r--r--	root/root	usr/include/srtp/rdbx.h
--rw-r--r--	root/root	usr/include/srtp/rtp.h
--rw-r--r--	root/root	usr/include/srtp/rtp_priv.h
--rw-r--r--	root/root	usr/include/srtp/sha1.h
--rw-r--r--	root/root	usr/include/srtp/srtp.h
--rw-r--r--	root/root	usr/include/srtp/srtp_priv.h
--rw-r--r--	root/root	usr/include/srtp/stat.h
--rw-r--r--	root/root	usr/include/srtp/ut_sim.h
--rw-r--r--	root/root	usr/include/srtp/xfm.h
+drwxr-xr-x	root/root	usr/include/srtp2/
+-rw-r--r--	root/root	usr/include/srtp2/auth.h
+-rw-r--r--	root/root	usr/include/srtp2/cipher.h
+-rw-r--r--	root/root	usr/include/srtp2/crypto_types.h
+-rw-r--r--	root/root	usr/include/srtp2/srtp.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libsrtp.a
-lrwxrwxrwx	root/root	usr/lib/libsrtp.so -> libsrtp.so.1.4.5
--rwxr-xr-x	root/root	usr/lib/libsrtp.so.1.4.5
+-rw-r--r--	root/root	usr/lib/libsrtp2.a
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libsrtp2.pc
diff --git a/libsrtp/.signature b/libsrtp/.signature
index 633b002cf..6dbfbb9c9 100644
--- a/libsrtp/.signature
+++ b/libsrtp/.signature
@@ -1,5 +1,5 @@
-untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Xhx0W8uyorQtDnRqjE7hTOOh25OVIZuO7wxuD0Ecwyp4SIr3Hrnbr3A2ahSMOUBg90S8VFOTjW8yayCooBshwE=
-SHA256 (Pkgfile) = 93e504550028bf5b3b7db33529e90ff8b7331528c85c224dd3f650ef61ee30c7
-SHA256 (.footprint) = fabc707f1116030242e30b486c63df519ada5d4b12231e1fb04e6d100f269f45
-SHA256 (srtp-git20150922.tar.gz) = a5c2c9329e9869b5c19c0f827a60068376161605931c1a99093b1fecf3846405
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3zl9A7RUkjRKITeMPgqySYh+MFMXHKbZYb512HL8Kbl7GXOCT+92682mBqnDv9MYYWcK1U7vf861W0PtBFanyQM=
+SHA256 (Pkgfile) = 032c9e3e1376bfa9416018126e741c07a865d0c3584ae8df9fbaf878e163e21b
+SHA256 (.footprint) = 91295a1aca3241912bd2cf2fb57bdf10b3f3d53025e35c879a35d70ca34f09a3
+SHA256 (libsrtp-2.2.0.tar.gz) = 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b
diff --git a/libsrtp/Pkgfile b/libsrtp/Pkgfile
index ccc188c2b..0465720d4 100644
--- a/libsrtp/Pkgfile
+++ b/libsrtp/Pkgfile
@@ -1,18 +1,18 @@
-# Description:	Secure Realtime transport protocol library
-# URL:		git://git.linphone.org/srtp.git
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	
+# Description:  Secure Realtime transport protocol library
+# URL: https://github.com/cisco/libsrtp
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Depends on:
 
 name=libsrtp
-version=git20150922
+version=2.2.0
 release=1
-source=(http://www.mizrahi.com.ve/crux/dist/srtp-$version.tar.gz)
+source=(https://github.com/cisco/libsrtp/archive/v$version/$name-$version.tar.gz)
 
 build() {
-	cd srtp
-	./configure \
-		--prefix=/usr \
-		--disable-debug
-	make
-	make DESTDIR=$PKG install
+  cd $name-$version
+  ./configure \
+    --prefix=/usr \
+    --disable-debug
+  make
+  make DESTDIR=$PKG install
 }