net-news/newsboat: revbump 2.17.1, ssl deps and libressl patch

Bug: https://bugs.gentoo.org/694750
Closes: https://bugs.gentoo.org/701966
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

3 files changed, 109 insertions, 4 deletions

diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index c2b27f9bf8c6..178ba2b89b5f 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -14,6 +14,7 @@ DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST constant_time_eq-0.1.3.crate 1279 BLAKE2B 9c67df59e184ff479c5bcd0e11df936b0cac0ab899fe7c4a578df49c9ec6e8c83dd7cd9f1a70bcf08787b8f420ccd3e2c74b02743b350c47ffae8ce117933a6e SHA512 b605ef913ae39c4d9658e9240b9d3dc7736c8d668e83326fc3c68498ca177e40960047de1beee684a23ce96bdf3f80d5b76ef7db6f2758c7aeb14f7a2258a69e
+DIST curl-sys-0.4.12.crate 2859726 BLAKE2B 4041c315f629f2f776ed585e791ecf704b87bc51380576b6b24d66086aea328c1762174cc096b7448c551a7e46d22b1562a506e2f38bb92126c1e0c7d65a9f86 SHA512 3ddf0d9f5453fb943ac20cd42599e266c0dca7bf350c4abd673db2ce46e14462364a8503be79e5702e1ad773e244375ccd3d80cfd7f558513bb79cfdfc48ab7b
 DIST curl-sys-0.4.5.crate 2983237 BLAKE2B 07f111f6274051bee5ce69c680b067f687e4fd741c6ea155535fc24bd447345529475eb4c329010f86fa30b3a08dafcbb34eade53ab341240674a9376b98fc4c SHA512 04b7213d82037d80676f553c2595ea0f3cc69f22f8a85a389075026a1d2325cb61c4f4c5ff6a2842e1a0bbf44d4617f18c47eca5c6686394c6e1e01b67a4d18c
 DIST dirs-1.0.4.crate 12844 BLAKE2B 41807d6f2f2b69ee66fdfa9bbbe4148caa78afc951b63a4a67bfa0aad46c831fd7a255655e8832f8441ad9840900879cbd90e134e6393b257ee4afbc757b1b1d SHA512 a3416281a22eb4bd6929ff0857c963ffdd53ed9ffdd26d30603fd847ae0de68428b05691aba46232551b86b562d4b9dad18695fe7ee58247f9ad80a776863f44
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
@@ -28,6 +29,7 @@ DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
 DIST libz-sys-1.0.17.crate 632674 BLAKE2B 33c75d418d4337a1fc090eece0aa19ffd3259c9c9e3c267f1e0276bea88f8cdbb8b7eb552cd879df242f5a86541d22db5615b6db49d667589579f98113a1991f SHA512 1a944e5badbf9ac2ab7f235893971ccf259814b4dc2d83769508e4a1500bf2868828c91c7e841d5ad0b7d5ce185f8f904bf1887aa03289e5ef1e683d221e1cc9
+DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
 DIST locale_config-0.2.2.crate 20975 BLAKE2B e675c792f5092670cc9f3a3ffecc9c3c35b2bd81f9557f1303a22a817b16d2d42c2289dc9c811b77d7ba76c5a62251550cb683555f05260004ce88d0c964f114 SHA512 969565323cbd9d6e3713052afe08aea606d4b4a336015eb1cc5e73f9ce3415df5eb54e4254c8df09a3a79fcfa3de0ca8c8194bd596f373868ee2ed659ac90a41
 DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
@@ -42,6 +44,7 @@ DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST once_cell-0.1.8.crate 14908 BLAKE2B 08f25a9163ecf2b1e93b1060153a9d47057c0342cef98ffc2dd1373a89ca9de5938f8883683507ab91b1d688fce47ca19853801531ed439c925d1c32c22b80f0 SHA512 068e1f74a2da7377d8b9e5d879e075276cd70dbd07814a6026beb013c556f393e73159ce4de8d8d6b1185676761d830a19e749b8e569aaeb59a87d77bcb0271c
 DIST openssl-sys-0.9.46.crate 44219 BLAKE2B 843002eef29ec07a404bc87d888d0296935b4cd4d7f5705e27fc4a931dc8e866dbe27654b45fa881e83dc6d0d16e5c79bdc0feb568a5c1ec12cdb9dfdf33fa77 SHA512 d8468fffec982a6c02845cbc9dc9b93c7d58728bbf94592e2fcb4a3f204cee5b1ba4120a8b956e6a3782977ece23e8d0667d17d149104aac59d29b5adf514eec
