gentoo resync : 16.04.2018

8 files changed, 52 insertions, 22 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index aaf21bd085fa..b8297578967c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ctorrent/Manifest b/net-p2p/ctorrent/Manifest
index 11be96e7807c..bc66c3709b71 100644
--- a/net-p2p/ctorrent/Manifest
+++ b/net-p2p/ctorrent/Manifest
@@ -1,7 +1,8 @@
 AUX ctorrent-3.3.2-empty-path-components.patch 838 BLAKE2B 429629e3a774738f49251886c3555ebcefc421fd0598cfcba22dac54326a5267d52d2ed5a575e5d8099420016be6135fad4ac80d2ac5571ec5eec606f6959eaa SHA512 0465d2c12b4bcd39a247a89c3623f425b53ebf879c50f0f042237a576877cebaaa05c32047878832f2acab1e9c6566f4f1341b1bcf5fbe149744c408a402c8f1
 AUX ctorrent-3.3.2-negative-ints.patch 442 BLAKE2B 5580122a22c750e253f6a229f83b4db37d2222a0cdf4c0b3cce217164ac558b622e426c064d211aa13a83e372754240e57753a401ff5d6b3aa071a5679ced8a2 SHA512 edc950552e3497d91a98ba320d4fbc49284f07f9a130230a765427b91e1dcde099610d5be16c4b9c9969a446d8908c18dd3884eb207901ae46e4b696d1215150
-AUX ctorrent-CVE-2009-1759.patch 10931 BLAKE2B 1806ab97b613281d375b80bc84762304c58fd0bc9f046b5a1fab5bc6b70577d5ee03b080f5e8b7f1b5907f2867f3c8808ece4797fb73a2ab92053f93857e2831 SHA512 ecfe47034e5f54ebc1c7b94b846f7a5f619496928a8dadd7624ae9f51d05ef13b4b6c030373fb5c4817d6e5aee659b072c5b31eb32ff306e4514e4fcb6e5c4ea
+AUX ctorrent-CVE-2009-1759.patch 10951 BLAKE2B 852f88d508f7b8d00f3e09d8076985adb16bc3e741adc3df8a152cfb79e5c4bf66759a4eec01405dbd706e0eb357f8dcef5004cbc99ed4fc55fe00330df67de2 SHA512 9ab3080fc58564e48f5404bb29affe621d4d5c52ded858378354084a350e9f7932d579433cdc25b684627116c728b70affe8a352a316eb028cab1f326c13ee20
 DIST ctorrent-dnh3.3.2.tar.gz 219053 BLAKE2B a05958e85721b8a119a9ee9fdf80071456420b023767bda1c19d9021646236745ee6515bea1213ea3a513fad47ae0f7ecb843504e8015b5ed23b964e16b08f4c SHA512 e59b2b899b8603e42a5754d5ce65f661b135b8e107140e0472af379b2b06ee2985239ed0ebf19dcaef788e617b99eac35ad32ad2d10352e2fcf5a6dc084d27dd
 EBUILD ctorrent-3.3.2-r2.ebuild 621 BLAKE2B acad04bb8ba23b8fa5c4ac763e3e5092af0ab3582a36b9232d13b616c2a427fb8ff6ce847e863b902d9f276ce71b5b5ea9818c7139459c3de51a630bd11e8071 SHA512 e7bf0ab4e23771852cbba7d7bd17b9c6695fa84a797b5ef200e68f02606bbedbd26277648856b036a2f025ad2122720340aadd81de7a831336910aaec36cac1c
 EBUILD ctorrent-3.3.2-r3.ebuild 680 BLAKE2B dff20a05e5188fb28a465226cfda971e1df04bf741d8c0795c258b8baae9b6caefc7cad93ec7f7f54ec18ce1d816a448eff62cfe8b96ead73be7849227c3e67a SHA512 6c8022bfd0f631159d44af684fb5c2a57dbb21f9694787dc720374d17f0b7d7474517ac54d06c164fdc1422570036cf67ef07c4483b81789af335fe3bb582be5
