CVS commit: pkgsrc/security/gpgme

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/gpgme
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 29 Aug 2017 11:26:20 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 29 11:26:20 UTC 2017

Modified Files:
        pkgsrc/security/gpgme: Makefile PLIST distinfo
        pkgsrc/security/gpgme/patches: patch-af
Removed Files:
        pkgsrc/security/gpgme/patches: patch-ac patch-ae patch-ag patch-ah

Log Message:
Updated gpgme to 1.9.0.

Drop historic patches; adapt one to upstream changes
and add bug report URL.

Noteworthy changes in version 1.9.0 (2017-03-28)
------------------------------------------------

 * Clarified meaning of the 'expire' parameter of gpgme_op_createkey
   and gpgme_op_createsubkey.  New flag to force a key without an
   expiration date.

 * New function gpgme_op_keylist_from_data_start to list keys from
   data objects without importing them.

 * New function gpgme_op_set_uid_flag to flag a key as primary.

 * New function gpgme_op_decrypt_ext to run decryption with special
   flags.  This can for example be used to unwrap keys (remove only
   the encryption layer).

 * New encryption flags to wrap a key (adding an encryption layer to
   an OpenPGP message) or to create anonymously encrypted messages.

 * Support for adduid and revuid operations in the C++ bindings.

 * Support for smartcard key generation in the C++ bindings.

 * Several new functions for the Python binding.

 * Many smaller bug fixes.

 * Interface changes relative to the 1.8.0 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 gpgme_op_createkey          CHANGED: Meaning of 'expire' parameter.
 gpgme_op_createsubkey       CHANGED: Meaning of 'expire' parameter.
 GPGME_CREATE_NOEXPIRE       NEW.
 gpgme_key_t                 EXTENDED: New field 'origin'.
 gpgme_key_t                 EXTENDED: New field 'last_update'.
 gpgme_subkey_t              EXTENDED: New field 'is_de_vs'.
 gpgme_user_id_t             EXTENDED: New field 'origin'.
 gpgme_user_id_t             EXTENDED: New field 'last_update'.
 gpgme_op_keylist_from_data_start NEW.
 gpgme_op_set_uid_flag_start      NEW.
 gpgme_op_set_uid_flag            NEW.
 gpgme_op_decrypt_ext_start       NEW.
 gpgme_op_decrypt_ext             NEW.
 GPGME_ENCRYPT_THROW_KEYIDS       NEW.
 GPGME_ENCRYPT_WRAP               NEW.
 GPGME_DECRYPT_VERIFY             NEW.
 GPGME_DECRYPT_UNWRAP             NEW.
 gpgme_data_rewind                UN-DEPRECATE.
 cpp: Context::revUid(const Key&, const char*)      NEW.
 cpp: Context::startRevUid(const Key&, const char*) NEW.
 cpp: Context::addUid(const Key&, const char*)      NEW.
 cpp: Context::startAddUid(const Key&, const char*) NEW.
 cpp: Key::UserID::revoke()                         NEW.
 cpp: Key::addUid()                                 NEW.
 cpp: Key::isDeVs                                   NEW.
 cpp: GpgGenCardKeyInteractor                       NEW.
 cpp: Subkey::keyGrip                               NEW.
 cpp: Subkey::isDeVs                                NEW.
 cpp: Data::toKeys                                  NEW.
 cpp: Context::setDecryptFlags                      NEW.
 cpp: Context::decrypt                         EXTENDED: Flags added.
 cpp: Context::startDecrypt                    EXTENDED: Flags added.
 cpp: Context::decryptAndVerify                EXTENDED: Flags added.
 cpp: Context::startCombinedDecryptionAndVerification EXTENDED: Flags.
 cpp: Context::encryptFlags                    EXTENDED: New flags.
 qt: CryptoConfig::stringValueList()                NEW.
 py: Context.__init__        EXTENDED: New keyword arg home_dir.
 py: Context.home_dir        NEW.
 py: Context.keylist         EXTENDED: New keyword arg mode.
 py: Context.keylist         EXTENDED: New keyword arg source.
 py: Context.create_key      NEW.
 py: Context.create_subkey   NEW.
 py: Context.key_add_uid     NEW.
 py: Context.key_revoke_uid  NEW.
 py: Context.key_sign        NEW.
 py: Context.key_tofu_policy NEW.
 py: core.pubkey_algo_string NEW.
 py: core.addrspec_from_uid  NEW.

 [c=C29/A18/R0 cpp=C10/A4/R0 qt=C9/A2/R0]


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/security/gpgme/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/gpgme/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/gpgme/distinfo
cvs rdiff -u -r1.12 -r0 pkgsrc/security/gpgme/patches/patch-ac
cvs rdiff -u -r1.6 -r0 pkgsrc/security/gpgme/patches/patch-ae
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/gpgme/patches/patch-af
cvs rdiff -u -r1.5 -r0 pkgsrc/security/gpgme/patches/patch-ag
cvs rdiff -u -r1.3 -r0 pkgsrc/security/gpgme/patches/patch-ah

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

