Index: head/devel/qca/Makefile =================================================================== --- head/devel/qca/Makefile (revision 506207) +++ head/devel/qca/Makefile (revision 506208) @@ -1,54 +1,55 @@ # Created by: Vsevolod Stakhov # $FreeBSD$ PORTNAME= qca PORTVERSION= 2.2.1 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KDE/stable/qca/${PORTVERSION} PKGNAMESUFFIX= -qt5 MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform crypto API for Qt ${FLAVOR:C/qt//} LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cmake compiler:c++11-lang qt:5 tar:xz CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no \ -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ -DQCA_MAN_INSTALL_DIR=${PREFIX}/man CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt USE_LDCONFIG= yes CMAKE_ARGS+= -DQCA_SUFFIX=qt5 USE_QT= core buildtools_build qmake_build PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= BOTAN GNUPG OPENSSL SASL TEST OPTIONS_DEFAULT=GNUPG OPENSSL OPTIONS_SUB= yes BOTAN_CMAKE_ON= -DWITH_botan_PLUGIN=yes +BOTAN_DESC= Build with Botan crypto library BOTAN_LIB_DEPENDS= libbotan-2.so:security/botan2 BOTAN_USES= pkgconfig GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes GNUPG_RUN_DEPENDS= gpg2:security/gnupg OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes OPENSSL_USES= ssl SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 TEST_CMAKE_BOOL= BUILD_TESTS TEST_TEST_TARGET= test TEST_USE= QT=network,testlib .include Index: head/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h =================================================================== --- head/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h (nonexistent) +++ head/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h (revision 506208) @@ -0,0 +1,49 @@ +--- 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 Property changes on: head/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp =================================================================== --- head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp (nonexistent) +++ head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp (revision 506208) @@ -0,0 +1,44 @@ +--- 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 + #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 Property changes on: head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property