summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2018-04-14 20:32:19 +0200
committerPacho Ramos <pacho@gentoo.org>2018-04-14 20:45:12 +0200
commitc4957cff7d40b12706a131db83a6af5f41af4c2e (patch)
treea2b0d917afcab204ba18e321f9f02005915265ae
parentghc-package.eclass: allow override of default ghc and ghc-pkg tools (diff)
downloadgentoo-c4957cff7d40b12706a131db83a6af5f41af4c2e.tar.gz
gentoo-c4957cff7d40b12706a131db83a6af5f41af4c2e.tar.bz2
gentoo-c4957cff7d40b12706a131db83a6af5f41af4c2e.zip
net-p2p/ctorrent: Support libressl (#602326)
Package-Manager: Portage-2.3.28, Repoman-2.3.9
-rw-r--r--net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild29
-rw-r--r--net-p2p/ctorrent/files/ctorrent-CVE-2009-1759.patch20
2 files changed, 39 insertions, 10 deletions
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);