From 05097353f99b7b310a737681e863ea28e2c2056c Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Thu, 8 Jan 2026 08:14:47 -0600 Subject: [PATCH] quota: update to 4.11 Remove openat patch, which is now upstream. Signed-off-by: W. Michael Petullo --- utils/quota/Makefile | 6 ++-- .../001-setproject-fix-openat-call.patch | 32 ------------------- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 utils/quota/patches/001-setproject-fix-openat-call.patch diff --git a/utils/quota/Makefile b/utils/quota/Makefile index 49bea64df2c88..e78030ea561ea 100644 --- a/utils/quota/Makefile +++ b/utils/quota/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quota -PKG_VERSION:=4.10 -PKG_RELEASE:=3 +PKG_VERSION:=4.11 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linuxquota -PKG_HASH:=a04a0cafca29c15be8b6ac660e06188bccb802c19efe2e7c19ed7f3d667ecf5e +PKG_HASH:=0a51b8f920254d8e83c34a4c3082b7d241f5d6fd65188afadf29859d5223ef78 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/quota/patches/001-setproject-fix-openat-call.patch b/utils/quota/patches/001-setproject-fix-openat-call.patch deleted file mode 100644 index cbb79d5eed128..0000000000000 --- a/utils/quota/patches/001-setproject-fix-openat-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d9852bd5b76ca65f283929e803b87343942ecb1f Mon Sep 17 00:00:00 2001 -From: Konstantin Demin -Date: Tue, 1 Jul 2025 14:35:36 +0200 -Subject: setproject: fix openat() call - -It looks like that openat() call was copy-pasted from above fstatat() call. -However, manpage for openat() doesn't mention AT_SYMLINK_NOFOLLOW. -Furthermore, AT_SYMLINK_NOFOLLOW constant value (0x100) sometimes (!) clashes -with O_CREAT constant value which is defined as 0100 (0x40) OR 0x100 (yes, two -different values for the same constant appear in headers). This produces build -errors when fortifying defines (-D_FORTIFY_SOURCE) are in effect (e.g. with -glibc 2.41). In order to keep correct behavior, use O_NOFOLLOW instead of -AT_SYMLINK_NOFOLLOW. - -Fixes: e61d46c65899ced9599c93a6128f19d8759fcad8 -Signed-off-by: Konstantin Demin -Signed-off-by: Jan Kara ---- - setproject.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/setproject.c -+++ b/setproject.c -@@ -73,7 +73,7 @@ static void setproject_recurse(int dirfd - if (!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) - continue; - -- int fd = openat(dirfd, d->d_name, AT_SYMLINK_NOFOLLOW); -+ int fd = openat(dirfd, d->d_name, O_NOFOLLOW); - if (fd < 0) { - errstr(_("error opening %s: %m"), d->d_name); - errno = 0;