Accepting request 948470 from home:seil0:branches:network

- 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 OBS-URL: https://build.opensuse.org/request/show/948470 OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=53
2022-01-24 19:21:54 +00:00 · 2022-01-24 19:21:54 +00:00 · f0a167fc8c
commit f0a167fc8c
parent acfcfb4b23
6 changed files with 111 additions and 21 deletions
--- a/FreeFileSync-disable-in-app-updates.patch
+++ b/FreeFileSync-disable-in-app-updates.patch
@ -1,6 +1,6 @@
-diff -Naur FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp FreeFileSync_11.13_Source/FreeFileSync/Source/ui/gui_generated.cpp
--- FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp	2021-08-17 09:48:08.000000000 +0200
-+++ FreeFileSync_11.13_Source/FreeFileSync/Source/ui/gui_generated.cpp	2022-01-16 17:43:23.315321793 +0100
+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 );
--- a/FreeFileSync-openssl-1.1.1.patch
+++ b/FreeFileSync-openssl-1.1.1.patch
@ -0,0 +1,52 @@
+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"));
+ 
--- a/FreeFileSync.changes
+++ b/FreeFileSync.changes
@ -1,4 +1,38 @@
 -------------------------------------------------------------------
+Sun Jan 16 17:42:44 UTC 2022 - Jannik Seiler <seil0@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 <seil0@mosad.xyz>

 - Add FreeFileSync-disable-in-app-updates.patch to disable the in app 
--- a/FreeFileSync.spec
+++ b/FreeFileSync.spec
@ -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
@ -32,6 +32,7 @@ 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
@ -69,8 +70,11 @@ export CXXFLAGS="%{optflags} -fabi-version=2 -fabi-compat-version=2"
 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
--- a/FreeFileSync_11.13_Source.zip
+++ b/FreeFileSync_11.13_Source.zip
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51cc5940fb99d85e52f519bc9b5c96fd1434b834b3ceadd51765bf4038a1eea5
-size 2554702
--- a/FreeFileSync_11.16_Source.zip
+++ b/FreeFileSync_11.16_Source.zip
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a02515634f7c5241f32da3484822f834ca0be4510e1e46f2be8f012520bf861f
+size 2654765