[svn] GnuPG - r4315 - in branches/STABLE-BRANCH-1-4: . g10 scripts

[svn author wk]

Author: wk
Date: 2006-10-23 16:21:41 +0200 (Mon, 23 Oct 2006)
New Revision: 4315

Modified:
   branches/STABLE-BRANCH-1-4/TODO
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
   branches/STABLE-BRANCH-1-4/scripts/ChangeLog
   branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi
Log:
New command --gpgconf-test.


Modified: branches/STABLE-BRANCH-1-4/TODO
===================================================================
--- branches/STABLE-BRANCH-1-4/TODO	2006-10-23 14:02:13 UTC (rev 4314)
+++ branches/STABLE-BRANCH-1-4/TODO	2006-10-23 14:21:41 UTC (rev 4315)
@@ -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

Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-10-23 14:02:13 UTC (rev 4314)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-10-23 14:21:41 UTC (rev 4315)
@@ -1,3 +1,7 @@
+2006-10-23  Werner Koch  <wk at g10code.com>
+
+	* gpg.c (main): New command --gpgconf-list.
+
 2006-10-06  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2006-10-23 14:02:13 UTC (rev 4314)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2006-10-23 14:21:41 UTC (rev 4315)
@@ -114,6 +114,7 @@
     aLSignKey,
     aListConfig,
     aGPGConfList,
+    aGPGConfTest,
     aListPackets,
     aEditKey,
     aDeleteKeys,
@@ -420,6 +421,7 @@
 #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 @@
 	  case aCheckKeys: 
 	  case aListConfig:
           case aGPGConfList:
+          case aGPGConfTest:
 	  case aListPackets:
 	  case aImport: 
 	  case aFastImport: 
@@ -3185,6 +3188,9 @@
     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

Modified: branches/STABLE-BRANCH-1-4/scripts/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/ChangeLog	2006-10-23 14:02:13 UTC (rev 4314)
+++ branches/STABLE-BRANCH-1-4/scripts/ChangeLog	2006-10-23 14:21:41 UTC (rev 4315)
@@ -1,3 +1,8 @@
+2006-10-02  Werner Koch  <wk at 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 at g10code.com>
 
 	* autogen.sh: Better detection of the cross compiler.

Modified: branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi	2006-10-23 14:02:13 UTC (rev 4314)
+++ branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi	2006-10-23 14:21:41 UTC (rev 4315)
@@ -385,11 +385,14 @@
 
   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"