From 22b95d518db54b83938a8b81da435efb2d92e49c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 6 May 2024 00:05:08 +0200
Subject: [PATCH] bump(main/libelf): 0.191

---
 packages/libelf/build.sh                  |  4 +--
 packages/libelf/debuginfod-client.c.patch | 23 -------------
 packages/libelf/debuginfod.cxx.patch      | 39 ++++++-----------------
 3 files changed, 12 insertions(+), 54 deletions(-)
 delete mode 100644 packages/libelf/debuginfod-client.c.patch

diff --git a/packages/libelf/build.sh b/packages/libelf/build.sh
index 6ae944db65..60e7a721a9 100644
--- a/packages/libelf/build.sh
+++ b/packages/libelf/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://sourceware.org/elfutils/
 TERMUX_PKG_DESCRIPTION="ELF object file access library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="0.190"
+TERMUX_PKG_VERSION="0.191"
 TERMUX_PKG_SRCURL="https://sourceware.org/elfutils/ftp/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2"
-TERMUX_PKG_SHA256=8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692
+TERMUX_PKG_SHA256=df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871
 # libandroid-support for langinfo.
 TERMUX_PKG_DEPENDS="libandroid-support, zlib, zstd"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c99=yes --disable-symbol-versioning"
diff --git a/packages/libelf/debuginfod-client.c.patch b/packages/libelf/debuginfod-client.c.patch
deleted file mode 100644
index 7e4dd04f2b..0000000000
--- a/packages/libelf/debuginfod-client.c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- elfutils-0.185/debuginfod/debuginfod-client.c	2021-05-22 23:55:24.000000000 +0530
-+++ elfutils-0.185-patch/debuginfod/debuginfod-client.c	2021-08-28 22:14:21.559999738 +0530
-@@ -85,6 +85,20 @@
- #include <sys/utsname.h>
- #include <curl/curl.h>
- 
-+static int futimes(int fd, const struct timeval tv[2]) {
-+  if (tv == NULL)
-+    return syscall(__NR_utimensat, fd, NULL, NULL, 0);
-+  if (tv[0].tv_usec < 0 || tv[0].tv_usec >= 1000000 || tv[1].tv_usec < 0 ||
-+      tv[1].tv_usec >= 1000000) {
-+    return -1;
-+  }
-+  // Convert timeval to timespec.
-+  struct timespec ts[2];
-+  TIMEVAL_TO_TIMESPEC(tv, ts);
-+
-+  return syscall(__NR_utimensat, fd, NULL, ts, 0);
-+}
-+
- /* If fts.h is included before config.h, its indirect inclusions may not
-    give us the right LFS aliases of these functions, so map them manually.  */
- #ifdef BAD_FTS
diff --git a/packages/libelf/debuginfod.cxx.patch b/packages/libelf/debuginfod.cxx.patch
index 0943c73d3d..a9ba098f48 100644
--- a/packages/libelf/debuginfod.cxx.patch
+++ b/packages/libelf/debuginfod.cxx.patch
@@ -1,14 +1,7 @@
---- elfutils-0.185/debuginfod/debuginfod.cxx	2021-05-22 23:55:24.000000000 +0530
-+++ elfutils-0.185-patch/debuginfod/debuginfod.cxx	2021-08-28 23:44:30.087999769 +0530
-@@ -58,7 +58,6 @@
- #include <fcntl.h>
- #include <netdb.h>
- 
--
- /* If fts.h is included before config.h, its indirect inclusions may not
-    give us the right LFS aliases of these functions, so map them manually.  */
- #ifdef BAD_FTS
-@@ -93,6 +92,7 @@
+diff -u -r elfutils-0.191/debuginfod/debuginfod.cxx src/debuginfod/debuginfod.cxx
+--- elfutils-0.191/debuginfod/debuginfod.cxx	2024-03-01 20:12:17.000000000 +0000
++++ src/debuginfod/debuginfod.cxx	2024-05-05 21:55:02.817312341 +0000
+@@ -109,6 +109,7 @@
  #include <libdwelf.h>
  
  #include <microhttpd.h>
@@ -16,23 +9,11 @@
  
  #if MHD_VERSION >= 0x00097002
  // libmicrohttpd 0.9.71 broke API
-@@ -116,6 +116,19 @@
- #define tid() pthread_self()
- #endif
+@@ -1445,7 +1446,6 @@
  
-+static int futimes(int fd, const struct timeval tv[2]) {
-+  if (tv == NULL)
-+    return syscall(__NR_utimensat, fd, NULL, NULL, 0);
-+  if (tv[0].tv_usec < 0 || tv[0].tv_usec >= 1000000 || tv[1].tv_usec < 0 ||
-+      tv[1].tv_usec >= 1000000) {
-+    return -1;
-+  }
-+  // Convert timeval to timespec.
-+  struct timespec ts[2];
-+  TIMEVAL_TO_TIMESPEC(tv, ts);
-+
-+  return syscall(__NR_utimensat, fd, NULL, ts, 0);
-+}
+   map<key,fdcache_entry> entries; // optimized for lookup
+   time_t last_cleaning;
+-  long max_fds;
+   long max_mbs;
  
- inline bool
- string_endswith(const string& haystack, const string& needle)
+ public: