From 31cf39791ec0c02caded3774674b9a998d3f2eca Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 23 Oct 2006 14:21:41 +0000
Subject: [PATCH] New command --gpgconf-test.

---
 TODO                     | 2 ++
 g10/ChangeLog            | 4 ++++
 g10/gpg.c                | 6 ++++++
 scripts/ChangeLog        | 5 +++++
 scripts/w32installer.nsi | 3 +++
 5 files changed, 20 insertions(+)

diff --git a/TODO b/TODO
index fd0d47c17..fc7fe4cc3 100644
--- a/TODO
+++ b/TODO
@@ -70,3 +70,5 @@
     no way to issue a cancel when unsing the CLI - this would however
     be a Good Thing when used with mixed symkey/pubkey encrypted
     messages. See comment in mainproc.c:proc_symkey_enc. 
+
+  * Copy the manual from trunk and update the Makefile.
\ No newline at end of file
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 9b8349917..f92c0fd02 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-23  Werner Koch  <wk@g10code.com>
+
+	* gpg.c (main): New command --gpgconf-list.
+
 2006-10-06  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather
diff --git a/g10/gpg.c b/g10/gpg.c
index a3265239a..5c9a2b049 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -114,6 +114,7 @@ enum cmd_and_opt_values
     aLSignKey,
     aListConfig,
     aGPGConfList,
+    aGPGConfTest,
     aListPackets,
     aEditKey,
     aDeleteKeys,
@@ -420,6 +421,7 @@ static ARGPARSE_OPTS opts[] = {
 #endif
     { aListConfig, "list-config", 256, "@"},
     { aGPGConfList, "gpgconf-list", 256, "@" },
+    { aGPGConfTest, "gpgconf-test", 256, "@" },
     { aListPackets, "list-packets",256, "@"},
     { aExportOwnerTrust, "export-ownertrust", 256, "@"},
     { aImportOwnerTrust, "import-ownertrust", 256, "@"},
@@ -2011,6 +2013,7 @@ main (int argc, char **argv )
 	  case aCheckKeys: 
 	  case aListConfig:
           case aGPGConfList:
+          case aGPGConfTest:
 	  case aListPackets:
 	  case aImport: 
 	  case aFastImport: 
@@ -3185,6 +3188,9 @@ main (int argc, char **argv )
     if( opt.verbose > 1 )
 	set_packet_list_mode(1);
 
+    if (cmd == aGPGConfTest)
+      g10_exit(0);
+
     /* Add the keyrings, but not for some special commands and not in
        case of "-kvv userid keyring".  Also avoid adding the secret
        keyring for a couple of commands to avoid unneeded access in
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 692598fff..ae87f3a0d 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Werner Koch  <wk@g10code.com>
+
+	* w32installer.nsi: Don't uninstall winpt if the installer comes
+	without it.  I fixed it despite of what I said in bug 521.
+
 2006-09-13  Werner Koch  <wk@g10code.com>
 
 	* autogen.sh: Better detection of the cross compiler.
diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi
index 5a3266408..5a8c668c4 100644
--- a/scripts/w32installer.nsi
+++ b/scripts/w32installer.nsi
@@ -385,11 +385,14 @@ Section "Uninstall"
 
   Delete "$INSTDIR\gpgsplit.exe"
   Delete "$INSTDIR\gpgv.exe"
+
+!ifdef WITH_WINPT
   Delete "$INSTDIR\WinPT.exe"
   Delete "$INSTDIR\PTD.dll"
   Delete "$INSTDIR\Doc\README.winpt.txt"
   Delete "$INSTDIR\Doc\NEWS.winpt.txt"
   Delete "$INSTDIR\Doc\keyserver.conf"
+!endif
 
   Delete "$INSTDIR\Doc\gnupg.man"
   Delete "$INSTDIR\Doc\gpg.man"