Merge branch 'master' into KBrown-pub

This commit is contained in:
Sandino Araico Sanchez 2017-05-03 20:29:04 -05:00
commit e0fc393cd5
4 changed files with 10 additions and 101 deletions

View file

@ -1,13 +1,9 @@
AUX libressl-2.2.4-clientcert.patch 1387 SHA256 a9a4038c02e6c21fb927141695da600f540fcc265d6f644d2a1c6063a288bd85 SHA512 411c50b5bf9bdeba022f6181d8395b571842625962d5d6f4467cde8b1e87156cea8b33416cfc1c537c0fb19fad7e7c7fb3a542045e84e5af0c80116259446554 WHIRLPOOL f9d7923654956dd333fe1f43bd1b13e9942473f2b69b90705373770523e0e3620fdcb0e364afecdc065c4efaea66fbb389a9b9e3b3cf6c35be44af428ce69b25
DIST libressl-2.2.5.tar.gz 2966527 SHA256 e3caded0469d8dc64f4ca2fe8e499ada4dd014e84d1c5a71818d39e54e6c914b SHA512 501d04cb966260854082d374e60aabde21bcd65a331ff7c76044f2053b22ddab4914710b223b400a3a181873c6af5e2e7da5f04bdd9028fddbf420e259a2863a WHIRLPOOL 47f7d35ceff5004af0c2f79509678c4826eabe05225dbcf5cbe1f9cb358d1657ff288a702e14bfd578fd03e38256d2aa2c79ec724a05c98aa91317e6a9a5f9d4
DIST libressl-2.2.6.tar.gz 2965531 SHA256 1ee19994cffd047d40f63ba149115dba18a681b0cc923beec301bf424b58d64f SHA512 41e29431ad9e8b18e2dbc30fe9df1d7be3ca372d5d7757b5b01f8904515bafd5333446957fbc9874f64f384dae56cf6bf29d6808a7c0df1836b55ea64804a4bf WHIRLPOOL 49b6efa211ea4789e51388d3ebfec941dfedad427b806b33d439a7639e09d16e5c9004edc4a4c8e3de63040ebc2fe0a3a3819c68ed674e3bb36bb52b49e75ce5
DIST libressl-2.5.0.tar.gz 3012855 SHA256 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae SHA512 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332 WHIRLPOOL 9b145915734a1914f0d36df04a8b35aa2ce2c91f7d6b3a978c5c6845314c56c61718fce6c471ba1a03f3d1ff052246c3db767adee99bc3d38a6bd692b9086ad0
DIST libressl-2.5.1.tar.gz 3266271 SHA256 f71ae0a824b78fb1a47ffa23c9c26e9d96c5c9b29234eacedce6b4c7740287cd SHA512 44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9 WHIRLPOOL e31b487e9e88f372cd22db05e54e74900181120cf8c6105f5531658e7b467722680921f3630b8943ee0ec5f5777cb76a7ddc64e4d43f166903928aaa4f98509c
DIST libressl-2.5.2.tar.gz 3277320 SHA256 0ffa7d70809284a4ac96e965918a61c1d7930bca865457a7db0ff0afc8201c82 SHA512 2c42b8bab40dfb517231d83456073c92a61210a83654f23bec1b5148bd7e3c0590f50244970ebf966e5e9582ea98289fe48c6f246d1d79e5d9facea2041e4faa WHIRLPOOL fc1dba52049779bf55a39a88abff8db8cfa3ba0d437dfacefa372d64e9859d7904848ba146a54064f70b79d0febea666757981ff4268699ac22a6cd8b5f3bc73
DIST libressl-2.5.3.tar.gz 3285151 SHA256 14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30 SHA512 e5ba2abb8a0835a025d2777d9c0e8e95813777af8167e322d8e5ae20485c32b628ced77141b156fd3619b65a5afae1a5bc90a7252166a9a54f7e3d23388b3bd0 WHIRLPOOL 687d2b0f2f4294bbc16022056cae7e9f1dd70f168aa087e5d12e4e0eb498b8df05de48c262e5c6b094ea4cbff68a3c74255f369029f377a91e0f34f23e2daf4a
EBUILD libressl-2.2.5.ebuild 1054 SHA256 142e8949dd994b073f5534eec5179e0279b0355db8d19706ae79fec884fd8e50 SHA512 857a5a4f515b0d3da119afbe887904f22d4dc4604c6a79356babe7153780fd1891f8a2669a60fc6a21306b87489f49da5b9b025c9b7bfd7c77769f375c02999a WHIRLPOOL 045e3fc06a6756d388ac812275e7d356882ef060dca81ec842b843015169e16d21321135e3b16e56ffe61964d625fb3df279013dbecb865a8d3c54d8b47fc723
EBUILD libressl-2.2.6.ebuild 1054 SHA256 3fab9e63f6de19c5b8f72004eb07683bf4f6258ca6ba4e894d8bfdd7bda4ca7d SHA512 5c0b1cc0cec3b2377ecaef9656abdff5423d4ec3382c40efd1755af7aa381c9ff776d163d66bbd02e0f5aae7d77817d9bbb5add36b3d7bc79f1f8ab8fa8760f5 WHIRLPOOL ff305eb21f44a422b921164114d115b8f8942b79b78316181423a2bee71ac9f93a8308c777722f1fe0af0661649dfa7b8d3e357f98073a80783a64a3a97f5ccf
EBUILD libressl-2.5.0-r1.ebuild 1229 SHA256 3012d42d7b9f4294825c234106177dfa5c8e323b9e95adcae870d37d6cfd6a7a SHA512 7f52efcd5891c2b758b595ba3985114bc3ee994de190a1a8fbf6cf2022c4cc45f4b40a3ef0e5b23ca16c17b47600b23e146348016b0c1a8f6b8b4733feb5614a WHIRLPOOL f6ddc4a0cef44805b5fbf7d90d338b9a7f622297edc7bb522ed46b521234799fd1b64390cd937ef0a87259f5d91d6190172a8b5eb809373895d4bc73dcb52909
DIST libressl-2.5.4.tar.gz 3286042 SHA256 107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa SHA512 8ca86c14af0020c90bef4651892799864938dab9d898172269cb78bad5963314e064f2b4c46e6a04e0b85d1eddbd1840b734803c11ceec8fd6bb1290e0fe204c WHIRLPOOL f1cfb1b126759275172616eadbc40e20ae8bbc615bfa4e49e68b3c5a9f66e6503007531a2ff59df482ebf6902008b431ca5891d73e6c8887862f11e00f76b423
EBUILD libressl-2.5.1-r100.ebuild 1243 SHA256 f866bdbf7e3d93c54be85ff3aa34daa53e9aeacf0603d7a3097fe9b85f3c98cb SHA512 8c589126549842d807aeed4800f036097011556ef6615d02b3703f0335247322c52f7115b1d1efde900e291f4df4fe4beabf396b4d45b7841c34911aacc9f8e4 WHIRLPOOL ad33df3b7360c9d149af41c5377709e7f2d2de6994d839c1ee0ab708477ee4433fce3c0bec479e91a3f1fed3d194bd28b0df3f7dd5d3cea383828a21a997088a
EBUILD libressl-2.5.2-r100.ebuild 1243 SHA256 f866bdbf7e3d93c54be85ff3aa34daa53e9aeacf0603d7a3097fe9b85f3c98cb SHA512 8c589126549842d807aeed4800f036097011556ef6615d02b3703f0335247322c52f7115b1d1efde900e291f4df4fe4beabf396b4d45b7841c34911aacc9f8e4 WHIRLPOOL ad33df3b7360c9d149af41c5377709e7f2d2de6994d839c1ee0ab708477ee4433fce3c0bec479e91a3f1fed3d194bd28b0df3f7dd5d3cea383828a21a997088a
EBUILD libressl-2.5.3-r100.ebuild 1295 SHA256 73f60fe04912311fc8501cf507c5fcbec1b8027375c2a9ff40565255f568564a SHA512 805e6f0bc9170570dba7702a1e890986e42ccd045768eeba023fa499132ed427c0eee11ea9f8fd298f33cf319121e4e1a33c78663ca8233be74372a02f13bc91 WHIRLPOOL d71f6cc2f864b4ac1a67db9325f7bd6772c5962b0f55ca0e9ea4ceeaf1a0a83dde552f3d75786c541b49e800f713c34afee336286e2e6d935b33da9bbb7fcc8c
EBUILD libressl-2.5.4-r100.ebuild 1295 SHA256 73f60fe04912311fc8501cf507c5fcbec1b8027375c2a9ff40565255f568564a SHA512 805e6f0bc9170570dba7702a1e890986e42ccd045768eeba023fa499132ed427c0eee11ea9f8fd298f33cf319121e4e1a33c78663ca8233be74372a02f13bc91 WHIRLPOOL d71f6cc2f864b4ac1a67db9325f7bd6772c5962b0f55ca0e9ea4ceeaf1a0a83dde552f3d75786c541b49e800f713c34afee336286e2e6d935b33da9bbb7fcc8c

View file

@ -1,45 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
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"
SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
IUSE="+asm static-libs"
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"
}
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
}

View file

@ -1,45 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
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"
SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
IUSE="+asm static-libs"
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"
}
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
}

View file

@ -1,8 +1,7 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
inherit eutils multilib-minimal
@ -14,10 +13,12 @@ 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/39"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
SLOT="0/43"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
IUSE="+asm static-libs"
#RDEPEND="!dev-libs/openssl:0"
#DEPEND="${RDEPEND}"
PDEPEND="app-misc/ca-certificates"
src_prepare() {
@ -31,6 +32,8 @@ src_prepare() {
-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
configure || die "fixing CFLAGS failed"
eapply_user
}
multilib_src_configure() {