pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/transmission/patches transmission: remove obsolete...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8c8cec7e0c35
branches: trunk
changeset: 398509:8c8cec7e0c35
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Jul 20 23:24:29 2019 +0000
description:
transmission: remove obsolete patches
diffstat:
net/transmission/patches/patch-ab | 20 -
net/transmission/patches/patch-libtransmission_crypto-utils-openssl.c | 115 -----
net/transmission/patches/patch-libtransmission_platform-quota.c | 42 -
net/transmission/patches/patch-libtransmission_quark.c | 39 -
net/transmission/patches/patch-libtransmission_quark.h | 39 -
net/transmission/patches/patch-libtransmission_rpc-server.c | 224 ----------
net/transmission/patches/patch-libtransmission_rpc-server.h | 41 -
net/transmission/patches/patch-libtransmission_session.c | 39 -
net/transmission/patches/patch-libtransmission_transmission.h | 38 -
net/transmission/patches/patch-libtransmission_web.c | 38 -
10 files changed, 0 insertions(+), 635 deletions(-)
diffs (truncated from 675 to 300 lines):
diff -r fa7a76d0a600 -r 8c8cec7e0c35 net/transmission/patches/patch-ab
--- a/net/transmission/patches/patch-ab Sat Jul 20 23:15:50 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2014/04/01 11:13:28 wiz Exp $
-
-Provide default implementation if none exists.
-
---- third-party/libnatpmp/getgateway.c.orig 2008-08-09 06:08:13.000000000 +0200
-+++ third-party/libnatpmp/getgateway.c
-@@ -49,6 +49,13 @@
- #undef USE_SYSCTL_NET_ROUTE
- #endif
-
-+#if !defined(USE_PROC_NET_ROUTE) && !defined(USE_SOCKET_ROUTE) && !defined(USE_SYSCTL_NET_ROUTE)
-+int getdefaultgateway(in_addr_t * addr)
-+{
-+ return -1;
-+}
-+#endif
-+
- #ifdef WIN32
- #undef USE_PROC_NET_ROUTE
- #undef USE_SOCKET_ROUTE
diff -r fa7a76d0a600 -r 8c8cec7e0c35 net/transmission/patches/patch-libtransmission_crypto-utils-openssl.c
--- a/net/transmission/patches/patch-libtransmission_crypto-utils-openssl.c Sat Jul 20 23:15:50 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-$NetBSD: patch-libtransmission_crypto-utils-openssl.c,v 1.1 2018/02/16 12:33:37 wiz Exp $
-
-Fix build with openssl-1.1.
-From upstream via Peter Hjalmarsson via
-https://bugzilla.redhat.com/show_bug.cgi?id=1468077
-
---- libtransmission/crypto-utils-openssl.c.orig 2015-12-29 00:47:32.449150371 +0000
-+++ libtransmission/crypto-utils-openssl.c
-@@ -230,6 +230,61 @@ tr_rc4_process (tr_rc4_ctx_t handle,
- ****
- ***/
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+static inline int
-+DH_set0_pqg (DH * dh,
-+ BIGNUM * p,
-+ BIGNUM * q,
-+ BIGNUM * g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free (dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free (dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free (dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits (q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int
-+DH_set_length (DH * dh,
-+ long length)
-+{
-+ dh->length = length;
-+ return 1;
-+}
-+
-+static inline void
-+DH_get0_key(const DH * dh,
-+ const BIGNUM ** pub_key,
-+ const BIGNUM ** priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+#endif
-+
- tr_dh_ctx_t
- tr_dh_new (const uint8_t * prime_num,
- size_t prime_num_length,
-@@ -237,13 +292,19 @@ tr_dh_new (const uint8_t * prime_num,
- size_t generator_num_length)
- {
- DH * handle = DH_new ();
-+ BIGNUM * p, * g;
-
- assert (prime_num != NULL);
- assert (generator_num != NULL);
-+ p = BN_bin2bn (prime_num, prime_num_length, NULL);
-+ g = BN_bin2bn (generator_num, generator_num_length, NULL);
-
-- if (!check_pointer (handle->p = BN_bin2bn (prime_num, prime_num_length, NULL)) ||
-- !check_pointer (handle->g = BN_bin2bn (generator_num, generator_num_length, NULL)))
-+ if (!check_pointer (p) ||
-+ !check_pointer (g) ||
-+ !DH_set0_pqg (handle, p, NULL, g))
- {
-+ BN_free (p);
-+ BN_free (g);
- DH_free (handle);
- handle = NULL;
- }
-@@ -268,16 +329,20 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle
- {
- DH * handle = raw_handle;
- int dh_size, my_public_key_length;
-+ const BIGNUM * hand_pub_key;
-
- assert (handle != NULL);
- assert (public_key != NULL);
-
-- handle->length = private_key_length * 8;
-+
-+ DH_set_length(handle, private_key_length * 8);
-
- if (!check_result (DH_generate_key (handle)))
- return false;
-
-- my_public_key_length = BN_bn2bin (handle->pub_key, public_key);
-+ DH_get0_key (handle, &hand_pub_key, NULL);
-+
-+ my_public_key_length = BN_bn2bin (hand_pub_key, public_key);
- dh_size = DH_size (handle);
-
- tr_dh_align_key (public_key, my_public_key_length, dh_size);
diff -r fa7a76d0a600 -r 8c8cec7e0c35 net/transmission/patches/patch-libtransmission_platform-quota.c
--- a/net/transmission/patches/patch-libtransmission_platform-quota.c Sat Jul 20 23:15:50 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD$
-
-Fix dragonflybsd build
-
---- libtransmission/platform-quota.c.orig 2017-06-19 12:56:41.129003307 +0000
-+++ libtransmission/platform-quota.c
-@@ -18,6 +18,8 @@
- #include <sys/types.h> /* types needed by quota.h */
- #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <ufs/ufs/quota.h> /* quotactl() */
-+ #elif defined (__DragonFly__)
-+ #include <vfs/ufs/quota.h> /* quotactl */
- #elif defined (__NetBSD__)
- #include <sys/param.h>
- #ifndef statfs
-@@ -244,12 +246,16 @@ getquota (const char * device)
- static int64_t
- getquota (const char * device)
- {
-+#ifdef __DragonFly__
-+ struct ufs_dqblk dq;
-+#else
- struct dqblk dq;
-+#endif
- int64_t limit;
- int64_t freespace;
- int64_t spaceused;
-
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__)
- if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) &dq) == 0)
- {
- #elif defined(__sun)
-@@ -281,7 +287,7 @@ getquota (const char * device)
- /* No quota enabled for this user */
- return -1;
- }
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- spaceused = (int64_t) dq.dqb_curblocks >> 1;
- #elif defined(__APPLE__)
- spaceused = (int64_t) dq.dqb_curbytes;
diff -r fa7a76d0a600 -r 8c8cec7e0c35 net/transmission/patches/patch-libtransmission_quark.c
--- a/net/transmission/patches/patch-libtransmission_quark.c Sat Jul 20 23:15:50 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-libtransmission_quark.c,v 1.1 2018/01/16 09:37:00 wiz Exp $
-
-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@localhost>:
-
-https://github.com/transmission/transmission/pull/468/commits
-
-From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
-From: Tavis Ormandy <taviso%google.com@localhost>
-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(-)
-
---- libtransmission/quark.c.orig 2016-01-09 18:02:58.738698801 +0000
-+++ libtransmission/quark.c
-@@ -289,6 +289,8 @@ static const struct tr_key_struct my_sta
- { "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 -r fa7a76d0a600 -r 8c8cec7e0c35 net/transmission/patches/patch-libtransmission_quark.h
--- a/net/transmission/patches/patch-libtransmission_quark.h Sat Jul 20 23:15:50 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-libtransmission_quark.h,v 1.1 2018/01/16 09:37:00 wiz Exp $
-
-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@localhost>:
-
-https://github.com/transmission/transmission/pull/468/commits
-
-From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
-From: Tavis Ormandy <taviso%google.com@localhost>
-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(-)
-
---- libtransmission/quark.h.orig 2015-06-28 19:23:49.613528096 +0000
-+++ 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 -r fa7a76d0a600 -r 8c8cec7e0c35 net/transmission/patches/patch-libtransmission_rpc-server.c
--- a/net/transmission/patches/patch-libtransmission_rpc-server.c Sat Jul 20 23:15:50 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-$NetBSD: patch-libtransmission_rpc-server.c,v 1.1 2018/01/16 09:37:00 wiz Exp $
-
-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@localhost>:
-
-https://github.com/transmission/transmission/pull/468/commits
-
-From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
-From: Tavis Ormandy <taviso%google.com@localhost>
-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 +
Home |
Main Index |
Thread Index |
Old Index