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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-08-24 08:05:24 +0200 (Fri, 24 Aug 2007)
New Revision: 498

Modified:
   trunk/ChangeLog
   trunk/src/inst-dirmngr.nsi
Log:
Updated libassuan


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-23 09:24:18 UTC (rev 497)
+++ trunk/ChangeLog	2007-08-24 06:05:24 UTC (rev 498)
@@ -1,3 +1,12 @@
+2007-08-24  Werner Koch  <wk at g10code.com>
+
+	* packages/packages.current: Updated libassuan to 1.0.3.
+
+2007-08-23  Werner Koch  <wk at g10code.com>
+
+	* src/inst-dirmngr.nsi: Install examples files as default
+	configuration.
+
 2007-08-20  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Add bzip2.

Modified: trunk/src/inst-dirmngr.nsi
===================================================================
--- trunk/src/inst-dirmngr.nsi	2007-08-23 09:24:18 UTC (rev 497)
+++ trunk/src/inst-dirmngr.nsi	2007-08-24 06:05:24 UTC (rev 498)
@@ -41,6 +41,20 @@
   File "${prefix}/bin/dirmngr-client.exe"
   File "${prefix}/libexec/dirmngr_ldap.exe"
 
+  SetOutPath "$INSTDIR\etc\dirmngr"
+
+  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"
+
+   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/*.crt"
+
+  dirmngr_no_conf:
+
+  SetOutPath "$INSTDIR"
+
   # We need to create the cache directory, as this is not
   # automatically created by dirmngr.  Actually, the default should be
   # different.  FIXME.