Index: head/security/polarssl13/Makefile =================================================================== --- head/security/polarssl13/Makefile (revision 381315) +++ head/security/polarssl13/Makefile (revision 381316) @@ -1,58 +1,61 @@ # $FreeBSD$ PORTNAME= polarssl -PORTVERSION= 1.3.9 -PORTREVISION= 1 +PORTVERSION= 1.3.10 DISTVERSIONSUFFIX= -gpl +#PORTREVISION= 1 CATEGORIES= security devel -MASTER_SITES= http://polarssl.org/download/ +MASTER_SITES= https://polarssl.org/download/ PKGNAMESUFFIX= 13 +DISTNAME= mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= chris@bsdjunk.com COMMENT= Open Source embedded SSL/TLS cryptographic library LICENSE= GPLv2 ALL_TARGET= no_test -USES= cpe gmake tar:tgz +USES= cpe gmake tar:tgz USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +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.7 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.7 - cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.7 libpolarssl.so + ${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 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 .include Index: head/security/polarssl13/distinfo =================================================================== --- head/security/polarssl13/distinfo (revision 381315) +++ head/security/polarssl13/distinfo (revision 381316) @@ -1,2 +1,2 @@ -SHA256 (polarssl-1.3.9-gpl.tgz) = d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755 -SIZE (polarssl-1.3.9-gpl.tgz) = 1741396 +SHA256 (mbedtls-1.3.10-gpl.tgz) = 746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e +SIZE (mbedtls-1.3.10-gpl.tgz) = 1709888 Index: head/security/polarssl13/files/patch-library-asn1parse_c =================================================================== --- head/security/polarssl13/files/patch-library-asn1parse_c (revision 381315) +++ head/security/polarssl13/files/patch-library-asn1parse_c (nonexistent) @@ -1,11 +0,0 @@ ---- library/asn1parse.c.orig 2015-01-20 10:12:00.469677333 +0000 -+++ library/asn1parse.c 2015-01-20 10:14:00.764667419 +0000 -@@ -278,6 +278,8 @@ - if( cur->next == NULL ) - return( POLARSSL_ERR_ASN1_MALLOC_FAILED ); - -+ memset( cur->next, 0, sizeof( asn1_sequence ) ); -+ - cur = cur->next; - } - } Property changes on: head/security/polarssl13/files/patch-library-asn1parse_c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/polarssl13/files/patch-include_polarssl_config.h =================================================================== --- head/security/polarssl13/files/patch-include_polarssl_config.h (nonexistent) +++ head/security/polarssl13/files/patch-include_polarssl_config.h (revision 381316) @@ -0,0 +1,9 @@ +--- include/polarssl/config.h.bak 2014-04-11 22:33:59.000000000 +0900 ++++ include/polarssl/config.h 2014-04-30 17:36:41.000000000 +0900 +@@ -2383,4 +2383,6 @@ + #error "POLARSSL_X509_CSR_WRITE_C defined, but not all prerequisites" + #endif + ++#define SHOW_PROTOTYPE_CHANGE_WARNINGS ++ + #endif /* config.h */ Property changes on: head/security/polarssl13/files/patch-include_polarssl_config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/polarssl13/files/patch-library-Makefile =================================================================== --- head/security/polarssl13/files/patch-library-Makefile (revision 381315) +++ head/security/polarssl13/files/patch-library-Makefile (revision 381316) @@ -1,25 +1,24 @@ ---- library/Makefile.old 2014-11-28 16:02:22.000000000 +0000 -+++ library/Makefile 2014-11-28 16:03:01.000000000 +0000 +--- library/Makefile.orig 2015-02-11 01:00:42.000000000 +0900 ++++ library/Makefile 2015-02-18 12:47:25.000000000 +0900 @@ -18,9 +18,7 @@ # CFLAGS += -D_BSD_EXTENSION # To compile as a shared library: -ifdef SHARED CFLAGS += -fPIC -endif - SONAME=libpolarssl.so.7 + SONAME=libmbedtls.so.8 @@ -65,11 +63,7 @@ .SILENT: -ifndef SHARED -all: static -else --all: shared + all: shared static -endif -+all: shared static static: libpolarssl.a Index: head/security/polarssl13/pkg-plist =================================================================== --- head/security/polarssl13/pkg-plist (revision 381315) +++ head/security/polarssl13/pkg-plist (revision 381316) @@ -1,90 +1,92 @@ bin/polarssl_aescrypt2 bin/polarssl_benchmark bin/polarssl_dh_client bin/polarssl_dh_genprime bin/polarssl_dh_server bin/polarssl_hello bin/polarssl_md5sum bin/polarssl_mpi_demo bin/polarssl_rsa_genkey bin/polarssl_rsa_sign bin/polarssl_rsa_verify 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_server bin/polarssl_ssl_test -include/polarssl/aesni.h -include/polarssl/ccm.h -include/polarssl/check_config.h -include/polarssl/compat-1.2.h -include/polarssl/ecdh.h -include/polarssl/ecdsa.h -include/polarssl/ecp.h -include/polarssl/hmac_drbg.h -include/polarssl/memory.h -include/polarssl/memory_buffer_alloc.h -include/polarssl/oid.h -include/polarssl/pk.h -include/polarssl/pk_wrap.h -include/polarssl/platform.h -include/polarssl/ripemd160.h -include/polarssl/sha256.h -include/polarssl/sha512.h -include/polarssl/ssl_ciphersuites.h -include/polarssl/threading.h -include/polarssl/x509_crl.h -include/polarssl/x509_crt.h -include/polarssl/x509_csr.h -lib/libpolarssl.so.7 include/polarssl/aes.h +include/polarssl/aesni.h include/polarssl/arc4.h include/polarssl/asn1.h include/polarssl/asn1write.h include/polarssl/base64.h include/polarssl/bignum.h include/polarssl/blowfish.h include/polarssl/bn_mul.h include/polarssl/camellia.h +include/polarssl/ccm.h include/polarssl/certs.h +include/polarssl/check_config.h include/polarssl/cipher.h include/polarssl/cipher_wrap.h +include/polarssl/compat-1.2.h include/polarssl/config.h include/polarssl/ctr_drbg.h include/polarssl/debug.h include/polarssl/des.h include/polarssl/dhm.h +include/polarssl/ecdh.h +include/polarssl/ecdsa.h +include/polarssl/ecp.h include/polarssl/entropy.h include/polarssl/entropy_poll.h include/polarssl/error.h include/polarssl/gcm.h include/polarssl/havege.h +include/polarssl/hmac_drbg.h include/polarssl/md.h include/polarssl/md2.h include/polarssl/md4.h include/polarssl/md5.h include/polarssl/md_wrap.h +include/polarssl/memory.h +include/polarssl/memory_buffer_alloc.h include/polarssl/net.h +include/polarssl/oid.h include/polarssl/openssl.h include/polarssl/padlock.h -include/polarssl/pem.h include/polarssl/pbkdf2.h +include/polarssl/pem.h +include/polarssl/pk.h +include/polarssl/pk_wrap.h include/polarssl/pkcs11.h include/polarssl/pkcs12.h include/polarssl/pkcs5.h +include/polarssl/platform.h +include/polarssl/ripemd160.h include/polarssl/rsa.h include/polarssl/sha1.h +include/polarssl/sha256.h +include/polarssl/sha512.h include/polarssl/ssl.h include/polarssl/ssl_cache.h +include/polarssl/ssl_ciphersuites.h +include/polarssl/threading.h include/polarssl/timing.h include/polarssl/version.h include/polarssl/x509.h +include/polarssl/x509_crl.h +include/polarssl/x509_crt.h +include/polarssl/x509_csr.h include/polarssl/xtea.h 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