[Gpg4win-commits] r697 - in trunk: . include patches/gnupg2-2.0.8 po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 30 15:21:16 CET 2008
Author: werner
Date: 2008-01-30 15:21:14 +0100 (Wed, 30 Jan 2008)
New Revision: 697
Modified:
trunk/ChangeLog
trunk/include/config.nsi.in
trunk/patches/gnupg2-2.0.8/03-create-keyring.patch
trunk/po/ChangeLog
trunk/po/de.po
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.nsi
trunk/src/inst-gnupg2.nsi
trunk/src/inst-sections.nsi
Log:
GnuPG2 fixes.
Dependecy fixes for creating a gnupg only installer.
Tried to fix a gettext problem on the Welcome page - to no avail.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/ChangeLog 2008-01-30 14:21:14 UTC (rev 697)
@@ -1,3 +1,12 @@
+2008-01-30 Werner Koch <wk at g10code.com>
+
+ * src/inst-sections.nsi: Install GTK+ of gnupg2 is selected.
+
+ * src/inst-gnupg2.nsi: Switch Outpath back to standard.
+
+ * patches/gnupg2-2.0.8/patches/03-create-keyring.patch: Also do it
+ for the trustdb.
+
2008-01-29 Werner Koch <wk at g10code.com>
* packages/packages.current: Updated GpgOL.
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/include/config.nsi.in 2008-01-30 14:21:14 UTC (rev 697)
@@ -37,6 +37,8 @@
!define INSTALL "@INSTALL@"
!define WGET @WGET@
+!define DOSLF "\r\n"
+
# If debugging is desired.
@GPG4WIN_DEBUG@
Modified: trunk/patches/gnupg2-2.0.8/03-create-keyring.patch
===================================================================
--- trunk/patches/gnupg2-2.0.8/03-create-keyring.patch 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/patches/gnupg2-2.0.8/03-create-keyring.patch 2008-01-30 14:21:14 UTC (rev 697)
@@ -1,15 +1,18 @@
#! /bin/sh
-patch -p1 -f $* < $0
+patch -p0 -f $* < $0
exit $?
-2008-01-29 Werner Koch <wk at g10code.com>
+2008-01-30 Werner Koch <wk at g10code.com>
+ * tdbio.c (tdbio_set_dbname): Also test for forward slash.
* keydb.c (maybe_create_keyring): Take care of a missing slash.
(maybe_create_keyring) [W32]: Also test for forward slash.
---- gnug/g10/keydb.c (revision 4676)
-+++ gnupg/g10/keydb.c (working copy)
+Index: g10/keydb.c
+===================================================================
+--- g10/keydb.c (revision 4666)
++++ g10/keydb.c (working copy)
@@ -1,5 +1,6 @@
/* keydb.c - key database dispatcher
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -45,7 +48,12 @@
*last_slash_in_filename = 0;
if (access(filename, F_OK))
{
-@@ -115,9 +129,8 @@
+@@ -111,13 +125,12 @@
+ if (access (filename, F_OK))
+ {
+ rc = gpg_error_from_syserror ();
+- *last_slash_in_filename = DIRSEP_C;
++ *last_slash_in_filename = save_slash;
goto leave;
}
}
@@ -56,5 +64,35 @@
/* To avoid races with other instances of gpg trying to create or
update the keyring (it is removed during an update for a short
time), we do the next stuff in a locked state. */
-
-
+Index: g10/tdbio.c
+===================================================================
+--- g10/tdbio.c (revision 4666)
++++ g10/tdbio.c (working copy)
+@@ -505,14 +505,25 @@
+ int rc;
+ char *p = strrchr( fname, DIRSEP_C );
+ mode_t oldmask;
++ int save_slash;
+
+- assert(p);
++#if HAVE_W32_SYSTEM
++ {
++ /* Windows may either have a slash or a backslash. Take
++ care of it. */
++ char *pp = strrchr (fname, '/');
++ if (!p || pp > p)
++ p = pp;
++ }
++#endif /*HAVE_W32_SYSTEM*/
++ assert (p);
++ save_slash = *p;
+ *p = 0;
+ if( access( fname, F_OK ) ) {
+ try_make_homedir( fname );
+ log_fatal( _("%s: directory does not exist!\n"), fname );
+ }
+- *p = DIRSEP_C;
++ *p = save_slash;
+
+ xfree(db_name);
+ db_name = fname;
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/po/ChangeLog 2008-01-30 14:21:14 UTC (rev 697)
@@ -1,3 +1,7 @@
+2008-01-30 Werner Koch <wk at g10code.com>
+
+ * de.po: Fixed.
+
2008-01-16 Marcus Brinkmann <marcus at g10code.de>
* POTFILES.in: Add src/gpg4win.nsi and src/gpg4win-src.nsi.
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/po/de.po 2008-01-30 14:21:14 UTC (rev 697)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-01-29 11:51+0100\n"
-"PO-Revision-Date: 2008-01-16 00:51+0100\n"
+"POT-Creation-Date: 2008-01-30 14:26+0100\n"
+"PO-Revision-Date: 2008-01-30 14:28+0100\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -31,21 +31,16 @@
"GnuPG is GNU's tool for secure communication and data storage. It can be "
"used to encrypt data and to create digital signatures. It includes an "
"advanced key management facility and is compliant with the proposed OpenPGP "
-"Internet standard as described in RFC2440. \r\n"
-"\r\n"
-"$_CLICK \r\n"
-"\r\n"
-"\r\n"
-"\r\n"
-"\r\n"
-"This is Gpg4win version ${VERSION}\r\n"
-" file version ${PROD_VERSION}\r\n"
-" release date ${_BUILD_ISODATE}"
+"Internet standard as described in RFC2440. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}"
+"${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} "
+"file version ${PROD_VERSION}${DOSLF}${DOSLF} release date ${_BUILD_ISODATE}"
msgstr ""
"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
-"sowie zum sicheren Speichern von Daten. \\r\\n\\r\\n$_CLICK\n"
-"\\r\\n\\r\\n\\r\\n\\r\\n\\r\\nDies ist Gpg4win Version ${VERSION}\\r\\n\\\n"
-"Dateiversion ${PROD_VERSION}\\r\\n Releasedatum ${_BUILD_ISODATE}"
+"sowie zum sicheren Speichern von Daten. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}\n"
+"${DOSLF}${DOSLF}${DOSLF}${DOSLF}Dies ist Gpg4win Version ${VERSION}"
+"${DOSLF} \n"
+"Dateiversion ${PROD_VERSION}${DOSLF}\n"
+"Releasedatum ${_BUILD_ISODATE}"
#: src/gpg4win-src.nsi:71
msgctxt "T_WelcomeTitleGpg4winSrc"
@@ -58,22 +53,15 @@
"GnuPG is GNU's tool for secure communication and data storage. It can be "
"used to encrypt data and to create digital signatures. It includes an "
"advanced key management facility and is compliant with the proposed OpenPGP "
-"Internet standard as described in RFC2440. \r\n"
-"\r\n"
-"$_CLICK \r\n"
-"\r\n"
-"\r\n"
-"\r\n"
-"\r\n"
-"This is Gpg4win version ${VERSION}\r\n"
-"file version ${PROD_VERSION}\r\n"
-"release date ${_BUILD_ISODATE}"
+"Internet standard as described in RFC2440. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}"
+"${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} "
+"file version ${PROD_VERSION}${DOSLF}${DOSLF} release date ${_BUILD_ISODATE}"
msgstr ""
"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
-"sowie zum sicheren Speichern von Daten.\n"
-"\\r\\n\\r\\n$_CLICK\n"
-"\\r\\n\\r\\n\\r\\n\\r\\n\\r\\nDies ist Gpg4win Version ${VERSION}\\r\\n\n"
-"Dateiversion ${PROD_VERSION}\\r\\n\n"
+"sowie zum sicheren Speichern von Daten. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}\n"
+"${DOSLF}${DOSLF}${DOSLF}${DOSLF}Dies ist Gpg4win Version ${VERSION}"
+"${DOSLF} \n"
+"Dateiversion ${PROD_VERSION}${DOSLF}\n"
"Releasedatum ${_BUILD_ISODATE}"
#: src/installer.nsi:206
@@ -349,7 +337,7 @@
msgstr ""
"EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
-#: src/inst-gnupg2.nsi:110
+#: src/inst-gnupg2.nsi:115
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard with S/MIME support"
msgstr ""
@@ -538,3 +526,31 @@
"Das Schlüsselverwaltungsprogramm Windows Privacy Tray aufrufen. Dies ist "
"ein vielseitiges Programm zur Schlüsselverwaltung und Verschlüsselung. Es "
"installiert sich in die Startleiste."
+
+#~ msgctxt "T_AboutGpg4winSrc"
+#~ msgid ""
+#~ "GnuPG is GNU's tool for secure communication and data storage. It can be "
+#~ "used to encrypt data and to create digital signatures. It includes an "
+#~ "advanced key management facility and is compliant with the proposed "
+#~ "OpenPGP Internet standard as described in RFC2440. \r\n"
+#~ "\r\n"
+#~ "$_CLICK \r\n"
+#~ "\r\n"
+#~ "\r\n"
+#~ "\r\n"
+#~ "\r\n"
+#~ "This is Gpg4win version ${VERSION}\r\n"
+#~ "file version ${PROD_VERSION}\r\n"
+#~ "release date ${_BUILD_ISODATE}"
+#~ msgstr ""
+#~ "GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
+#~ "sowie zum sicheren Speichern von Daten. \r\n"
+#~ "\r\n"
+#~ "$_CLICK \r\n"
+#~ "\r\n"
+#~ "\r\n"
+#~ "\r\n"
+#~ "\r\n"
+#~ "Dies ist Gpg4win Version ${VERSION}\r\n"
+#~ "Dateiversion ${PROD_VERSION}\r\n"
+#~ "Releasedatum ${_BUILD_ISODATE}"
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/src/gpg4win-src.nsi 2008-01-30 14:21:14 UTC (rev 697)
@@ -77,9 +77,9 @@
It can be used to encrypt data and to create digital signatures. \
It includes an advanced key management facility and is compliant \
with the proposed OpenPGP Internet standard as described in RFC2440. \
- \r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n\
- file version ${PROD_VERSION}\r\n\
+ ${DOSLF}${DOSLF}$_CLICK \
+ ${DOSLF}${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} \
+ file version ${PROD_VERSION}${DOSLF}${DOSLF} \
release date ${_BUILD_ISODATE}"
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/src/gpg4win.nsi 2008-01-30 14:21:14 UTC (rev 697)
@@ -1,5 +1,5 @@
# gpg4win.nsi - Installer for GnuPG 4 Windows. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
#
# This file is part of GPG4Win.
#
@@ -140,9 +140,9 @@
It can be used to encrypt data and to create digital signatures. \
It includes an advanced key management facility and is compliant \
with the proposed OpenPGP Internet standard as described in RFC2440. \
- \r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n \
- file version ${PROD_VERSION}\r\n \
+ ${DOSLF}${DOSLF}$_CLICK \
+ ${DOSLF}${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} \
+ file version ${PROD_VERSION}${DOSLF}${DOSLF} \
release date ${_BUILD_ISODATE}"
# At long last, include all the translations.
Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/src/inst-gnupg2.nsi 2008-01-30 14:21:14 UTC (rev 697)
@@ -104,6 +104,11 @@
no_config_trustlist_txt:
no_config_gpg_conf_files:
+
+# Switch outpath back to standard so that the finish page can show the
+# README file. Fixme: We should have a final section to do this.
+ SetOutPath "$INSTDIR"
+
!endif
${MementoSectionEnd}
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2008-01-29 19:11:27 UTC (rev 696)
+++ trunk/src/inst-sections.nsi 2008-01-30 14:21:14 UTC (rev 697)
@@ -567,6 +567,11 @@
!insertmacro SelectSection ${SEC_zlib}
!insertmacro SelectSection ${SEC_pinentry}
!insertmacro SelectSection ${SEC_dirmngr}
+ # Because we need pinnetry, we also need to install GTK+
+ !insertmacro SelectSection ${SEC_zlib}
+ !insertmacro SelectSection ${SEC_gtk_}
+ !insertmacro SelectSection ${SEC_libpng}
+ !insertmacro SelectSection ${SEC_glib}
skip_gnupg2:
!endif
More information about the Gpg4win-commits
mailing list