Minor changes. https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.7yd7ab9ppagk
* Remove patch since the change is included. Signed-off-by: Christian Melki <[email protected]> --- ...x-use-getdents64-instead-of-getdents.patch | 63 ------------------- patches/libcap-2.72/series | 4 -- rules/libcap.make | 4 +- 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 patches/libcap-2.72/0001-psx-use-getdents64-instead-of-getdents.patch delete mode 100644 patches/libcap-2.72/series diff --git a/patches/libcap-2.72/0001-psx-use-getdents64-instead-of-getdents.patch b/patches/libcap-2.72/0001-psx-use-getdents64-instead-of-getdents.patch deleted file mode 100644 index 6edb68a49..000000000 --- a/patches/libcap-2.72/0001-psx-use-getdents64-instead-of-getdents.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Xi Ruoyao <[email protected]> -Date: Tue, 12 Nov 2024 11:44:56 +0800 -Subject: [PATCH] psx: use getdents64 instead of getdents - -On relatively new architectures (for example ARM64, RISC-V, and -LoongArch), the kernel does not have a getdents syscall. Use getdents64 -instead to fix the build on them. - -The getdents64 syscall was added in Linux 2.4 and I don't think we -should still support older kernels today. - -Signed-off-by: Xi Ruoyao <[email protected]> -Signed-off-by: Andrew G. Morgan <[email protected]> ---- - psx/psx.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/psx/psx.c b/psx/psx.c -index d66a7bf7aa7f..bf7d69fb55ac 100644 ---- a/psx/psx.c -+++ b/psx/psx.c -@@ -410,10 +410,11 @@ static long int __psx_immediate_syscall(long int syscall_nr, - - #define BUF_SIZE 4096 - --struct psx_linux_dirent { -- unsigned long d_ino; -- off_t d_off; -+struct psx_linux_dirent64 { -+ long long d_ino; -+ long long d_off; - unsigned short d_reclen; -+ unsigned char d_type; - char d_name[]; - }; - -@@ -486,11 +487,11 @@ long int __psx_syscall(long int syscall_nr, ...) { - - for (;;) { - char buf[BUF_SIZE]; -- size_t nread = syscall(SYS_getdents, fd, buf, BUF_SIZE); -+ size_t nread = syscall(SYS_getdents64, fd, buf, BUF_SIZE); - if (nread == 0) { - break; - } else if (nread < 0) { -- perror("getdents failed"); -+ perror("getdents64 failed"); - kill(psx_tracker.pid, SIGKILL); - } - -@@ -499,10 +500,10 @@ long int __psx_syscall(long int syscall_nr, ...) { - for (offset = 0; offset < nread; offset += reclen) { - /* deal with potential unaligned reads */ - memcpy(&reclen, buf + offset + -- offsetof(struct psx_linux_dirent, d_reclen), -+ offsetof(struct psx_linux_dirent64, d_reclen), - sizeof(reclen)); - char *dir = (buf + offset + -- offsetof(struct psx_linux_dirent, d_name)); -+ offsetof(struct psx_linux_dirent64, d_name)); - long tid = atoi(dir); - if (tid == 0 || tid == self) { - continue; diff --git a/patches/libcap-2.72/series b/patches/libcap-2.72/series deleted file mode 100644 index 865ca3099..000000000 --- a/patches/libcap-2.72/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-psx-use-getdents64-instead-of-getdents.patch -# 1666dae941d8a109c02e73257ed0c32e - git-ptx-patches magic diff --git a/rules/libcap.make b/rules/libcap.make index 62b227df7..79e8a2d61 100644 --- a/rules/libcap.make +++ b/rules/libcap.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap # # Paths and names # -LIBCAP_VERSION := 2.72 -LIBCAP_MD5 := 0d9dd20dbdc7a94942f0c43ae706e5ac +LIBCAP_VERSION := 2.73 +LIBCAP_MD5 := 0e186df9de9b1e925593a96684fe2e32 LIBCAP := libcap-$(LIBCAP_VERSION) LIBCAP_SUFFIX := tar.xz LIBCAP_URL := \ -- 2.34.1