Modified files:

Index: pkgsrc/security/gpgme/Makefile
diff -u pkgsrc/security/gpgme/Makefile:1.83 pkgsrc/security/gpgme/Makefile:1.84
--- pkgsrc/security/gpgme/Makefile:1.83 Thu Aug 10 18:49:17 2017
+++ pkgsrc/security/gpgme/Makefile      Tue Aug 29 11:26:19 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2017/08/10 18:49:17 tron Exp $
+# $NetBSD: Makefile,v 1.84 2017/08/29 11:26:19 wiz Exp $
 
-DISTNAME=      gpgme-1.8.0
-PKGREVISION=   1
+DISTNAME=      gpgme-1.9.0
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=  .tar.bz2
@@ -18,10 +17,6 @@ GNU_CONFIGURE=               yes
 PTHREAD_OPTS+=         require
 INFO_FILES=            yes
 
-# turn off swig/python detection; there is no configure flag as of 1.8.0
-# https://dev.gnupg.org/T3057
-CONFIGURE_ENV+=                ac_cv_path_SWIG=
-
 SUBST_CLASSES+=                pthread
 SUBST_FILES.pthread=   src/gpgme-config.in
 SUBST_SED.pthread+=    -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
@@ -31,34 +26,16 @@ SUBST_STAGE.pthread=        post-patch
 CPPFLAGS.Darwin=       -D_POSIX_C_SOURCE=200809L
 LIBS.SunOS+=           -lnsl -lsocket
 
-# getenv_r is not detected correctly. It will be found
-# in either base system or librfuncs
-CONFIGURE_ENV+=                ac_cv_func_getenv_r=yes
-
-# 17 errors as of 1.8.0
+# 18 errors as of 1.9.0
 # https://dev.gnupg.org/T3056
 TEST_TARGET=           check
 
-.include "../../mk/pthread.buildlink3.mk"
-
 .include "options.mk"
 
-CONFIGURE_ENV.HPUX+=   ac_cv_lib_pthread_pthread_create=yes
-
-.include "../../mk/bsd.prefs.mk"
-
-# TLS is unsupported on NetBSD<=5, but causes crashes on -current too
-#.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*)
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-CONFIGURE_ENV+=                gpgme_cv_tls_works=no
-.endif
-
-# we want the getenv_r() semantics of NetBSD-current
-BUILDLINK_API_DEPENDS.librfuncs+=      librfuncs>=1.0.7nb1
-.include "../../devel/librfuncs/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 BUILDLINK_API_DEPENDS.libassuan+=      libassuan>=2.0.2
 .include "../../security/libassuan2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.17
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-_UNWRAP_FILES=
+#_UNWRAP_FILES=

