ffs: fix fuzz/patches

2 files changed, 45 insertions, 58 deletions

diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index bc9ad4a..de2bd20 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -3,10 +3,9 @@ Source: Original research
 Last-Modified: 2022-08-03
 Last-Version: 11.23
 Message: Main patch to compile on Devuan.
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/ffs_paths.cpp 10.18-1/FreeFileSync/Source/ffs_paths.cpp
---- 10.13-0/FreeFileSync/Source/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
-+++ 11.21-1/FreeFileSync/Source/ffs_paths.cpp	2019-11-21 09:41:42.287474472 -0500
-@@ -49,7 +49,7 @@
+--- a/FreeFileSync/Source/ffs_paths.cpp
++++ b/FreeFileSync/Source/ffs_paths.cpp
+@@ -49,7 +49,7 @@ Zstring fff::getInstallDirPath()
  
  Zstring fff::getResourceDirPath()
  {
@@ -15,9 +14,8 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  }
  
  
-diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile
---- 11.20-0/FreeFileSync/Source/Makefile	2022-04-18 09:49:31.901386387 -0400
-+++ 11.20-1/FreeFileSync/Source/Makefile	2022-04-18 10:00:41.504569833 -0400
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
 @@ -1,10 +1,10 @@
 -exeName = FreeFileSync_$(shell arch)
 +exeName = FreeFileSync
@@ -32,11 +30,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/Makefile 11
  
  
  cxxFlags  += `pkg-config --cflags openssl`
-Message: some random sloppiness with a missing graphical asset. It's not important to the application.
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
-+++ 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp  2021-07-15 09:03:57.753183052 -0400
-@@ -93,6 +93,8 @@
+--- a/FreeFileSync/Source/ui/small_dlgs.cpp
++++ b/FreeFileSync/Source/ui/small_dlgs.cpp
+@@ -89,6 +89,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
      build += LTR_MARK; //fix Arabic
      build += utfTo<wxString>(cpuArchName);
  
@@ -45,7 +41,7 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
      build += SPACED_BULLET;
      build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
  
-@@ -140,9 +140,9 @@
+@@ -139,9 +141,9 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
  
      wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files
  
@@ -58,7 +54,7 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
  
      //--------------------------------------------------------------------------
      //have animal + text match *final* dialog width
-@@ -152,7 +152,7 @@
+@@ -151,7 +153,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
          const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 /* grey border*/) / 2;
          const int textWidth  =  m_panelDonate->GetSize().GetWidth() - 5 - 5 - imageWidth;
  
@@ -67,9 +63,8 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
  
          m_staticTextDonate->Show();
          m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size
-diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 11.20-0/FreeFileSync/Source/RealTimeSync/Makefile	2022-04-18 09:49:31.901386387 -0400
-+++ 11.20-1/FreeFileSync/Source/RealTimeSync/Makefile	2022-04-18 10:00:35.168501749 -0400
+--- a/FreeFileSync/Source/RealTimeSync/Makefile
++++ b/FreeFileSync/Source/RealTimeSync/Makefile
 @@ -1,10 +1,10 @@
 -exeName = RealTimeSync_$(shell arch)
 +exeName = RealTimeSync
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 3a11dca..c3e5d55 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -2,10 +2,9 @@ Version: 11.23
 Date: 2022-08-03
 Author: bgstack15
 Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program.
-diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp
---- 11.23-0/FreeFileSync/Source/ui/gui_generated.cpp	2022-08-03 08:55:32.136102940 -0400
-+++ 11.23-1/FreeFileSync/Source/ui/gui_generated.cpp	2022-08-03 08:58:06.653976661 -0400
-@@ -110,15 +110,6 @@
+--- a/FreeFileSync/Source/ui/gui_generated.cpp
++++ b/FreeFileSync/Source/ui/gui_generated.cpp
+@@ -110,15 +110,6 @@ MainDialogGenerated::MainDialogGenerated
  
      m_menuHelp->AppendSeparator();
  
@@ -21,7 +20,7 @@ diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/
      m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
      m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1131,8 +1122,6 @@
+@@ -1131,8 +1122,6 @@ MainDialogGenerated::MainDialogGenerated
      m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
      m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
      m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
@@ -30,10 +29,9 @@ diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/
      m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
      m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
      m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
-diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/Source/ui/gui_generated.h
---- 11.23-0/FreeFileSync/Source/ui/gui_generated.h	2022-08-03 08:55:32.136102940 -0400
-+++ 11.23-1/FreeFileSync/Source/ui/gui_generated.h	2022-08-03 08:57:44.669710074 -0400
-@@ -96,8 +96,6 @@
+--- a/FreeFileSync/Source/ui/gui_generated.h
++++ b/FreeFileSync/Source/ui/gui_generated.h
+@@ -96,8 +96,6 @@ protected:
      wxMenuItem* m_menuItemShowOverview;
      wxMenu* m_menuHelp;
      wxMenuItem* m_menuItemHelp;
@@ -42,7 +40,7 @@ diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/So
      wxMenuItem* m_menuItemAbout;
      wxBoxSizer* bSizerPanelHolder;
      wxPanel* m_panelTopButtons;
-@@ -232,8 +230,6 @@
+@@ -232,8 +230,6 @@ protected:
      virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
      virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
      virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
@@ -51,18 +49,17 @@ diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/So
      virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
      virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
      virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp
---- 11.16-0/FreeFileSync/Source/ui/main_dlg.cpp	2022-01-04 08:52:19.811432573 -0500
-+++ 11.16-1/FreeFileSync/Source/ui/main_dlg.cpp	2022-01-04 08:57:14.506728896 -0500
-@@ -31,7 +31,6 @@
+--- a/FreeFileSync/Source/ui/main_dlg.cpp
++++ b/FreeFileSync/Source/ui/main_dlg.cpp
+@@ -30,7 +30,6 @@
+ #include <wx+/window_tools.h>
  #include <wx+/image_resources.h>
- //#include <wx+/std_button_layout.h>
  #include "cfg_grid.h"
 -#include "version_check.h"
  #include "gui_status_handler.h"
  #include "small_dlgs.h"
  #include "progress_indicator.h"
-@@ -821,7 +820,6 @@
+@@ -826,7 +825,6 @@ imgFileManagerSmall_([]
  
      setImage(*m_menuItemHelp,            loadImage("help_sicon"));
      setImage(*m_menuItemAbout,           loadImage("about_sicon"));
@@ -70,7 +67,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc
  
      fixMenuIcons(*m_menuFile);
      fixMenuIcons(*m_menuActions);
-@@ -922,9 +920,6 @@
+@@ -927,9 +925,6 @@ imgFileManagerSmall_([]
      //mainly to update row label sizes...
      updateGui();
  
@@ -80,7 +77,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc
      //asynchronous call to wxWindow::Layout(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
      Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
      wxCommandEvent evtDummy;           //call once before onLayoutWindowAsync()
-@@ -1108,8 +1104,6 @@
+@@ -1123,8 +1118,6 @@ void MainDialog::setGlobalCfgOnInit(cons
      auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
      auiMgr_.GetPane(m_panelLog   ).Hide(); //
  
@@ -89,7 +86,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc
      auiMgr_.Update();
  }
  
-@@ -5740,72 +5734,6 @@
+@@ -5746,72 +5739,6 @@ void MainDialog::onMenuExportFileList(wx
      }
  }
  
@@ -162,10 +159,9 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc
  void MainDialog::onLayoutWindowAsync(wxIdleEvent& event)
  {
      //execute just once per startup!
-diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.h 11.10-2/FreeFileSync/Source/ui/main_dlg.h
---- 11.10-1/FreeFileSync/Source/ui/main_dlg.h	2021-05-10 08:02:46.059494398 -0400
-+++ 11.10-2/FreeFileSync/Source/ui/main_dlg.h	2021-05-10 10:52:28.108669884 -0400
-@@ -266,8 +266,6 @@
+--- a/FreeFileSync/Source/ui/main_dlg.h
++++ b/FreeFileSync/Source/ui/main_dlg.h
+@@ -273,8 +273,6 @@ private:
      void onMenuExportFileList (wxCommandEvent& event) override;
      void onMenuResetLayout    (wxCommandEvent& event) override { resetLayout(); }
      void onMenuFindItem       (wxCommandEvent& event) override { showFindPanel(true /*show*/); } //CTRL + F
@@ -174,10 +170,9 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.h 11.10-2/FreeFileSync/Source/
      void onMenuAbout          (wxCommandEvent& event) override;
      void onShowHelp           (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); }
      void onMenuQuit           (wxCommandEvent& event) override { Close(); }
-diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/Source/ui/version_check.cpp
---- 11.16-1/FreeFileSync/Source/ui/version_check.cpp	2021-05-10 08:10:14.751776629 -0400
-+++ 11.16-2/FreeFileSync/Source/ui/version_check.cpp	2021-05-10 10:50:08.595338399 -0400
-@@ -73,6 +73,8 @@
+--- a/FreeFileSync/Source/ui/version_check.cpp
++++ b/FreeFileSync/Source/ui/version_check.cpp
+@@ -73,6 +73,8 @@ time_t getVersionCheckCurrentTime()
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -186,7 +181,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -158,8 +160,7 @@
+@@ -151,8 +153,7 @@ void showUpdateAvailableDialog(wxWindow*
      std::wstring updateDetailsMsg;
      try
      {
@@ -196,7 +191,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/
      }
      catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); }
  
-@@ -182,8 +183,8 @@
+@@ -175,8 +176,8 @@ void showUpdateAvailableDialog(wxWindow*
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -207,7 +202,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/
  
      if (response.empty() ||
      !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
-@@ -226,58 +227,6 @@
+@@ -223,58 +224,6 @@ void fff::disableUpdateCheck(time_t& las
  }
  
  
@@ -266,10 +261,9 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/
  struct fff::UpdateCheckResultPrep
  {
      std::vector<std::pair<std::string, std::string>> postParameters;
-diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.h 11.10-2/FreeFileSync/Source/ui/version_check.h
---- 11.16-0/FreeFileSync/Source/ui/version_check.h	2021-05-10 08:02:46.067494474 -0400
-+++ 11.16-1/FreeFileSync/Source/ui/version_check.h	2021-05-10 10:50:22.035466671 -0400
-@@ -32,9 +32,6 @@
+--- a/FreeFileSync/Source/ui/version_check.h
++++ b/FreeFileSync/Source/ui/version_check.h
+@@ -32,9 +32,6 @@ std::shared_ptr<const UpdateCheckResult>
  void automaticUpdateCheckEval(wxWindow& parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion,
                                const UpdateCheckResult* asyncResult);
  //----------------------------------------------------------------------------
@@ -279,10 +273,9 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.h 11.10-2/FreeFileSync/So
  }
  
  #endif //VERSION_CHECK_H_324872374893274983275
-diff -aur /usr/src/freefilesync/11.22-0/FreeFileSync/Source/Makefile /usr/src/freefilesync/11.22-1/FreeFileSync/Source/Makefile
---- 11.22-0/FreeFileSync/Source/Makefile	2022-06-26 11:47:06.603733867 -0400
-+++ 11.22-1/FreeFileSync/Source/Makefile	2022-06-26 14:01:34.640058450 -0400
-@@ -76,7 +85,6 @@
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
+@@ -77,7 +77,6 @@ cppFiles+=ui/small_dlgs.cpp
  cppFiles+=ui/sync_cfg.cpp
  cppFiles+=ui/tray_icon.cpp
  cppFiles+=ui/triple_splitter.cpp
@@ -290,9 +283,8 @@ diff -aur /usr/src/freefilesync/11.22-0/FreeFileSync/Source/Makefile /usr/src/fr
  cppFiles+=../../libcurl/curl_wrap.cpp
  cppFiles+=../../zen/file_access.cpp
  cppFiles+=../../zen/file_io.cpp
-diff -aur /usr/src/freefilesync/11.22-0/FreeFileSync/Source/ui/small_dlgs.cpp /usr/src/freefilesync/11.22-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 11.22-0/FreeFileSync/Source/ui/small_dlgs.cpp	2022-06-26 12:01:15.638291465 -0400
-+++ 11.22-1/FreeFileSync/Source/ui/small_dlgs.cpp	2022-06-26 14:01:37.516094208 -0400
+--- a/FreeFileSync/Source/ui/small_dlgs.cpp
++++ b/FreeFileSync/Source/ui/small_dlgs.cpp
 @@ -27,7 +27,6 @@
  #include <wx+/image_resources.h>
  #include "gui_generated.h"