[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: 07e1efa8132f651286a95431e62469f1a53f6402 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Apr 30 16:48:19 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Apr 30 16:49:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e1efa8 net-p2p/ctorrent: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index 0c54c21409a..5700e3892e4 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,11 +12,9 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm ppc ~s390 ~sparc x86" -IUSE="libressl" RDEPEND=" - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/files/, net-p2p/ctorrent/
commit: af066c6b63a89f834a736181d7c892ebc453fecd Author: David Seifert gentoo org> AuthorDate: Sat Mar 21 15:01:44 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Mar 21 15:01:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af066c6b net-p2p/ctorrent: Add missing include Closes: https://bugs.gentoo.org/713752 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: David Seifert gentoo.org> net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 9 + net-p2p/ctorrent/files/ctorrent-3.3.2-sys-types_h.patch | 11 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index 000a6838b53..85457d846cf 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MY_P="${PN}-dnh${PV}" @@ -14,16 +14,17 @@ SLOT="0" KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86" IUSE="libressl" -S="${WORKDIR}/${MY_P}" - RDEPEND=" libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) " DEPEND="${RDEPEND}" +S="${WORKDIR}/${MY_P}" + PATCHES=( "${FILESDIR}"/${PN}-CVE-2009-1759.patch "${FILESDIR}"/${P}-negative-ints.patch "${FILESDIR}"/${P}-empty-path-components.patch + "${FILESDIR}"/${P}-sys-types_h.patch ) diff --git a/net-p2p/ctorrent/files/ctorrent-3.3.2-sys-types_h.patch b/net-p2p/ctorrent/files/ctorrent-3.3.2-sys-types_h.patch new file mode 100644 index 000..bf93cb2a3bb --- /dev/null +++ b/net-p2p/ctorrent/files/ctorrent-3.3.2-sys-types_h.patch @@ -0,0 +1,11 @@ +--- a/compat.c b/compat.c +@@ -8,6 +8,8 @@ + #include + #endif + ++#include ++ + #include "compat.h" + + #ifndef HAVE_CLOCK_GETTIME
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/, net-p2p/gtorrentviewer/, net-p2p/rtorrent/, ...
commit: fd0667fe79fd0ad1687008fc29d400bd2ddb3665 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 11 15:37:14 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 11 15:37:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0667fe net-p2p: Remove *-fbsd KEYWORDS Signed-off-by: Michał Górny gentoo.org> net-p2p/bittornado/bittornado-0.3.18-r4.ebuild | 2 +- net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild | 2 +- net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 2 +- net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild | 2 +- net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild | 2 +- net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild | 2 +- net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 2 +- net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 2 +- net-p2p/mldonkey/mldonkey-3.1.6.ebuild | 2 +- net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild | 2 +- net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild | 2 +- net-p2p/rtorrent/rtorrent-0.9.7.ebuild | 2 +- net-p2p/rtorrent/rtorrent-0.9.8.ebuild | 2 +- net-p2p/transmission/transmission-2.94-r1.ebuild| 2 +- net-p2p/transmission/transmission-.ebuild | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild b/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild index 65522c0ef29..b08cf00354d 100644 --- a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild +++ b/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild @@ -20,7 +20,7 @@ SRC_URI="http://download2.bittornado.com/download/${MY_P}.tar.gz; LICENSE="MIT GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]" diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild index f745bef28bb..9b2dcca61fd 100644 --- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild +++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/effigies/BitTornado/archive/${EGIT_COMMIT}.tar.gz -> LICENSE="MIT GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index d921f9ff372..000a6838b53 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86" IUSE="libressl" S="${WORKDIR}/${MY_P}" diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild index f47119c78d9..0dec1bcfd05 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/; SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 x86" RDEPEND=" sys-libs/binutils-libs:= diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild index 9bbefd21a8c..b7e9bc27bfc 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/; SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ppc ~ppc64 x86" RDEPEND=" sys-libs/binutils-libs:= diff --git a/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild b/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild index dafc8d42581..e9712a50b7f 100644 --- a/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild +++ b/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://gtorrentviewer.sourceforge.net/; SRC_URI="mirror://sourceforge/gtorrentviewer/${MY_P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc x86" SLOT="0" IUSE="" diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild index 2f99a446acc..37f706a8420 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: 0dfc495ed2d5bfc1677c5b01340285c0d9677839 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Feb 18 07:37:52 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Feb 18 07:37:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dfc495e net-p2p/ctorrent: Drop old Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild | 27 --- net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild | 28 2 files changed, 55 deletions(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild deleted file mode 100644 index a93b57767ba..000 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -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="" - -S=${WORKDIR}/${MY_P} - -DEPEND="dev-libs/openssl:=" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch - epatch "${FILESDIR}"/${P}-negative-ints.patch -} diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild deleted file mode 100644 index ba96a9a0cf3..000 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -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="" - -S=${WORKDIR}/${MY_P} - -DEPEND="dev-libs/openssl:=" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch - epatch "${FILESDIR}"/${P}-negative-ints.patch - epatch "${FILESDIR}"/${P}-empty-path-components.patch -}
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: f4355044094f31a379284c8914bce1b0d5131b73 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Feb 18 07:35:37 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Feb 18 07:35:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4355044 net-p2p/ctorrent: arm stable wrt bug #676750 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="arm" net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index c175d7cf552..64d5545aec8 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="libressl" S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: a72fa1979ab6ec1fc3f8d578908aa2c6db422f04 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Feb 18 07:36:03 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Feb 18 07:36:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72fa197 net-p2p/ctorrent: amd64 stable wrt bug #676750 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index 64d5545aec8..d921f9ff372 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="libressl" S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: c1c1347c1b4163b05e05762106925e7df0a32364 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Feb 15 01:28:27 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 15 01:36:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c1347c net-p2p/ctorrent: x86 stable (bug #676750) Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index 1681587e969..c175d7cf552 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="libressl" S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: 09b24dcd4f01fea6e1131d368361f1db0e555bd1 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Feb 2 20:20:03 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Feb 2 20:44:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b24dcd net-p2p/ctorrent: stable 3.3.2-r4 for ppc, bug #676750 Package-Manager: Portage-2.3.59, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild index 415fc523444..1681587e969 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="libressl" S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/, net-p2p/ctorrent/files/
commit: c4957cff7d40b12706a131db83a6af5f41af4c2e Author: Pacho Ramos gentoo org> AuthorDate: Sat Apr 14 18:32:19 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Apr 14 18:45:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4957cff net-p2p/ctorrent: Support libressl (#602326) Package-Manager: Portage-2.3.28, Repoman-2.3.9 net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 29 ++ .../ctorrent/files/ctorrent-CVE-2009-1759.patch| 20 +++ 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 000..415fc523444 --- /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 196703099f6..f732278a18d 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);
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/files/, net-p2p/ctorrent/
commit: dc985c3cb2c8094313f60553c2a488f9bd39002d Author: Mike Frysinger gentoo org> AuthorDate: Sun Sep 13 02:51:39 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Sep 13 02:52:22 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc985c3c net-p2p/ctorrent: workaround broken rTorrent files net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild | 29 + .../ctorrent-3.3.2-empty-path-components.patch | 38 ++ 2 files changed, 67 insertions(+) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild new file mode 100644 index 000..d667683 --- /dev/null +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils + +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="" + +S=${WORKDIR}/${MY_P} + +DEPEND="dev-libs/openssl:=" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch + epatch "${FILESDIR}"/${P}-negative-ints.patch + epatch "${FILESDIR}"/${P}-empty-path-components.patch +} diff --git a/net-p2p/ctorrent/files/ctorrent-3.3.2-empty-path-components.patch b/net-p2p/ctorrent/files/ctorrent-3.3.2-empty-path-components.patch new file mode 100644 index 000..fce41d4 --- /dev/null +++ b/net-p2p/ctorrent/files/ctorrent-3.3.2-empty-path-components.patch @@ -0,0 +1,38 @@ +rTorrent sometimes creates invalid torrents which has empty path components. +the bitorrent spec allows for "" strings, but they make no sense in paths. +so instead of always adding a / in between, skip them. ugh. + +for example: +dict { + 'info' => dict { + 'name' => str = "some dir" (len = 8) + 'files' => list [ + dict { + 'length' => int = 12345567 + 'path' => list [ + str = "" (len = 0) + str = "foo.bin" (len = 7) + ] + } + ... + ] + ... + } + ... +} + +ctorrent will then try to fetch the file "/some dir/foo.bin" instead of +"some dir/foo.bin" (relative to $PWD). + +--- a/bencode.cpp b/bencode.cpp +@@ -258,7 +258,8 @@ + n -= r; + if( 'e' == *pb ) break; + if( pathname >= endmax ) return 0; +-*pathname++ = PATH_SP; ++if (q) ++ *pathname++ = PATH_SP; + } + *pathname = '\0'; + return (pb - b + 1);
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: 2a957b1a21c7d88bc05b4715b7e9f151c37c1831 Author: Mike Frysinger vapier AT gentoo DOT org AuthorDate: Mon Aug 10 04:24:26 2015 + Commit: Mike Frysinger vapier AT gentoo DOT org CommitDate: Mon Aug 10 04:29:13 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a957b1a ctorrent: RDEPEND: add openssl net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild index 751caa5..a3ae152 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild @@ -20,6 +20,7 @@ IUSE= S=${WORKDIR}/${MY_P} DEPEND=dev-libs/openssl +RDEPEND=${DEPEND} src_prepare() { epatch ${FILESDIR}/${PN}-CVE-2009-1759.patch
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ctorrent/
commit: 987e6e59a7329c5f6d14d990fdb995b5af97517a Author: Mike Frysinger vapier AT gentoo DOT org AuthorDate: Mon Aug 10 04:27:52 2015 + Commit: Mike Frysinger vapier AT gentoo DOT org CommitDate: Mon Aug 10 04:29:14 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987e6e59 ctorrent: EAPI: update to 5 net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild index a3ae152..8749c4c 100644 --- a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild +++ b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=2 +EAPI=5 inherit eutils @@ -19,15 +19,10 @@ IUSE= S=${WORKDIR}/${MY_P} -DEPEND=dev-libs/openssl +DEPEND=dev-libs/openssl:= RDEPEND=${DEPEND} src_prepare() { epatch ${FILESDIR}/${PN}-CVE-2009-1759.patch epatch ${FILESDIR}/${P}-negative-ints.patch } - -src_install() { - emake DESTDIR=${D} install || die - dodoc AUTHORS ChangeLog README-DNH.TXT README NEWS -}