+EBUILD ctorrent-3.3.2-r4.ebuild 701 BLAKE2B 23c549be2f1df933df3690bdc23c328965126c1ff9966af0dbacea5145e3f562075590c00a75d0662367ddbe543a3021812c85beebcccf1272a7e1770ba688be SHA512 a58b3e1d6031f375c4717093d84959e7f6bdba87851461bca67b081736dd8e3022b163829198d4de3636306ca832c72964b133c6c9cd69393820c43272f60ac2
 MISC metadata.xml 245 BLAKE2B 135efc8148ddf902795388aef90e078b6e9793d8913798723b71abd479a0468bd68be0f21ab36508835ab5e4e5618a0e16d601aabc3755022df6b52075e51036 SHA512 2614273ab49d7d71d4a7c39fde414a2337c4f62fa92f9b803d900dcae5c79299c894a1161ff14269d20f436376c5388b3e3f0cd3ad9d2b6ae766366c7029d6bb
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
new file mode 100644
index 000000000000..415fc5234448
--- /dev/null
+++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-dnh${PV}"
+
+DESCRIPTION="Enhanced CTorrent is a BitTorrent console client written in C and C++"
+HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
+SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="libressl"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-CVE-2009-1759.patch
+	"${FILESDIR}"/${P}-negative-ints.patch
+	"${FILESDIR}"/${P}-empty-path-components.patch
+)
diff --git a/net-p2p/ctorrent/files/ctorrent-CVE-2009-1759.patch b/net-p2p/ctorrent/files/ctorrent-CVE-2009-1759.patch
index 196703099f60..f732278a18d0 100644
--- a/net-p2p/ctorrent/files/ctorrent-CVE-2009-1759.patch
+++ b/net-p2p/ctorrent/files/ctorrent-CVE-2009-1759.patch
@@ -3,8 +3,8 @@ Source: Upstream SVN, rev 302 from the drorrent-3 branch.
 
 Index: bencode.h
 ===================================================================
---- bencode.h	(revision 300)
-+++ bencode.h	(revision 302)
+--- a/bencode.h	(revision 300)
++++ b/bencode.h	(revision 302)
 @@ -25,7 +25,7 @@
  size_t decode_list(const char *b,size_t len,const char *keylist);
  size_t decode_rev(const char *b,size_t len,const char *keylist);
@@ -16,8 +16,8 @@ Index: bencode.h
  size_t bencode_int(const uint64_t integer, FILE *fp);
 Index: bencode.cpp
 ===================================================================
---- bencode.cpp	(revision 300)
-+++ bencode.cpp	(revision 302)
+--- a/bencode.cpp	(revision 300)
++++ b/bencode.cpp	(revision 302)
 @@ -233,22 +233,28 @@
    return bencode_end_dict_list(fp);
  }
@@ -53,8 +53,8 @@ Index: bencode.cpp
    return (pb - b + 1);
 Index: btfiles.cpp
 ===================================================================
---- btfiles.cpp	(revision 300)
-+++ btfiles.cpp	(revision 302)
+--- a/btfiles.cpp	(revision 300)
++++ b/btfiles.cpp	(revision 302)
 @@ -449,7 +449,8 @@
    return 0;
  }
@@ -334,8 +334,8 @@ Index: btfiles.cpp
  
 Index: btcontent.cpp
 ===================================================================
---- btcontent.cpp	(revision 300)
-+++ btcontent.cpp	(revision 302)
+--- a/btcontent.cpp	(revision 300)
++++ b/btcontent.cpp	(revision 302)
 @@ -357,7 +357,11 @@
  
    cfg_req_queue_length = (m_piece_length / cfg_req_slice_size) * 2 - 1;
@@ -351,8 +351,8 @@ Index: btcontent.cpp
    b = (char *)0;
 Index: btfiles.h
 ===================================================================
---- btfiles.h	(revision 300)
-+++ btfiles.h	(revision 302)
+--- a/btfiles.h	(revision 300)
++++ b/btfiles.h	(revision 302)
 @@ -61,7 +61,7 @@
    
    int BuildFromFS(const char *pathname);
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index f5346b4bab13..f29dd90fbc7d 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,6 +1,6 @@
 DIST ncdc-1.19.1.tar.gz 354308 BLAKE2B dc2f7e821c22d0ac1efbd6241ffcfc36f76676b90569aa459cd1a85b7e517104320757fd83ed918b0e2ea3ba4bd8343849b81f6700a25b968fa3db24c5ea2193 SHA512 36eda8c582ddb40ef732151ecc1654eae927a6a004430d8d27528b3c57ae5e1b06c23a867d8e1624ee4365031325fd7ced2888dd64ff129431bba9ff4171f189
 DIST ncdc-1.20.tar.gz 367688 BLAKE2B 33bf6cd92146b0cf3d188cec4b5c29f0860f91cbdf7a1ab33789985a61b706647591513fb596f89b21d3d8aebf683316397b94f184aac928a93e23fc17030e82 SHA512 0f20d6584aab1e69bcb3a93271a8542c5968adee5fd198b375dc258996b60ee5f642eac5d5e91c5513e367bbfd42eda80ede9e6e93ab38279c33e8da557010a7
