Date: Sun, 30 Oct 2022 06:39:59 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4f546089d6ac - main - x11/kf5-kdelibs4support: Fix build w/ libressl 3.5 Message-ID: <202210300639.29U6dx8k062077@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f546089d6aca6a6090df531d091415687432ae9 commit 4f546089d6aca6a6090df531d091415687432ae9 Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2022-10-19 06:17:20 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2022-10-30 06:38:33 +0000 x11/kf5-kdelibs4support: Fix build w/ libressl 3.5 Approved by: tcberner (kde, mentor) Differential Revision: https://reviews.freebsd.org/D37044 --- .../files/patch-src_kssl_kopenssl.cpp | 119 +++++++++++++++++++++ .../files/patch-src_kssl_ksslcertificate.cpp | 11 ++ 2 files changed, 130 insertions(+) diff --git a/x11/kf5-kdelibs4support/files/patch-src_kssl_kopenssl.cpp b/x11/kf5-kdelibs4support/files/patch-src_kssl_kopenssl.cpp new file mode 100644 index 000000000000..d989c72082a3 --- /dev/null +++ b/x11/kf5-kdelibs4support/files/patch-src_kssl_kopenssl.cpp @@ -0,0 +1,119 @@ +--- src/kssl/kopenssl.cpp.orig 2022-10-19 06:07:48 UTC ++++ src/kssl/kopenssl.cpp +@@ -978,7 +978,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v) + + void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *)) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + X509_STORE_set_verify_cb_func(store, verify_cb); + #else + if (K_X509_STORE_set_verify_cb) { +@@ -1043,7 +1043,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a + + void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (psig) { + *psig = x->signature; + } +@@ -1121,7 +1121,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509) + + ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return X509_get_notBefore(x); + #else + if (K_X509_getm_notBefore) { +@@ -1134,7 +1134,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X5 + + ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return X509_get_notAfter(x); + #else + if (K_X509_getm_notAfter) { +@@ -1412,7 +1412,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_ST + + X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return v->current_cert; + #else + if (K_X509_STORE_CTX_get_current_cert) { +@@ -1425,7 +1425,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X + + void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + v->error = error; + #else + if (K_X509_STORE_CTX_set_error) { +@@ -1436,7 +1436,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STOR + + int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return v->error; + #else + if (K_X509_STORE_CTX_get_error) { +@@ -1893,7 +1893,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int + + int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return pkey->type; + #else + if (K_EVP_PKEY_base_id) { +@@ -1906,7 +1906,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) + + RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return pkey->pkey.rsa; + #else + if (K_EVP_PKEY_get0_RSA) { +@@ -1919,7 +1919,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) + + void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (n) { + *n = rsa->n; + } +@@ -1938,7 +1938,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNU + + DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return pkey->pkey.dsa; + #else + if (K_EVP_PKEY_get0_DSA) { +@@ -1951,7 +1951,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) + + void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (p) { + *p = dsa->p; + } +@@ -1970,7 +1970,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNU + + void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (pub_key) { + *pub_key = dsa->pub_key; + } diff --git a/x11/kf5-kdelibs4support/files/patch-src_kssl_ksslcertificate.cpp b/x11/kf5-kdelibs4support/files/patch-src_kssl_ksslcertificate.cpp new file mode 100644 index 000000000000..f43c8e07ac38 --- /dev/null +++ b/x11/kf5-kdelibs4support/files/patch-src_kssl_ksslcertificate.cpp @@ -0,0 +1,11 @@ +--- src/kssl/ksslcertificate.cpp.orig 2022-10-19 06:09:59 UTC ++++ src/kssl/ksslcertificate.cpp +@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape() + { + QByteArray qba; + // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all +-#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) ++#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L + NETSCAPE_X509 nx; + ASN1_OCTET_STRING hdr; + QTemporaryFile ktf;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210300639.29U6dx8k062077>