Attachment #162809 for bug #204305

View | Details | Raw Unified | Return to bug 204305
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	qca
PORTVERSION=	2.1.1
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	KDE/stable/qca/${PORTVERSION}/src

MAINTAINER=	kde@FreeBSD.org
COMMENT=	Cross-platform crypto API for Qt 4

BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss

USES=		cmake:outsource 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

.if defined(PKGNAMESUFFIX)
CMAKE_ARGS+=	-DQCA_SUFFIX=qt5
USE_QT5=	core buildtools_build qmake_build
.else
USE_QT4=	corelib moc_build qmake_build rcc_build
CMAKE_ARGS+=	-DQT4_BUILD=yes
.endif

PLIST_SUB=	SHLIB_VER=${PORTVERSION}

OPTIONS_DEFINE=	GNUPG OPENSSL SASL
OPTIONS_DEFAULT=GNUPG OPENSSL
OPTIONS_SUB=	yes

SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2

post-patch:
# Qt Network module is used for tests only
	${REINPLACE_CMD} 's,Core Network,Core,' ${WRKSRC}/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/qca/distinfo (-2 / +2 lines)
1	SHA256 (qca-2.1.0.tar.gz) = 226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284	1	SHA256 (qca-2.1.1.tar.xz) = 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983
2	SIZE (qca-2.1.0.tar.gz) = 978473	2	SIZE (qca-2.1.1.tar.xz) = 688460




Fix a few syntax errors such that the QC_CERTSTORE_PATH environment
variable is used correctly.

--- CMakeLists.txt.orig	2014-11-06 08:15:45 UTC
+++ CMakeLists.txt
@@ -262,13 +262,13 @@ message(STATUS "Checking for certstore..
 if( WIN32 )
 # USE BUILTIN
 else ( WIN32 )
-  if ( ENV{QC_CERTSTORE_PATH} )
-    if(EXISTS ENV{QC_CERTSTORE_PATH})
+  if ( DEFINED ENV{QC_CERTSTORE_PATH} )
+    if(EXISTS $ENV{QC_CERTSTORE_PATH})
       set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH})
-    else(EXISTS ENV{QC_CERTSTORE_PATH})
+    else(EXISTS $ENV{QC_CERTSTORE_PATH})
       # path to try
