Date: Sun, 19 Jul 2020 08:10:52 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542543 - in head/security/openssl-devel: . files Message-ID: <202007190810.06J8AqXg087932@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Jul 19 08:10:52 2020 New Revision: 542543 URL: https://svnweb.freebsd.org/changeset/ports/542543 Log: security/openssl-devel: Update to 3.0.0-alpha5 * target now determined in util/perl/OpenSSL/config.pm * Stop modifying Makefile twice Deleted: head/security/openssl-devel/files/patch-config Modified: head/security/openssl-devel/Makefile head/security/openssl-devel/distinfo head/security/openssl-devel/pkg-plist Modified: head/security/openssl-devel/Makefile ============================================================================== --- head/security/openssl-devel/Makefile Sun Jul 19 04:17:08 2020 (r542542) +++ head/security/openssl-devel/Makefile Sun Jul 19 08:10:52 2020 (r542543) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openssl -DISTVERSION= 3.0.0-alpha4 +DISTVERSION= 3.0.0-alpha5 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ @@ -11,8 +11,8 @@ PKGNAMESUFFIX= -devel MAINTAINER= brnrd@FreeBSD.org COMMENT= TLSv1.3 capable SSL and crypto library -LICENSE= OpenSSL -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt CONFLICTS_INSTALL= libressl-[0-9]* \ libressl-devel-[0-9]* \ @@ -116,11 +116,18 @@ TLS1_IMPLIES= TLS1_1 TLS1_1_IMPLIES= TLS1_2 EC_CONFIGURE_ON= enable-ec_nistp_64_gcc_128 +FIPS_VARS= shlibs+=lib/ossl-modules/fips.so I386_CONFIGURE_ON= 386 +LEGACY_VARS= shlibs+=lib/ossl-modules/legacy.so MAN3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-util_find-doc-nits SHARED_MAKE_ENV= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_PLIST_SUB= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_USE= ldconfig=yes +SHARED_VARS= shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \ + lib/libssl.so.${OPENSSL_SHLIBVER} \ + lib/engines-${OPENSSL_SHLIBVER}/capi.so \ + lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \ + lib/engines-${OPENSSL_SHLIBVER}/padlock.so" SSL3_CONFIGURE_ON+= enable-ssl3-method ZLIB_CONFIGURE_ON= zlib-dynamic @@ -139,19 +146,13 @@ BROKEN_sparc64= option ASM generates illegal instructi .endif post-patch: - ${REINPLACE_CMD} \ - -e 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \ - -e 's| install_html_docs$$||' \ - -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ + ${REINPLACE_CMD} -Ee 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \ + -e 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \ ${WRKSRC}/Configurations/unix-Makefile.tmpl - ${REINPLACE_CMD} 's|\^GNU ld|GNU|' ${WRKSRC}/Configurations/shared-info.pl ${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \ - ${WRKSRC}/VERSION + ${WRKSRC}/VERSION.dat post-configure: - ${REINPLACE_CMD} \ - -e 's|^build_docs:.*|build_docs: build_man_docs|' \ - ${WRKSRC}/Makefile ( cd ${WRKSRC} ; ${PERL} configdata.pm --dump ) post-configure-MAN3-off: @@ -161,13 +162,8 @@ post-configure-MAN3-off: ${WRKSRC}/Makefile post-install-SHARED-on: -#.for i in libcrypto libssl -# ${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib -# ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$i.so.${OPENSSL_SHLIBVER} -# ${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so -#.endfor -.for i in capi devcrypto padlock - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines-12/${i}.so +.for i in ${SHLIBS} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i .endfor post-install-SHARED-off: Modified: head/security/openssl-devel/distinfo ============================================================================== --- head/security/openssl-devel/distinfo Sun Jul 19 04:17:08 2020 (r542542) +++ head/security/openssl-devel/distinfo Sun Jul 19 08:10:52 2020 (r542543) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593160320 -SHA256 (openssl-3.0.0-alpha4.tar.gz) = d930b650e0899f5baca8b80c50e7401620c129fef6c50198400999776a39bd37 -SIZE (openssl-3.0.0-alpha4.tar.gz) = 13884897 +TIMESTAMP = 1595000257 +SHA256 (openssl-3.0.0-alpha5.tar.gz) = 09ad89af04cbf36dbbce1fc7063e18fcc333fcaaf3eccecf22c4a99bac83e139 +SIZE (openssl-3.0.0-alpha5.tar.gz) = 13919931 Modified: head/security/openssl-devel/pkg-plist ============================================================================== --- head/security/openssl-devel/pkg-plist Sun Jul 19 04:17:08 2020 (r542542) +++ head/security/openssl-devel/pkg-plist Sun Jul 19 08:10:52 2020 (r542543) @@ -56,6 +56,7 @@ include/openssl/ess.h include/openssl/esserr.h include/openssl/evp.h include/openssl/evperr.h +include/openssl/fipskey.h include/openssl/fips_names.h include/openssl/hmac.h include/openssl/http.h @@ -64,7 +65,6 @@ include/openssl/idea.h include/openssl/kdf.h include/openssl/kdferr.h include/openssl/lhash.h -include/openssl/mac.h include/openssl/macros.h include/openssl/md2.h include/openssl/md4.h @@ -76,8 +76,8 @@ include/openssl/objects.h include/openssl/objectserr.h include/openssl/ocsp.h include/openssl/ocsperr.h -include/openssl/%%OPENSSLDIR%%conf.h -include/openssl/%%OPENSSLDIR%%v.h +include/openssl/opensslconf.h +include/openssl/opensslv.h include/openssl/ossl_typ.h include/openssl/param_build.h include/openssl/params.h @@ -129,9 +129,9 @@ include/openssl/x509err.h include/openssl/x509v3.h include/openssl/x509v3err.h lib/libcrypto.a -%%SHARED%%lib/engines-12/capi.so -%%SHARED%%lib/engines-12/devcrypto.so -%%SHARED%%lib/engines-12/padlock.so +%%SHARED%%lib/engines-%%SHLIBVER%%/capi.so +%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so +%%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so %%SHARED%%lib/libcrypto.so %%SHARED%%lib/libcrypto.so.%%SHLIBVER%% lib/libssl.a @@ -503,7 +503,7 @@ man/man1/tsget.1.gz %%MAN3%%man/man3/PKCS7_verify.3.gz %%MAN3%%man/man3/PKCS8_pkey_add1_attr.3.gz %%MAN3%%man/man3/RAND_DRBG_generate.3.gz -%%MAN3%%man/man3/RAND_DRBG_get0_master.3.gz +%%MAN3%%man/man3/RAND_DRBG_get0_public.3.gz %%MAN3%%man/man3/RAND_DRBG_new.3.gz %%MAN3%%man/man3/RAND_DRBG_reseed.3.gz %%MAN3%%man/man3/RAND_DRBG_set_callbacks.3.gz @@ -724,6 +724,7 @@ man/man1/tsget.1.gz %%MAN3%%man/man3/X509_load_http.3.gz %%MAN3%%man/man3/X509_new.3.gz %%MAN3%%man/man3/X509_sign.3.gz +%%MAN3%%man/man3/X509_verify.3.gz %%MAN3%%man/man3/X509_verify_cert.3.gz %%MAN3%%man/man3/X509v3_cache_extensions.3.gz %%MAN3%%man/man3/X509v3_get_ext_by_NID.3.gz @@ -826,7 +827,8 @@ man/man5/x509v3_config.5.gz %%MAN3%%man/man7/ssl.7.gz %%MAN3%%man/man7/x509.7.gz %%OPENSSLDIR%%/misc/CA.pl -%%OPENSSLDIR%%/misc/tsget.pl +@comment %%OPENSSLDIR%%/misc/tsget.pl +%%OPENSSLDIR%%/misc/tsget @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf @dir %%OPENSSLDIR%%/private
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007190810.06J8AqXg087932>