svn commit: r389281 - in head: dns/powerdns ftp/curl net/belle-sip net/mediastreamer security/libbzrtp security/openvpn-devel security/polarssl13 security/polarssl13/files

Tijl Coosemans tijl at FreeBSD.org
Fri Jun 12 16:14:57 UTC 2015 

Author: tijl
Date: Fri Jun 12 16:14:54 2015
New Revision: 389281
URL: https://svnweb.freebsd.org/changeset/ports/389281

Log:
  - Update security/polarssl13 to 1.3.11
  - Patch a Makefile so regular make install works
  - Replace a patch with MAKE_ENV
  - Bump dependent ports
  
  PR:		200816

Deleted:
  head/security/polarssl13/files/
Modified:
  head/dns/powerdns/Makefile
  head/ftp/curl/Makefile
  head/net/belle-sip/Makefile
  head/net/mediastreamer/Makefile
  head/security/libbzrtp/Makefile
  head/security/openvpn-devel/Makefile
  head/security/polarssl13/Makefile
  head/security/polarssl13/distinfo
  head/security/polarssl13/pkg-descr
  head/security/polarssl13/pkg-plist

Modified: head/dns/powerdns/Makefile
==============================================================================
--- head/dns/powerdns/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/dns/powerdns/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -2,6 +2,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -160,7 +161,7 @@ MODULES+=	opendbx
 .if ${PORT_OPTIONS:MPOLARSSL}
 CONFIGURE_ARGS+=	--without-system-polarssl
 .else
-LIB_DEPENDS+=		libpolarssl.so.8:${PORTSDIR}/security/polarssl13
+LIB_DEPENDS+=		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 .endif
 
 post-install:

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/ftp/curl/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -3,6 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.42.1
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -126,7 +127,7 @@ OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_USE=		OPENSSL=yes
 POLARSSL_CONFIGURE_OFF=	--without-polarssl
 POLARSSL_CONFIGURE_ON=	--with-polarssl=${LOCALBASE}
-POLARSSL_LIB_DEPENDS=	libpolarssl.so.8:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 PROXY_CONFIGURE_OFF=	--disable-proxy
 PROXY_CONFIGURE_ON=	--enable-proxy
 RTMP_CONFIGURE_OFF=	--without-librtmp

Modified: head/net/belle-sip/Makefile
==============================================================================
--- head/net/belle-sip/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/net/belle-sip/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -2,6 +2,7 @@
 
 PORTNAME=	belle-sip
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
@@ -33,7 +34,7 @@ OPTIONS_DEFINE=	POLARSSL
 OPTIONS_DEFAULT=POLARSSL
 
 POLARSSL_CONFIGURE_ENABLE=	tls
-POLARSSL_LIB_DEPENDS=		libpolarssl.so.8:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 
 post-extract:
 	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar

Modified: head/net/mediastreamer/Makefile
==============================================================================
--- head/net/mediastreamer/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/net/mediastreamer/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediastreamer
 PORTVERSION=	2.11.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/mediastreamer
 
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
 		libsrtp.so:${PORTSDIR}/net/libsrtp \
 		libbzrtp.so:${PORTSDIR}/security/libbzrtp \
-		libpolarssl.so.8:${PORTSDIR}/security/polarssl13
+		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 

Modified: head/security/libbzrtp/Makefile
==============================================================================
--- head/security/libbzrtp/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/security/libbzrtp/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libbzrtp
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SAVANNAH/linphone/bzrtp
 DISTNAME=	bzrtp-${DISTVERSION}
@@ -12,7 +13,7 @@ COMMENT=	ZRTP support library (RFC 6189)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpolarssl.so.8:${PORTSDIR}/security/polarssl13
+LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-strict \

Modified: head/security/openvpn-devel/Makefile
==============================================================================
--- head/security/openvpn-devel/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/security/openvpn-devel/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -3,6 +3,7 @@
 
 PORTNAME=	openvpn
 DISTVERSION=	201516
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel/ \
 		ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/openvpn-devel/
