summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen, Chih-Chia <pigfoot@gmail.com>2016-03-10 17:29:25 +0800
committerChen, Chih-Chia <pigfoot@gmail.com>2016-03-10 17:29:25 +0800
commit1a59e3bda80803146a9451f563c65f048408d314 (patch)
tree6bd79254ad1f7b0627ab46973e8b7807db6c22fb /dev-libs
parentAdd sys-fs/fswatch (1.8.0 && git) (diff)
downloadpigfoot-1a59e3bda80803146a9451f563c65f048408d314.tar.gz
pigfoot-1a59e3bda80803146a9451f563c65f048408d314.tar.bz2
pigfoot-1a59e3bda80803146a9451f563c65f048408d314.zip
[dev-libs/openssl] Update to 1.0.2g-r2
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/Manifest4
-rw-r--r--dev-libs/openssl/metadata.xml11
-rw-r--r--dev-libs/openssl/openssl-1.0.2g-r2.ebuild (renamed from dev-libs/openssl/openssl-1.0.2e.ebuild)15
3 files changed, 16 insertions, 14 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 670d095..e48411a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -9,8 +9,8 @@ AUX openssl-1.0.2a-parallel-symlinking.patch 2041 SHA256 30cb49489de5041841a74da
AUX openssl-1.0.2a-x32-asm.patch 1561 SHA256 8bcff04217c5ad82448e27d14f3559a157c2cad89b5fb2b6af701fff1664f86d SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c WHIRLPOOL 70163beaed966de948562c3a633828846d12eda7b04526c7e33746c67af5a20ecf47e9e9e5cce33abf7444676f4b15b770204e95db75d0b91a9db13c46ff92bb
AUX openssl-1.0.2e-chacha20_poly1305_cf.patch 142424 SHA256 863ea35a573d19995db3922bbd0893596b76fd19f1b6e34461d425297fa53060 SHA512 d4a68fcecbf9f029ac19ce0c41a3199a1ecba9f10c11d8ed1da89f34ba008a441f17500fbd82909a927b7be3dfab38bfb792d31f2cb8154fa794d914575c38fb WHIRLPOOL da45cf979d86f5290d0a36b4547a3b9e770bf2fa66db1ed0e1a341363171d66ee4c11941c7eaa97771d202b297a2315ef4eed2295f7dda51f68b5a60f40f149c
AUX openssl-1.0.2e-parallel-build.patch 9620 SHA256 1200c48f8e209bce505bec23958afa4700681ee97f374064a5484623fe497269 SHA512 8aa64a78bc190a9c04f0093af2cdbcc0bed25be8c5f31c3a31e8b19954a58ba96ab05139d3ae6ecd7bc24e123536eec54fc98330167affcfd13cbd6d90626637 WHIRLPOOL 7ad5e275dce8f644deb3779900940cdbc625ecdcc984386502e1cb8dd7ead6bbd3a32fa41ae537a7ad5b2dc8308a2458ebbfcd3c05aedc4874e5d5a212677f88
-DIST openssl-1.0.2e.tar.gz 5256555 SHA256 e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f WHIRLPOOL 8e1c1800a66f57fa78dc391e717e4b2bdf0e6e37a837c5ac033d7a4b1a6437451c7e7540c4ec2f75f936a2d2ef4f9293b42c76f51b0c9c93706639589612f196
DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9
-EBUILD openssl-1.0.2e.ebuild 8889 SHA256 94d1ec898922de876f0455ce9bedf67c1226d89bd32a4ddf36b1ddae75c09bf8 SHA512 b602036a6c3d832d749cbc8e989322f94c0efb6e7254a96d6926ea9168756d0382ab616eeecb4eda009bf48b35651cf39dcedcac0d8b833cb24a0e20a0f0745e WHIRLPOOL 440652b5076b21ebd435f6204e9d8d75cd3429f9929729849cb40bc9690720c215b4a5e806a8bd00d5860c9a13c1c7cabc686580487a90afa5c7f7926f2cf1c1
+DIST openssl-1.0.2g.tar.gz 5266102 SHA256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 SHA512 4d96b6c8a232203483d6e8bee81da01ba10977bfbac92f25304a36dec9ea584b7ef917bc45e097cc7dbe681d71a4570d649c22244c178393ae91fab48323f735 WHIRLPOOL aedbd82af0a550e8329a84312fae492f3bb3cb04af763fc9ef532099b2b2e61a55e4a7cfb06085f045740e2b692bbdb3ecb8bf5ca82f46325c3caf22d2317ffb
EBUILD openssl-1.0.2f.ebuild 8901 SHA256 4d54785c116acc66b3bec970e4184cb0b6712dd7c9a02b9cd12e41d8a7e23ccb SHA512 e85bb49c864dfc11ced880c2cb614d6db4f476b45954672be651fe5fc2c42f0ca9e4e6db49712a9e182a2e1941b06664ccf7f1fe7d261ab45b2bf35b7faa4a09 WHIRLPOOL 0d7e01919400a0889b75f9718207ea361da18b9a45620a96196ab4e48514eeb2b65cc3c654679989ad4c091ecb135e5c2aaaa293746dbd4dc637a946bac9d311
+EBUILD openssl-1.0.2g-r2.ebuild 9076 SHA256 70bc40824909952421cc4994b5ce180f5cc4d25e5f1c0a8e2e91eea10cb89b62 SHA512 e79ab54bfdaf229c415dc9e1c86a8c3dc8e20ee8715b08abc83cd332652ca9577a97581a51a30b7a3e139ba4c179766f3417116fbd3305a5cb8f5fdf3bfcf4f4 WHIRLPOOL f172b3631bc618a11fa3d65953ca48951da538949c0ea88ee48bcf5a7a3f0260bea006f458672f7ca66ed71199c0918e32598a579ef34c6a7aa2b85c1626fe7c
MISC metadata.xml 309 SHA256 25781461d8d8523a4ba8fe3df0362e386486d35448f7dba713a2fd59dc21acd4 SHA512 805ef574465b9ff8d6eeabaaaa4c1ddb29d5064592b2e3d39c82430fa6901769338d8dcea528217caea4395c10f2e9d1f39029db3c71059d899ddba23fe7fa30 WHIRLPOOL 989fefe2e3864108f63cca936f06bf32bd02ab2535f3d70db9d10d54de9d496944e278d73f0e48a4b37c0d153718fc8c1403e9fdeda1477d48dc607467a6e7b1
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index ddf3549..af561bd 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd></herd>
- <maintainer>
- <email>pigfoot@gmail.com</email>
- <name>Chen, Chih-Chia</name>
- <description>Maintainer. Assign bugs to him</description>
- </maintainer>
+<maintainer type="project">
+ <email>pigfoot@gmail.com</email>
+ <name>Chen, Chih-Chia</name>
+ <description>Maintainer. Assign bugs to him</description>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2g-r2.ebuild
index ea214ab..9929ee6 100644
--- a/dev-libs/openssl/openssl-1.0.2e.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2g-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI=5
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
@@ -12,9 +12,11 @@ HOMEPAGE="http://www.openssl.org/"
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
+# subslot set to 1.0.2g version as this is the first release without SSLv2
+# support and thus breaks nearly every openssl consumer (see bug #575548)
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist +cloudflare gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist +chacha20_poly1305 gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
# The blocks are temporary just to make sure people upgrade to a
@@ -56,7 +58,7 @@ src_prepare() {
if ! use vanilla ; then
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
- epatch "${FILESDIR}"/${PN}-1.0.2e-parallel-build.patch
+ epatch "${FILESDIR}"/${PN}-1.0.2g-parallel-build.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
@@ -67,7 +69,7 @@ src_prepare() {
epatch_user #332661
fi
- if use cloudflare ; then
+ if use chacha20_poly1305 ; then
epatch "${FILESDIR}"/${PN}-1.0.2e-chacha20_poly1305_cf.patch
fi
@@ -158,6 +160,7 @@ multilib_src_configure() {
enable-mdc2 \
enable-rc5 \
enable-tlsext \
+ enable-ssl2 \
$(use_ssl asm) \
$(use_ssl gmp gmp -lgmp) \
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \