From 37714ea5a55680a635a84fd76c1a300118746fee Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 24 Mar 2022 22:30:03 +0000 Subject: [PATCH] gpgme: update to version 1.17.1 Remove backported patch which is now included in the upstream release. Signed-off-by: Daniel Golle (cherry picked from commit d7799595bd74992145172706b5e65f71658e0e63) --- libs/gpgme/Makefile | 6 ++--- ...001-Support-closefrom-also-for-glibc.patch | 27 ------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 libs/gpgme/patches/001-Support-closefrom-also-for-glibc.patch diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile index da26126808..ed3ec8cc9e 100644 --- a/libs/gpgme/Makefile +++ b/libs/gpgme/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpgme -PKG_VERSION:=1.16.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.17.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) -PKG_HASH:=6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0 +PKG_HASH:=711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-3.0-or-later diff --git a/libs/gpgme/patches/001-Support-closefrom-also-for-glibc.patch b/libs/gpgme/patches/001-Support-closefrom-also-for-glibc.patch deleted file mode 100644 index b4164ae202..0000000000 --- a/libs/gpgme/patches/001-Support-closefrom-also-for-glibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Jiri Kucera -Date: Sun, 25 Jul 2021 09:35:54 +0000 (+0200) -Subject: core: Support closefrom also for glibc. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e - -core: Support closefrom also for glibc. - -* src/posix-io.c (_gpgme_io_spawn): Use glibc's closefrom. --- - -Since 2.34, glibc introduces closefrom (the implementation -follows *BSD standard). - -Signed-off-by: Werner Koch ---- - ---- a/src/posix-io.c -+++ b/src/posix-io.c -@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char - if (fd_list[i].fd > fd) - fd = fd_list[i].fd; - fd++; --#if defined(__sun) || defined(__FreeBSD__) -+#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__) - closefrom (fd); - max_fds = fd; - #else /*!__sun */ -- 2.30.2