diff --git a/package/quota/0001-setproject-fix-openat-call.patch b/package/quota/0001-setproject-fix-openat-call.patch deleted file mode 100644 index 3c5d523e1e..0000000000 --- a/package/quota/0001-setproject-fix-openat-call.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d9852bd5b76ca65f283929e803b87343942ecb1f Mon Sep 17 00:00:00 2001 -From: Konstantin Demin -Date: Tue, 1 Jul 2025 14:35:36 +0200 -Subject: [PATCH] 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 - -Upstream: https://sourceforge.net/p/linuxquota/code/ci/d9852bd5b76ca65f283929e803b87343942ecb1f/ - -Signed-off-by: Bernd Kuhls ---- - setproject.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setproject.c b/setproject.c -index 3047c3d..e688dcd 100644 ---- a/setproject.c -+++ b/setproject.c -@@ -73,7 +73,7 @@ static void setproject_recurse(int dirfd, unsigned id, unsigned dev) - 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; --- -2.47.3 - diff --git a/package/quota/0002-setproject-Fix-openWRT-build.patch b/package/quota/0002-setproject-Fix-openWRT-build.patch deleted file mode 100644 index 04cc5fab04..0000000000 --- a/package/quota/0002-setproject-Fix-openWRT-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 41ba7031ca4852739dd1f66102d34e4a98490906 Mon Sep 17 00:00:00 2001 -From: Jan Kara -Date: Tue, 1 Jul 2025 15:41:56 +0200 -Subject: [PATCH] setproject: Fix openWRT build - -basename() needs libgen.h include in openWRT build environment. Add it. - -Reported-by: "W. Michael Petullo" -Signed-off-by: Jan Kara - -Upstream: https://sourceforge.net/p/linuxquota/code/ci/41ba7031ca4852739dd1f66102d34e4a98490906/ - -Signed-off-by: Bernd Kuhls ---- - setproject.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setproject.c b/setproject.c -index e688dcd..4308435 100644 ---- a/setproject.c -+++ b/setproject.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - --- -2.47.3 - diff --git a/package/quota/quota.hash b/package/quota/quota.hash index e82c1f2c64..675a28041b 100644 --- a/package/quota/quota.hash +++ b/package/quota/quota.hash @@ -1,6 +1,2 @@ -# From https://sourceforge.net/projects/linuxquota/files/quota-tools/4.10/ -sha1 343f26a6f1b6a8dbbd7d89045b0c087efb08d553 quota-4.10.tar.gz - -# Locally calculated -sha256 a04a0cafca29c15be8b6ac660e06188bccb802c19efe2e7c19ed7f3d667ecf5e quota-4.10.tar.gz +sha256 0a51b8f920254d8e83c34a4c3082b7d241f5d6fd65188afadf29859d5223ef78 quota-4.11.tar.gz sha256 32a5fd41e7a257f7f0373988ea8d45cebdbf376060703c242c11c000751b1203 COPYING diff --git a/package/quota/quota.mk b/package/quota/quota.mk index f22ebe41c4..f5a0a09dfc 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUOTA_VERSION = 4.10 +QUOTA_VERSION = 4.11 QUOTA_SITE = https://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+