Attachment 212262 Details for Bug 244682 – v1

[patch] v1

qca-2.3.0.v1.diff (text/plain), 5.08 KB, created by Tobias C. Berner on 2020-03-08 15:08:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2020-03-08 15:08:57 UTC

Size: 5.08 KB

patch

obsolete

>diff --git a/devel/qca/Makefile b/devel/qca/Makefile
>index bf85d6421f51..5d380175ceac 100644
>--- a/devel/qca/Makefile
>+++ b/devel/qca/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	qca
>-PORTVERSION=	2.2.1
>-PORTREVISION=	4
>+DISTVERSION=	2.3.0
> CATEGORIES=	devel
> MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
> PKGNAMESUFFIX=	-qt5
>diff --git a/devel/qca/distinfo b/devel/qca/distinfo
>index b4e73a9c7888..01c9e8ca5be7 100644
>--- a/devel/qca/distinfo
>+++ b/devel/qca/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1556314674
>-SHA256 (qca-2.2.1.tar.xz) = d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02
>-SIZE (qca-2.2.1.tar.xz) = 691676
>+TIMESTAMP = 1583676075
>+SHA256 (qca-2.3.0.tar.xz) = 1d68ef41a1b61dc9786beb923a68902a6276a77cced5e5ea7ff985ef113932d7
>+SIZE (qca-2.3.0.tar.xz) = 729504
>diff --git a/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt b/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt
>deleted file mode 100644
>index fa9fe230c79a..000000000000
>--- a/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- plugins/qca-botan/CMakeLists.txt.orig	2019-04-24 12:58:14 UTC
>-+++ plugins/qca-botan/CMakeLists.txt
>-@@ -16,6 +16,7 @@ if(BOTAN_FOUND)
>-     set_property(TARGET qca-botan  PROPERTY SUFFIX ".dylib")
>-   endif()
>- 
>-+  target_link_directories(qca-botan PRIVATE ${BOTAN_LIBRARY_DIRS})
>-   target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES})
>- 
>-   if(NOT DEVELOPER_MODE)
>diff --git a/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h b/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h
>deleted file mode 100644
>index a0e197ef3e4e..000000000000
>--- a/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h
>+++ /dev/null
>@@ -1,49 +0,0 @@
>---- plugins/qca-ossl/ossl110-compat.h.orig	2019-04-24 12:58:14 UTC
>-+++ plugins/qca-ossl/ossl110-compat.h
>-@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
>-     return 1;
>- }
>- 
>--static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
>--    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
>--{
>--    if (!meth) return 0;
>--    meth->rsa_sign = sign;
>--    return 1;
>--}
>--
>--static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
>--    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
>--{
>--    if (!meth) return 0;
>--    meth->rsa_verify = verify;
>--    return 1;
>--}
>--
>- static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
>- {
>-     if (!meth) return 0;
>-@@ -271,5 +255,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
>- #define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
>- 
>- #endif // OPENSSL_VERSION_NUMBER < 0x10100000L
>-+
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>-+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
>-+    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
>-+{
>-+    if (!meth) return 0;
>-+    meth->rsa_sign = sign;
>-+    return 1;
>-+}
>-+
>-+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
>-+    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
>-+{
>-+    if (!meth) return 0;
>-+    meth->rsa_verify = verify;
>-+    return 1;
>-+}
>-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 
>- #endif // OSSL110COMPAT_H
>diff --git a/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp b/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
>deleted file mode 100644
>index a5ddc5f874ad..000000000000
>--- a/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
>+++ /dev/null
>@@ -1,44 +0,0 @@
>---- plugins/qca-ossl/qca-ossl.cpp.orig	2019-04-24 12:58:14 UTC
>-+++ plugins/qca-ossl/qca-ossl.cpp
>-@@ -62,12 +62,12 @@
>- #endif
>- 
>- // OpenSSL 1.1.0 compatibility macros
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
>- #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
>- #endif
>- 
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- #include <openssl/kdf.h>
>- #endif
>- 
>-@@ -1280,7 +1280,7 @@ class opensslPbkdf2Context : public KDFContext (public
>- protected:
>- };
>- 
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- class opensslHkdfContext : public HKDFContext
>- {
>- public:
>-@@ -7416,7 +7416,7 @@ class opensslProvider : public Provider (public)
>- #endif
>- 		list += "pbkdf1(sha1)";
>- 		list += "pbkdf2(sha1)";
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- 		list += "hkdf(sha256)";
>- #endif
>- 		list += "pkey";
>-@@ -7489,7 +7489,7 @@ class opensslProvider : public Provider (public)
>- #endif
>- 		else if ( type == "pbkdf2(sha1)" )
>- 			return new opensslPbkdf2Context( this, type );
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- 		else if ( type == "hkdf(sha256)" )
>- 			return new opensslHkdfContext( this, type );
>- #endif

Actions: View | Diff

Attachments on bug 244682: 212262 | 212404