+DIST openssl-sys-0.9.53.crate 45434 BLAKE2B 42fef72ebbf3bfcb8eeb6499d2965e297c4e4712ba06354020ae322aded58917e02a77028ddb165b5210e1352a29d74380a7ed93c1b6cb56aa722e803e0bfc70 SHA512 da0b34b5a58abf1b7e40dcdc1d9f4f6f0f8a4d5d8bb7b7417025a6ecf73145e80304541d2944050c162d7a9b1835434a9d7d2fb670d5cf1065055c09e35f940d
 DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
 DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
diff --git a/net-news/newsboat/files/newsboat-2.17.1-libressl.patch b/net-news/newsboat/files/newsboat-2.17.1-libressl.patch
new file mode 100644
index 000000000000..97f7ae9574f1
--- /dev/null
+++ b/net-news/newsboat/files/newsboat-2.17.1-libressl.patch
@@ -0,0 +1,98 @@
+--- newsboat-2.17.1/Cargo.lock	2019-12-04 13:42:07.256925256 +0100
++++ newsboat-2.17.1/Cargo.lock	2019-12-04 13:54:34.171901288 +0100
+@@ -124,13 +124,13 @@
+ 
+ [[package]]
+ name = "curl-sys"
+-version = "0.4.5"
++version = "0.4.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+  "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -234,12 +234,12 @@
+  "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gettext-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gettext-sys 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "natord 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -265,7 +265,7 @@
+ 
+ [[package]]
+ name = "libz-sys"
+-version = "1.0.17"
++version = "1.0.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -349,7 +349,7 @@
+ 
+ [[package]]
+ name = "openssl-sys"
+-version = "0.9.46"
++version = "0.9.53"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -884,7 +884,7 @@
+ "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+ "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+ "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
+-"checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a"
++"checksum curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "78800a6de442f65dab6ce26c6f369c14fc585686432bf4b77119d2d384216c31"
+ "checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a"
+ "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+ "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+@@ -897,7 +897,7 @@
+ "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+ "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+ "checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047"
+-"checksum libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5"
++"checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16"
+ "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab"
+ "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+ "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+@@ -908,7 +908,7 @@
+ "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+ "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
+ "checksum once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37"
+-"checksum openssl-sys 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)" = "05636e06b4f8762d4b81d24a351f3966f38bd25ccbcfd235606c91fdb82cc60f"
++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
+ "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
+ "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
+ "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+--- newsboat-2.17.1/rust/libnewsboat/Cargo.toml
++++ newsboat-2.17.1/rust/libnewsboat/Cargo.toml
+@@ -17,14 +17,14 @@
+ unicode-width = "0.1.5"
+ nom = "^4.1"
+ unicode-segmentation = "1"
+-curl-sys = "0.4.5"
++curl-sys = "0.4.12"
+ libc = "0.2"
+ gettext-rs = "0.4.1"
+ natord = "1.0.9"
+ 
+ # We don't use the following crates, but we pin their versions to make sure
+ # that Newsboat builds with Rust 1.25 and later.
+-libz-sys = "= 1.0.17"
++libz-sys = "= 1.0.18"
+ 
+ [dependencies.clap]
+ version = "2.33"
diff --git a/net-news/newsboat/newsboat-2.17.1.ebuild b/net-news/newsboat/newsboat-2.17.1-r1.ebuild
index 00e7d98f989a..ddf378badb9c 100644
--- a/net-news/newsboat/newsboat-2.17.1.ebuild
+++ b/net-news/newsboat/newsboat-2.17.1-r1.ebuild
@@ -20,7 +20,7 @@ chrono-0.4.6
 clap-2.33.0
 cloudabi-0.0.3
 constant_time_eq-0.1.3
-curl-sys-0.4.5
+curl-sys-0.4.12
 dirs-1.0.4
 failure-0.1.5
 failure_derive-0.1.5
@@ -33,7 +33,7 @@ kernel32-sys-0.2.2
 lazy_static-0.2.11
 lazy_static-1.2.0
 libc-0.2.48
-libz-sys-1.0.17
+libz-sys-1.0.18
 locale_config-0.2.2
 lock_api-0.1.5
 matches-0.1.8
@@ -44,7 +44,7 @@ nom-4.2.3
 num-integer-0.1.39
 num-traits-0.2.6
 once_cell-0.1.8
-openssl-sys-0.9.46
+openssl-sys-0.9.53
 parking_lot-0.7.1
 parking_lot_core-0.4.0
 percent-encoding-1.0.1
@@ -122,7 +122,7 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="libressl"
 
 RDEPEND="
 	>=dev-db/sqlite-3.5:3
@@ -136,10 +136,14 @@ DEPEND="${RDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig
 	sys-devel/gettext
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.11-flags.patch
+	"${FILESDIR}"/${PN}-2.17.1-libressl.patch
 )
 
 src_configure() {