Date: Sun, 25 Aug 2019 15:37:09 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509800 - in head: Mk/Uses devel/linux-c7-qt emulators/linux-c7 emulators/linux_base-c7 print/linux-c7-cups-libs security security/linux-c7-libssh2 security/linux-c7-openssl x11-toolkit... Message-ID: <201908251537.x7PFb955085162@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Aug 25 15:37:08 2019 New Revision: 509800 URL: https://svnweb.freebsd.org/changeset/ports/509800 Log: Move security/linux-c7-openssl into emulators/linux_base-c7. It is needed by sha*sum from the coreutils package. Deleted: head/security/linux-c7-openssl/ Modified: head/Mk/Uses/linux.mk head/devel/linux-c7-qt/Makefile head/emulators/linux-c7/Makefile head/emulators/linux_base-c7/Makefile head/emulators/linux_base-c7/distinfo head/emulators/linux_base-c7/pkg-plist.amd64 head/emulators/linux_base-c7/pkg-plist.i386 head/print/linux-c7-cups-libs/Makefile head/security/Makefile head/security/linux-c7-libssh2/Makefile head/x11-toolkits/linux-c7-qt-x11/Makefile Modified: head/Mk/Uses/linux.mk ============================================================================== --- head/Mk/Uses/linux.mk Sun Aug 25 15:05:59 2019 (r509799) +++ head/Mk/Uses/linux.mk Sun Aug 25 15:37:08 2019 (r509800) @@ -125,7 +125,7 @@ linux_openmotif_DEP= linux-${linux_ARGS}-motif>0:x11- .if ${linux_ARGS} == c6 linux_openssl_DEP= linux-${linux_ARGS}-openssl>0:security/linux-${linux_ARGS}-openssl .else -linux_openssl_DEP= linux-${linux_ARGS}-openssl-libs>0:security/linux-${linux_ARGS}-openssl +linux_openssl_DEP= # empty .endif linux_p11-kit_DEP= linux-${linux_ARGS}-p11-kit>0:security/linux-${linux_ARGS}-p11-kit linux_pango_DEP= linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango Modified: head/devel/linux-c7-qt/Makefile ============================================================================== --- head/devel/linux-c7-qt/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/devel/linux-c7-qt/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -4,7 +4,7 @@ PORTNAME= qt PORTVERSION= 4.8.7 DISTVERSIONSUFFIX= -3.el7_6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel linux MAINTAINER= emulation@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= RPM of QT4 (Linux CentOS ${LINUX_DIST_VER}) USES= linux:c7 USE_LDCONFIG= yes -USE_LINUX= fontconfig png dbuslibs sqlite3 openssl +USE_LINUX= fontconfig png dbuslibs sqlite3 USE_LINUX_RPM= yes CONFLICTS= linux-c6-${PORTNAME}47-[0-9]* Modified: head/emulators/linux-c7/Makefile ============================================================================== --- head/emulators/linux-c7/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/emulators/linux-c7/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -3,6 +3,7 @@ PORTNAME= linux-c7 PORTVERSION= ${LINUX_DIST_VER} +PORTREVISION= 1 CATEGORIES= emulators linux MAINTAINER= emulation@FreeBSD.org @@ -44,7 +45,6 @@ RUN_DEPENDS= linux-c7-libasyncns>0:dns/linux-c7-libasy linux-c7-libv4l>0:multimedia/linux-c7-libv4l \ linux-c7-cyrus-sasl-lib>0:security/linux-c7-cyrus-sasl2 \ linux-c7-libssh2>0:security/linux-c7-libssh2 \ - linux-c7-openssl-libs>0:security/linux-c7-openssl \ linux-c7-gnutls>0:security/linux-c7-gnutls \ linux-c7-libgcrypt>0:security/linux-c7-libgcrypt \ linux-c7-nss>0:security/linux-c7-nss \ Modified: head/emulators/linux_base-c7/Makefile ============================================================================== --- head/emulators/linux_base-c7/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/emulators/linux_base-c7/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- EXTRACT_ONLY= ${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//} @@ -56,6 +56,7 @@ LIB_DISTNAMES= bzip2-libs-1.0.6-13.el7 \ libuuid-2.23.2-59.el7_6.1 \ ncurses-libs-5.9-14.20130511.el7_4 \ nss-softokn-freebl-3.36.0-5.el7_5 \ + openssl-libs-1.0.2k-16.el7_6.1 \ pcre-8.32-17.el7 \ popt-1.13-16.el7 \ readline-6.2-10.el7 \ @@ -106,6 +107,7 @@ SRC_DISTFILES= acl-2.2.51-14.el7${SRC_SUFX}:SOURCE \ libsepol-2.5-10.el7${SRC_SUFX}:SOURCE \ ncurses-5.9-14.20130511.el7_4${SRC_SUFX}:SOURCE \ nss-softokn-3.36.0-5.el7_5${SRC_SUFX}:SOURCE \ + openssl-1.0.2k-16.el7_6.1${SRC_SUFX}:SOURCE \ pcre-8.32-17.el7${SRC_SUFX}:SOURCE \ popt-1.13-16.el7${SRC_SUFX}:SOURCE \ readline-6.2-10.el7${SRC_SUFX}:SOURCE \ Modified: head/emulators/linux_base-c7/distinfo ============================================================================== --- head/emulators/linux_base-c7/distinfo Sun Aug 25 15:05:59 2019 (r509799) +++ head/emulators/linux_base-c7/distinfo Sun Aug 25 15:37:08 2019 (r509800) @@ -1,4 +1,4 @@ -TIMESTAMP = 1566725763 +TIMESTAMP = 1566746201 SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68 SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124 SHA256 (centos/bash-4.2.46-31.el7.i686.rpm) = 2988de97c4231cd72677ac64f3f1e20191355e0e34a56d59ed26cabc700ee29d @@ -163,6 +163,10 @@ SHA256 (centos/nss-softokn-freebl-3.36.0-5.el7_5.i686. SIZE (centos/nss-softokn-freebl-3.36.0-5.el7_5.i686.rpm) = 216532 SHA256 (centos/nss-softokn-freebl-3.36.0-5.el7_5.x86_64.rpm) = 7453ea2169f5550d8cde93045131a7d63a9fbdc952486fd84c6240019eced0d4 SIZE (centos/nss-softokn-freebl-3.36.0-5.el7_5.x86_64.rpm) = 227732 +SHA256 (centos/openssl-libs-1.0.2k-16.el7_6.1.i686.rpm) = 85196c91aca22b435858d1cfbed40d66bb5823ebe221cf3a1c75370837ec4def +SIZE (centos/openssl-libs-1.0.2k-16.el7_6.1.i686.rpm) = 1017576 +SHA256 (centos/openssl-libs-1.0.2k-16.el7_6.1.x86_64.rpm) = 18b0cd4008e88fae324c2f745d390631cae427b5fa40da682c6250b137e635fb +SIZE (centos/openssl-libs-1.0.2k-16.el7_6.1.x86_64.rpm) = 1251908 SHA256 (centos/pcre-8.32-17.el7.i686.rpm) = 752d582daaf1be9531de9c25c45ef861b47330432827ae3b6c5ef37f21d82e92 SIZE (centos/pcre-8.32-17.el7.i686.rpm) = 430428 SHA256 (centos/pcre-8.32-17.el7.x86_64.rpm) = cf2b84402e9a9fcf92c8a8a965c4e8d217e82e80c0945de2ce8d46c17131ad28 @@ -269,6 +273,8 @@ SHA256 (centos/ncurses-5.9-14.20130511.el7_4.src.rpm) SIZE (centos/ncurses-5.9-14.20130511.el7_4.src.rpm) = 3940747 SHA256 (centos/nss-softokn-3.36.0-5.el7_5.src.rpm) = 9fca79f5c3d1b2acc101f35f2cc046a6b9a7a7519a8c90dc30db3be3d266d0f4 SIZE (centos/nss-softokn-3.36.0-5.el7_5.src.rpm) = 4350452 +SHA256 (centos/openssl-1.0.2k-16.el7_6.1.src.rpm) = e32e88975b6597e56aaa80f070372dd823ff2a8201141f471c78041edb8fde7e +SIZE (centos/openssl-1.0.2k-16.el7_6.1.src.rpm) = 3746933 SHA256 (centos/pcre-8.32-17.el7.src.rpm) = b96493d8ea6def2e9a40dade4feedcea2b4bbfe8ce4c13a3465e99f21ef2c43d SIZE (centos/pcre-8.32-17.el7.src.rpm) = 1428012 SHA256 (centos/popt-1.13-16.el7.src.rpm) = a76a84ef85b502a4501e7e255aafb0d4be34442f94bbb742d248ef40366fb924 Modified: head/emulators/linux_base-c7/pkg-plist.amd64 ============================================================================== --- head/emulators/linux_base-c7/pkg-plist.amd64 Sun Aug 25 15:05:59 2019 (r509799) +++ head/emulators/linux_base-c7/pkg-plist.amd64 Sun Aug 25 15:37:08 2019 (r509800) @@ -34,6 +34,7 @@ etc/os-release etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7 +etc/pki/tls/openssl.cnf etc/prelink.conf.d/nss-softokn-prelink.conf etc/profile etc/profile.d/colorgrep.csh @@ -319,6 +320,10 @@ usr/bin/write usr/bin/x86_64 usr/bin/xargs usr/bin/yes +usr/lib/.libcrypto.so.1.0.2k.hmac +usr/lib/.libcrypto.so.10.hmac +usr/lib/.libssl.so.1.0.2k.hmac +usr/lib/.libssl.so.10.hmac usr/lib/audit/sotruss-lib.so usr/lib/db4.7.25/libdb.so usr/lib/db4.7.25/libdb_cxx.so @@ -618,6 +623,8 @@ usr/lib/libcom_err.so.2 usr/lib/libcom_err.so.2.1 usr/lib/libcrypt-2.17.so usr/lib/libcrypt.so.1 +usr/lib/libcrypto.so.1.0.2k +usr/lib/libcrypto.so.10 usr/lib/libdb-4.7.so usr/lib/libdb-5.3.so usr/lib/libdb-5.so @@ -746,6 +753,8 @@ usr/lib/libselinux.so.1 usr/lib/libsepol.so.1 usr/lib/libslang.so.2 usr/lib/libslang.so.2.2.4 +usr/lib/libssl.so.1.0.2k +usr/lib/libssl.so.10 usr/lib/libstdc++.so.5 usr/lib/libstdc++.so.5.0.7 usr/lib/libstdc++.so.6 @@ -766,6 +775,17 @@ usr/lib/locale/locale-archive usr/lib/lsb/init-functions usr/lib/lsb/install_initd usr/lib/lsb/remove_initd +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/lib/rtkaio/i686/nosegneg/librt.so.1 usr/lib/rtkaio/i686/nosegneg/librtkaio-2.17.so usr/lib/rtkaio/librt.so.1 @@ -783,6 +803,10 @@ usr/lib/systemd/system/fstrim.service usr/lib/systemd/system/fstrim.timer usr/lib/tmpfiles.d/libselinux.conf usr/lib/udev/rules.d/60-raw.rules +usr/lib64/.libcrypto.so.1.0.2k.hmac +usr/lib64/.libcrypto.so.10.hmac +usr/lib64/.libssl.so.1.0.2k.hmac +usr/lib64/.libssl.so.10.hmac usr/lib64/audit/sotruss-lib.so usr/lib64/db4.7.25/libdb.so usr/lib64/db4.7.25/libdb_cxx.so @@ -1070,6 +1094,8 @@ usr/lib64/libcom_err.so.2 usr/lib64/libcom_err.so.2.1 usr/lib64/libcrypt-2.17.so usr/lib64/libcrypt.so.1 +usr/lib64/libcrypto.so.1.0.2k +usr/lib64/libcrypto.so.10 usr/lib64/libdb-4.7.so usr/lib64/libdb-5.3.so usr/lib64/libdb-5.so @@ -1198,6 +1224,8 @@ usr/lib64/libselinux.so.1 usr/lib64/libsepol.so.1 usr/lib64/libslang.so.2 usr/lib64/libslang.so.2.2.4 +usr/lib64/libssl.so.1.0.2k +usr/lib64/libssl.so.10 usr/lib64/libstdc++.so.5 usr/lib64/libstdc++.so.5.0.7 usr/lib64/libstdc++.so.6 @@ -1214,6 +1242,17 @@ usr/lib64/libuuid.so.1 usr/lib64/libuuid.so.1.3.0 usr/lib64/libz.so.1 usr/lib64/libz.so.1.2.7 +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 usr/lib64/rtkaio/librt.so.1 usr/lib64/rtkaio/librtkaio-2.17.so usr/lib64/security/pam_cap.so @@ -2174,6 +2213,7 @@ usr/share/licenses/gmp-6.0.0/COPYINGv2 usr/share/licenses/gmp-6.0.0/COPYINGv3 usr/share/licenses/krb5-libs-1.15.1/LICENSE usr/share/licenses/libsepol-2.5/COPYING +usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/af/LC_MESSAGES/bash.mo %%NLS%%usr/share/locale/af/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/af/LC_MESSAGES/glib20.mo @@ -3127,6 +3167,9 @@ var/mail @dir etc/krb5.conf.d @dir etc/ld.so.conf.d @dir etc/opt +@dir etc/pki/tls/certs +@dir etc/pki/tls/misc +@dir etc/pki/tls/private @dir etc/pm/config.d @dir etc/pm/power.d @dir etc/pm/sleep.d Modified: head/emulators/linux_base-c7/pkg-plist.i386 ============================================================================== --- head/emulators/linux_base-c7/pkg-plist.i386 Sun Aug 25 15:05:59 2019 (r509799) +++ head/emulators/linux_base-c7/pkg-plist.i386 Sun Aug 25 15:37:08 2019 (r509800) @@ -33,6 +33,7 @@ etc/os-release etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7 +etc/pki/tls/openssl.cnf etc/prelink.conf.d/nss-softokn-prelink.conf etc/profile etc/profile.d/colorgrep.csh @@ -316,6 +317,10 @@ usr/bin/whoami usr/bin/write usr/bin/xargs usr/bin/yes +usr/lib/.libcrypto.so.1.0.2k.hmac +usr/lib/.libcrypto.so.10.hmac +usr/lib/.libssl.so.1.0.2k.hmac +usr/lib/.libssl.so.10.hmac usr/lib/audit/sotruss-lib.so usr/lib/db4.7.25/libdb.so usr/lib/db4.7.25/libdb_cxx.so @@ -615,6 +620,8 @@ usr/lib/libcom_err.so.2 usr/lib/libcom_err.so.2.1 usr/lib/libcrypt-2.17.so usr/lib/libcrypt.so.1 +usr/lib/libcrypto.so.1.0.2k +usr/lib/libcrypto.so.10 usr/lib/libdb-4.7.so usr/lib/libdb-5.3.so usr/lib/libdb-5.so @@ -743,6 +750,8 @@ usr/lib/libselinux.so.1 usr/lib/libsepol.so.1 usr/lib/libslang.so.2 usr/lib/libslang.so.2.2.4 +usr/lib/libssl.so.1.0.2k +usr/lib/libssl.so.10 usr/lib/libstdc++.so.5 usr/lib/libstdc++.so.5.0.7 usr/lib/libstdc++.so.6 @@ -763,6 +772,17 @@ usr/lib/locale/locale-archive usr/lib/lsb/init-functions usr/lib/lsb/install_initd usr/lib/lsb/remove_initd +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/lib/rtkaio/i686/nosegneg/librt.so.1 usr/lib/rtkaio/i686/nosegneg/librtkaio-2.17.so usr/lib/rtkaio/librt.so.1 @@ -1728,6 +1748,7 @@ usr/share/licenses/gmp-6.0.0/COPYINGv2 usr/share/licenses/gmp-6.0.0/COPYINGv3 usr/share/licenses/krb5-libs-1.15.1/LICENSE usr/share/licenses/libsepol-2.5/COPYING +usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/af/LC_MESSAGES/bash.mo %%NLS%%usr/share/locale/af/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/af/LC_MESSAGES/glib20.mo @@ -2677,6 +2698,9 @@ var/mail @dir etc/krb5.conf.d @dir etc/ld.so.conf.d @dir etc/opt +@dir etc/pki/tls/certs +@dir etc/pki/tls/misc +@dir etc/pki/tls/private @dir etc/pm/config.d @dir etc/pm/power.d @dir etc/pm/sleep.d Modified: head/print/linux-c7-cups-libs/Makefile ============================================================================== --- head/print/linux-c7-cups-libs/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/print/linux-c7-cups-libs/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -4,7 +4,7 @@ PORTNAME= cups PORTVERSION= 1.6.3 DISTVERSIONSUFFIX= -35.el7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print linux PKGNAMESUFFIX= -libs @@ -13,7 +13,7 @@ COMMENT= Common UNIX Printing System libraries USES= linux:c7 USE_LDCONFIG= yes -USE_LINUX= avahi-libs openssl +USE_LINUX= avahi-libs USE_LINUX_RPM= yes LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/security/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -343,7 +343,6 @@ SUBDIR += linux-c7-libtasn1 SUBDIR += linux-c7-nettle SUBDIR += linux-c7-nss - SUBDIR += linux-c7-openssl SUBDIR += linux-c7-p11-kit SUBDIR += linux-c7-trousers SUBDIR += log2timeline Modified: head/security/linux-c7-libssh2/Makefile ============================================================================== --- head/security/linux-c7-libssh2/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/security/linux-c7-libssh2/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -4,7 +4,7 @@ PORTNAME= libssh2 PORTVERSION= 1.4.3 DISTVERSIONSUFFIX= -12.el7_6.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org @@ -12,7 +12,6 @@ COMMENT= Library implementing the SSH2 protocol (Linux USES= linux:c7 USE_LDCONFIG= yes -USE_LINUX= openssl USE_LINUX_RPM= yes CONFLICTS= linux-c6-${PORTNAME}-[0-9]* Modified: head/x11-toolkits/linux-c7-qt-x11/Makefile ============================================================================== --- head/x11-toolkits/linux-c7-qt-x11/Makefile Sun Aug 25 15:05:59 2019 (r509799) +++ head/x11-toolkits/linux-c7-qt-x11/Makefile Sun Aug 25 15:37:08 2019 (r509800) @@ -4,7 +4,7 @@ PORTNAME= qt PORTVERSION= 4.8.7 DISTVERSIONSUFFIX= -3.el7_6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux PKGNAMESUFFIX= -x11 @@ -13,7 +13,7 @@ COMMENT= Cross-platform application and UI framework ( USES= linux:c7 USE_LDCONFIG= yes -USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs +USE_LINUX= alsalib dri fontconfig jpeg png qt tiff xorglibs USE_LINUX_RPM= yes LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908251537.x7PFb955085162>