2005-10-01 Marcus Brinkmann <marcus@g10code.de>
* gpg/Makefile.am (EXTRA_DIST): Remove gpg.conf. (DISTCLEANFILES): Add gpg.conf. (all-local): Add gpg.conf. (./gpg.conf): New target. * gpg/gpg.conf: Remove file.
This commit is contained in:
parent
fbf6ece78b
commit
bda9541b51
@ -1,5 +1,11 @@
|
||||
2005-10-01 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* gpg/Makefile.am (EXTRA_DIST): Remove gpg.conf.
|
||||
(DISTCLEANFILES): Add gpg.conf.
|
||||
(all-local): Add gpg.conf.
|
||||
(./gpg.conf): New target.
|
||||
* gpg/gpg.conf: Remove file.
|
||||
|
||||
* gpg/Makefile.am (EXTRA_DIST): Add gpg.conf.
|
||||
|
||||
* gpg/Makefile.am (TESTS): Add t-sig-notation.
|
||||
|
@ -32,10 +32,10 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
|
||||
t-file-name
|
||||
|
||||
CLEANFILES = secring.gpg pubring.gpg trustdb.gpg
|
||||
DISTCLEANFILES = pubring.gpg~ random_seed
|
||||
DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf
|
||||
|
||||
EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
|
||||
geheim.txt pubkey-1.asc seckey-1.asc gpg.conf
|
||||
geheim.txt pubkey-1.asc seckey-1.asc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/gpgme
|
||||
|
||||
@ -49,11 +49,16 @@ noinst_PROGRAMS = $(TESTS) t-genkey
|
||||
clean-local:
|
||||
$(srcdir)/mkdemodirs --clean
|
||||
|
||||
all-local: ./pubring.gpg
|
||||
all-local: ./pubring.gpg ./gpg.conf
|
||||
|
||||
./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg
|
||||
$(GPG) --homedir . --import $(srcdir)/pubdemo.asc
|
||||
$(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
|
||||
$(GPG) --homedir . --allow-secret-key-import \
|
||||
--import Alpha/Secret.gpg Zulu/Secret.gpg
|
||||
|
||||
./Alpha/Secret.gpg: secdemo.asc
|
||||
srcdir=$(srcdir) $(srcdir)/mkdemodirs
|
||||
|
||||
./gpg.conf:
|
||||
# This is required for t-sig-notations.
|
||||
echo no-force-v3-sigs > ./gpg.conf
|
||||
|
@ -1,27 +0,0 @@
|
||||
# Options for GnuPG
|
||||
# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; as a special exception the author gives
|
||||
# unlimited permission to copy and/or distribute it, with or without
|
||||
# modifications, as long as this notice is preserved.
|
||||
#
|
||||
# This file is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Unless you specify which option file to use (with the command line
|
||||
# option "--options filename"), GnuPG uses the file ~/.gnupg/gpg.conf
|
||||
# by default.
|
||||
#
|
||||
# An options file can contain any long options which are available in
|
||||
# GnuPG. If the first non white space character of a line is a '#',
|
||||
# this line is ignored. Empty lines are also ignored.
|
||||
#
|
||||
# See the man page for a list of options.
|
||||
|
||||
# By default GnuPG creates version 3 signatures for data files. This
|
||||
# is not strictly OpenPGP compliant but PGP 6 and most versions of PGP
|
||||
# 7 require them. To disable this behavior, you may use this option
|
||||
# or --openpgp.
|
||||
|
||||
no-force-v3-sigs
|
Loading…
Reference in New Issue
Block a user