diff options
| -rw-r--r-- | freefilesync/ffs_libssl.patch | 53 | ||||
| -rw-r--r-- | freefilesync/ffs_no_eraseif.patch | 18 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 8 |
3 files changed, 14 insertions, 65 deletions
diff --git a/freefilesync/ffs_libssl.patch b/freefilesync/ffs_libssl.patch deleted file mode 100644 index 1e043c1..0000000 --- a/freefilesync/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<const char*>(&n); - return { numStr[3], numStr[2], numStr[1], numStr[0] }; //big endian! - }; diff --git a/freefilesync/ffs_no_eraseif.patch b/freefilesync/ffs_no_eraseif.patch index 1df8ef5..d20fd81 100644 --- a/freefilesync/ffs_no_eraseif.patch +++ b/freefilesync/ffs_no_eraseif.patch @@ -185,15 +185,15 @@ diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source cfg.directories.assign(uniqueFolders.begin(), uniqueFolders.end()); cfg.commandline = Zstr('"') + fff::getFreeFileSyncLauncherPath() + Zstr("\" \"") + filePath + Zstr('"'); } -diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source/RealTimeSync/monitor.cpp 10.18-2/FreeFileSync/Source/RealTimeSync/monitor.cpp ---- 10.18-1/FreeFileSync/Source/RealTimeSync/monitor.cpp 2019-11-20 16:15:55.822668055 -0500 -+++ 10.18-2/FreeFileSync/Source/RealTimeSync/monitor.cpp 2019-11-20 17:57:30.560558406 -0500 -@@ -163,7 +163,7 @@ - { - std::vector<DirWatcher::Entry> changedItems = watcher->getChanges([&] { requestUiUpdate(false /*readyForSync*/); /*throw X*/ }, - cbInterval); //throw FileError -- std::erase_if(changedItems, [](const DirWatcher::Entry& e) -+ eraseIf(changedItems, [](const DirWatcher::Entry& e) +diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.23-0/FreeFileSync/Source/RealTimeSync/monitor.cpp 10.23-1/FreeFileSync/Source/RealTimeSync/monitor.cpp +--- 10.23-0/FreeFileSync/Source/RealTimeSync/monitor.cpp 2020-04-21 08:03:55.508842092 -0400 ++++ 10.23-1/FreeFileSync/Source/RealTimeSync/monitor.cpp 2020-04-21 09:10:54.765302811 -0400 +@@ -152,7 +152,7 @@ + if (change.type == DirWatcher::ChangeType::baseFolderUnavailable) + return change; + +- std::erase_if(changes, [](const DirWatcher::Change& e) ++ eraseIf(changes, [](const DirWatcher::Change& e) { return endsWith(e.itemPath, Zstr(".ffs_tmp")) || //sync.8ea2.ffs_tmp diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 018b130..6b28b26 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -18,7 +18,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.22 +Version: 10.23 Release: 1%{?dist} Summary: A file synchronization utility @@ -41,7 +41,6 @@ Patch6: ffs_libssh2.patch Patch7: ffs_curl.patch Patch8: ffs_bit.patch Patch9: ffs_no_eraseif.patch -Patch10: ffs_libssl.patch Packager: B Stack <bgstack15@gmail.com> # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -101,7 +100,6 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch8 -p1 %patch9 -p1 %endif -%patch10 -p1 # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags @@ -204,6 +202,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Tue Apr 21 2020 B Stack <bgstack15@gmail.com> - 10.23-1 +- version bump +- remove ffs_libssl.patch + * Wed Mar 18 2020 B Stack <bgstack15@gmail.com> - 10.22-1 - version bump - add ffs_libssl.patch |