From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id qHJxBV1C5V6QIAAA0tVLHw (envelope-from ) for ; Sat, 13 Jun 2020 21:17:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aHNaAV1C5V49XAAAbx9fmQ (envelope-from ) for ; Sat, 13 Jun 2020 21:17:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 85777940669 for ; Sat, 13 Jun 2020 21:17:16 +0000 (UTC) Received: from localhost ([::1]:43342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkDWd-00041F-I1 for larch@yhetil.org; Sat, 13 Jun 2020 17:17:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkDWQ-0003u5-Hw for guix-patches@gnu.org; Sat, 13 Jun 2020 17:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkDWQ-0006oD-8T for guix-patches@gnu.org; Sat, 13 Jun 2020 17:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jkDWQ-00049A-49 for guix-patches@gnu.org; Sat, 13 Jun 2020 17:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41840] [PATCH 1/2] gnu: Transmission: Update to 3.0.0. References: <20200613211356.GA20074@jasmine.lan> In-Reply-To: <20200613211356.GA20074@jasmine.lan> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jun 2020 21:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41840 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41840@debbugs.gnu.org Received: via spool by 41840-submit@debbugs.gnu.org id=B41840.159208300515907 (code B ref 41840); Sat, 13 Jun 2020 21:17:02 +0000 Received: (at 41840) by debbugs.gnu.org; 13 Jun 2020 21:16:45 +0000 Received: from localhost ([127.0.0.1]:42592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkDW2-00048O-IL for submit@debbugs.gnu.org; Sat, 13 Jun 2020 17:16:45 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:37105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkDVx-00047w-Pd for 41840@debbugs.gnu.org; Sat, 13 Jun 2020 17:16:37 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 925885C0082; Sat, 13 Jun 2020 17:16:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 13 Jun 2020 17:16:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=zxfvT5X6ND+Pym1AIuaNLtn NZ/zlzdWXJ3pkRr4jK1Y=; b=WgkAv/AE0p9zXBPxuAl+r7i3BhTdzh4XtdZ1sCR JpiYqTA+rz08e+UGyyy9TZZcnL620haADPnFiULQyaCqcG4xfkmMpiBA5L4eHngU +G13kyblhbmH5dQbT06I6LCCudLK5TUgfayQ8rjlGq7oP+cCLKzaaTj6tYronW0c Wgno= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=zxfvT5 X6ND+Pym1AIuaNLtnNZ/zlzdWXJ3pkRr4jK1Y=; b=o7BXLwhmLBnhrHqe6gUR7S kH18RmBGTwa7p8rHT0GMNizauEveo9ATFikwGuyytvVYuUhjsSsSrQvaD95NHm8m yuIZHRWeFKRx1xPkIxQAmJdVqcpkyM5+X1uveTGye04Aj5+1zMbLLdd0CwIFOc4q 93f6ddzNG8Cgt8J6HAXUVWaoRACgo4tEyZbc2sR2fV2N86pFrywf+ViZW1cTl5lG Qwa2+RYMNmSJZpOgsaPyaE1y/EX4v69CwZBlGO0JYWASZn82pbmEl2HL3lwQj0Hr iivrC6EuZXbx3Na2XCLYAHwL08bIyTlVP/aWByB81j3WUgo3QdLP+QXOI+rR/KBA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudeifedgudeiudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephffhgfeihfeuveefteekvdevffdvle fgjeehgfeludetgfduuddvieejgffhgfeunecuffhomhgrihhnpehgihhthhhusgdrtgho mhdpmhhithhrvgdrohhrghdpfhgvughorhgrphhrohhjvggtthdrohhrghenucfkphepje eirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from jasmine.lan (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 348963061856 for <41840@debbugs.gnu.org>; Sat, 13 Jun 2020 17:16:28 -0400 (EDT) From: Leo Famulari Date: Sat, 13 Jun 2020 17:16:20 -0400 Message-Id: <6312635e56b6f461b62019cf75cbaff2b6315110.1592082970.git.leo@famulari.name> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=famulari.name header.s=mesmtp header.b=WgkAv/AE; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm3 header.b=o7BXLwhm; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.99 X-TUID: Zowl7GKhGkYd * gnu/packages/bittorrent.scm (transmission): Update to 3.0.0. [source]: Remove obsolete patch. [inputs]: Remove unused inputs inotify-tools, cyrus-sasl, and file. [license]: Correct the license field. * gnu/packages/patches/transmission-CVE-2018-10756.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bittorrent.scm | 25 +++---- .../patches/transmission-CVE-2018-10756.patch | 71 ------------------- 3 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 gnu/packages/patches/transmission-CVE-2018-10756.patch diff --git a/gnu/local.mk b/gnu/local.mk index 583274235b..3b7415b540 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1541,7 +1541,6 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ - %D%/packages/patches/transmission-CVE-2018-10756.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 8b041cb3f5..c132aaead6 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Tomáš Čech ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -42,7 +42,6 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -50,7 +49,6 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) - #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) #:use-module (gnu packages nettle) #:use-module (gnu packages ncurses) @@ -67,16 +65,15 @@ (define-public transmission (package (name "transmission") - (version "2.94") + (version "3.00") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/transmission/transmission-releases/raw/" - "master/transmission-" version ".tar.xz")) - (patches (search-patches "transmission-CVE-2018-10756.patch")) + (uri (string-append "https://github.com/transmission/transmission" + "/releases/download/" version "/transmission-" + version ".tar.xz")) (sha256 (base32 - "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m")))) + "1wjmn96zrvmk8j1yz2ysmqd7a2x6ilvnwwapcvfzgxs2wwpnai4i")))) (build-system glib-or-gtk-build-system) (outputs '("out" ; library and command-line interface "gui")) ; graphical user interface @@ -92,8 +89,7 @@ (gui (assoc-ref outputs "gui"))) (mkdir-p (string-append gui "/bin")) (rename-file (string-append out "/bin/transmission-gtk") - (string-append gui - "/bin/transmission-gtk")) + (string-append gui "/bin/transmission-gtk")) ;; Move the '.desktop' and icon files as well. (mkdir (string-append gui "/share")) @@ -104,12 +100,9 @@ '("applications" "icons" "pixmaps"))) #t))))) (inputs - `(("inotify-tools" ,inotify-tools) - ("libevent" ,libevent) + `(("libevent" ,libevent) ("curl" ,curl) - ("cyrus-sasl" ,cyrus-sasl) ("openssl" ,openssl) - ("file" ,file) ("zlib" ,zlib) ("gtk+" ,gtk+))) (native-inputs @@ -131,7 +124,7 @@ DHT, µTP, PEX and Magnet Links.") ;; or any future license endorsed by Mnemosyne LLC. ;; ;; A few files files carry an MIT/X11 license header. - (license l:gpl3+))) + (license (list l:gpl2 l:gpl3)))) (define-public libtorrent (package diff --git a/gnu/packages/patches/transmission-CVE-2018-10756.patch b/gnu/packages/patches/transmission-CVE-2018-10756.patch deleted file mode 100644 index f9bdcf60aa..0000000000 --- a/gnu/packages/patches/transmission-CVE-2018-10756.patch +++ /dev/null @@ -1,71 +0,0 @@ -Fix CVE-2018-10756: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10756 - -Patch copied from Fedora: - -https://src.fedoraproject.org/rpms/transmission/blob/master/f/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch - ---- a/libtransmission/variant.c 2018-05-01 12:21:08.000000000 -0500 -+++ b/libtransmission/variant.c 2020-05-18 10:21:27.554214128 -0500 -@@ -820,7 +820,7 @@ - struct SaveNode - { - const tr_variant * v; -- tr_variant sorted; -+ tr_variant* sorted; - size_t childIndex; - bool isVisited; - }; -@@ -849,26 +849,33 @@ - - qsort (tmp, n, sizeof (struct KeyIndex), compareKeyIndex); - -- tr_variantInitDict (&node->sorted, n); -+ node->sorted = tr_new(tr_variant, 1); -+ tr_variantInitDict (node->sorted, n); - for (i=0; isorted.val.l.vals[i] = *tmp[i].val; -+ node->sorted->val.l.vals[i] = *tmp[i].val; - node->sorted.val.l.count = n; - - tr_free (tmp); - -- node->v = &node->sorted; -+ v = node->sorted; - } - else - { -- node->v = v; -+ node->sorted = NULL; - } -+ -+ node->v = v; - } - - static void - nodeDestruct (struct SaveNode * node) - { -- if (node->v == &node->sorted) -- tr_free (node->sorted.val.l.vals); -+ //TR_ASSERT(node != NULL); -+ if (node->sorted != NULL) -+ { -+ tr_free(node->sorted->val.l.vals); -+ tr_free(node->sorted); -+ } - } - - /** ---- a/libtransmission/variant.c 2020-05-18 10:21:49.000000000 -0500 -+++ b/libtransmission/variant.c 2020-05-18 10:24:34.673648865 -0500 -@@ -853,7 +853,7 @@ - tr_variantInitDict (node->sorted, n); - for (i=0; isorted->val.l.vals[i] = *tmp[i].val; -- node->sorted.val.l.count = n; -+ node->sorted->val.l.count = n; - - tr_free (tmp); - - -- 2.26.2