[gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2015-10-03 18:57 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2015-10-03 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e9f79718d75e1e2a9b1f5e11073f50b03617fed2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 18:56:15 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 18:57:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f79718

net-p2p/transmission: Fix issue with encryption with libevent-2.1.5

Backported upstream patches.

Bug: https://bugs.gentoo.org/536922

Package-Manager: portage-2.2.22_p5

 .../transmission/files/2.84-libevent-2.1.5.patch   | 112 ++++++++++++++
 net-p2p/transmission/transmission-2.84-r2.ebuild   | 164 +++++++++++++++++++++
 2 files changed, 276 insertions(+)

diff --git a/net-p2p/transmission/files/2.84-libevent-2.1.5.patch b/net-p2p/transmission/files/2.84-libevent-2.1.5.patch
new file mode 100644
index 0000000..48101eb
--- /dev/null
+++ b/net-p2p/transmission/files/2.84-libevent-2.1.5.patch
@@ -0,0 +1,112 @@
+Fix runtime issues with libevent-2.1.5
+
+Bug: https://bugs.gentoo.org/536922
+Index: libtransmission/peer-io.c
+===================================================================
+--- libtransmission/peer-io.c	(revision 14541)
++++ libtransmission/peer-io.c	(revision 14545)
+@@ -1041,6 +1041,33 @@
+ ***
+ **/
+ 
++static inline void
++processBuffer (tr_crypto        * crypto,
++               struct evbuffer  * buffer,
++               size_t             offset,
++               size_t             size,
++               void            (* callback) (tr_crypto *, size_t, const void *, void *))
++{
++    struct evbuffer_ptr pos;
++    struct evbuffer_iovec iovec;
++
++    evbuffer_ptr_set (buffer, &pos, offset, EVBUFFER_PTR_SET);
++
++    do
++    {
++        if (evbuffer_peek (buffer, size, &pos, &iovec, 1) <= 0)
++            break;
++
++        callback (crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
++
++        assert (size >= iovec.iov_len);
++        size -= iovec.iov_len;
++    }
++    while (!evbuffer_ptr_set (buffer, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
++
++    assert (size == 0);
++}
++
+ static void
+ addDatatype (tr_peerIo * io, size_t byteCount, bool isPieceData)
+ {
+@@ -1051,19 +1078,14 @@
+     peer_io_push_datatype (io, d);
+ }
+ 
+-static void
+-maybeEncryptBuffer (tr_peerIo * io, struct evbuffer * buf)
++static inline void
++maybeEncryptBuffer (tr_peerIo       * io,
++                    struct evbuffer * buf,
++                    size_t            offset,
++                    size_t            size)
+ {
+     if (io->encryption_type == PEER_ENCRYPTION_RC4)
+-    {
+-        struct evbuffer_ptr pos;
+-        struct evbuffer_iovec iovec;
+-        evbuffer_ptr_set (buf, &pos, 0, EVBUFFER_PTR_SET);
+-        do {
+-            evbuffer_peek (buf, -1, &pos, &iovec, 1);
+-            tr_cryptoEncrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
+-        } while (!evbuffer_ptr_set (buf, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
+-    }
++        processBuffer (&io->crypto, buf, offset, size, &tr_cryptoEncrypt);
+ }
+ 
+ void
+@@ -1070,7 +1092,7 @@
+ tr_peerIoWriteBuf (tr_peerIo * io, struct evbuffer * buf, bool isPieceData)
+ {
+     const size_t byteCount = evbuffer_get_length (buf);
+-    maybeEncryptBuffer (io, buf);
++    maybeEncryptBuffer (io, buf, 0, byteCount);
+     evbuffer_add_buffer (io->outbuf, buf);
+     addDatatype (io, byteCount, isPieceData);
+ }
+@@ -1126,6 +1148,16 @@
+ ****
+ ***/
+ 
++static inline void
++maybeDecryptBuffer (tr_peerIo       * io,
++                    struct evbuffer * buf,
++                    size_t            offset,
++                    size_t            size)
++{
++    if (io->encryption_type == PEER_ENCRYPTION_RC4)
++        processBuffer (&io->crypto, buf, offset, size, &tr_cryptoDecrypt);
++}
++
+ void
+ tr_peerIoReadBytesToBuf (tr_peerIo * io, struct evbuffer * inbuf, struct evbuffer * outbuf, size_t byteCount)
+ {
+@@ -1141,17 +1173,7 @@
+     evbuffer_add_buffer (outbuf, tmp);
+     evbuffer_free (tmp);
+ 
+-    /* decrypt if needed */
+-    if (io->encryption_type == PEER_ENCRYPTION_RC4) {
+-        struct evbuffer_ptr pos;
+-        struct evbuffer_iovec iovec;
+-        evbuffer_ptr_set (outbuf, &pos, old_length, EVBUFFER_PTR_SET);
+-        do {
+-            evbuffer_peek (outbuf, byteCount, &pos, &iovec, 1);
+-            tr_cryptoDecrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
+-            byteCount -= iovec.iov_len;
+-        } while (!evbuffer_ptr_set (outbuf, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
+-    }
++    maybeDecryptBuffer (io, outbuf, old_length, byteCount);
+ }
+ 
+ void

diff --git a/net-p2p/transmission/transmission-2.84-r2.ebuild b/net-p2p/transmission/transmission-2.84-r2.ebuild
new file mode 100644
index 0000000..49e1f80
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.84-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils qmake-utils systemd user
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk lightweight systemd qt4 qt5 xfs"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+
+RDEPEND=">=dev-libs/libevent-2.0.10:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp:=
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3:=[ssl]
+	sys-libs/zlib:=
+	gtk? (
+		>=dev-libs/dbus-glib-0.100:=
+		>=dev-libs/glib-2.32:2=
+		>=x11-libs/gtk+-3.4:3=
+		ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
+		)
+	systemd? ( sys-apps/systemd:= )
+	qt4? (
+		dev-qt/qtcore:4=
+		dev-qt/qtgui:4=
+		dev-qt/qtdbus:4=
+		)
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtdbus:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtwidgets:5=
+		)"
+DEPEND="${RDEPEND}
+	>=dev-libs/glib-2.32
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig
+	xfs? ( sys-fs/xfsprogs )"
+
+REQUIRED_USE="ayatana? ( gtk ) ?? ( qt4 qt5 )"
+
+DOCS="AUTHORS NEWS qt/README.txt"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+	# Trick to avoid automagic dependency
+	use ayatana || { sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die; }
+	# Pass our configuration dir to systemd unit file
+	sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/${PN}-daemon.service || die
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${PN}/Makefile.am || die
+	# Fix for broken translations path
+	epatch "${FILESDIR}"/${PN}-2.80-translations-path-fix.patch
+	# http://trac.transmissionbt.com/ticket/5700
+	sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+
+	epatch "${FILESDIR}/2.84-miniupnp14.patch"
+	epatch "${FILESDIR}/2.84-libevent-2.1.5.patch"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+	econf \
+		--enable-external-natpmp \
+		$(use_enable lightweight) \
+		$(use_with systemd systemd-daemon) \
+		$(use_with gtk)
+
+	if use qt4 || use qt5; then
+		pushd qt >/dev/null || die
+		use qt4 && eqmake4 qtr.pro
+		use qt5 && eqmake5 qtr.pro
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use qt4 || use qt5; then
+		use qt4 && local -x QT_SELECT=4
+		use qt5 && local -x QT_SELECT=5
+		emake -C qt
+		lrelease qt/translations/*.ts || die
+	fi
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.9 ${PN}-daemon
+	newconfd "${FILESDIR}"/${PN}-daemon.confd.4 ${PN}-daemon
+	systemd_dounit daemon/${PN}-daemon.service
+
+	keepdir /var/{lib/${PN}/{config,downloads},log/${PN}}
+	fowners -R ${PN}:${PN} /var/{lib/${PN}/{,config,downloads},log/${PN}}
+
+	if use qt4 || use qt5; then
+		pushd qt >/dev/null || die
+		emake INSTALL_ROOT="${ED}"/usr install
+
+		domenu ${PN}-qt.desktop
+
+		local res
+		for res in 16 22 24 32 48 64 72 96 128 192 256; do
+			doicon -s ${res} icons/hicolor/${res}x${res}/${PN}-qt.png
+		done
+		doicon -s scalable icons/hicolor/scalable/${PN}-qt.svg
+
+		use qt4 && insinto /usr/share/qt4/translations
+		use qt5 && insinto /usr/share/qt5/translations
+		doins translations/*.qm
+		popd >/dev/null || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "If you use ${PN}-daemon, please, set 'rpc-username' and"
+	elog "'rpc-password' (in plain text, ${PN}-daemon will hash it on"
+	elog "start) in settings.json file located at /var/lib/${PN}/config or"
+	elog "any other appropriate config directory."
+	elog
+	elog "Since µTP is enabled by default, ${PN} needs large kernel buffers for"
+	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+	elog " net.core.rmem_max = 4194304"
+	elog " net.core.wmem_max = 1048576"
+	elog "and run sysctl -p"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2016-03-04  2:41 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2016-03-04  2:41 UTC (permalink / raw
  To: gentoo-commits

commit:     803531857196864988838036e52f5b255e855c42
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 02:41:17 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 02:41:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80353185

net-p2p/transmission: Bump to 2.90

Also modernize the init script.

Package-Manager: portage-2.2.27_p64

 net-p2p/transmission/Manifest                      |   1 +
 .../files/transmission-daemon.initd.10             |  43 ++++++
 net-p2p/transmission/transmission-2.90.ebuild      | 158 +++++++++++++++++++++
 3 files changed, 202 insertions(+)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 7de950d..13521d0 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1 +1,2 @@
 DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
+DIST transmission-2.90.tar.xz 3377720 SHA256 69ff8caf81684155926f437f46bf7df1b1fb304f52c7809f546257e8923f2fd2 SHA512 09c8e90cb1c7b508e3956d294ba9b5f01b4093c9f934c76d7515e96915c657b97f02819e1365dbbfecbdf489ae5757346d8bb2dd8e0070c304af434006495fda WHIRLPOOL a51a86603ddf208c73b6e86a05eda2d90636407c7c716fb959fa460a72908aafe2d82f46c1fe3d7afda52ba845d73924d0f26f107a2446644809f7cfd5985275

diff --git a/net-p2p/transmission/files/transmission-daemon.initd.10 b/net-p2p/transmission/files/transmission-daemon.initd.10
new file mode 100644
index 0000000..7acb222
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.10
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command="/usr/bin/transmission-daemon"
+extra_started_commands="reload"
+description="Transmission is a fast, easy and free bittorrent client"
+description_start="Start transmission-daemon server and web interface"
+description_stop="Stop transmission-daemon server and web interface"
+description_reload="Reload transmission-daemon settings"
+
+rundir=${rundir:-/var/run/transmission}
+pidfile=${pidfile:-${rundir}/transmission.pid}
+config_dir=${config_dir:-/var/lib/transmission/config}
+download_dir=${download_dir:-/var/lib/transmission/downloads}
+logfile=${logfile:-/var/log/transmission/transmission.log}
+runas_user=${runas_user:-transmission:transmission}
+
+retry="TERM/45/QUIT/15"
+
+start_pre() {
+	command_args="
+		--config-dir ${config_dir}
+		--download-dir ${download_dir}
+		--pid-file ${pidfile}
+		${TRANSMISSION_OPTIONS}
+	"
+	command_user="${runas_user}"
+
+	checkpath -d -o ${runas_user} "${rundir}" /var/lib/transmission "${config_dir}" "${download_dir}" || return
+
+	if [ "${logfile}" != syslog ]; then
+		checkpath -d -o ${runas_user} /var/log/transmission || return
+		command_args="${command_args} --logfile ${logfile}"
+	fi
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --exec "${command}" --pidfile "${pidfile}"
+	eend $?
+}

diff --git a/net-p2p/transmission/transmission-2.90.ebuild b/net-p2p/transmission/transmission-2.90.ebuild
new file mode 100644
index 0000000..96c12ef
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.90.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools fdo-mime gnome2-utils qmake-utils systemd user
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk libressl lightweight systemd qt4 qt5 xfs"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+
+RDEPEND=">=dev-libs/libevent-2.0.10:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl )
+	net-libs/libnatpmp:=
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3:=[ssl]
+	sys-libs/zlib:=
+	gtk? (
+		>=dev-libs/dbus-glib-0.100:=
+		>=dev-libs/glib-2.32:2=
+		>=x11-libs/gtk+-3.4:3=
+		ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
+		)
+	systemd? ( sys-apps/systemd:= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtdbus:4
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		)"
+DEPEND="${RDEPEND}
+	>=dev-libs/glib-2.32
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	xfs? ( sys-fs/xfsprogs )"
+
+REQUIRED_USE="ayatana? ( gtk ) ?? ( qt4 qt5 )"
+
+DOCS="AUTHORS NEWS qt/README.txt"
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+
+	# Trick to avoid automagic dependency
+	use ayatana || { sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die; }
+
+	# Pass our configuration dir to systemd unit file
+	sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/transmission-daemon.service || die
+
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+	econf \
+		--enable-external-natpmp \
+		$(use_enable lightweight) \
+		$(use_with systemd systemd-daemon) \
+		$(use_with gtk)
+
+	if use qt4 || use qt5; then
+		pushd qt >/dev/null || die
+		use qt4 && eqmake4 qtr.pro
+		use qt5 && eqmake5 qtr.pro
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use qt4 || use qt5; then
+		local qt_bindir
+		use qt4 && qt_bindir=$(qt4_get_bindir)
+		use qt5 && qt_bindir=$(qt5_get_bindir)
+		emake -C qt
+		"${qt_bindir}"/lrelease qt/translations/*.ts || die
+	fi
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/transmission/web/LICENSE || die
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+	systemd_dounit daemon/transmission-daemon.service
+
+	if use qt4 || use qt5; then
+		pushd qt >/dev/null || die
+		emake INSTALL_ROOT="${ED}"/usr install
+
+		domenu transmission-qt.desktop
+
+		local res
+		for res in 16 22 24 32 48 64 72 96 128 192 256; do
+			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
+		done
+		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
+
+		use qt4 && insinto /usr/share/qt4/translations
+		use qt5 && insinto /usr/share/qt5/translations
+		doins translations/*.qm
+		popd >/dev/null || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	enewgroup transmission
+	enewuser transmission -1 -1 -1 transmission
+
+	elog "If you use transmission-daemon, please, set 'rpc-username' and"
+	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
+	elog "start) in settings.json file located at /var/lib/transmission/config or"
+	elog "any other appropriate config directory."
+	elog
+	elog "Since µTP is enabled by default, transmission needs large kernel buffers for"
+	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+	elog " net.core.rmem_max = 4194304"
+	elog " net.core.wmem_max = 1048576"
+	elog "and run sysctl -p"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2016-03-16 17:06 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2016-03-16 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     5d45c75941a5fd40b933e9f9d04d9dc9f25dcaf6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 17:03:24 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 17:05:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d45c759

net-p2p/transmission: Fix building against recent libsystemd

Package-Manager: portage-2.2.28_p60

 net-p2p/transmission/files/libsystemd.patch   | 11 +++++++++++
 net-p2p/transmission/transmission-2.92.ebuild |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/net-p2p/transmission/files/libsystemd.patch b/net-p2p/transmission/files/libsystemd.patch
new file mode 100644
index 0000000..5db47ef
--- /dev/null
+++ b/net-p2p/transmission/files/libsystemd.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,7 @@
+             [Add support for systemd startup notification (default is autodetected)]),
+             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
+ AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
+-    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
++    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
+         [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
+         [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
+             [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]

diff --git a/net-p2p/transmission/transmission-2.92.ebuild b/net-p2p/transmission/transmission-2.92.ebuild
index 96c12ef..68a80b3 100644
--- a/net-p2p/transmission/transmission-2.92.ebuild
+++ b/net-p2p/transmission/transmission-2.92.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/libevent-2.0.10:=
 		>=x11-libs/gtk+-3.4:3=
 		ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
 		)
-	systemd? ( sys-apps/systemd:= )
+	systemd? ( >=sys-apps/systemd-209:= )
 	qt4? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -56,6 +56,10 @@ REQUIRED_USE="ayatana? ( gtk ) ?? ( qt4 qt5 )"
 
 DOCS="AUTHORS NEWS qt/README.txt"
 
+PATCHES=(
+	"${FILESDIR}"/libsystemd.patch
+)
+
 src_prepare() {
 	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
 
@@ -68,7 +72,7 @@ src_prepare() {
 	# http://trac.transmissionbt.com/ticket/4324
 	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
 
-	eapply_user
+	default
 	eautoreconf
 }
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2016-04-24  3:27 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2016-04-24  3:27 UTC (permalink / raw
  To: gentoo-commits

commit:     0692b037ffd8d2ac0b202f29dc842141bb7ee83d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 03:20:00 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 03:27:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0692b037

net-p2p/transmission: systemd: Move config-dir to a service.d file

Package-Manager: portage-2.2.28_p71

 net-p2p/transmission/files/transmission-daemon.service.conf | 2 ++
 net-p2p/transmission/transmission-2.92.ebuild               | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-p2p/transmission/files/transmission-daemon.service.conf b/net-p2p/transmission/files/transmission-daemon.service.conf
new file mode 100644
index 0000000..ae543ca
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.service.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment=TRANSMISSION_HOME=/var/lib/transmission/config

diff --git a/net-p2p/transmission/transmission-2.92.ebuild b/net-p2p/transmission/transmission-2.92.ebuild
index 4ae6553..a1d9b1b 100644
--- a/net-p2p/transmission/transmission-2.92.ebuild
+++ b/net-p2p/transmission/transmission-2.92.ebuild
@@ -66,9 +66,6 @@ src_prepare() {
 	# Trick to avoid automagic dependency
 	use ayatana || { sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die; }
 
-	# Pass our configuration dir to systemd unit file
-	sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/transmission-daemon.service || die
-
 	# http://trac.transmissionbt.com/ticket/4324
 	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
 
@@ -120,6 +117,7 @@ src_install() {
 	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
 	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
 	systemd_dounit daemon/transmission-daemon.service
+	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
 
 	if use qt4 || use qt5; then
 		pushd qt >/dev/null || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2018-03-10 18:21 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2018-03-10 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     20e14e6a5d031c7112d7346a6abe26324e876bc3
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 18:21:02 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 18:21:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e14e6a

net-p2p/transmission: fix build with libressl

Closes: https://bugs.gentoo.org/646354
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81

 net-p2p/transmission/files/transmission-2.93-libressl.patch | 11 +++++++++++
 net-p2p/transmission/transmission-2.93.ebuild               |  1 +
 2 files changed, 12 insertions(+)

diff --git a/net-p2p/transmission/files/transmission-2.93-libressl.patch b/net-p2p/transmission/files/transmission-2.93-libressl.patch
new file mode 100644
index 00000000000..8c978ced269
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.93-libressl.patch
@@ -0,0 +1,11 @@
+--- a/libtransmission/crypto-utils-openssl.c
++++ b/libtransmission/crypto-utils-openssl.c
+@@ -230,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t   handle,
+ ****
+ ***/
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static inline int
+ DH_set0_pqg (DH     * dh,
+              BIGNUM * p,

diff --git a/net-p2p/transmission/transmission-2.93.ebuild b/net-p2p/transmission/transmission-2.93.ebuild
index d5235cc1c65..f4d38bcde3f 100644
--- a/net-p2p/transmission/transmission-2.93.ebuild
+++ b/net-p2p/transmission/transmission-2.93.ebuild
@@ -52,6 +52,7 @@ DOCS=( AUTHORS NEWS qt/README.txt )
 
 PATCHES=(
 	"${FILESDIR}"/libsystemd.patch
+	"${FILESDIR}"/transmission-2.93-libressl.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2018-06-20  2:24 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2018-06-20  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     95598f0d18961b3b1e09855fa8abb353ccff7450
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 02:24:09 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 02:24:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95598f0d

net-p2p/transmission: remove old

Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247

 net-p2p/transmission/Manifest                      |   1 -
 .../files/transmission-2.92-handshake.patch        |  33 ---
 .../files/transmission-2.92-pr468.patch            | 302 ---------------------
 net-p2p/transmission/transmission-2.92-r2.ebuild   | 164 -----------
 net-p2p/transmission/transmission-2.92-r3.ebuild   | 165 -----------
 5 files changed, 665 deletions(-)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index ce243d76192..a938d3a1d5d 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,3 +1,2 @@
-DIST transmission-2.92.tar.xz 3378116 BLAKE2B 8929a2eab8a1617db44ca8a081fd7de786daef92e891ac86d4690451c0f4fa0d4e1ea03692c59babea6e9aee5dcfef57bd81e5c72a0bb4fe9efbd436ff006104 SHA512 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11
 DIST transmission-2.93.tar.xz 3363868 BLAKE2B 786a8daec548d96b05d90c238cc7b67d402dc0d828860bb1a79b8059c687de309288be17fd12fd51abeafa28d9630fd19be9513c76cbf091f81ce9a181596042 SHA512 7565893f67fc10f1b683814fa4d365d841ec833bc8dfdab731432fe68f1a38daeb4c9100653763f16bfb4336fba11c9b0b9730a9817e17a140704a7c4aa5c087
 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7

diff --git a/net-p2p/transmission/files/transmission-2.92-handshake.patch b/net-p2p/transmission/files/transmission-2.92-handshake.patch
deleted file mode 100644
index a30cd583fae..00000000000
--- a/net-p2p/transmission/files/transmission-2.92-handshake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4c00df9463ea4fd70b73c620e439f5c3ee5efa60
-Author: Mike Gelfand <mikedld@mikedld.com>
-Date:   Sun Sep 18 13:58:15 2016 +0300
-
-    Abort handshake if establishing DH shared secret fails
-    
-    Fixes #27
-
-diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
-index c728696..e7ff131 100644
---- a/libtransmission/handshake.c
-+++ b/libtransmission/handshake.c
-@@ -425,7 +425,8 @@ readYb (tr_handshake * handshake, struct evbuffer * inbuf)
- 
-   /* compute the secret */
-   evbuffer_remove (inbuf, yb, KEY_LEN);
--  tr_cryptoComputeSecret (handshake->crypto, yb);
-+  if (!tr_cryptoComputeSecret (handshake->crypto, yb))
-+    return tr_handshakeDone (handshake, false);
- 
-   /* now send these: HASH ('req1', S), HASH ('req2', SKEY) xor HASH ('req3', S),
-    * ENCRYPT (VC, crypto_provide, len (PadC), PadC, len (IA)), ENCRYPT (IA) */
-@@ -741,7 +742,9 @@ readYa (tr_handshake    * handshake,
- 
-   /* read the incoming peer's public key */
-   evbuffer_remove (inbuf, ya, KEY_LEN);
--  tr_cryptoComputeSecret (handshake->crypto, ya);
-+  if (!tr_cryptoComputeSecret (handshake->crypto, ya))
-+    return tr_handshakeDone (handshake, false);
-+
-   computeRequestHash (handshake, "req1", handshake->myReq1);
- 
-   /* send our public key to the peer */

diff --git a/net-p2p/transmission/files/transmission-2.92-pr468.patch b/net-p2p/transmission/files/transmission-2.92-pr468.patch
deleted file mode 100644
index a3a0cf16082..00000000000
--- a/net-p2p/transmission/files/transmission-2.92-pr468.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-Fix a weakness that allows remote code execution via the Transmission
-RPC server using DNS rebinding:
-
-https://bugs.chromium.org/p/project-zero/issues/detail?id=1447
-
-Patch adapted from Tavis Ormandy's patch on the Transmission master
-branch to the Transmission 2.92 release by Leo Famulari
-<leo@famulari.name>:
-
-https://github.com/transmission/transmission/pull/468/commits
-
-From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
-From: Tavis Ormandy <taviso@google.com>
-Date: Thu, 11 Jan 2018 10:00:41 -0800
-Subject: [PATCH] mitigate dns rebinding attacks against daemon
-
----
- libtransmission/quark.c        |   2 + 
- libtransmission/quark.h        |   2 + 
- libtransmission/rpc-server.c   | 116 +++++++++++++++++++++++++++++++++++++----
- libtransmission/rpc-server.h   |   4 ++
- libtransmission/session.c      |   2 + 
- libtransmission/transmission.h |   1 + 
- libtransmission/web.c          |   3 ++
- 7 files changed, 121 insertions(+), 9 deletions(-)
-
-diff --git a/libtransmission/quark.c b/libtransmission/quark.c
-index 30cc2bca4..b4fd7aabd 100644
---- a/libtransmission/quark.c
-+++ b/libtransmission/quark.c
-@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] =
-   { "rpc-authentication-required", 27 },
-   { "rpc-bind-address", 16 },
-   { "rpc-enabled", 11 },
-+  { "rpc-host-whitelist", 18 },
-+  { "rpc-host-whitelist-enabled", 26 },
-   { "rpc-password", 12 },
-   { "rpc-port", 8 },
-   { "rpc-url", 7 },
-diff --git a/libtransmission/quark.h b/libtransmission/quark.h
-index 7f5212733..17464be8f 100644
---- a/libtransmission/quark.h
-+++ b/libtransmission/quark.h
-@@ -291,6 +291,8 @@ enum
-   TR_KEY_rpc_authentication_required,
-   TR_KEY_rpc_bind_address,
-   TR_KEY_rpc_enabled,
-+  TR_KEY_rpc_host_whitelist,
-+  TR_KEY_rpc_host_whitelist_enabled,
-   TR_KEY_rpc_password,
-   TR_KEY_rpc_port,
-   TR_KEY_rpc_url,
-diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
-index a3485f3fa..292cd5fce 100644
---- a/libtransmission/rpc-server.c
-+++ b/libtransmission/rpc-server.c
-@@ -52,6 +52,7 @@ struct tr_rpc_server
-     bool               isEnabled;
-     bool               isPasswordEnabled;
-     bool               isWhitelistEnabled;
-+    bool               isHostWhitelistEnabled;
-     tr_port            port;
-     char             * url;
-     struct in_addr     bindAddress;
-@@ -63,6 +64,7 @@ struct tr_rpc_server
-     char             * password;
-     char             * whitelistStr;
-     tr_list          * whitelist;
-+    tr_list          * hostWhitelist;
- 
-     char             * sessionId;
-     time_t             sessionIdExpiresAt;
-@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address)
-   return false;
- }
- 
-+static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req)
-+{
-+    /* If password auth is enabled, any hostname is permitted. */
-+    if (server->isPasswordEnabled)
-+    {
-+        return true;
-+    }
-+
-+    char const* const host = evhttp_find_header(req->input_headers, "Host");
-+
-+    // If whitelist is disabled, no restrictions.
-+    if (!server->isHostWhitelistEnabled)
-+        return true;
-+
-+    /* No host header, invalid request. */
-+    if (host == NULL)
-+    {
-+        return false;
-+    }
-+
-+    /* Host header might include the port. */
-+    char* const hostname = tr_strndup(host, strcspn(host, ":"));
-+
-+    /* localhost or ipaddress is always acceptable. */
-+    if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname))
-+    {
-+        tr_free(hostname);
-+        return true;
-+    }
-+
-+    /* Otherwise, hostname must be whitelisted. */
-+    for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) {
-+        if (tr_wildmat(hostname, l->data))
-+        {
-+            tr_free(hostname);
-+            return true;
-+        }
-+    }
-+
-+    tr_free(hostname);
-+    return false;
-+}
-+
- static bool
- test_session_id (struct tr_rpc_server * server, struct evhttp_request * req)
- {
-@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg)
-           handle_upload (req, server);
-         }
- #ifdef REQUIRE_SESSION_ID
-+        else if (!isHostnameAllowed(server, req))
-+        {
-+            char* tmp = tr_strdup_printf(
-+                "<p>Transmission received your request, but the hostname was unrecognized.</p>"
-+                "<p>To fix this, choose one of the following options:"
-+                "<ul>"
-+                "<li>Enable password authentication, then any hostname is allowed.</li>"
-+                "<li>Add the hostname you want to use to the whitelist in settings.</li>"
-+                "</ul></p>"
-+                "<p>If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.</p>"
-+                "<p>This requirement has been added to help prevent "
-+                "<a href=\"https://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding</a> "
-+                "attacks.</p>");
-+            send_simple_response(req, 421, tmp);
-+            tr_free(tmp);
-+        }
-+
-       else if (!test_session_id (server, req))
-         {
-           const char * sessionId = get_current_session_id (server);
-@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg)
-             "<li> When you get this 409 error message, resend your request with the updated header"
-             "</ol></p>"
-             "<p>This requirement has been added to help prevent "
--            "<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
-+            "<a href=\"https://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
-             "attacks.</p>"
-             "<p><code>%s: %s</code></p>",
-             TR_RPC_SESSION_ID_HEADER, sessionId);
-@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server)
-   return server->url ? server->url : "";
- }
- 
--void
--tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
-+static void
-+tr_rpcSetList (char const* whitelistStr, tr_list** list)
- {
-   void * tmp;
-   const char * walk;
- 
--  /* keep the string */
--  tmp = server->whitelistStr;
--  server->whitelistStr = tr_strdup (whitelistStr);
--  tr_free (tmp);
--
-   /* clear out the old whitelist entries */
--  while ((tmp = tr_list_pop_front (&server->whitelist)))
-+  while ((tmp = tr_list_pop_front (list)) != NULL)
-     tr_free (tmp);
- 
-   /* build the new whitelist entries */
-@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
-       const char * delimiters = " ,;";
-       const size_t len = strcspn (walk, delimiters);
-       char * token = tr_strndup (walk, len);
--      tr_list_append (&server->whitelist, token);
-+      tr_list_append (list, token);
-       if (strcspn (token, "+-") < len)
-         tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'!  Are you using an old ACL by mistake?)", token);
-       else
-@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
-     }
- }
- 
-+void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr)
-+{
-+    tr_rpcSetList(whitelistStr, &server->hostWhitelist);
-+}
-+
-+void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr)
-+{
-+    /* keep the string */
-+    char* const tmp = server->whitelistStr;
-+    server->whitelistStr = tr_strdup(whitelistStr);
-+    tr_free(tmp);
-+
-+    tr_rpcSetList(whitelistStr, &server->whitelist);
-+}
-+
- const char*
- tr_rpcGetWhitelist (const tr_rpc_server * server)
- {
-@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server)
-   return server->isWhitelistEnabled;
- }
- 
-+void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled)
-+{
-+    server->isHostWhitelistEnabled = isEnabled;
-+}
-+
- /****
- *****  PASSWORD
- ****/
-@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session  * session, tr_variant * settings)
-   else
-     tr_rpcSetWhitelistEnabled (s, boolVal);
- 
-+  key = TR_KEY_rpc_host_whitelist_enabled;
-+
-+  if (!tr_variantDictFindBool(settings, key, &boolVal))
-+  {
-+      missing_settings_key(key);
-+  }
-+  else
-+  {
-+      tr_rpcSetHostWhitelistEnabled(s, boolVal);
-+  }
-+
-+  key = TR_KEY_rpc_host_whitelist;
-+
-+  if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL)
-+  {
-+      missing_settings_key(key);
-+  }
-+  else
-+  {
-+      tr_rpcSetHostWhitelist(s, str);
-+  }
-+
-   key = TR_KEY_rpc_authentication_required;
-   if (!tr_variantDictFindBool (settings, key, &boolVal))
-     missing_settings_key (key);
-diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
-index e0302c5ea..8c9e6b24e 100644
---- a/libtransmission/rpc-server.h
-+++ b/libtransmission/rpc-server.h
-@@ -49,6 +49,10 @@ void            tr_rpcSetWhitelist (tr_rpc_server * server,
- 
- const char*     tr_rpcGetWhitelist (const tr_rpc_server * server);
- 
-+void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled);
-+
-+void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist);
-+
- void            tr_rpcSetPassword (tr_rpc_server * server,
-                                    const char *    password);
- 
-diff --git a/libtransmission/session.c b/libtransmission/session.c
-index 844cadba8..58b717913 100644
---- a/libtransmission/session.c
-+++ b/libtransmission/session.c
-@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d)
-   tr_variantDictAddStr  (d, TR_KEY_rpc_username,                    "");
-   tr_variantDictAddStr  (d, TR_KEY_rpc_whitelist,                   TR_DEFAULT_RPC_WHITELIST);
-   tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled,           true);
-+  tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST);
-+  tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true);
-   tr_variantDictAddInt  (d, TR_KEY_rpc_port,                        atoi (TR_DEFAULT_RPC_PORT_STR));
-   tr_variantDictAddStr  (d, TR_KEY_rpc_url,                         TR_DEFAULT_RPC_URL_STR);
-   tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled,  true);
-diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
-index 4f76adfd6..e213a8f4e 100644
---- a/libtransmission/transmission.h
-+++ b/libtransmission/transmission.h
-@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void);
- #define TR_DEFAULT_BIND_ADDRESS_IPV4        "0.0.0.0"
- #define TR_DEFAULT_BIND_ADDRESS_IPV6             "::"
- #define TR_DEFAULT_RPC_WHITELIST          "127.0.0.1"
-+#define TR_DEFAULT_RPC_HOST_WHITELIST              ""
- #define TR_DEFAULT_RPC_PORT_STR                "9091"
- #define TR_DEFAULT_RPC_URL_STR       "/transmission/"
- #define TR_DEFAULT_PEER_PORT_STR              "51413"
-diff --git a/libtransmission/web.c b/libtransmission/web.c
-index ee495e9fc..c7f062730 100644
---- a/libtransmission/web.c
-+++ b/libtransmission/web.c
-@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code)
-       case 415: return "Unsupported Media Type";
-       case 416: return "Requested Range Not Satisfiable";
-       case 417: return "Expectation Failed";
-+      case 421: return "Misdirected Request";
-       case 500: return "Internal Server Error";
-       case 501: return "Not Implemented";
-       case 502: return "Bad Gateway";

