Received: by mail.netbsd.org (Postfix, from userid 605) id 1FBDC84D44; Thu, 18 Mar 2021 06:44:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 59F7384D25 for ; Thu, 18 Mar 2021 06:44:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id LOF70qqSS8rE for ; Thu, 18 Mar 2021 06:44:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 80B6684C86 for ; Thu, 18 Mar 2021 06:44:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 72962FA95; Thu, 18 Mar 2021 06:44:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1616049885122290" MIME-Version: 1.0 Date: Thu, 18 Mar 2021 06:44:45 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/security/qgpgme To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20210318064445.72962FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1616049885122290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Thu Mar 18 06:44:45 UTC 2021 Modified Files: pkgsrc/security/qgpgme: Makefile PLIST distinfo pkgsrc/security/qgpgme/patches: patch-lang_qt_src_Makefile.in Log Message: qgpgme: update to 1.15.1 to match gpgme. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/qgpgme/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/qgpgme/PLIST \ pkgsrc/security/qgpgme/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1616049885122290 Content-Disposition: inline Content-Length: 5208 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/qgpgme/Makefile diff -u pkgsrc/security/qgpgme/Makefile:1.16 pkgsrc/security/qgpgme/Makefile:1.17 --- pkgsrc/security/qgpgme/Makefile:1.16 Tue Feb 2 12:05:48 2021 +++ pkgsrc/security/qgpgme/Makefile Thu Mar 18 06:44:45 2021 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2021/02/02 12:05:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.17 2021/03/18 06:44:45 markd Exp $ -DISTNAME= gpgme-1.10.0 -PKGNAME= qgpgme-1.10.0 -PKGREVISION= 13 +DISTNAME= gpgme-1.15.1 +PKGNAME= qgpgme-1.15.1 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/security/qgpgme/PLIST diff -u pkgsrc/security/qgpgme/PLIST:1.1 pkgsrc/security/qgpgme/PLIST:1.2 --- pkgsrc/security/qgpgme/PLIST:1.1 Wed Jan 31 11:36:14 2018 +++ pkgsrc/security/qgpgme/PLIST Thu Mar 18 06:44:45 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2018/01/31 11:36:14 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/03/18 06:44:45 markd Exp $ include/QGpgME/AbstractImportJob include/QGpgME/AddUserIDJob include/QGpgME/ChangeExpiryJob @@ -7,6 +7,7 @@ include/QGpgME/ChangePasswdJob include/QGpgME/CryptoConfig include/QGpgME/DN include/QGpgME/DataProvider +include/QGpgME/Debug include/QGpgME/DecryptJob include/QGpgME/DecryptVerifyJob include/QGpgME/DefaultKeyGenerationJob @@ -14,6 +15,7 @@ include/QGpgME/DeleteJob include/QGpgME/DownloadJob include/QGpgME/EncryptJob include/QGpgME/ExportJob +include/QGpgME/GpgCardJob include/QGpgME/HierarchicalKeyKistJob include/QGpgME/ImportFromKeyserverJob include/QGpgME/ImportJob @@ -42,6 +44,7 @@ include/qgpgme/changeownertrustjob.h include/qgpgme/changepasswdjob.h include/qgpgme/cryptoconfig.h include/qgpgme/dataprovider.h +include/qgpgme/debug.h include/qgpgme/decryptjob.h include/qgpgme/decryptverifyjob.h include/qgpgme/defaultkeygenerationjob.h @@ -50,6 +53,7 @@ include/qgpgme/dn.h include/qgpgme/downloadjob.h include/qgpgme/encryptjob.h include/qgpgme/exportjob.h +include/qgpgme/gpgcardjob.h include/qgpgme/hierarchicalkeylistjob.h include/qgpgme/importfromkeyserverjob.h include/qgpgme/importjob.h Index: pkgsrc/security/qgpgme/distinfo diff -u pkgsrc/security/qgpgme/distinfo:1.1 pkgsrc/security/qgpgme/distinfo:1.2 --- pkgsrc/security/qgpgme/distinfo:1.1 Wed Jan 31 11:36:14 2018 +++ pkgsrc/security/qgpgme/distinfo Thu Mar 18 06:44:45 2021 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1 2018/01/31 11:36:14 markd Exp $ +$NetBSD: distinfo,v 1.2 2021/03/18 06:44:45 markd Exp $ -SHA1 (gpgme-1.10.0.tar.bz2) = 77d3390887da25ed70b7ac04392360efbdca501f -RMD160 (gpgme-1.10.0.tar.bz2) = 9e6d0cef086b47f697a17384082f0c9f2f95c412 -SHA512 (gpgme-1.10.0.tar.bz2) = 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5 -Size (gpgme-1.10.0.tar.bz2) = 1370162 bytes -SHA1 (patch-lang_qt_src_Makefile.in) = 1487a7d404241f9cbf8771716da934f783847e5c +SHA1 (gpgme-1.15.1.tar.bz2) = 5ae07a303fcf9cec490dabdfbc6e0f3b8f6dd5a0 +RMD160 (gpgme-1.15.1.tar.bz2) = 16eb8809be0482f3f52c591d3235f0c169be8de0 +SHA512 (gpgme-1.15.1.tar.bz2) = 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2 +Size (gpgme-1.15.1.tar.bz2) = 1699349 bytes +SHA1 (patch-lang_qt_src_Makefile.in) = 943f3466322a30c8de2c23bdf0dda3bda4fd0e9f Index: pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in diff -u pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in:1.1 pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in:1.2 --- pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in:1.1 Wed Jan 31 11:36:14 2018 +++ pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in Thu Mar 18 06:44:45 2021 @@ -1,22 +1,22 @@ -$NetBSD: patch-lang_qt_src_Makefile.in,v 1.1 2018/01/31 11:36:14 markd Exp $ +$NetBSD: patch-lang_qt_src_Makefile.in,v 1.2 2021/03/18 06:44:45 markd Exp $ Use installed libraries ---- lang/qt/src/Makefile.in.orig 2017-12-12 11:56:08.000000000 +0000 +--- lang/qt/src/Makefile.in.orig 2021-01-08 17:21:11.000000000 +0000 +++ lang/qt/src/Makefile.in -@@ -138,8 +138,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" +@@ -143,8 +143,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qgpgmeincludedir)" \ "$(DESTDIR)$(qgpgmeincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libqgpgme_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \ - ../../../src/libgpgme.la -+libqgpgme_la_DEPENDENCIES = - am__objects_1 = dataprovider.lo job.lo multideletejob.lo \ ++libqgpgme_la_DEPENDENCIES = + am__objects_1 = dataprovider.lo debug.lo job.lo multideletejob.lo \ qgpgmeadduseridjob.lo qgpgmebackend.lo \ qgpgmechangeexpiryjob.lo qgpgmechangeownertrustjob.lo \ -@@ -667,7 +666,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s - @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ - -DBUILDING_QGPGME +@@ -727,7 +726,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s + -DBUILDING_QGPGME -Wsuggest-override \ + -Wzero-as-null-pointer-constant -libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \ +libqgpgme_la_LIBADD = -lgpgmepp -lgpgme \ --_----------=_1616049885122290--