FreeFileSync 10.9 rpm and dpkg

10 files changed, 162 insertions, 95 deletions

diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
new file mode 100644
index 0000000..e464662
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -0,0 +1,25 @@
+This is still experimental.
+diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/folder_selector.cpp 10.9-1/FreeFileSync/Source/ui/folder_selector.cpp
+--- 10.9-0/FreeFileSync/Source/ui/folder_selector.cpp   2019-02-10 16:42:28.960039117 -0500
++++ 10.9-1/FreeFileSync/Source/ui/folder_selector.cpp   2019-02-10 20:20:11.981339625 -0500
+@@ -231,7 +231,7 @@
+
+     std::optional<std::wstring> parallelOpsDisabledReason;
+
+-        parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition");
++    //  parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition");
+
+     if (showCloudSetupDialog(parent_, folderPathPhrase, parallelOps, get(parallelOpsDisabledReason)) != ReturnSmallDlg::BUTTON_OKAY)
+         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 @@
+ globalPairCfg_(globalPairCfg),
+ localPairCfg_(localPairConfig),
+ showMultipleCfgs_(showMultipleCfgs),
+-perfPanelActive_(false),
++perfPanelActive_(true),
+ commandHistItemsMax_(commandHistItemsMax)
+ {
+     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
diff --git a/freefilesync/debian/patches/devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index abe5389..ff840d7 100644
--- a/freefilesync/debian/patches/devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -18,7 +18,7 @@ diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Sou
  
      //if (isPortableVersion())
 -    return appendSeparator(getExeFolderParentPath());
-+    return appendSeparator(getExeFolderParentPath()) + appendSeparator("share") + appendSeparator("FreeFileSync");
++    return appendSeparator("/usr") + appendSeparator("share") + appendSeparator("freefilesync");
      //else //use OS' standard paths
      //    return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir()));
  }
