Rafael Sadowski <[email protected]> writes:
> Hi All,
>
> please find below a simple patch to teach security/qca to use cert.pem
> from base. Qca own rootcerts.pem is from January 15th, 2009 (according
> to README). This diff also fix a conflict with upcoming qca-qt5.
>
> OK? Comments?
Please use SYSCONFDIR here. BASESYSCONFDIR is a user setting while
/etc/ssl/cert.pem is a fixed location.
> Rafael Sadowski
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/qca/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 11 Jul 2017 20:40:44 -0000 1.19
> +++ Makefile 12 Jul 2017 13:16:56 -0000
> @@ -10,6 +10,7 @@ DISTNAME = qca-${VERSION}
> PKGNAME-main = qca-${VERSION}
> PKGNAME-ossl = qca-ossl-${VERSION}
> PKGNAME-gnupg = qca-gnupg-${VERSION}
> +REVISION-main = 0
>
> CATEGORIES = security
>
> @@ -39,6 +40,7 @@ CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=
> -DQCA_BINARY_INSTALL_DIR=${PREFIX}/bin \
> -DBUILD_PLUGINS="ossl;gnupg" \
> -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=ON \
> + -Dqca_CERTSTORE=${BASESYSCONFDIR}/ssl/cert.pem \
> -DQT4_BUILD:Bool=ON
>
> MODULES = devel/cmake
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/security/qca/pkg/PLIST-main,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 PLIST-main
> --- pkg/PLIST-main 11 Jul 2017 20:40:44 -0000 1.1
> +++ pkg/PLIST-main 12 Jul 2017 13:16:56 -0000
> @@ -5,8 +5,6 @@
> @pkgpath security/qca2
> @bin bin/mozcerts
> @bin bin/qcatool
> -certs/
> -certs/rootcerts.pem
> include/QtCrypto/
> include/QtCrypto/QtCrypto
> include/QtCrypto/qca.h
> @@ -30,10 +28,10 @@ lib/cmake/Qca/QcaConfig.cmake
> lib/cmake/Qca/QcaConfigVersion.cmake
> lib/cmake/Qca/QcaTargets${MODCMAKE_BUILD_SUFFIX}
> lib/cmake/Qca/QcaTargets.cmake
> -lib/qca/
> -lib/qca/crypto/
> @lib lib/libqca.so.${LIBqca_VERSION}
> lib/pkgconfig/qca2.pc
> +lib/qca/
> +lib/qca/crypto/
> @man man/man1/qcatool.1
> mkspecs/
> mkspecs/features/
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
