[git] GPGME - branch, master, updated. gpgme-1.6.0-392-g0763357
by Werner Koch
cvs at cvs.gnupg.org
Tue Sep 20 20:04:54 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, master has been updated
via 0763357e39d140b068ee9838a5da08be75426d9f (commit)
via bfb6890ded99f040fe8ecf910f927a136e4acfda (commit)
via 29207bcd3bf4de7264197db6758130375b16d9bb (commit)
via df7e92b4d585b7dce919c5a3aab9524f6e183cbe (commit)
from ef99b74eb12463db7da5806a316e3b55f8097c5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0763357e39d140b068ee9838a5da08be75426d9f
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 20 19:58:00 2016 +0200
tests: Make "make -j distcheck" work in Python.
* lang/python/Makefile.am (SUBDIRS): Make current dir fist.
* lang/python/tests/Makefile.am (xcheck): Depend on pubring-stamp.
(CLEANFILES): Remove private-keys-v1.d/gpg-sample.stamp.
(check-local): Remove.
(initial.py): Remove dependency.
(./pubring-stamp): Depend on conf files and the
private-keys-v1.d/gpg-sample.stamp file. Also replace use of
basename.
--
This addresses the problem that two rules might run the private keys
copy rule and due to the files being chmod -w during make discheck the
second process running that rule's cp would get a permission error.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index da626d1..897c2a6 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = \
examples \
pyme
-SUBDIRS = tests
+SUBDIRS = . tests
COPY_FILES = \
$(srcdir)/gpgme.i \
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 0538e54..aa88bdc 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -65,14 +65,16 @@ EXTRA_DIST = support.py $(XTESTS) encrypt-only.asc sign-only.asc \
check: xcheck
.PHONY: xcheck
-xcheck:
+
+xcheck: ./pubring-stamp
$(TESTS_ENVIRONMENT) $(PYTHON) $(srcdir)/run-tests.py \
--interpreters="$(PYTHONS)" --srcdir=$(srcdir) $(TESTFLAGS) \
$(XTESTS)
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg-agent.conf pubring.kbx~ gpg.conf pubring.gpg~ \
- random_seed .gpg-v21-migrated pubring-stamp
+ random_seed .gpg-v21-migrated \
+ pubring-stamp private-keys-v1.d/gpg-sample.stamp
private_keys = \
$(test_srcdir)/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
@@ -85,21 +87,17 @@ clean-local:
-$(top_srcdir)/tests/start-stop-agent --stop
-rm -fR -- private-keys-v1.d openpgp-revocs.d S.gpg-agent sshcontrol
-check-local: ./gpg.conf ./gpg-agent.conf ./pubring-stamp \
- ./private-keys-v1.d/gpg-sample.stamp
-
-# To guarantee that check-local is run before any tests we
-# add this dependency:
-initial.py: check-local
./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
for k in $(private_keys); do \
- cp $$k private-keys-v1.d/`basename $$k`.key; \
+ cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
done
echo x > ./private-keys-v1.d/gpg-sample.stamp
-./pubring-stamp: $(test_srcdir)/pubdemo.asc
+./pubring-stamp: $(test_srcdir)/pubdemo.asc \
+ ./gpg.conf ./gpg-agent.conf \
+ ./private-keys-v1.d/gpg-sample.stamp
$(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/pubdemo.asc
-$(GPG) --batch --no-permission-warning \
commit bfb6890ded99f040fe8ecf910f927a136e4acfda
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 20 19:51:02 2016 +0200
tests: Use --batch for gpg import.
* lang/python/tests/Makefile.am (./pubring-stamp): Use --batch with
GPG to avoid Pinentries during import when using GnuPG >= 2.1.
Replace touch by echo.
* tests/gpg/Makefile.am (./pubring-stamp): Ditto.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 6a315d7..0538e54 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -100,11 +100,11 @@ initial.py: check-local
echo x > ./private-keys-v1.d/gpg-sample.stamp
./pubring-stamp: $(test_srcdir)/pubdemo.asc
- $(GPG) --no-permission-warning \
+ $(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/pubdemo.asc
- -$(GPG) --no-permission-warning \
+ -$(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/secdemo.asc
- touch ./pubring-stamp
+ echo x > ./pubring-stamp
./gpg.conf:
# This is required for t-sig-notations.
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index e1c033b..9877843 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -89,11 +89,11 @@ export GPG_AGENT_INFO :=
echo x > ./private-keys-v1.d/gpg-sample.stamp
./pubring-stamp: $(srcdir)/pubdemo.asc
- $(GPG) --no-permission-warning \
+ $(GPG) --batch --no-permission-warning \
--import $(srcdir)/pubdemo.asc
- -$(GPG) --no-permission-warning \
+ -$(GPG) --batch --no-permission-warning \
--import $(srcdir)/secdemo.asc
- touch ./pubring-stamp
+ echo x > ./pubring-stamp
./gpg.conf:
# This is required for t-sig-notations.
commit 29207bcd3bf4de7264197db6758130375b16d9bb
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 20 19:46:04 2016 +0200
tests: Improve portability.
* lang/qt/tests/Makefile.am (clean-local): Avoid non-portable "--"
* lang/python/Makefile.am (copystamp): Use well defined cp -R instead
of cp -r.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 9ec9c4a..da626d1 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -48,8 +48,8 @@ COPY_FILES_PYME = \
# distutils are not VPATH-aware.
copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
if test "$(srcdir)" != "$(builddir)" ; then \
- cp -r $(COPY_FILES) . ; \
- cp -r $(COPY_FILES_PYME) pyme ; \
+ cp -R $(COPY_FILES) . ; \
+ cp -R $(COPY_FILES_PYME) pyme ; \
fi
touch $@
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 90f2978..f243a55 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -71,7 +71,7 @@ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg.conf
clean-local:
- -rm -fR -- private-keys-v1.d
+ -rm -fR private-keys-v1.d crls.d
export GNUPGHOME := $(abs_builddir)
commit df7e92b4d585b7dce919c5a3aab9524f6e183cbe
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 20 19:43:49 2016 +0200
build: Create swdb file.
* Makefile.am (distcheck-hook): New.
(dist-hook): s/VERSION/PACKAGE_VERSION/ for future compatibility.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/Makefile.am b/Makefile.am
index cb22a91..72b8ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,9 +39,23 @@ SUBDIRS = src ${tests} doc lang
# to be used for patch's Prereq: feature.
dist-hook: gen-ChangeLog
@set -e; \
- sed -e 's/@pkg_version@/$(VERSION)/g' \
+ sed -e 's/@pkg_version@/$(PACKAGE_VERSION)/g' \
$(top_srcdir)/gpgme.spec.in > $(distdir)/gpgme.spec
- echo "$(VERSION)" > $(distdir)/VERSION
+ echo "$(PACKAGE_VERSION)" > $(distdir)/VERSION
+
+distcheck-hook:
+ set -e; ( \
+ pref="#+macro: gpgme_" ;\
+ reldate="$$(date -u +%Y-%m-%d)" ;\
+ echo "$${pref}ver $(PACKAGE_VERSION)" ;\
+ echo "$${pref}date $${reldate}" ;\
+ list='$(DIST_ARCHIVES)'; for i in $$list; do \
+ case "$$i" in *.tar.bz2) \
+ echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
+ echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
+ echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
+ esac;\
+ done ) | tee $(distdir).swdb
gen_start_date = 2011-12-01T00:00:00
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 18 ++++++++++++++++--
lang/python/Makefile.am | 6 +++---
lang/python/tests/Makefile.am | 24 +++++++++++-------------
lang/qt/tests/Makefile.am | 2 +-
tests/gpg/Makefile.am | 6 +++---
5 files changed, 34 insertions(+), 22 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list