From d0947aabee3bf32f80038539ec38d5c2c3500edf Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 2 Jul 2020 09:06:11 -0500 Subject: [PATCH] 3.00 --- .gitignore | 1 + ...smissionbt.Transmission.-D-Bus-names.patch | 36 +++-------- ...adf8e5e1c2b48791f9d22fc8c747e974180e.patch | 62 ------------------- sources | 2 +- transmission-fdlimits.patch | 34 +++++----- transmission-libsystemd.patch | 47 -------------- transmission.spec | 19 +++--- 7 files changed, 40 insertions(+), 161 deletions(-) delete mode 100644 2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch delete mode 100644 transmission-libsystemd.patch diff --git a/.gitignore b/.gitignore index f79b335..b6ad07d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ transmission-2.04.tar.xz /transmission-2.92.tar.xz /transmission-2.93.tar.xz /transmission-2.94.tar.xz +/transmission-3.00.tar.xz diff --git a/0001-gtk-use-com.transmissionbt.Transmission.-D-Bus-names.patch b/0001-gtk-use-com.transmissionbt.Transmission.-D-Bus-names.patch index 5470e64..f54c69d 100644 --- a/0001-gtk-use-com.transmissionbt.Transmission.-D-Bus-names.patch +++ b/0001-gtk-use-com.transmissionbt.Transmission.-D-Bus-names.patch @@ -1,27 +1,11 @@ -From: Will Thompson -Date: Fri, 4 Aug 2017 15:20:07 +0100 -Subject: [PATCH] gtk: use com.transmissionbt.Transmission.* D-Bus names - -Using the com.transmissionbt.Transmission. namespace (with a capital T) -is consistent with the Qt frontend using -com.transmissionbt.Transmission, and with standard D-Bus naming -conventions. ---- - gtk/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/main.c b/gtk/main.c -index a164ab439..9fa2690b5 100644 ---- gtk/main.c -+++ gtk/main.c -@@ -680,7 +680,7 @@ int main(int argc, char** argv) +--- gtk/main.c~ 2020-05-22 06:04:23.000000000 -0500 ++++ gtk/main.c 2020-07-02 08:50:35.087089387 -0500 +@@ -675,7 +675,7 @@ - /* init the application for the specified config dir */ - stat (cbdata.config_dir, &sb); -- application_id = g_strdup_printf ("com.transmissionbt.transmission_%lu_%lu", (unsigned long)sb.st_dev, (unsigned long)sb.st_ino); -+ application_id = g_strdup_printf ("com.transmissionbt.Transmission._%lu_%lu", (unsigned long)sb.st_dev, (unsigned long)sb.st_ino); - app = gtk_application_new (application_id, G_APPLICATION_HANDLES_OPEN); - g_signal_connect (app, "open", G_CALLBACK (on_open), &cbdata); - g_signal_connect (app, "startup", G_CALLBACK (on_startup), &cbdata); --- -2.13.3 + /* init the application for the specified config dir */ + stat(cbdata.config_dir, &sb); +- application_id = g_strdup_printf("com.transmissionbt.transmission_%lu_%lu", (unsigned long)sb.st_dev, ++ application_id = g_strdup_printf("com.transmissionbt.Transmission._%lu_%lu", (unsigned long)sb.st_dev, + (unsigned long)sb.st_ino); + app = gtk_application_new(application_id, G_APPLICATION_HANDLES_OPEN); + g_signal_connect(app, "open", G_CALLBACK(on_open), &cbdata); diff --git a/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch b/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch deleted file mode 100644 index 6ce93dd..0000000 --- a/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- libtransmission/variant.c~ 2018-05-01 12:21:08.000000000 -0500 -+++ 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); -+ } - } - - /** ---- libtransmission/variant.c~ 2020-05-18 10:21:49.000000000 -0500 -+++ 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); - diff --git a/sources b/sources index 802a15c..55d0db4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (transmission-2.94.tar.xz) = ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7 +SHA512 (transmission-3.00.tar.xz) = eeaf7fe46797326190008776a7fa641b6341c806b0f1684c2e7326c1284832a320440013e42a37acda9fd0ee5dca695f215d6263c8acb39188c5d9a836104a61 diff --git a/transmission-fdlimits.patch b/transmission-fdlimits.patch index 42b6061..dead58d 100644 --- a/transmission-fdlimits.patch +++ b/transmission-fdlimits.patch @@ -1,24 +1,28 @@ ---- libtransmission/fdlimit.c.orig 2018-01-10 20:21:41.933611849 +0100 -+++ libtransmission/fdlimit.c 2018-01-10 20:22:02.367013913 +0100 -@@ -365,22 +365,6 @@ - fileset_construct (&i->fileset, FILE_CACHE_SIZE); - session->fdInfo = i; +--- libtransmission/fdlimit.c~ 2020-05-22 06:04:23.000000000 -0500 ++++ libtransmission/fdlimit.c 2020-07-02 08:53:15.170954677 -0500 +@@ -390,26 +390,6 @@ + fileset_construct(&i->fileset, FILE_CACHE_SIZE); + session->fdInfo = i; -#ifndef _WIN32 -- /* set the open-file limit to the largest safe size wrt FD_SETSIZE */ -- struct rlimit limit; -- if (!getrlimit (RLIMIT_NOFILE, &limit)) +- +- /* set the open-file limit to the largest safe size wrt FD_SETSIZE */ +- struct rlimit limit; +- +- if (getrlimit(RLIMIT_NOFILE, &limit) == 0) - { -- const int old_limit = (int) limit.rlim_cur; -- const int new_limit = MIN (limit.rlim_max, FD_SETSIZE); -- if (new_limit != old_limit) +- int const old_limit = (int)limit.rlim_cur; +- int const new_limit = MIN(limit.rlim_max, FD_SETSIZE); +- +- if (new_limit != old_limit) - { -- limit.rlim_cur = new_limit; -- setrlimit (RLIMIT_NOFILE, &limit); -- getrlimit (RLIMIT_NOFILE, &limit); -- tr_logAddInfo ("Changed open file limit from %d to %d", old_limit, (int)limit.rlim_cur); +- limit.rlim_cur = new_limit; +- setrlimit(RLIMIT_NOFILE, &limit); +- getrlimit(RLIMIT_NOFILE, &limit); +- tr_logAddInfo("Changed open file limit from %d to %d", old_limit, (int)limit.rlim_cur); - } - } +- -#endif } } diff --git a/transmission-libsystemd.patch b/transmission-libsystemd.patch deleted file mode 100644 index 5d8c7ad..0000000 --- a/transmission-libsystemd.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up ./configure.orig ./configure ---- ./configure.orig 2016-03-06 23:24:37.116078717 +0300 -+++ ./configure 2017-04-13 23:25:44.643463654 +0300 -@@ -19160,12 +19160,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` -+ pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -19178,12 +19178,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` -+ pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -19202,9 +19202,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsystemd-daemon"` -+ SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsystemd"` - else -- SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsystemd-daemon"` -+ SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsystemd"` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5 diff --git a/transmission.spec b/transmission.spec index 8afb6b1..a2fc1ac 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: transmission -Version: 2.94 -Release: 9%{?dist} +Version: 3.00 +Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client # See COPYING. This licensing situation is... special. License: MIT and GPLv2 @@ -11,12 +11,10 @@ URL: http://www.transmissionbt.com Source0: https://github.com/transmission/transmission-releases/raw/master/transmission-%{version}.tar.xz # https://bugzilla.redhat.com/show_bug.cgi?id=1221292 Source1: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/transmission-symbolic.svg -Patch1: transmission-libsystemd.patch -Patch2: transmission-fdlimits.patch +Patch1: transmission-fdlimits.patch # Fix the DBus name to match the app name for flatpak builds # https://github.com/transmission/transmission/pull/847 -Patch3: 0001-gtk-use-com.transmissionbt.Transmission.-D-Bus-names.patch -Patch4: 2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch +Patch2: 0001-gtk-use-com.transmissionbt.Transmission.-D-Bus-names.patch BuildRequires: openssl-devel >= 1.1.0 BuildRequires: glib2-devel >= 2.32.0 @@ -43,7 +41,6 @@ back-end. %package common Summary: Transmission common files -Conflicts: transmission < 1.80-0.3.b4 %description common Common files for Transmission BitTorrent client sub-packages. It includes the web user interface, icons and transmission-remote, transmission-create, @@ -96,8 +93,6 @@ sed -i 's|Icon=%{name}-qt|Icon=%{name}|g' qt/%{name}-qt.desktop # convert to UTF encoding iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new mv AUTHORS.new AUTHORS -iconv --from=ISO-8859-1 --to=UTF-8 NEWS > NEWS.new -mv NEWS.new NEWS %build @@ -191,7 +186,7 @@ EOF %files common %license COPYING -%doc AUTHORS NEWS README +%doc AUTHORS NEWS.md README.md %{_bindir}/transmission-remote %{_bindir}/transmission-create %{_bindir}/transmission-edit @@ -200,6 +195,7 @@ EOF %{_datadir}/pixmaps/* %{_datadir}/icons/hicolor/*/apps/transmission.* %{_datadir}/icons/hicolor/symbolic/apps/transmission-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/transmission-devel.svg %doc %{_mandir}/man1/transmission-remote* %doc %{_mandir}/man1/transmission-create* %doc %{_mandir}/man1/transmission-edit* @@ -227,6 +223,9 @@ EOF %doc %{_mandir}/man1/transmission-qt.* %changelog +* Thu Jul 02 2020 Gwyn Ciesla - 3.00-1 +- 3.00 + * Mon May 18 2020 Gwyn Ciesla - 2.94-9 - Backported patch for CVE-2018-10756