diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index 21495f6a8c6e..0fbc68ed3a65 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libressl -PORTVERSION= 2.4.2 +PORTVERSION= 2.5.0 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL PKGNAMESUFFIX= -devel @@ -11,14 +11,14 @@ MAINTAINER= brnrd@FreeBSD.org COMMENT= Free version of the SSL/TLS protocol forked from OpenSSL LICENSE= BSD4CLAUSE -#LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/COPYING CPE_VENDOR= openbsd OPTIONS_DEFINE= MAN3 NC OPTIONS_DEFAULT= MAN3 NC MAN3_DESC= Install API manpages (section 3) -NC_DESC= Build nc libtls demo application +NC_DESC= Install TLS-enabled netcat CONFLICTS?= libressl-[0-9]* \ openssl-[0-9]* \ @@ -28,6 +28,7 @@ GNU_CONFIGURE= yes USES= cpe libtool pathfix pkgconfig USE_LDCONFIG= yes OPTIONS_SUB= yes +CFLAGS+= -fpic -DPIC INSTALL_TARGET= install-strip TEST_TARGET= check @@ -36,11 +37,11 @@ post-stage-NC-on: ${INSTALL_PROGRAM} ${WRKSRC}/apps/nc/.libs/nc ${STAGEDIR}/${PREFIX}/bin/nc ${INSTALL_MAN} ${WRKSRC}/apps/nc/nc.1 ${STAGEDIR}/${PREFIX}/man/man1/nc.1 +post-stage: + ${RM} -rf ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem + post-install-MAN3-off: ${RM} -rf ${STAGEDIR}/${PREFIX}/man/man3 ${REINPLACE_CMD} -e '/^man\/man3/d' ${TMPPLIST} -post-install: - ${RM} -rf ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem - .include diff --git a/security/libressl-devel/distinfo b/security/libressl-devel/distinfo index ce36b22cc659..0331f9fc1804 100644 --- a/security/libressl-devel/distinfo +++ b/security/libressl-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470249624 -SHA256 (libressl-2.4.2.tar.gz) = 5f87d778e5d62822d60e38fa9621c1c5648fc559d198ba314bd9d89cbf67d9e3 -SIZE (libressl-2.4.2.tar.gz) = 3021644 +TIMESTAMP = 1475011024 +SHA256 (libressl-2.5.0.tar.gz) = 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae +SIZE (libressl-2.5.0.tar.gz) = 3012855 diff --git a/security/libressl-devel/pkg-plist b/security/libressl-devel/pkg-plist index fa6697415566..184bf3e40370 100644 --- a/security/libressl-devel/pkg-plist +++ b/security/libressl-devel/pkg-plist @@ -14,7 +14,6 @@ include/openssl/camellia.h include/openssl/cast.h include/openssl/chacha.h include/openssl/cmac.h -include/openssl/cms.h include/openssl/comp.h include/openssl/conf.h include/openssl/conf_api.h @@ -76,15 +75,15 @@ include/tls.h lib/libcrypto.a lib/libcrypto.so lib/libcrypto.so.38 -lib/libcrypto.so.38.0.0 +lib/libcrypto.so.38.0.1 lib/libssl.a lib/libssl.so lib/libssl.so.39 -lib/libssl.so.39.0.0 +lib/libssl.so.39.0.1 lib/libtls.a lib/libtls.so lib/libtls.so.11 -lib/libtls.so.11.0.0 +lib/libtls.so.11.0.4 libdata/pkgconfig/libcrypto.pc libdata/pkgconfig/libssl.pc libdata/pkgconfig/libtls.pc @@ -174,7 +173,6 @@ man/man3/BIO_int_ctrl.3.gz man/man3/BIO_make_bio_pair.3.gz man/man3/BIO_method_type.3.gz man/man3/BIO_new.3.gz -man/man3/BIO_new_CMS.3.gz man/man3/BIO_new_accept.3.gz man/man3/BIO_new_bio_pair.3.gz man/man3/BIO_new_buffer_ssl_connect.3.gz @@ -357,22 +355,6 @@ man/man3/BUF_MEM_free.3.gz man/man3/BUF_MEM_grow.3.gz man/man3/BUF_MEM_new.3.gz man/man3/BUF_strdup.3.gz -man/man3/CMS_add0_cert.3.gz -man/man3/CMS_add1_recipient_cert.3.gz -man/man3/CMS_add1_signer.3.gz -man/man3/CMS_compress.3.gz -man/man3/CMS_decrypt.3.gz -man/man3/CMS_encrypt.3.gz -man/man3/CMS_final.3.gz -man/man3/CMS_get0_RecipientInfos.3.gz -man/man3/CMS_get0_SignerInfos.3.gz -man/man3/CMS_get0_type.3.gz -man/man3/CMS_get1_ReceiptRequest.3.gz -man/man3/CMS_sign.3.gz -man/man3/CMS_sign_receipt.3.gz -man/man3/CMS_uncompress.3.gz -man/man3/CMS_verify.3.gz -man/man3/CMS_verify_receipt.3.gz man/man3/CONF_modules_finish.3.gz man/man3/CONF_modules_free.3.gz man/man3/CONF_modules_load.3.gz @@ -953,7 +935,6 @@ man/man3/PEM_write_X509_AUX.3.gz man/man3/PEM_write_X509_CRL.3.gz man/man3/PEM_write_X509_REQ.3.gz man/man3/PEM_write_X509_REQ_NEW.3.gz -man/man3/PEM_write_bio_CMS_stream.3.gz man/man3/PEM_write_bio_DHparams.3.gz man/man3/PEM_write_bio_DSAPrivateKey.3.gz man/man3/PEM_write_bio_DSA_PUBKEY.3.gz @@ -1047,9 +1028,7 @@ man/man3/SHA1.3.gz man/man3/SHA1_Final.3.gz man/man3/SHA1_Init.3.gz man/man3/SHA1_Update.3.gz -man/man3/SMIME_read_CMS.3.gz man/man3/SMIME_read_PKCS7.3.gz -man/man3/SMIME_write_CMS.3.gz man/man3/SMIME_write_PKCS7.3.gz man/man3/SSL_CIPHER_description.3.gz man/man3/SSL_CIPHER_get_bits.3.gz @@ -1454,7 +1433,6 @@ man/man3/engine.3.gz man/man3/evp.3.gz man/man3/get_session_cb.3.gz man/man3/i2d_ASN1_OBJECT.3.gz -man/man3/i2d_CMS_bio_stream.3.gz man/man3/i2d_DHparams.3.gz man/man3/i2d_DSAPrivateKey.3.gz man/man3/i2d_DSAPublicKey.3.gz