[Gpg4win-commits] r195 - in trunk: . patches/gpa-0.7.2

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-03-03 16:35:53 +0100 (Fri, 03 Mar 2006)
New Revision: 195

Added:
   trunk/patches/gpa-0.7.2/01-keyserver-list.patch
Removed:
   trunk/patches/gpa-0.7.2/01-bin-open.patch
Modified:
   trunk/ChangeLog
Log:
2006-03-03  Marcus Brinkmann  <marcus at g10code.de>

	* patches/gpa-0.7.2/01-bin-open.patch: Rename to ...
	* patches/gpa-0.7.2/01-keyserver-list.patch: ... this.  Remove
	binary open patch.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-03-03 15:32:05 UTC (rev 194)
+++ trunk/ChangeLog	2006-03-03 15:35:53 UTC (rev 195)
@@ -1,5 +1,9 @@
 2006-03-03  Marcus Brinkmann  <marcus at g10code.de>
 
+	* patches/gpa-0.7.2/01-bin-open.patch: Rename to ...
+	* patches/gpa-0.7.2/01-keyserver-list.patch: ... this.  Remove
+	binary open patch.
+
 	* packages/packages.current: Use GPA 0.7.2.
 
 	* packages/packages.current: Use libgpg-error 1.2 and GPGME 1.2.

Deleted: trunk/patches/gpa-0.7.2/01-bin-open.patch
===================================================================
--- trunk/patches/gpa-0.7.2/01-bin-open.patch	2006-03-03 15:32:05 UTC (rev 194)
+++ trunk/patches/gpa-0.7.2/01-bin-open.patch	2006-03-03 15:35:53 UTC (rev 195)
@@ -1,71 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Use binary open mode for files. 
-Fix keyserver list.
-
-
-2006-02-15  Werner Koch  <wk at g10code.com>
-
-       * Fixed typo in keyserver list.
-
-2006-02-14  Marcus Brinkmann  <marcus at g10code.de>
-
-       * gpgmetools.c (O_BINARY): Define if it isn't defined by system
-       headers.
-       (gpa_open_output): Use open() instead of creat() and set binary
-       mode.
-       (gpa_open_input): Set binary mode.
-
-
-
-Index: src/gpgmetools.c
-===================================================================
---- src/gpgmetools.c    (revision 738)
-+++ src/gpgmetools.c    (working copy)
-@@ -43,6 +43,12 @@
- #include <windows.h>
- #endif
- 
-+#ifndef O_BINARY
-+#ifdef _O_BINARY
-+#define O_BINARY       _O_BINARY
-+#else
-+#define O_BINARY       0
-+#endif
- 
- /* Report an unexpected error in GPGME and quit the application.  */
- void
-@@ -176,7 +182,7 @@
-     {
-       gpg_error_t err;
- 
--      target = creat (filename, 0666);
-+      target = open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
-       if (target == -1)
-        {
-          gchar *message;
-@@ -202,7 +208,7 @@
-   gpg_error_t err;
-   int target = -1;
- 
--  target = open (filename, O_RDONLY);
-+  target = open (filename, O_RDONLY | O_BINARY);
-   if (target == -1)
-     {
-       gchar *message;
-Index: src/keyserver.c
-===================================================================
---- src/keyserver.c     (revision 739)
-+++ src/keyserver.c     (working copy)
-@@ -169,7 +169,7 @@
-       add_server (&serverlist, "hkp://random.sks.keyserver.penguin.de");
-       add_server (&serverlist, "hkp://blackhole.pca.dfn.de"); 
-       add_server (&serverlist, "hkp://pks.gpg.cz");
--      add_server (&serverlist, "hpk://pgp.cns.ualberta.ca");
-+      add_server (&serverlist, "hkp://pgp.cns.ualberta.ca");
-       add_server (&serverlist, "hkp://minsky.surfnet.nl");
-       add_server (&serverlist, "hkp://keyserver.ubuntu.com");
-       add_server (&serverlist, "hkp://keyserver.pramberger.at");
-

Copied: trunk/patches/gpa-0.7.2/01-keyserver-list.patch (from rev 194, trunk/patches/gpa-0.7.2/01-bin-open.patch)
===================================================================
--- trunk/patches/gpa-0.7.2/01-bin-open.patch	2006-03-03 15:32:05 UTC (rev 194)
+++ trunk/patches/gpa-0.7.2/01-keyserver-list.patch	2006-03-03 15:35:53 UTC (rev 195)
@@ -0,0 +1,26 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Fix keyserver list.
+
+
+2006-02-15  Werner Koch  <wk at g10code.com>
+
+       * Fixed typo in keyserver list.
+
+
+Index: src/keyserver.c
+===================================================================
+--- src/keyserver.c     (revision 739)
++++ src/keyserver.c     (working copy)
+@@ -169,7 +169,7 @@
+       add_server (&serverlist, "hkp://random.sks.keyserver.penguin.de");
+       add_server (&serverlist, "hkp://blackhole.pca.dfn.de"); 
+       add_server (&serverlist, "hkp://pks.gpg.cz");
+-      add_server (&serverlist, "hpk://pgp.cns.ualberta.ca");
++      add_server (&serverlist, "hkp://pgp.cns.ualberta.ca");
+       add_server (&serverlist, "hkp://minsky.surfnet.nl");
+       add_server (&serverlist, "hkp://keyserver.ubuntu.com");
+       add_server (&serverlist, "hkp://keyserver.pramberger.at");
+