@@ -48,7 +49,7 @@ PW_SAVE_CONFIGURE_ENABLE=	password-save
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPOLARSSL}
-LIB_DEPENDS+=	libpolarssl.so.8:${PORTSDIR}/security/polarssl13
+LIB_DEPENDS+=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 CONFIGURE_ARGS+=--with-crypto-library=polarssl
 .else
 USE_OPENSSL=	yes

Modified: head/security/polarssl13/Makefile
==============================================================================
--- head/security/polarssl13/Makefile	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/security/polarssl13/Makefile	Fri Jun 12 16:14:54 2015	(r389281)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	polarssl
-PORTVERSION=	1.3.10
+PORTVERSION=	1.3.11
 DISTVERSIONSUFFIX=	-gpl
-#PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://polarssl.org/download/
 PKGNAMESUFFIX=	13
 DISTNAME=	mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Open Source embedded SSL/TLS cryptographic library
+COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ALL_TARGET=	no_test
-
+MAKE_ENV=	SHARED=1
 USES=		cpe gmake tar:tgz
 USE_LDCONFIG=	yes
 
@@ -23,39 +23,14 @@ WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION
 
 CONFLICTS=	polarssl-[0-9]*
 
-DOCFILES=	ChangeLog README.rst LICENSE
-BINFILES=	aescrypt2 benchmark dh_client dh_genprime dh_server hello \
-		md5sum mpi_demo rsa_genkey rsa_sign rsa_verify selftest \
-		sha1sum sha2sum ssl_cert_test ssl_client1 ssl_client2 \
-		ssl_server ssl_test
-
-# cmake install is broken, so we do it by hand
-do-install:
-	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"
-	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libpolarssl.so)
-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libmbedtls.so.8)
-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.8 libmbedtls.so)
-.for i in ${BINFILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
-.endfor
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} \
+		-e 's/PREFIX/NAMEPREFIX/' \
+		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
+		${WRKSRC}/Makefile
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
+	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
+		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>

Modified: head/security/polarssl13/distinfo
==============================================================================
--- head/security/polarssl13/distinfo	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/security/polarssl13/distinfo	Fri Jun 12 16:14:54 2015	(r389281)
@@ -1,2 +1,2 @@
-SHA256 (mbedtls-1.3.10-gpl.tgz) = 746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e
-SIZE (mbedtls-1.3.10-gpl.tgz) = 1709888
+SHA256 (mbedtls-1.3.11-gpl.tgz) = 67a593027b6a442a4fa5b6c224c4ac8cdae5be721f5a28a11d34f10dcda441cb
+SIZE (mbedtls-1.3.11-gpl.tgz) = 1731809

Modified: head/security/polarssl13/pkg-descr
==============================================================================
--- head/security/polarssl13/pkg-descr	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/security/polarssl13/pkg-descr	Fri Jun 12 16:14:54 2015	(r389281)
@@ -1,21 +1,4 @@
-PolarSSL is a light-weight open source cryptographic and SSL/TLS library
-written in C. PolarSSL is written with embedded systems in mind and has
-been ported on a number of architectures, including ARM, PowerPC, MIPS
-and Motorola 68000.
+mbed TLS is a lightweight, portable, fully featured and standards compliant
+SSL/TLS and cryptography library.
 
-Features include:
- * Small memory footprint
- * Clean and simple API for integration
- * Loose coupling of cryptographic code.
- * Symmetric encryption algorithms: AES, Triple-DES, DES, ARC4, Camellia, XTEA
- * Hash algorithms: MD2, MD4, MD5, SHA-1, SHA-224, SHA-256, SHA-384, SHA-512
- * HAVEGE random number generator
- * RSA with PKCS#1 v1.5 padding
- * SSL version 3 and TLS version 1 client support
- * X.509 certificate and CRL reading from memory or disk in PEM and DER formats
- * Over 900 regression and code coverage tests
- * Example applications
-
-LICENSE: GPL2
-
-WWW: http://polarssl.org/
+WWW: https://tls.mbed.org/

