diff --git a/devel/apr1/files/patch-bdb18 b/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 similarity index 100% rename from devel/apr1/files/patch-bdb18 rename to devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index ef3c12ab5a6e..a5291efc1863 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -1,74 +1,74 @@ PORTNAME= libressl -PORTVERSION= 3.9.2 +PORTVERSION= 4.0.0 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL PKGNAMESUFFIX= -devel MAINTAINER= brnrd@FreeBSD.org COMMENT= Free version of the SSL/TLS protocol forked from OpenSSL WWW= https://www.libressl.org/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= default libtls FLAVOR?= ${FLAVORS:[1]} libtls_DESCR= pkg-descr-libtls libtls_PKGNAMESUFFIX= -devel-libtls libtls_PLIST= pkg-plist-libtls CPE_VENDOR= openbsd OPTIONS_DEFINE= LIBTLS MAN3 NC OPTIONS_DEFAULT= MAN3 NC LIBTLS_DESC= Only install libtls (no libcrypto/libssl) MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat CONFLICTS_INSTALL= libressl \ libretls default_CONFLICTS_INSTALL= openssl openssl111 openssl3[12] openssl-quictls .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS .elif ${FLAVOR:U} == libtls OPTIONS_SLAVE= LIBTLS OPTIONS_EXCLUDE= MAN3 .endif LIBTLS_CONFIGURE_ENABLE= libtls-only NC_CONFIGURE_ENABLE= nc GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share USES= cpe libtool pathfix pkgconfig USE_LDCONFIG= yes OPTIONS_SUB= yes CFLAGS+= -fpic -DPIC -Wl,-rpath,${PREFIX}/lib -Wl,--as-needed LDFLAGS+= -pthread INSTALL_TARGET= install-strip TEST_TARGET= check -PLIST_SUB+= LIBCRYPTO_SHLIBMAJ=53 \ - LIBCRYPTO_SHLIBFULL=53.0.0 \ - LIBSSL_SHLIBMAJ=56 \ - LIBSSL_SHLIBFULL=56.0.0 \ - LIBTLS_SHLIBMAJ=29 \ - LIBTLS_SHLIBFULL=29.0.0 +PLIST_SUB+= LIBCRYPTO_SHLIBMAJ=55 \ + LIBCRYPTO_SHLIBFULL=55.0.0 \ + LIBSSL_SHLIBMAJ=58 \ + LIBSSL_SHLIBFULL=58.0.0 \ + LIBTLS_SHLIBMAJ=31 \ + LIBTLS_SHLIBFULL=31.0.0 post-patch-MAN3-off: ${REINPLACE_CMD} -e '/^install-man:/s/install-man3//' \ -e '/$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook/d' \ ${WRKSRC}/man/Makefile.in post-install: ${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem ${RMDIR} ${STAGEDIR}${PREFIX}/etc/ssl/certs ${LN} -s /etc/ssl/certs ${STAGEDIR}${PREFIX}/etc/ssl/certs post-stage-MAN3-on: (cd ${STAGEDIR}${PREFIX}; ${FIND} share/man/man3 -not -type d | \ ${SED} 's/$$/.gz/' >> ${TMPPLIST}) .include diff --git a/security/libressl-devel/distinfo b/security/libressl-devel/distinfo index 8ffa5f973c11..7212ef81f8ca 100644 --- a/security/libressl-devel/distinfo +++ b/security/libressl-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715594027 -SHA256 (libressl-3.9.2.tar.gz) = 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97 -SIZE (libressl-3.9.2.tar.gz) = 4353829 +TIMESTAMP = 1728973273 +SHA256 (libressl-4.0.0.tar.gz) = 4d841955f0acc3dfc71d0e3dd35f283af461222350e26843fea9731c0246a1e4 +SIZE (libressl-4.0.0.tar.gz) = 4259615 diff --git a/security/libressl-devel/pkg-plist b/security/libressl-devel/pkg-plist index e6953d72280e..c73e0cb9c35a 100644 --- a/security/libressl-devel/pkg-plist +++ b/security/libressl-devel/pkg-plist @@ -1,102 +1,96 @@ %%NC%%bin/nc bin/ocspcheck bin/openssl etc/ssl/certs etc/ssl/openssl.cnf etc/ssl/x509v3.cnf include/openssl/aes.h include/openssl/asn1.h include/openssl/asn1t.h include/openssl/bio.h include/openssl/blowfish.h include/openssl/bn.h include/openssl/buffer.h 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 include/openssl/crypto.h include/openssl/ct.h include/openssl/curve25519.h include/openssl/des.h include/openssl/dh.h include/openssl/dsa.h include/openssl/dtls1.h include/openssl/ec.h include/openssl/ecdh.h include/openssl/ecdsa.h include/openssl/engine.h include/openssl/err.h include/openssl/evp.h include/openssl/hkdf.h include/openssl/hmac.h include/openssl/idea.h include/openssl/kdf.h include/openssl/lhash.h include/openssl/md4.h include/openssl/md5.h include/openssl/modes.h include/openssl/obj_mac.h include/openssl/objects.h include/openssl/ocsp.h include/openssl/opensslconf.h include/openssl/opensslfeatures.h include/openssl/opensslv.h include/openssl/ossl_typ.h include/openssl/pem.h -include/openssl/pem2.h include/openssl/pkcs12.h include/openssl/pkcs7.h include/openssl/poly1305.h include/openssl/posix_time.h include/openssl/rand.h include/openssl/rc2.h include/openssl/rc4.h include/openssl/ripemd.h include/openssl/rsa.h include/openssl/safestack.h include/openssl/sha.h include/openssl/sm3.h include/openssl/sm4.h include/openssl/srtp.h include/openssl/ssl.h -include/openssl/ssl2.h -include/openssl/ssl23.h include/openssl/ssl3.h include/openssl/stack.h include/openssl/tls1.h include/openssl/ts.h include/openssl/txt_db.h include/openssl/ui.h -include/openssl/ui_compat.h -include/openssl/whrlpool.h include/openssl/x509.h include/openssl/x509_vfy.h include/openssl/x509v3.h include/tls.h lib/libcrypto.a lib/libcrypto.so lib/libcrypto.so.%%LIBCRYPTO_SHLIBMAJ%% lib/libcrypto.so.%%LIBCRYPTO_SHLIBFULL%% lib/libssl.a lib/libssl.so lib/libssl.so.%%LIBSSL_SHLIBMAJ%% lib/libssl.so.%%LIBSSL_SHLIBFULL%% lib/libtls.a lib/libtls.so lib/libtls.so.%%LIBTLS_SHLIBMAJ%% lib/libtls.so.%%LIBTLS_SHLIBFULL%% libdata/pkgconfig/libcrypto.pc libdata/pkgconfig/libssl.pc libdata/pkgconfig/libtls.pc libdata/pkgconfig/openssl.pc %%NC%%share/man/man1/nc.1.gz share/man/man1/openssl.1.gz share/man/man5/openssl.cnf.5.gz share/man/man5/x509v3.cnf.5.gz share/man/man8/ocspcheck.8.gz @dir include/openssl diff --git a/security/libressl-devel/version.mk b/security/libressl-devel/version.mk index d967dc772682..c2a37fc2b0bb 100644 --- a/security/libressl-devel/version.mk +++ b/security/libressl-devel/version.mk @@ -1 +1 @@ -OPENSSL_SHLIBVER?= 53 +OPENSSL_SHLIBVER?= 55