Index: pkgsrc/security/gpgme/PLIST
diff -u pkgsrc/security/gpgme/PLIST:1.19 pkgsrc/security/gpgme/PLIST:1.20
--- pkgsrc/security/gpgme/PLIST:1.19    Tue Aug  1 11:48:20 2017
+++ pkgsrc/security/gpgme/PLIST Tue Aug 29 11:26:19 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2017/08/01 11:48:20 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.20 2017/08/29 11:26:19 wiz Exp $
 bin/gpgme-config
 bin/gpgme-tool
 include/gpgme++/configuration.h
@@ -15,6 +15,7 @@ include/gpgme++/exception.h
 include/gpgme++/global.h
 include/gpgme++/gpgadduserideditinteractor.h
 include/gpgme++/gpgagentgetinfoassuantransaction.h
+include/gpgme++/gpggencardkeyinteractor.h
 include/gpgme++/gpgmefw.h
 include/gpgme++/gpgmepp_export.h
 include/gpgme++/gpgmepp_version.h

Index: pkgsrc/security/gpgme/distinfo
diff -u pkgsrc/security/gpgme/distinfo:1.37 pkgsrc/security/gpgme/distinfo:1.38
--- pkgsrc/security/gpgme/distinfo:1.37 Fri Mar 31 10:31:57 2017
+++ pkgsrc/security/gpgme/distinfo      Tue Aug 29 11:26:19 2017
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.37 2017/03/31 10:31:57 wiz Exp $
+$NetBSD: distinfo,v 1.38 2017/08/29 11:26:19 wiz Exp $
 
-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 (gpgme-1.9.0.tar.bz2) = 870719cd3d2ef6a7fcb1d6af9ce5446edba7bfc3
+RMD160 (gpgme-1.9.0.tar.bz2) = 55719b4a7263ae8d0ef79205e26409ff5693ea27
+SHA512 (gpgme-1.9.0.tar.bz2) = 2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8
+Size (gpgme-1.9.0.tar.bz2) = 1344222 bytes
 SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072
-SHA1 (patch-ac) = 4862ec21f1d5f4fc6e58d761b0514a28af19346b
-SHA1 (patch-ae) = 1259739c4690db656bc5b6113842b1d5c4623616
-SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
-SHA1 (patch-ag) = e41a315f9b3fa4a80bcc439f6be21ded0bc0b063
-SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
+SHA1 (patch-af) = 972982cd34315b2163d14919982f5d5b8fff1000

Index: pkgsrc/security/gpgme/patches/patch-af
diff -u pkgsrc/security/gpgme/patches/patch-af:1.6 pkgsrc/security/gpgme/patches/patch-af:1.7
--- pkgsrc/security/gpgme/patches/patch-af:1.6  Sun Nov 15 18:41:55 2009
+++ pkgsrc/security/gpgme/patches/patch-af      Tue Aug 29 11:26:20 2017
@@ -1,18 +1,11 @@
-$NetBSD: patch-af,v 1.6 2009/11/15 18:41:55 drochner Exp $
+$NetBSD: patch-af,v 1.7 2017/08/29 11:26:20 wiz Exp $
 
---- src/get-env.c.orig 2004-12-07 21:47:40.000000000 +0100
+Add missing getenv_r() support.
+https://dev.gnupg.org/T3376
+
+--- src/get-env.c.orig 2016-11-16 12:22:41.000000000 +0000
 +++ src/get-env.c
-@@ -22,6 +22,9 @@
- #include <config.h>
- #endif
- #include <stdlib.h>
-+#if HAVE_RFUNCS_H
-+#include <rfuncs.h>
-+#endif
- #include <errno.h>
- #include <string.h>
- 
-@@ -53,7 +56,25 @@ _gpgme_getenv (const char *name, char **
+@@ -53,7 +53,25 @@ _gpgme_getenv (const char *name, char **
  
  #else
  
@@ -34,9 +27,9 @@ $NetBSD: patch-af,v 1.6 2009/11/15 18:41
 +        errno = ENOMEM;
 +    }
 +  if (!*value && errno != ENOENT)
-+      return gpg_error_from_errno (errno);
++      return gpg_error_from_syserror ();
 +  else
-+      return (0);
++      return 0;
 +}
  
  #endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index