From 21ec9290ad831d9793fff4b9797e78ac17882f3c01782ae40accea9915df9147 Mon Sep 17 00:00:00 2001 From: Jannik Seiler Date: Sat, 11 Feb 2023 16:10:59 +0000 Subject: [PATCH] Accepting request 1064399 from home:seil0:branches:network - 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 --- FreeFileSync-openssl-1.1.1.patch | 52 -------------------------------- FreeFileSync.changes | 5 +++ FreeFileSync.spec | 3 +- 3 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 FreeFileSync-openssl-1.1.1.patch diff --git a/FreeFileSync-openssl-1.1.1.patch b/FreeFileSync-openssl-1.1.1.patch deleted file mode 100644 index ce60a90..0000000 --- a/FreeFileSync-openssl-1.1.1.patch +++ /dev/null @@ -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(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")); - diff --git a/FreeFileSync.changes b/FreeFileSync.changes index 2baf95d..47de3aa 100644 --- a/FreeFileSync.changes +++ b/FreeFileSync.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 11 14:48:04 UTC 2023 - Jannik Seiler + +- Drop FreeFileSync-openssl-1.1.1.patch as it is no longer needed + ------------------------------------------------------------------- Sun Dec 25 20:20:12 UTC 2022 - Jannik Seiler diff --git a/FreeFileSync.spec b/FreeFileSync.spec index 27040b4..1c3383e 100644 --- a/FreeFileSync.spec +++ b/FreeFileSync.spec @@ -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