libsrtp: security update to 1.5.4 (soname bump).

common/shlibs

@@ -1213,7 +1213,7 @@ libdotconf.so.0 dotconf-1.3_1
 libspeechd.so.2 speech-dispatcher-0.8_1
 libre2.so.0 re2-2015.07.01_1
 libminizip.so.1 minizip-1.2.7_1
-libsrtp.so.0 libsrtp-1.4.4_1
+libsrtp.so.1 libsrtp-1.5.4_1
 libjsoncpp.so.1 jsoncpp-1.6.5_1
 libesmtp.so.6 libesmtp-1.0.6_4
 libcaca.so.0 libcaca-0.99.beta18_3

srcpkgs/libsrtp/patches/libsrtp-1.4.4-shared.patch

@@ -1,75 +0,0 @@
-diff -up srtp/Makefile.in.shared srtp/Makefile.in
---- Makefile.in.shared	2010-05-21 13:45:35.000000000 -0400
-+++ Makefile.in	2010-10-04 15:53:29.132116130 -0400
-@@ -8,7 +8,7 @@
- # runtest       runs test applications 
- # test		builds test applications
- # libcrypt.a	static library implementing crypto engine
--# libsrtp.a	static library implementing srtp
-+# libsrtp.so	shared library implementing srtp
- # clean		removes objects, libs, and executables
- # distribution  cleans and builds a .tgz
- # tags          builds etags file from all .c and .h files
-@@ -97,13 +97,13 @@ kernel  = crypto/kernel/crypto_kernel.o 
- 
- cryptobj =  $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
- 
--# libsrtp.a (implements srtp processing)
-+# libsrtp (implements srtp processing)
- 
- srtpobj = srtp/srtp.o srtp/ekt.o
- 
--libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
--	ar cr libsrtp.a $^
--	$(RANLIB) libsrtp.a
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(COMPILE) -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,$@.0 -z noexecstack -o $@.0.0.0 $^
-+	ln -s $@.0.0.0 $@	
- 
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
-@@ -127,19 +127,19 @@ testapp = $(crypto_testapp) test/srtp_dr
- 	  test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
- 	  test/dtls_srtp_driver$(EXE)
- 
--$(testapp): libsrtp.a
-+$(testapp): libsrtp.so
- 
- test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c
--	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+	$(COMPILE) $(LDFLAGS) -o $@ test/rtpw.c test/rtp.c test/getopt_s.c $(LIBS) $(SRTPLIB)
- 
- test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c
--	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+	$(COMPILE) $(LDFLAGS) -o $@ test/srtp_driver.c test/getopt_s.c $(LIBS) $(SRTPLIB)
- 
- test/rdbx_driver$(EXE): test/rdbx_driver.c test/getopt_s.c
--	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+	$(COMPILE) $(LDFLAGS) -o $@ test/rdbx_driver.c test/getopt_s.c $(LIBS) $(SRTPLIB)
- 
- test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c
--	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+	$(COMPILE) $(LDFLAGS) -o $@ test/dtls_srtp_driver.c test/getopt_s.c $(LIBS) $(SRTPLIB)
- 
- test: $(testapp)
- 	@echo "Build done. Please run '$(MAKE) runtest' to run self tests."
-@@ -197,16 +197,16 @@ install:
- 	cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp  
- 	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
--	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+	if [ -f libsrtp.so.0.0.0 ]; then cp libsrtp.so.0.0.0 $(DESTDIR)$(libdir)/; fi
- 
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/srtp/*.h
--	rm -f $(DESTDIR)$(libdir)/libsrtp.a
-+	rm -f $(DESTDIR)$(libdir)/libsrtp.so*
- 	-rmdir $(DESTDIR)$(includedir)/srtp
- 
- clean:
- 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
--        libcryptomath.a libsrtp.a core *.core test/core
-+        libcryptomath.a libsrtp.so* core *.core test/core
- 	for a in * */* */*/*; do			\
-               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
-         done;

srcpkgs/libsrtp/template

@@ -1,24 +1,19 @@
 # Template build file for 'libsrtp'.
 pkgname=libsrtp
-version=1.4.4
+version=1.5.4
-revision=4
+revision=1
-wrksrc=srtp
 build_style=gnu-configure
+make_build_target="libsrtp.a shared_library"
+hostmakedepends="automake pkg-config"
 short_desc="Library implementing SRTP, the Secure Real-time Transport Protocol"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="BSD"
-homepage="http://sourceforge.net/projects/srtp/"
+homepage="https://github.com/cisco/libsrtp"
-#Use fedora's cvs checkout for the good
+distfiles="https://github.com/cisco/libsrtp/archive/v${version}.tar.gz"
-distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libsrtp/srtp-1.4.4-20101004cvs.tar.bz2/160479555f5e95027ad318605c1c670c/srtp-1.4.4-20101004cvs.tar.bz2"
+checksum=56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0
-checksum=ac91a00c4eed0c111a94dfa5295a32af82cdd26c1c7f58f317b1062f0beb923b
 
-CFLAGS="-fPIC"
+pre_configure() {
-
+	autoreconf -fi
-post_install() {
-	sed "s,@VERSION@,${version},g" ${FILESDIR}/libsrtp.pc > libsrtp.pc
-	vinstall libsrtp.pc 644 usr/lib/pkgconfig
-	ln -sf libsrtp.so.0.0.0 ${DESTDIR}/usr/lib/libsrtp.so
-	ln -sf libsrtp.so.0.0.0 ${DESTDIR}/usr/lib/libsrtp.so.0
 }
 
 libsrtp-devel_package() {
@@ -27,6 +22,7 @@ libsrtp-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.so
+		vmove usr/lib/*.a
 	}
 }