* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2016-09-23 9:32 Alon Bar-Lev
0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2016-09-23 9:32 UTC (permalink / raw
To: gentoo-commits
commit: aa6d11aa925958a502e4095af161e5a78f9ecd7f
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 09:31:23 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 09:32:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6d11aa
app-crypt/gpgme: version bump
Bug: 594640
Package-Manager: portage-2.2.28
app-crypt/gpgme/Manifest | 1 +
app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch | 4 +-
app-crypt/gpgme/gpgme-1.7.0.ebuild | 62 +++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 7ea626f..66841c3 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,2 +1,3 @@
DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
DIST gpgme-1.6.0.tar.bz2 983573 SHA256 b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d SHA512 b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b WHIRLPOOL 4e753156474097dba9db2905954d1754ca408066996a01cbc7266a24654eb7c2323043f40495cc3c227d8eef540eeca47de4c23bb329a2d34604d5a4d3828970
+DIST gpgme-1.7.0.tar.bz2 1281708 SHA256 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 SHA512 8c5891104bd531d555fc4c22086cfdea9f18be6885200f02e087d695d0518e311527a227f2c41e0dc1156cc0985265d0bee6c4504de7e2d2de0bc543a1036b5a WHIRLPOOL aaf60c5a30f9161bf8edb24e583e6a83e4a6e28abe7d9878d1d36b5ab34507ff2a47695dc4856c4fdad59463a5d56de1d8d35dee3315dfa54758c8445d9f706e
diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
index dc921ee..293debb 100644
--- a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
+++ b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
@@ -1,5 +1,5 @@
---- ./gpgme-1.1.8/src/gpgme-config.in.orig 2009-03-08 10:25:48.000000000 +1100
-+++ ./gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100
+--- gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:25:48.000000000 +1100
++++ gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100
@@ -64,7 +64,7 @@
while test $# -gt 0; do
case "$1" in
diff --git a/app-crypt/gpgme/gpgme-1.7.0.ebuild b/app-crypt/gpgme/gpgme-1.7.0.ebuild
new file mode 100644
index 00000000..6f59d08
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils qmake-utils
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx qt5 test"
+
+RDEPEND="app-crypt/gnupg
+ >=dev-libs/libassuan-2.0.2
+ >=dev-libs/libgpg-error-1.11
+ qt5? ( dev-qt/qtcore:5 )"
+ #doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+ qt5? (
+ test? ( dev-qt/qttest:5 )
+ )"
+
+REQUIRED_USE="qt5? ( cxx )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+)
+
+src_prepare() {
+ default
+
+ # remove non working tests
+ sed -i 's/\tt-sig-notation\$(EXEEXT)/\t/' tests/gpg/Makefile.in || die
+ sed -i 's/ t-encrypt\$(EXEEXT)//' lang/qt/tests/Makefile.in || die
+}
+
+src_configure() {
+ local languages=( "cl" )
+ use cxx && languages+=( "cpp" )
+ if use qt5; then
+ languages+=( "qt" )
+ #use doc ||
+ export DOXYGEN=
+ fi
+
+ econf \
+ --includedir="${EPREFIX}/usr/include/gpgme" \
+ --enable-languages="${languages[*]}" \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ use common-lisp || rm -fr "${ED}usr/share/common-lisp"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2016-09-23 20:31 Alon Bar-Lev
0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2016-09-23 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 113f70ec80afe48d98b60293be3d2f09155d301c
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 20:29:55 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:30:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113f70ec
app-crypt/gpgme: fix qt tests issue
Bug: 594922
Package-Manager: portage-2.2.28
.../files/gpgme-1.7.0-build-tests-disable.patch | 40 +++++++++++
.../gpgme/files/gpgme-1.7.0-build-tests.patch | 82 ++++++++++++++++++++++
app-crypt/gpgme/gpgme-1.7.0.ebuild | 9 ++-
3 files changed, 126 insertions(+), 5 deletions(-)
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch
new file mode 100644
index 00000000..7d56ad3
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch
@@ -0,0 +1,40 @@
+From 516022b0cd1a43973a467bb5b7e6813b9444d608 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 23 Sep 2016 22:46:39 +0300
+Subject: [PATCH] build: tests: remove non working
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lang/qt/tests/Makefile.am | 2 +-
+ tests/gpg/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
+index a41dc8c..e05c8a3 100644
+--- a/lang/qt/tests/Makefile.am
++++ b/lang/qt/tests/Makefile.am
+@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
+ EXTRA_DIST = initial.test
+
+ TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
+- t-encrypt t-wkspublish
++ t-wkspublish
+
+ moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
+ t-encrypt.moc t-support.hmoc t-wkspublish.moc
+diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
+index 9877843..90a1dfd 100644
+--- a/tests/gpg/Makefile.am
++++ b/tests/gpg/Makefile.am
+@@ -36,7 +36,7 @@ endif
+
+ c_tests = \
+ t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
+- t-decrypt t-verify t-decrypt-verify t-sig-notation t-export \
++ t-decrypt t-verify t-decrypt-verify t-export \
+ t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait \
+ t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix)
+
+--
+2.7.3
+
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch
new file mode 100644
index 00000000..719ddac
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch
@@ -0,0 +1,82 @@
+From c2f352363615a4581e01999eb4230f4921cc6f9f Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 23 Sep 2016 23:05:35 +0300
+Subject: [PATCH] build: avoid build tests if not required
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lang/qt/tests/Makefile.am | 2 +-
+ tests/Makefile.am | 2 +-
+ tests/gpg/Makefile.am | 2 +-
+ tests/gpgsm/Makefile.am | 2 +-
+ tests/opassuan/Makefile.am | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
+index 36ecfe4..63186e7 100644
+--- a/lang/qt/tests/Makefile.am
++++ b/lang/qt/tests/Makefile.am
+@@ -62,7 +62,7 @@ nodist_t_keylist_SOURCES = $(moc_files)
+
+ BUILT_SOURCES = $(moc_files)
+
+-noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
++check_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
+ run-keyformailboxjob t-wkspublish
+
+ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index c71914f..b698e11 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -31,7 +31,7 @@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
+
+ noinst_HEADERS = run-support.h
+
+-noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
++check_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
+ run-verify run-encrypt run-identify run-decrypt run-genkey \
+ run-keysign run-tofu
+
+diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
+index 90a1dfd..671a2f3 100644
+--- a/tests/gpg/Makefile.am
++++ b/tests/gpg/Makefile.am
+@@ -64,7 +64,7 @@ LDADD = ../../src/libgpgme.la
+ t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
+
+ # We don't run t-genkey in the test suite, because it takes too long
+-noinst_PROGRAMS = $(c_tests) t-genkey
++check_PROGRAMS = $(c_tests) t-genkey
+
+ clean-local:
+ -$(top_srcdir)/tests/start-stop-agent --stop
+diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
+index 41645b6..1bdb712 100644
+--- a/tests/gpgsm/Makefile.am
++++ b/tests/gpgsm/Makefile.am
+@@ -40,7 +40,7 @@ LDADD = ../../src/libgpgme.la
+
+ # We don't run t-genkey in the test suite, because it takes too long
+ # and needs a working pinentry.
+-noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
++check_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
+
+ key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
+
+diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am
+index 31d26ed..608b608 100644
+--- a/tests/opassuan/Makefile.am
++++ b/tests/opassuan/Makefile.am
+@@ -27,7 +27,7 @@ EXTRA_DIST =
+ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
+ LDADD = ../../src/libgpgme.la
+
+-noinst_PROGRAMS = $(TESTS) t-command
++check_PROGRAMS = $(TESTS) t-command
+
+ DISTCLEANFILES =
+
+--
+2.7.3
+
diff --git a/app-crypt/gpgme/gpgme-1.7.0.ebuild b/app-crypt/gpgme/gpgme-1.7.0.ebuild
index bb05f40..41ebf70 100644
--- a/app-crypt/gpgme/gpgme-1.7.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.7.0.ebuild
@@ -4,7 +4,7 @@
EAPI="6"
-inherit eutils qmake-utils
+inherit autotools eutils
DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
@@ -33,14 +33,13 @@ REQUIRED_USE="qt5? ( cxx )"
PATCHES=(
"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+ "${FILESDIR}"/${P}-build-tests.patch
+ "${FILESDIR}"/${P}-build-tests-disable.patch
)
src_prepare() {
default
-
- # remove non working tests
- sed -i 's/\tt-sig-notation\$(EXEEXT)/\t/' tests/gpg/Makefile.in || die
- sed -i 's/ t-encrypt\$(EXEEXT)//' lang/qt/tests/Makefile.in || die
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2016-10-19 5:27 Alon Bar-Lev
0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2016-10-19 5:27 UTC (permalink / raw
To: gentoo-commits
commit: 1490afc44c41e3937255c1da52b59f35937a3754
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 05:27:28 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 05:27:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1490afc4
app-crypt/gpgme: cleanup
Package-Manager: portage-2.3.0
app-crypt/gpgme/Manifest | 2 -
.../gpgme/files/gpgme-1.7.0-build-python.patch | 115 ---------------------
.../files/gpgme-1.7.0-build-tests-disable.patch | 40 -------
.../gpgme/files/gpgme-1.7.0-build-tests.patch | 82 ---------------
app-crypt/gpgme/gpgme-1.7.0.ebuild | 95 -----------------
5 files changed, 334 deletions(-)
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index f8e4ec8..ab41d70 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,3 @@
DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
DIST gpgme-1.6.0.tar.bz2 983573 SHA256 b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d SHA512 b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b WHIRLPOOL 4e753156474097dba9db2905954d1754ca408066996a01cbc7266a24654eb7c2323043f40495cc3c227d8eef540eeca47de4c23bb329a2d34604d5a4d3828970
-DIST gpgme-1.7.0-build-32bit.patch 31933 SHA256 933eb074334b3f241290e2ff11b16165a028062b543395de4592a4678656153c SHA512 04be159ea211ed3bc921a65fb7a489e22c98c8e03dfe2457c38045bf8be335db8d2d56ab16de4bab49f62af40cd19dfd53bfb373a77db10853d011ec583c1dde WHIRLPOOL c69c7b0e8cfea89ff6490857790dec6cda06cc43d0d6ff6546c29c99c9bef3b7c4a377daf2949d9669169a35570dc9a859e9ab604c02c89c9e9768bd5347fe4c
-DIST gpgme-1.7.0.tar.bz2 1281708 SHA256 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 SHA512 8c5891104bd531d555fc4c22086cfdea9f18be6885200f02e087d695d0518e311527a227f2c41e0dc1156cc0985265d0bee6c4504de7e2d2de0bc543a1036b5a WHIRLPOOL aaf60c5a30f9161bf8edb24e583e6a83e4a6e28abe7d9878d1d36b5ab34507ff2a47695dc4856c4fdad59463a5d56de1d8d35dee3315dfa54758c8445d9f706e
DIST gpgme-1.7.1.tar.bz2 1285809 SHA256 d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6 SHA512 b8c2e2aa1f413748dc8b0f9f63ef5d1ddbb00dfd82f63a28b7162cf5d8af2a33f7ba29a309da5244ad6e23a561b99716d47d02956d03ece16d06af6ff77f200c WHIRLPOOL a7eea63ba23bf034c18565c171353ed01464f814d6d8cddb4047df402a2bd4830dd719cd4f7feb41038dd8871f3064d5b7e4ffaa6e5a9bf204d42618eb7b0788
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
deleted file mode 100644
index d37d297..00000000
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From e5bccea346379a70fd9cb910c4ead9642227747f Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 24 Sep 2016 01:26:19 +0300
-Subject: [PATCH] build: lang: python: cleanups
-
-1. Make setup.py executable when generated.
-
-2. Add prepare target to enable prepare the source tree without building
- anything. This is handy to enable standard distutils build outside of
- gpgme build system.
-
-3. Treat data.h in similar manner as other VPATH issues, just symlink it
- to the srcdir to simplify build, remove the CFLAGS requirement of
- distutils.
-
-The above does not alter the behavior of current build but supports the
-following sequence:
-
-$ mkdir build
-$ cd build
-$ ../configure --enable-languages=
-$ make
-$ cd lang/python
-$ make prepare
-$ ./setup.py build
-$ ./setup.py install
-
-Notice the standard use of distutils which is required for package
-manager to control the python selection and build process.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 2 +-
- lang/python/Makefile.am | 16 ++++++++++------
- lang/python/gpgme.i | 2 +-
- 3 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4a29f2f..efa1f19 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -886,9 +886,9 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
- AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([lang/qt/doc/Doxyfile])])
- AC_CONFIG_FILES(lang/qt/doc/Makefile)
- AC_CONFIG_FILES([lang/python/Makefile
-- lang/python/setup.py
- lang/python/pyme/version.py
- lang/python/tests/Makefile])
-+AC_CONFIG_FILES([lang/python/setup.py], [chmod a+x lang/python/setup.py])
- AC_OUTPUT
-
- echo "
-diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
-index 2271ce0..9866f53 100644
---- a/lang/python/Makefile.am
-+++ b/lang/python/Makefile.am
-@@ -46,24 +46,28 @@ COPY_FILES_PYME = \
-
- # For VPATH builds we need to copy some files because Python's
- # distutils are not VPATH-aware.
--copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
-+copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h
- if test "$(srcdir)" != "$(builddir)" ; then \
- cp -R $(COPY_FILES) . ; \
- cp -R $(COPY_FILES_PYME) pyme ; \
- fi
- touch $@
-
-+data.h:
-+ ln -s "$(top_srcdir)/src/data.h"
-+
- all-local: copystamp
- for PYTHON in $(PYTHONS); do \
-- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
-- $$PYTHON setup.py build --verbose ; \
-+ $$PYTHON setup.py build --verbose ; \
- done
-
- dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
-- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
-- $(PYTHON) setup.py sdist --verbose
-+ $(PYTHON) setup.py sdist --verbose
- gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
-
-+.PHONY: prepare
-+prepare: copystamp
-+
- .PHONY: sdist
- sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
-
-@@ -72,7 +76,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
- twine upload $^
-
- CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
-- copystamp
-+ data.h copystamp
-
- # Remove the rest.
- #
-diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
-index 84addae..ac666f4 100644
---- a/lang/python/gpgme.i
-+++ b/lang/python/gpgme.i
-@@ -183,7 +183,7 @@
- representation of struct gpgme_data for an very efficient check if
- the buffer has been modified. */
- %{
--#include "src/data.h" /* For struct gpgme_data. */
-+#include "data.h" /* For struct gpgme_data. */
- %}
- #endif
-
---
-2.7.3
-
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch
deleted file mode 100644
index 7d56ad3..00000000
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 516022b0cd1a43973a467bb5b7e6813b9444d608 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 23 Sep 2016 22:46:39 +0300
-Subject: [PATCH] build: tests: remove non working
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- lang/qt/tests/Makefile.am | 2 +-
- tests/gpg/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
-index a41dc8c..e05c8a3 100644
---- a/lang/qt/tests/Makefile.am
-+++ b/lang/qt/tests/Makefile.am
-@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
- EXTRA_DIST = initial.test
-
- TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
-- t-encrypt t-wkspublish
-+ t-wkspublish
-
- moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
- t-encrypt.moc t-support.hmoc t-wkspublish.moc
-diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
-index 9877843..90a1dfd 100644
---- a/tests/gpg/Makefile.am
-+++ b/tests/gpg/Makefile.am
-@@ -36,7 +36,7 @@ endif
-
- c_tests = \
- t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
-- t-decrypt t-verify t-decrypt-verify t-sig-notation t-export \
-+ t-decrypt t-verify t-decrypt-verify t-export \
- t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait \
- t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix)
-
---
-2.7.3
-
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch
deleted file mode 100644
index 719ddac..00000000
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From c2f352363615a4581e01999eb4230f4921cc6f9f Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 23 Sep 2016 23:05:35 +0300
-Subject: [PATCH] build: avoid build tests if not required
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- lang/qt/tests/Makefile.am | 2 +-
- tests/Makefile.am | 2 +-
- tests/gpg/Makefile.am | 2 +-
- tests/gpgsm/Makefile.am | 2 +-
- tests/opassuan/Makefile.am | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
-index 36ecfe4..63186e7 100644
---- a/lang/qt/tests/Makefile.am
-+++ b/lang/qt/tests/Makefile.am
-@@ -62,7 +62,7 @@ nodist_t_keylist_SOURCES = $(moc_files)
-
- BUILT_SOURCES = $(moc_files)
-
--noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
-+check_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
- run-keyformailboxjob t-wkspublish
-
- CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index c71914f..b698e11 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -31,7 +31,7 @@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
-
- noinst_HEADERS = run-support.h
-
--noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
-+check_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
- run-verify run-encrypt run-identify run-decrypt run-genkey \
- run-keysign run-tofu
-
-diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
-index 90a1dfd..671a2f3 100644
---- a/tests/gpg/Makefile.am
-+++ b/tests/gpg/Makefile.am
-@@ -64,7 +64,7 @@ LDADD = ../../src/libgpgme.la
- t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
-
- # We don't run t-genkey in the test suite, because it takes too long
--noinst_PROGRAMS = $(c_tests) t-genkey
-+check_PROGRAMS = $(c_tests) t-genkey
-
- clean-local:
- -$(top_srcdir)/tests/start-stop-agent --stop
-diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
-index 41645b6..1bdb712 100644
---- a/tests/gpgsm/Makefile.am
-+++ b/tests/gpgsm/Makefile.am
-@@ -40,7 +40,7 @@ LDADD = ../../src/libgpgme.la
-
- # We don't run t-genkey in the test suite, because it takes too long
- # and needs a working pinentry.
--noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
-+check_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
-
- key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
-
-diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am
-index 31d26ed..608b608 100644
---- a/tests/opassuan/Makefile.am
-+++ b/tests/opassuan/Makefile.am
-@@ -27,7 +27,7 @@ EXTRA_DIST =
- AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
- LDADD = ../../src/libgpgme.la
-
--noinst_PROGRAMS = $(TESTS) t-command
-+check_PROGRAMS = $(TESTS) t-command
-
- DISTCLEANFILES =
-
---
-2.7.3
-
diff --git a/app-crypt/gpgme/gpgme-1.7.0.ebuild b/app-crypt/gpgme/gpgme-1.7.0.ebuild
deleted file mode 100644
index 16eaa6e..00000000
--- a/app-crypt/gpgme/gpgme-1.7.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 eutils qmake-utils
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
- https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=a142f187b7ddb2728ec3e1743da4a0c4538ab40a -> gpgme-1.7.0-build-32bit.patch"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5 test"
-
-RDEPEND="app-crypt/gnupg
- >=dev-libs/libassuan-2.0.2
- >=dev-libs/libgpg-error-1.11
- qt5? (
- dev-qt/qtcore:5
- !kde-apps/gpgmepp:4
- !kde-apps/kdepimlibs:4
- )
- python? ( ${PYTHON_DEPS} )"
- #doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
- python? ( dev-lang/swig )
- qt5? (
- test? ( dev-qt/qttest:5 )
- )"
-
-REQUIRED_USE="qt5? ( cxx )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
- "${FILESDIR}"/${P}-build-tests.patch
- "${FILESDIR}"/${P}-build-tests-disable.patch
- "${FILESDIR}"/${P}-build-python.patch
-)
-
-do_python() {
- if use python; then
- pushd lang/python > /dev/null || die
- distutils-r1_src_${EBUILD_PHASE}
- popd > /dev/null
- fi
-}
-
-src_prepare() {
- sed -e '/a\/lang\/cpp\/src\/context_glib.cpp/,+30d' "${DISTDIR}/gpgme-1.7.0-build-32bit.patch" > "${T}/gpgme-1.7.0-build-32bit.patch"
- PATCHES+=(
- "${T}"/${P}-build-32bit.patch
- )
- default
- eautoreconf
- do_python
-}
-
-src_configure() {
- local languages=()
- use common-lisp && languages+=( "cl" )
- use cxx && languages+=( "cpp" )
- if use qt5; then
- languages+=( "qt" )
- #use doc ||
- export DOXYGEN=
- export MOC="$(qt5_get_bindir)/moc"
- fi
-
- econf \
- --includedir="${EPREFIX}/usr/include/gpgme" \
- --enable-languages="${languages[*]}" \
- $(use_enable static-libs static)
-
- use python && make -C lang/python prepare
-
- do_python
-}
-
-src_compile() {
- default
- do_python
-}
-
-src_install() {
- default
- do_python
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2017-07-08 18:35 Alon Bar-Lev
0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2017-07-08 18:35 UTC (permalink / raw
To: gentoo-commits
commit: ab2d3e9ff887c8d228d5be16ea0047f6d296a022
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 18:33:55 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 18:34:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2d3e9f
app-crypt/gpgme: fix gcc-7 issue
Bug: 623622
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch | 16 ++++++++++++++++
app-crypt/gpgme/gpgme-1.8.0-r3.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch
new file mode 100644
index 00000000000..9dd3e85cbfb
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch
@@ -0,0 +1,16 @@
+diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
+index eb3af56..af47594 100644
+--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
++++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
+@@ -51,2 +51,3 @@
+ #include <cassert>
++#include <functional> /* std::mem_fn */
+
+diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
+index 32b23db..c4f85c2 100644
+--- a/lang/qt/src/threadedjobmixin.h
++++ b/lang/qt/src/threadedjobmixin.h
+@@ -53,2 +53,3 @@
+ #include <cassert>
++#include <functional> /* std::function */
+
diff --git a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
index 852f9033430..c18cb6e64d6 100644
--- a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
+++ b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
@@ -39,6 +39,7 @@ REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
"${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-gcc-7.patch
)
do_python() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2017-11-29 19:47 Alon Bar-Lev
0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2017-11-29 19:47 UTC (permalink / raw
To: gentoo-commits
commit: d59e4c9344392f1af0d3016041d98fe597abb22b
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 19:46:05 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 19:47:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59e4c93
app-crypt/gpgme: fix tests
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=639192
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-crypt/gpgme/Manifest | 4 ++--
.../gpgme/files/gpgme-1.10.0_beta81-build.patch | 28 ++++++++++++++++++++++
app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild | 7 +++++-
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index e8cc44b4308..b8df5746154 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,2 +1,2 @@
-DIST gpgme-1.10.0-beta81.tar.bz2 1293818 SHA256 91bc25aac8bb953da2f216ca3a41b9c7be34bb8adae5d2b7ad51975cc221ef2a SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b WHIRLPOOL 37b83ed311927ecc17c211157ac6a35a213d1a3549948752c1aa05fe547e035de3ae47a0c3e5ab5c5aea2567d612fab2cb4864b5db2f9ca351c2c061d5aebcf5
-DIST gpgme-1.8.0.tar.bz2 1298407 SHA256 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de WHIRLPOOL 79ed725e24302d4d738e90739cf3c5e6e9fa89c3e4fef87a4fca569abb7f7b7f0140e62e76161f747b555f49166fd0ccda277dbd6cc46c00ce2797c32d442f7b
+DIST gpgme-1.10.0-beta81.tar.bz2 1293818 BLAKE2B 12dbc9120986943ace281c0f0f7020c71e5ed2760bcc85f7d427f731190df8b24779932b8fb8476372669960be28a9ce8af9622b534b4e3e7a9cd5180663f147 SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b
+DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
diff --git a/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch
new file mode 100644
index 00000000000..8f6dc01617c
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch
@@ -0,0 +1,28 @@
+From 8ffc2c7809b47a87131cde38e14dc3941d13fa21 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 29 Nov 2017 21:35:33 +0200
+Subject: [PATCH GPGME] tests: gpgsm: fix gpg-agent detection
+To: gnupg-devel@gnupg.org
+
+* tests/gpgsm/Makefile.am: set the GPG_AGENT var.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tests/gpgsm/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
+index 3774c5ff..4ab22833 100644
+--- a/tests/gpgsm/Makefile.am
++++ b/tests/gpgsm/Makefile.am
+@@ -20,6 +20,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+ GPGSM = gpgsm
++GPG_AGENT = gpg-agent
+
+ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
+ top_srcdir=$(top_srcdir)
+--
+2.13.6
+
diff --git a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
index 562eb510e9a..a17a8fa1602 100644
--- a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
DISTUTILS_OPTIONAL=1
-inherit distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs
+inherit autotools distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs
MY_PV="${PV//_/-}"
MY_P="${PN}-${MY_PV}"
@@ -39,6 +39,10 @@ RDEPEND="${COMMON_DEPEND}
REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
S="${WORKDIR}/${MY_P}"
do_python() {
@@ -55,6 +59,7 @@ pkg_setup() {
src_prepare() {
default
+ eautoreconf
# Socket name is too long if we use full beta name
# tests are failing
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2018-04-20 10:34 Alon Bar-Lev
0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2018-04-20 10:34 UTC (permalink / raw
To: gentoo-commits
commit: 35e05f97d850e9ff84236cd7680a8e2c0539f320
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 10:33:34 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 10:34:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e05f97
app-crypt/gpgme: version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-crypt/gpgme/Manifest | 2 +-
app-crypt/gpgme/files/gpgme-1.11.0-build.patch | 34 ----------------------
app-crypt/gpgme/files/gpgme-1.11.0-tests.patch | 25 ----------------
.../{gpgme-1.11.0.ebuild => gpgme-1.11.1.ebuild} | 9 +-----
4 files changed, 2 insertions(+), 68 deletions(-)
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 58d8139788a..ec409d46cfe 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,3 +1,3 @@
DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
-DIST gpgme-1.11.0.tar.bz2 1414991 BLAKE2B 2ef78b9b6f1017f821d83c2a91775b19ff2a0705d3441105d4f6d2fce4edaec9b26a6ea6a79e94f623f2ed064dd311846f1c3b92a94fcb3e1c11c8d2bc90c80b SHA512 79d1e4bb7a0a15ae107dae8aab29aa0b62c47ea93b228429332bb7ed24fc742afcc7abf537319d5466dee5a3b83b3fba3cf90a8bad8c97c64d7215c6573eabb5
+DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
diff --git a/app-crypt/gpgme/files/gpgme-1.11.0-build.patch b/app-crypt/gpgme/files/gpgme-1.11.0-build.patch
deleted file mode 100644
index 7477a0ae8e8..00000000000
--- a/app-crypt/gpgme/files/gpgme-1.11.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8b4fd18c98eab1287836c79ae4efc77541e7dc30 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 18 Apr 2018 23:53:01 +0300
-Subject: [PATCH GPGME] build: gpgme-json: install properly
-
-not installing properly using libtool result in:
-
- * QA Notice: The following files contain insecure RUNPATHs
- * Please file a bug about this at https://bugs.gentoo.org/
- * with the maintainer of the package.
- * /var/tmp/portage/app-crypt/gpgme-1.11.0/image/usr/bin/gpgme-json
- * RPATH: /var/tmp/portage/app-crypt/gpgme-1.11.0/work/b/src/.libs
----
- src/Makefile.am | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c2d4a843..3d638b23 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -103,9 +103,7 @@ gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h
- gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
-
- gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h
--gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS)
--# We use -no-install temporary during development.
--gpgme_json_LDFLAGS = -no-install
-+gpgme_json_LDADD = -lm libgpgme.la @GPG_ERROR_LIBS@
-
-
- if HAVE_W32_SYSTEM
---
-2.16.1
-
diff --git a/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch b/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch
deleted file mode 100644
index 1acb71af442..00000000000
--- a/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 82b2b2da2bf6f50fbc5481e106c010567665575d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 18 Apr 2018 23:59:20 +0300
-Subject: [PATCH] tests: gpg: disable t-verify
-
----
- tests/gpg/t-verify.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
-index 7c23406f..315040e8 100644
---- a/tests/gpg/t-verify.c
-+++ b/tests/gpg/t-verify.c
-@@ -225,6 +225,8 @@ main (int argc, char *argv[])
- gpgme_verify_result_t result;
- const char *s;
-
-+ exit(0);
-+
- (void)argc;
- (void)argv;
-
---
-2.16.1
-
diff --git a/app-crypt/gpgme/gpgme-1.11.0.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
similarity index 92%
rename from app-crypt/gpgme/gpgme-1.11.0.ebuild
rename to app-crypt/gpgme/gpgme-1.11.1.ebuild
index 1b4ceae45e9..764c52bd016 100644
--- a/app-crypt/gpgme/gpgme-1.11.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -7,7 +7,6 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs
-inherit autotools
DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
@@ -15,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1/11" # subslot = soname major version
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs cxx python qt5"
COMMON_DEPEND=">=app-crypt/gnupg-2
@@ -37,11 +36,6 @@ RDEPEND="${COMMON_DEPEND}
REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-tests.patch"
-)
-
do_python() {
if use python; then
pushd "lang/python" > /dev/null || die
@@ -62,7 +56,6 @@ pkg_setup() {
src_prepare() {
default
- eautoreconf
elibtoolize
# Make best effort to allow longer PORTAGE_TMPDIR
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2022-03-07 4:21 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-03-07 4:21 UTC (permalink / raw
To: gentoo-commits
commit: 5b2fdfc8096c3d8ea640e7a6f3bbdb2d5807f6f1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 04:16:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 04:21:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2fdfc8
app-crypt/gpgme: fix t-edit-sign test failure in 1.16.0
Fixed in 1.17.0+. It's not a bug in gpgme itself, just the test
suite, so no revbump needed. For us, only seems to have resulted
in actual failure on PPC (and ARM?).
Closes: https://bugs.gentoo.org/827898
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gpgme-1.16.0-fix-t-edit-sign-test.patch | 120 +++++++++++++++++++++
app-crypt/gpgme/gpgme-1.16.0.ebuild | 3 +-
2 files changed, 122 insertions(+), 1 deletion(-)
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
new file mode 100644
index 000000000000..6a5a7c0707c4
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
@@ -0,0 +1,120 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969;hp=e8e055e682f8994d62012574e1c8d862ca72a35d
+https://dev.gnupg.org/T5509
+https://bugs.gentoo.org/827898
+
+From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Sat, 26 Jun 2021 18:02:47 +0200
+Subject: [PATCH 1/1] core: Fix use-after-free issue in test
+
+* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New.
+(main): Factored out signing and verifying the result.
+--
+
+Factoring the two steps of the test into different functions fixes the
+use-after-free issue that was caused by accidentaly using a variable
+of the first step in the second step.
+
+GnuPG-bug-id: 5509
+--- a/tests/gpg/t-edit-sign.c
++++ b/tests/gpg/t-edit-sign.c
+@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd)
+ }
+
+
+-int
+-main (int argc, char **argv)
++void
++sign_key (const char *key_fpr, const char *signer_fpr)
+ {
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t out = NULL;
+- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
+ gpgme_key_t signing_key = NULL;
+- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
+ gpgme_key_t key = NULL;
+- gpgme_key_t signed_key = NULL;
+- gpgme_user_id_t signed_uid = NULL;
+- gpgme_key_sig_t key_sig = NULL;
+ char *agent_info;
+- int mode;
+-
+- (void)argc;
+- (void)argv;
+-
+- init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
+ err = gpgme_new (&ctx);
+ fail_if_err (err);
+
+- /* Sign the key */
+ agent_info = getenv("GPG_AGENT_INFO");
+ if (!(agent_info && strchr (agent_info, ':')))
+ gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
+@@ -159,8 +147,23 @@ main (int argc, char **argv)
+ gpgme_data_release (out);
+ gpgme_key_unref (key);
+ gpgme_key_unref (signing_key);
++ gpgme_release (ctx);
++}
++
++
++void
++verify_key_signature (const char *key_fpr, const char *signer_keyid)
++{
++ gpgme_ctx_t ctx;
++ gpgme_error_t err;
++ gpgme_key_t signed_key = NULL;
++ gpgme_user_id_t signed_uid = NULL;
++ gpgme_key_sig_t key_sig = NULL;
++ int mode;
++
++ err = gpgme_new (&ctx);
++ fail_if_err (err);
+
+- /* Verify the key signature */
+ mode = gpgme_get_keylist_mode (ctx);
+ mode |= GPGME_KEYLIST_MODE_SIGS;
+ err = gpgme_set_keylist_mode (ctx, mode);
+@@ -168,7 +171,7 @@ main (int argc, char **argv)
+ err = gpgme_get_key (ctx, key_fpr, &signed_key, 0);
+ fail_if_err (err);
+
+- signed_uid = key->uids;
++ signed_uid = signed_key->uids;
+ if (!signed_uid)
+ {
+ fprintf (stderr, "Signed key has no user IDs\n");
+@@ -180,7 +183,7 @@ main (int argc, char **argv)
+ exit (1);
+ }
+ key_sig = signed_uid->signatures->next;
+- if (strcmp ("2D727CC768697734", key_sig->keyid))
++ if (strcmp (signer_keyid, key_sig->keyid))
+ {
+ fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
+ key_sig->keyid);
+@@ -196,6 +199,23 @@ main (int argc, char **argv)
+
+ gpgme_key_unref (signed_key);
+ gpgme_release (ctx);
++}
++
++
++int
++main (int argc, char **argv)
++{
++ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
++ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
++ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
++
++ (void)argc;
++ (void)argv;
++
++ init_gpgme (GPGME_PROTOCOL_OpenPGP);
++
++ sign_key (key_fpr, signer_fpr);
++ verify_key_signature (key_fpr, signer_keyid);
+
+ return 0;
+ }
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index e728a4e493cd..39331ee0ab33 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,7 @@ REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}"/${P}-glibc-2.34.patch
+ "${FILESDIR}"/${P}-fix-t-edit-sign-test.patch
)
do_python() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2022-07-15 9:16 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-07-15 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 062bda03ee5751477a74d68f6b000e7cb4a3226c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 09:16:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 09:16:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062bda03
app-crypt/gpgme: drop 1.16.0
Closes: https://bugs.gentoo.org/836033
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/gpgme/Manifest | 2 -
.../files/gpgme-1.16.0-fix-t-edit-sign-test.patch | 120 ---------------------
.../gpgme/files/gpgme-1.16.0-glibc-2.34.patch | 33 ------
app-crypt/gpgme/gpgme-1.16.0.ebuild | 119 --------------------
4 files changed, 274 deletions(-)
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 1b3f13117b3a..228275f1e483 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,4 +1,2 @@
-DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
-DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449e2297ad5a853fc145e106757e639b5bf5c23de6475055578633e12d8dc7d11ebb689ee6c74283c7cfe28058e65 SHA512 0c230b55bb0b24af85cd6df9e6be6ef8245d29af0fb8348fe044979ab75250987fafbd709d1898852a23df99fb16dd61b0b2bc6a821ed1c1b9aadd86182e5b9a
DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
deleted file mode 100644
index 6a5a7c0707c4..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969;hp=e8e055e682f8994d62012574e1c8d862ca72a35d
-https://dev.gnupg.org/T5509
-https://bugs.gentoo.org/827898
-
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Sat, 26 Jun 2021 18:02:47 +0200
-Subject: [PATCH 1/1] core: Fix use-after-free issue in test
-
-* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New.
-(main): Factored out signing and verifying the result.
---
-
-Factoring the two steps of the test into different functions fixes the
-use-after-free issue that was caused by accidentaly using a variable
-of the first step in the second step.
-
-GnuPG-bug-id: 5509
---- a/tests/gpg/t-edit-sign.c
-+++ b/tests/gpg/t-edit-sign.c
-@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd)
- }
-
-
--int
--main (int argc, char **argv)
-+void
-+sign_key (const char *key_fpr, const char *signer_fpr)
- {
- gpgme_ctx_t ctx;
- gpgme_error_t err;
- gpgme_data_t out = NULL;
-- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
- gpgme_key_t signing_key = NULL;
-- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
- gpgme_key_t key = NULL;
-- gpgme_key_t signed_key = NULL;
-- gpgme_user_id_t signed_uid = NULL;
-- gpgme_key_sig_t key_sig = NULL;
- char *agent_info;
-- int mode;
--
-- (void)argc;
-- (void)argv;
--
-- init_gpgme (GPGME_PROTOCOL_OpenPGP);
-
- err = gpgme_new (&ctx);
- fail_if_err (err);
-
-- /* Sign the key */
- agent_info = getenv("GPG_AGENT_INFO");
- if (!(agent_info && strchr (agent_info, ':')))
- gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
-@@ -159,8 +147,23 @@ main (int argc, char **argv)
- gpgme_data_release (out);
- gpgme_key_unref (key);
- gpgme_key_unref (signing_key);
-+ gpgme_release (ctx);
-+}
-+
-+
-+void
-+verify_key_signature (const char *key_fpr, const char *signer_keyid)
-+{
-+ gpgme_ctx_t ctx;
-+ gpgme_error_t err;
-+ gpgme_key_t signed_key = NULL;
-+ gpgme_user_id_t signed_uid = NULL;
-+ gpgme_key_sig_t key_sig = NULL;
-+ int mode;
-+
-+ err = gpgme_new (&ctx);
-+ fail_if_err (err);
-
-- /* Verify the key signature */
- mode = gpgme_get_keylist_mode (ctx);
- mode |= GPGME_KEYLIST_MODE_SIGS;
- err = gpgme_set_keylist_mode (ctx, mode);
-@@ -168,7 +171,7 @@ main (int argc, char **argv)
- err = gpgme_get_key (ctx, key_fpr, &signed_key, 0);
- fail_if_err (err);
-
-- signed_uid = key->uids;
-+ signed_uid = signed_key->uids;
- if (!signed_uid)
- {
- fprintf (stderr, "Signed key has no user IDs\n");
-@@ -180,7 +183,7 @@ main (int argc, char **argv)
- exit (1);
- }
- key_sig = signed_uid->signatures->next;
-- if (strcmp ("2D727CC768697734", key_sig->keyid))
-+ if (strcmp (signer_keyid, key_sig->keyid))
- {
- fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
- key_sig->keyid);
-@@ -196,6 +199,23 @@ main (int argc, char **argv)
-
- gpgme_key_unref (signed_key);
- gpgme_release (ctx);
-+}
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
-+ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
-+ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
-+
-+ (void)argc;
-+ (void)argv;
-+
-+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
-+
-+ sign_key (key_fpr, signer_fpr);
-+ verify_key_signature (key_fpr, signer_keyid);
-
- return 0;
- }
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
deleted file mode 100644
index f328e4540ae3..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/803557
-https://dev.gnupg.org/T5587
-
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 5 Sep 2021 00:05:00 +0200
-Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34
-
-Fix the following build failure with glibc >= 2.34 raised because
-closefrom doesn't return an int but a void since its addition with
-https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c
-
-```
-posix-io.c: In function '_gpgme_io_spawn':
-posix-io.c:577:23: error: void value not ignored as it ought to be
- 577 | while ((i = closefrom (fd)) && errno == EINTR)
- | ^
-```
-
-Fixes:
- - http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---- a/src/posix-io.c
-+++ b/src/posix-io.c
-@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
- if (fd_list[i].fd > fd)
- fd = fd_list[i].fd;
- fd++;
--#if defined(__sun) || defined(__FreeBSD__)
-+#if defined(__sun) || defined(__FreeBSD__) || (defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
- closefrom (fd);
- max_fds = fd;
- #else /*!__sun */
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
deleted file mode 100644
index 7a84df5e6d29..000000000000
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
- verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs +cxx python qt5"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=app-crypt/gnupg-2
- >=dev-libs/libassuan-2.5.3:=
- >=dev-libs/libgpg-error-1.36:=
- python? ( ${PYTHON_DEPS} )
- qt5? ( dev-qt/qtcore:5 )"
- #doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
- qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )
- verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-glibc-2.34.patch
- "${FILESDIR}"/${P}-fix-t-edit-sign-test.patch
-)
-
-do_python() {
- if use python; then
- pushd "lang/python" > /dev/null || die
- top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
- popd > /dev/null
- fi
-}
-
-pkg_setup() {
- addpredict /run/user/$(id -u)/gnupg
-
- local MAX_WORKDIR=66
- if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
- ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
- SKIP_TESTS=1
- fi
-}
-
-src_prepare() {
- default
- elibtoolize
-
- # Make best effort to allow longer PORTAGE_TMPDIR
- # as usock limitation fails build/tests
- ln -s "${P}" "${WORKDIR}/b"
- S="${WORKDIR}/b"
-}
-
-src_configure() {
- local languages=()
- use common-lisp && languages+=( "cl" )
- use cxx && languages+=( "cpp" )
- if use qt5; then
- languages+=( "qt" )
- #use doc ||
- export DOXYGEN=true
- export MOC="$(qt5_get_bindir)/moc"
- fi
-
- econf \
- $([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
- --enable-languages="${languages[*]}" \
- $(use_enable static-libs static)
-
- use python && make -C lang/python prepare
-
- do_python
-}
-
-src_compile() {
- default
- do_python
-}
-
-src_test() {
- [[ -z "${SKIP_TESTS}" ]] || return
-
- default
- if use python; then
- test_python() {
- emake -C lang/python/tests check \
- PYTHON=${EPYTHON} \
- PYTHONS=${EPYTHON} \
- TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
- }
- python_foreach_impl test_python
- fi
-}
-
-src_install() {
- default
- do_python
- find "${ED}" -type f -name '*.la' -delete || die
-
- # backward compatibility for gentoo
- # in the past we had slots
- dodir /usr/include/gpgme
- dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/
@ 2023-10-28 4:53 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-10-28 4:53 UTC (permalink / raw
To: gentoo-commits
commit: 4ca5bff1b724f71d86ab56599f9e07c828f8d96b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 03:18:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 04:52:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca5bff1
app-crypt/gpgme: add 1.23.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/gpgme/Manifest | 2 +
.../files/gpgme-1.23.1-tests-gnupg-no-tofu.patch | 26 ++++
app-crypt/gpgme/gpgme-1.23.1.ebuild | 166 +++++++++++++++++++++
3 files changed, 194 insertions(+)
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index b69c1bf3f85e..d94b7cafdf4f 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -2,3 +2,5 @@ DIST gpgme-1.21.0.tar.bz2 1830113 BLAKE2B 77000567fde5b78bf46352b25c81e7223506c0
DIST gpgme-1.21.0.tar.bz2.sig 119 BLAKE2B ac19a5694e139be36ee9c6e28501d4a695166cfbc8f1561de7c7741a274f35cb0a67f779b5fc1ff58b5a11eeaa5e575c06233be65d01c40504efe16a759740ea SHA512 8a471333fd0fc6da50990c3aed67900a6b183cde0fcc449d37435289d8f309c68555c741281c06af9740ac088ae0b4747263da1dfd23d90b050185706948b227
DIST gpgme-1.22.0.tar.bz2 1717836 BLAKE2B 6c03f4252391a114233fed284bf9eba03fa7b67328b506c01554fbd4239e0f3ede0bc79d82e9f21718084ca17945d628707d4451ac765a8f36d282e7e2d75f8e SHA512 17053053fa885f01416433e43072ac716b5d5db0c3edf45b2d6e90e6384d127626e6ae3ce421abba8f449f5ca7e8963f3d62f3565d295847170bc998d1ec1a70
DIST gpgme-1.22.0.tar.bz2.sig 119 BLAKE2B fde8892743e7658004d73d89dcb3899fd003ad9222fa47ec0beb29c507917936cd34ade58609cb44c8ed2d2dc0c8e4aba6ac73ed4789d2a375f79055d23c2349 SHA512 20468946e8247dd12991b25a599ee815b2627931fd3886c41b310eea51f058a51cd1584de2292241a225144bf9a1f18b70bb495cb34304879fc294fc95b220ea
+DIST gpgme-1.23.1.tar.bz2 1716825 BLAKE2B 5810bafb2bbea0a44078fdd587fdeae5a2705dac381d6873dd1cdff017a0be7213125846201cdfef510a5802fdc6d86fd2216b17c380ef5f9e30add5edeaa70c SHA512 a82d5de29a38e5cee4042b3891d0a2c265001832e8578ba17b26c48c6d2a4d5919ac9655b4bfb5235dc8c7cea8d3254054da270d287133b9161e7c6ef93b2d58
+DIST gpgme-1.23.1.tar.bz2.sig 119 BLAKE2B bc31079a0632aee4f84347114f3705d8e5068282000057cd8f332b541ee9f0d82eda246ed9b0fb156bb5fbb887156df8ba28518b184ce71b4c66c80e02efc154 SHA512 c3546bc69f8f083d6ebf146336860af263810224a7e9a42c233bfa1210eb0f6f82c26bf134d261ca823eef170549c2642ea2d689610446df91805c5d3c02528f
diff --git a/app-crypt/gpgme/files/gpgme-1.23.1-tests-gnupg-no-tofu.patch b/app-crypt/gpgme/files/gpgme-1.23.1-tests-gnupg-no-tofu.patch
new file mode 100644
index 000000000000..831f68c8ea18
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.23.1-tests-gnupg-no-tofu.patch
@@ -0,0 +1,26 @@
+https://dev.gnupg.org/T6778
+--- a/lang/python/tests/support.py
++++ b/lang/python/tests/support.py
+@@ -46,13 +46,15 @@ def is_gpg_version(version):
+
+
+ def have_tofu_support(ctx, some_uid):
+- keys = list(
+- ctx.keylist(
+- some_uid,
+- mode=(gpg.constants.keylist.mode.LOCAL |
+- gpg.constants.keylist.mode.WITH_TOFU)))
+- return len(keys) > 0
+-
++ try:
++ keys = list(
++ ctx.keylist(
++ some_uid,
++ mode=(gpg.constants.keylist.mode.LOCAL |
++ gpg.constants.keylist.mode.WITH_TOFU)))
++ return len(keys) > 0
++ except gpg.errors.GPGMEError:
++ return False
+
+ # Skip the Python tests for GnuPG < 2.1.12. Prior versions do not
+ # understand the command line flags that we assume exist. C.f. issue
diff --git a/app-crypt/gpgme/gpgme-1.23.1.ebuild b/app-crypt/gpgme/gpgme-1.23.1.ebuild
new file mode 100644
index 000000000000..62c999847385
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.23.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+# in-source builds are not supported:
+# * https://dev.gnupg.org/T6313#166339
+# * https://dev.gnupg.org/T6673#174545
+inherit distutils-r1 libtool flag-o-matic out-of-source qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="
+ mirror://gnupg/gpgme/${P}.tar.bz2
+ verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
+# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
+SLOT="1/11.6.15.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+# - On each bump, update dep bounds on each version from configure.ac!
+RDEPEND="
+ >=app-crypt/gnupg-2
+ >=dev-libs/libassuan-2.5.3:=
+ >=dev-libs/libgpg-error-1.46-r1:=
+ python? ( ${PYTHON_DEPS} )
+ qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+#doc? ( app-doc/doxygen[dot] )
+BDEPEND="
+ python? ( dev-lang/swig )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+ "${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+)
+
+src_prepare() {
+ default
+
+ elibtoolize
+
+ # bug #697456
+ addpredict /run/user/$(id -u)/gnupg
+
+ local MAX_WORKDIR=66
+ if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+ eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+ die "Could not run tests as requested with too-long WORKDIR."
+ fi
+
+ # Make best effort to allow longer PORTAGE_TMPDIR
+ # as usock limitation fails build/tests
+ ln -s "${P}" "${WORKDIR}/b" || die
+ S="${WORKDIR}/b"
+}
+
+my_src_configure() {
+ local languages=()
+
+ # bug #847955
+ append-lfs-flags
+
+ if use common-lisp ; then
+ languages+=( "cl" )
+ fi
+
+ if use cxx ; then
+ languages+=( "cpp" )
+ fi
+
+ # TODO: qt6? but qt5 and qt5 are mutually exclusive :(
+ if use qt5; then
+ languages+=( "qt5" )
+
+ #use doc ||
+ export DOXYGEN=true
+ export MOC="$(qt5_get_bindir)/moc"
+ fi
+
+ local myeconfargs=(
+ $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
+ --enable-languages="${languages[*]}"
+ $(use_enable static-libs static)
+ )
+
+ econf "${myeconfargs[@]}"
+
+ if use python ; then
+ emake -C lang/python prepare
+
+ pushd lang/python > /dev/null || die
+ top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
+ popd > /dev/null || die
+ fi
+}
+
+my_src_compile() {
+ default
+
+ if use python ; then
+ pushd lang/python > /dev/null || die
+ top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+}
+
+my_src_test() {
+ default
+
+ if use python ; then
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ emake -C lang/python/tests check \
+ PYTHON=${EPYTHON} \
+ PYTHONS=${EPYTHON} \
+ TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+my_src_install() {
+ default
+
+ if use python ; then
+ pushd lang/python > /dev/null || die
+ top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
+ popd > /dev/null || die
+ fi
+
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ # Backward compatibility for gentoo
+ # (in the past, we had slots)
+ dodir /usr/include/gpgme
+ dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-10-28 4:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-08 18:35 [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/files/, app-crypt/gpgme/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2023-10-28 4:53 Sam James
2022-07-15 9:16 Sam James
2022-03-07 4:21 Sam James
2018-04-20 10:34 Alon Bar-Lev
2017-11-29 19:47 Alon Bar-Lev
2016-10-19 5:27 Alon Bar-Lev
2016-09-23 20:31 Alon Bar-Lev
2016-09-23 9:32 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox