* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/
@ 2015-10-04 15:51 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2015-10-04 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 92028dec3c192e6d8693d0d2b73b3ef3e7dfe522
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 15:50:38 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 15:50:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92028dec
net-p2p/transmission: Use upstream patch for miniupnpc 14
Package-Manager: portage-2.2.22_p5
net-p2p/transmission/files/2.84-miniupnp14.patch | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/net-p2p/transmission/files/2.84-miniupnp14.patch b/net-p2p/transmission/files/2.84-miniupnp14.patch
index 7e531cc..cdf64e1 100644
--- a/net-p2p/transmission/files/2.84-miniupnp14.patch
+++ b/net-p2p/transmission/files/2.84-miniupnp14.patch
@@ -1,23 +1,18 @@
-libtransmission: Build fix for miniupnp API version 14
+https://bugs.gentoo.org/562020
-Patch by Sander Sweers <Sander.Sweers@gmail.com>
-
-Bug: https://bugs.gentoo.org/562020
Index: libtransmission/upnp.c
===================================================================
--- libtransmission/upnp.c (revision 14564)
-+++ libtransmission/upnp.c (working copy)
-@@ -86,8 +86,12 @@
- struct UPNPDev * ret;
- bool have_err;
++++ libtransmission/upnp.c (revision 14565)
+@@ -88,7 +88,11 @@
--#if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
-+#if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
+ #if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
int err = UPNPDISCOVER_SUCCESS;
++ #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
+ ret = upnpDiscover (msec, NULL, NULL, 0, 0, 2, &err);
-+ have_err = err != UPNPDISCOVER_SUCCESS;
-+#elif (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
-+ int err = UPNPDISCOVER_SUCCESS;
++ #else
ret = upnpDiscover (msec, NULL, NULL, 0, 0, &err);
++ #endif
have_err = err != UPNPDISCOVER_SUCCESS;
#else
+ ret = upnpDiscover (msec, NULL, NULL, 0);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/
@ 2016-04-03 16:46 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2016-04-03 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 42448bd7cfc0c82caf3c1d43d77721edde17fadd
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 3 16:45:45 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 3 16:45:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42448bd7
net-p2p/transmission: Remove default TRANSMISSION_OPTIONS setting
Bug: https://bugs.gentoo.org/578920
net-p2p/transmission/files/transmission-daemon.confd.4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-p2p/transmission/files/transmission-daemon.confd.4 b/net-p2p/transmission/files/transmission-daemon.confd.4
index 8f3b131..64ecd80 100644
--- a/net-p2p/transmission/files/transmission-daemon.confd.4
+++ b/net-p2p/transmission/files/transmission-daemon.confd.4
@@ -3,7 +3,8 @@
# better to configure some settings (like username/password) in
# /var/lib/transmission/config/settings.json to avoid other users see it with `ps`
-TRANSMISSION_OPTIONS="--encryption-preferred"
+# Parameters to pass to transmission-daemon
+# TRANSMISSION_OPTIONS=""
# Run daemon as another user (username or username:groupname)
# If you change this setting, chown -R /var/lib/transmission/config <and download directory, check web settings>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/
@ 2017-08-13 11:31 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-08-13 11:31 UTC (permalink / raw
To: gentoo-commits
commit: bb0af1cc7a9f95428a46884d0cb841bbe1360ce4
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 11 14:53:14 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:28:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0af1cc
net-p2p/transmission: remove unused patches/files
Closes: https://github.com/gentoo/gentoo/pull/5390
.../transmission/files/2.84-libevent-2.1.5.patch | 112 ---------------------
net-p2p/transmission/files/2.84-miniupnp14.patch | 18 ----
.../files/2.84-node_alloc-segfault.patch | 55 ----------
.../transmission-2.80-translations-path-fix.patch | 17 ----
.../transmission/files/transmission-daemon.initd.9 | 72 -------------
5 files changed, 274 deletions(-)
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
deleted file mode 100644
index 48101ebfb77..00000000000
--- a/net-p2p/transmission/files/2.84-libevent-2.1.5.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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/files/2.84-miniupnp14.patch b/net-p2p/transmission/files/2.84-miniupnp14.patch
deleted file mode 100644
index cdf64e10d93..00000000000
--- a/net-p2p/transmission/files/2.84-miniupnp14.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/562020
-
-Index: libtransmission/upnp.c
-===================================================================
---- libtransmission/upnp.c (revision 14564)
-+++ libtransmission/upnp.c (revision 14565)
-@@ -88,7 +88,11 @@
-
- #if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
- int err = UPNPDISCOVER_SUCCESS;
-+ #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
-+ ret = upnpDiscover (msec, NULL, NULL, 0, 0, 2, &err);
-+ #else
- ret = upnpDiscover (msec, NULL, NULL, 0, 0, &err);
-+ #endif
- have_err = err != UPNPDISCOVER_SUCCESS;
- #else
- ret = upnpDiscover (msec, NULL, NULL, 0);
diff --git a/net-p2p/transmission/files/2.84-node_alloc-segfault.patch b/net-p2p/transmission/files/2.84-node_alloc-segfault.patch
deleted file mode 100644
index 717242879a7..00000000000
--- a/net-p2p/transmission/files/2.84-node_alloc-segfault.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: libtransmission/list.c
-===================================================================
---- libtransmission/list.c (revision 14318)
-+++ libtransmission/list.c (revision 14319)
-@@ -30,20 +30,24 @@
- static tr_list*
- node_alloc (void)
- {
-- tr_list * ret;
-+ tr_list * ret = NULL;
-+ tr_lock * lock = getRecycledNodesLock ();
-
-- if (recycled_nodes == NULL)
-+ tr_lockLock (lock);
-+
-+ if (recycled_nodes != NULL)
- {
-- ret = tr_new (tr_list, 1);
-- }
-- else
-- {
-- tr_lockLock (getRecycledNodesLock ());
- ret = recycled_nodes;
- recycled_nodes = recycled_nodes->next;
-- tr_lockUnlock (getRecycledNodesLock ());
- }
-
-+ tr_lockUnlock (lock);
-+
-+ if (ret == NULL)
-+ {
-+ ret = tr_new (tr_list, 1);
-+ }
-+
- *ret = TR_LIST_CLEAR;
- return ret;
- }
-@@ -51,13 +55,15 @@
- static void
- node_free (tr_list* node)
- {
-+ tr_lock * lock = getRecycledNodesLock ();
-+
- if (node != NULL)
- {
- *node = TR_LIST_CLEAR;
-- tr_lockLock (getRecycledNodesLock ());
-+ tr_lockLock (lock);
- node->next = recycled_nodes;
- recycled_nodes = node;
-- tr_lockUnlock (getRecycledNodesLock ());
-+ tr_lockUnlock (lock);
- }
- }
-
diff --git a/net-p2p/transmission/files/transmission-2.80-translations-path-fix.patch b/net-p2p/transmission/files/transmission-2.80-translations-path-fix.patch
deleted file mode 100644
index 48638010f96..00000000000
--- a/net-p2p/transmission/files/transmission-2.80-translations-path-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch was adapted from -2.77-transmations-path-fix.patch for 2.80
-
-Fix path for finding locale-specific files:
-QCoreApplication::applicationDirPath() transforms to '/usr/bin'
-and locale files are in '/usr/share/qt4/translations'
-
---- qt/app.cc
-+++ qt/app.cc
-@@ -98,7 +98,7 @@
- installTranslator (&qtTranslator);
-
- // install the transmission translator
-- appTranslator.load (QString (MY_CONFIG_NAME) + "_" + QLocale::system ().name (), QCoreApplication::applicationDirPath () + "/translations");
-+ appTranslator.load (QString (MY_CONFIG_NAME) + "_" + QLocale::system ().name (), QLibraryInfo::location(QLibraryInfo::TranslationsPath) );
- installTranslator (&appTranslator);
-
- Formatter::initUnits ();
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.9 b/net-p2p/transmission/files/transmission-daemon.initd.9
deleted file mode 100644
index 7a4acc98918..00000000000
--- a/net-p2p/transmission/files/transmission-daemon.initd.9
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}
-
-SSD_OPTIONS=""
-
-depend() {
- need net
-}
-
-check_config() {
- if [ ! -d "${rundir}" ]; then
- mkdir "${rundir}"
- if [ -n "${runas_user}" ]; then
- chown -R ${runas_user} "${rundir}"
- fi
- fi
-
- # In case no config directory option passed use default
- if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then
- TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}"
- # put download dir location on first run (and take it from config later)
- if [ ! -f ${config_dir}/settings.json ]; then
- TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}"
- fi
- fi
-
- if [ -n "${runas_user}" ]; then
- if [ -f /etc/init.d/sysfs ]; then
- SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}"
- else
- SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}"
- fi
- fi
-}
-
-start() {
- check_config
-
- ebegin "Starting transmission daemon"
- start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \
- --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \
- $(test ${logfile} != "syslog" && echo --logfile ${logfile}) \
- ${TRANSMISSION_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping transmission daemon"
- start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile}
- eend $?
-}
-
-reload() {
- ebegin "Reloading transmission configuration"
- start-stop-daemon --signal HUP --pidfile ${pidfile}
- eend $?
-}
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/
@ 2019-03-04 3:14 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2019-03-04 3:14 UTC (permalink / raw
To: gentoo-commits
commit: dc43f72baf6e277192b5e0ef6ada8035c6feafa5
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Mar 3 16:09:39 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 03:09:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc43f72b
net-p2p/transmission: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11242
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-p2p/transmission/files/transmission-2.93-libressl.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/net-p2p/transmission/files/transmission-2.93-libressl.patch b/net-p2p/transmission/files/transmission-2.93-libressl.patch
deleted file mode 100644
index 8c978ced269..00000000000
--- a/net-p2p/transmission/files/transmission-2.93-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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,
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-04 3:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-04 3:14 [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2017-08-13 11:31 David Seifert
2016-04-03 16:46 Mike Gilbert
2015-10-04 15:51 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox