gentoo auto-resync : 17:10:2022 - 07:54:11

8 files changed, 278 insertions, 34 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 7ba4162631fa..a5484d2cb44b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/quotatool/Manifest b/sys-fs/quotatool/Manifest
index b70b9c0380fe..0b85e708d187 100644
--- a/sys-fs/quotatool/Manifest
+++ b/sys-fs/quotatool/Manifest
@@ -1,4 +1,7 @@
 AUX quotatool-1.4.13-fix-buildsystem.patch 728 BLAKE2B 00a8b73a04c6bdaffcfe824a245517beba111f7890ead9589e51328aeaadcf9ac6051a4775d238f576577b299a4311b72ed89609822d1454332d2750bebd51b9 SHA512 0120578568ddfe977a89dac48b920388a650debc17174e551b2af0d4d53d2d242f6639fdc57da0a568bca01a38613d0955ef1136da89298369ea1de87e392641
+AUX quotatool-1.6.2-clang16.patch 971 BLAKE2B 7ac02ae9742207905563c16a9e3412b6b1c1cf52cdf592c058f36d61ddba50bc7a5e51eca1123ec461be7fc0aeffc4bfb37a611965f8c6a4602216428d55c0da SHA512 14a9f6a7a9f75744fcaf6ae0026c27fa499aa9657b3347f421443e921fc365a6a56f647eb125396bce0b46b2cf2b3f971d86878ddf85c297d1656f997ec8de81
+AUX quotatool-1.6.2-fix-autoconf.patch 4292 BLAKE2B 235b394ca499b415a5dbab75b882dd1b0294d516a44cb292d1d0b97a8a10bb9f499ac38b13554615e6f3180809d0361b84951db2e4a566702c6c65fec252e534 SHA512 e767832750964580a081680941b972aaccb6f14c80490a907a902be29a93af941c12721121f822e7656fc7cdeb6658a8f9c44990ea2a7356a1f4326a367f1286
+AUX quotatool-1.6.2-warnings.patch 1612 BLAKE2B 6a3f69a5b44afddc4684069f181aa06573014c23d2cd43c8c9e4dca255f24cfbd7fed3455b13fdbd71bb2c7167db90ed21f83a6b7ef7d67054cb61e299b8f02e SHA512 5a281a5fafb6364e998c76c4c269f8213daa24a0efd48a7edcd29623552e84f8dfe738d6a92dbaa7ef5506371ab27090e190a8327a9df695e0a394a3ec80dafd
 DIST quotatool-1.6.2.tar.gz 147691 BLAKE2B 22eb1f5012b0dd19d52a795a493e7a51e9bab0d6e71b10d632a4f61faf6b54db5b0b6096fdc38b0fdd2879ebc2a4cb44e7279e735e09436a9def5018814b3478 SHA512 882bdc43e49ef69b1b2899da01faf7853524f67585b716bba195ea89a250a90a7796a225b7d141b68bf45c7524d9fe506000998e6e7dc113b559f95e6ed21e2c
