Merge branch '2.9x'

2018-05-01 22:44:51 +03:00 · 2018-05-01 22:44:51 +03:00 · c951848a5b
parent c89cce792d d8e60ee44f
commit c951848a5b
9 changed files with 30 additions and 15 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -44,8 +44,8 @@ set(TR_NAME ${PROJECT_NAME})
 #         "Z" for unsupported trunk builds,
 #         "0" for stable, supported releases
 # these should be the only two lines you need to change
-set(TR_USER_AGENT_PREFIX "2.93+")
-set(TR_PEER_ID_PREFIX "-TR293Z-")
+set(TR_USER_AGENT_PREFIX "2.94+")
+set(TR_PEER_ID_PREFIX "-TR294Z-")

 string(REGEX MATCH "^([0-9]+)\\.([0-9]+).*" TR_VERSION "${TR_USER_AGENT_PREFIX}")
 set(TR_VERSION_MAJOR "${CMAKE_MATCH_1}")
--- a/15
+++ b/15
@ -1,4 +1,17 @@
-=== Transmission 2.93 (2018/01/xx) ===
+=== Transmission 2.94 (2018/05/01) ===
+[https://github.com/transmission/transmission/releases/tag/2.94 All tickets closed by this release]
+==== All Platforms ====
+  * Fix building against LibreSSL (#284, #486, #570)
+  * Fix building against mbedTLS (#115, #528)
+  * Fix torrents ETA calculation (#522)
+  * Fix cross-compilation issues caused by miniupnpc configuration test (#475)
+==== Qt Client ====
+  * Fix bad downloaded percentage in DetailsDialog  (#547)
+==== Web Client ====
+  * Fix tracker error XSS in inspector (CVE pending)
+  * Fix torrent name HTML-escaping in trackers inspector tabTODO
+
+=== Transmission 2.93 (2018/01/23) ===
 [https://github.com/transmission/transmission/releases/tag/2.93 All tickets closed by this release]
 ==== All Platforms ====
  * Fix CVE-2018-5702 (#468)
--- a/Transmission.xcodeproj/project.pbxproj
+++ b/Transmission.xcodeproj/project.pbxproj
@ -3040,7 +3040,7 @@
 				IBC_NOTICES = NO;
 				IBC_WARNINGS = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
 				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
 				INFOPLIST_PREPROCESS = YES;
 				LIBRARY_SEARCH_PATHS = (
@ -3187,7 +3187,7 @@
 				IBC_NOTICES = NO;
 				IBC_WARNINGS = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
 				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
 				INFOPLIST_PREPROCESS = YES;
 				LIBRARY_SEARCH_PATHS = (
@ -3268,7 +3268,7 @@
 				IBC_NOTICES = NO;
 				IBC_WARNINGS = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
 				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
 				INFOPLIST_PREPROCESS = YES;
 				LIBRARY_SEARCH_PATHS = (
--- a/configure.ac
+++ b/configure.ac
@ -3,8 +3,8 @@ dnl STATUS: "X" for prerelease beta builds,
 dnl         "Z" for unsupported trunk builds,
 dnl         "0" for stable, supported releases
 dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],[2.93+])
-m4_define([peer_id_prefix],[-TR293Z-])
+m4_define([user_agent_prefix],[2.94+])
+m4_define([peer_id_prefix],[-TR294Z-])

 AC_INIT([transmission],[user_agent_prefix],[https://github.com/transmission/transmission])
 AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix])
--- a/libtransmission/version.h.in
+++ b/libtransmission/version.h.in
@ -7,6 +7,7 @@
 #define SHORT_VERSION_STRING      "${TR_USER_AGENT_PREFIX}"
 #define LONG_VERSION_STRING       "${TR_USER_AGENT_PREFIX} (${TR_VCS_REVISION})"
 #define VERSION_STRING_INFOPLIST  ${TR_USER_AGENT_PREFIX}
+#define BUILD_STRING_INFOPLIST    14714.${TR_VERSION_MAJOR}.${TR_VERSION_MINOR}
 #define MAJOR_VERSION             ${TR_VERSION_MAJOR}
 #define MINOR_VERSION             ${TR_VERSION_MINOR}

--- a/macosx/AboutWindowController.m
+++ b/macosx/AboutWindowController.m
@ -22,6 +22,8 @@

 #import "AboutWindowController.h"

+#include "version.h"
+
@implementation AboutWindowController

 AboutWindowController * fAboutBoxInstance = nil;
@ -34,9 +36,7 @@ AboutWindowController * fAboutBoxInstance = nil;

 - (void) awakeFromNib
 {
-    NSDictionary * info = [[NSBundle mainBundle] infoDictionary];
-    [fVersionField setStringValue: [NSString stringWithFormat: @"%@ (%@)",
-        info[@"CFBundleShortVersionString"], info[(NSString *)kCFBundleVersionKey]]];
+    [fVersionField setStringValue: @(LONG_VERSION_STRING)];

    [fCopyrightField setStringValue: [[NSBundle mainBundle] localizedStringForKey: @"NSHumanReadableCopyright"
                                        value: nil table: @"InfoPlist"]];
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@ -59,7 +59,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>VCS_REVISION_NUM</string>
+	<string>BUILD_STRING_INFOPLIST</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
--- a/update-version-h.sh
+++ b/update-version-h.sh
@ -54,6 +54,7 @@ cat > libtransmission/version.h.new << EOF
 #define SHORT_VERSION_STRING      "${user_agent_prefix}"
 #define LONG_VERSION_STRING       "${user_agent_prefix} (${vcs_revision})"
 #define VERSION_STRING_INFOPLIST  ${user_agent_prefix}
+#define BUILD_STRING_INFOPLIST    14714.${major_version}.${minor_version}
 #define MAJOR_VERSION             ${major_version}
 #define MINOR_VERSION             ${minor_version}
 EOF
--- a/web/javascript/inspector.js
+++ b/web/javascript/inspector.js
@ -759,7 +759,7 @@ function Inspector(controller) {
                html.push('<div class="inspector_group">');

                if (torrents.length > 1) {
-                    html.push('<div class="inspector_torrent_label">', tor.getName(), '</div>');
+                    html.push('<div class="inspector_torrent_label">', sanitizeText(tor.getName()), '</div>');
                }

                tier = -1;
@ -785,9 +785,9 @@ function Inspector(controller) {
                    html.push('<li class="inspector_tracker_entry ', parity, '"><div class="tracker_host" title="', sanitizeText(tracker.announce), '">',
                        sanitizeText(tracker.host || tracker.announce), '</div>',
                        '<div class="tracker_activity">',
-                        '<div>', lastAnnounceStatusHash['label'], ': ', lastAnnounceStatusHash['value'], '</div>',
+                        '<div>', lastAnnounceStatusHash['label'], ': ', sanitizeText(lastAnnounceStatusHash['value']), '</div>',
                        '<div>', announceState, '</div>',
-                        '<div>', lastScrapeStatusHash['label'], ': ', lastScrapeStatusHash['value'], '</div>',
+                        '<div>', lastScrapeStatusHash['label'], ': ', sanitizeText(lastScrapeStatusHash['value']), '</div>',
                        '</div><table class="tracker_stats">',
                        '<tr><th>Seeders:</th><td>', (tracker.seederCount > -1 ? tracker.seederCount : na), '</td></tr>',
                        '<tr><th>Leechers:</th><td>', (tracker.leecherCount > -1 ? tracker.leecherCount : na), '</td></tr>',