diff --git a/freefilesync/debian/patches/ffs_makefile.patch b/freefilesync/debian/patches/ffs_makefile.patch
new file mode 100644
index 0000000..79a8233
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_makefile.patch
@@ -0,0 +1,32 @@
+diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/Makefile 10.9-1/FreeFileSync/Source/Makefile
+--- 10.3-0/FreeFileSync/Source/Makefile	2019-02-10 22:01:42.138160180 -0500
++++ 10.9-1/FreeFileSync/Source/Makefile	2019-02-11 21:48:19.729739859 -0500
+@@ -1,10 +1,10 @@
+-EXENAME = FreeFileSync_$(shell arch)
++EXENAME = FreeFileSync
+ 
+ CXXFLAGS = -std=c++17 -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
+            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ 
+-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+ 
+ 
+ CXXFLAGS  += `pkg-config --cflags openssl`
+diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefile 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile
+--- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile	2019-02-10 22:01:42.141160214 -0500
++++ 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile	2019-02-11 21:48:22.504771344 -0500
+@@ -1,10 +1,10 @@
+-EXENAME = RealTimeSync_$(shell arch)
++EXENAME = RealTimeSync
+ 
+ CXXFLAGS = -std=c++17 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
+            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ 
+-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+ 
+ #Gtk - support "no button border"
+ CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
new file mode 100644
index 0000000..3582b1d
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -0,0 +1,67 @@
+diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp 10.9-1/FreeFileSync/Source/ui/main_dlg.cpp
+--- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp	2019-02-10 22:01:42.029158919 -0500
++++ 10.9-1/FreeFileSync/Source/ui/main_dlg.cpp	2019-02-10 22:01:57.435336536 -0500
+@@ -5023,7 +5023,7 @@
+         globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
+ 
+     m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
+-
++    /*
+     if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
+     {
+         flashStatusInformation(_("Searching for program updates..."));
+@@ -5031,6 +5031,7 @@
+         automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
+                                  automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get());
+     }
++    */
+ }
+ 
+ 
+@@ -5038,7 +5039,7 @@
+ {
+     //execute just once per startup!
+     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
+-
++    /*
+     if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
+     {
+         flashStatusInformation(_("Searching for program updates..."));
+@@ -5052,6 +5053,7 @@
+                                      resultAsync.get()); //run on main thread:
+         });
+     }
++    */
+ }
+ 
+ 
+diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/version_check.cpp 10.9-1/FreeFileSync/Source/ui/version_check.cpp
+--- 10.9-0/FreeFileSync/Source/ui/version_check.cpp	2019-02-10 22:01:42.126160041 -0500
++++ 10.9-1/FreeFileSync/Source/ui/version_check.cpp	2019-02-10 22:17:56.183369507 -0500
+@@ -69,6 +69,8 @@
+ 
+ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
+ {
++    // short-circuit
++    return false;
+     if (lastUpdateCheck == getVersionCheckInactiveId())
+         return false;
+ 
+@@ -236,13 +238,13 @@
+         const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError
+         lastOnlineVersion = onlineVersion;
+ 
+-        if (haveNewerVersionOnline(onlineVersion))
+-            showUpdateAvailableDialog(parent, onlineVersion);
+-        else
++        //if (haveNewerVersionOnline(onlineVersion))
++        //    showUpdateAvailableDialog(parent, onlineVersion);
++        //else
+             showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg().
+                                    setIcon(getResourceImage(L"update_check")).
+                                    setTitle(_("Check for Program Updates")).
+-                                   setMainInstructions(_("FreeFileSync is up to date.")));
++                                   setMainInstructions(_("Use your package manager for any updates to FreeFileSync.")));
+     }
+     catch (const zen::SysError& e)
+     {
diff --git a/freefilesync/debian/patches/no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 78ac2a5..78ac2a5 100644
--- a/freefilesync/debian/patches/no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
diff --git a/freefilesync/debian/patches/ffs_old_libcurl.patch b/freefilesync/debian/patches/ffs_old_libcurl.patch
new file mode 100644
index 0000000..e13f1bb
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_old_libcurl.patch
@@ -0,0 +1,13 @@
+Upstream uses a libcurl more current than Fedora 29.
+diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
+--- 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h   2019-02-10 16:42:29.124040824 -0500
++++ 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h   2019-02-10 20:57:30.758315345 -0500
+@@ -75,7 +75,7 @@
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
++            //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
diff --git a/freefilesync/debian/patches/ffs_sftp.patch b/freefilesync/debian/patches/ffs_sftp.patch
new file mode 100644
index 0000000..34dc9ad
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_sftp.patch
@@ -0,0 +1,17 @@
+diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/sftp.cpp 10.9-1/FreeFileSync/Source/fs/sftp.cpp
+--- 10.9-0/FreeFileSync/Source/fs/sftp.cpp  2019-02-10 16:42:29.139040980 -0500
++++ 10.9-1/FreeFileSync/Source/fs/sftp.cpp  2019-02-10 21:28:00.030732089 -0500
+@@ -56,9 +56,10 @@
+
+ //attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval
+
+-const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ  = 4 * MAX_SFTP_READ_SIZE;     //https://github.com/libssh2/libssh2/issues/90
+-const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 4 * MAX_SFTP_OUTGOING_SIZE; //
+-static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!");
++// these values are all manually derived from https://github.com/libssh2/libssh2/blob/master/src/sftp.h which for some weak reason are not included in the libssh2-devel headers.
++const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ  = 4 * 30000;     //https://github.com/libssh2/libssh2/issues/90
++const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 4 * 30000; //
++//static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!");
+ /*
+ Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file:
+
diff --git a/freefilesync/debian/patches/makefile.patch b/freefilesync/debian/patches/makefile.patch
deleted file mode 100644
index b3ff7ff..0000000
--- a/freefilesync/debian/patches/makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/Makefile 10.3-2/FreeFileSync/Source/Makefile
---- 10.3-0/FreeFileSync/Source/Makefile   2018-08-07 05:03:33.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/Makefile   2018-08-15 22:25:06.694355202 -0400
-@@ -9,7 +9,7 @@
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
-
--LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
-+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
-
- #Gtk - support recycler/icon loading/no button border/grid scrolling
- CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-@@ -101,6 +101,7 @@
- all: ../Build/Bin/$(APPNAME)
- 
- ../Build/Bin/$(APPNAME): $(OBJ_FILES)
-+	mkdir -p ../Build/Bin
- 	g++ -o $@ $^ $(LINKFLAGS)
- 
- ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile  2018-08-07 05:03:33.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile  2018-08-15 22:25:15.968461418 -0400
-@@ -6,7 +6,7 @@
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
-
--LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
-+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
-
- #Gtk - support "no button border"
- CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
diff --git a/freefilesync/debian/patches/no_check_updates.patch b/freefilesync/debian/patches/no_check_updates.patch
deleted file mode 100644
index 99f0c8f..0000000
--- a/freefilesync/debian/patches/no_check_updates.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.3-2/FreeFileSync/Source/ui/main_dlg.cpp
---- 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/ui/main_dlg.cpp	2018-08-08 18:50:50.455078387 -0400
-@@ -5004,7 +5004,7 @@
-         globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
- 
-     m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
--
-+    /*
-     if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
-     {
-         flashStatusInformation(_("Searching for program updates..."));
-@@ -5012,6 +5012,7 @@
-         automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
-                                  automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get());
-     }
-+    */
- }
- 
- 
-@@ -5019,7 +5020,7 @@
- {
-     //execute just once per startup!
-     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
--
-+    /*
-     if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
-     {
-         flashStatusInformation(_("Searching for program updates..."));
-@@ -5033,6 +5034,7 @@
-                                      resultAsync.get()); //run on main thread:
-         });
-     }
-+    */
- }
- 
- 
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/version_check_impl.h 10.3-2/FreeFileSync/Source/ui/version_check_impl.h
---- 10.3-0/FreeFileSync/Source/ui/version_check_impl.h	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/ui/version_check_impl.h	2018-08-08 18:50:50.458078415 -0400
-@@ -14,7 +14,7 @@
- 
- namespace fff
- {
--inline
-+
- time_t getVersionCheckInactiveId()
- {
-     //use current version to calculate a changing number for the inactive state near UTC begin, in order to always check for updates after installing a new version
-@@ -38,7 +38,6 @@
- }
- 
- 
--inline
- time_t getVersionCheckCurrentTime()
- {
-     return std::time(nullptr);
diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series
index d430762..2dbed63 100644
--- a/freefilesync/debian/patches/series
+++ b/freefilesync/debian/patches/series
@@ -1,5 +1,7 @@
-# You must remove unused comment lines for the released package.
-no_check_updates.patch
-devuan.patch
-no_wx311.patch
-makefile.patch
+ffs_allow_parallel_ops.patch
+ffs_devuan.patch
+ffs_makefile.patch
+ffs_no_check_updates.patch
+ffs_no_wx311.patch
+ffs_old_libcurl.patch
+ffs_sftp.patch