From 7babc3fe45db645fd9e0c5bac5594fe168c1b7ad Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 20 Apr 2020 15:45:42 -0400 Subject: ffs: remove libssl.patch, gtk3 dpkg rc1 --- freefilesync/debian/changelog | 33 +++++++++++++++-- freefilesync/debian/control | 10 +++--- freefilesync/debian/patches/ffs_libssl.patch | 53 ---------------------------- freefilesync/debian/patches/series | 3 +- 4 files changed, 36 insertions(+), 63 deletions(-) delete mode 100644 freefilesync/debian/patches/ffs_libssl.patch (limited to 'freefilesync/debian') diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index ca2a9c5..2360ed2 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,30 @@ +freefilesync (10.23-1+devuan) albion; urgency=medium + + * Run "on completion" commands on console (no need for "cmd.exe /c") + * Check exit code and report errors for external applications + * Report stream output of failed command line calls (macOs, Linux) + * Use Unicode symbols compatible with older macOS + * RealTimeSync: invoke command using cmd.exe instead of ShellExecute (Windows) + * Avoid hitting log file length limitations for aggregated jobs + * Fix OpenSSL failing on HTTP 1.0 response without Content-Length + * Don't allow creating folder names ending with space or dot + * Support base folders with trailing blanks + * Show system error descriptions on volume shadow copy errors + * Raise exit code if saving log file or sending email failed + * Report all documented MTP error descriptions + * Updated default exclude filter (macOS/Linux) + * Added image outlines for improved dark mode support + * Work around WBEM_E_INVALID_CLASS error during installation + * Align file path rendering with app layout direction + * Play sound notification also when "cancel on first error" is set + * Cleaner file path formatting (macOs, Linux) + * Added instructions when failing to start due to missing GTK2 (Ubuntu) + * RealTimeSync: distinguish drive unmount from folder change notification + * Avoid blocking command scripts waiting for user input + * Updated translation files + + -- Ben Stack Mon, 20 Apr 2020 15:09:48 -0400 + freefilesync (10.22-2+devuan) albion; urgency=medium * gtk2 build @@ -109,7 +136,7 @@ freefilesync (10.17-1+devuan) obs; urgency=low * Integrate latest libcurl FTP bug fixes * Detect common invalid SFTP key file formats * Fixed startup crash caused by corrupted HDD properties - * Allow SFTP access via Ed25519 key in PKIX format + * Allow SFTP access via Ed25519 key in PKIX format -- B Stack Tue, 22 Oct 2019 10:04:13 -0400 @@ -132,7 +159,7 @@ freefilesync (10.16-1+devuan) obs; urgency=low * Fixed accessibility issue with progress graph colors * Use short naming convention when deleting abandoned folder lock * Detect endless folder lock recursion on buggy file systems - * Fixed Google Drive parsing error for invalid file time + * Fixed Google Drive parsing error for invalid file time -- B Stack Tue, 16 Sep 2019 10:04:13 -0400 @@ -148,7 +175,7 @@ freefilesync (10.15-1+devuan) obs; urgency=low * Fixed main dialog out-of-screen position on startup (macOS) * Activated CDN for all web accesses * Redirect error dialog to stderr during sound playback (Linux) - * Updated translation files + * Updated translation files -- B Stack Thu, 15 Aug 2019 21:56:04 -0400 diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 748d6fc..3c93cea 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -11,13 +11,13 @@ Build-Depends: debhelper (>=12~), unzip, # gtk2 version, now possible only with local devuan-archive, and these must be removed for gtk3 build # install with sudo apt-get install libwxbase3.0-0v5=3.0.4+dfsg-14 libwxbase3.0-dev=3.0.4+dfsg-14 libwxgtk3.0-0v5=3.0.4+dfsg-14 libwxgtk3.0-dev=3.0.4+dfsg-14 wx3.0-headers=3.0.4+dfsg-14 libgtk2.0-dev - libgtk2.0-dev, - libwxgtk3.0-dev (=3.0.4+dfsg-14), +# libgtk2.0-dev, +# libwxgtk3.0-dev (=3.0.4+dfsg-14), # gtk3 version, and these must be removed for gtk2 build -# install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 +# install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 libgtk-3-dev libwxgtk3.0-gtk3-dev # which will remove libwxbase3.0-dev=3.0.4+dfsg-14 -# libgtk-3-dev, -# libwxgtk3.0-gtk3-dev, + libgtk-3-dev, + libwxgtk3.0-gtk3-dev, Standards-Version: 4.1.4 Homepage: https://freefilesync.org/ diff --git a/freefilesync/debian/patches/ffs_libssl.patch b/freefilesync/debian/patches/ffs_libssl.patch deleted file mode 100644 index 1e043c1..0000000 --- a/freefilesync/debian/patches/ffs_libssl.patch +++ /dev/null @@ -1,53 +0,0 @@ -Author: bgstack15 -Message: Revert freefilesync 10.22 zen/open_ssl.cpp which depends on openssl 1.1.1e which is not available in this distro yet. -Date: 2020-03-18 -diff --git a/zen/open_ssl.cpp b/zen/open_ssl.cpp -index 0f1da3fc..b823f8ca 100644 ---- a/zen/open_ssl.cpp -+++ b/zen/open_ssl.cpp -@@ -18,7 +18,7 @@ using namespace zen; - #error FFS, we are royally screwed! - #endif - --static_assert(OPENSSL_VERSION_NUMBER >= 0x1010105fL, "OpenSSL version too old"); -+static_assert(OPENSSL_VERSION_NUMBER >= 0x10100000L, "OpenSSL version too old"); - - - void zen::openSslInit() -@@ -68,7 +68,7 @@ std::wstring formatOpenSSLError(const std::wstring& functionName, unsigned long - - std::wstring formatLastOpenSSLError(const std::wstring& functionName) - { -- const auto ec = ::ERR_peek_last_error(); -+ const unsigned long ec = ::ERR_peek_last_error(); - ::ERR_clear_error(); //clean up for next OpenSSL operation on this thread - return formatOpenSSLError(functionName, ec); - } -@@ -566,16 +566,9 @@ public: - if (rv != 1) - { - const int sslError = ::SSL_get_error(ssl_, rv); -- if (sslError == SSL_ERROR_ZERO_RETURN) -- return 0; //EOF + close_notify alert -- -- warn_static("find a better solution for SSL_read_ex + EOF") -- //"sslError == SSL_ERROR_SYSCALL && ::ERR_peek_last_error() == 0" => obsolete as of OpenSSL 1.1.1e -- //https://github.com/openssl/openssl/issues/10880#issuecomment-575746226 -- const auto ec = ::ERR_peek_last_error(); -- if (sslError == SSL_ERROR_SSL && ERR_GET_REASON(ec) == SSL_R_UNEXPECTED_EOF_WHILE_READING) //EOF: only expected for HTTP/1.0 -+ if (sslError == SSL_ERROR_ZERO_RETURN || //EOF + close_notify alert -+ (sslError == SSL_ERROR_SYSCALL && ::ERR_peek_last_error() == 0)) //EOF: only expected for HTTP/1.0 - return 0; -- - throw SysError(formatLastOpenSSLError(L"SSL_read_ex") + L' ' + formatSslErrorCode(sslError)); - } - assert(bytesReceived > 0); //SSL_read_ex() considers EOF an error! -@@ -771,7 +764,7 @@ std::string zen::convertPuttyKeyToPkix(const std::string& keyStream, const std:: - - auto numToBeString = [](size_t n) -> std::string - { -- static_assert(usingLittleEndian()&& sizeof(n) >= 4); -+ static_assert(usingLittleEndian() && sizeof(n) >= 4); - const char* numStr = reinterpret_cast(&n); - return { numStr[3], numStr[2], numStr[1], numStr[0] }; //big endian! - }; diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series index 48d9670..da9adb8 100644 --- a/freefilesync/debian/patches/series +++ b/freefilesync/debian/patches/series @@ -1,10 +1,9 @@ ffs_allow_parallel_ops.patch ffs_devuan.patch # gtk3 for obs, gtk2 for albion -ffs_devuan_gtk2.patch +ffs_devuan_gtk3.patch ffs_no_check_updates.patch ffs_no_wx311.patch ffs_sftp.patch ffs_libssh2.patch ffs_curl.patch -ffs_libssl.patch -- cgit