pool/gpgme
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 910320 from home:pmonrealgonzalez:branches:Base:System

Browse Source 
- Fix build with glibc 2.34: [bsc#1189089]
  * Use glibc's closefrom.
  * Add gpgme-use-glibc-closefrom.patch

OBS-URL: https://build.opensuse.org/request/show/910320
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=134
This commit is contained in:
Pedro Monreal Gonzalez 2021-08-05 13:08:37 +00:00 committed by Git OBS Bridge
parent 660e7c44f3
commit b4d1c96df4
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gpgme-use-glibc-closefrom.patch Normal file
View File

@ -0,0 +1,32 @@
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 e712ef28..2a3a81fc 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 */
--
2.11.0

7
gpgme.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 5 10:29:27 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
- Fix build with glibc 2.34: [bsc#1189089]
* Use glibc's closefrom.
* Add gpgme-use-glibc-closefrom.patch
-------------------------------------------------------------------
Wed Jul 7 18:19:43 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>

5
gpgme.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gpgme
# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@ -45,6 +45,8 @@ Source3: gpgme.keyring
Source99: gpgme.changes
Patch0: gpgme-1.16.0-Use-after-free-in-t-edit-sign-test.patch
Patch1: gpgme-1.16.0-t-various-testSignKeyWithExpiration-32-bit.patch
# PATCH-FIX-UPSTREAM bsc#1189089 Use glibc's closefrom
Patch2: gpgme-use-glibc-closefrom.patch
BuildRequires: gcc-c++
BuildRequires: gpg2 >= 2.0.10
BuildRequires: libassuan-devel >= 2.4.2
@ -209,6 +211,7 @@ This package contains the bindings to use the library in Qt C++ applications.
%setup -q -n gpgme-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99})