svn commit: r383864 - in head/net: asterisk asterisk11 asterisk13 libsrtp libsrtp/files ortp

Tijl Coosemans tijl at FreeBSD.org
Sun Apr 12 12:12:01 UTC 2015 

Author: tijl
Date: Sun Apr 12 12:11:57 2015
New Revision: 383864
URL: https://svnweb.freebsd.org/changeset/ports/383864

Log:
  Update net/libsrtp to 1.5.2 and use base OpenSSL on FreeBSD 10 and up
  
  PR:		198903
  Tested by:	madpilot
  Approved by:	maintainer timeout (18 days)

Added:
  head/net/libsrtp/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/net/libsrtp/files/patch-crypto-include-sha1.h
Modified:
  head/net/asterisk/Makefile
  head/net/asterisk11/Makefile
  head/net/asterisk13/Makefile
  head/net/libsrtp/Makefile
  head/net/libsrtp/distinfo
  head/net/libsrtp/files/patch-libsrtp.pc.in
  head/net/libsrtp/pkg-plist
  head/net/ortp/Makefile

Modified: head/net/asterisk/Makefile
==============================================================================
--- head/net/asterisk/Makefile	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/asterisk/Makefile	Sun Apr 12 12:11:57 2015	(r383864)
@@ -3,6 +3,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.8.32.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Modified: head/net/asterisk11/Makefile
==============================================================================
--- head/net/asterisk11/Makefile	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/asterisk11/Makefile	Sun Apr 12 12:11:57 2015	(r383864)
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	11.17.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/asterisk13/Makefile	Sun Apr 12 12:11:57 2015	(r383864)
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	13.3.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Modified: head/net/libsrtp/Makefile
==============================================================================
--- head/net/libsrtp/Makefile	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/libsrtp/Makefile	Sun Apr 12 12:11:57 2015	(r383864)
@@ -3,8 +3,7 @@
 
 PORTNAME=	libsrtp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.0
-PORTREVISION=	1
+DISTVERSION=	1.5.2
 CATEGORIES=	net
 
 MAINTAINER=	alexander at brovikov.ru
@@ -18,29 +17,27 @@ GH_ACCOUNT=	cisco
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-openssl
-CFLAGS+=	-fPIC	# Taken from configure script
+CPPFLAGS+=	-I${OPENSSLBASE}/include
+LIBS+=		-L${OPENSSLBASE}/lib
 USES=		gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
 
 .if ! defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
 .endif
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015
+WITH_OPENSSL_PORT=	yes
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} \
-		-e 's/@LDFLAGS@ -L\./-L. @LDFLAGS@/' \
-		-e 's/libsrtp.so/&.0/g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} '/pkg-config/s/openssl/libcrypto/' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} '/pkg-config.*openssl/d' ${WRKSRC}/configure
 
 post-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} libsrtp.so.0)
-
-post-install:
-	${LN} -s libsrtp.so.0 ${STAGEDIR}${PREFIX}/lib/libsrtp.so
+		${MAKEFILE} ${MAKE_ARGS} shared_library)
 
 .include <bsd.port.mk>

Modified: head/net/libsrtp/distinfo
==============================================================================
--- head/net/libsrtp/distinfo	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/libsrtp/distinfo	Sun Apr 12 12:11:57 2015	(r383864)
@@ -1,2 +1,2 @@
-SHA256 (libsrtp-v1.5.0_GH0.tar.gz) = ecf5e9be5a6ec3c73841977dc2e059c69209849f2e500269fa133d4c654f1b47
-SIZE (libsrtp-v1.5.0_GH0.tar.gz) = 1687709
+SHA256 (libsrtp-v1.5.2_GH0.tar.gz) = 86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda
+SIZE (libsrtp-v1.5.2_GH0.tar.gz) = 1690272

Added: head/net/libsrtp/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/libsrtp/files/patch-Makefile.in	Sun Apr 12 12:11:57 2015	(r383864)
@@ -0,0 +1,16 @@
+--- Makefile.in.orig	2015-03-11 14:02:12 UTC
++++ Makefile.in
+@@ -84,12 +84,11 @@ pkgconfig_DATA = libsrtp.pc
+ endif
+ 
+ SHAREDLIBVERSION = 1
+-ifeq (linux,$(findstring linux, at host@))
+ SHAREDLIB_DIR = $(libdir)
+ SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@
+ SHAREDLIBSUFFIXNOVER = so
+ SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION)
+-else ifeq (mingw,$(findstring mingw, at host@))
++ifeq (mingw,$(findstring mingw, at host@))
+ SHAREDLIB_DIR = $(bindir)
+ SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a
+ SHAREDLIBVERSION =

Modified: head/net/libsrtp/files/patch-libsrtp.pc.in
==============================================================================
--- head/net/libsrtp/files/patch-libsrtp.pc.in	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/libsrtp/files/patch-libsrtp.pc.in	Sun Apr 12 12:11:57 2015	(r383864)
@@ -6,5 +6,5 @@
  
 -Libs: -L${libdir} -lsrtp @LIBS@
 +Libs: -L${libdir} -lsrtp
-+Requires.private: libcrypto
++Libs.private: -lcrypto
  Cflags: -I${includedir}

Modified: head/net/libsrtp/pkg-plist
==============================================================================
--- head/net/libsrtp/pkg-plist	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/libsrtp/pkg-plist	Sun Apr 12 12:11:57 2015	(r383864)
@@ -37,5 +37,5 @@ include/srtp/ut_sim.h
 include/srtp/xfm.h
 lib/libsrtp.a
 lib/libsrtp.so
-lib/libsrtp.so.0
+lib/libsrtp.so.1
 libdata/pkgconfig/libsrtp.pc

Modified: head/net/ortp/Makefile
==============================================================================
--- head/net/ortp/Makefile	Sun Apr 12 12:01:28 2015	(r383863)
+++ head/net/ortp/Makefile	Sun Apr 12 12:11:57 2015	(r383864)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ortp
 PORTVERSION=	0.23.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/ortp/sources

More information about the svn-ports-head mailing list