From 8b119a6c8aab5ac6a6b2cb3b79171229be895108 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Sun, 7 Aug 2016 18:26:57 -0400
Subject: [PATCH] app-mobilephone/smssend, dev-libs/skyutils: fix SSLv3
 support.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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
---
 .../{smssend-3.4-r1.ebuild => smssend-3.4-r2.ebuild}      | 4 +++-
 dev-libs/skyutils/metadata.xml                            | 6 ------
 .../{skyutils-2.8-r4.ebuild => skyutils-2.8-r5.ebuild}    | 8 ++------
 3 files changed, 5 insertions(+), 13 deletions(-)
 rename app-mobilephone/smssend/{smssend-3.4-r1.ebuild => smssend-3.4-r2.ebuild} (80%)
 rename dev-libs/skyutils/{skyutils-2.8-r4.ebuild => skyutils-2.8-r5.ebuild} (81%)

diff --git a/app-mobilephone/smssend/smssend-3.4-r1.ebuild b/app-mobilephone/smssend/smssend-3.4-r2.ebuild
similarity index 80%
rename from app-mobilephone/smssend/smssend-3.4-r1.ebuild
rename to 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
similarity index 81%
rename from dev-libs/skyutils/skyutils-2.8-r4.ebuild
rename to 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=(
-- 
2.26.2