From: Jiri Slachta Date: Sat, 6 Dec 2014 12:02:21 +0000 (+0100) Subject: libsrtp: update to 1.5.0, switch to github repo X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=722ea9b644cf53871b725b13794e19f6512886ac;p=feed%2Ftelephony.git libsrtp: update to 1.5.0, switch to github repo Signed-off-by: Jiri Slachta --- diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile index ac09f55..0033535 100644 --- a/libs/libsrtp/Makefile +++ b/libs/libsrtp/Makefile @@ -8,14 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsrtp -PKG_VERSION:=1.4.4 +PKG_VERSION:=1.5.0 PKG_RELEASE:=1 -PKG_SOURCE:=srtp-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=@SF/srtp -PKG_MD5SUM:=9b449edb011c934ca97009e7e0566d22 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=f1084acad71cfcd2da08827ba2d1c87d09fd8608 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/srtp +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL:=1 PKG_LICENSE:=BSD-3-Clause @@ -25,7 +27,15 @@ PKG_MAINTAINER:=Jiri Slachta include $(INCLUDE_DIR)/package.mk TARGET_CFLAGS += $(FPIC) -CONFIGURE_ARGS += --disable-stdout --enable-syslog +CONFIGURE_ARGS += \ + --disable-kernel-linux \ + --disable-debug \ + --enable-generic-aesicm \ + --disable-openssl \ + --enable-syslog \ + --disable-stdout \ + --disable-console \ + --disable-gdoi define Package/libsrtp SUBMENU:=Telephony @@ -38,21 +48,22 @@ endef define Package/libsrtp/description Open-source implementation of the Secure Real-time Transport Protocol (SRTP) originally authored by Cisco Systems, Inc. -It is available under a BSD-style license. endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/srtp $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.{a,so*} $(1)/usr/lib/ -endef + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.{a,so} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsrtp.pc $(1)/usr/lib/pkgconfig/ +endef define Package/libsrtp/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.so.* \ - $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.so $(1)/usr/lib/ endef $(eval $(call BuildPackage,libsrtp)) diff --git a/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch b/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch index 534ea4b..98c94d9 100644 --- a/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch +++ b/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch @@ -1,11 +1,12 @@ Description: Fix MIPS namespace collision Author: Thiemo Seufer -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=24;bug=439976 +Origin: vendor, http://bugs.debian.org/439976#24 Bug-Debian: http://bugs.debian.org/439976 Last-Update: 2010-02-28 + --- a/test/srtp_driver.c +++ b/test/srtp_driver.c -@@ -314,7 +314,7 @@ main (int argc, char *argv[]) { +@@ -341,7 +341,7 @@ if (do_codec_timing) { srtp_policy_t policy; int ignore; @@ -14,8 +15,8 @@ Last-Update: 2010-02-28 crypto_policy_set_rtp_default(&policy.rtp); crypto_policy_set_rtcp_default(&policy.rtcp); -@@ -323,33 +323,33 @@ main (int argc, char *argv[]) { - policy.key = test_key; +@@ -353,33 +353,33 @@ + policy.allow_repeat_tx = 0; policy.next = NULL; - printf("mips estimate: %e\n", mips); diff --git a/libs/libsrtp/patches/1005_fix_data_alignment.patch b/libs/libsrtp/patches/1005_fix_data_alignment.patch index 4cb8889..6a52bca 100644 --- a/libs/libsrtp/patches/1005_fix_data_alignment.patch +++ b/libs/libsrtp/patches/1005_fix_data_alignment.patch @@ -1,20 +1,13 @@ Description: Fix data alignment Author: "Martin Guy" -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=470505 +Origin: vendor, http://bugs.debian.org/470505#5 Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1912057&group_id=38894&atid=423799 Bug-Debian: http://bugs.debian.org/470505 Last-Update: 2011-05-30 + --- a/test/srtp_driver.c +++ b/test/srtp_driver.c -@@ -1129,7 +1129,6 @@ mips_estimate(int num_trials, int *ignor - * These packets were made with the default SRTP policy. - */ - -- - err_status_t - srtp_validate() { - unsigned char test_key[30] = { -@@ -1144,14 +1143,14 @@ srtp_validate() { +@@ -1207,14 +1207,14 @@ srtp_validate() { 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab }; diff --git a/libs/libsrtp/patches/1007_update_Doxyfile.patch b/libs/libsrtp/patches/1007_update_Doxyfile.patch index 8108d7d..ded88ef 100644 --- a/libs/libsrtp/patches/1007_update_Doxyfile.patch +++ b/libs/libsrtp/patches/1007_update_Doxyfile.patch @@ -1,9 +1,10 @@ Description: Update Doxyfile and header template Author: Jonas Smedegaard -Last-Update: 2010-02-28 +Last-Update: 2013-07-22 + --- a/doc/Makefile.in +++ b/doc/Makefile.in -@@ -25,6 +25,7 @@ libsrtpdoc: +@@ -25,6 +25,7 @@ echo "*** Sorry, can't build doc outside source dir"; exit 1; \ fi sed 's/LIBSRTPVERSION/$(version)/' header.template > header.tex @@ -11,7 +12,7 @@ Last-Update: 2010-02-28 doxygen sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp mv latex/index.tmp latex/index.tex -@@ -38,7 +39,7 @@ cryptodoc: clean +@@ -38,7 +39,7 @@ cp latex/refman.pdf crypto.pdf clean: @@ -22,11 +23,7 @@ Last-Update: 2010-02-28 done; --- a/doc/header.template +++ b/doc/header.template -@@ -6,28 +6,40 @@ - % - \documentclass[letterpaper]{book} - \usepackage{makeidx} --\usepackage{fancyhdr} +@@ -10,28 +10,47 @@ \usepackage{graphicx} \usepackage{multicol} \usepackage{float} @@ -71,7 +68,17 @@ Last-Update: 2010-02-28 \makeindex \setcounter{tocdepth}{1} \renewcommand{\footrulewidth}{0.4pt} -@@ -59,7 +71,9 @@ + ++\let\origdoublepage\cleardoublepage ++\providecommand{\clearemptydoublepage}{% ++ \clearpage ++ {\pagestyle{empty}\origdoublepage}% ++} ++ + % these lengths are from DAM + \textwidth = 6.5 in + %\textheight = 9 in +@@ -59,7 +78,9 @@ \selectfont @@ -81,7 +88,7 @@ Last-Update: 2010-02-28 \begin{titlepage} \vspace*{4cm} %\begin{center} -@@ -107,9 +121,6 @@ This reference material in this documena +@@ -107,9 +128,6 @@ \clearemptydoublepage \pagenumbering{roman} \tableofcontents diff --git a/libs/libsrtp/patches/1008_shared-lib.patch b/libs/libsrtp/patches/1008_shared-lib.patch index 96a13ca..a165d4a 100644 --- a/libs/libsrtp/patches/1008_shared-lib.patch +++ b/libs/libsrtp/patches/1008_shared-lib.patch @@ -1,10 +1,6 @@ -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 -@@ -15,7 +15,7 @@ +@@ -19,7 +19,7 @@ .PHONY: all test build_table_apps @@ -13,43 +9,3 @@ Last-Update: 2010-03-19 runtest: build_table_apps test @echo "running libsrtp test applications..." -@@ -67,7 +67,7 @@ libdir = @libdir@ - # implicit rules for object files and test apps - - %.o: %.c -- $(COMPILE) -c $< -o $@ -+ $(COMPILE) -fPIC -c $< -o $@ - - %$(EXE): %.c - $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) -@@ -105,6 +105,9 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi - ar cr libsrtp.a $^ - $(RANLIB) libsrtp.a - -+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi) -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0 $^ -+ - # libcryptomath.a contains general-purpose routines that are used to - # generate tables and verify cryptoalgorithm implementations - this - # library is not meant to be included in production code -@@ -197,6 +200,11 @@ install: - cp include/*.h $(DESTDIR)$(includedir)/srtp - cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp - if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi -+ if [ -f libsrtp.so.0.0 ]; then \ -+ cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \ -+ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \ -+ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \ -+ fi - - uninstall: - rm -rf $(DESTDIR)$(includedir)/srtp -@@ -204,7 +212,7 @@ uninstall: - - clean: - rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \ -- libcryptomath.a libsrtp.a core *.core test/core -+ libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core - for a in * */* */*/*; do \ - if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ - done;