From 343752cd28715dc8f6f53ccb55c495cbcd8fc73b Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 31 Mar 2017 10:31:57 +0000 Subject: Updated gpgme to 1.8.0. A library was removed; recursive bump will follow soon. Noteworthy changes in version 1.8.0 (2016-11-16) ------------------------------------------------ * The module of the Python bindings has been renamed to 'gpg'. * New interface to query current software versions. * New feature to use gpg's --{show,override}session-key options. * New interface to set the sender of a mail. * qt: Added Distinguished Name parser from libkleo * The --homedir option is now used with recent gpgconf versions. * On 64 bit Windows systems gpgconf is now properly located. * The internal locking functions have been replaced by libgpg-error locking functions. * Interface changes relative to the 1.7.1 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_set_sender NEW. gpgme_get_sender NEW. gpgme_op_query_swdb NEW. gpgme_op_query_swdb_result NEW. gpgme_query_swdb_result_t NEW. gpgme_get_ctx_flag NEW. gpgme_decrypt_result_t EXTENDED: New field session_key. qt: DN NEW. qt: DN::Attribute NEW. qt: Job::context(Job*) NEW. cpp: EngineInfo::Version::Version(const char*) NEW. cpp: EngineInfo::Version::Version() NEW. cpp: SwdbResult NEW. cpp: Context::setSender(const char*) NEW. cpp: Context::getSender() NEW. [c=C28/A17/R0 cpp=C9/A3/R0 qt=C8/A1/R0] Noteworthy changes in version 1.7.1 (2016-10-18) ------------------------------------------------ * Fixed problems with the new language bindings. * New helper function gpgme_addrspec_from_uid. * Use option --exit-on-status-write-error with newer gpg versions. * qt: Missed API from the Qt Binding inclusion has been added again. * qt: abstractimportjob.h is now installed to that ImportJobs can be used again. * qt: Fixed spelling error in API (startReceive). * Interface changes relative to the 1.7.0 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_addrspec_from_uid NEW. qt: WksPublishJob::startRecieve RENAMED to ::startReceive. qt: MultiDeleteJob NEW. qt: AbstractImportJob NEW. qt: SpecialJob NEW. cpp: Signature::key(bool, bool) NEW. cpp: UserID::addrSpecFromString(const char*) NEW. cpp: UserID::addrSpec() NEW. [c=C27/A16/R0 cpp=C8/A2/R0 qt=C7/A0/R0] Noteworthy changes in version 1.7.0 (2016-09-21) ------------------------------------------------ * New language bindings for Python 2 and 3. * New language Bindings for C++ and the Qt-Framework API. * New functions gpgme_op_createkey and gpgme_op_createsubkey to make key creation easier (requires GnuPG 2.1). * New functions gpgme_op_adduid and gpgme_op_revuid to make user id management easier (requires GnuPG 2.1). * New function gpgme_op_keysign to make key signing easier (requires GnuPG 2.1). * New function gpgme_op_interact to replace the now deprecated functions gpgme_op_edit and gpgme_op_card_edit. * New function gpgme_pubkey_algo_string to convert a public key algorithm into a GnuPG 2.1 style string. * Support for GnuPG 2.1's TOFU trust model. * Notation flags are now correctly set on verify. * New global flag "require-gnupg" to set a minimal gnupg version. * More supported items in gpgme_get_dirinfo. * New function gpgme_data_set_flag and flag "size-hint". * New function gpgme_set_ctx_flag and flags "full-status" and "raw-description". * Improved gpgme_data_identify to distinguish more file types. * New flag GPGME_ENCRYPT_SYMMETRIC for gpgme_op_encrypt to allow mixed public key and symmetric encryption. * New field KEYGRIP in gpgme_subkey_t. New fields FPR in gpgme_key_t. * New flag GPGME_DATA_ENCODING_MIME to declare that the encrypted or signed data is a valid MIME part. This is to support future GnuPG versions. * Interface changes relative to the 1.6.0 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_pubkey_algo_string NEW. GPGME_PK_EDDSA NEW. gpgme_set_ctx_flag NEW. gpgme_data_set_flag NEW. gpgme_op_createkey NEW. gpgme_op_createkey_start NEW. gpgme_op_createsubkey NEW. gpgme_op_createsubkey_start NEW. gpgme_op_adduid_start NEW. gpgme_op_adduid NEW. gpgme_op_revuid_start NEW. gpgme_op_revuid NEW. gpgme_op_keysign_start NEW. gpgme_op_keysign NEW. gpgme_op_tofu_policy_start NEW. gpgme_op_tofu_policy NEW. gpgme_op_interact_start NEW. gpgme_op_interact NEW. gpgme_interact_cb_t NEW. gpgme_op_edit_start DEPRECATED. gpgme_op_edit DEPRECATED. gpgme_op_card_edit_start DEPRECATED. gpgme_op_card_edit DEPRECATED. gpgme_edit_cb_t DEPRECATED. gpgme_status_code_t DEPRECATED. gpgme_genkey_result_t EXTENDED: New fields pubkey and seckey. gpgme_signature_t EXTENDED: New field key. gpgme_key_t EXTENDED: New field fpr. gpgme_subkey_t EXTENDED: New field keygrip. gpgme_user_id_t EXTENDED: New field tofu. gpgme_tofu_policy_t NEW. gpgme_tofu_info_t NEW. GPGME_STATUS_KEY_CONSIDERED NEW. GPGME_STATUS_TOFU_USER NEW. GPGME_STATUS_TOFU_STATS NEW. GPGME_STATUS_TOFU_STATS_LONG NEW. GPGME_STATUS_NOTATION_FLAGS NEW. GPGME_KEYLIST_MODE_WITH_TOFU NEW. GPGME_DATA_TYPE_PGP_ENCRYPTED NEW. GPGME_DATA_TYPE_PGP_SIGNATURE NEW. GPGME_DATA_ENCODING_MIME NEW. GPGME_ENCRYPT_SYMMETRIC NEW. GPGME_CREATE_SIGN NEW. GPGME_CREATE_ENCR NEW. GPGME_CREATE_CERT NEW. GPGME_CREATE_AUTH NEW. GPGME_CREATE_NOPASSWD NEW. GPGME_CREATE_SELFSIGNED NEW. GPGME_CREATE_NOSTORE NEW. GPGME_CREATE_WANTPUB NEW. GPGME_CREATE_WANTSEC NEW. GPGME_CREATE_FORCE NEW. GPGME_KEYSIGN_LOCAL NEW. GPGME_KEYSIGN_LFSEP NEW. GPGME_INTERACT_CARD NEW. --- security/gpgme/Makefile | 7 +++---- security/gpgme/PLIST | 3 +-- security/gpgme/buildlink3.mk | 4 ++-- security/gpgme/distinfo | 17 ++++++++--------- security/gpgme/patches/patch-aa | 16 ++++++++-------- security/gpgme/patches/patch-ac | 17 ++++------------- security/gpgme/patches/patch-ag | 10 +++++----- security/gpgme/patches/patch-aj | 13 ------------- 8 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 security/gpgme/patches/patch-aj (limited to 'security/gpgme') diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 8b73cae7349..dd2378fe9ff 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.78 2016/02/26 09:41:05 jperkin Exp $ +# $NetBSD: Makefile,v 1.79 2017/03/31 10:31:57 wiz Exp $ -DISTNAME= gpgme-1.6.0 -PKGREVISION= 1 +DISTNAME= gpgme-1.8.0 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ EXTRACT_SUFX= .tar.bz2 @@ -49,7 +48,7 @@ BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.7nb1 .include "../../devel/librfuncs/buildlink3.mk" BUILDLINK_API_DEPENDS.libassuan+= libassuan>=2.0.2 .include "../../security/libassuan2/buildlink3.mk" -BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.4 +BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.17 .include "../../security/libgpg-error/buildlink3.mk" .include "../../mk/bsd.pkg.mk" _UNWRAP_FILES= diff --git a/security/gpgme/PLIST b/security/gpgme/PLIST index 83089030018..9ba35901f12 100644 --- a/security/gpgme/PLIST +++ b/security/gpgme/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.17 2015/07/05 18:26:44 wiz Exp $ +@comment $NetBSD: PLIST,v 1.18 2017/03/31 10:31:57 wiz Exp $ bin/gpgme-config bin/gpgme-tool include/gpgme.h info/gpgme.info -lib/libgpgme-pthread.la lib/libgpgme.la share/aclocal/gpgme.m4 share/common-lisp/source/gpgme/gpgme-package.lisp diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk index eb89dfed9eb..9a4b8792ca0 100644 --- a/security/gpgme/buildlink3.mk +++ b/security/gpgme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2017/03/17 08:48:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2017/03/31 10:31:57 wiz Exp $ BUILDLINK_TREE+= gpgme @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gpgme GPGME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gpgme+= gpgme>=0.9.0 -BUILDLINK_ABI_DEPENDS.gpgme+= gpgme>=1.3.0nb1 +BUILDLINK_ABI_DEPENDS.gpgme+= gpgme>=1.8.0 BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme .include "../../devel/librfuncs/buildlink3.mk" diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index e1303e63fbe..9ff4414140a 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.36 2015/11/04 01:17:45 agc Exp $ +$NetBSD: distinfo,v 1.37 2017/03/31 10:31:57 wiz Exp $ -SHA1 (gpgme-1.6.0.tar.bz2) = 21510323495f6220f8f67610c3c27a23d761d43d -RMD160 (gpgme-1.6.0.tar.bz2) = 0ce3451911bba6dcce7b120f9c8387cd41e3f514 -SHA512 (gpgme-1.6.0.tar.bz2) = b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b -Size (gpgme-1.6.0.tar.bz2) = 983573 bytes -SHA1 (patch-aa) = dcea4fd232a8e3e3656ae9cf5319060a009f3c59 -SHA1 (patch-ac) = c7df3fc77834286ffcc675f4c55a19553bf2c2f1 +SHA1 (gpgme-1.8.0.tar.bz2) = efa043064dbf675fd713228c6fcfcc4116feb221 +RMD160 (gpgme-1.8.0.tar.bz2) = b21a322ddbaf160538267cf201aeec207b8287f6 +SHA512 (gpgme-1.8.0.tar.bz2) = 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de +Size (gpgme-1.8.0.tar.bz2) = 1298407 bytes +SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072 +SHA1 (patch-ac) = 4862ec21f1d5f4fc6e58d761b0514a28af19346b SHA1 (patch-ae) = 1259739c4690db656bc5b6113842b1d5c4623616 SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b -SHA1 (patch-ag) = c45777a312bb5ed7f57852e9410270a4fafee9f8 +SHA1 (patch-ag) = e41a315f9b3fa4a80bcc439f6be21ded0bc0b063 SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48 -SHA1 (patch-aj) = 8464f57c871f055cfb6c83b1458e6906c625ca5b diff --git a/security/gpgme/patches/patch-aa b/security/gpgme/patches/patch-aa index ea1ceafca0a..469309e25a3 100644 --- a/security/gpgme/patches/patch-aa +++ b/security/gpgme/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.11 2013/05/03 16:36:04 drochner Exp $ +$NetBSD: patch-aa,v 1.12 2017/03/31 10:31:57 wiz Exp $ ---- src/gpgme-config.in.orig 2012-05-02 08:42:23.000000000 +0000 +--- src/gpgme-config.in.orig 2016-11-10 16:13:34.000000000 +0000 +++ src/gpgme-config.in -@@ -33,8 +33,8 @@ gpg_error_libs="@GPG_ERROR_LIBS@" - thread_modules="" - - @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +@@ -35,8 +35,8 @@ thread_modules="" + # For compatibility we keep proving the + # thread modules variable. + thread_modules="$thread_modules pthread" -libs_pthread="-lpthread" -cflags_pthread="" +libs_pthread="@PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" - # Configure glib. - libs_glib="@GLIB_LIBS@" + avail_lang='c @GPGME_CONFIG_AVAIL_LANG@' + diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac index b63ec06e7d1..1d6957fd7be 100644 --- a/security/gpgme/patches/patch-ac +++ b/security/gpgme/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.11 2014/09/04 08:25:56 wiz Exp $ +$NetBSD: patch-ac,v 1.12 2017/03/31 10:31:57 wiz Exp $ ---- configure.orig 2014-07-30 09:54:53.000000000 +0000 +--- configure.orig 2016-11-16 12:46:37.000000000 +0000 +++ configure -@@ -2710,6 +2710,7 @@ $as_echo "$as_me: creating cache $cache_ +@@ -2784,6 +2784,7 @@ $as_echo "$as_me: creating cache $cache_ fi as_fn_append ac_header_list " locale.h" @@ -10,16 +10,7 @@ $NetBSD: patch-ac,v 1.11 2014/09/04 08:25:56 wiz Exp $ as_fn_append ac_header_list " sys/select.h" as_fn_append ac_header_list " sys/uio.h" as_fn_append ac_header_list " argp.h" -@@ -17195,7 +17196,7 @@ if ${ac_cv_lib_pthread_pthread_create+:} - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -17873,7 +17874,7 @@ main () +@@ -21175,7 +21176,7 @@ main () return 0; } _ACEOF diff --git a/security/gpgme/patches/patch-ag b/security/gpgme/patches/patch-ag index 6094cbdb75e..7d129c1308e 100644 --- a/security/gpgme/patches/patch-ag +++ b/security/gpgme/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.4 2011/08/11 11:15:00 adam Exp $ +$NetBSD: patch-ag,v 1.5 2017/03/31 10:31:57 wiz Exp $ ---- config.h.in.orig 2010-01-11 11:06:53.000000000 +0000 +--- config.h.in.orig 2016-11-16 12:29:36.000000000 +0000 +++ config.h.in -@@ -76,6 +76,9 @@ - /* Define if we have pthread. */ - #undef HAVE_PTHREAD +@@ -77,6 +77,9 @@ + /* If available, contains the Python version number currently in use. */ + #undef HAVE_PYTHON +/* Define to 1 if you have the header file. */ +#undef HAVE_RFUNCS_H diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj deleted file mode 100644 index 2e05287bab9..00000000000 --- a/security/gpgme/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.8 2015/07/05 18:26:45 wiz Exp $ - ---- src/Makefile.in.orig 2015-06-08 13:03:50.000000000 +0000 -+++ src/Makefile.in -@@ -632,7 +632,7 @@ libgpgme_pthread_la_LDFLAGS = \ - - libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers - libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ -- -lpthread @GPG_ERROR_LIBS@ -+ $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@ - - @BUILD_W32_GLIB_TRUE@libgpgme_glib_la_LDFLAGS = \ - @BUILD_W32_GLIB_TRUE@ $(no_undefined) $(export_symbols) $(extra_ltoptions) \ -- cgit v1.2.3