-    endif(EXISTS ENV{QC_CERTSTORE_PATH})
-  else( ENV{QC_CERTSTORE_PATH} )
+    endif(EXISTS $ENV{QC_CERTSTORE_PATH})
+  else( DEFINED ENV{QC_CERTSTORE_PATH} )
     set( toTry
       "/etc/ssl/certs/ca-certificates.crt"
       "/usr/share/ssl/cert.pem"
@@ -282,7 +282,7 @@ else ( WIN32 )
         set( qca_CERTSTORE ${_current_try})
       endif(EXISTS ${_current_try})
     endforeach (_current_try)
-  endif( ENV{QC_CERTSTORE_PATH} )
+  endif( DEFINED ENV{QC_CERTSTORE_PATH} )
 endif(WIN32)
 
 if (qca_CERTSTORE)




commit d4e9444f9dd2741cc2a4b3f4d6c510e4a1d7413c
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date:   Sat Jan 17 15:12:03 2015 +0200

    Do not end Cipher::Mode with a comma.

    This solves a build failure with compilers such as GCC 4.2:
    /usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list

    REVIEW: 122107

--- include/QtCrypto/qca_basic.h
+++ include/QtCrypto/qca_basic.h
@@ -595,7 +595,7 @@ public:
 		CFB, ///< operate in %Cipher FeedBack mode
 		ECB, ///< operate in Electronic Code Book mode
 		OFB, ///< operate in Output FeedBack Mode
-		CTR, ///< operate in CounTer Mode
+		CTR  ///< operate in CounTer Mode
 	};
 
 	/**

Lines 23-29 Link Here

(-)devel/qca/pkg-plist (-1 / +1 lines)
23	lib/cmake/Qca/QcaTargets.cmake	23	lib/cmake/Qca/QcaTargets.cmake
24	lib/libqca.so	24	lib/libqca.so
25	lib/libqca.so.2	25	lib/libqca.so.2
26	lib/libqca.so.2.1.0	26	lib/libqca.so.%%SHLIB_VER%%
27	%%SASL%%lib/qca/crypto/libqca-cyrus-sasl.so	27	%%SASL%%lib/qca/crypto/libqca-cyrus-sasl.so
28	%%GNUPG%%lib/qca/crypto/libqca-gnupg.so	28	%%GNUPG%%lib/qca/crypto/libqca-gnupg.so
29	%%OPENSSL%%lib/qca/crypto/libqca-ossl.so	29	%%OPENSSL%%lib/qca/crypto/libqca-ossl.so




bin/mozcerts-qt5
bin/qcatool-qt5
include/Qca-qt5/QtCrypto/QtCrypto
include/Qca-qt5/QtCrypto/qca.h
include/Qca-qt5/QtCrypto/qca_basic.h
include/Qca-qt5/QtCrypto/qca_cert.h
include/Qca-qt5/QtCrypto/qca_core.h
include/Qca-qt5/QtCrypto/qca_export.h
include/Qca-qt5/QtCrypto/qca_keystore.h
include/Qca-qt5/QtCrypto/qca_publickey.h
include/Qca-qt5/QtCrypto/qca_safetimer.h
include/Qca-qt5/QtCrypto/qca_securelayer.h
include/Qca-qt5/QtCrypto/qca_securemessage.h
include/Qca-qt5/QtCrypto/qca_support.h
include/Qca-qt5/QtCrypto/qca_textfilter.h
include/Qca-qt5/QtCrypto/qca_tools.h
include/Qca-qt5/QtCrypto/qca_version.h
include/Qca-qt5/QtCrypto/qcaprovider.h
include/Qca-qt5/QtCrypto/qpipe.h
%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Config.cmake
%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5ConfigVersion.cmake
%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Targets-%%CMAKE_BUILD_TYPE%%.cmake
%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Targets.cmake
%%QT_LIBDIR%%/libqca-qt5.so
%%QT_LIBDIR%%/libqca-qt5.so.2
%%QT_LIBDIR%%/libqca-qt5.so.%%SHLIB_VER%%
%%SASL%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-cyrus-sasl.so
%%GNUPG%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-gnupg.so
%%OPENSSL%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-ossl.so
%%QT_MKSPECDIR%%/features/crypto.prf
libdata/pkgconfig/qca2-qt5.pc
man/man1/qcatool-qt5.1.gz




# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
# $FreeBSD$

PORTNAME=	qca
PORTVERSION=	2.1.0
CATEGORIES=	devel
MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
PKGNAMESUFFIX=	-qt5

COMMENT=	Cross-platform crypto API for Qt 5
COMMENT=	Cross-platform crypto API for Qt5

PLIST=		${PKGDIR}/pkg-plist.qt5
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss

MASTERDIR=	${.CURDIR}/../qca
.include "${MASTERDIR}/Makefile"
		-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
		-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
		-DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \
		-DQCA_SUFFIX=qt5
CONFIGURE_ENV=	QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
USE_LDCONFIG=	yes
USE_QT5=	buildtools_build core network qmake_build

OPTIONS_DEFINE=	GNUPG OPENSSL SASL
OPTIONS_DEFAULT=GNUPG OPENSSL
OPTIONS_SUB=	yes

GNUPG_CMAKE_ON=		-DWITH_gnupg_PLUGIN=yes
GNUPG_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg

OPENSSL_CMAKE_ON=	-DWITH_ossl_PLUGIN=yes
OPENSSL_USE=		OPENSSL=yes

SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/qca-qt5/distinfo (-2 lines)
1	SHA256 (qca-2.1.0.tar.gz) = 226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284
2	SIZE (qca-2.1.0.tar.gz) = 978473




--- CMakeLists.txt.orig	2014-11-06 08:15:45 UTC
+++ CMakeLists.txt
@@ -170,8 +170,8 @@ else( QCA_INSTALL_IN_QT_PREFIX )
   set(QCA_BINARY_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Directory where qca plugins will install")
   set(QCA_LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Directory where qca library will install")
   set(QCA_FEATURE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
-  set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca public headers will install")
-  set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca headers will install")
+  set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qca-${QCA_SUFFIX}" CACHE PATH "Directory where qca public headers will install")
+  set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qca-${QCA_SUFFIX}" CACHE PATH "Directory where qca headers will install")
   set(QCA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${QCA_LIB_NAME}/html" CACHE PATH "Directory where qca documentation will install")
   set(QCA_MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where qca man pages will install")
 endif( QCA_INSTALL_IN_QT_PREFIX )
@@ -262,13 +262,13 @@ message(STATUS "Checking for certstore..
 if( WIN32 )
 # USE BUILTIN
 else ( WIN32 )
-  if ( ENV{QC_CERTSTORE_PATH} )
-    if(EXISTS ENV{QC_CERTSTORE_PATH})
+  if ( DEFINED ENV{QC_CERTSTORE_PATH} )
+    if(EXISTS $ENV{QC_CERTSTORE_PATH})
       set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH})
-    else(EXISTS ENV{QC_CERTSTORE_PATH})
+    else(EXISTS $ENV{QC_CERTSTORE_PATH})
       # path to try
-    endif(EXISTS ENV{QC_CERTSTORE_PATH})
-  else( ENV{QC_CERTSTORE_PATH} )
+    endif(EXISTS $ENV{QC_CERTSTORE_PATH})
+  else( DEFINED ENV{QC_CERTSTORE_PATH} )
     set( toTry
       "/etc/ssl/certs/ca-certificates.crt"
       "/usr/share/ssl/cert.pem"
@@ -282,7 +282,7 @@ else ( WIN32 )
         set( qca_CERTSTORE ${_current_try})
       endif(EXISTS ${_current_try})
     endforeach (_current_try)
-  endif( ENV{QC_CERTSTORE_PATH} )
+  endif( DEFINED ENV{QC_CERTSTORE_PATH} )
 endif(WIN32)
 
 if (qca_CERTSTORE)
@@ -374,7 +374,7 @@ include(CMakePackageConfigHelpers)
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfig.cmake"
-  INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca
+  INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX}
 )
 write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
 
@@ -434,10 +434,10 @@ if(NOT DEVELOPER_MODE)
   endif()
   message("")
 
-  install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca FILE QcaTargets.cmake)
+  install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX} FILE QcaTargets.cmake)
   install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfig.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfigVersion.cmake"
-    DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca
+    DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX}
     )
 endif()




commit d4e9444f9dd2741cc2a4b3f4d6c510e4a1d7413c
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date:   Sat Jan 17 15:12:03 2015 +0200

    Do not end Cipher::Mode with a comma.

    This solves a build failure with compilers such as GCC 4.2:
    /usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list

    REVIEW: 122107

--- include/QtCrypto/qca_basic.h
+++ include/QtCrypto/qca_basic.h
@@ -595,7 +595,7 @@ public:
 		CFB, ///< operate in %Cipher FeedBack mode
 		ECB, ///< operate in Electronic Code Book mode
 		OFB, ///< operate in Output FeedBack Mode
-		CTR, ///< operate in CounTer Mode
+		CTR  ///< operate in CounTer Mode
 	};
 
 	/**




QCA aims to provide a straightforward and cross-platform crypto API,
using Qt datatypes and conventions.

Supported features:

  * SSL/TLS
  * X509
  * SASL
  * RSA
  * Hashing (SHA1, MD5)
  * Ciphers (Blowfish, 3DES, AES)

WWW: http://delta.affinix.com/qca/




bin/mozcerts-qt5
bin/qcatool-qt5
include/qca-qt5/QtCrypto/QtCrypto
include/qca-qt5/QtCrypto/qca.h
include/qca-qt5/QtCrypto/qca_basic.h
include/qca-qt5/QtCrypto/qca_cert.h
include/qca-qt5/QtCrypto/qca_core.h
include/qca-qt5/QtCrypto/qca_export.h
include/qca-qt5/QtCrypto/qca_keystore.h
include/qca-qt5/QtCrypto/qca_publickey.h
include/qca-qt5/QtCrypto/qca_safetimer.h
include/qca-qt5/QtCrypto/qca_securelayer.h
include/qca-qt5/QtCrypto/qca_securemessage.h
include/qca-qt5/QtCrypto/qca_support.h
include/qca-qt5/QtCrypto/qca_textfilter.h
include/qca-qt5/QtCrypto/qca_tools.h
include/qca-qt5/QtCrypto/qca_version.h
include/qca-qt5/QtCrypto/qcaprovider.h
include/qca-qt5/QtCrypto/qpipe.h
lib/cmake/Qca-qt5/QcaConfig.cmake
lib/cmake/Qca-qt5/QcaConfigVersion.cmake
lib/cmake/Qca-qt5/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Qca-qt5/QcaTargets.cmake
lib/libqca-qt5.so
lib/libqca-qt5.so.2
lib/libqca-qt5.so.2.1.0
%%SASL%%lib/qca-qt5/crypto/libqca-cyrus-sasl.so
%%GNUPG%%lib/qca-qt5/crypto/libqca-gnupg.so
%%OPENSSL%%lib/qca-qt5/crypto/libqca-ossl.so
%%QT_MKSPECDIR%%/features/crypto.prf
libdata/pkgconfig/qca2-qt5.pc
man/man1/qcatool-qt5.1.gz

Return to bug 204305

Lines 2-27 Link Here

(-)devel/qca/Makefile (-7 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qca	4	PORTNAME= qca
5	PORTVERSION= 2.1.0	5	PORTVERSION= 2.1.1
6	PORTREVISION= 3
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://delta.affinix.com/download/qca/2.0/	7	MASTER_SITES= KDE/stable/qca/${PORTVERSION}/src
9		8
10	MAINTAINER= kde@FreeBSD.org	9	MAINTAINER= kde@FreeBSD.org
11	COMMENT= Cross-platform crypto API for Qt	10	COMMENT= Cross-platform crypto API for Qt 4
12		11
13	BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	12	BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
14	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	13	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
15		14
16	USES= cmake:outsource	15	USES= cmake:outsource tar:xz
17	CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \	16	CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no \
18	-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \	17	-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
19	-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \	18	-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
20	-DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man	19	-DQCA_MAN_INSTALL_DIR=${PREFIX}/man
21	CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt	20	CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
22	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22
		23	.if defined(PKGNAMESUFFIX)
		24	CMAKE_ARGS+= -DQCA_SUFFIX=qt5
		25	USE_QT5= core buildtools_build qmake_build
		26	.else
23	USE_QT4= corelib moc_build qmake_build rcc_build	27	USE_QT4= corelib moc_build qmake_build rcc_build
		28	CMAKE_ARGS+= -DQT4_BUILD=yes
		29	.endif
24		30
		31	PLIST_SUB= SHLIB_VER=${PORTVERSION}
		32
25	OPTIONS_DEFINE= GNUPG OPENSSL SASL	33	OPTIONS_DEFINE= GNUPG OPENSSL SASL
26	OPTIONS_DEFAULT=GNUPG OPENSSL	34	OPTIONS_DEFAULT=GNUPG OPENSSL
27	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
Lines 35-38 Link Here
35	SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes	43	SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes
36	SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2	44	SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
37		45
		46	post-patch:
		47	# Qt Network module is used for tests only
		48	${REINPLACE_CMD} 's,Core Network,Core,' ${WRKSRC}/CMakeLists.txt
		49
38	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-33 Link Here

(-)devel/qca/files/patch-CMakeLists.txt (-33 lines)
1	Fix a few syntax errors such that the QC_CERTSTORE_PATH environment
2	variable is used correctly.
3
4	--- CMakeLists.txt.orig 2014-11-06 08:15:45 UTC
5	+++ CMakeLists.txt
6	@@ -262,13 +262,13 @@ message(STATUS "Checking for certstore..
7	if( WIN32 )
8	# USE BUILTIN
9	else ( WIN32 )
10	- if ( ENV{QC_CERTSTORE_PATH} )
11	- if(EXISTS ENV{QC_CERTSTORE_PATH})
12	+ if ( DEFINED ENV{QC_CERTSTORE_PATH} )
13	+ if(EXISTS $ENV{QC_CERTSTORE_PATH})
14	set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH})
15	- else(EXISTS ENV{QC_CERTSTORE_PATH})
16	+ else(EXISTS $ENV{QC_CERTSTORE_PATH})
17	# path to try
18	- endif(EXISTS ENV{QC_CERTSTORE_PATH})
19	- else( ENV{QC_CERTSTORE_PATH} )
20	+ endif(EXISTS $ENV{QC_CERTSTORE_PATH})
21	+ else( DEFINED ENV{QC_CERTSTORE_PATH} )
22	set( toTry
23	"/etc/ssl/certs/ca-certificates.crt"
24	"/usr/share/ssl/cert.pem"
25	@@ -282,7 +282,7 @@ else ( WIN32 )
26	set( qca_CERTSTORE ${_current_try})
27	endif(EXISTS ${_current_try})
28	endforeach (_current_try)
29	- endif( ENV{QC_CERTSTORE_PATH} )
30	+ endif( DEFINED ENV{QC_CERTSTORE_PATH} )
31	endif(WIN32)
32
33	if (qca_CERTSTORE)

Lines 1-22 Link Here

(-)devel/qca/files/patch-git_d4e9444f (-22 lines)
1	commit d4e9444f9dd2741cc2a4b3f4d6c510e4a1d7413c
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Sat Jan 17 15:12:03 2015 +0200
4
5	Do not end Cipher::Mode with a comma.
6
7	This solves a build failure with compilers such as GCC 4.2:
8	/usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list
9
10	REVIEW: 122107
11
12	--- include/QtCrypto/qca_basic.h
13	+++ include/QtCrypto/qca_basic.h
14	@@ -595,7 +595,7 @@ public:
15	CFB, ///< operate in %Cipher FeedBack mode
16	ECB, ///< operate in Electronic Code Book mode
17	OFB, ///< operate in Output FeedBack Mode
18	- CTR, ///< operate in CounTer Mode
19	+ CTR ///< operate in CounTer Mode
20	};
21
22	/**

Lines 1-32 Link Here

(-)devel/qca/pkg-plist.qt5 (-27 / +27 lines)
1	bin/mozcerts-qt5	1	bin/mozcerts-qt5
2	bin/qcatool-qt5	2	bin/qcatool-qt5
3	include/qca-qt5/QtCrypto/QtCrypto	3	include/Qca-qt5/QtCrypto/QtCrypto
4	include/qca-qt5/QtCrypto/qca.h	4	include/Qca-qt5/QtCrypto/qca.h
5	include/qca-qt5/QtCrypto/qca_basic.h	5	include/Qca-qt5/QtCrypto/qca_basic.h
6	include/qca-qt5/QtCrypto/qca_cert.h	6	include/Qca-qt5/QtCrypto/qca_cert.h
7	include/qca-qt5/QtCrypto/qca_core.h	7	include/Qca-qt5/QtCrypto/qca_core.h
8	include/qca-qt5/QtCrypto/qca_export.h	8	include/Qca-qt5/QtCrypto/qca_export.h
9	include/qca-qt5/QtCrypto/qca_keystore.h	9	include/Qca-qt5/QtCrypto/qca_keystore.h
10	include/qca-qt5/QtCrypto/qca_publickey.h	10	include/Qca-qt5/QtCrypto/qca_publickey.h
11	include/qca-qt5/QtCrypto/qca_safetimer.h	11	include/Qca-qt5/QtCrypto/qca_safetimer.h
12	include/qca-qt5/QtCrypto/qca_securelayer.h	12	include/Qca-qt5/QtCrypto/qca_securelayer.h
13	include/qca-qt5/QtCrypto/qca_securemessage.h	13	include/Qca-qt5/QtCrypto/qca_securemessage.h
14	include/qca-qt5/QtCrypto/qca_support.h	14	include/Qca-qt5/QtCrypto/qca_support.h
15	include/qca-qt5/QtCrypto/qca_textfilter.h	15	include/Qca-qt5/QtCrypto/qca_textfilter.h
16	include/qca-qt5/QtCrypto/qca_tools.h	16	include/Qca-qt5/QtCrypto/qca_tools.h
17	include/qca-qt5/QtCrypto/qca_version.h	17	include/Qca-qt5/QtCrypto/qca_version.h
18	include/qca-qt5/QtCrypto/qcaprovider.h	18	include/Qca-qt5/QtCrypto/qcaprovider.h
19	include/qca-qt5/QtCrypto/qpipe.h	19	include/Qca-qt5/QtCrypto/qpipe.h
20	lib/cmake/Qca-qt5/QcaConfig.cmake	20	%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Config.cmake
21	lib/cmake/Qca-qt5/QcaConfigVersion.cmake	21	%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5ConfigVersion.cmake
22	lib/cmake/Qca-qt5/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake	22	%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Targets-%%CMAKE_BUILD_TYPE%%.cmake
23	lib/cmake/Qca-qt5/QcaTargets.cmake	23	%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Targets.cmake
24	lib/libqca-qt5.so	24	%%QT_LIBDIR%%/libqca-qt5.so
25	lib/libqca-qt5.so.2	25	%%QT_LIBDIR%%/libqca-qt5.so.2
26	lib/libqca-qt5.so.2.1.0	26	%%QT_LIBDIR%%/libqca-qt5.so.%%SHLIB_VER%%
27	%%SASL%%lib/qca-qt5/crypto/libqca-cyrus-sasl.so	27	%%SASL%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-cyrus-sasl.so
28	%%GNUPG%%lib/qca-qt5/crypto/libqca-gnupg.so	28	%%GNUPG%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-gnupg.so
29	%%OPENSSL%%lib/qca-qt5/crypto/libqca-ossl.so	29	%%OPENSSL%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-ossl.so
30	%%QT_MKSPECDIR%%/features/crypto.prf	30	%%QT_MKSPECDIR%%/features/crypto.prf
31	libdata/pkgconfig/qca2-qt5.pc	31	libdata/pkgconfig/qca2-qt5.pc
32	man/man1/qcatool-qt5.1.gz	32	man/man1/qcatool-qt5.1.gz

Lines 1-39 Link Here

(-)devel/qca-qt5/Makefile (-33 / +4 lines)
1	# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= qca
5	PORTVERSION= 2.1.0
6	CATEGORIES= devel
7	MASTER_SITES= http://delta.affinix.com/download/qca/2.0/
8	PKGNAMESUFFIX= -qt5	3	PKGNAMESUFFIX= -qt5
9		4
10	MAINTAINER= pawel@FreeBSD.org	5	COMMENT= Cross-platform crypto API for Qt 5
11	COMMENT= Cross-platform crypto API for Qt5
12		6
13	BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	7	PLIST= ${PKGDIR}/pkg-plist.qt5
14	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
15		8
16	USES= cmake:outsource	9	MASTERDIR= ${.CURDIR}/../qca
17	CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT5_BUILD=yes \	10	.include "${MASTERDIR}/Makefile"
18	-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
19	-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
20	-DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \
21	-DQCA_SUFFIX=qt5
22	CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
23	USE_LDCONFIG= yes
24	USE_QT5= buildtools_build core network qmake_build
25
26	OPTIONS_DEFINE= GNUPG OPENSSL SASL
27	OPTIONS_DEFAULT=GNUPG OPENSSL
28	OPTIONS_SUB= yes
29
30	GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes
31	GNUPG_RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
32
33	OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes
34	OPENSSL_USE= OPENSSL=yes
35
36	SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes
37	SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
38
39	.include <bsd.port.mk>

Lines 1-63 Link Here

(-)devel/qca-qt5/files/patch-CMakeLists.txt (-63 lines)
1	--- CMakeLists.txt.orig 2014-11-06 08:15:45 UTC
2	+++ CMakeLists.txt
3	@@ -170,8 +170,8 @@ else( QCA_INSTALL_IN_QT_PREFIX )
4	set(QCA_BINARY_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Directory where qca plugins will install")
5	set(QCA_LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Directory where qca library will install")
6	set(QCA_FEATURE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
7	- set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca public headers will install")
8	- set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca headers will install")
9	+ set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qca-${QCA_SUFFIX}" CACHE PATH "Directory where qca public headers will install")
10	+ set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qca-${QCA_SUFFIX}" CACHE PATH "Directory where qca headers will install")
11	set(QCA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${QCA_LIB_NAME}/html" CACHE PATH "Directory where qca documentation will install")
12	set(QCA_MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where qca man pages will install")
13	endif( QCA_INSTALL_IN_QT_PREFIX )
14	@@ -262,13 +262,13 @@ message(STATUS "Checking for certstore..
15	if( WIN32 )
16	# USE BUILTIN
17	else ( WIN32 )
18	- if ( ENV{QC_CERTSTORE_PATH} )
19	- if(EXISTS ENV{QC_CERTSTORE_PATH})
20	+ if ( DEFINED ENV{QC_CERTSTORE_PATH} )
21	+ if(EXISTS $ENV{QC_CERTSTORE_PATH})
22	set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH})
23	- else(EXISTS ENV{QC_CERTSTORE_PATH})
24	+ else(EXISTS $ENV{QC_CERTSTORE_PATH})
25	# path to try
26	- endif(EXISTS ENV{QC_CERTSTORE_PATH})
27	- else( ENV{QC_CERTSTORE_PATH} )
28	+ endif(EXISTS $ENV{QC_CERTSTORE_PATH})
29	+ else( DEFINED ENV{QC_CERTSTORE_PATH} )
30	set( toTry
31	"/etc/ssl/certs/ca-certificates.crt"
32	"/usr/share/ssl/cert.pem"
33	@@ -282,7 +282,7 @@ else ( WIN32 )
34	set( qca_CERTSTORE ${_current_try})
35	endif(EXISTS ${_current_try})
36	endforeach (_current_try)
37	- endif( ENV{QC_CERTSTORE_PATH} )
38	+ endif( DEFINED ENV{QC_CERTSTORE_PATH} )
39	endif(WIN32)
40
41	if (qca_CERTSTORE)
42	@@ -374,7 +374,7 @@ include(CMakePackageConfigHelpers)
43	configure_package_config_file(
44	"${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
45	"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfig.cmake"
46	- INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca
47	+ INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX}
48	)
49	write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
50
51	@@ -434,10 +434,10 @@ if(NOT DEVELOPER_MODE)
52	endif()
53	message("")
54
55	- install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca FILE QcaTargets.cmake)
56	+ install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX} FILE QcaTargets.cmake)
57	install(FILES
58	"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfig.cmake"
59	"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfigVersion.cmake"
60	- DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca
61	+ DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX}
62	)
63	endif()

Lines 1-22 Link Here

(-)devel/qca-qt5/files/patch-git_d4e9444f (-22 lines)
1	commit d4e9444f9dd2741cc2a4b3f4d6c510e4a1d7413c
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Sat Jan 17 15:12:03 2015 +0200
4
5	Do not end Cipher::Mode with a comma.
6
7	This solves a build failure with compilers such as GCC 4.2:
8	/usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list
9
10	REVIEW: 122107
11
12	--- include/QtCrypto/qca_basic.h
13	+++ include/QtCrypto/qca_basic.h
14	@@ -595,7 +595,7 @@ public:
15	CFB, ///< operate in %Cipher FeedBack mode
16	ECB, ///< operate in Electronic Code Book mode
17	OFB, ///< operate in Output FeedBack Mode
18	- CTR, ///< operate in CounTer Mode
19	+ CTR ///< operate in CounTer Mode
20	};
21
22	/**

Lines 1-13 Link Here

(-)devel/qca-qt5/pkg-descr (-13 lines)
1	QCA aims to provide a straightforward and cross-platform crypto API,
2	using Qt datatypes and conventions.
3
4	Supported features:
5
6	* SSL/TLS
7	* X509
8	* SASL
9	* RSA
10	* Hashing (SHA1, MD5)
11	* Ciphers (Blowfish, 3DES, AES)
12
13	WWW: http://delta.affinix.com/qca/

Lines 1-32 Link Here

(-)devel/qca-qt5/pkg-plist (-32 lines)
1	bin/mozcerts-qt5
2	bin/qcatool-qt5
3	include/qca-qt5/QtCrypto/QtCrypto
4	include/qca-qt5/QtCrypto/qca.h
5	include/qca-qt5/QtCrypto/qca_basic.h
6	include/qca-qt5/QtCrypto/qca_cert.h
7	include/qca-qt5/QtCrypto/qca_core.h
8	include/qca-qt5/QtCrypto/qca_export.h
9	include/qca-qt5/QtCrypto/qca_keystore.h
10	include/qca-qt5/QtCrypto/qca_publickey.h
11	include/qca-qt5/QtCrypto/qca_safetimer.h
12	include/qca-qt5/QtCrypto/qca_securelayer.h
13	include/qca-qt5/QtCrypto/qca_securemessage.h
14	include/qca-qt5/QtCrypto/qca_support.h
15	include/qca-qt5/QtCrypto/qca_textfilter.h
16	include/qca-qt5/QtCrypto/qca_tools.h
17	include/qca-qt5/QtCrypto/qca_version.h
18	include/qca-qt5/QtCrypto/qcaprovider.h
19	include/qca-qt5/QtCrypto/qpipe.h
20	lib/cmake/Qca-qt5/QcaConfig.cmake
21	lib/cmake/Qca-qt5/QcaConfigVersion.cmake
22	lib/cmake/Qca-qt5/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake
23	lib/cmake/Qca-qt5/QcaTargets.cmake
24	lib/libqca-qt5.so
25	lib/libqca-qt5.so.2
26	lib/libqca-qt5.so.2.1.0
27	%%SASL%%lib/qca-qt5/crypto/libqca-cyrus-sasl.so
28	%%GNUPG%%lib/qca-qt5/crypto/libqca-gnupg.so
29	%%OPENSSL%%lib/qca-qt5/crypto/libqca-ossl.so
30	%%QT_MKSPECDIR%%/features/crypto.prf
31	libdata/pkgconfig/qca2-qt5.pc
32	man/man1/qcatool-qt5.1.gz