21091953 upgrade GPGME to 1.5.3
authorStefan Teleman <stefan.teleman@oracle.com>
Fri, 15 May 2015 11:39:39 -0700
changeset 4296 f17a315fb096
parent 4295 8e6a71e8754b
child 4297 b90b1e0312f8
21091953 upgrade GPGME to 1.5.3 19340692 problem in UTILITY/GPGME
components/gpgme/Makefile
components/gpgme/gpgme.p5m
components/gpgme/patches/000-gpgconf.c.patch
components/gpgme/patches/000-gpgme-config.in.patch
components/gpgme/patches/001-mkstatus.patch
--- a/components/gpgme/Makefile	Thu May 14 10:36:26 2015 -0700
+++ b/components/gpgme/Makefile	Fri May 15 11:39:39 2015 -0700
@@ -25,16 +25,16 @@
 PATH = /usr/gnu/bin:/usr/bin
 
 COMPONENT_NAME=		gpgme
-COMPONENT_VERSION=	1.1.8
+COMPONENT_VERSION=	1.5.3
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.gnupg.org/related_software/gpgme/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0f73a219e0b389f25c8d9b563eb8e0a9ffd9dd038d91b572eaf0ea33beff05e2
+    sha256:0db040c5b07e69cfe9a0b4566c8e90151ebacfe122c97c452f11386654aefcc9
 COMPONENT_ARCHIVE_URL=	ftp://ftp.gnupg.org/gcrypt/gpgme/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gnupg
 
-TPNO=			8637
+TPNO=			21167
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -64,18 +64,17 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		--enable-shared
 CONFIGURE_OPTIONS  +=		--disable-static
+CONFIGURE_OPTIONS  +=		--disable-silent-rules
 CONFIGURE_OPTIONS  +=		--with-gpg-error-prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS  +=		--enable-largefile
-CONFIGURE_OPTIONS  +=		--with-pth=$(CONFIGURE_PREFIX)
-CONFIGURE_OPTIONS  +=		--disable-gpg-test
-CONFIGURE_OPTIONS  +=		--disable-gpgsm-test
-CONFIGURE_OPTIONS  +=		--disable-gpgconf-test
-CONFIGURE_OPTIONS  +=		--with-gpg=$(USRBINDIR)/gpg2
-CONFIGURE_OPTIONS  +=		--with-gpgsm=$(USRBINDIR)/gpgsm
-CONFIGURE_OPTIONS  +=		--with-gpgconf=$(USRBINDIR)/gpgconf
+CONFIGURE_OPTIONS  +=		--enable-gpg-test
+CONFIGURE_OPTIONS  +=		--enable-gpgsm-test
+CONFIGURE_OPTIONS  +=		--enable-gpgconf-test
+CONFIGURE_OPTIONS  +=		--with-libgpg-error-prefix=$(CONFIGURE_PREFIX)
+CONFIGURE_OPTIONS  +=		--with-libassuan-prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS  +=		--with-pic
 
-ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_32_and_64)
 
@@ -83,11 +82,16 @@
 
 install: $(INSTALL_32_and_64)
 
-test: $(TEST_32_and_64)
-
+# Although building and running the GpgME tests is enabled, GpgME's
+# Test Harness is not suitable for running in an automated test
+# environment. The GpgME tests require interactive, manual input
+# from the tty as well as system configuration changes.
+# The GpgME Test Harness can only be run manually, and interactively
+# from a terminal.
+test: $(NO_TESTS)
 
-REQUIRED_PACKAGES += library/pth
 REQUIRED_PACKAGES += library/security/libgpg-error
+REQUIRED_PACKAGES += library/security/libassuan
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/linker
--- a/components/gpgme/gpgme.p5m	Thu May 14 10:36:26 2015 -0700
+++ b/components/gpgme/gpgme.p5m	Fri May 15 11:39:39 2015 -0700
@@ -35,30 +35,26 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-#
 file path=usr/bin/gpgme-config
+file usr/bin/$(MACH64)/gpgme-tool path=usr/bin/gpgme-tool
 file path=usr/include/gpgme.h
-link path=usr/lib/$(MACH64)/libgpgme-pth.so target=libgpgme-pth.so.11.6.6
 #
-link path=usr/lib/$(MACH64)/libgpgme-pth.so.11 target=libgpgme-pth.so.11.6.6
-file path=usr/lib/$(MACH64)/libgpgme-pth.so.11.6.6
 link path=usr/lib/$(MACH64)/libgpgme-pthread.so \
-    target=libgpgme-pthread.so.11.6.6
+    target=libgpgme-pthread.so.11.13.2
 link path=usr/lib/$(MACH64)/libgpgme-pthread.so.11 \
