[Gpg4win-commits] r1629 - in trunk: . packages patches/gpgme
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 2 17:28:10 CET 2011
Author: marcus
Date: 2011-02-02 17:28:09 +0100 (Wed, 02 Feb 2011)
New Revision: 1629
Removed:
trunk/patches/gpgme/02-w32-io-threads.patch
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/packages/packages.current
Log:
Update libassuan and gpgme.
2011-02-02 Marcus Brinkmann <marcus at g10code.com>
* packages/packages.current: Update libassuan and gpgme.
* Makefile.am (EXTRA_DIST): Remove
patches/gpgme/02-w32-io-threads.patch.
* patches/gpgme/02-w32-io-threads.patch: Removed.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-02-01 14:28:02 UTC (rev 1628)
+++ trunk/ChangeLog 2011-02-02 16:28:09 UTC (rev 1629)
@@ -1,3 +1,10 @@
+2011-02-02 Marcus Brinkmann <marcus at g10code.com>
+
+ * packages/packages.current: Update libassuan and gpgme.
+ * Makefile.am (EXTRA_DIST): Remove
+ patches/gpgme/02-w32-io-threads.patch.
+ * patches/gpgme/02-w32-io-threads.patch: Removed.
+
2011-02-01 Emanuel Schuetze <emanuel at intevation.de>
* src/inst-sections.nsi: Fix wrong desktop/startmenu shortcut
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2011-02-01 14:28:02 UTC (rev 1628)
+++ trunk/Makefile.am 2011-02-02 16:28:09 UTC (rev 1629)
@@ -30,7 +30,6 @@
patches/glib-2.20.0/01-socket.patch \
patches/glib-2.24.0/01-socket.patch \
patches/gpgme/01-gpg2.patch \
- patches/gpgme/02-w32-io-threads.patch \
patches/gpgme-1.1.7/01-registry.patch \
patches/gpgme-1.1.7/02-extern-umlaute.patch \
patches/gpgme-1.1.7/03-error-parsing.patch \
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2011-02-01 14:28:02 UTC (rev 1628)
+++ trunk/packages/packages.current 2011-02-02 16:28:09 UTC (rev 1629)
@@ -338,9 +338,6 @@
file libgcrypt/libgcrypt-1.4.6.tar.bz2
chk 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6
-file libassuan/libassuan-2.0.1.tar.bz2
-chk b7e9dbd41769cc20b1fb7db9f2ecdf276ffc352c
-
name gnupg2-2.0.17.tar.bz2
file gnupg/gnupg-2.0.17.tar.bz2
chk 41ef5460417ca0a1131fc730849fe3afd49ad2de
@@ -357,9 +354,12 @@
# (Snapshots)
server ftp://ftp.g10code.com/g10code/scratch
-file gpgme-1.3.1-svn1460.tar.bz2
-chk a309ae1880c84bf7d76fea7186b3247ee70b1693
+file libassuan-2.0.2-gita7e76c4.tar.bz2
+chk 54196e0301393a8e942ba1890834d84b
+file gpgme-1.3.1-git129741d.tar.bz2
+chk 9aeb7286985d558b4958d2c9f3860098
+
file libgpg-error-1.10-svn249.tar.bz2
chk 71c16e8475dc3a75ac58f2b80eae6ec2a2a7e4a1
Deleted: trunk/patches/gpgme/02-w32-io-threads.patch
===================================================================
--- trunk/patches/gpgme/02-w32-io-threads.patch 2011-02-01 14:28:02 UTC (rev 1628)
+++ trunk/patches/gpgme/02-w32-io-threads.patch 2011-02-02 16:28:09 UTC (rev 1629)
@@ -1,136 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Revert a change that needs more testing.
-
-diff -rup src/w32-io.c src/w32-io.c
---- src/w32-io.c 2009-06-21 00:55:40.000000000 +0200
-+++ src/w32-io.c 2009-06-21 00:56:01.000000000 +0200
-@@ -389,12 +389,9 @@ find_reader (int fd, int start_it)
- if (i != reader_table_size)
- {
- rd = create_reader (fd_to_handle (fd));
-- if (rd)
-- {
-- reader_table[i].fd = fd;
-- reader_table[i].context = rd;
-- reader_table[i].used = 1;
-- }
-+ reader_table[i].fd = fd;
-+ reader_table[i].context = rd;
-+ reader_table[i].used = 1;
- }
-
- UNLOCK (reader_table_lock);
-@@ -695,12 +692,9 @@ find_writer (int fd, int start_it)
- if (i != writer_table_size)
- {
- wt = create_writer (fd_to_handle (fd));
-- if (wt)
-- {
-- writer_table[i].fd = fd;
-- writer_table[i].context = wt;
-- writer_table[i].used = 1;
-- }
-+ writer_table[i].fd = fd;
-+ writer_table[i].context = wt;
-+ writer_table[i].used = 1;
- }
-
- UNLOCK (writer_table_lock);
-@@ -739,7 +733,7 @@ _gpgme_io_write (int fd, const void *buf
- if (count == 0)
- return TRACE_SYSRES (0);
-
-- ctx = find_writer (fd, 0);
-+ ctx = find_writer (fd, 1);
- if (!ctx)
- return TRACE_SYSRES (-1);
-
-@@ -832,7 +826,6 @@ _gpgme_io_pipe (int filedes[2], int inhe
- /* Make one end inheritable. */
- if (inherit_idx == 0)
- {
-- struct writer_context_s *ctx;
- HANDLE hd;
- if (!DuplicateHandle (GetCurrentProcess(), rh,
- GetCurrentProcess(), &hd, 0,
-@@ -848,22 +841,9 @@ _gpgme_io_pipe (int filedes[2], int inhe
- }
- CloseHandle (rh);
- rh = hd;
--
-- ctx = find_writer (handle_to_fd (wh), 0);
-- assert (ctx == NULL);
-- ctx = find_writer (handle_to_fd (wh), 1);
-- if (!ctx)
-- {
-- CloseHandle (rh);
-- CloseHandle (wh);
-- /* FIXME: Should translate the error code. */
-- errno = EIO;
-- return TRACE_SYSRES (-1);
-- }
- }
- else if (inherit_idx == 1)
- {
-- struct reader_context_s *ctx;
- HANDLE hd;
- if (!DuplicateHandle( GetCurrentProcess(), wh,
- GetCurrentProcess(), &hd, 0,
-@@ -879,18 +859,6 @@ _gpgme_io_pipe (int filedes[2], int inhe
- }
- CloseHandle (wh);
- wh = hd;
--
-- ctx = find_reader (handle_to_fd (rh), 0);
-- assert (ctx == NULL);
-- ctx = find_reader (handle_to_fd (rh), 1);
-- if (!ctx)
-- {
-- CloseHandle (rh);
-- CloseHandle (wh);
-- /* FIXME: Should translate the error code. */
-- errno = EIO;
-- return TRACE_SYSRES (-1);
-- }
- }
-
- filedes[0] = handle_to_fd (rh);
-@@ -1280,7 +1248,7 @@ _gpgme_io_select (struct io_select_fd_s
- {
- if (fds[i].for_read)
- {
-- struct reader_context_s *ctx = find_reader (fds[i].fd,0);
-+ struct reader_context_s *ctx = find_reader (fds[i].fd,1);
-
- if (!ctx)
- TRACE_LOG1 ("error: no reader for FD 0x%x (ignored)",
-@@ -1303,7 +1271,7 @@ _gpgme_io_select (struct io_select_fd_s
- }
- else if (fds[i].for_write)
- {
-- struct writer_context_s *ctx = find_writer (fds[i].fd,0);
-+ struct writer_context_s *ctx = find_writer (fds[i].fd,1);
-
- if (!ctx)
- TRACE_LOG1 ("error: no writer for FD 0x%x (ignored)",
-@@ -1449,7 +1417,7 @@ _gpgme_io_dup (int fd)
- return TRACE_SYSRES (-1);
- }
-
-- rd_ctx = find_reader (fd, 0);
-+ rd_ctx = find_reader (fd, 1);
- if (rd_ctx)
- {
- /* No need for locking, as the only races are against the reader
-@@ -1468,7 +1436,7 @@ _gpgme_io_dup (int fd)
- UNLOCK (reader_table_lock);
- }
-
-- wt_ctx = find_writer (fd, 0);
-+ wt_ctx = find_writer (fd, 1);
- if (wt_ctx)
- {
- /* No need for locking, as the only races are against the writer
More information about the Gpg4win-commits
mailing list