[Midnightbsd-cvs] mports [20022] trunk/devel/qca: qca 2.1.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 25 08:01:06 EDT 2015
Revision: 20022
http://svnweb.midnightbsd.org/mports/?rev=20022
Author: laffer1
Date: 2015-08-25 08:01:05 -0400 (Tue, 25 Aug 2015)
Log Message:
-----------
qca 2.1.0
Modified Paths:
--------------
trunk/devel/qca/Makefile
trunk/devel/qca/distinfo
trunk/devel/qca/pkg-plist
Added Paths:
-----------
trunk/devel/qca/files/patch-CMakeLists.txt
trunk/devel/qca/files/patch-git_d4e9444f
Removed Paths:
-------------
trunk/devel/qca/files/patch-configure
trunk/devel/qca/files/patch-r1273508
trunk/devel/qca/files/patch-src__src.pro
Modified: trunk/devel/qca/Makefile
===================================================================
--- trunk/devel/qca/Makefile 2015-08-25 11:54:15 UTC (rev 20021)
+++ trunk/devel/qca/Makefile 2015-08-25 12:01:05 UTC (rev 20022)
@@ -1,49 +1,38 @@
# $MidnightBSD$
PORTNAME= qca
-PORTVERSION= 2.0.3
+PORTVERSION= 2.1.0
CATEGORIES= devel
MASTER_SITES= http://delta.affinix.com/download/qca/2.0/
-DISTNAME= qca-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Cross-platform crypto API for QT
+COMMENT= Cross-platform crypto API for Qt
+
LICENSE= lgpl
-USE_BZIP2= yes
-USE_QT4= corelib qmake_build moc_build
-HAS_CONFIGURE= yes
-QT_NONSTANDARD= yes
-CONFIGURE_ARGS+=--prefix=${PREFIX}
-CONFIGURE_ENV+= QMAKESPEC=${QMAKESPEC}
-USE_OPENSSL= yes
+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
+CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \
+ -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
+ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
+ -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man
+CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
USE_LDCONFIG= yes
+USE_QT4= corelib moc_build qmake_build rcc_build
-MAN1= qcatool2.1
+OPTIONS_DEFINE= GNUPG OPENSSL SASL
+OPTIONS_DEFAULT=GNUPG OPENSSL
+OPTIONS_SUB= yes
-.if defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+= QC_VERBOSE=Y
-.endif
+GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes
+GNUPG_RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
-.if defined(MAINTAINER_MODE)
-USE_QT4+= qtestlib
-.else
-CONFIGURE_ARGS+=--disable-tests
-.endif
+OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes
+OPENSSL_USE= OPENSSL=yes
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--release --no-separate-debug-info
-PLIST_SUB+= DEBUG="@comment "
-.else
-CONFIGURE_ARGS+=--debug
-PLIST_SUB+= DEBUG=""
-.endif
+SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes
+SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-pre-configure:
- ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure
- ${MKDIR} ${WRKSRC}/libdata/pkgconfig
-
-post-install:
- ${STRIP_CMD} ${PREFIX}/bin/qcatool2 ${PREFIX}/lib/libqca.so.${PORTVERSION}
-
.include <bsd.port.mk>
Modified: trunk/devel/qca/distinfo
===================================================================
--- trunk/devel/qca/distinfo 2015-08-25 11:54:15 UTC (rev 20021)
+++ trunk/devel/qca/distinfo 2015-08-25 12:01:05 UTC (rev 20022)
@@ -1,2 +1,2 @@
-SHA256 (qca-2.0.3.tar.bz2) = 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f
-SIZE (qca-2.0.3.tar.bz2) = 4530731
+SHA256 (qca-2.1.0.tar.gz) = 226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284
+SIZE (qca-2.1.0.tar.gz) = 978473
Added: trunk/devel/qca/files/patch-CMakeLists.txt
===================================================================
--- trunk/devel/qca/files/patch-CMakeLists.txt (rev 0)
+++ trunk/devel/qca/files/patch-CMakeLists.txt 2015-08-25 12:01:05 UTC (rev 20022)
@@ -0,0 +1,33 @@
+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)
Property changes on: trunk/devel/qca/files/patch-CMakeLists.txt
___________________________________________________________________
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
Deleted: trunk/devel/qca/files/patch-configure
===================================================================
--- trunk/devel/qca/files/patch-configure 2015-08-25 11:54:15 UTC (rev 20021)
+++ trunk/devel/qca/files/patch-configure 2015-08-25 12:01:05 UTC (rev 20022)
@@ -1,59 +0,0 @@
---- ./configure.orig 2008-07-21 21:27:13.000000000 +0400
-+++ ./configure 2009-03-15 18:24:58.000000000 +0300
-@@ -382,7 +382,7 @@
- echo makespec is $defmakespec
- fi
-
--qm_spec=""
-+qm_spec="$defmakespec"
- # if the makespec is macx-xcode, force macx-g++
- if [ "$defmakespec" = "macx-xcode" ]; then
- qm_spec=macx-g++
-@@ -799,10 +799,10 @@
- }
-
- str = QString(
-- "prffiles.path = %1/mkspecs/features\n"
-+ "prffiles.path = %%PREFIX%%/share/qt4/mkspecs/features\n"
- "prffiles.files = crypto.prf\n"
- "INSTALLS += prffiles\n"
-- ).arg(QLibraryInfo::location(QLibraryInfo::DataPath));
-+ );
- conf->addExtra(str);
-
- // write pkg-config files
-@@ -852,11 +852,11 @@
- str += pkg_template2.arg("QCA");
- str += pkg_template3.arg("QtCore");
- str += pkg_template4.arg("qca");
-- f.setFileName("lib/pkgconfig/qca2.pc");
-+ f.setFileName("libdata/pkgconfig/qca2.pc");
- if(f.open(QFile::WriteOnly | QFile::Truncate))
- f.write(str.toLatin1());
- f.close();
-- pcfiles += "lib/pkgconfig/qca2.pc";
-+ pcfiles += "libdata/pkgconfig/qca2.pc";
- }
-
- if(do_pc_debug)
-@@ -865,17 +865,17 @@
- str += pkg_template2.arg("QCA_debug");
- str += pkg_template3.arg("QtCore_debug");
- str += pkg_template4.arg("qca_debug");
-- f.setFileName("lib/pkgconfig/qca2_debug.pc");
-+ f.setFileName("libdata/pkgconfig/qca2_debug.pc");
- if(f.open(QFile::WriteOnly | QFile::Truncate))
- f.write(str.toLatin1());
- f.close();
-- pcfiles += "lib/pkgconfig/qca2_debug.pc";
-+ pcfiles += "libdata/pkgconfig/qca2_debug.pc";
- }
-
- if(!pcfiles.isEmpty())
- {
- str = QString(
-- "pcfiles.path = \$\$LIBDIR/pkgconfig\n"
-+ "pcfiles.path = %%PREFIX%%/libdata/pkgconfig\n"
- "pcfiles.files = %1\n"
- "INSTALLS += pcfiles\n"
- ).arg(pcfiles.join(" "));
Added: trunk/devel/qca/files/patch-git_d4e9444f
===================================================================
--- trunk/devel/qca/files/patch-git_d4e9444f (rev 0)
+++ trunk/devel/qca/files/patch-git_d4e9444f 2015-08-25 12:01:05 UTC (rev 20022)
@@ -0,0 +1,22 @@
+commit d4e9444f9dd2741cc2a4b3f4d6c510e4a1d7413c
+Author: Raphael Kubo da Costa <rakuco at 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
+ };
+
+ /**
Property changes on: trunk/devel/qca/files/patch-git_d4e9444f
___________________________________________________________________
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
Deleted: trunk/devel/qca/files/patch-r1273508
===================================================================
--- trunk/devel/qca/files/patch-r1273508 2015-08-25 11:54:15 UTC (rev 20021)
+++ trunk/devel/qca/files/patch-r1273508 2015-08-25 12:01:05 UTC (rev 20022)
@@ -1,59 +0,0 @@
---- ./src/botantools/botan/botan/secmem.h 2007-04-20 08:26:13.000000000 +1100
-+++ ./src/botantools/botan/botan/secmem.h 2012-05-08 14:54:53.513833555 +1100
-@@ -191,15 +191,15 @@
- {
- public:
- MemoryVector<T>& operator=(const MemoryRegion<T>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
-
- MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
- MemoryVector(const T in[], u32bit n)
-- { MemoryRegion<T>::init(false); set(in, n); }
-+ { MemoryRegion<T>::init(false); this->set(in, n); }
- MemoryVector(const MemoryRegion<T>& in)
-- { MemoryRegion<T>::init(false); set(in); }
-+ { MemoryRegion<T>::init(false); this->set(in); }
- MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- { MemoryRegion<T>::init(false); set(in1); append(in2); }
-+ { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
- };
-
- /*************************************************
-@@ -210,15 +210,15 @@
- {
- public:
- SecureVector<T>& operator=(const MemoryRegion<T>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
-
- SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
- SecureVector(const T in[], u32bit n)
-- { MemoryRegion<T>::init(true); set(in, n); }
-+ { MemoryRegion<T>::init(true); this->set(in, n); }
- SecureVector(const MemoryRegion<T>& in)
-- { MemoryRegion<T>::init(true); set(in); }
-+ { MemoryRegion<T>::init(true); this->set(in); }
- SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+ { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
- };
-
- /*************************************************
-@@ -229,14 +229,14 @@
- {
- public:
- SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
-
- SecureBuffer() { MemoryRegion<T>::init(true, L); }
- SecureBuffer(const T in[], u32bit n)
- { MemoryRegion<T>::init(true, L); copy(in, n); }
- private:
- SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
- };
-
- }
Deleted: trunk/devel/qca/files/patch-src__src.pro
===================================================================
--- trunk/devel/qca/files/patch-src__src.pro 2015-08-25 11:54:15 UTC (rev 20021)
+++ trunk/devel/qca/files/patch-src__src.pro 2015-08-25 12:01:05 UTC (rev 20022)
@@ -1,11 +0,0 @@
---- ./src/src.pro.orig 2008-06-04 04:50:25.000000000 +0400
-+++ ./src/src.pro 2009-03-15 18:39:38.000000000 +0300
-@@ -110,7 +110,7 @@
- incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto
- !lib_bundle:INSTALLS += incfiles
-
-- manfiles.path = $$DATADIR/man/man1
-+ manfiles.path = $$PREFIX/man/man1
- manfiles.files = $$QCA_BASE/man/qcatool2.1
- INSTALLS += manfiles
- }
Modified: trunk/devel/qca/pkg-plist
===================================================================
--- trunk/devel/qca/pkg-plist 2015-08-25 11:54:15 UTC (rev 20021)
+++ trunk/devel/qca/pkg-plist 2015-08-25 12:01:05 UTC (rev 20022)
@@ -1,5 +1,5 @@
-bin/qcatool2
-%%DEBUG%%bin/qcatool2.debug
+bin/mozcerts
+bin/qcatool
include/QtCrypto/QtCrypto
include/QtCrypto/qca.h
include/QtCrypto/qca_basic.h
@@ -8,26 +8,25 @@
include/QtCrypto/qca_export.h
include/QtCrypto/qca_keystore.h
include/QtCrypto/qca_publickey.h
+include/QtCrypto/qca_safetimer.h
include/QtCrypto/qca_securelayer.h
include/QtCrypto/qca_securemessage.h
include/QtCrypto/qca_support.h
include/QtCrypto/qca_textfilter.h
include/QtCrypto/qca_tools.h
+include/QtCrypto/qca_version.h
include/QtCrypto/qcaprovider.h
include/QtCrypto/qpipe.h
-lib/libqca.prl
+lib/cmake/Qca/QcaConfig.cmake
+lib/cmake/Qca/QcaConfigVersion.cmake
+lib/cmake/Qca/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qca/QcaTargets.cmake
lib/libqca.so
lib/libqca.so.2
-lib/libqca.so.2.0
-lib/libqca.so.2.0.3
-%%DEBUG%%lib/libqca.so.2.0.3.debug
+lib/libqca.so.2.1.0
+%%SASL%%lib/qca/crypto/libqca-cyrus-sasl.so
+%%GNUPG%%lib/qca/crypto/libqca-gnupg.so
+%%OPENSSL%%lib/qca/crypto/libqca-ossl.so
libdata/pkgconfig/qca2.pc
-share/qca/certs/README
-share/qca/certs/rootcerts.pem
-share/qt4/mkspecs/features/crypto.prf
- at dirrmtry share/qt4/mkspecs/features
- at dirrmtry share/qt4/mkspecs
- at dirrmtry share/qt4
- at dirrm share/qca/certs
- at dirrm share/qca
- at dirrm include/QtCrypto
+man/man1/qcatool.1.gz
+%%QT_MKSPECDIR%%/features/crypto.prf
More information about the Midnightbsd-cvs
mailing list