From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 09 Dec 2024 12:43:39 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tKcAt-005x94-11 for lore@lore.pengutronix.de; Mon, 09 Dec 2024 12:43:39 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tKcAt-0003qH-HI; Mon, 09 Dec 2024 12:43:39 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tKcAg-0003X3-8w; Mon, 09 Dec 2024 12:43:26 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tKcAf-002VPC-0y; Mon, 09 Dec 2024 12:43:26 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tKcAg-006GK8-05; Mon, 09 Dec 2024 12:43:26 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 9 Dec 2024 12:43:26 +0100 Message-Id: <20241209114326.1492709-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241205212820.1336735-1-christian.melki@t2data.com> References: <20241205212820.1336735-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] libcap: Version bump. 2.72 -> 2.73. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 5bce7bd2012d3582d97fe579d6c5cefedf37f46a. Michael [sent from post-receive hook] On Mon, 09 Dec 2024 12:43:25 +0100, Christian Melki wrote: > 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 > Message-Id: <20241205212820.1336735-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 6edb68a4904b..000000000000 > --- a/patches/libcap-2.72/0001-psx-use-getdents64-instead-of-getdents.patch > +++ /dev/null > @@ -1,63 +0,0 @@ > -From: Xi Ruoyao > -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 > -Signed-off-by: Andrew G. Morgan > ---- > - 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 865ca309946f..000000000000 > --- 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 62b227df74bf..79e8a2d61270 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 := \