-EBUILD quotatool-1.6.2.ebuild 545 BLAKE2B 4573bd791e83d2011492af0d672ee82d16000fda95f9e3a5a2e141faf2f29ced8ad14cb49be8094f29ddbc4d71915b74e95a4ecdf8a4dffde05425eb498ba7f7 SHA512 39d161788cc9d9168fd9abc8e1da25f798765b94df0bfc66678d448a920a75f8deca8c42e6340549d31676823cd886c2a06d1e802cb3597ea6f52afbd52cd32b
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+EBUILD quotatool-1.6.2-r1.ebuild 774 BLAKE2B 492129dc61626e384a3c6ddfe8a8a9575c19b301c1cd176636b14dad461654b873b082ae7a4b5962d691a9f741899742b10a58ebd0428f0b90419b5778d48154 SHA512 45d4046fce9151538fff8eaf6323584061b710f026391342daf0e8ef208a9063667c43fcdbb66749fd02dfb99523b4f60b0dd5bbfea0d588ff2c53408a84b830
+MISC metadata.xml 341 BLAKE2B 1bf0dc2eaf87efd6d1d578e0c9d3a0743b8fd9b3610238386a1bdc1bf7cc040dc9f08261cb2bc3d1e006773b9c3d314406b66559aa33590c3ca416fa49572348 SHA512 77c0761e2ca47085ef0bd734d126e44b30a7fca25c636d5b3dbf7de8b4bcf686078f076cf86d1c868c2e557f372b87afbd97f4f47719b15710175fd55d7ae921
diff --git a/sys-fs/quotatool/files/quotatool-1.6.2-clang16.patch b/sys-fs/quotatool/files/quotatool-1.6.2-clang16.patch
new file mode 100644
index 000000000000..e68ed5f53814
--- /dev/null
+++ b/sys-fs/quotatool/files/quotatool-1.6.2-clang16.patch
@@ -0,0 +1,32 @@
+https://github.com/ekenberg/quotatool/commit/ad6944baaa73cf6230f9a2bef2399b31c2130547
+
+From ad6944baaa73cf6230f9a2bef2399b31c2130547 Mon Sep 17 00:00:00 2001
+From: Bas Zoetekouw <bas.zoetekouw@surfnet.nl>
+Date: Thu, 9 Aug 2018 22:11:58 +0200
+Subject: [PATCH] fix compiler warnings
+
+--- a/src/output.h
++++ b/src/output.h
+@@ -17,8 +17,8 @@
+ 
+ extern int output_level;
+ 
+-inline void   output_version (void);
+-inline void   output_help (void);
++void   output_version (void);
++void   output_help (void);
+ 
+ void   output_debug (const char *format, ...);
+ void   output_info (const char *format, ...);
+--- a/src/quota.h
++++ b/src/quota.h
+@@ -110,7 +110,7 @@ void        quota_delete   (quota_t *myquota);
+ int         quota_get      (quota_t *myquota);
+ int         quota_set      (quota_t *myquota);
+ 
+-int         xfs_reset_grace(quota_t *myquota, int grace_type);
++int         quota_reset_grace(quota_t *myquota, int grace_type);
+ 
+ 
+ #endif /* INCLUDE_QUOTATOOL_QUOTA */
+
diff --git a/sys-fs/quotatool/files/quotatool-1.6.2-fix-autoconf.patch b/sys-fs/quotatool/files/quotatool-1.6.2-fix-autoconf.patch
new file mode 100644
index 000000000000..5d681bb7132f
--- /dev/null
+++ b/sys-fs/quotatool/files/quotatool-1.6.2-fix-autoconf.patch
@@ -0,0 +1,133 @@
+https://github.com/ekenberg/quotatool/commit/b42fbba1c2a863b726d30b0d80471e76c82ec801
+https://github.com/ekenberg/quotatool/commit/2b773bb36135ede595bb2305663aec809edc8d35
+
+From b42fbba1c2a863b726d30b0d80471e76c82ec801 Mon Sep 17 00:00:00 2001
+From: Bas Zoetekouw <bas.zoetekouw@surfnet.nl>
+Date: Tue, 12 Feb 2019 15:35:34 +0100
+Subject: [PATCH] make configure.in work with recent autoconf
+
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(src/main.c)
++AC_INIT
++AC_CONFIG_SRCDIR([src/main.c])
+ AC_CONFIG_AUX_DIR(tools)
+ 
+ 
+@@ -17,20 +18,20 @@ dnl ---------------------------------------------------------------------------
+ dnl Set program, version info
+ PROGNAME=quotatool
+ AC_SUBST(PROGNAME)
+-AC_DEFINE_UNQUOTED(PROGNAME, "$PROGNAME")
++AC_DEFINE_UNQUOTED(PROGNAME, "$PROGNAME", [Name of the current program])
+ 
+ AC_SUBST(MAJOR_VERSION)
+-AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION)
++AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [Major version number])
+ 
+ AC_SUBST(MINOR_VERSION)
+-AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION)
++AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [Minor version number])
+ 
+ AC_SUBST(PATCHLEVEL)
+-AC_DEFINE_UNQUOTED(PATCHLEVEL, "$PATCHLEVEL")
++AC_DEFINE_UNQUOTED(PATCHLEVEL, "$PATCHLEVEL", [Patch level version number])
+ 
+-AC_DEFINE_UNQUOTED(COPYRIGHT_NOTICE, "$COPYRIGHT_NOTICE")
++AC_DEFINE_UNQUOTED(COPYRIGHT_NOTICE, "$COPYRIGHT_NOTICE", [Copyright notice])
+ 
+-AC_DEFINE_UNQUOTED(WWW_URL, "$WWW_URL")
++AC_DEFINE_UNQUOTED(WWW_URL, "$WWW_URL", [Upstream homepage])
+ 
+ dnl get the system type (for the makefile)
+ 
+@@ -38,31 +39,31 @@ AC_CANONICAL_HOST
+ case [$host] in
+   *linux*)
+ 	PLATFORM=linux
+-	AC_DEFINE(PLATFORM_LINUX, 1)
++	AC_DEFINE(PLATFORM_LINUX, 1, [Is this a Linux platform?])
+ 	;;
+   *solaris*)
+ 	PLATFORM=solaris
+-	AC_DEFINE(PLATFORM_SOLARIS, 1)
++	AC_DEFINE(PLATFORM_SOLARIS, 1, [Is this a Solaris platform?])
+ 	;;
+   *aix*)
+ 	PLATFORM=aix
+-	AC_DEFINE(PLATFORM_AIX, 1)
++	AC_DEFINE(PLATFORM_AIX, 1, [Is this an AIX platform?])
+ 	;;
+   *freebsd*|*openbsd*|*netbsd*)
+ 	PLATFORM=bsd
+-	AC_DEFINE(PLATFORM_BSD, 1)
++	AC_DEFINE(PLATFORM_BSD, 1, [Is this a *BSD platform?])
+ 	;;
+   *apple-darwin*)
+         PLATFORM=darwin
+-        AC_DEFINE(PLATFORM_DARWIN, 1)
++        AC_DEFINE(PLATFORM_DARWIN, 1, [Is this an OSX platform?])
+         ;;
+   *)
+ 	PLATFORM=unknown
+-	AC_DEFINE(PLATFORM_UNKNOWN, 1)
++	AC_DEFINE(PLATFORM_UNKNOWN, 1, [Is this an unknown platform?])
+ 	;;
+ esac
+ AC_SUBST(PLATFORM)
+-AC_DEFINE_UNQUOTED(PLATFORM, $PLATFORM)
++AC_DEFINE_UNQUOTED(PLATFORM, $PLATFORM, [Name of the current platform])
+ 
+ dnl Check for programs.
+ 
+@@ -106,13 +107,13 @@ AC_C_CONST
+ AC_TYPE_UID_T
+ AC_C_INLINE
+ AC_CHECK_TYPE(u_int64_t, HAVE_U_INT64_T=1, HAVE_U_INT64_T=0)
+-AC_DEFINE_UNQUOTED(HAVE_U_INT64_T, $HAVE_U_INT64_T)
++AC_DEFINE_UNQUOTED(HAVE_U_INT64_T, $HAVE_U_INT64_T, [Can we use uint64_t?])
+ 
+ dnl Check for library functions.
+ 
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(strdup strerror strtol strtod strchr)
+-test [x$PLATFORM] = [xlinux] &&  AC_DEFINE(HAVE_GNU_GETOPT, 1)
++test [x$PLATFORM] = [xlinux] &&  AC_DEFINE(HAVE_GNU_GETOPT, 1, [Can we use GNU getopt?])
+ 
+ dnl check for strlcpy and strlcat (mostly BSD)
+ AC_CHECK_FUNCS(strlcpy strlcat)
+@@ -121,9 +122,10 @@ dnl Check the commandline
+ 
+ AC_ARG_WITH(gnu-getopt,  \
+   [--with-gnu-getopt       getopt() is GNU getopt],\
+-            test [x$withval] != [xno] || AC_DEFINE(HAVE_GNU_GETOPT, 1))
++            test [x$withval] != [xno] || AC_DEFINE(HAVE_GNU_GETOPT, 1), [Can we use GNU getopt?])
+ 
+ dnl Create output files
+ 
+ AC_CONFIG_HEADER(src/config.h)
+-AC_OUTPUT(local.mk)
++AC_CONFIG_FILES([local.mk])
++AC_OUTPUT
+
+From 2b773bb36135ede595bb2305663aec809edc8d35 Mon Sep 17 00:00:00 2001
+From: Bas Zoetekouw <bas@debian.org>
+Date: Wed, 13 Feb 2019 09:00:41 +0100
+Subject: [PATCH] Update configure.in
+
+Misplaced brace
+--- a/configure.in
++++ b/configure.in
+@@ -122,7 +122,7 @@ dnl Check the commandline
+ 
+ AC_ARG_WITH(gnu-getopt,  \
+   [--with-gnu-getopt       getopt() is GNU getopt],\
+-            test [x$withval] != [xno] || AC_DEFINE(HAVE_GNU_GETOPT, 1), [Can we use GNU getopt?])
++            test [x$withval] != [xno] || AC_DEFINE(HAVE_GNU_GETOPT, 1, [Can we use GNU getopt?]))
+ 
+ dnl Create output files
+ 
+
diff --git a/sys-fs/quotatool/files/quotatool-1.6.2-warnings.patch b/sys-fs/quotatool/files/quotatool-1.6.2-warnings.patch
new file mode 100644
index 000000000000..0598f86b489b
--- /dev/null
+++ b/sys-fs/quotatool/files/quotatool-1.6.2-warnings.patch
@@ -0,0 +1,67 @@
+https://github.com/ekenberg/quotatool/commit/09695c944947d804cbe3b5c7e2c854953984413e
+https://github.com/ekenberg/quotatool/commit/af27842d1a6640d932407999ceec57f54a225a78
+
+From 09695c944947d804cbe3b5c7e2c854953984413e Mon Sep 17 00:00:00 2001
+From: Bas Zoetekouw <bas.zoetekouw@surfnet.nl>
+Date: Thu, 9 Aug 2018 22:17:22 +0200
+Subject: [PATCH] fix implicit fallthrough
+
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -268,6 +268,7 @@ argdata_t *parse_commandline (int argc, char **argv)
+ 
+     case '?':
+       output_error ("Unrecognized option: '%c'", optopt);
++      __attribute__ ((fallthrough));
+ 
+     default:
+       output_help();
+
+
+From af27842d1a6640d932407999ceec57f54a225a78 Mon Sep 17 00:00:00 2001
+From: Johan Ekenberg <johan.ekenberg@gmail.com>
+Date: Mon, 1 Apr 2019 13:19:08 +0200
+Subject: [PATCH] Fix compiler warnings
+
+__P() seems to not be used with modern compilers
+Fix switch-case attribute fallthrough warning
+--- a/src/linux/linux_quota.h
++++ b/src/linux/linux_quota.h
+@@ -117,7 +117,7 @@ struct if_dqinfo {
+ 	#endif
+ #endif
+ 
+-long quotactl __P((int, const char *, qid_t, caddr_t));
++long quotactl (int, const char *, qid_t, caddr_t);
+ 
+ /*
+  * runtime detection of quota format
+@@ -139,16 +139,3 @@ int kern_quota_format(fs_t *, int);
+ #include "xfs_quota.h"
+ 
+ #endif /* _QUOTA_ */
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -268,7 +268,7 @@ argdata_t *parse_commandline (int argc, char **argv)
+ 
+     case '?':
+       output_error ("Unrecognized option: '%c'", optopt);
+-      __attribute__ ((fallthrough));
++      // fall through
+ 
+     default:
+       output_help();
+
diff --git a/sys-fs/quotatool/metadata.xml b/sys-fs/quotatool/metadata.xml
index 73dda144f9ac..fd8d6c15a717 100644
--- a/sys-fs/quotatool/metadata.xml
+++ b/sys-fs/quotatool/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ekenberg/quotatool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/quotatool/quotatool-1.6.2-r1.ebuild b/sys-fs/quotatool/quotatool-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..6739b334ab11
--- /dev/null
+++ b/sys-fs/quotatool/quotatool-1.6.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line utility for filesystem quotas"
+HOMEPAGE="https://quotatool.ekenberg.se/"
+SRC_URI="https://quotatool.ekenberg.se/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+
+RDEPEND="sys-fs/quota"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.13-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-fix-autoconf.patch
+	"${FILESDIR}"/${P}-warnings.patch
+)
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	# TODO: drop on next release (https://github.com/ekenberg/quotatool/commit/5529c8084a06d4d95905f76e47d2621564876081)
+	dodir /usr/sbin /usr/share/man/man8
+	default
+}
diff --git a/sys-fs/quotatool/quotatool-1.6.2.ebuild b/sys-fs/quotatool/quotatool-1.6.2.ebuild
deleted file mode 100644
index 29880c32b907..000000000000
--- a/sys-fs/quotatool/quotatool-1.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Command-line utility for filesystem quotas"
-HOMEPAGE="http://quotatool.ekenberg.se/"
-SRC_URI="http://quotatool.ekenberg.se/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-
-RDEPEND="sys-fs/quota"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.13-fix-buildsystem.patch )
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	dodir /usr/sbin /usr/share/man/man8
-	default
-}