freefilesync 10.20 rpm rc1

6 files changed, 47 insertions, 27 deletions

diff --git a/freefilesync/FreeFileSync.desktop b/freefilesync/FreeFileSync.desktop
index d7b508d..6bb4d24 100644
--- a/freefilesync/FreeFileSync.desktop
+++ b/freefilesync/FreeFileSync.desktop
@@ -2,7 +2,7 @@
 Categories=GTK;Utility;FileTools;
 Comment=Backup software to synchronize files and folders
 Comment[pt_BR]=Aplicação de backup para sincronizar arquivos e diretórios
-Exec=FreeFileSync
+Exec=FreeFileSync %f
 GenericName=File synchronization
 GenericName[pt_BR]=Sincronização de arquivos
 Icon=FreeFileSync
diff --git a/freefilesync/ffs_allow_parallel_ops.patch b/freefilesync/ffs_allow_parallel_ops.patch
index e464662..3d8197f 100644
--- a/freefilesync/ffs_allow_parallel_ops.patch
+++ b/freefilesync/ffs_allow_parallel_ops.patch
@@ -13,13 +13,13 @@ diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/folde
          return;
 diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp
 --- 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp	2019-02-10 22:01:42.075159451 -0500
-+++ 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp	2019-02-11 21:25:11.685992654 -0500
-@@ -263,7 +263,7 @@
++++ 10.20-1/FreeFileSync/Source/ui/sync_cfg.cpp	2019-02-11 21:25:11.685992654 -0500
+@@ -283,7 +283,7 @@
+ commandHistoryOut_(commandHistory),
  globalPairCfg_(globalPairCfg),
  localPairCfg_(localPairConfig),
- showMultipleCfgs_(showMultipleCfgs),
--perfPanelActive_(false),
-+perfPanelActive_(true),
- commandHistItemsMax_(commandHistItemsMax)
+-enableExtraFeatures_(false),
++enableExtraFeatures_(true),
+ showMultipleCfgs_(showMultipleCfgs)
  {
      setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch
index 25ad6a6..4c584fe 100644
--- a/freefilesync/ffs_curl.patch
+++ b/freefilesync/ffs_curl.patch
@@ -21,9 +21,9 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
                => https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an
 
 Message: For Fedora <= 30 that has curl < 7.66.0 you need this patch.
-diff -x '*.swp' -Naur 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.17-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h
---- 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h	2019-10-21 11:23:51.238139296 -0400
-+++ 10.17-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h	2019-10-21 11:37:17.175140528 -0400
+diff -Naur 10.20-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.20-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h
+--- 10.20-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h	2019-11-20 07:57:22.146753270 -0500
++++ 10.20-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h	2020-02-18 07:26:34.057709413 -0500
 @@ -16,7 +16,8 @@
  //-------------------------------------------------
  
@@ -48,3 +48,32 @@ diff -x '*.swp' -Naur 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.17-
  
      return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
  }
+diff -Naur 10.20-0/libcurl/curl_wrap.h 10.20-1/libcurl/curl_wrap.h
+--- 10.20-0/libcurl/curl_wrap.h	2020-02-18 07:23:30.008454286 -0500
++++ 10.20-1/libcurl/curl_wrap.h	2020-02-18 07:25:34.397984509 -0500
+@@ -17,7 +17,8 @@
+ //-------------------------------------------------
+ 
+ #ifndef CURLINC_CURL_H
+-    #error curl.h header guard changed
++    // disable for Fedora <= 30
++    //#error curl.h header guard changed
+ #endif
+ 
+ namespace zen
+@@ -134,11 +135,11 @@
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_INVALIDCERTSTATUS);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP2_STREAM);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_RECURSIVE_API_CALL);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
++            //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
++            //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
++            //ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
+     }
+-    static_assert(CURL_LAST == CURLE_HTTP3 + 1);
++    //static_assert(CURL_LAST == CURLE_HTTP3 + 1);
+ 
+     return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
+ }
diff --git a/freefilesync/ffs_libssh2.patch b/freefilesync/ffs_libssh2.patch
index 0abd660..6ba7bea 100644
--- a/freefilesync/ffs_libssh2.patch
+++ b/freefilesync/ffs_libssh2.patch
@@ -22,15 +22,3 @@ Date: 2019-09-17T13:41:23Z
      }
      return replaceCpy<std::wstring>(L"SSH status %x.", L"%x", numberTo<std::wstring>(sc));
  }
-diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/afs/sftp.cpp 10.10-1/FreeFileSync/Source/afs/sftp.cpp
---- 10.10-0/FreeFileSync/Source/afs/sftp.cpp	2019-03-12 08:09:58.465098982 -0400
-+++ 10.17-1/FreeFileSync/Source/afs/sftp.cpp	2019-10-21 08:46:07.562161269 -0400
-@@ -1588,7 +1588,7 @@
-             runSftpCommand(login_, L"libssh2_sftp_mkdir", //throw SysError
-                            [&](const SshSession::Details& sd) //noexcept!
-             {
--                return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath), LIBSSH2_SFTP_DEFAULT_MODE);
-+                return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath), LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO);
-                 //default for newly created directories: 0777 (LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO)
-             });
-         }
diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index eaff5c4..bb54677 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/ffs_no_check_updates.patch
@@ -61,10 +61,10 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
--    const std::string buffer = sendHttpPost(Zstr("https://api.freefilesync.org/latest_version"), postParams,
--                                            ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError
-+    const std::string buffer = "";
-     return trimCpy(buffer);
+-    const std::string response = sendHttpPost(Zstr("https://api.freefilesync.org/latest_version"), postParams,
+-                                              ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError
++    const std::string response = "";
+     return trimCpy(response);
  }
  
 @@ -235,13 +235,13 @@
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 6d1ccf2..f53c693 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -18,7 +18,7 @@
 %define libssh2_name libssh2-%{name}
 %endif
 Name:       freefilesync
-Version:    10.19
+Version:    10.20
 Release:    1%{?dist}
 Summary:    A file synchronization utility
 
@@ -202,6 +202,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
 
 %changelog
+* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 10.20-1
+- version bump
+
 * Fri Dec 27 2019 B Stack <bgstack15@gmail.com> - 10.19-1
 - version bump