Index: branches/2017Q1/security/linux-c7-openssl/Makefile =================================================================== --- branches/2017Q1/security/linux-c7-openssl/Makefile (revision 434708) +++ branches/2017Q1/security/linux-c7-openssl/Makefile (revision 434709) @@ -1,27 +1,28 @@ # Created by: Piotr Kubaj # $FreeBSD$ PORTNAME= openssl PORTVERSION= 1.0.1e +PORTREVISION= 3 CATEGORIES= security linux -BIN_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= CENTOS_LINUX/centos/7.3.1611/updates/x86_64/Packages/ \ + CENTOS_LINUX/centos/7.3.1611/updates/Source/SPackages/ LIB_DISTFILES= ${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX} SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE MAINTAINER= emulation@FreeBSD.org COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER}) LICENSE= OpenSSL -LICENSE_FILE= ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/LICENSE +LICENSE_FILE= ${WRKSRC}/usr/share/doc/${PORTNAME}-libs-${PORTVERSION}/LICENSE CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]* -RPMVERSION= 51.el7_2.7 +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr +DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}-libs-${PORTVERSION} +RPMVERSION= 60.el7_3.1 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes - -PLIST_SUB+= PORTVERSION="${PORTVERSION}" -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr .include Index: branches/2017Q1/security/linux-c7-openssl/distinfo.i386 =================================================================== --- branches/2017Q1/security/linux-c7-openssl/distinfo.i386 (revision 434708) +++ branches/2017Q1/security/linux-c7-openssl/distinfo.i386 (revision 434709) @@ -1,7 +1,5 @@ -TIMESTAMP = 1475154570 -SHA256 (rpm/centos/7.2.1511/i386/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = acae0134d0426a80dca9548b918dd1e680966b18bfcadf39a77e74588584b79b -SIZE (rpm/centos/7.2.1511/i386/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = 962504 -SHA256 (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.i686.rpm) = 592cfbf57d68a62ee27ff37e1b27da2e97ecb7a83a1f3b8d547ab4a1c4f206b4 -SIZE (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.i686.rpm) = 721716 -SHA256 (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.src.rpm) = d360d24d02c44f4e6f11d25ba7c0f7f8085c7dd2f1e13e5ec6b9b76014b879bd -SIZE (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.src.rpm) = 3323775 +TIMESTAMP = 1487705996 +SHA256 (rpm/centos/7.2.1511/i386/openssl-libs-1.0.1e-60.el7_3.1.i686.rpm) = 75afa599c87b32683162c976a3f7245767b1612b6fc1c1f935c41bcaaab71b8d +SIZE (rpm/centos/7.2.1511/i386/openssl-libs-1.0.1e-60.el7_3.1.i686.rpm) = 967736 +SHA256 (rpm/centos/7.2.1511/i386/openssl-1.0.1e-60.el7_3.1.src.rpm) = 976eaf61e1cbe2ac4bf32a440a5697dc19be59fd1b275bb314fda8888c3340a4 +SIZE (rpm/centos/7.2.1511/i386/openssl-1.0.1e-60.el7_3.1.src.rpm) = 3333123 Index: branches/2017Q1/security/linux-c7-openssl/distinfo.x86_64 =================================================================== --- branches/2017Q1/security/linux-c7-openssl/distinfo.x86_64 (revision 434708) +++ branches/2017Q1/security/linux-c7-openssl/distinfo.x86_64 (revision 434709) @@ -1,9 +1,7 @@ -TIMESTAMP = 1475154589 -SHA256 (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = acae0134d0426a80dca9548b918dd1e680966b18bfcadf39a77e74588584b79b -SIZE (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = 962504 -SHA256 (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.x86_64.rpm) = 9f8480889c72db6e05d6b87def4799659d4abeb93fa0c9436e69b9fafcce3736 -SIZE (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.x86_64.rpm) = 975936 -SHA256 (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.x86_64.rpm) = a383f9d15fbc2c740a773ffafdddb325b6db18a8c59732b347d694f5f89e2dda -SIZE (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.x86_64.rpm) = 729500 -SHA256 (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.src.rpm) = d360d24d02c44f4e6f11d25ba7c0f7f8085c7dd2f1e13e5ec6b9b76014b879bd -SIZE (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.src.rpm) = 3323775 +TIMESTAMP = 1487705996 +SHA256 (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-60.el7_3.1.i686.rpm) = 75afa599c87b32683162c976a3f7245767b1612b6fc1c1f935c41bcaaab71b8d +SIZE (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-60.el7_3.1.i686.rpm) = 967736 +SHA256 (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-60.el7_3.1.x86_64.rpm) = d3354df1c13897870b20407aed7b3eb1ee581b0e1f4af4bcd920fa57914202ca +SIZE (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-60.el7_3.1.x86_64.rpm) = 981920 +SHA256 (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-60.el7_3.1.src.rpm) = 976eaf61e1cbe2ac4bf32a440a5697dc19be59fd1b275bb314fda8888c3340a4 +SIZE (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-60.el7_3.1.src.rpm) = 3333123 Index: branches/2017Q1/security/linux-c7-openssl/pkg-plist.i386 =================================================================== --- branches/2017Q1/security/linux-c7-openssl/pkg-plist.i386 (revision 434708) +++ branches/2017Q1/security/linux-c7-openssl/pkg-plist.i386 (revision 434709) @@ -1,101 +1,24 @@ -etc/pki/tls/certs/Makefile -etc/pki/tls/certs/make-dummy-cert -etc/pki/tls/certs/renew-dummy-cert -etc/pki/tls/misc/CA -etc/pki/tls/misc/c_hash -etc/pki/tls/misc/c_info -etc/pki/tls/misc/c_issuer -etc/pki/tls/misc/c_name etc/pki/tls/openssl.cnf -usr/bin/openssl -usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac +usr/lib/.libcrypto.so.1.0.1e.hmac usr/lib/.libcrypto.so.10.hmac -usr/lib/.libssl.so.%%PORTVERSION%%.hmac +usr/lib/.libssl.so.1.0.1e.hmac usr/lib/.libssl.so.10.hmac -usr/lib/libcrypto.so.%%PORTVERSION%% +usr/lib/libcrypto.so.1.0.1e usr/lib/libcrypto.so.10 -usr/lib/libssl.so.%%PORTVERSION%% +usr/lib/libssl.so.1.0.1e usr/lib/libssl.so.10 usr/lib/openssl/engines/lib4758cca.so usr/lib/openssl/engines/libaep.so usr/lib/openssl/engines/libatalla.so usr/lib/openssl/engines/libcapi.so usr/lib/openssl/engines/libchil.so usr/lib/openssl/engines/libcswift.so usr/lib/openssl/engines/libgmp.so usr/lib/openssl/engines/libnuron.so usr/lib/openssl/engines/libpadlock.so usr/lib/openssl/engines/libsureware.so usr/lib/openssl/engines/libubsec.so -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.FIPS -%%PORTDOCS%%%%DOCSDIR%%/c-indentation.el -%%PORTDOCS%%%%DOCSDIR%%/openssl.txt -%%PORTDOCS%%%%DOCSDIR%%/openssl_button.gif -%%PORTDOCS%%%%DOCSDIR%%/openssl_button.html -%%PORTDOCS%%%%DOCSDIR%%/ssleay.txt -%%PORTDOCS%%usr/share/doc/openssl-libs-%%PORTVERSION%%/LICENSE -usr/share/man/man1/asn1parse.1ssl.gz -usr/share/man/man1/ca.1ssl.gz -usr/share/man/man1/ciphers.1ssl.gz -usr/share/man/man1/cms.1ssl.gz -usr/share/man/man1/crl.1ssl.gz -usr/share/man/man1/crl2pkcs7.1ssl.gz -usr/share/man/man1/dgst.1ssl.gz -usr/share/man/man1/dhparam.1ssl.gz -usr/share/man/man1/dsa.1ssl.gz -usr/share/man/man1/dsaparam.1ssl.gz -usr/share/man/man1/ec.1ssl.gz -usr/share/man/man1/ecparam.1ssl.gz -usr/share/man/man1/enc.1ssl.gz -usr/share/man/man1/errstr.1ssl.gz -usr/share/man/man1/gendsa.1ssl.gz -usr/share/man/man1/genpkey.1ssl.gz -usr/share/man/man1/genrsa.1ssl.gz -usr/share/man/man1/md2.1ssl.gz -usr/share/man/man1/md4.1ssl.gz -usr/share/man/man1/md5.1ssl.gz -usr/share/man/man1/mdc2.1ssl.gz -usr/share/man/man1/nseq.1ssl.gz -usr/share/man/man1/ocsp.1ssl.gz -usr/share/man/man1/openssl.1ssl.gz -usr/share/man/man1/pkcs12.1ssl.gz -usr/share/man/man1/pkcs7.1ssl.gz -usr/share/man/man1/pkcs8.1ssl.gz -usr/share/man/man1/pkey.1ssl.gz -usr/share/man/man1/pkeyparam.1ssl.gz -usr/share/man/man1/pkeyutl.1ssl.gz -usr/share/man/man1/req.1ssl.gz -usr/share/man/man1/ripemd160.1ssl.gz -usr/share/man/man1/rsa.1ssl.gz -usr/share/man/man1/rsautl.1ssl.gz -usr/share/man/man1/s_client.1ssl.gz -usr/share/man/man1/s_server.1ssl.gz -usr/share/man/man1/s_time.1ssl.gz -usr/share/man/man1/sess_id.1ssl.gz -usr/share/man/man1/sha.1ssl.gz -usr/share/man/man1/sha1.1ssl.gz -usr/share/man/man1/smime.1ssl.gz -usr/share/man/man1/speed.1ssl.gz -usr/share/man/man1/spkac.1ssl.gz -usr/share/man/man1/sslpasswd.1ssl.gz -usr/share/man/man1/sslrand.1ssl.gz -usr/share/man/man1/ts.1ssl.gz -usr/share/man/man1/tsget.1ssl.gz -usr/share/man/man1/verify.1ssl.gz -usr/share/man/man1/version.1ssl.gz -usr/share/man/man1/x509.1ssl.gz -usr/share/man/man5/config.5ssl.gz -usr/share/man/man5/openssl.cnf.5ssl.gz -usr/share/man/man5/x509v3_config.5ssl.gz -usr/share/man/man7/des_modes.7ssl.gz -@dir etc/pki/CA/certs -@dir etc/pki/CA/crl -@dir etc/pki/CA/newcerts -@dir etc/pki/CA/private +@dir etc/pki/tls/certs +@dir etc/pki/tls/misc @dir etc/pki/tls/private Index: branches/2017Q1/security/linux-c7-openssl/pkg-plist.x86_64 =================================================================== --- branches/2017Q1/security/linux-c7-openssl/pkg-plist.x86_64 (revision 434708) +++ branches/2017Q1/security/linux-c7-openssl/pkg-plist.x86_64 (revision 434709) @@ -1,120 +1,43 @@ -etc/pki/tls/certs/Makefile -etc/pki/tls/certs/make-dummy-cert -etc/pki/tls/certs/renew-dummy-cert -etc/pki/tls/misc/CA -etc/pki/tls/misc/c_hash -etc/pki/tls/misc/c_info -etc/pki/tls/misc/c_issuer -etc/pki/tls/misc/c_name etc/pki/tls/openssl.cnf -usr/bin/openssl -usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac +usr/lib/.libcrypto.so.1.0.1e.hmac usr/lib/.libcrypto.so.10.hmac -usr/lib/.libssl.so.%%PORTVERSION%%.hmac +usr/lib/.libssl.so.1.0.1e.hmac usr/lib/.libssl.so.10.hmac -usr/lib/libcrypto.so.%%PORTVERSION%% +usr/lib/libcrypto.so.1.0.1e usr/lib/libcrypto.so.10 -usr/lib/libssl.so.%%PORTVERSION%% +usr/lib/libssl.so.1.0.1e usr/lib/libssl.so.10 usr/lib/openssl/engines/lib4758cca.so usr/lib/openssl/engines/libaep.so usr/lib/openssl/engines/libatalla.so usr/lib/openssl/engines/libcapi.so usr/lib/openssl/engines/libchil.so usr/lib/openssl/engines/libcswift.so usr/lib/openssl/engines/libgmp.so usr/lib/openssl/engines/libnuron.so usr/lib/openssl/engines/libpadlock.so usr/lib/openssl/engines/libsureware.so usr/lib/openssl/engines/libubsec.so -usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac +usr/lib64/.libcrypto.so.1.0.1e.hmac usr/lib64/.libcrypto.so.10.hmac -usr/lib64/.libssl.so.%%PORTVERSION%%.hmac +usr/lib64/.libssl.so.1.0.1e.hmac usr/lib64/.libssl.so.10.hmac -usr/lib64/libcrypto.so.%%PORTVERSION%% +usr/lib64/libcrypto.so.1.0.1e usr/lib64/libcrypto.so.10 -usr/lib64/libssl.so.%%PORTVERSION%% +usr/lib64/libssl.so.1.0.1e usr/lib64/libssl.so.10 usr/lib64/openssl/engines/lib4758cca.so usr/lib64/openssl/engines/libaep.so usr/lib64/openssl/engines/libatalla.so usr/lib64/openssl/engines/libcapi.so usr/lib64/openssl/engines/libchil.so usr/lib64/openssl/engines/libcswift.so usr/lib64/openssl/engines/libgmp.so usr/lib64/openssl/engines/libnuron.so usr/lib64/openssl/engines/libpadlock.so usr/lib64/openssl/engines/libsureware.so usr/lib64/openssl/engines/libubsec.so -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.FIPS -%%PORTDOCS%%%%DOCSDIR%%/c-indentation.el -%%PORTDOCS%%%%DOCSDIR%%/openssl.txt -%%PORTDOCS%%%%DOCSDIR%%/openssl_button.gif -%%PORTDOCS%%%%DOCSDIR%%/openssl_button.html -%%PORTDOCS%%%%DOCSDIR%%/ssleay.txt -%%PORTDOCS%%usr/share/doc/openssl-libs-%%PORTVERSION%%/LICENSE -usr/share/man/man1/asn1parse.1ssl.gz -usr/share/man/man1/ca.1ssl.gz -usr/share/man/man1/ciphers.1ssl.gz -usr/share/man/man1/cms.1ssl.gz -usr/share/man/man1/crl.1ssl.gz -usr/share/man/man1/crl2pkcs7.1ssl.gz -usr/share/man/man1/dgst.1ssl.gz -usr/share/man/man1/dhparam.1ssl.gz -usr/share/man/man1/dsa.1ssl.gz -usr/share/man/man1/dsaparam.1ssl.gz -usr/share/man/man1/ec.1ssl.gz -usr/share/man/man1/ecparam.1ssl.gz -usr/share/man/man1/enc.1ssl.gz -usr/share/man/man1/errstr.1ssl.gz -usr/share/man/man1/gendsa.1ssl.gz -usr/share/man/man1/genpkey.1ssl.gz -usr/share/man/man1/genrsa.1ssl.gz -usr/share/man/man1/md2.1ssl.gz -usr/share/man/man1/md4.1ssl.gz -usr/share/man/man1/md5.1ssl.gz -usr/share/man/man1/mdc2.1ssl.gz -usr/share/man/man1/nseq.1ssl.gz -usr/share/man/man1/ocsp.1ssl.gz -usr/share/man/man1/openssl.1ssl.gz -usr/share/man/man1/pkcs12.1ssl.gz -usr/share/man/man1/pkcs7.1ssl.gz -usr/share/man/man1/pkcs8.1ssl.gz -usr/share/man/man1/pkey.1ssl.gz -usr/share/man/man1/pkeyparam.1ssl.gz -usr/share/man/man1/pkeyutl.1ssl.gz -usr/share/man/man1/req.1ssl.gz -usr/share/man/man1/ripemd160.1ssl.gz -usr/share/man/man1/rsa.1ssl.gz -usr/share/man/man1/rsautl.1ssl.gz -usr/share/man/man1/s_client.1ssl.gz -usr/share/man/man1/s_server.1ssl.gz -usr/share/man/man1/s_time.1ssl.gz -usr/share/man/man1/sess_id.1ssl.gz -usr/share/man/man1/sha.1ssl.gz -usr/share/man/man1/sha1.1ssl.gz -usr/share/man/man1/smime.1ssl.gz -usr/share/man/man1/speed.1ssl.gz -usr/share/man/man1/spkac.1ssl.gz -usr/share/man/man1/sslpasswd.1ssl.gz -usr/share/man/man1/sslrand.1ssl.gz -usr/share/man/man1/ts.1ssl.gz -usr/share/man/man1/tsget.1ssl.gz -usr/share/man/man1/verify.1ssl.gz -usr/share/man/man1/version.1ssl.gz -usr/share/man/man1/x509.1ssl.gz -usr/share/man/man5/config.5ssl.gz -usr/share/man/man5/openssl.cnf.5ssl.gz -usr/share/man/man5/x509v3_config.5ssl.gz -usr/share/man/man7/des_modes.7ssl.gz -@dir etc/pki/CA/certs -@dir etc/pki/CA/crl -@dir etc/pki/CA/newcerts -@dir etc/pki/CA/private +@dir etc/pki/tls/certs +@dir etc/pki/tls/misc @dir etc/pki/tls/private Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 434708) +++ branches/2017Q1 (revision 434709) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r434593