mirror of
git://git.gnupg.org/gnupg.git
synced 2024-09-20 14:51:42 +02:00
![Werner Koch](/assets/img/avatar_default.png)
* configure.ac (USE_GPG2_HACK): New ac_define am_conditional. * common/homedir.c (gnupg_module_name): Replace use of macro NAME_OF_INSTALLED_GPG. * g10/keygen.c (generate_keypair): Ditto. * g10/Makefile.am (bin_PROGRAMS): Remove. (noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2. (gpg2_hack_list): New. (use_gpg2_hack): New. (gpg2_SOURCES): Rename to gpg_SOURCES. (gpgv2_SOURCES): Rename to gpgv_SOURCES. (gpg2_LDADD): Rename to gpg_LDADD. (gpgv2_LDADD): Rename to gpgv_LDADD. (gpg2_LDFLAGS): Rename to gpg_LDFLAGS. (gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS. (install-exec-hook): Remove WinCE specific rules and add new rules. (uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2. * tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/. * tests/openpgp/defs.inc: Ditto. * tests/openpgp/gpgtar.test: Ditto. * tests/openpgp/mkdemodirs: Ditto. * tests/openpgp/signdemokey: Ditto. * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete --enable-mailto, add --enable-gpg2-is-gpg. -- Although we need to duplicate some automake generated code this method allows to easily switch the name of the installed target using the configure option "--enable-gpg2-is-gpg". Signed-off-by: Werner Koch <wk@gnupg.org>
42 lines
1.2 KiB
Bash
Executable File
42 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
set -e
|
|
|
|
# We need to use --no-options so that a gpg.conf from an older version
|
|
# of gpg is not used.
|
|
GPG="../../g10/gpg --no-options --batch --quiet
|
|
--no-secmem-warning --allow-secret-key-import"
|
|
|
|
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
|
|
done) || true
|
|
exit 0
|
|
fi
|
|
|
|
$GPG --dearmor -o secdemo.gpg --yes ../checks/secdemo.asc
|
|
$GPG --dearmor -o pubdemo.gpg --yes ../checks/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 --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
|
|
|
|
|