summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-07-17 12:45:09 +0000
committerB Stack <bgstack15@gmail.com>2019-07-17 12:45:09 +0000
commit459a69438a74439e7e6af8889890cecdd1c20b99 (patch)
tree59a10555410c2baffb8b07873489d14b759966ba
parentMerge branch 'waterfox-bump' into 'master' (diff)
parentfreefilesync: no update check, rpm and dpkg (diff)
downloadstackrpms-459a69438a74439e7e6af8889890cecdd1c20b99.tar.gz
stackrpms-459a69438a74439e7e6af8889890cecdd1c20b99.tar.bz2
stackrpms-459a69438a74439e7e6af8889890cecdd1c20b99.zip
Merge branch 'freefilesync-nocheck' into 'master'
freefilesync: no update check, rpm and dpkg Closes #9 See merge request bgstack15/stackrpms!75
-rw-r--r--freefilesync/debian/changelog6
-rw-r--r--freefilesync/debian/patches/ffs_no_check_updates.patch38
-rw-r--r--freefilesync/ffs_no_check_updates.patch38
-rw-r--r--freefilesync/freefilesync.spec5
4 files changed, 68 insertions, 19 deletions
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 0193438..c27332a 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,9 @@
+freefilesync (10.14-2+devuan) manual; urgency=low
+
+ * Completely disable the update-check
+
+ -- B Stack <bgstack15@gmail.com> Tue, 16 Jul 2019 12:56:46 -0400
+
freefilesync (10.14-1+devuan) manual; urgency=low
* Warn if versioning folder paths differ only in case
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;
diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index 3582b1d..c11bf3a 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/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;
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 1c8244e..4a961b9 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -15,7 +15,7 @@
%endif
Name: freefilesync
Version: 10.14
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: A file synchronization utility
Group: Applications/File
@@ -190,6 +190,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
%ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
%changelog
+* Tue Jul 16 2019 B Stack <bgstack15@gmail.com> - 10.14-3
+- completely disable update-check
+
* Tue Jul 16 2019 B Stack <bgstack15@gmail.com> - 10.14-2
- adjust dependencies for el7
bgstack15