net-libs/libsrtp: version bump to 1.4.4

svn path=/trunk/; revision=782

6 files changed, 93 insertions, 84 deletions

diff --git a/net-libs/libsrtp/ChangeLog b/net-libs/libsrtp/ChangeLog
index de07fae..ef8b15f 100644
--- a/net-libs/libsrtp/ChangeLog
+++ b/net-libs/libsrtp/ChangeLog
@@ -1,16 +1,8 @@
-2006-06-17 17:47  stkn
+# ChangeLog for net-libs/libsrtp
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
 
-	* [r296] Manifest:
-	  foobar
-
-2006-06-17 17:47  stkn
-
-	* [r295] libsrtp-1.4.2.ebuild:
-	  Set license to cisco-BSD in libsrtp ebuild
-
-2006-06-17 17:43  stkn
-
-	* [r293] ., Manifest, files, files/digest-libsrtp-1.4.2,
-	  files/libsrtp-1.4.2-test-getopt-fix.diff, libsrtp-1.4.2.ebuild:
-	  Add libsrtp-1.4.2
+  21 Feb 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  -libsrtp-1.4.2, +libsrtp-1.4.4:
+  Version bump to 1.4.4
 
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 571f5ec..1a4ca84 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,4 +1,3 @@
-AUX libsrtp-1.4.2-test-getopt-fix.diff 629 RMD160 c2ea23677977856c8f57600644ee8bf3dd9badcb SHA1 c95ce6bc209ebd43e79ab2a58d856d6ff160382b SHA256 5cad9bfc3ae64bae286245e30cad80e9ab7f5f5540187372221a4a7e1eb0d107
-DIST srtp-1.4.2.tgz 488333 RMD160 35b66d4531431da7ce24d9eb28fda8f5dfae5c63 SHA1 ad51f2a4dcf4e0709d1bd95ec10f155ee320ad3f SHA256 8338091085dbdab679962448d8db64486ccac903c35b28198bd066053bab2791
-EBUILD libsrtp-1.4.2.ebuild 873 RMD160 c0010b246061d027d22d932f2df8c84fc53067ef SHA1 d0413a5d031793422ca19a59c46ffdfa8f20c50b SHA256 b7b644a8ce418ffc4ce6320bc51f1c13db403fdfac44c8c7033d2878d3760403
-MISC ChangeLog 329 RMD160 0ae92ec3bff95a4ba467e56460778ec01f509650 SHA1 1eebec3facf23802543d8c1acdaafa1b27ab82c6 SHA256 6b64ab0898caea087b468d19d2a15d284eafb040f479cbd5437e100bc5d9cd2a
+DIST srtp-1.4.4.tgz 502890 RMD160 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee SHA1 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521 SHA256 d9c2cbb1c95172ed2dc963eff0d6ce1072326dc81cb1dd38414e9f0e430af314
+EBUILD libsrtp-1.4.4.ebuild 2033 RMD160 93c6c405c0ae4173fc06839bedeb34807cfd800a SHA1 50223fd4d1b34be4a666c2369be4ad6fb70ce24a SHA256 b8403bef4c854c25c4333bb0d1b6eaad380e13c459040115306957d0dc5b6f96
+MISC ChangeLog 243 RMD160 6bc2a7b3ca24549707fc836c5d906aca126ff1c1 SHA1 420df97af05b1208145b9cc62190f3db18f5d7d8 SHA256 b85ee6d717f7f4d22f58b9f059ee70a8f284b92b6778c671d8bd2fe0d47172c6
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.2-test-getopt-fix.diff b/net-libs/libsrtp/files/libsrtp-1.4.2-test-getopt-fix.diff
deleted file mode 100644
index 0060d71..0000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.2-test-getopt-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- srtp/test/rdbx_driver.c.orig	2006-06-17 19:39:03.000000000 +0200
-+++ srtp/test/rdbx_driver.c	2006-06-17 19:39:16.000000000 +0200
-@@ -70,7 +70,7 @@
- main (int argc, char *argv[]) {
-   double rate;
-   err_status_t status;
--  char q;
-+  int q;
-   unsigned do_timing_test = 0;
-   unsigned do_validation = 0;
- 
---- srtp/test/srtp_driver.c.orig	2006-06-17 19:39:08.000000000 +0200
-+++ srtp/test/srtp_driver.c	2006-06-17 19:39:27.000000000 +0200
-@@ -138,7 +138,7 @@
- 
- int
- main (int argc, char *argv[]) {
--  char q;
-+  int q;
-   unsigned do_timing_test    = 0;
-   unsigned do_rejection_test = 0;
-   unsigned do_codec_timing   = 0;
diff --git a/net-libs/libsrtp/libsrtp-1.4.2.ebuild b/net-libs/libsrtp/libsrtp-1.4.2.ebuild
deleted file mode 100644
index 87e27e3..0000000
--- a/net-libs/libsrtp/libsrtp-1.4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="SecureRTP library"
-HOMEPAGE="http://srtp.sourceforge.net/"
-SRC_URI="http://srtp.sourceforge.net/srtp-${PV}.tgz"
-
-SLOT="0"
-LICENSE="cisco-BSD"
-KEYWORDS="~ppc ~x86"
-
-S="${WORKDIR}/srtp"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# change variable for getopt result from char to int
-	# to fix argument parsing in srtp_driver and rdbx_driver test
-	epatch "${FILESDIR}"/libsrtp-1.4.2-test-getopt-fix.diff
-}
-
-src_compile() {
-	econf \
-		--enable-pic || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_test() {
-	emake -j1 runtest || die "selftest failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGES LICENSE README TODO VERSION
-	dodoc doc/*.txt doc/*.pdf
-}
diff --git a/net-libs/libsrtp/libsrtp-1.4.4.ebuild b/net-libs/libsrtp/libsrtp-1.4.4.ebuild
new file mode 100644
index 0000000..3e59864
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.4.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+MY_PN="srtp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SecureRTP library"
+HOMEPAGE="http://srtp.sourceforge.net/srtp.html"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+# syslog: Enable syslog for error messages
+# aesicm: Use AES ICM cryptographic algorithm
+# console: Enable /dev/console for error messages
+IUSE="aesicm console debug doc syslog"
+# TODO: kernel_linux USE flag has been disabled because compilation fails with
+
+S=${WORKDIR}/${MY_PN}
+
+src_configure() {
+	# stdout enables error messages in stdout.
+	# it is enabled by default
+	# can't build with --enable-kernel-linux
+	# gdoi has been disabled by upstream and using it breaks the build
+	econf \
+		$(use_enable aesicm generic-aesicm) \
+		$(use_enable console) \
+		$(use_enable debug) \
+		$(use_enable syslog) \
+		--enable-stdout \
+		--disable-kernel-linux \
+		--disable-gdoi
+}
+
+src_compile() {
+	# target all is building test
+	emake ${PN}.a || die "emake failed"
+}
+
+src_test() {
+	# getopt returns an int, not a char
+	sed -i -e "s/char q/int q/" \
+		test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c \
+		|| die "fixing getopt errors failed"
+
+	# test/rtpw_test.sh is assuming . is in $PATH
+	sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh \
+		|| die "patching test/rtpw_test.sh failed"
+
+	# test/rtpw.c is using /usr/share/dict/words assuming it exists
+	# using test/rtpw.c guaratees the file exists in any case
+	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c \
+		|| die "patching test/rtpw.c failed"
+
+	emake test || die "building test failed"
+	emake -j1 runtest || die "tests failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	dodoc CHANGES README TODO || die "dodoc failed"
+
+	if use doc; then
+		# libsrtp.pdf can also be generated with doxygen
+		# but it would be a waste of time as it is already built
+		dodoc doc/*.txt doc/*.pdf || die "dodoc failed"
+	fi
+}
diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
new file mode 100644
index 0000000..7440f54
--- /dev/null
+++ b/net-libs/libsrtp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>maintainer-wanted</herd>
+	<use>
+		<flag name='aesicm'>Use AES ICM cryptographic algorithm</flag>
+		<flag name='console'>Enable /dev/console for error messages</flag>
+		<flag name='syslog'>Enable syslog for error messages</flag>
+	</use>
+</pkgmetadata>