quota: update to 4.10

Upstream list of changes is available at
https://sourceforge.net/p/linuxquota/news/.

Signed-off-by: W. Michael Petullo <[email protected]>

diff --git a/utils/quota/Makefile b/utils/quota/Makefile
index 46afe0b04c09d2689a5ad2649c152ce847a9863c..04ee314ad0ddedf723438d5cf00174c389953f3d 100644 (file)
--- a/utils/quota/Makefile
+++ b/utils/quota/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quota
-PKG_VERSION:=4.09
+PKG_VERSION:=4.10
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linuxquota
-PKG_HASH:=9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9
+PKG_HASH:=a04a0cafca29c15be8b6ac660e06188bccb802c19efe2e7c19ed7f3d667ecf5e
 
 PKG_MAINTAINER:=W. Michael Petullo <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/utils/quota/patches/010-gcc14.patch b/utils/quota/patches/010-gcc14.patch
index 2637fcdb87361f8a9a1cd709c47576e998e5812d..cdd0ec851f0f342414e661a8290355da4b641385 100644 (file)
--- a/utils/quota/patches/010-gcc14.patch
+++ b/utils/quota/patches/010-gcc14.patch
@@ -8,50 +8,3 @@
  #include <time.h>
  #include <stdarg.h>
  
---- a/edquota.c
-+++ b/edquota.c
-@@ -38,7 +38,7 @@ char *progname;
- static int flags, quotatype;
- static int fmt = -1;
- static char *protoname;
--static char *dirname;
-+static char *dname;
- 
- static void usage(void)
- {
-@@ -138,7 +138,7 @@ static int parse_options(int argc, char
-                                 exit(1);
-                         break;
-                 case 'f':
--                        dirname = optarg;
-+                        dname = optarg;
-                         break;
-                 case 256:
-                         flags |= FL_NUMNAMES;
-@@ -176,7 +176,7 @@ static void copy_prototype(int argc, cha
-       protoprivs = getprivs(protoid, handles, 0);
-       while (argc-- > 0) {
-               id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
--              curprivs = getprivs(id, handles, !dirname);
-+              curprivs = getprivs(id, handles, !dname);
-               if (!curprivs)
-                       die(1, _("Cannot get quota information for user %s\n"), *argv);
-               argv++;
-@@ -223,7 +223,7 @@ int main(int argc, char **argv)
-       argv += ret;
- 
-       init_kernel_interface();
--      handles = create_handle_list(dirname ? 1 : 0, dirname ? &dirname : NULL, quotatype, fmt,
-+      handles = create_handle_list(dname ? 1 : 0, dname ? &dname : NULL, quotatype, fmt,
-                       (flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS,
-                       (flags & FL_REMOTE) ? 0 : MS_LOCALONLY);
-       if (!handles[0]) {
-@@ -296,7 +296,7 @@ int main(int argc, char **argv)
-       else {
-               for (; argc > 0; argc--, argv++) {
-                       id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
--                      curprivs = getprivs(id, handles, !dirname);
-+                      curprivs = getprivs(id, handles, !dname);
-                       if (!curprivs)
-                               die(1, _("Cannot get quota information for user %s.\n"), *argv);
-                       if (flags & FL_EDIT_TIMES) {