Modified: head/security/polarssl13/pkg-plist
==============================================================================
--- head/security/polarssl13/pkg-plist	Fri Jun 12 15:39:13 2015	(r389280)
+++ head/security/polarssl13/pkg-plist	Fri Jun 12 16:14:54 2015	(r389281)
@@ -1,22 +1,91 @@
+bin/mbedtls_aescrypt2
+bin/mbedtls_benchmark
+bin/mbedtls_cert_app
+bin/mbedtls_cert_req
+bin/mbedtls_crl_app
+bin/mbedtls_crypt_and_hash
+bin/mbedtls_dh_client
+bin/mbedtls_dh_genprime
+bin/mbedtls_dh_server
+bin/mbedtls_gen_entropy
+bin/mbedtls_gen_key
+bin/mbedtls_gen_random_ctr_drbg
+bin/mbedtls_gen_random_havege
+bin/mbedtls_generic_sum
+bin/mbedtls_hello
+bin/mbedtls_key_app
+bin/mbedtls_key_app_writer
+bin/mbedtls_md5sum
+bin/mbedtls_mini_client
+bin/mbedtls_mpi_demo
+bin/mbedtls_pem2der
+bin/mbedtls_pk_decrypt
+bin/mbedtls_pk_encrypt
+bin/mbedtls_pk_sign
+bin/mbedtls_pk_verify
+bin/mbedtls_rsa_decrypt
+bin/mbedtls_rsa_encrypt
+bin/mbedtls_rsa_genkey
+bin/mbedtls_rsa_sign
+bin/mbedtls_rsa_sign_pss
+bin/mbedtls_rsa_verify
+bin/mbedtls_rsa_verify_pss
+bin/mbedtls_selftest
+bin/mbedtls_sha1sum
+bin/mbedtls_sha2sum
+bin/mbedtls_ssl_cert_test
+bin/mbedtls_ssl_client1
+bin/mbedtls_ssl_client2
+bin/mbedtls_ssl_fork_server
+bin/mbedtls_ssl_mail_client
+bin/mbedtls_ssl_server
+bin/mbedtls_ssl_server2
+bin/mbedtls_ssl_test
+bin/mbedtls_strerror
 bin/polarssl_aescrypt2
 bin/polarssl_benchmark
+bin/polarssl_cert_app
+bin/polarssl_cert_req
+bin/polarssl_crl_app
+bin/polarssl_crypt_and_hash
 bin/polarssl_dh_client
 bin/polarssl_dh_genprime
 bin/polarssl_dh_server
+bin/polarssl_gen_entropy
+bin/polarssl_gen_key
+bin/polarssl_gen_random_ctr_drbg
+bin/polarssl_gen_random_havege
+bin/polarssl_generic_sum
 bin/polarssl_hello
+bin/polarssl_key_app
+bin/polarssl_key_app_writer
 bin/polarssl_md5sum
+bin/polarssl_mini_client
 bin/polarssl_mpi_demo
+bin/polarssl_pem2der
+bin/polarssl_pk_decrypt
+bin/polarssl_pk_encrypt
+bin/polarssl_pk_sign
+bin/polarssl_pk_verify
+bin/polarssl_rsa_decrypt
+bin/polarssl_rsa_encrypt
 bin/polarssl_rsa_genkey
 bin/polarssl_rsa_sign
+bin/polarssl_rsa_sign_pss
 bin/polarssl_rsa_verify
+bin/polarssl_rsa_verify_pss
 bin/polarssl_selftest
 bin/polarssl_sha1sum
 bin/polarssl_sha2sum
 bin/polarssl_ssl_cert_test
 bin/polarssl_ssl_client1
 bin/polarssl_ssl_client2
+bin/polarssl_ssl_fork_server
+bin/polarssl_ssl_mail_client
 bin/polarssl_ssl_server
+bin/polarssl_ssl_server2
 bin/polarssl_ssl_test
+bin/polarssl_strerror
 include/polarssl/aes.h
 include/polarssl/aesni.h
 include/polarssl/arc4.h
@@ -82,11 +151,8 @@ include/polarssl/x509_crl.h
 include/polarssl/x509_crt.h
 include/polarssl/x509_csr.h
 include/polarssl/xtea.h
+lib/libmbedtls.a
+lib/libmbedtls.so
+lib/libmbedtls.so.9
 lib/libpolarssl.a
 lib/libpolarssl.so
-lib/libpolarssl.so.8
-lib/libmbedtls.so
-lib/libmbedtls.so.8
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.rst
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE

More information about the svn-ports-all mailing list