diff --git a/net-p2p/transmission/transmission-2.92-r2.ebuild b/net-p2p/transmission/transmission-2.92-r2.ebuild
deleted file mode 100644
index ba43a7787f0..00000000000
--- a/net-p2p/transmission/transmission-2.92-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools fdo-mime flag-o-matic gnome2-utils qmake-utils systemd user
-
-DESCRIPTION="A Fast, Easy and Free BitTorrent client"
-HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT=0
-IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND=">=dev-libs/libevent-2.0.10:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		)
-	systemd? ( >=sys-apps/systemd-209:= )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.32
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	xfs? ( sys-fs/xfsprogs )"
-
-REQUIRED_USE="ayatana? ( gtk )"
-
-DOCS=( AUTHORS NEWS qt/README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/libsystemd.patch
-	"${FILESDIR}/${P}-handshake.patch"
-)
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
-
-	# Trick to avoid automagic dependency
-	if ! use ayatana ; then
-		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
-	fi
-
-	# http://trac.transmissionbt.com/ticket/4324
-	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_xfs_xfs_h=$(usex xfs)
-
-	# https://bugs.gentoo.org/577528
-	append-lfs-flags
-
-	econf \
-		--enable-external-natpmp \
-		$(use_enable lightweight) \
-		$(use_with systemd systemd-daemon) \
-		$(use_with gtk)
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		eqmake5 qtr.pro
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt5; then
-		emake -C qt
-		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-	systemd_dounit daemon/transmission-daemon.service
-	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		emake INSTALL_ROOT="${ED%/}"/usr install
-
-		domenu transmission-qt.desktop
-
-		local res
-		for res in 16 22 24 32 48 64 72 96 128 192 256; do
-			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
-		done
-		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
-
-		insinto /usr/share/qt5/translations
-		doins translations/*.qm
-		popd >/dev/null || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	enewgroup transmission
-	enewuser transmission -1 -1 /var/lib/transmission transmission
-
-	if [[ ! -e "${EROOT%/}"/var/lib/transmission ]]; then
-		mkdir -p "${EROOT%/}"/var/lib/transmission || die
-		chown transmission:transmission "${EROOT%/}"/var/lib/transmission || die
-	fi
-
-	elog "If you use transmission-daemon, please, set 'rpc-username' and"
-	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
-	elog "start) in settings.json file located at /var/lib/transmission/config or"
-	elog "any other appropriate config directory."
-	elog
-	elog "Since µTP is enabled by default, transmission needs large kernel buffers for"
-	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
-	elog " net.core.rmem_max = 4194304"
-	elog " net.core.wmem_max = 1048576"
-	elog "and run sysctl -p"
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/net-p2p/transmission/transmission-2.92-r3.ebuild b/net-p2p/transmission/transmission-2.92-r3.ebuild
deleted file mode 100644
index 839052138da..00000000000
--- a/net-p2p/transmission/transmission-2.92-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools fdo-mime flag-o-matic gnome2-utils qmake-utils systemd user
-
-DESCRIPTION="A Fast, Easy and Free BitTorrent client"
-HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT=0
-IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND=">=dev-libs/libevent-2.0.10:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		)
-	systemd? ( >=sys-apps/systemd-209:= )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.32
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	xfs? ( sys-fs/xfsprogs )"
-
-REQUIRED_USE="ayatana? ( gtk )"
-
-DOCS=( AUTHORS NEWS qt/README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/libsystemd.patch
-	"${FILESDIR}"/transmission-2.92-handshake.patch
-	"${FILESDIR}"/transmission-2.92-pr468.patch
-)
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
-
-	# Trick to avoid automagic dependency
-	if ! use ayatana ; then
-		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
-	fi
-
-	# http://trac.transmissionbt.com/ticket/4324
-	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_xfs_xfs_h=$(usex xfs)
-
-	# https://bugs.gentoo.org/577528
-	append-lfs-flags
-
-	econf \
-		--enable-external-natpmp \
-		$(use_enable lightweight) \
-		$(use_with systemd systemd-daemon) \
-		$(use_with gtk)
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		eqmake5 qtr.pro
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt5; then
-		emake -C qt
-		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-	systemd_dounit daemon/transmission-daemon.service
-	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		emake INSTALL_ROOT="${ED%/}"/usr install
-
-		domenu transmission-qt.desktop
-
-		local res
-		for res in 16 22 24 32 48 64 72 96 128 192 256; do
-			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
-		done
-		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
-
-		insinto /usr/share/qt5/translations
-		doins translations/*.qm
-		popd >/dev/null || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	enewgroup transmission
-	enewuser transmission -1 -1 /var/lib/transmission transmission
-
-	if [[ ! -e "${EROOT%/}"/var/lib/transmission ]]; then
-		mkdir -p "${EROOT%/}"/var/lib/transmission || die
-		chown transmission:transmission "${EROOT%/}"/var/lib/transmission || die
-	fi
-
-	elog "If you use transmission-daemon, please, set 'rpc-username' and"
-	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
-	elog "start) in settings.json file located at /var/lib/transmission/config or"
-	elog "any other appropriate config directory."
-	elog
-	elog "Since µTP is enabled by default, transmission needs large kernel buffers for"
-	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
-	elog " net.core.rmem_max = 4194304"
-	elog " net.core.wmem_max = 1048576"
-	elog "and run sysctl -p"
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2020-07-18 13:19 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2020-07-18 13:19 UTC (permalink / raw
  To: gentoo-commits

commit:     55ade643b77337f69d7511f1f3f06806e4ca0328
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 13:18:03 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 13:19:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ade643

net-p2p/transmission: remove old

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-p2p/transmission/Manifest                    |   1 -
 net-p2p/transmission/files/libsystemd.patch      |  11 --
 net-p2p/transmission/metadata.xml                |   1 -
 net-p2p/transmission/transmission-2.94-r1.ebuild | 159 -----------------------
 4 files changed, 172 deletions(-)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5fd51e6815c..1b20bc82f39 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,2 +1 @@
-DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76

diff --git a/net-p2p/transmission/files/libsystemd.patch b/net-p2p/transmission/files/libsystemd.patch
deleted file mode 100644
index 5db47ef39bd..00000000000
--- a/net-p2p/transmission/files/libsystemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,7 @@
-             [Add support for systemd startup notification (default is autodetected)]),
-             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
-         [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-         [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-             [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]

diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index a5cf0e4c937..f4f00780e76 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
 		<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
-		<flag name="xfs">Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-p2p/transmission/transmission-2.94-r1.ebuild b/net-p2p/transmission/transmission-2.94-r1.ebuild
deleted file mode 100644
index 432fe079c92..00000000000
--- a/net-p2p/transmission/transmission-2.94-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils qmake-utils systemd xdg-utils
-
-DESCRIPTION="A Fast, Easy and Free BitTorrent client"
-HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT=0
-IUSE="appindicator gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		appindicator? ( >=dev-libs/libappindicator-0.4.90:3 )
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		)
-	systemd? ( >=sys-apps/systemd-209:= )"
-DEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-	>=dev-libs/glib-2.32
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	xfs? ( sys-fs/xfsprogs )"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}"
-
-REQUIRED_USE="appindicator? ( gtk )"
-
-DOCS=( AUTHORS NEWS qt/README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/libsystemd.patch
-)
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
-
-	# Trick to avoid automagic dependency
-	if ! use appindicator ; then
-		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
-	fi
-
-	# http://trac.transmissionbt.com/ticket/4324
-	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_xfs_xfs_h=$(usex xfs)
-
-	# https://bugs.gentoo.org/577528
-	append-lfs-flags
-
-	econf \
-		--enable-external-natpmp \
-		$(use_enable lightweight) \
-		$(use_with systemd systemd-daemon) \
-		$(use_with gtk)
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		eqmake5 qtr.pro
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt5; then
-		emake -C qt
-		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-	systemd_dounit daemon/transmission-daemon.service
-	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		emake INSTALL_ROOT="${ED%/}"/usr install
-
-		domenu transmission-qt.desktop
-
-		local res
-		for res in 16 22 24 32 48 64 72 96 128 192 256; do
-			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
-		done
-		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
-
-		insinto /usr/share/qt5/translations
-		doins translations/*.qm
-		popd >/dev/null || die
-	fi
-
-	if [[ ${EUID} == 0 ]]; then
-		diropts -o transmission -g transmission
-	fi
-	keepdir /var/lib/transmission
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2022-10-24 15:26 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2022-10-24 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     bd8ba891e5de806c0725eab7e22753bb0c6b262d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 15:25:26 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 15:25:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8ba891

net-p2p/transmission: fix progress bars in Qt UI

Closes: https://bugs.gentoo.org/878099
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 ...ransmission-3.00-horizontal-progress-bars.patch | 36 ++++++++++++++++++++++
 ...-3.00-r4.ebuild => transmission-3.00-r5.ebuild} |  1 +
 2 files changed, 37 insertions(+)

diff --git a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
new file mode 100644
index 000000000000..63d8ca2fe274
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/878099
+https://github.com/transmission/transmission/issues/3150
+
+--- a/qt/FileTreeDelegate.cc
++++ a/qt/FileTreeDelegate.cc
+@@ -49,7 +49,7 @@
+     if (column == FileTreeModel::COL_PROGRESS)
+     {
+         QStyleOptionProgressBar p;
+-        p.state = option.state | QStyle::State_Small;
++        p.state = option.state | QStyle::State_Horizontal | QStyle::State_Small;
+         p.direction = qApp->layoutDirection();
+         p.rect = option.rect;
+         p.rect.setSize(QSize(option.rect.width() - 4, option.rect.height() - 8));
+--- a/qt/TorrentDelegate.cc
++++ a/qt/TorrentDelegate.cc
+@@ -545,7 +545,7 @@
+         progressBarState = QStyle::State_None;
+     }
+ 
+-    progressBarState |= QStyle::State_Small;
++    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
+ 
+     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
+     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
+--- a/qt/TorrentDelegateMin.cc
++++ a/qt/TorrentDelegateMin.cc
+@@ -218,7 +218,7 @@
+         progressBarState = QStyle::State_None;
+     }
+ 
+-    progressBarState |= QStyle::State_Small;
++    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
+ 
+     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
+     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();

diff --git a/net-p2p/transmission/transmission-3.00-r4.ebuild b/net-p2p/transmission/transmission-3.00-r5.ebuild
similarity index 98%
rename from net-p2p/transmission/transmission-3.00-r4.ebuild
rename to net-p2p/transmission/transmission-3.00-r5.ebuild
index 2b31213bed1f..6a12e5a07a73 100644
--- a/net-p2p/transmission/transmission-3.00-r4.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r5.ebuild
@@ -68,6 +68,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/cmake-unused-command-line.patch
 	"${FILESDIR}"/transmission-3.00-openssl-3.patch
+	"${FILESDIR}"/transmission-3.00-horizontal-progress-bars.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/
@ 2024-06-10 20:15 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2024-06-10 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e76703c71078a8a95a403bface08c405c6db1774
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 20:10:01 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 20:14:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76703c7

net-p2p/transmission: drop 3.00-r6, 4.0.3, 4.0.3-r1, 4.0.4

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-p2p/transmission/Manifest                      |   3 -
 .../files/cmake-unused-command-line.patch          |  21 ---
 ...ransmission-3.00-horizontal-progress-bars.patch |  36 -----
 .../files/transmission-3.00-openssl-3.patch        |  37 -----
 net-p2p/transmission/metadata.xml                  |   1 -
 net-p2p/transmission/transmission-3.00-r6.ebuild   | 137 ------------------
 net-p2p/transmission/transmission-4.0.3-r1.ebuild  | 153 ---------------------
 net-p2p/transmission/transmission-4.0.3.ebuild     | 153 ---------------------
 net-p2p/transmission/transmission-4.0.4.ebuild     | 153 ---------------------
 9 files changed, 694 deletions(-)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index dde3fc627b5a..ee2b56c96a39 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,2 @@
-DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
-DIST transmission-4.0.3.tar.xz 10062044 BLAKE2B 3d58f002d57458869e143e4a3617c8992e51a01f15f0e17031bc2913f404a455cde3397bde404f84a2234d12411e99b2902e4213ca6811b95288bb68f9b98553 SHA512 246d4af2f9b399cb5a6e43ca0852d2ab5ff48d2a5c89d0f450c968fcad042ef2e45fef3c9be8ffbf37e7c61dc509929869b6bf59914333818ddf6950582d669c
-DIST transmission-4.0.4.tar.xz 9755152 BLAKE2B 0cdf6075dffba941cbb47924879e8849938620068f3389fe6d5a03b100d11d66a0d33692738001092b8ac3ea181d9cfb554ba1bb2553dc7f06fd83b04f7e0ca9 SHA512 3ddb36c46cc496c16bc4571678dfec33bd3697b6ace656d0f57a6c32279e937cbce91d11cf1895721e880be0c20cc6f88b71a0663dc32879c44d31a3611bd6ef
 DIST transmission-4.0.5.tar.xz 9745756 BLAKE2B 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997 SHA512 9d3df965929ba18aa8186f89060aeacc8ead3df4a5acdc74a005dc62deadc5fa239af99c49ca2477cc5c1adfcd834481105f1dbc94e0efe210e9e6680bfec124
 DIST transmission-4.0.6.tar.xz 11908296 BLAKE2B 3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e16508ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a SHA512 d11654bd5174a990d8021fde890389bc7c073f63f80e1335bb2c250aff60f06d0b6481fb041ae4fdccd1c43278c71ddc36f692d7dda3ed2a1aaa9bd1bbc2cb0c

diff --git a/net-p2p/transmission/files/cmake-unused-command-line.patch b/net-p2p/transmission/files/cmake-unused-command-line.patch
deleted file mode 100644
index 6e0af5dc7cc9..000000000000
--- a/net-p2p/transmission/files/cmake-unused-command-line.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 63b8fd6391cd30bb45e1c9432f69c43ade9bb7ea Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 23 May 2020 22:25:42 -0400
-Subject: [PATCH] Do not warn about unused command line options
-
----
- cmake/TrMacros.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/TrMacros.cmake b/cmake/TrMacros.cmake
-index 5e439126f..674b2ede0 100644
---- a/cmake/TrMacros.cmake
-+++ b/cmake/TrMacros.cmake
-@@ -95,6 +95,7 @@ macro(tr_add_external_auto_library ID DIRNAME LIBNAME)
-             PREFIX "${${ID}_PREFIX}"
-             CMAKE_ARGS
-                 -Wno-dev # We don't want to be warned over unused variables
-+		--no-warn-unused-cli
-                 "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}"
-                 "-DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_USER_MAKE_RULES_OVERRIDE}"
-                 "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"

diff --git a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
deleted file mode 100644
index 63d8ca2fe274..000000000000
--- a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/878099
-https://github.com/transmission/transmission/issues/3150
-
---- a/qt/FileTreeDelegate.cc
-+++ a/qt/FileTreeDelegate.cc
-@@ -49,7 +49,7 @@
-     if (column == FileTreeModel::COL_PROGRESS)
-     {
-         QStyleOptionProgressBar p;
--        p.state = option.state | QStyle::State_Small;
-+        p.state = option.state | QStyle::State_Horizontal | QStyle::State_Small;
-         p.direction = qApp->layoutDirection();
-         p.rect = option.rect;
-         p.rect.setSize(QSize(option.rect.width() - 4, option.rect.height() - 8));
---- a/qt/TorrentDelegate.cc
-+++ a/qt/TorrentDelegate.cc
-@@ -545,7 +545,7 @@
-         progressBarState = QStyle::State_None;
-     }
- 
--    progressBarState |= QStyle::State_Small;
-+    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
- 
-     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
-     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
---- a/qt/TorrentDelegateMin.cc
-+++ a/qt/TorrentDelegateMin.cc
-@@ -218,7 +218,7 @@
-         progressBarState = QStyle::State_None;
-     }
- 
--    progressBarState |= QStyle::State_Small;
-+    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
- 
-     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
-     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();

diff --git a/net-p2p/transmission/files/transmission-3.00-openssl-3.patch b/net-p2p/transmission/files/transmission-3.00-openssl-3.patch
deleted file mode 100644
index f288298cbf3d..000000000000
--- a/net-p2p/transmission/files/transmission-3.00-openssl-3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 15 May 2022 10:54:38 -0400
-Subject: [PATCH] openssl: load "legacy" provider for RC4
-
----
- libtransmission/crypto-utils-openssl.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
-index 45fd71913..14d680654 100644
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -20,6 +20,9 @@
- #include <openssl/rand.h>
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
-+#if OPENSSL_VERSION_MAJOR >= 3
-+#include <openssl/provider.h>
-+#endif
- 
- #include "transmission.h"
- #include "crypto-utils.h"
-@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle)
- 
- tr_rc4_ctx_t tr_rc4_new(void)
- {
-+#if OPENSSL_VERSION_MAJOR >= 3
-+    OSSL_PROVIDER_load(NULL, "default");
-+    OSSL_PROVIDER_load(NULL, "legacy");
-+#endif
-     EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new();
- 
-     if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1)))
--- 
-2.35.1
-

diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 25854b5ac42d..7977f9390453 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="cli">Build command-line client</flag>
 		<flag name="debug">Enable assertions</flag>
-		<flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
 		<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-p2p/transmission/transmission-3.00-r6.ebuild b/net-p2p/transmission/transmission-3.00-r6.ebuild
deleted file mode 100644
index 820cbc376d71..000000000000
--- a/net-p2p/transmission/transmission-3.00-r6.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2006-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic systemd xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/transmission/transmission"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A fast, easy, and free BitTorrent client"
-HOMEPAGE="https://transmissionbt.com/"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT="0"
-IUSE="appindicator cli debug gtk lightweight nls mbedtls qt5 systemd test"
-RESTRICT="!test? ( test )"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-BDEPEND="${ACCT_DEPEND}
-	virtual/pkgconfig
-	nls? (
-		gtk? ( sys-devel/gettext )
-		qt5? ( dev-qt/linguist-tools:5 )
-	)
-"
-COMMON_DEPEND="
-	>=dev-libs/libevent-2.0.10:=
-	!mbedtls? ( dev-libs/openssl:0= )
-	mbedtls? ( net-libs/mbedtls:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	nls? ( virtual/libintl )
-	gtk? (
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		appindicator? ( >=dev-libs/libappindicator-0.4.30:3 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtdbus:5
-	)
-	systemd? ( >=sys-apps/systemd-209:= )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/cmake-unused-command-line.patch
-	"${FILESDIR}"/transmission-3.00-openssl-3.patch
-	"${FILESDIR}"/transmission-3.00-horizontal-progress-bars.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		-DENABLE_CLI=$(usex cli ON OFF)
-		-DENABLE_GTK=$(usex gtk ON OFF)
-		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
-		-DENABLE_NLS=$(usex nls ON OFF)
-		-DENABLE_QT=$(usex qt5 ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
-
-		-DUSE_SYSTEM_EVENT2=ON
-		-DUSE_SYSTEM_DHT=OFF
-		-DUSE_SYSTEM_MINIUPNPC=ON
-		-DUSE_SYSTEM_NATPMP=ON
-		-DUSE_SYSTEM_UTP=OFF
-		-DUSE_SYSTEM_B64=OFF
-
-		-DWITH_CRYPTO=$(usex mbedtls polarssl openssl)
-		-DWITH_INOTIFY=ON
-		-DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-	)
-
-	# Disable assertions by default, bug 893870.
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-
-	if use systemd; then
-		# Service sets Type=notify
-		systemd_dounit daemon/transmission-daemon.service
-		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-	fi
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	if [[ ${EUID} == 0 ]]; then
-		diropts -o transmission -g transmission
-	fi
-	keepdir /var/lib/transmission
-}
-
-pkg_postrm() {
-	if use gtk || use qt5; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use qt5; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}

diff --git a/net-p2p/transmission/transmission-4.0.3-r1.ebuild b/net-p2p/transmission/transmission-4.0.3-r1.ebuild
deleted file mode 100644
index ad6df4c46340..000000000000
--- a/net-p2p/transmission/transmission-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2006-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic tmpfiles systemd xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/transmission/transmission"
-else
-	MY_PV="${PV/_beta/-beta.}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A fast, easy, and free BitTorrent client"
-HOMEPAGE="https://transmissionbt.com/"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT="0"
-IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test"
-REQUIRED_USE="?? ( qt5 qt6 )"
-RESTRICT="!test? ( test )"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		gtk? ( sys-devel/gettext )
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-COMMON_DEPEND="
-	>=dev-libs/libevent-2.1.0:=[threads(+)]
-	!mbedtls? ( dev-libs/openssl:0= )
-	mbedtls? ( net-libs/mbedtls:0= )
-	net-libs/libnatpmp
-	>=net-libs/libpsl-0.21.1
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.28.0[ssl]
-	sys-libs/zlib:=
-	nls? ( virtual/libintl )
-	gtk? (
-		>=dev-cpp/gtkmm-3.24.0:4.0
-		>=dev-cpp/glibmm-2.60.0:2.68
-		appindicator? ( dev-libs/libayatana-appindicator )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus,gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	systemd? ( >=sys-apps/systemd-209:= )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		-DENABLE_GTK=$(usex gtk ON OFF)
-		-DENABLE_MAC=OFF
-		-DREBUILD_WEB=OFF
-		-DENABLE_CLI=$(usex cli ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
-		-DENABLE_NLS=$(usex nls ON OFF)
-
-		-DRUN_CLANG_TIDY=OFF
-
-		-DUSE_GTK_VERSION=4
-		-DUSE_SYSTEM_EVENT2=ON
-		-DUSE_SYSTEM_DEFLATE=OFF
-		-DUSE_SYSTEM_DHT=OFF
-		-DUSE_SYSTEM_MINIUPNPC=ON
-		-DUSE_SYSTEM_NATPMP=ON
-		-DUSE_SYSTEM_UTP=OFF
-		-DUSE_SYSTEM_B64=OFF
-		-DUSE_SYSTEM_PSL=ON
-
-		-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl)
-		-DWITH_INOTIFY=ON
-		-DWITH_APPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-	)
-
-	if use qt6; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 )
-	elif use qt5; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 )
-	else
-		mycmakeargs+=( -DENABLE_QT=OFF )
-	fi
-
-	# Disable assertions by default, bug 893870.
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-
-	if use systemd; then
-		# Service sets Type=notify
-		systemd_dounit daemon/transmission-daemon.service
-		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-	fi
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	newtmpfiles "${FILESDIR}"/transmission-daemon.tmpfiles transmission-daemon.conf
-}
-
-pkg_postrm() {
-	if use gtk || use qt5 || use qt6; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use qt5 || use qt6; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-	tmpfiles_process transmission-daemon.conf
-}

diff --git a/net-p2p/transmission/transmission-4.0.3.ebuild b/net-p2p/transmission/transmission-4.0.3.ebuild
deleted file mode 100644
index c75d92d0e1a1..000000000000
--- a/net-p2p/transmission/transmission-4.0.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2006-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic tmpfiles systemd xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/transmission/transmission"
-else
-	MY_PV="${PV/_beta/-beta.}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="A fast, easy, and free BitTorrent client"
-HOMEPAGE="https://transmissionbt.com/"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT="0"
-IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test"
-REQUIRED_USE="?? ( qt5 qt6 )"
-RESTRICT="!test? ( test )"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		gtk? ( sys-devel/gettext )
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-COMMON_DEPEND="
-	>=dev-libs/libevent-2.1.0:=[threads(+)]
-	!mbedtls? ( dev-libs/openssl:0= )
-	mbedtls? ( net-libs/mbedtls:0= )
-	net-libs/libnatpmp
-	>=net-libs/libpsl-0.21.1
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.28.0[ssl]
-	sys-libs/zlib:=
-	nls? ( virtual/libintl )
-	gtk? (
-		>=dev-cpp/gtkmm-3.24.0:3.0
-		>=dev-cpp/glibmm-2.60.0:2
-		appindicator? ( dev-libs/libayatana-appindicator )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus,gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	systemd? ( >=sys-apps/systemd-209:= )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		-DENABLE_GTK=$(usex gtk ON OFF)
-		-DENABLE_MAC=OFF
-		-DREBUILD_WEB=OFF
-		-DENABLE_CLI=$(usex cli ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
-		-DENABLE_NLS=$(usex nls ON OFF)
-
-		-DRUN_CLANG_TIDY=OFF
-
-		-DUSE_GTK_VERSION=3
-		-DUSE_SYSTEM_EVENT2=ON
-		-DUSE_SYSTEM_DEFLATE=OFF
-		-DUSE_SYSTEM_DHT=OFF
-		-DUSE_SYSTEM_MINIUPNPC=ON
-		-DUSE_SYSTEM_NATPMP=ON
-		-DUSE_SYSTEM_UTP=OFF
-		-DUSE_SYSTEM_B64=OFF
-		-DUSE_SYSTEM_PSL=ON
-
-		-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl)
-		-DWITH_INOTIFY=ON
-		-DWITH_APPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-	)
-
-	if use qt6; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 )
-	elif use qt5; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 )
-	else
-		mycmakeargs+=( -DENABLE_QT=OFF )
-	fi
-
-	# Disable assertions by default, bug 893870.
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-
-	if use systemd; then
-		# Service sets Type=notify
-		systemd_dounit daemon/transmission-daemon.service
-		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-	fi
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	newtmpfiles "${FILESDIR}"/transmission-daemon.tmpfiles transmission-daemon.conf
-}
-
-pkg_postrm() {
-	if use gtk || use qt5 || use qt6; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use qt5 || use qt6; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-	tmpfiles_process transmission-daemon.conf
-}

diff --git a/net-p2p/transmission/transmission-4.0.4.ebuild b/net-p2p/transmission/transmission-4.0.4.ebuild
deleted file mode 100644
index f9d4e2dcede6..000000000000
--- a/net-p2p/transmission/transmission-4.0.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2006-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic tmpfiles systemd xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/transmission/transmission"
-else
-	MY_PV="${PV/_beta/-beta.}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A fast, easy, and free BitTorrent client"
-HOMEPAGE="https://transmissionbt.com/"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT="0"
-IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test"
-REQUIRED_USE="?? ( qt5 qt6 )"
-RESTRICT="!test? ( test )"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		gtk? ( sys-devel/gettext )
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-COMMON_DEPEND="
-	>=dev-libs/libevent-2.1.0:=[threads(+)]
-	!mbedtls? ( dev-libs/openssl:0= )
-	mbedtls? ( net-libs/mbedtls:0= )
-	net-libs/libnatpmp
-	>=net-libs/libpsl-0.21.1
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.28.0[ssl]
-	sys-libs/zlib:=
-	nls? ( virtual/libintl )
-	gtk? (
-		>=dev-cpp/gtkmm-3.24.0:4.0
-		>=dev-cpp/glibmm-2.60.0:2.68
-		appindicator? ( dev-libs/libayatana-appindicator )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus,gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	systemd? ( >=sys-apps/systemd-209:= )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		-DENABLE_GTK=$(usex gtk ON OFF)
-		-DENABLE_MAC=OFF
-		-DREBUILD_WEB=OFF
-		-DENABLE_CLI=$(usex cli ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
-		-DENABLE_NLS=$(usex nls ON OFF)
-
-		-DRUN_CLANG_TIDY=OFF
-
-		-DUSE_GTK_VERSION=4
-		-DUSE_SYSTEM_EVENT2=ON
-		-DUSE_SYSTEM_DEFLATE=OFF
-		-DUSE_SYSTEM_DHT=OFF
-		-DUSE_SYSTEM_MINIUPNPC=ON
-		-DUSE_SYSTEM_NATPMP=ON
-		-DUSE_SYSTEM_UTP=OFF
-		-DUSE_SYSTEM_B64=OFF
-		-DUSE_SYSTEM_PSL=ON
-
-		-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl)
-		-DWITH_INOTIFY=ON
-		-DWITH_APPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-	)
-
-	if use qt6; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 )
-	elif use qt5; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 )
-	else
-		mycmakeargs+=( -DENABLE_QT=OFF )
-	fi
-
-	# Disable assertions by default, bug 893870.
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-
-	if use systemd; then
-		# Service sets Type=notify
-		systemd_dounit daemon/transmission-daemon.service
-		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-	fi
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	newtmpfiles "${FILESDIR}"/transmission-daemon.tmpfiles transmission-daemon.conf
-}
-
-pkg_postrm() {
-	if use gtk || use qt5 || use qt6; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use qt5 || use qt6; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-	tmpfiles_process transmission-daemon.conf
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-06-10 20:15 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-16 17:06 [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/, net-p2p/transmission/ Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2024-06-10 20:15 Mike Gilbert
2022-10-24 15:26 Mike Gilbert
2020-07-18 13:19 Mike Gilbert
2018-06-20  2:24 Mike Gilbert
2018-03-10 18:21 Mike Gilbert
2016-04-24  3:27 Mike Gilbert
2016-03-04  2:41 Mike Gilbert
2015-10-03 18:57 Mike Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox