From 0d81f0a8a5c3f2072ab1572ba50d8aa58cc410ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=B7=A6=E6=B8=85?= Date: Mon, 18 Mar 2024 08:25:15 +0000 Subject: [PATCH] =?UTF-8?q?!1=20rv64g=E6=9E=B6=E6=9E=84=20=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99=20libc6-dev=20=E5=8D=87=E7=BA=A72.3?= =?UTF-8?q?6=E5=90=8E=20closefrom=E5=87=BD=E6=95=B0=E6=8A=A5=E9=94=99=20Me?= =?UTF-8?q?rge=20pull=20request=20!1=20from=20=E6=99=AF=E9=9B=85=E8=8C=B9/?= =?UTF-8?q?openkylin/yangtze?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 +++++ ...009-1-rv64g-libc6-dev-2.36-closefrom.patch | 23 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 30 insertions(+) create mode 100644 debian/patches/0009-1-rv64g-libc6-dev-2.36-closefrom.patch diff --git a/debian/changelog b/debian/changelog index 7f0f88b..0e28879 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gpgme1.0 (1.13.1-ok2) yangtze; urgency=medium + + * src/posix-io.c:573: add the judgement of GLIBC + + -- root Mon, 18 Mar 2024 07:50:30 +0000 + gpgme1.0 (1.13.1-ok1) yangtze; urgency=medium * Build for openKylin. diff --git a/debian/patches/0009-1-rv64g-libc6-dev-2.36-closefrom.patch b/debian/patches/0009-1-rv64g-libc6-dev-2.36-closefrom.patch new file mode 100644 index 0000000..750b700 --- /dev/null +++ b/debian/patches/0009-1-rv64g-libc6-dev-2.36-closefrom.patch @@ -0,0 +1,23 @@ +From: =?utf-8?b?5ZGo5rem5riF?= +Date: Mon, 18 Mar 2024 08:25:15 +0000 +Subject: =?utf-8?b?ITEgcnY2NGfmnrbmnoQg57yW6K+R5oql6ZSZIGxpYmM2LWRldiDljYc=?= + =?utf-8?b?57qnMi4zNuWQjiBjbG9zZWZyb23lh73mlbDmiqXplJkgTWVyZ2UgcHVsbCByZXF1?= + =?utf-8?b?ZXN0ICExIGZyb20g5pmv6ZuF6Iy5L29wZW5reWxpbi95YW5ndHpl?= + +--- + 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..b8eee37 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 */ diff --git a/debian/patches/series b/debian/patches/series index 9394d7e..280ff63 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 0006-gpg-Send-with-keygrip-when-listing-keys.patch 0007-use-FULL_PATH_NAMES-NO-for-reproducible-doxygen-docu.patch 0006-PIC-and-shared.patch +0009-1-rv64g-libc6-dev-2.36-closefrom.patch