1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

Don't link gpgv with libreadline

Also add a useful .gitignore file.
This commit is contained in:
Werner Koch 2011-02-23 14:29:59 +01:00
parent 75d62be9c5
commit d0a9b8a9fb
36 changed files with 416 additions and 37703 deletions

File diff suppressed because it is too large Load diff

View file

@ -7,12 +7,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
#
# GnuPG 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 General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
## Process this file with automake to produce Makefile.in
@ -73,7 +73,7 @@ common_source = \
signal.c
if ENABLE_CARD_SUPPORT
card_support_source_gpg = card-util.c
card_support_source_gpg = card-util.c
card_support_source_scd = \
app-common.h \
app-openpgp.c \
@ -83,7 +83,7 @@ card_support_source_scd = \
card_support_source_local = cardglue.c cardglue.h tlv.c tlv.h
else
card_support_source_gpg =
card_support_source_scd =
card_support_source_scd =
card_support_source_local =
endif
@ -124,10 +124,10 @@ gpg_SOURCES = gpg.c \
gpgv_SOURCES = gpgv.c \
$(common_source) \
verify.c
verify.c
LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@
gpg_LDADD = $(LDADD) @LIBREADLINE@ @DLLIBS@ @NETLIBS@ @LIBUSB@
$(PROGRAMS): $(needed_libs)

View file

@ -56,7 +56,7 @@ enum cmd_and_opt_values { aNull = 0,
oVerbose = 'v',
oBatch = 500,
oKeyring,
oIgnoreTimeConflict,
oIgnoreTimeConflict,
oStatusFD,
oLoggerFD,
oHomedir,
@ -70,7 +70,7 @@ static ARGPARSE_OPTS opts[] = {
{ oVerbose, "verbose", 0, N_("verbose") },
{ oQuiet, "quiet", 0, N_("be somewhat more quiet") },
{ oKeyring, "keyring" ,2, N_("take the keys from this keyring")},
{ oIgnoreTimeConflict, "ignore-time-conflict", 0,
{ oIgnoreTimeConflict, "ignore-time-conflict", 0,
N_("make timestamp conflicts only a warning") },
{ oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
{ oLoggerFD, "logger-fd",1, "@" },
@ -151,7 +151,7 @@ main( int argc, char **argv )
disable_dotlock();
set_native_charset (NULL); /* Try to auto set the character set */
pargs.argc = &argc;
pargs.argv = &argv;
pargs.flags= 1; /* do not remove the args */
@ -181,9 +181,9 @@ main( int argc, char **argv )
keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", 8, 0);
for(sl = nrings; sl; sl = sl->next )
keydb_add_resource (sl->d, 8, 0 );
FREE_STRLIST(nrings);
if( (rc = verify_signatures( argc, argv ) ))
log_error("verify signatures failed: %s\n", g10_errstr(rc) );
@ -203,7 +203,7 @@ g10_exit( int rc )
/* Stub:
* We have to override the trustcheck from pkclist.c becuase
* We have to override the trustcheck from pkclist.c becuase
* this utility assumes that all keys in the keyring are trustworthy
*/
int
@ -216,7 +216,7 @@ void
read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck,
byte *marginals,byte *completes,byte *cert_depth) {}
/* Stub:
/* Stub:
* We don't have the trustdb , so we have to provide some stub functions
* instead
*/
@ -336,7 +336,7 @@ check_secret_key( PKT_secret_key *sk, int n )
}
/* Stub:
* No secret key, so no passphrase needed
* No secret key, so no passphrase needed
*/
DEK *
passphrase_to_dek( u32 *keyid, int pubkey_algo,
@ -425,6 +425,8 @@ void init_ttyfp (void) { }
#ifdef HAVE_LIBREADLINE
void tty_enable_completion(rl_completion_func_t *completer) {}
void tty_disable_completion(void) {}
void rl_cleanup_after_signal (void) {}
void rl_free_line_state (void) {}
#endif
/* We do not do any locking, so use these stubs here */