-    target=libgpgme-pthread.so.11.6.6
-file path=usr/lib/$(MACH64)/libgpgme-pthread.so.11.6.6
-link path=usr/lib/$(MACH64)/libgpgme.so target=libgpgme.so.11.6.6
-link path=usr/lib/$(MACH64)/libgpgme.so.11 target=libgpgme.so.11.6.6
-file path=usr/lib/$(MACH64)/libgpgme.so.11.6.6
-link path=usr/lib/libgpgme-pth.so target=libgpgme-pth.so.11.6.6
-link path=usr/lib/libgpgme-pth.so.11 target=libgpgme-pth.so.11.6.6
-file path=usr/lib/libgpgme-pth.so.11.6.6
-link path=usr/lib/libgpgme-pthread.so target=libgpgme-pthread.so.11.6.6
-link path=usr/lib/libgpgme-pthread.so.11 target=libgpgme-pthread.so.11.6.6
-file path=usr/lib/libgpgme-pthread.so.11.6.6
-link path=usr/lib/libgpgme.so target=libgpgme.so.11.6.6
-link path=usr/lib/libgpgme.so.11 target=libgpgme.so.11.6.6
-file path=usr/lib/libgpgme.so.11.6.6
+    target=libgpgme-pthread.so.11.13.2
+file path=usr/lib/$(MACH64)/libgpgme-pthread.so.11.13.2
+file path=usr/lib/$(MACH64)/libgpgme-pthread.so.11.13.2
+link path=usr/lib/$(MACH64)/libgpgme.so target=libgpgme.so.11.13.2
+link path=usr/lib/$(MACH64)/libgpgme.so.11 target=libgpgme.so.11.13.2
+file path=usr/lib/$(MACH64)/libgpgme.so.11.13.2
+link path=usr/lib/libgpgme-pthread.so target=libgpgme-pthread.so.11.13.2
+link path=usr/lib/libgpgme-pthread.so.11 target=libgpgme-pthread.so.11.13.2
+file path=usr/lib/libgpgme-pthread.so.11.13.2
+link path=usr/lib/libgpgme.so target=libgpgme.so.11.13.2
+link path=usr/lib/libgpgme.so.11 target=libgpgme.so.11.13.2
+file path=usr/lib/libgpgme.so.11.13.2
+#
 file path=usr/share/aclocal/gpgme.m4
 file path=usr/share/common-lisp/source/gpgme/gpgme-package.lisp
 file path=usr/share/common-lisp/source/gpgme/gpgme.asd
@@ -70,3 +66,4 @@
 license gpgme.license license="GPLv2, LGPLv2"
 #
 depend type=optional fmri=crypto/[email protected]
+
--- a/components/gpgme/patches/000-gpgconf.c.patch	Thu May 14 10:36:26 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- src/gpgconf.c	2008-11-03 08:50:12.000000000 -0800
-+++ src/gpgconf.c	2011-05-27 08:41:54.744907426 -0700
[email protected]@ -59,7 +59,7 @@
- gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type)
- {
- #ifdef ENABLE_GPGCONF
--  return _gpgme_conf_arg_release (arg, type);
-+  _gpgme_conf_arg_release (arg, type);
- #endif
- }
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gpgme/patches/000-gpgme-config.in.patch	Fri May 15 11:39:39 2015 -0700
@@ -0,0 +1,20 @@
+# Internal patch.
+# GpgME can't find /usr/bin/gpg2 and /usr/bin/gpgsm,
+# which are needed by gpgme-config. So, we have to find
+# them instead.
+# Not for upstream because they should fix this.
+--- src/gpgme-config.in	2013-03-15 12:27:33.000000000 -0700
++++ src/gpgme-config.in	2015-05-14 12:28:27.296390126 -0700
[email protected]@ -179,10 +179,10 @@
+ 	    fi
+ 	    ;;
+         --get-gpg)
+-            output="$output @[email protected]"
++            output="$output /usr/bin/gpg2"
+             ;;
+         --get-gpgsm)
+-            output="$output @[email protected]"
++            output="$output /usr/bin/gpgsm"
+             ;;
+ 	*)
+             usage 1 1>&2
--- a/components/gpgme/patches/001-mkstatus.patch	Thu May 14 10:36:26 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- src/mkstatus	2008-11-03 08:50:12.000000000 -0800
-+++ src/mkstatus	2011-05-27 09:27:36.446497463 -0700
[email protected]@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # mkstatus - Extract error strings from rungpg.h
- #            and create a lookup table
- #	Copyright (C) 2000 Werner Koch (dd9jn)
[email protected]@ -38,7 +38,7 @@
- {
- EOF
- 
--awk '
-+gawk '
- /GPGME_STATUS_ENTER/      { okay = 1 }
- !okay                     { next }
- /}/                       { exit 0 }