gnu: Transmission: Update to 3.0.0.
* gnu/packages/bittorrent.scm (transmission): Update to 3.0.0. [source]: Remove obsolete patch. * gnu/packages/patches/transmission-CVE-2018-10756.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
parent
37fea3c30a
commit
7233b19fde
3 changed files with 6 additions and 80 deletions
|
@ -1568,7 +1568,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/tipp10-fix-compiling.patch \
|
%D%/packages/patches/tipp10-fix-compiling.patch \
|
||||||
%D%/packages/patches/tipp10-remove-license-code.patch \
|
%D%/packages/patches/tipp10-remove-license-code.patch \
|
||||||
%D%/packages/patches/tk-find-library.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/ttf2eot-cstddef.patch \
|
||||||
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
|
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
|
||||||
%D%/packages/patches/tomb-fix-errors-on-open.patch \
|
%D%/packages/patches/tomb-fix-errors-on-open.patch \
|
||||||
|
|
|
@ -65,16 +65,15 @@
|
||||||
(define-public transmission
|
(define-public transmission
|
||||||
(package
|
(package
|
||||||
(name "transmission")
|
(name "transmission")
|
||||||
(version "2.94")
|
(version "3.00")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append "https://github.com/transmission/transmission"
|
||||||
"https://github.com/transmission/transmission-releases/raw/"
|
"/releases/download/" version "/transmission-"
|
||||||
"master/transmission-" version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(patches (search-patches "transmission-CVE-2018-10756.patch"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"))))
|
"1wjmn96zrvmk8j1yz2ysmqd7a2x6ilvnwwapcvfzgxs2wwpnai4i"))))
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(outputs '("out" ; library and command-line interface
|
(outputs '("out" ; library and command-line interface
|
||||||
"gui")) ; graphical user interface
|
"gui")) ; graphical user interface
|
||||||
|
@ -90,8 +89,7 @@
|
||||||
(gui (assoc-ref outputs "gui")))
|
(gui (assoc-ref outputs "gui")))
|
||||||
(mkdir-p (string-append gui "/bin"))
|
(mkdir-p (string-append gui "/bin"))
|
||||||
(rename-file (string-append out "/bin/transmission-gtk")
|
(rename-file (string-append out "/bin/transmission-gtk")
|
||||||
(string-append gui
|
(string-append gui "/bin/transmission-gtk"))
|
||||||
"/bin/transmission-gtk"))
|
|
||||||
|
|
||||||
;; Move the '.desktop' and icon files as well.
|
;; Move the '.desktop' and icon files as well.
|
||||||
(mkdir (string-append gui "/share"))
|
(mkdir (string-append gui "/share"))
|
||||||
|
|
|
@ -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; i<n; ++i)
|
|
||||||
- node->sorted.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; i<n; ++i)
|
|
||||||
node->sorted->val.l.vals[i] = *tmp[i].val;
|
|
||||||
- node->sorted.val.l.count = n;
|
|
||||||
+ node->sorted->val.l.count = n;
|
|
||||||
|
|
||||||
tr_free (tmp);
|
|
||||||
|
|
||||||
|
|
Reference in a new issue