[Gpg4win-commits] r836 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Jun 26 23:36:38 CEST 2008
Author: werner
Date: 2008-06-26 23:36:38 +0200 (Thu, 26 Jun 2008)
New Revision: 836
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/packages/packages.current
trunk/src/inst-dirmngr.nsi
trunk/src/inst-gnupg2.nsi
trunk/src/uninst-dirmngr.nsi
trunk/src/uninst-gnupg2.nsi
Log:
Updated packages
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/ChangeLog 2008-06-26 21:36:38 UTC (rev 836)
@@ -1,3 +1,8 @@
+2008-06-26 Werner Koch <wk at g10code.com>
+
+ * packages/packages.current: Update gpa, gpgol, gpgme, kdelibs and
+ kleopatra.
+
2008-06-25 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Update gpgme.
@@ -4,6 +9,18 @@
* src/inst-gpgme.nsi: Install gpgme-w32spawn.exe.
* src/uninst-gpgme.nsi: Uninstall it.
+2008-06-19 Werner Koch <wk at g10code.com>
+
+ * src/inst-gnupg2.nsi: Rename the section to just gnupg.
+ * src/uninst-gnupg2.nsi: Ditto.
+
+2008-06-16 Werner Koch <wk at g10code.com>
+
+ * src/inst-gnupg2.nsi: Move installation of gpgconf-conf.skel to
+ COMMON_APPDATA. Try to stop gpg-agent first.
+ * src/inst-dirmngr.nsi: Likewise.
+ * src/uninst-gnupg2.nsi: Try to stop a running gpg-agent first.
+
2008-06-05 Werner Koch <wk at g10code.com>
* src/uninst-libetpan.nsi: Remove libetpan-13.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/NEWS 2008-06-26 21:36:38 UTC (rev 836)
@@ -11,13 +11,19 @@
(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
Diese Version soll nicht in einer Produktivumgebung
eingesetzt werden.
+(en) Global configuration is now stored below CSIDL_COMMON_APPDATA\GNU
+ and not anymore below the installation directory. Similar to
+ user setttings, these configuration files are not removed or
+ overwritten during an uninstall or an reinstall.
+
+
~~~~~~~~~~~~~~~
GnuPG: 2.0.10-svn4773
DirMngr: 1.0.2-svn299
Kleopatra: 20080526-2
-GPA: 0.7.7-svn897
-GpgOL: 0.10.14
+GPA: 0.7.7-svn899
+GpgOL: 0.10.15-svn260
GpgEX: 0.9.0
Claws-Mail: 3.4.0
Novices: 1.0.0
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/packages/packages.current 2008-06-26 21:36:38 UTC (rev 836)
@@ -229,12 +229,14 @@
#
# GpgOL
#
-server ftp://ftp.g10code.com/g10code/gpgol/alpha
+#server ftp://ftp.g10code.com/g10code/gpgol/alpha
-file gpgol-0.10.14.tar.bz2
-chk 79a44c9b4eb6ca996ef26659255e4dd86af03b80
+#file gpgol-0.10.14.tar.bz2
+#chk 79a44c9b4eb6ca996ef26659255e4dd86af03b80
+server ftp://ftp.g10code.com/g10code/scratch
+file gpgol-0.10.15-svn260.tar.bz2
+chk 4449a5c004fc38a45c57a6c96c04ed5d2db6dcbb
-
#
# GpgEX
#
@@ -294,13 +296,12 @@
file gnupg-2.0.10-svn4773.tar.bz2
chk 6040e890f4383700b7459b02f94381c31a663813
-file dirmngr-1.0.2-svn299.tar.bz2
-chk 53547434d5a2de17891a68ef8cbfdd450833a6e7
+file dirmngr-1.0.2-XXXXX.tar.bz2
+chk
-file gpgme-1.1.7-svn1321.tar.bz2
-chk d0fe53b17270512e3669d1d2b6a1ebcf8d8bf894
+file gpgme-1.1.7-svn1322.tar.bz2
+chk 353773b96e783bafd10f9bcd66831f8423838964
-
#
# adns
#
@@ -319,8 +320,8 @@
#chk bb9182cd4c6bd6677ba9cdcca262dcc1b1d22c3c
server ftp://ftp.g10code.com/g10code/scratch
-file gpa-0.7.7-svn897.tar.bz2
-chk 712f829ae5f5c44665371ace1810ab95fa646f39
+file gpa-0.7.7-svn899.tar.bz2
+chk 98b95913307da43cc34447223e84247753b7e4b4
#
@@ -375,25 +376,24 @@
server ftp://ftp.kdab.net/pub/gpg4win
-name kdelibs-20080526-2-bin.zip
-file kdelibs-for-kleo-20080526-2-bin.zip
-chk 1380ab5075f1fca903cb073552fabc7107582a43
+name kdelibs-20080625-bin.zip
+file kdelibs-for-kleo-20080625-bin.zip
+chk 17dc52abcbcd454857e0768e86f62db6aadec096
-name kdelibs-20080526-2-lib.zip
-file kdelibs-for-kleo-20080526-2-dev.zip
-chk 5cb519634735479ec7138fa0324ac5ec82371a2a
+name kdelibs-20080625-lib.zip
+file kdelibs-for-kleo-20080625-dev.zip
+chk 076d83746bd4db2f4719899ca0cdd723df418ddf
-name kdelibs-20080526-2-src.zip
-file kdelibs-for-kleo-20080526-2-src.zip
-chk d8ea0b5558fc56d8320368d0c671b28a2e93a00f
+name kdelibs-20080625-src.zip
+file kdelibs-for-kleo-20080625-src.zip
+chk 990eb139dece3a8dc0d3837f9c919c17c5c19b74
-
# Kleopatra
server ftp://ftp.kdab.net/pub/gpg4win
-file kleopatra-20080526-2-bin.zip
-chk 606d1f8f4ec30c3e8df254effd7ac3ecb6f4ce6a
+file kleopatra-20080625-bin.zip
+chk f7f9b7fdcef901a4455fc399085f7770783b4181
-file kleopatra-20080526-2-src.zip
-chk 7b1cc5a7bb1e397ae928b09d4bec0799c6f2a4fe
+file kleopatra-20080625-src.zip
+chk 796abb71a32b71b28192f975c030fb9dfe91b907
\ No newline at end of file
Modified: trunk/src/inst-dirmngr.nsi
===================================================================
--- trunk/src/inst-dirmngr.nsi 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/src/inst-dirmngr.nsi 2008-06-26 21:36:38 UTC (rev 836)
@@ -42,21 +42,23 @@
File "${prefix}/libexec/dirmngr_ldap.exe"
# Create a directory for extra certs for documentation reasons.
- SetOutPath "$INSTDIR\lib\dirmngr\extra-certs"
+ SetShellVarContext all
+ SetOutPath "$APPDATA\GNU\lib\dirmngr\extra-certs"
# Note: The make-msi.pl script ignores the following line, which is
# ok, because the Windows installer does not override locally
# modified files.
- ifFileExists "$INSTDIR\etc\dirmngr\dirmngr.conf" dirmngr_no_conf 0
- SetOutPath "$INSTDIR\etc\dirmngr"
+ 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"
+ 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"
@@ -73,6 +75,7 @@
g4wihelp::service_start "DirMngr" 0
# If requested, install the configuration files.
+ # Fixme: I don't think that is right (wk)!
ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
StrCmp $0 "" no_config_dirmngr_files
CreateDirectory "$0\gnupg"
Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/src/inst-gnupg2.nsi 2008-06-26 21:36:38 UTC (rev 836)
@@ -26,7 +26,7 @@
!define source ${bpdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
-${MementoSection} "GnuPG2" SEC_gnupg2
+${MementoSection} "GnuPG" SEC_gnupg2
SectionIn RO
SetOutPath "$INSTDIR"
@@ -41,6 +41,11 @@
# it like we did with gpg. It might be better to install this tool
# into a subdirectory.
+ # If we are reinstalling, try to kill a possible running agent
+ ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_gpg_connect_agent
+ ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
+ no_gpg_connect_agent:
+
ClearErrors
SetOverwrite try
File "${prefix}/bin/gpg-agent.exe"
@@ -103,9 +108,11 @@
SetOutPath "$INSTDIR\gnupg2.nls"
File /nonfatal "${prefix}/share/gnupg/*.mo"
-
- SetOutPath "$INSTDIR\etc\gnupg"
+ # Always install the new template into COMMON_APPDATA folder.
+ SetShellVarContext all
+ SetOutPath "$APPDATA\GNU\etc\gnupg"
File /oname=gpgconf-conf.skel "${source}/doc/examples/gpgconf.conf"
+ SetShellVarContext current
# If requested, install the configuration files.
Modified: trunk/src/uninst-dirmngr.nsi
===================================================================
--- trunk/src/uninst-dirmngr.nsi 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/src/uninst-dirmngr.nsi 2008-06-26 21:36:38 UTC (rev 836)
@@ -41,12 +41,14 @@
Delete "$INSTDIR\dirmngr_ldap.exe"
RMDir "$INSTDIR\cache"
- # Remove the extra-certs directory. Obviously this works only if the
- # user has not populated it.
+ # The next thing is only to cleanup cruft from versions < 1.9.3.
+ # Newer versions install them into COMMON_APPDATA and they are not
+ # removed on purpose. Remove the extra-certs directory. Obviously
+ # this works only if the user has not populated it.
RMDir "$INSTDIR\lib\dirmngr\extra-certs"
RMDir "$INSTDIR\lib\dirmngr"
- # Remove etc files.
+ # Remove etc files. This is only useful for installer < 1.9.3.
Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"
Delete "$INSTDIR\etc\dirmngr\bnetza-10r-ocsp.signer"
Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi 2008-06-26 10:46:58 UTC (rev 835)
+++ trunk/src/uninst-gnupg2.nsi 2008-06-26 21:36:38 UTC (rev 836)
@@ -26,11 +26,17 @@
# Uninstaller section.
-Section "-un.gnupg2"
+Section "-un.gnupg"
!ifdef SOURCES
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
+ ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_u_gpg_connect_agent
+ ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
+ no_u_gpg_connect_agent:
+
Delete "$INSTDIR\gpg2.exe"
Delete "$INSTDIR\gpgv2.exe"
Delete "$INSTDIR\gpgsm.exe"
@@ -63,6 +69,8 @@
RMDir "$INSTDIR\share\gnupg"
RMDir "$INSTDIR\share"
+ # This file is not anymore used but was used by older versions
+ # (prior to 1.9.3 - always remove it.
Delete "$INSTDIR\etc\gnupg\gpgconf-conf.skel"
RMDir "$INSTDIR\etc\gnupg"
RMDir "$INSTDIR\etc"
More information about the Gpg4win-commits
mailing list