From 519e4d5d99fc43d5c9a038098c029dc4ef9d6792 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Nov 2017 16:49:02 +0000 Subject: gentoo resync : 12.11.2017 --- dev-libs/libressl/Manifest | 4 +-- dev-libs/libressl/libressl-2.6.3-r2.ebuild | 52 ++++++++++++++++++++++++++++ dev-libs/libressl/libressl-2.6.3.ebuild | 54 ------------------------------ dev-libs/libressl/metadata.xml | 1 - 4 files changed, 54 insertions(+), 57 deletions(-) create mode 100644 dev-libs/libressl/libressl-2.6.3-r2.ebuild delete mode 100644 dev-libs/libressl/libressl-2.6.3.ebuild (limited to 'dev-libs/libressl') diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest index 305c744c2170..91ff61490c48 100644 --- a/dev-libs/libressl/Manifest +++ b/dev-libs/libressl/Manifest @@ -15,6 +15,6 @@ EBUILD libressl-2.5.5.ebuild 1306 SHA256 cd517214cd6a7929e41d5d6a1a4dfafb8f9705c EBUILD libressl-2.6.0.ebuild 1302 SHA256 c787b068b05070e84a6536d21ef458119bb746475e0fa511ebe68b32afcbf631 SHA512 3546873fef3a9fb5fc8c5bf4ecf97ee129d270767526a052d4872b624506f3e90b001ade330e4d95e8207e4f4ee4348c2d89e21a4e4948737d103412c4164e5c WHIRLPOOL 6e80f5335955cf4719a42567b5a04c9e923bbaf8d751f5c3a56a2886674eea267017e272367c657499d4ee39e58ef5980a554077af2f494912dc7d8833a8b517 EBUILD libressl-2.6.1.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4 EBUILD libressl-2.6.2.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4 -EBUILD libressl-2.6.3.ebuild 1377 SHA256 c66c90b6a74e75b6d0e7b2506326938c939dd8effebc677924ce7486f0d2d9dd SHA512 ce509e74001458d7f1b59e4769da2c29d27ff06001ee754f3f8bcd0d0e025dbd27318a72e7e5b610456f627f6706114e6ceed6675109241cbec891763c344c30 WHIRLPOOL 6669b2c49134305694adadd825e74081180f06b620b37db8d6c637a9b3092c9bf1b38090750365fd78a174b2f5b945b68f1aed29a34a870745d84e4a890f155d +EBUILD libressl-2.6.3-r2.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4 MISC ChangeLog 6269 SHA256 054b8922c785b18cd0daa0a4b6558c0fc7cb1038607ff93025d8325d57b4975a SHA512 4e5e249d7081aa5ce74c0190f6f656196ead36ff3bd1d45bc2717801f691b1d5de456f37a825b59a3f07d3310315fbbdbee1316b099fbd22c17663476eac19f2 WHIRLPOOL ccabaac1a877cba13a4c44df7c6277c3730cff63f5cf256b41e7f7a17210902f9e6ce211d2d7cee709cbfda1703101546db832d5919ef7c123325372400a0ee6 -MISC metadata.xml 1051 SHA256 92477deb25376da7267b638c5488e99ab8c99da3cc9174dbbfc4698b8cfbde13 SHA512 781e76c37667200d669dcc9057d59a41014916a0e9917595ffe70e5e379a35f86290c547fb63c3f7f8596a3901f602948739874bd1c137e5f9f9b498db4218fe WHIRLPOOL 61c4d264ded6c5d18a0baf16982693da1cc9e61d4769720800f5fc6fceeafac7ab9d105b6f05b3b3416ee07808cc78910b84f4913412b8850ceb0305d10cedbc +MISC metadata.xml 986 SHA256 7ae348d550d88fb3adc70de87d9963e378107a62d9b2bee243c2ba209a537724 SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe WHIRLPOOL 204fe8fa33c937c85edaaeed1e995d92489452c93231d1e5fc44b79a620d86c5b79be10245487bad31a35d4bb09458bf7cf3ce55d0b486d092ff7a36abac67de diff --git a/dev-libs/libressl/libressl-2.6.3-r2.ebuild b/dev-libs/libressl/libressl-2.6.3-r2.ebuild new file mode 100644 index 000000000000..ae81279ce6f1 --- /dev/null +++ b/dev-libs/libressl/libressl-2.6.3-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils multilib-minimal + +DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL" +HOMEPAGE="http://www.libressl.org/" +SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz" + +LICENSE="ISC openssl" +# Reflects ABI of libcrypto.so and libssl.so. Since these can differ, +# we'll try to use the max of either. However, if either change between +# versions, we have to change the subslot to trigger rebuild of consumers. +SLOT="0/44" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86" +IUSE="+asm static-libs" + +RDEPEND="!dev-libs/openssl:0" +DEPEND="${RDEPEND}" +PDEPEND="app-misc/ca-certificates" + +src_prepare() { + touch crypto/Makefile.in + + sed -i \ + -e '/^[ \t]*CFLAGS=/s#-g ##' \ + -e '/^[ \t]*CFLAGS=/s#-g"#"#' \ + -e '/^[ \t]*CFLAGS=/s#-O2 ##' \ + -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \ + -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \ + -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \ + configure || die "fixing CFLAGS failed" + + eapply_user +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable asm) \ + $(use_enable static-libs static) +} + +multilib_src_test() { + emake check +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} diff --git a/dev-libs/libressl/libressl-2.6.3.ebuild b/dev-libs/libressl/libressl-2.6.3.ebuild deleted file mode 100644 index 6372f13faa6a..000000000000 --- a/dev-libs/libressl/libressl-2.6.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib - -DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL" -HOMEPAGE="https://www.libressl.org" -SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz" - -LICENSE="ISC openssl" -# Reflects ABI of libcrypto.so and libssl.so. Since these can differ, -# we'll try to use the max of either. However, if either change between -# versions, we have to change the subslot to trigger rebuild of consumers. -SLOT="0/44" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86" -IUSE="+asm nc static-libs" - -RDEPEND=" - !dev-libs/openssl:0 - nc? ( !net-analyzer/openbsd-netcat )" -DEPEND="${RDEPEND}" -PDEPEND="app-misc/ca-certificates" - -src_prepare() { - # Correct hardcoded paths to use ca-certificates instead of cert.pem - find "${S}"/{apps,crypto,tls} -type f -exec \ - sed -e 's|/cert.pem|/certs/ca-certificates.crt|' -i {} \; || die - - eapply_user -} - -src_configure() { - local mycmakeargs=( - -DENABLE_ASM=$(usex asm) - -DENABLE_NC=$(usex nc) - -DOPENSSLDIR="${EPREFIX}"/etc/ssl - -DUSE_SHARED=1 - ) - - cmake-multilib_src_configure -} - -multilib_src_install_all() { - einstalldocs - - # Delete cert.pem - rm "${ED}"/etc/ssl/cert.pem || die - - if ! use static-libs ; then - find "${D}" -name '*.a' -exec rm -f {} + || die - fi -} diff --git a/dev-libs/libressl/metadata.xml b/dev-libs/libressl/metadata.xml index 9a56130ae30a..a7201a6f607c 100644 --- a/dev-libs/libressl/metadata.xml +++ b/dev-libs/libressl/metadata.xml @@ -11,7 +11,6 @@ Enables assembly - Installs the libtls-based netcat binary http://www.libressl.org/releases.html -- cgit v1.2.3