diff options
author | Michael Orlitzky <mjo@gentoo.org> | 2016-08-07 18:26:57 -0400 |
---|---|---|
committer | Michael Orlitzky <mjo@gentoo.org> | 2016-08-07 18:32:19 -0400 |
commit | 8b119a6c8aab5ac6a6b2cb3b79171229be895108 (patch) | |
tree | 2d3cb48bd5be7e84f5eb72e7185c017bb61560d4 | |
parent | media-gfx/imagemagick: Bump to versions 6.9.5.5 and 7.0.2.7 (diff) | |
download | gentoo-8b119a6c8aab5ac6a6b2cb3b79171229be895108.tar.gz gentoo-8b119a6c8aab5ac6a6b2cb3b79171229be895108.tar.bz2 gentoo-8b119a6c8aab5ac6a6b2cb3b79171229be895108.zip |
app-mobilephone/smssend, dev-libs/skyutils: fix SSLv3 support.
In commits 790eacc and ac28332, I added an "sslv3" USE flag to
dev-libs/skyutils and revisioned app-mobilephone/smssend to depend on
it. This fix was insufficient; any other programs linking to
libskyutils would suffer the same problem, as Michał Górny pointed
out.
Two new revisions of the affected packages remove the "sslv3" option
for dev-libs/skyutils, and make it depend on openssl[sslv3] when the
user asks for SSL support. Note: this required the removal of LibreSSL
support on skyutils. The new revision of app-mobilephone/smssend now
depends on the fixed revision of skyutils.
An additional fix was made, and now smssend depends on
skyutils[ssl]. Without SSL support in libskyutils, many SMS providers
simply don't work.
Gentoo-Bug: 588326
-rw-r--r-- | app-mobilephone/smssend/smssend-3.4-r2.ebuild (renamed from app-mobilephone/smssend/smssend-3.4-r1.ebuild) | 4 | ||||
-rw-r--r-- | dev-libs/skyutils/metadata.xml | 6 | ||||
-rw-r--r-- | dev-libs/skyutils/skyutils-2.8-r5.ebuild (renamed from dev-libs/skyutils/skyutils-2.8-r4.ebuild) | 8 |
3 files changed, 5 insertions, 13 deletions
diff --git a/app-mobilephone/smssend/smssend-3.4-r1.ebuild b/app-mobilephone/smssend/smssend-3.4-r2.ebuild index 287ac04eec6f..be95746e2cd3 100644 --- a/app-mobilephone/smssend/smssend-3.4-r1.ebuild +++ b/app-mobilephone/smssend/smssend-3.4-r2.ebuild @@ -16,7 +16,9 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND=">=dev-libs/skyutils-2.7[sslv3]" +# -r5 of skyutils fixes a runtime crash, bug 588326. +# Without SSL support in skyutils, some providers fail. +DEPEND=">=dev-libs/skyutils-2.8-r5[ssl]" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-verizon.diff" ) diff --git a/dev-libs/skyutils/metadata.xml b/dev-libs/skyutils/metadata.xml index deb5277467ee..209c459554ad 100644 --- a/dev-libs/skyutils/metadata.xml +++ b/dev-libs/skyutils/metadata.xml @@ -6,10 +6,4 @@ This library contains many useful functions such as chained lists, string manipulation, socket, and the HTTP protocol. </longdescription> - - <use> - <flag name="sslv3"> - Require OpenSSL to be built with the old SSLv3 protocol enabled. - </flag> - </use> </pkgmetadata> diff --git a/dev-libs/skyutils/skyutils-2.8-r4.ebuild b/dev-libs/skyutils/skyutils-2.8-r5.ebuild index 252add28bbd8..48c855e6d5e4 100644 --- a/dev-libs/skyutils/skyutils-2.8-r4.ebuild +++ b/dev-libs/skyutils/skyutils-2.8-r5.ebuild @@ -13,13 +13,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="libressl ssl sslv3" -REQUIRED_USE="sslv3? ( ssl? ( !libressl ) )" +IUSE="ssl" -DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0=[sslv3?] ) - libressl? ( dev-libs/libressl:0= ) -)" +DEPEND="ssl? ( dev-libs/openssl:0=[sslv3] )" RDEPEND="${DEPEND}" PATCHES=( |