Update to 1.17.0

Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
This commit is contained in:
yixiangzhike 2022-08-03 10:40:04 +08:00
parent bbe8fdfc1f
commit 9499fdddd4
4 changed files with 10 additions and 37 deletions

View File

@ -1,32 +0,0 @@
From 4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e Mon Sep 17 00:00:00 2001
From: Jiri Kucera <sanczes@gmail.com>
Date: Sun, 25 Jul 2021 11:35:54 +0200
Subject: [PATCH] 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 <wk@gnupg.org>
---
src/posix-io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/posix-io.c b/src/posix-io.c
index e712ef2..2a3a81f 100644
--- a/src/posix-io.c
+++ b/src/posix-io.c
@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
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 */
--
1.8.3.1

Binary file not shown.

BIN
gpgme-1.17.0.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,10 +1,10 @@
Name: gpgme
Version: 1.16.0
Release: 2
Version: 1.17.0
Release: 1
Summary: GnuPG Made Easy
License: GPLv2+ and LGPLv2+
URL: https://gnupg.org/related_software/gpgme/
Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2
# upstream patches
# Don't add extra libs/cflags in gpgme-config/cmake equivalent
@ -13,9 +13,8 @@ Patch0: 0001-don-t-add-extra-libraries-for-linking.patch
Patch1: gpgme-1.3.2-largefile.patch
# Let's fix stupid AX_PYTHON_DEVEL
Patch2: 0001-fix-stupid-ax_python_devel.patch
Patch3: backport-core-Support-closefrom-also-for-glibc.patch
# support python3.10
Patch4: gpgme-Add-support-for-building-with-Python3.10.patch
Patch3: gpgme-Add-support-for-building-with-Python3.10.patch
BuildRequires: autoconf automake gcc gcc-c++ gawk gnupg2 >= 2.2.24
BuildRequires: libgpg-error-devel >= 1.36 libassuan-devel >= 2.4.2
@ -152,6 +151,12 @@ fi
%changelog
* Wed Aug 3 2022 yixiangzhike <yixiangzhike007@163.com> - 1.17.0-1
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:update to 1.17.0
* Tue Jul 26 2022 yixiangzhike <yixiangzhike007@163.com> - 1.16.0-2
- Type:bugfix
- CVE:NA