From edf19bbf8f644f8a0553bde0cc4e8ad3855d1a0e Mon Sep 17 00:00:00 2001 From: Moritz Schulte Date: Sun, 19 Apr 2009 18:03:49 +0000 Subject: * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg. * gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in. (mkdemodirs): New target. (clean-local): Added command for removing mkdemodirs script. (./Alpha/Secret.gpg): Added dependency on mkdemodirs. * gpg/mkdemodirs: Renamed to ... * gpg/mkdemodirs.in: ... here. * gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg". --- ChangeLog | 4 ++++ Makefile.am | 4 +++- tests/ChangeLog | 11 ++++++++++ tests/gpg/Makefile.am | 15 +++++++++----- tests/gpg/mkdemodirs | 55 ------------------------------------------------- tests/gpg/mkdemodirs.in | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 61 deletions(-) delete mode 100755 tests/gpg/mkdemodirs create mode 100755 tests/gpg/mkdemodirs.in diff --git a/ChangeLog b/ChangeLog index fecb981c..14797c4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-04-19 Moritz + + * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg. + 2009-03-06 Marcus Brinkmann * assuan/: Update to libassuan SVN 2009-03-06. diff --git a/Makefile.am b/Makefile.am index d22ceaec..3201aeca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am - Top level Makefile for GPGME. # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH +# Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009 g10 Code GmbH # # This file is part of GPGME. # @@ -22,6 +22,8 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = dist-bzip2 +DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@" + EXTRA_DIST = gpgme.spec.in autogen.sh if BUILD_ASSUAN diff --git a/tests/ChangeLog b/tests/ChangeLog index 027afccf..154de99d 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,14 @@ +2009-04-19 Moritz + + * gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in. + (mkdemodirs): New target. + (clean-local): Added command for removing mkdemodirs script. + (./Alpha/Secret.gpg): Added dependency on mkdemodirs. + + * gpg/mkdemodirs: Renamed to ... + * gpg/mkdemodirs.in: ... here. + * gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg". + 2009-02-24 Werner Koch * opassuan/t-command.c: Adjust for changed new op_assuan interface. diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 3588d39e..57e53132 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -1,5 +1,5 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2004, 2005 g10 Code GmbH +# Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH # # This file is part of GPGME. # @@ -40,7 +40,7 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf -EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ +EXTRA_DIST = mkdemodirs.in pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ geheim.txt pubkey-1.asc seckey-1.asc pinentry INCLUDES = -I$(top_builddir)/src @@ -52,8 +52,13 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la # We don't run t-genkey in the test suite, because it takes too long noinst_PROGRAMS = $(TESTS) t-genkey +mkdemodirs: mkdemodirs.in Makefile + sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs + chmod +x mkdemodirs + clean-local: - $(srcdir)/mkdemodirs --clean + -./mkdemodirs --clean + -rm -f mkdemodirs all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf @@ -62,8 +67,8 @@ all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf $(GPG) --homedir . --allow-secret-key-import \ --import Alpha/Secret.gpg Zulu/Secret.gpg -./Alpha/Secret.gpg: secdemo.asc - srcdir=$(srcdir) $(srcdir)/mkdemodirs +./Alpha/Secret.gpg: mkdemodirs secdemo.asc + srcdir=$(srcdir) ./mkdemodirs ./gpg.conf: # This is required for t-sig-notations. diff --git a/tests/gpg/mkdemodirs b/tests/gpg/mkdemodirs deleted file mode 100755 index ab2c5687..00000000 --- a/tests/gpg/mkdemodirs +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Copyright (C) 2004 g10 Code GmbH -# -# This file is part of GPGME. -# -# GPGME is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of the -# License, or (at your option) any later version. -# -# GPGME is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General -# Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -set -e - -GPG="gpg --batch --quiet --no-secmem-warning" -NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India - Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo - Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' - -if [ "$1" = "--clean" ]; then - (for i in $NAMES; do - [ -d $i ] && rm -r $i || true - done) || true - exit 0 -fi - -[ -z "$srcdir" ] && srcdir="../tests" - - -$GPG --dearmor -o secdemo.gpg --yes $srcdir/secdemo.asc -$GPG --dearmor -o pubdemo.gpg --yes $srcdir/pubdemo.asc -[ -f ./tdb.tmp ] && rm ./tdb.tmp -GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring - --keyring pubdemo.gpg --secret-keyring secdemo.gpg" -echo -n "Creating:" -for name in $NAMES; do - echo -n " $name" - [ -d $name ] && rm -r $name - mkdir $name - $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg - $GPG --homedir $name --allow-secret-key-import --import $name/Secret.gpg - $GPGDEMO --export -o - $name > $name/Public.gpg - $GPG --homedir $name --import $name/Public.gpg - [ -f $name/pubring.gpg~ ] && rm $name/pubring.gpg~ -done -echo "." -[ -f ./tdb.tmp ] && rm ./tdb.tmp -rm pubdemo.gpg secdemo.gpg diff --git a/tests/gpg/mkdemodirs.in b/tests/gpg/mkdemodirs.in new file mode 100755 index 00000000..653c91f4 --- /dev/null +++ b/tests/gpg/mkdemodirs.in @@ -0,0 +1,55 @@ +#!/bin/sh +# Copyright (C) 2004 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of the +# License, or (at your option) any later version. +# +# GPGME is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +# Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + +set -e + +GPG="@GPG@ --batch --quiet --no-secmem-warning" +NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India + Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo + Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' + +if [ "$1" = "--clean" ]; then + (for i in $NAMES; do + [ -d $i ] && rm -r $i || true + done) || true + exit 0 +fi + +[ -z "$srcdir" ] && srcdir="../tests" + + +$GPG --dearmor -o secdemo.gpg --yes $srcdir/secdemo.asc +$GPG --dearmor -o pubdemo.gpg --yes $srcdir/pubdemo.asc +[ -f ./tdb.tmp ] && rm ./tdb.tmp +GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring + --keyring pubdemo.gpg --secret-keyring secdemo.gpg" +echo -n "Creating:" +for name in $NAMES; do + echo -n " $name" + [ -d $name ] && rm -r $name + mkdir $name + $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg + $GPG --homedir $name --allow-secret-key-import --import $name/Secret.gpg + $GPGDEMO --export -o - $name > $name/Public.gpg + $GPG --homedir $name --import $name/Public.gpg + [ -f $name/pubring.gpg~ ] && rm $name/pubring.gpg~ +done +echo "." +[ -f ./tdb.tmp ] && rm ./tdb.tmp +rm pubdemo.gpg secdemo.gpg -- cgit v1.2.3