Merge branch 'freefilesync-nocheck' into 'master'

freefilesync: no update check, rpm and dpkg

Closes #9

See merge request bgstack15/stackrpms!75

1 files changed, 29 insertions, 9 deletions

diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 3582b1d..c11bf3a 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,7 +1,7 @@
-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
+diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-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 @@
++++ 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp	2019-07-16 10:56:40.213575535 -0400
+@@ -5298,7 +5298,7 @@
          globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
  
      m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
@@ -10,7 +10,7 @@ diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5031,6 +5031,7 @@
+@@ -5306,6 +5306,7 @@
          automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                   automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get());
      }
@@ -18,7 +18,7 @@ diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_
  }
  
  
-@@ -5038,7 +5039,7 @@
+@@ -5313,7 +5314,7 @@
  {
      //execute just once per startup!
      Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
@@ -27,7 +27,7 @@ diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5052,6 +5053,7 @@
+@@ -5327,6 +5328,7 @@
                                       resultAsync.get()); //run on main thread:
          });
      }
@@ -35,9 +35,9 @@ diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_
  }
  
  
-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
+diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 10.14-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
++++ 10.14-1/FreeFileSync/Source/ui/version_check.cpp	2019-07-16 11:45:36.113848111 -0400
 @@ -69,6 +69,8 @@
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
@@ -47,7 +47,27 @@ diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/versi
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -236,13 +238,13 @@
+@@ -156,8 +158,7 @@
+     {
+         try
+         {
+-            const std::string buf = sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })),
+-            ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError
++            const std::string buf = "";
+             updateDetailsMsg = utfTo<std::wstring>(buf);
+         }
+         catch (const zen::SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); }
+@@ -187,8 +188,7 @@
+ //access is thread-safe on Windows (WinInet), but not on Linux/OS X (wxWidgets)
+ 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);
+ }
+ 
+@@ -235,13 +235,13 @@
          const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError
          lastOnlineVersion = onlineVersion;