Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package FreeFileSync for openSUSE:Factory
checked in at 2022-01-24 23:10:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/FreeFileSync (Old)
and /work/SRC/openSUSE:Factory/.FreeFileSync.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeFileSync"
Mon Jan 24 23:10:28 2022 rev:9 rq:948471 version:11.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/FreeFileSync/FreeFileSync.changes
2021-08-25 20:59:20.689071661 +0200
+++ /work/SRC/openSUSE:Factory/.FreeFileSync.new.1938/FreeFileSync.changes
2022-01-24 23:11:10.942270643 +0100
@@ -1,0 +2,40 @@
+Sun Jan 16 17:42:44 UTC 2022 - Jannik Seiler <se...@mosad.xyz>
+
+- Update to 11.16
+ - Allow to select and remove invalid config file
+ - Migrated all HTTPS requests to use libcurl (Linux, macOS)
+ - Set keyboard focus on config panel after startup
+ - Added computer name to log file trailer
+ - Context menu instead of confirmation dialog for swap sides
+ - Fixed config selection lost after auto-cleaning obsolete rows
+ - Install app files with owner set to root (Linux)
+ - Don't override keyboard shortcut "CTRL + W" (macOS)
+ - Migrated key conversion routines deprecated in OpenSSL 3.0
+ - Boxed app icon to fit OS theme (macOS)
+ - Fixed manual retry after automatic update check error
+ - Fixed missing ampersands in middle grid tooltip
+- Changes from 11.15
+ - Play sound reminder when waiting for user confirmation
+ - Enhanced crash diagnostics with known triggers
+ - Defer reporting third-party incompatibilities until after crashing
+ - Fixed Server 2019 not being detected for log file
+ - Use native representation for modified config (macOS)
+ - Improved WinMerge detection for external app integration
+- Changes from 11.14
+ - Authenticate (S)FTP connections using OpenSSL 3.0
+ - Fixed E_NOINTERFACE error after synchronization
+ - Preempt crashes due to Nahimic Sonic Studio 3
+ - Hide main window when minimizing progress window (macOS)
+ - Avoid second dock icon when minimizing progress window (macOS)
+- Add FreeFileSync-openssl-1.1.1.patch to fix build with openssl 1.1.1
+- Update FreeFileSync-disable-in-app-updates.patch for version 11.16
+- Rename FreeFileSync-Build.patch to FreeFileSync-build.patch
+- Rename FreeFileSync-icon_loader.patch to FreeFileSync-icon-loader.patch
+- Rename FreeFileSync-Resources.patch to FreeFileSync-resources.patch
+-------------------------------------------------------------------
+Sun Jan 16 17:01:17 UTC 2022 - Jannik Seiler <se...@mosad.xyz>
+
+- Add FreeFileSync-disable-in-app-updates.patch to disable the in app
+ standalone updater for the packaged version of FreeFileSync.
+
+-------------------------------------------------------------------
Old:
----
FreeFileSync-Build.patch
FreeFileSync-Resources.patch
FreeFileSync-icon_loader.patch
FreeFileSync_11.13_Source.zip
New:
----
FreeFileSync-build.patch
FreeFileSync-disable-in-app-updates.patch
FreeFileSync-icon-loader.patch
FreeFileSync-openssl-1.1.1.patch
FreeFileSync-resources.patch
FreeFileSync_11.16_Source.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ FreeFileSync.spec ++++++
--- /var/tmp/diff_new_pack.EUeGFy/_old 2022-01-24 23:11:11.854264410 +0100
+++ /var/tmp/diff_new_pack.EUeGFy/_new 2022-01-24 23:11:11.858264383 +0100
@@ -1,7 +1,7 @@
#
# spec file for package FreeFileSync
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: FreeFileSync
-Version: 11.13
+Version: 11.16
Release: 0
Summary: Backup software to synchronize files and folders
License: GPL-3.0-or-later
@@ -28,9 +28,11 @@
Source2: %{name}.png
Source3: RealTimeSync.desktop
Source4: RealTimeSync.png
-Patch0: FreeFileSync-Build.patch
-Patch1: FreeFileSync-Resources.patch
-Patch2: FreeFileSync-icon_loader.patch
+Patch0: FreeFileSync-build.patch
+Patch1: FreeFileSync-resources.patch
+Patch2: FreeFileSync-icon-loader.patch
+Patch3: FreeFileSync-disable-in-app-updates.patch
+Patch4: FreeFileSync-openssl-1.1.1.patch
BuildRequires: boost-devel >= 1.54
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
@@ -68,8 +70,11 @@
export CC="gcc"
export CXX="g++"
-%make_build -C %{name}/Source exeName=FreeFileSync
-%make_build -C %{name}/Source/RealTimeSync exeName=RealTimeSync
+/usr/bin/make -O -j1 V=1 VERBOSE=1 -C FreeFileSync/Source exeName=FreeFileSync
+/usr/bin/make -O -j1 V=1 VERBOSE=1 -C FreeFileSync/Source/RealTimeSync
exeName=RealTimeSync
+
+#%%make_build -C %%{name}/Source exeName=FreeFileSync
+#%%make_build -C %%{name}/Source/RealTimeSync exeName=RealTimeSync
%install
# FreeFileSync
++++++ FreeFileSync-build.patch ++++++
diff -Naur FreeFileSync_11.4_Source_orig/FreeFileSync/Source/Makefile
FreeFileSync_11.4_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_11.4_Source_orig/FreeFileSync/Source/Makefile 2020-12-05
14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/FreeFileSync/Source/Makefile 2020-12-11
09:24:39.418116342 +0100
@@ -2,9 +2,9 @@
cxxFlags = -std=c++2a -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow
-Wno-maybe-uninitialized \
- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie
-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no`
-pthread
+linkFlags = -s `wx-config --libs std, aui, richtext --debug=no` -pthread -lz
-pie
cxxFlags += `pkg-config --cflags openssl`
@@ -16,9 +16,10 @@
cxxFlags += `pkg-config --cflags libssh2`
linkFlags += `pkg-config --libs libssh2`
-cxxFlags += `pkg-config --cflags gtk+-2.0`
+cxxFlags += `pkg-config --cflags gtk+-3.0`
+linkFlags += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
-cxxFlags += -isystem/usr/include/gtk-2.0
+cxxFlags += -isystem/usr/include/gtk-3.0
#support for SELinux (optional)
SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
diff -Naur
FreeFileSync_11.4_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile
FreeFileSync_11.4_Source/FreeFileSync/Source/RealTimeSync/Makefile
--- FreeFileSync_11.4_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile
2020-12-05 14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/FreeFileSync/Source/RealTimeSync/Makefile
2020-12-11 09:19:38.287288344 +0100
@@ -2,14 +2,15 @@
cxxFlags = -std=c++2a -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow
-Wno-maybe-uninitialized \
- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie
-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no`
-pthread
+linkFlags = -s `wx-config --libs std, aui, richtext --debug=no` -pthread -lz
-pie
#Gtk - support "no button border"
-cxxFlags += `pkg-config --cflags gtk+-2.0`
+cxxFlags += `pkg-config --cflags gtk+-3.0`
+linkFlags += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
-cxxFlags += -isystem/usr/include/gtk-2.0
+cxxFlags += -isystem/usr/include/gtk-3.0
cppFiles=
cppFiles+=application.cpp
diff -Naur FreeFileSync_11.4_Source_orig/libssh2/libssh2_wrap.h
FreeFileSync_11.4_Source/libssh2/libssh2_wrap.h
--- FreeFileSync_11.4_Source_orig/libssh2/libssh2_wrap.h 2020-12-05
14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/libssh2/libssh2_wrap.h 2020-12-11
09:17:38.447774909 +0100
@@ -20,6 +20,22 @@
#error libssh2_sftp.h header guard changed
#endif
+// fix some build errors
+/* MAX_SFTP_READ_SIZE is how much data is asked for at max in each FXP_READ
+ * packets.
+ */
+#ifndef MAX_SFTP_READ_SIZE
+ #define MAX_SFTP_READ_SIZE 30000
+#endif
+
+/*
+ * MAX_SFTP_OUTGOING_SIZE MUST not be larger than 32500 or so. This is the
+ * amount of data sent in each FXP_WRITE packet
+ */
+#ifndef MAX_SFTP_OUTGOING_SIZE
+ #define MAX_SFTP_OUTGOING_SIZE 30000
+#endif
+
//fix libssh2 64-bit warning mess: https://github.com/libssh2/libssh2/pull/96
#undef libssh2_userauth_password
inline int libssh2_userauth_password(LIBSSH2_SESSION* session, const
std::string& username, const std::string& password)
diff -Naur FreeFileSync_11.4_Source_orig/zen/ring_buffer.h
FreeFileSync_11.4_Source/zen/ring_buffer.h
--- FreeFileSync_11.4_Source_orig/zen/ring_buffer.h 2020-12-05
14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/zen/ring_buffer.h 2020-12-11 09:16:43.519997924
+0100
@@ -8,6 +8,7 @@
#define RING_BUFFER_H_01238467085684139453534
#include <cassert>
+#include <cstddef>
#include "scope_guard.h"
++++++ FreeFileSync-disable-in-app-updates.patch ++++++
diff -Naur
FreeFileSync_11.16_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp
FreeFileSync_11.16_Source/FreeFileSync/Source/ui/gui_generated.cpp
--- FreeFileSync_11.16_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp
2022-01-02 18:32:20.000000000 +0100
+++ FreeFileSync_11.16_Source/FreeFileSync/Source/ui/gui_generated.cpp
2022-01-16 18:08:11.272184873 +0100
@@ -108,13 +108,14 @@
m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString(
_("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
m_menuHelp->Append( m_menuItemHelp );
- m_menuHelp->AppendSeparator();
+ // disable update/auto update actions for packaged version (they are only
hidden, to not break any code and keep the patch small)
+ //m_menuHelp->AppendSeparator();
m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY,
wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
- m_menuHelp->Append( m_menuItemCheckVersionNow );
+ //m_menuHelp->Append( m_menuItemCheckVersionNow );
m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY,
wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK
);
- m_menuHelp->Append( m_menuItemCheckVersionAuto );
+ //m_menuHelp->Append( m_menuItemCheckVersionAuto );
m_menuItemCheckVersionAuto->Check( true );
m_menuHelp->AppendSeparator();
diff -Naur FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp
FreeFileSync_11.13_Source/FreeFileSync/Source/ui/main_dlg.cpp
--- FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp
2021-08-17 09:48:08.000000000 +0200
+++ FreeFileSync_11.13_Source/FreeFileSync/Source/ui/main_dlg.cpp
2022-01-16 17:27:16.593500053 +0100
@@ -845,7 +845,7 @@
updateGui();
//register regular check for update on next idle event
- Bind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
+ //Bind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
//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);
diff -Naur
FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/version_check.cpp
FreeFileSync_11.13_Source/FreeFileSync/Source/ui/version_check.cpp
--- FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/version_check.cpp
2022-01-16 17:31:51.876901517 +0100
+++ FreeFileSync_11.13_Source/FreeFileSync/Source/ui/version_check.cpp
2022-01-16 17:32:03.004877442 +0100
@@ -77,7 +77,9 @@
return false;
const time_t now = std::time(nullptr);
- return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+ //return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+
+ return false;
}
++++++ FreeFileSync-icon-loader.patch ++++++
--- FreeFileSync_11.9_Source_orig/FreeFileSync/Source/base/icon_loader.cpp
2021-04-01 20:49:34.000000000 +0200
+++ FreeFileSync_11.9_Source/FreeFileSync/Source/base/icon_loader.cpp
2021-05-14 16:26:33.212337647 +0200
@@ -216,7 +216,7 @@
//the remaining icon types won't block!
assert(GDK_IS_PIXBUF(gicon) || G_IS_THEMED_ICON(gicon) ||
G_IS_EMBLEMED_ICON(gicon));
- return FileIconHolder(static_cast<GIcon*>(::g_object_ref(gicon)) /*pass
ownership*/, maxSize);
+ return FileIconHolder(gicon /*pass ownership*/, maxSize);
}
++++++ FreeFileSync-openssl-1.1.1.patch ++++++
Summary: Compile for libss-dev 1.1.1m
Author: bgstack15
Date: 2022-01-04
Version: 11.16
Message: Compile on Devuan Ceres with libssl-dev_1.1.1m-1
diff -aur 11.13/zen/open_ssl.cpp 11.14/zen/open_ssl.cpp
--- 11.16-0/zen/open_ssl.cpp 2022-01-04 10:04:34.135914294 -0500
+++ 11.16-1/zen/open_ssl.cpp 2022-01-04 10:29:12.544451067 -0500
@@ -201,7 +201,7 @@
//================================================================================
-std::string keyToStream(const EVP_PKEY* evp, RsaStreamType streamType, bool
publicKey) //throw SysError
+std::string keyToStream(EVP_PKEY* evp, RsaStreamType streamType, bool
publicKey) //throw SysError
{
//assert(::EVP_PKEY_get_base_id(evp) == EVP_PKEY_RSA);
@@ -210,7 +210,7 @@
case RsaStreamType::pkix:
{
//fix OpenSSL API inconsistencies:
- auto PEM_write_bio_PrivateKey2 = [](BIO* bio, const EVP_PKEY* key)
+ auto PEM_write_bio_PrivateKey2 = [](BIO* bio, EVP_PKEY* key)
{
return ::PEM_write_bio_PrivateKey(bio, //BIO* bp
key, //const EVP_PKEY* x
@@ -269,7 +269,7 @@
return {reinterpret_cast<const char*>(keyBuf), keyLen};
#else
//fix OpenSSL API inconsistencies:
- auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, const RSA* rsa)
+ auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, RSA* rsa)
{
return ::PEM_write_bio_RSAPrivateKey(bio, //BIO* bp
rsa, //const RSA* x
@@ -279,14 +279,14 @@
nullptr,
//pem_password_cb* cb
nullptr); //void* u
};
- auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, const RSA* rsa) {
return ::PEM_write_bio_RSAPublicKey(bio, rsa); };
+ auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, RSA* rsa) { return
::PEM_write_bio_RSAPublicKey(bio, rsa); };
BIO* bio = ::BIO_new(BIO_s_mem());
if (!bio)
throw SysError(formatLastOpenSSLError("BIO_new"));
ZEN_ON_SCOPE_EXIT(::BIO_free_all(bio));
- const RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference!
+ RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference!
if (!rsa)
throw SysError(formatLastOpenSSLError("EVP_PKEY_get0_RSA"));
++++++ FreeFileSync-resources.patch ++++++
--- FreeFileSync_11.0_Source_orig/FreeFileSync/Source/ffs_paths.cpp
2020-07-22 13:22:20.000000000 +0200
+++ FreeFileSync_11.0_Source/FreeFileSync/Source/ffs_paths.cpp 2020-08-04
15:21:24.667813874 +0200
@@ -64,7 +64,8 @@
Zstring fff::getResourceDirPf()
{
- return getProcessParentFolderPath() + FILE_NAME_SEPARATOR +
Zstr("Resources") + FILE_NAME_SEPARATOR;
+ // for opensuse install to /usr/share/FreeFileSync specificly
+ return Zstr("/usr/share/FreeFileSync/");
}
