From 9f7e0220ee57d147b5e6ee5e33ae345faaa0fdf6 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Thu, 9 May 2024 10:37:57 +0000
Subject: [PATCH] bump(main/cpio): 2.15

---
 packages/cpio/build.sh                        |  4 +-
 .../cpio/cpio-2.14-configure-clang16.patch    | 46 +++++++++++++++----
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/packages/cpio/build.sh b/packages/cpio/build.sh
index 1646126686..c88f9b23ff 100644
--- a/packages/cpio/build.sh
+++ b/packages/cpio/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/cpio/
 TERMUX_PKG_DESCRIPTION="CPIO implementation from the GNU project"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.14
+TERMUX_PKG_VERSION="2.15"
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/cpio/cpio-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_SHA256=fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12
+TERMUX_PKG_SHA256=937610b97c329a1ec9268553fb780037bcfff0dcffe9725ebc4fd9c1aa9075db
 TERMUX_PKG_DEPENDS="tar"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-rmt=$TERMUX_PREFIX/libexec/rmt"
 
diff --git a/packages/cpio/cpio-2.14-configure-clang16.patch b/packages/cpio/cpio-2.14-configure-clang16.patch
index f8aaa1afa4..35c10d0ac3 100644
--- a/packages/cpio/cpio-2.14-configure-clang16.patch
+++ b/packages/cpio/cpio-2.14-configure-clang16.patch
@@ -1,8 +1,7 @@
 https://github.com/termux/termux-packages/issues/15852
 Borrowed from https://github.com/gentoo/gentoo/blob/496cb065e413016d6f788c26f485d55349b1c46b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
 
---- a/am/ax_compile_check_rettype.m4
-+++ b/am/ax_compile_check_rettype.m4
++++ ./am/ax_compile_check_rettype.m4
 @@ -70,6 +70,9 @@
  [for ac_type in char short int long "long long" $4
   do 
@@ -13,9 +12,8 @@ Borrowed from https://github.com/gentoo/gentoo/blob/496cb065e413016d6f788c26f485
  #include <sys/types.h>
  $3
  ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,14 +37,11 @@
++++ ./configure.ac
+@@ -37,28 +37,11 @@
  AC_C_PROTOTYPES
  
  AC_SYS_LARGEFILE
@@ -25,12 +23,26 @@ Borrowed from https://github.com/gentoo/gentoo/blob/496cb065e413016d6f788c26f485
  AC_CHECK_TYPE(gid_t, int)
  
  AC_HEADER_DIRENT
--AX_COMPILE_CHECK_RETTYPE([major], [0])
--AX_COMPILE_CHECK_RETTYPE([minor], [0])
+-AX_COMPILE_CHECK_RETTYPE([major], [0], [
+-#include <sys/types.h>
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#endif
+-#ifdef MAJOR_IN_SYSMACROS
+-# include <sys/sysmacros.h>
+-#endif])
+-AX_COMPILE_CHECK_RETTYPE([minor], [0], [
+-#include <sys/types.h>
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#endif
+-#ifdef MAJOR_IN_SYSMACROS
+-# include <sys/sysmacros.h>
+-#endif])
  
  AC_CHECK_FUNCS([fchmod fchown])
  # This is needed for mingw build
-@@ -65,7 +62,11 @@
+@@ -79,7 +62,25 @@
  
  AM_CONDITIONAL([CPIO_MT_COND], [test "$enable_mt" = yes])
  
@@ -38,8 +50,22 @@ Borrowed from https://github.com/gentoo/gentoo/blob/496cb065e413016d6f788c26f485
 +AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h sys/sysmacros.h])
 +
 +AC_HEADER_MAJOR
-+AC_COMPILE_CHECK_RETTYPE([major], [0])
-+AC_COMPILE_CHECK_RETTYPE([minor], [0])
++AX_COMPILE_CHECK_RETTYPE([major], [0], [
++#include <sys/types.h>
++#ifdef MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif])
++AX_COMPILE_CHECK_RETTYPE([minor], [0], [
++#include <sys/types.h>
++#ifdef MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif])
  
  AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, atoi, exit], , , [
  #include <stdio.h>