[Gpg4win-commits] r612 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-11-27 14:22:41 +0100 (Tue, 27 Nov 2007)
New Revision: 612

Added:
   trunk/src/dirmngr.conf
Modified:
   trunk/ChangeLog
   trunk/src/inst-dirmngr.nsi
Log:
2007-11-27  Marcus Brinkmann  <marcus at g10code.de>

	* src/dirmngr.conf: New file.
	* src/inst-dirmngr.nsi: Install our version of dirmngr.conf.
	Remove /nonfatal from configuration files.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-27 08:43:39 UTC (rev 611)
+++ trunk/ChangeLog	2007-11-27 13:22:41 UTC (rev 612)
@@ -1,3 +1,9 @@
+2007-11-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/dirmngr.conf: New file.
+	* src/inst-dirmngr.nsi: Install our version of dirmngr.conf.
+	Remove /nonfatal from configuration files.
+
 2007-11-27  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Update gnupg.

Added: trunk/src/dirmngr.conf
===================================================================
--- trunk/src/dirmngr.conf	2007-11-27 08:43:39 UTC (rev 611)
+++ trunk/src/dirmngr.conf	2007-11-27 13:22:41 UTC (rev 612)
@@ -0,0 +1,9 @@
+# Sample configuration file for dirmngr 
+
+# log-file C:\\dirmngr.log
+
+allow-ocsp
+
+ocsp-responder http://ocsp.nrca-ds.de:8080/ocsp-ocspresponder
+ocsp-signer bnetza-10r-ocsp.signer
+ocsp-current-period 86400

Modified: trunk/src/inst-dirmngr.nsi
===================================================================
--- trunk/src/inst-dirmngr.nsi	2007-11-27 08:43:39 UTC (rev 611)
+++ trunk/src/inst-dirmngr.nsi	2007-11-27 13:22:41 UTC (rev 612)
@@ -41,15 +41,18 @@
   File "${prefix}/bin/dirmngr-client.exe"
   File "${prefix}/libexec/dirmngr_ldap.exe"
 
-  SetOutPath "$INSTDIR\etc\dirmngr"
-
+  # Note: The make-msi.pl script ignores the following line and always
+  # installs the configuration files.
   ifFileExists "$INSTDIR\etc\dirmngr\dirmngr.conf" dirmngr_no_conf 0
-   File /nonfatal "${prefix}/share/doc/dirmngr/examples/dirmngr.conf"
-   File /nonfatal "${prefix}/share/doc/dirmngr/examples/bnetza-10r-ocsp.signer"
+   # Once we decide to install the conf files, we need all the example files.
+   SetOutPath "$INSTDIR\etc\dirmngr"
 
+   File "${SRCDIR}/dirmngr.conf"
+   File "${prefix}/share/doc/dirmngr/examples/bnetza-10r-ocsp.signer"
+
    SetOutPath "$INSTDIR\etc\dirmngr\trusted-certs"
-   File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
-   File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
+   File "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
+   File "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
 
   dirmngr_no_conf: