quota: update to 4.06
authorW. Michael Petullo <mike@flyn.org>
Sun, 31 Jan 2021 01:31:02 +0000 (19:31 -0600)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 31 Jan 2021 11:35:42 +0000 (13:35 +0200)
This includes a backport of quota commit 02b222a3, which removes the
use of reallocarray. The musl C library does not provide reallocarray.

Signed-off-by: W. Michael Petullo <mike@flyn.org>
utils/quota/Makefile
utils/quota/patches/020-remove-reallocarray.patch [new file with mode: 0644]

index 49af89eb11661840bf8a7ce42222c2c477f8b319..74b59429ce221a6c1817557a9798ab751f9c80fb 100644 (file)
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quota
-PKG_VERSION:=4.05
-PKG_RELEASE:=3
+PKG_VERSION:=4.06
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linuxquota
-PKG_HASH:=ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9
+PKG_HASH:=2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/utils/quota/patches/020-remove-reallocarray.patch b/utils/quota/patches/020-remove-reallocarray.patch
new file mode 100644 (file)
index 0000000..942e38e
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/quota.c b/quota.c
+index a6ed61f..a60de12 100644
+--- a/quota.c
++++ b/quota.c
+@@ -385,7 +385,7 @@ int main(int argc, char **argv)
+                         break;
+                 case 259:
+                         fscount++;
+-                        fsnames = reallocarray(fsnames, fscount, sizeof(char *));
++                        fsnames = realloc(fsnames, fscount * sizeof(char *));
+                         if (!fsnames)
+                               die(1, _("Not enough memory for filesystem names"));
+                         fsnames[fscount - 1] = optarg;