CVS commit: pkgsrc/security

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Dec  1 12:47:23 UTC 2022

Modified Files:
        pkgsrc/security/qca2-qt5: Makefile
        pkgsrc/security/qca2-qt5-gnupg: Makefile
        pkgsrc/security/qca2-qt5-ossl: Makefile
Added Files:
        pkgsrc/security/qca2-qt5: Makefile.common distinfo
        pkgsrc/security/qca2-qt5/patches: patch-CMakeLists.txt

Log Message:
qca2-qt5: Update to 2.3.5.

Detach from the qca2 build as a newer release is now required for QT5.  I was
unable to find a list of changes since 2.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/qca2-qt5/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/qca2-qt5/Makefile.common \
    pkgsrc/security/qca2-qt5/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/qca2-qt5-gnupg/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/qca2-qt5-ossl/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/qca2-qt5/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/qca2-qt5/Makefile
diff -u pkgsrc/security/qca2-qt5/Makefile:1.19 pkgsrc/security/qca2-qt5/Makefile:1.20
--- pkgsrc/security/qca2-qt5/Makefile:1.19      Wed Nov 23 16:18:59 2022
+++ pkgsrc/security/qca2-qt5/Makefile   Thu Dec  1 12:47:23 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2022/11/23 16:18:59 adam Exp $
+# $NetBSD: Makefile,v 1.20 2022/12/01 12:47:23 jperkin Exp $
 
 PKGNAME=       qca2-qt5-${DISTNAME:C/.*-//}
-PKGREVISION=   11
 
 COMMENT=       Cross-platform crypto API for QT5
 
-.include "../../security/qca2/Makefile.common"
+.include "../../security/qca2-qt5/Makefile.common"
 
 DEPENDS+=      mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 
@@ -14,7 +13,7 @@ INSTALLATION_DIRS=    lib/pkgconfig
 CMAKE_ARGS+=   -DBUILD_PLUGINS=none
 CMAKE_ARGS+=   -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
 
-PKGCONFIG_OVERRIDE=            lib/pkgconfig/qca2-qt5.pc 
+PKGCONFIG_OVERRIDE=            lib/pkgconfig/qca2-qt5.pc
 PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
 post-install:

Index: pkgsrc/security/qca2-qt5-gnupg/Makefile
diff -u pkgsrc/security/qca2-qt5-gnupg/Makefile:1.20 pkgsrc/security/qca2-qt5-gnupg/Makefile:1.21
--- pkgsrc/security/qca2-qt5-gnupg/Makefile:1.20        Wed Nov 23 16:21:02 2022
+++ pkgsrc/security/qca2-qt5-gnupg/Makefile     Thu Dec  1 12:47:23 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2022/11/23 16:21:02 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/12/01 12:47:23 jperkin Exp $
 
 PKGNAME=       qca2-qt5-gnupg-${DISTNAME:C/.*-//}
-PKGREVISION=   11
 
 COMMENT=       Cross-platform crypto API for QT5 - GnuPG plugin
 
-.include "../../security/qca2/Makefile.common"
+.include "../../security/qca2-qt5/Makefile.common"
 
 DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 

Index: pkgsrc/security/qca2-qt5-ossl/Makefile
diff -u pkgsrc/security/qca2-qt5-ossl/Makefile:1.20 pkgsrc/security/qca2-qt5-ossl/Makefile:1.21
--- pkgsrc/security/qca2-qt5-ossl/Makefile:1.20 Wed Nov 23 16:21:02 2022
+++ pkgsrc/security/qca2-qt5-ossl/Makefile      Thu Dec  1 12:47:23 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2022/11/23 16:21:02 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/12/01 12:47:23 jperkin Exp $
 
 PKGNAME=       qca2-qt5-ossl-${DISTNAME:C/.*-//}
-PKGREVISION=   11
 
 COMMENT=       Cross-platform crypto API for QT5 - OpenSSL plugin
 
-.include "../../security/qca2/Makefile.common"
+.include "../../security/qca2-qt5/Makefile.common"
 
 BUILD_DIRS=    plugins/qca-ossl
 

Added files:

Index: pkgsrc/security/qca2-qt5/Makefile.common
diff -u /dev/null pkgsrc/security/qca2-qt5/Makefile.common:1.1
--- /dev/null   Thu Dec  1 12:47:23 2022
+++ pkgsrc/security/qca2-qt5/Makefile.common    Thu Dec  1 12:47:23 2022
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile.common,v 1.1 2022/12/01 12:47:23 jperkin Exp $
+#
+# used by security/qca2-qt5-gnupg/Makefile
+# used by security/qca2-qt5-ossl/Makefile
+
+DISTNAME=      qca-2.3.5
+CATEGORIES=    security
+MASTER_SITES=  ${MASTER_SITE_KDE:=qca/${PKGVERSION_NOREV}/}
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://userbase.kde.org/QCA
+LICENSE=       gnu-lgpl-v2.1
+
+PATCHDIR=      ${.CURDIR}/../../security/qca2-qt5/patches
+DISTINFO_FILE= ${.CURDIR}/../../security/qca2-qt5/distinfo
+
+USE_TOOLS+=    gmake
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++
+
+# install under qt5 prefix to not clash with qca 1.x
+CMAKE_ARGS+=   -DQCA_INSTALL_IN_QT_PREFIX=ON
+CMAKE_ARGS+=   -DOSX_FRAMEWORK=OFF
+CMAKE_ARGS+=   -DBUILD_TESTS=OFF
+
+SUBST_CLASSES+=                certs
+SUBST_STAGE.certs=     pre-configure
+SUBST_FILES.certs=     CMakeLists.txt
+SUBST_VARS.certs=      PREFIX
Index: pkgsrc/security/qca2-qt5/distinfo
diff -u /dev/null pkgsrc/security/qca2-qt5/distinfo:1.1
--- /dev/null   Thu Dec  1 12:47:23 2022
+++ pkgsrc/security/qca2-qt5/distinfo   Thu Dec  1 12:47:23 2022
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2022/12/01 12:47:23 jperkin Exp $
+
+BLAKE2s (qca-2.3.5.tar.xz) = 380c378b23617c316480a2f899ecc69bec50e9f0b55d495cfde6161a54277473
+SHA512 (qca-2.3.5.tar.xz) = 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
+Size (qca-2.3.5.tar.xz) = 741036 bytes
+SHA1 (patch-CMakeLists.txt) = 4867c54f8bff523233a11201bdb021e6e81a10ed

Index: pkgsrc/security/qca2-qt5/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/security/qca2-qt5/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Dec  1 12:47:23 2022
+++ pkgsrc/security/qca2-qt5/patches/patch-CMakeLists.txt       Thu Dec  1 12:47:23 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2022/12/01 12:47:23 jperkin Exp $
+
+Add mozilla-rootcerts certstore to list
+
+--- CMakeLists.txt.orig        2018-01-31 20:15:27.000000000 +0000
++++ CMakeLists.txt
+@@ -304,6 +304,7 @@ else ( WIN32 )
+       "/etc/pki/tls/cert.pem"
+       "/etc/ssl/ca-bundle.pem"
+       "/usr/share/curl/curl-ca-bundle.crt"
++      "@PREFIX@/share/mozilla-rootcerts/cacert.pem"
+     )
+     foreach (_current_try ${toTry})
+       if(EXISTS ${_current_try})