-EBUILD ncdc-1.19.1.ebuild 709 BLAKE2B e68d2179bad3b264ec069a998cfb24ace7e3248968b5f08078dc2ee3cf3183a097fa06d7e47a55b6d5e399d359e141660f333a8b3a870b0437e0ed6ce6d8d8bc SHA512 5f292e933f0760ebeeb29f3ed0d14dbf16d2674bdd102d8ec7128f206988f7afb8d5dad9e7c0794216420330c018185ed16f76dcda631867b6166af211ebbc68
-EBUILD ncdc-1.20.ebuild 647 BLAKE2B 6f41e44f69a2d7ec89b35aa20306a7577e5e22d331a1c20b910d0bc275e087948267b53dd7a5419949ce5b8f428fb32b1e480a68cac14d4bf1948e703e3a04c4 SHA512 02fecd8d0ad832f8a71cccd2c757d669fc24341cf2ffe36a07763dedce0275d429760176a2c654f640536e582d0a0020374e806452c0cd7e3f570dd40e16f21f
-EBUILD ncdc-9999.ebuild 695 BLAKE2B b59488f09b8809515a8201b4e03c462cab2c6329ebba423a142cbf066e86cd8c1760bfd8a50bf0a0652095cd2d7aaab76d6a76370fe512b5d2c7b4b933b8a887 SHA512 4ae6a63180105862118ef725a994d67dfd6609b5a81401cf4deeddddd42ef810e1d7221167624d779acacd9958bd9759d9440a857d8e3f486f6a77580d500a46
+EBUILD ncdc-1.19.1.ebuild 711 BLAKE2B 05614f129f74b44f41462d23ec94416d92753639528dec6c8f0482758d64c0a42afc00e8f0fbf8b9eff17165388147897e747491bd47b34ca405ebcda40e1e5b SHA512 9e93fca4e84fa42cb986d30a405b3789767e80768c6b1813e21b01df840ff26a0cdf87bef8d71c443594ce616ab63d622a9114c1cc1c85e280759244217dbc8c
+EBUILD ncdc-1.20.ebuild 649 BLAKE2B 7eb95224df76314794a373e838e014ab4369599ca45bc5ab9d296364e01e7f13a246d74ea839e830b7629cad6254dd3d895054b2377e9a1a4e792ac868de9f3f SHA512 d530788351428522fa01c599b03f8dd9a1f7587542613ec8a396deeac6d282d41e3088b60d17fd830753a7df67960215ca3e7966f571cf1df885080e91f51296
+EBUILD ncdc-9999.ebuild 696 BLAKE2B 8fa87cdbb1ffc14650b8fa57a679460630e92f3d7061f0f12a48c0fd5ccdccddf58a1a19de94dd6dc0c2ec0d57996e2ba7b8fccf213d86c2ffd83de2903d3b00 SHA512 2198381e38d5da4d2c5fdc3382144ca341319fc72a643e8b66dca7f8dc470d1a5cfda7ecc453e235145a6dde8ee85803a4559b3adfb98b8e53938154ecf8a1c6
 MISC metadata.xml 531 BLAKE2B 1887f1ed902f0c7662b5100915d0adb712ae8a596e0427b9d0e51454389fd62e2e7545187b0bab021c92a02c932c893f3628cf1e79125bc42e1d766daf33fb12 SHA512 ca7f8462213f2aa1231d59e9d06b7c4243e994aae888df4cae59620f6297fc8f10c23db119737321c21771f5909e17d48ca5c117e5c684fa330ccc871bcc530a
diff --git a/net-p2p/ncdc/ncdc-1.19.1.ebuild b/net-p2p/ncdc/ncdc-1.19.1.ebuild
index 7810c157e08a..d58a060fb102 100644
--- a/net-p2p/ncdc/ncdc-1.19.1.ebuild
+++ b/net-p2p/ncdc/ncdc-1.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="http://dev.yorhel.nl/ncdc"
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-p2p/ncdc/ncdc-1.20.ebuild b/net-p2p/ncdc/ncdc-1.20.ebuild
index 6868ec7cf02f..dec62172d135 100644
--- a/net-p2p/ncdc/ncdc-1.20.ebuild
+++ b/net-p2p/ncdc/ncdc-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="http://dev.yorhel.nl/ncdc"
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index b140e9e32b3a..5759853e51ac 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="http://dev.yorhel.nl/ncdc"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
 EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
 
 LICENSE="MIT"