* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quotatool/files/
@ 2017-02-04 21:22 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-02-04 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 296f1281df6e4865ce9d7e87fa223b43a6f19ae9
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 15:25:55 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 21:21:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296f1281
sys-fs/quotatool: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3791
.../quotatool/files/quotatool-1.4.11-ldflags.patch | 27 ----------------------
1 file changed, 27 deletions(-)
diff --git a/sys-fs/quotatool/files/quotatool-1.4.11-ldflags.patch b/sys-fs/quotatool/files/quotatool-1.4.11-ldflags.patch
deleted file mode 100644
index 4f02822..00000000
--- a/sys-fs/quotatool/files/quotatool-1.4.11-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: quotatool-1.4.11/local.mk.in
-===================================================================
---- quotatool-1.4.11.orig/local.mk.in
-+++ quotatool-1.4.11/local.mk.in
-@@ -17,7 +17,8 @@ SHELL := /bin/sh
-
- CC := @CC@
- CFLAGS := @CFLAGS@
--CPPFLAGS = $(inc) @DEFS@
-+LDFLAGS := @LDFLAGS@
-+CPPFLAGS = @CPPFLAGS@ $(inc) @DEFS@
-
-
- INSTALL := @INSTALL@
-Index: quotatool-1.4.11/Makefile
-===================================================================
---- quotatool-1.4.11.orig/Makefile
-+++ quotatool-1.4.11/Makefile
-@@ -58,7 +58,7 @@ subdirs := src
- # compile the program (and the objects)
- all: $(prog)
- $(prog): $(objs)
-- $(CC) -o $(prog) $(objs) $(libs) $(CFLAGS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(prog) $(objs) $(libs)
-
-
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quotatool/files/
@ 2025-08-12 18:06 Michael Mair-Keimberger
0 siblings, 0 replies; 2+ messages in thread
From: Michael Mair-Keimberger @ 2025-08-12 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 8e6551d5703e1f84ac62b8b5a87e5906ad8eed2c
Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 7 18:03:51 2025 +0000
Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Tue Aug 12 18:05:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6551d5
sys-fs/quotatool: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>
Part-of: https://github.com/gentoo/gentoo/pull/43423
Closes: https://github.com/gentoo/gentoo/pull/43423
Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>
.../files/quotatool-1.4.13-fix-buildsystem.patch | 31 -----
.../quotatool/files/quotatool-1.6.2-clang16.patch | 32 -----
.../files/quotatool-1.6.2-fix-autoconf.patch | 133 ---------------------
.../quotatool/files/quotatool-1.6.2-warnings.patch | 67 -----------
4 files changed, 263 deletions(-)
diff --git a/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch b/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch
deleted file mode 100644
index b65542988080..000000000000
--- a/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/local.mk.in
-+++ b/local.mk.in
-@@ -17,7 +17,8 @@
-
- CC := @CC@
- CFLAGS := @CFLAGS@
--CPPFLAGS = $(inc) @DEFS@
-+LDFLAGS := @LDFLAGS@
-+CPPFLAGS = @CPPFLAGS@ $(inc) @DEFS@
-
-
- INSTALL := @INSTALL@
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,7 @@
- # compile the program (and the objects)
- all: $(prog)
- $(prog): $(objs)
-- $(CC) -o $(prog) $(objs) $(libs) $(CFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(prog) $(objs) $(libs)
-
-
-
---- a/tools/depend.sh
-+++ b/tools/depend.sh
-@@ -4,4 +4,4 @@
- # Generated automatically from depend.sh.in by configure.
-
- set -e
--gcc -MM $* | sed 's#\($*\)\.o[ :]*#\1.o $@ : #g'
-+${CC:-cc} -MM $* | sed 's#\($*\)\.o[ :]*#\1.o $@ : #g'
diff --git a/sys-fs/quotatool/files/quotatool-1.6.2-clang16.patch b/sys-fs/quotatool/files/quotatool-1.6.2-clang16.patch
deleted file mode 100644
index e68ed5f53814..000000000000
--- a/sys-fs/quotatool/files/quotatool-1.6.2-clang16.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 5d681bb7132f..000000000000
--- a/sys-fs/quotatool/files/quotatool-1.6.2-fix-autoconf.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-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
deleted file mode 100644
index 0598f86b489b..000000000000
--- a/sys-fs/quotatool/files/quotatool-1.6.2-warnings.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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();
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-12 18:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-12 18:06 [gentoo-commits] repo/gentoo:master commit in: sys-fs/quotatool/files/ Michael Mair-Keimberger
-- strict thread matches above, loose matches on Subject: below --
2017-02-04 21:22 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox