pool/FreeFileSync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1064399 from home:seil0:branches:network

Browse Source 
- Drop FreeFileSync-openssl-1.1.1.patch as it is no longer needed

OBS-URL: https://build.opensuse.org/request/show/1064399
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=61
This commit is contained in:
Jannik Seiler 2023-02-11 16:10:59 +00:00 committed by Git OBS Bridge
parent 81b549558c
commit 21ec9290ad
3 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
FreeFileSync-openssl-1.1.1.patch
View File

@ -1,52 +0,0 @@
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"));

5
FreeFileSync.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 11 14:48:04 UTC 2023 - Jannik Seiler <seil0@mosad.xyz>
- Drop FreeFileSync-openssl-1.1.1.patch as it is no longer needed
-------------------------------------------------------------------
Sun Dec 25 20:20:12 UTC 2022 - Jannik Seiler <seil0@mosad.xyz>

3
FreeFileSync.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package FreeFileSync
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,7 +32,6 @@ 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