From 62686b56da19b3a7184dc342cede5c9d20d150d7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 5 Nov 2018 08:59:13 +0100 Subject: [PATCH] speedo: Include Windows patch for gpgme 1.12.0 -- We don't want to do a release of gpgme right now, so we include just this minimal but important fix. --- Makefile.am | 1 + build-aux/speedo/patches/gpgme-1.12.0.patch | 36 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100755 build-aux/speedo/patches/gpgme-1.12.0.patch diff --git a/Makefile.am b/Makefile.am index 680fe1be1..2c7a46249 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \ build-aux/speedo/patches/atk-1.32.0.patch \ build-aux/speedo/patches/libiconv-1.14.patch \ build-aux/speedo/patches/pango-1.29.4.patch \ + build-aux/speedo/patches/gpgme-1.12.0.patch \ build-aux/speedo/patches/sqlite.patch diff --git a/build-aux/speedo/patches/gpgme-1.12.0.patch b/build-aux/speedo/patches/gpgme-1.12.0.patch new file mode 100755 index 000000000..1920dcf60 --- /dev/null +++ b/build-aux/speedo/patches/gpgme-1.12.0.patch @@ -0,0 +1,36 @@ +#! /bin/sh +patch -p1 -l -f $* < $0 +exit $? + + From 4faa0ccf58c7a0f64f51dcbc8466add660080414 Mon Sep 17 00:00:00 2001 + From: Werner Koch + Date: Fri, 2 Nov 2018 11:26:19 +0100 + Subject: [PATCH] w32: Don't use CloseHandle on an arbitrary integer. + + * src/assuan-support.c (my_waitpid): Do not close the PID = it is not + a handle. + -- + + At some time in the distant past we might have used the process object + as pid which obviously required a close. However this was changed and + so what we did here was to close an arbitrary handle (one which + matches the pid). + + GnuPG-bug-id: 4237 + Signed-off-by: Werner Koch + +diff --git a/src/assuan-support.c b/src/assuan-support.c +index 7fbd48a8..705088e4 100644 +--- a/src/assuan-support.c ++++ b/src/assuan-support.c +@@ -219,7 +219,7 @@ my_waitpid (assuan_context_t ctx, pid_t pid, + (void)nowait; + (void)status; + (void)options; +- CloseHandle ((HANDLE) pid); ++ (void)pid; /* Just a number without a kernel object. */ + #else + /* We can't just release the PID, a waitpid is mandatory. But + NOWAIT in POSIX systems just means the caller already did the +-- +2.11.0