| 1 |
commit: ded8cff386884ada7760078bd10d42cb58c73bc2 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 26 11:44:41 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 26 11:45:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded8cff3 |
| 7 |
|
| 8 |
dev-libs/openssl: Sec bump to versions 1.0.2j and 1.1.0b (bug #595186). |
| 9 |
|
| 10 |
Removed old. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.1 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-libs/openssl/Manifest | 3 +- |
| 16 |
...openssl-1.1.0a.ebuild => openssl-1.0.2j.ebuild} | 79 ++++++++++++---------- |
| 17 |
...openssl-1.1.0a.ebuild => openssl-1.1.0b.ebuild} | 0 |
| 18 |
3 files changed, 45 insertions(+), 37 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest |
| 21 |
index a5c5f39..4d20371 100644 |
| 22 |
--- a/dev-libs/openssl/Manifest |
| 23 |
+++ b/dev-libs/openssl/Manifest |
| 24 |
@@ -1,4 +1,5 @@ |
| 25 |
DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf |
| 26 |
DIST openssl-1.0.2h.tar.gz 5274412 SHA256 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 SHA512 780601f6f3f32f42b6d7bbc4c593db39a3575f9db80294a10a68b2b0bb79448d9bd529ca700b9977354cbdfc65887c76af0aa7b90d3ee421f74ab53e6f15c303 WHIRLPOOL 41b6cf0c08b547f1432dc8167a4c7835da0b6907f8932969e0a352fab8bdbb4d8f612a5bf431e415d93ff1c8238652b2ee3ce0bd935cc2f59e8ea4f40fe6b5d6 |
| 27 |
DIST openssl-1.0.2i.tar.gz 5308232 SHA256 9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f SHA512 41764debd5d64e4e770945f30d682e2c887d9cefb39b358c5c7f9d2cdce34393ed28d49b24e95c4639db2df01c278cbcde71bed2b03f9aafafc76766b03850e3 WHIRLPOOL ba1a4513aaa1de81e36912acfe0b6cf8e0acf7cc71d32b127b5e54eb2f6fc6ce63f4f61e9fc99fecc9e037cdccc496b9d15ea75b594b0fd8721b4478eab1f31d |
| 28 |
-DIST openssl-1.1.0a.tar.gz 5161414 SHA256 c2e696e34296cde2c9ec5dcdad9e4f042cd703932591d395c389de488302442b SHA512 80d6cf795decc923b0ea6a005805993d2a4133a1d41f0208982f4b147471e24782227c77611cc4c6d1e61849ce66c57987ea7a26ea66cd0b0adc66c200b96c21 WHIRLPOOL 7cc2dd31dcfc7a34f982dde16a0954b7158ddc8d787e9c8838905c19527d31f4049a31891f33e72bbf142a9062f99bf61874a11a143e4dd3de3b039d7f572f02 |
| 29 |
+DIST openssl-1.0.2j.tar.gz 5307912 SHA256 e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 SHA512 7d6ccae4aa3ccec3a5d128da29c68401cdb1210cba6d212d55235fc3bc63d7085e2f119e2bbee7ddff6b7b5eef07c6196156791724cd2caf313a4c2fef724edd WHIRLPOOL 1f17e80bc10da2eab9d4c1c3a662b0e2b4f7e8bc448aabb44cd98a96ba3d6cd0ef6cf9a3371d44b39a4d11b1a4087c8f0d056272ace6eba5bd2417f7ab9503b7 |
| 30 |
+DIST openssl-1.1.0b.tar.gz 5162355 SHA256 a45de072bf9be4dea437230aaf036000f0e68c6a665931c57e76b5b036cef6f7 SHA512 b6d66261427f1acc049bf5469a0dc668490e752c2ba4802481809e7e35367213eca17ac9fdc3f23ed5f7a53d303abca78b13a48b169f154043199f2680ccf1a4 WHIRLPOOL bc926b2839f2e85751480ac0a6306bd37ca1ac12759b78654fba6861517bb9979245b95676a60900eab9257334ecf2e1b7d9e406c39a6075054a93ffc1f7a76a |
| 31 |
|
| 32 |
diff --git a/dev-libs/openssl/openssl-1.1.0a.ebuild b/dev-libs/openssl/openssl-1.0.2j.ebuild |
| 33 |
similarity index 77% |
| 34 |
copy from dev-libs/openssl/openssl-1.1.0a.ebuild |
| 35 |
copy to dev-libs/openssl/openssl-1.0.2j.ebuild |
| 36 |
index 0aea4eb..f026079 100644 |
| 37 |
--- a/dev-libs/openssl/openssl-1.1.0a.ebuild |
| 38 |
+++ b/dev-libs/openssl/openssl-1.0.2j.ebuild |
| 39 |
@@ -2,7 +2,7 @@ |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
# $Id$ |
| 42 |
|
| 43 |
-EAPI=5 |
| 44 |
+EAPI="5" |
| 45 |
|
| 46 |
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
| 47 |
|
| 48 |
@@ -12,13 +12,15 @@ HOMEPAGE="http://www.openssl.org/" |
| 49 |
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" |
| 50 |
|
| 51 |
LICENSE="openssl" |
| 52 |
-SLOT="0/1.1" # .so version of libssl/libcrypto |
| 53 |
+SLOT="0" |
| 54 |
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" |
| 55 |
-IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib" |
| 56 |
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" |
| 57 |
RESTRICT="!bindist? ( bindist )" |
| 58 |
|
| 59 |
RDEPEND=">=app-misc/c_rehash-1.7-r1 |
| 60 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" |
| 61 |
+ gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
| 62 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
| 63 |
+ kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )" |
| 64 |
DEPEND="${RDEPEND} |
| 65 |
>=dev-lang/perl-5 |
| 66 |
sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
| 67 |
@@ -34,11 +36,6 @@ MULTILIB_WRAPPED_HEADERS=( |
| 68 |
usr/include/openssl/opensslconf.h |
| 69 |
) |
| 70 |
|
| 71 |
-PATCHES=( |
| 72 |
- "${FILESDIR}"/${PN}-1.1.0-ldflags.patch #327421 |
| 73 |
- "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
| 74 |
-) |
| 75 |
- |
| 76 |
src_prepare() { |
| 77 |
# keep this in sync with app-misc/c_rehash |
| 78 |
SSL_CNF_DIR="/etc/ssl" |
| 79 |
@@ -48,25 +45,37 @@ src_prepare() { |
| 80 |
rm -f Makefile |
| 81 |
|
| 82 |
if ! use vanilla ; then |
| 83 |
- epatch "${PATCHES[@]}" |
| 84 |
+ epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
| 85 |
+ epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch |
| 86 |
+ epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
| 87 |
+ epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
| 88 |
+ epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |
| 89 |
+ epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch |
| 90 |
+ epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
| 91 |
+ epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 |
| 92 |
+ |
| 93 |
epatch_user #332661 |
| 94 |
fi |
| 95 |
|
| 96 |
+ # disable fips in the build |
| 97 |
# make sure the man pages are suffixed #302165 |
| 98 |
# don't bother building man pages if they're disabled |
| 99 |
- # Make DOCDIR Gentoo compliant |
| 100 |
sed -i \ |
| 101 |
+ -e '/DIRS/s: fips : :g' \ |
| 102 |
-e '/^MANSUFFIX/s:=.*:=ssl:' \ |
| 103 |
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
| 104 |
-e $(has noman FEATURES \ |
| 105 |
&& echo '/^install:/s:install_docs::' \ |
| 106 |
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
| 107 |
- -e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \ |
| 108 |
- Configurations/unix-Makefile.tmpl \ |
| 109 |
+ Makefile.org \ |
| 110 |
|| die |
| 111 |
- |
| 112 |
# show the actual commands in the log |
| 113 |
- sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared |
| 114 |
+ sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
| 115 |
+ |
| 116 |
+ # since we're forcing $(CC) as makedep anyway, just fix |
| 117 |
+ # the conditional as always-on |
| 118 |
+ # helps clang (#417795), and versioned gcc (#499818) |
| 119 |
+ sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
| 120 |
|
| 121 |
# quiet out unknown driver argument warnings since openssl |
| 122 |
# doesn't have well-split CFLAGS and we're making it even worse |
| 123 |
@@ -81,16 +90,7 @@ src_prepare() { |
| 124 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
| 125 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
| 126 |
|
| 127 |
- # Prefixify Configure shebang (#141906) |
| 128 |
- sed \ |
| 129 |
- -e "1s,/usr/bin/env,${EPREFIX}&," \ |
| 130 |
- -i Configure || die |
| 131 |
- # Remove test target when FEATURES=test isn't set |
| 132 |
- if ! use test ; then |
| 133 |
- sed \ |
| 134 |
- -e '/^$config{dirs}/s@ "test",@@' \ |
| 135 |
- -i Configure || die |
| 136 |
- fi |
| 137 |
+ sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
| 138 |
# The config script does stupid stuff to prompt the user. Kill it. |
| 139 |
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
| 140 |
./config --test-sanity || die "I AM NOT SANE" |
| 141 |
@@ -136,18 +136,21 @@ multilib_src_configure() { |
| 142 |
echoit \ |
| 143 |
./${config} \ |
| 144 |
${sslout} \ |
| 145 |
- --api=1.1.0 \ |
| 146 |
$(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
| 147 |
enable-camellia \ |
| 148 |
- disable-deprecated \ |
| 149 |
$(use_ssl !bindist ec) \ |
| 150 |
${ec_nistp_64_gcc_128} \ |
| 151 |
enable-idea \ |
| 152 |
enable-mdc2 \ |
| 153 |
enable-rc5 \ |
| 154 |
+ enable-tlsext \ |
| 155 |
$(use_ssl asm) \ |
| 156 |
+ $(use_ssl gmp gmp -lgmp) \ |
| 157 |
+ $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
| 158 |
$(use_ssl rfc3779) \ |
| 159 |
$(use_ssl sctp) \ |
| 160 |
+ $(use_ssl sslv2 ssl2) \ |
| 161 |
+ $(use_ssl sslv3 ssl3) \ |
| 162 |
$(use_ssl tls-heartbeat heartbeats) \ |
| 163 |
$(use_ssl zlib) \ |
| 164 |
--prefix="${EPREFIX}"/usr \ |
| 165 |
@@ -157,19 +160,17 @@ multilib_src_configure() { |
| 166 |
|| die |
| 167 |
|
| 168 |
# Clean out hardcoded flags that openssl uses |
| 169 |
- # Fix quoting for sed |
| 170 |
- local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ |
| 171 |
- -e 's:^CFLAGS=::' \ |
| 172 |
+ local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
| 173 |
+ -e 's:^CFLAG=::' \ |
| 174 |
-e 's:-fomit-frame-pointer ::g' \ |
| 175 |
-e 's:-O[0-9] ::g' \ |
| 176 |
-e 's:-march=[-a-z0-9]* ::g' \ |
| 177 |
-e 's:-mcpu=[-a-z0-9]* ::g' \ |
| 178 |
-e 's:-m[a-z0-9]* ::g' \ |
| 179 |
- -e 's:\\:\\\\:g' \ |
| 180 |
) |
| 181 |
sed -i \ |
| 182 |
- -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ |
| 183 |
- -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ |
| 184 |
+ -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
| 185 |
+ -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
| 186 |
Makefile || die |
| 187 |
} |
| 188 |
|
| 189 |
@@ -178,6 +179,9 @@ multilib_src_compile() { |
| 190 |
# that it's -j1 as the code itself serializes subdirs |
| 191 |
emake -j1 depend |
| 192 |
emake all |
| 193 |
+ # rehash is needed to prep the certs/ dir; do this |
| 194 |
+ # separately to avoid parallel build issues. |
| 195 |
+ emake rehash |
| 196 |
} |
| 197 |
|
| 198 |
multilib_src_test() { |
| 199 |
@@ -185,7 +189,7 @@ multilib_src_test() { |
| 200 |
} |
| 201 |
|
| 202 |
multilib_src_install() { |
| 203 |
- emake DESTDIR="${D}" install |
| 204 |
+ emake INSTALL_PREFIX="${D}" install |
| 205 |
} |
| 206 |
|
| 207 |
multilib_src_install_all() { |
| 208 |
@@ -193,8 +197,9 @@ multilib_src_install_all() { |
| 209 |
# we provide a shell version via app-misc/c_rehash |
| 210 |
rm "${ED}"/usr/bin/c_rehash || die |
| 211 |
|
| 212 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el |
| 213 |
+ dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el |
| 214 |
dohtml -r doc/* |
| 215 |
+ use rfc3779 && dodoc engines/ccgost/README.gost |
| 216 |
|
| 217 |
# This is crappy in that the static archives are still built even |
| 218 |
# when USE=static-libs. But this is due to a failing in the openssl |
| 219 |
@@ -204,7 +209,9 @@ multilib_src_install_all() { |
| 220 |
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
| 221 |
|
| 222 |
# create the certs directory |
| 223 |
- keepdir ${SSL_CNF_DIR}/certs |
| 224 |
+ dodir ${SSL_CNF_DIR}/certs |
| 225 |
+ cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
| 226 |
+ rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
| 227 |
|
| 228 |
# Namespace openssl programs to prevent conflicts with other man pages |
| 229 |
cd "${ED}"/usr/share/man |
| 230 |
|
| 231 |
diff --git a/dev-libs/openssl/openssl-1.1.0a.ebuild b/dev-libs/openssl/openssl-1.1.0b.ebuild |
| 232 |
similarity index 100% |
| 233 |
rename from dev-libs/openssl/openssl-1.1.0a.ebuild |
| 234 |
rename to dev-libs/openssl/openssl-1.1.0b.ebuild |
Archives