[Gpg4win-commits] r1103 - in branches/gpg4win-1-branch: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Feb 17 16:40:07 CET 2009
Author: werner
Date: 2009-02-17 16:40:06 +0100 (Tue, 17 Feb 2009)
New Revision: 1103
Added:
branches/gpg4win-1-branch/src/dirmngr.conf
Modified:
branches/gpg4win-1-branch/ChangeLog
branches/gpg4win-1-branch/NEWS
branches/gpg4win-1-branch/configure.ac
branches/gpg4win-1-branch/packages/packages.current
branches/gpg4win-1-branch/src/Makefile.am
branches/gpg4win-1-branch/src/inst-dirmngr.nsi
branches/gpg4win-1-branch/src/inst-sections.nsi
branches/gpg4win-1-branch/src/uninst-dirmngr.nsi
branches/gpg4win-1-branch/src/uninst-gnupg.nsi
branches/gpg4win-1-branch/src/uninst-gnupg2.nsi
branches/gpg4win-1-branch/src/uninst-gpa.nsi
branches/gpg4win-1-branch/src/uninst-gpg4win.nsi
branches/gpg4win-1-branch/src/uninst-gpgme.nsi
Log:
Preparing 1.1.4.
Modified: branches/gpg4win-1-branch/ChangeLog
===================================================================
--- branches/gpg4win-1-branch/ChangeLog 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/ChangeLog 2009-02-17 15:40:06 UTC (rev 1103)
@@ -1,3 +1,20 @@
+2009-02-17 Werner Koch <wk at g10code.com>
+
+ Release 1.1.4.
+
+ * src/inst-sections.nsi: Change order of gnupg2 and dirmngr
+ installation.
+
+ * src/uninst-gnupg2.nsi: Take a nap after killing the agent.
+
+ * src/uninst-gpgme.nsi: Delete gpgme-w32spawn.
+
+ * src/inst-dirmngr.nsi: Update to matcyhncurrent dirmngr.
+ * src/dirmngr.conf: New.
+ * src/Makefile.am (EXTRA_DIST): Add dirmngr.conf.
+
+ * packages/packages.current: Update paperkey.
+
2009-02-10 Werner Koch <wk at g10code.com>
Release 1.1.4rc1.
Modified: branches/gpg4win-1-branch/NEWS
===================================================================
--- branches/gpg4win-1-branch/NEWS 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/NEWS 2009-02-17 15:40:06 UTC (rev 1103)
@@ -3,12 +3,18 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in version 1.1.4
+Noteworthy changes in version 1.1.4 (2009-02-17)
------------------------------------------------
-(en) Update GnuPG to 1.4.9 to solve problems on Windows Vista.
+(en) Updated GnuPG to 1.4.9 to solve problems on Windows Vista.
(de) GnuPG wurde auf 1.4.9 aktualisiert um Probleme unter Windws Vista zu lösen.
+(en) Updated the optional GnuPG-2 components.
+(de) Die optionalen GnuPG-2 Komponenten wurden aktualisert.
+
+(en) Included the Paperkey and Scute utilities.
+(de) Die Hilfsprogramme Paperkey und Scute sind jetzt enthalten.
+
~~~~~~~~~~~~~~~
GnuPG: 1.4.9
GnuPG2: 2.0.10
Modified: branches/gpg4win-1-branch/configure.ac
===================================================================
--- branches/gpg4win-1-branch/configure.ac 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/configure.ac 2009-02-17 15:40:06 UTC (rev 1103)
@@ -26,7 +26,7 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.1.4rc1])
+m4_define([my_version], [1.1.4])
m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
Modified: branches/gpg4win-1-branch/packages/packages.current
===================================================================
--- branches/gpg4win-1-branch/packages/packages.current 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/packages/packages.current 2009-02-17 15:40:06 UTC (rev 1103)
@@ -265,8 +265,8 @@
#
server http://www.jabberwocky.com/software/paperkey
-file paperkey-1.0.tar.gz
-chk ddb5fa5612df365ae0ba324ba307d3aa2e549981
+file paperkey-1.1.tar.gz
+chk 3953e853b8ee11ca476670e7f97e94a18bca83e3
#
Modified: branches/gpg4win-1-branch/src/Makefile.am
===================================================================
--- branches/gpg4win-1-branch/src/Makefile.am 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/Makefile.am 2009-02-17 15:40:06 UTC (rev 1103)
@@ -21,6 +21,7 @@
EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
installer-options.ini.in libiconv.def libintl.def loreley.mid \
gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
+ dirmngr.conf \
inst-sections.nsi installer.nsi installer-finish.nsi \
inst-gpg4win.nsi uninst-gpg4win.nsi \
inst-atk.nsi uninst-atk.nsi \
Added: branches/gpg4win-1-branch/src/dirmngr.conf
===================================================================
--- branches/gpg4win-1-branch/src/dirmngr.conf 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/dirmngr.conf 2009-02-17 15:40:06 UTC (rev 1103)
@@ -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: branches/gpg4win-1-branch/src/inst-dirmngr.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-dirmngr.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/inst-dirmngr.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -41,25 +41,23 @@
File "${prefix}/bin/dirmngr-client.exe"
File "${prefix}/libexec/dirmngr_ldap.exe"
- SetOutPath "$INSTDIR\etc\dirmngr"
+ # Create a directory for extra certs for documentation reasons.
+ SetShellVarContext all
+ SetOutPath "$APPDATA\GNU\lib\dirmngr\extra-certs"
- 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"
+ ifFileExists "$APPDATA\GNU\etc\dirmngr\dirmngr.conf" dirmngr_no_conf 0
+ SetOutPath "$APPDATA\GNU\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/*.crt"
-
+ SetOutPath "$APPDATA\GNU\etc\dirmngr\trusted-certs"
+ File "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
+ File "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
dirmngr_no_conf:
+ SetShellVarContext current
SetOutPath "$INSTDIR"
- # We need to create the cache directory, as this is not
- # automatically created by dirmngr. Actually, the default should be
- # different. FIXME.
- CreateDirectory "$INSTDIR\cache"
-
StrCmp $DirMngrStatus "MISSING" 0 dirmngr_created
# Create the service.
g4wihelp::service_create "DirMngr" "DirMngr" \
@@ -89,5 +87,20 @@
no_config_dirmngr_files:
+ # Try to delete certain trusted certificates installed by default
+ # with gpg4win 1.1.3. They are not useful at this location anymore.
+ # We only delete the certificates we know about and not just all of
+ # them.
+ Delete "$INSTDIR\etc\dirmngr"
+ Delete "$INSTDIR\etc\dirmngr\bnetza-10r-ocsp.signer"
+ Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"
+ Delete "$INSTDIR\etc\dirmngr\trusted-certs"
+ Delete "$INSTDIR\etc\dirmngr\trusted-certs\bnetza-10r-ca.crt"
+ Delete "$INSTDIR\etc\dirmngr\trusted-certs\README"
+ Delete "$INSTDIR\etc\dirmngr\trusted-certs\S-TRUSTQualifiedRootCA2008-001.final.v3.509.crt"
+ Delete "$INSTDIR\etc\dirmngr\trusted-certs\S-TRUSTQualifiedRootCA2008-002.final.v3.509.crt"
+ RMDir "$INSTDIR\etc\dirmngr"
+ RMDir "$INSTDIR\etc"
+
!endif
SectionEnd
Modified: branches/gpg4win-1-branch/src/inst-sections.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-sections.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/inst-sections.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -23,15 +23,16 @@
!include "inst-gpg4win.nsi"
+# Note: First install the libraries, then the applications. This is
+# required so that the uninstaller will first remove the application
+# and then the libraries.
+
!ifdef HAVE_PKG_ADNS
!include "inst-adns.nsi"
!endif
!ifdef HAVE_PKG_GNUPG
!include "inst-gnupg.nsi"
!endif
-!ifdef HAVE_PKG_GNUPG2
-!include "inst-gnupg2.nsi"
-!endif
!ifdef HAVE_PKG_PINENTRY
!include "inst-pinentry.nsi"
!endif
@@ -65,9 +66,6 @@
!ifdef HAVE_PKG_REGEX
!include "inst-regex.nsi"
!endif
-!ifdef HAVE_PKG_DIRMNGR
-!include "inst-dirmngr.nsi"
-!endif
!ifdef HAVE_PKG_PTHREADS_W32
!include "inst-pthreads-w32.nsi"
!endif
@@ -86,6 +84,12 @@
!ifdef HAVE_PKG_JPEG
!include "inst-jpeg.nsi"
!endif
+!ifdef HAVE_PKG_DIRMNGR
+!include "inst-dirmngr.nsi"
+!endif
+!ifdef HAVE_PKG_GNUPG2
+!include "inst-gnupg2.nsi"
+!endif
!ifdef HAVE_PKG_GPGOL
!include "inst-gpgol.nsi"
!endif
@@ -203,6 +207,12 @@
!ifdef HAVE_PKG_GPGOL
!include "uninst-gpgol.nsi"
!endif
+!ifdef HAVE_PKG_GNUPG2
+!include "uninst-gnupg2.nsi"
+!endif
+!ifdef HAVE_PKG_DIRMNGR
+!include "uninst-dirmngr.nsi"
+!endif
!ifdef HAVE_PKG_LIBPNG
!include "uninst-libpng.nsi"
!endif
@@ -221,9 +231,6 @@
!ifdef HAVE_PKG_PTHREADS_W32
!include "uninst-pthreads-w32.nsi"
!endif
-!ifdef HAVE_PKG_DIRMNGR
-!include "uninst-dirmngr.nsi"
-!endif
!ifdef HAVE_PKG_REGEX
!include "uninst-regex.nsi"
!endif
@@ -252,16 +259,13 @@
!include "uninst-w32pth.nsi"
!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
-# Note that the uninstaller of libgpg-error is supposed to remove the shareed
+# Note that the uninstaller of libgpg-error is supposed to remove the shared
# directories. We might want to move this to an extra section.
!include "uninst-libgpg-error.nsi"
!endif
!ifdef HAVE_PKG_PINENTRY
!include "uninst-pinentry.nsi"
!endif
-!ifdef HAVE_PKG_GNUPG2
-!include "uninst-gnupg2.nsi"
-!endif
!ifdef HAVE_PKG_GNUPG
!include "uninst-gnupg.nsi"
!endif
Modified: branches/gpg4win-1-branch/src/uninst-dirmngr.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-dirmngr.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/uninst-dirmngr.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -42,5 +42,6 @@
RMDir "$INSTDIR\cache"
RMDir "$INSTDIR"
+
!endif
SectionEnd
Modified: branches/gpg4win-1-branch/src/uninst-gnupg.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-gnupg.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/uninst-gnupg.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -59,11 +59,5 @@
Delete "$INSTDIR\gnupg.nls\de.mo"
RMDir "$INSTDIR\gnupg.nls"
- DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
-
- # Remove the public directory from the PATH
- Push "$INSTDIR\pub"
- Call un.RemoveFromPath
-
!endif
SectionEnd
Modified: branches/gpg4win-1-branch/src/uninst-gnupg2.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-gnupg2.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/uninst-gnupg2.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -31,12 +31,15 @@
Push "${gpg4win_pkg_gnupg2}"
Call un.SourceDelete
!else
+
# Try to stop a running agent. This is only for the admin but in
- # some cases that is actually useful.
+ # some cases that is actually useful. We sleep for awhile to give
+ # scdaemon a chance to commit suicide.
ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_u_gpg_connect_agent
ifFileExists "$INSTDIR\libgpg-error-0.dll" 0 no_u_gpg_connect_agent
ifFileExists "$INSTDIR\libw32pth-0.dll" 0 no_u_gpg_connect_agent
ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
+ Sleep 3000
no_u_gpg_connect_agent:
Delete "$INSTDIR\gpg2.exe"
Modified: branches/gpg4win-1-branch/src/uninst-gpa.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-gpa.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/uninst-gpa.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -32,8 +32,24 @@
!else
Delete "$INSTDIR\gpa.exe"
Delete "$INSTDIR\pub\gpa.exe"
+ RMDir "$INSTDIR\pub"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpa.mo"
+ RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\de"
+ Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gpa.mo"
+ RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ar"
+ Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gpa.mo"
+ RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\es"
+ Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gpa.mo"
+ RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\fr"
+ Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gpa.mo"
+ RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ru"
+ RMDir "$INSTDIR\share\locale"
Delete "$INSTDIR\share\gpa\gpa_tips.en"
Delete "$INSTDIR\share\gpa\gpa_tips.de"
Modified: branches/gpg4win-1-branch/src/uninst-gpg4win.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-gpg4win.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/uninst-gpg4win.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -24,6 +24,12 @@
Delete "gpg4win-${VERSION}.tar.bz2"
!else
+ DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
+
+ # Remove the public directory from the PATH
+ Push "$INSTDIR\pub"
+ Call un.RemoveFromPath
+
# Delete cruft from version prior to 0.8
Delete "$INSTDIR\share\eudoragpg\eudoragpg.html"
RMDir "$INSTDIR\share\eudoragpg"
@@ -38,6 +44,7 @@
RMDir "$INSTDIR\share\gpg4win"
# Try to remove other top directories.
+ RMDir "$INSTDIR\pub"
RMDir "$INSTDIR\lib"
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
Modified: branches/gpg4win-1-branch/src/uninst-gpgme.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-gpgme.nsi 2009-02-16 18:51:37 UTC (rev 1102)
+++ branches/gpg4win-1-branch/src/uninst-gpgme.nsi 2009-02-17 15:40:06 UTC (rev 1103)
@@ -33,6 +33,7 @@
Delete "$INSTDIR\libgpgme-11.dll"
Delete "$INSTDIR\libgpgme-glib-11.dll"
Delete "$INSTDIR\libgpgme-qt-11.dll"
+ Delete "$INSTDIR\gpgme-w32spawn.exe"
RMDir "$INSTDIR"
!endif
SectionEnd
More information about the Gpg4win-commits
mailing list