public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2017-09-05 20:40 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2017-09-05 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e2959e4f145e23e7e9bb9936c1df7a9233c85791
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 20:35:19 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 20:40:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2959e4f

sys-fs/quota: Removed old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-fs/quota/Manifest                              |  1 -
 sys-fs/quota/files/quota-no-quotactl-manpage.patch | 19 ------
 sys-fs/quota/quota-3.17-r1.ebuild                  | 79 ----------------------
 3 files changed, 99 deletions(-)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index a032eaee588..39d08c64a55 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,4 +1,3 @@
-DIST quota-3.17.tar.gz 439168 SHA256 253320993bb132814c724ca268a6346368be41846ad600f65ee4232ec8597d6f SHA512 7d200862f5ebee024295352289d940a1b728cb017e7c2c4f422a5a98d58ba8f62130640a4c08bdec02f94ea0f4abe146fb494c039b43021fd410ec17fd32b238 WHIRLPOOL e334f22a7c2f8097a2f7145217d1cf134a135a1b6705470121e3a9c0492d59677508bfaa06bcb4eecb9992491910f5b29068e005cafb5086df39da591e375613
 DIST quota-4.02.tar.gz 489289 SHA256 f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795 SHA512 547e08893b95928e5d183d29bee70d1932f85a675b96f64446e5a723d0759ad2d31223f8b6a5652cd698fce4907a15c294b91c18de32faddbef4975c9f22f2aa WHIRLPOOL eb102a14dfe780b7ed062c3c7abec1ef766beb31c18d92c5115ca703672ebb7e7bfb0479885c6c8c78520554aeb477bc1f4d48fbb76b0336047f42b55af49036
 DIST quota-4.03.tar.gz 564352 SHA256 9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 WHIRLPOOL 4a6354f7732e6c60782dbfb60fbfae47c96c438315572dccaf7d2563b8dab5eb46072f999481abe237df8dafaf252b095c9bcd5d58beecdf75db6aca8d46f4ab
 DIST quota-4.04.tar.gz 577303 SHA256 735be1887e7f51f54165e778ae43fc859c04e44d88834ecb2f470e91d4ef8edf SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad WHIRLPOOL ac6466fffaa0954b13a812827bba4f8753640b80fefb6cbbd582a3c916cc7b302e865ddfb3919335a2fe23168bf5894032a7393b4f1ef4615b75f30adc501f3e

diff --git a/sys-fs/quota/files/quota-no-quotactl-manpage.patch b/sys-fs/quota/files/quota-no-quotactl-manpage.patch
deleted file mode 100644
index bf0014d0459..00000000000
--- a/sys-fs/quota/files/quota-no-quotactl-manpage.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN quota-tools.orig/Makefile.in quota-tools/Makefile.in
---- quota-tools.orig/Makefile.in	2003-04-08 06:04:25.000000000 -0700
-+++ quota-tools/Makefile.in	2003-12-10 02:07:40.000000000 -0800
-@@ -88,7 +88,6 @@
- 	-$(INSTALL) -m $(DEF_CONF_MODE) quotatab $(ROOTDIR)$(sysconfdir)
- 	-$(INSTALL) -m $(DEF_CONF_MODE) quotagrpadmins $(ROOTDIR)$(sysconfdir)
- 	-mkdir -p $(ROOTDIR)$(mandir)/man1
--	-mkdir -p $(ROOTDIR)$(mandir)/man2
- 	-mkdir -p $(ROOTDIR)$(mandir)/man3
- 	-mkdir -p $(ROOTDIR)$(mandir)/man8
- 	-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
-@@ -96,7 +95,6 @@
- 	-$(INSTALL) -s -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
- 	-$(INSTALL) -s -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
--	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8
- 

diff --git a/sys-fs/quota/quota-3.17-r1.ebuild b/sys-fs/quota/quota-3.17-r1.ebuild
deleted file mode 100644
index 54332981cf3..00000000000
--- a/sys-fs/quota/quota-3.17-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nls tcpd ldap rpc"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	rpc? ( || ( net-nds/portmap net-nds/rpcbind ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch to prevent quotactl.2 manpage from being installed
-	# that page is provided by man-pages instead
-	epatch "${FILESDIR}"/${PN}-no-quotactl-manpage.patch
-
-	# This was for openldap-2.2 support before,
-	# Now we only support >=2.3
-	append-cppflags -DLDAP_DEPRECATED=0
-
-	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake STRIP="" ROOTDIR="${D}" install || die
-	rm -r "${D}"/usr/include || die #70938
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	ecvs_clean
-	dodoc doc/*
-	dodoc README.*
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/quota.rc7 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	else
-		rm -f "${D}"/usr/sbin/rpc.rquotad
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		insopts -m0644
-		doins ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe ldap-scripts/*.pl
-		doexe ldap-scripts/edquota_editor
-	fi
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2017-09-16 11:54 Andreas Hüttel
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Hüttel @ 2017-09-16 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     610af1a698ac2ca712034ff1928d56b51b61458c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 11:53:07 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 11:53:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610af1a6

sys-fs/quota: Fix build with glibc-2.26 and libtirpc.

Revbump since I'm not 100% sure about side effects if in previous
glibc+libtirpc combinations duplicate headers were installed.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-fs/quota/files/quota-4.04-glibc226.patch | 43 ++++++++++++++
 sys-fs/quota/quota-4.04-r1.ebuild            | 83 ++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)

diff --git a/sys-fs/quota/files/quota-4.04-glibc226.patch b/sys-fs/quota/files/quota-4.04-glibc226.patch
new file mode 100644
index 00000000000..5f63cde7d42
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.04-glibc226.patch
@@ -0,0 +1,43 @@
+From bbb8819fc0f6ed379a05d635a61bcf9c8986079f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 16 Sep 2017 13:09:43 +0200
+Subject: [PATCH] Add $(TIRPC_CFLAGS) globally to CFLAGS for RPC support,
+ needed for libc 2.26
+
+---
+ Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8d80bee..278290a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -51,6 +51,8 @@ EXTRA_DIST = \
+ noinst_LIBRARIES = libquota.a
+ 
+ if WITH_RPC
++CFLAGS += $(TIRPC_CFLAGS)
++
+ rpcsvcdir = $(includedir)/rpcsvc
+ rpcsvc_DATA = \
+ 	rquota.h \
+@@ -100,8 +102,6 @@ libquota_a_SOURCES = \
+ 	mntopt.h \
+ 	pot.c \
+ 	pot.h
+-libquota_a_CFLAGS = \
+-	$(TIRPC_CFLAGS)
+ libquota_a_LIBADD = \
+ 	$(RPCLIBS)
+ 
+@@ -235,7 +235,6 @@ rpc_rquotad_SOURCES = \
+ 	rquota_server.c \
+ 	rquota_svc.c \
+ 	svc_socket.c
+-rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS)
+ rpc_rquotad_LDADD = \
+ 	libquota.a \
+ 	$(WRAP_LIBS) \
+-- 
+2.14.1
+

diff --git a/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild
new file mode 100644
index 00000000000..0fccc223e07
--- /dev/null
+++ b/sys-fs/quota/quota-4.04-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap netlink nls rpc tcpd"
+
+RDEPEND="
+	ldap? ( >=net-nds/openldap-2.3.35 )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? (
+		net-nds/rpcbind
+		|| (	sys-libs/glibc[rpc(-)]
+			(
+				net-libs/rpcsvc-proto
+			)
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc226.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}"
+		$(use_enable nls)
+		$(use_enable ldap ldapmail)
+		$(use_enable netlink)
+		$(use_enable rpc)
+		$(use_enable rpc rpcsetquota)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2018-09-18  8:54 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-09-18  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b97ff58fca5ce104dbc558200389dd6ddda9e64e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 08:54:01 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 08:54:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97ff58f

sys-fs/quota: Fixed high CPU usage with USE="rpc".

Closes: https://bugs.gentoo.org/658022
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/quota-4.04-Listen-on-a-TCP-socket.patch  | 77 ++++++++++++++++++++
 sys-fs/quota/quota-4.04-r2.ebuild                  | 82 ++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
new file mode 100644
index 00000000000..cf1bd4aad32
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
@@ -0,0 +1,77 @@
+From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Tue, 22 May 2018 12:41:59 +0200
+Subject: [PATCH] Listen on a TCP socket
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
+connections because the polled TCP socket is not listening:
+
+poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
+  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
+accept(5, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
+accept(7, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
+
+The polled descriptors are:
+
+rpc.rquot 21981 root    4u  IPv4 80449159      0t0      UDP *:rquotad
+rpc.rquot 21981 root    5u  sock      0,9      0t0 80449162 protocol: TCP
+rpc.rquot 21981 root    6u  IPv6 80449165      0t0      UDP *:rquotad
+rpc.rquot 21981 root    7u  sock      0,9      0t0 80449168 protocol: TCPv6
+
+That results into a high CPU usage just after staring rpc.rquotad
+process.
+
+This patch adds a listen() call to svc_create_sock()
+routine which is needed with libtirpc version of svc_tli_create()
+as well as a needed IPv6 setsockopt().
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ svc_socket.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/svc_socket.c b/svc_socket.c
+index 8a44604..d2e3abf 100644
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
+ 		return -1;
+ 	}
+ 
++	if (ai->ai_family == AF_INET6) {
++		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
++				&optval, sizeof(optval)) < 0) {
++			errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno));
++			close(fd);
++			return -1;
++		}
++	}
++
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
+ 		errstr(_("Cannot set socket options: %s\n"), strerror(errno));
+ 		close(fd);
+@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
+ 		close(fd);
+ 		return -1;
+ 	}
++
++	if (ai->ai_protocol == IPPROTO_TCP) {
++		if (listen(fd, SOMAXCONN) < 0) {
++			errstr(_("Cannot listen to address: %s\n"), strerror(errno));
++			close(fd);
++			return -1;
++		}
++	}
++
+ 	return fd;
+ }
+ 
+-- 
+2.14.3
+

diff --git a/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild
new file mode 100644
index 00000000000..a6080157d8e
--- /dev/null
+++ b/sys-fs/quota/quota-4.04-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap netlink nls rpc tcpd"
+
+RDEPEND="
+	ldap? ( >=net-nds/openldap-2.3.35 )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? (
+		net-nds/rpcbind
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc
+		net-libs/rpcsvc-proto
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc226.patch"
+	"${FILESDIR}/${P}-Listen-on-a-TCP-socket.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}"
+		$(use_enable nls)
+		$(use_enable ldap ldapmail)
+		$(use_enable netlink)
+		$(use_enable rpc)
+		$(use_enable rpc rpcsetquota)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2020-11-10 13:34 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-11-10 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     430c71cb5a39799ec0dc511eebeb090b2bf99eba
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 13:34:02 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 13:34:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430c71cb

sys-fs/quota: Removed old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/quota/Manifest                              |  1 -
 .../files/quota-4.04-Listen-on-a-TCP-socket.patch  | 77 --------------------
 sys-fs/quota/files/quota-4.04-glibc226.patch       | 43 -----------
 sys-fs/quota/quota-4.04-r3.ebuild                  | 85 ----------------------
 4 files changed, 206 deletions(-)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 32589367d8a..54bfef226d5 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,3 +1,2 @@
-DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871

diff --git a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
deleted file mode 100644
index cf1bd4aad32..00000000000
--- a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Tue, 22 May 2018 12:41:59 +0200
-Subject: [PATCH] Listen on a TCP socket
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
-connections because the polled TCP socket is not listening:
-
-poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
-  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
-accept(5, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
-accept(7, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
-
-The polled descriptors are:
-
-rpc.rquot 21981 root    4u  IPv4 80449159      0t0      UDP *:rquotad
-rpc.rquot 21981 root    5u  sock      0,9      0t0 80449162 protocol: TCP
-rpc.rquot 21981 root    6u  IPv6 80449165      0t0      UDP *:rquotad
-rpc.rquot 21981 root    7u  sock      0,9      0t0 80449168 protocol: TCPv6
-
-That results into a high CPU usage just after staring rpc.rquotad
-process.
-
-This patch adds a listen() call to svc_create_sock()
-routine which is needed with libtirpc version of svc_tli_create()
-as well as a needed IPv6 setsockopt().
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- svc_socket.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/svc_socket.c b/svc_socket.c
-index 8a44604..d2e3abf 100644
---- a/svc_socket.c
-+++ b/svc_socket.c
-@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
- 		return -1;
- 	}
- 
-+	if (ai->ai_family == AF_INET6) {
-+		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-+				&optval, sizeof(optval)) < 0) {
-+			errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno));
-+			close(fd);
-+			return -1;
-+		}
-+	}
-+
- 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
- 		errstr(_("Cannot set socket options: %s\n"), strerror(errno));
- 		close(fd);
-@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
- 		close(fd);
- 		return -1;
- 	}
-+
-+	if (ai->ai_protocol == IPPROTO_TCP) {
-+		if (listen(fd, SOMAXCONN) < 0) {
-+			errstr(_("Cannot listen to address: %s\n"), strerror(errno));
-+			close(fd);
-+			return -1;
-+		}
-+	}
-+
- 	return fd;
- }
- 
--- 
-2.14.3
-

diff --git a/sys-fs/quota/files/quota-4.04-glibc226.patch b/sys-fs/quota/files/quota-4.04-glibc226.patch
deleted file mode 100644
index 5f63cde7d42..00000000000
--- a/sys-fs/quota/files/quota-4.04-glibc226.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bbb8819fc0f6ed379a05d635a61bcf9c8986079f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 16 Sep 2017 13:09:43 +0200
-Subject: [PATCH] Add $(TIRPC_CFLAGS) globally to CFLAGS for RPC support,
- needed for libc 2.26
-
----
- Makefile.am | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8d80bee..278290a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -51,6 +51,8 @@ EXTRA_DIST = \
- noinst_LIBRARIES = libquota.a
- 
- if WITH_RPC
-+CFLAGS += $(TIRPC_CFLAGS)
-+
- rpcsvcdir = $(includedir)/rpcsvc
- rpcsvc_DATA = \
- 	rquota.h \
-@@ -100,8 +102,6 @@ libquota_a_SOURCES = \
- 	mntopt.h \
- 	pot.c \
- 	pot.h
--libquota_a_CFLAGS = \
--	$(TIRPC_CFLAGS)
- libquota_a_LIBADD = \
- 	$(RPCLIBS)
- 
-@@ -235,7 +235,6 @@ rpc_rquotad_SOURCES = \
- 	rquota_server.c \
- 	rquota_svc.c \
- 	svc_socket.c
--rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS)
- rpc_rquotad_LDADD = \
- 	libquota.a \
- 	$(WRAP_LIBS) \
--- 
-2.14.1
-

diff --git a/sys-fs/quota/quota-4.04-r3.ebuild b/sys-fs/quota/quota-4.04-r3.ebuild
deleted file mode 100644
index 9a208fb2b9a..00000000000
--- a/sys-fs/quota/quota-4.04-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ldap netlink nls rpc tcpd"
-
-RDEPEND="
-	sys-fs/e2fsprogs
-	ldap? ( >=net-nds/openldap-2.3.35 )
-	netlink? (
-		sys-apps/dbus
-		dev-libs/libnl:3
-	)
-	rpc? (
-		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
-		net-libs/libtirpc
-		net-libs/rpcsvc-proto
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-PDEPEND="
-	rpc? ( net-nds/rpcbind )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc226.patch"
-	"${FILESDIR}/${P}-Listen-on-a-TCP-socket.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-ext2direct
-		$(use_enable nls)
-		$(use_enable ldap ldapmail)
-		$(use_enable netlink)
-		$(use_enable rpc)
-		$(use_enable rpc rpcsetquota)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	newinitd "${FILESDIR}"/quota.rc7 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		insopts -m0644
-		doins "${FILESDIR}"/ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe "${FILESDIR}"/ldap-scripts/*.pl
-		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
-	fi
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2022-01-13 10:25 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-01-13 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     f4cae72bff7ab14e21f3f73f97308e0b035db769
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 10:25:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 10:25:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cae72b

sys-fs/quota: fix build on musl

Closes: https://bugs.gentoo.org/713390
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/quota/files/quota-4.06-musl-cdefs.patch | 20 ++++++++++++++++++++
 sys-fs/quota/quota-4.06.ebuild                 | 18 ++++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/sys-fs/quota/files/quota-4.06-musl-cdefs.patch b/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
new file mode 100644
index 000000000000..286fc481b6b3
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
@@ -0,0 +1,20 @@
+https://sourceforge.net/p/linuxquota/code/ci/1959f3768a284315250acd4d17a9f5ef0b8ea189/tree/quota.h?diff=43b6e31f39edbe7de4f4feeef4d0cf6be093e021
+https://bugs.gentoo.org/713390
+--- a/quota.h
++++ b/quota.h
+@@ -1,7 +1,6 @@
+ #ifndef GUARD_QUOTA_H
+ #define GUARD_QUOTA_H
+ 
+-#include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+ 
+@@ -182,6 +181,6 @@
+ 	#endif
+ #endif
+ 
+-long quotactl __P((int, const char *, qid_t, caddr_t));
++long quotactl(int, const char *, qid_t, caddr_t);
+ 
+ #endif /* _QUOTA_ */

diff --git a/sys-fs/quota/quota-4.06.ebuild b/sys-fs/quota/quota-4.06.ebuild
index 3ca2ad3dd987..1c4cd2de9211 100644
--- a/sys-fs/quota/quota-4.06.ebuild
+++ b/sys-fs/quota/quota-4.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,21 +23,22 @@ RDEPEND="
 	)
 	rpc? (
 		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
-		net-libs/libtirpc
+		net-libs/libtirpc:=
 		net-libs/rpcsvc-proto
 	)
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-PDEPEND="
-	rpc? ( net-nds/rpcbind )
-"
+BDEPEND="nls? ( sys-devel/gettext )"
+PDEPEND="rpc? ( net-nds/rpcbind )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-cdefs.patch
+)
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -50,6 +51,7 @@ src_configure() {
 		$(use_enable rpc)
 		$(use_enable rpc rpcsetquota)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2022-09-23  2:54 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-09-23  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     113ecc58b17cf02f9d1ef1b9b0ccc0978fd86f92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 02:42:22 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 02:42:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113ecc58

sys-fs/quota: add 4.09

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/quota/Manifest                              |  1 +
 .../quota/files/quota-4.09-configure-bashism.patch | 16 +++++
 .../quota/files/quota-4.09-gettext-version.patch   | 14 ++++
 sys-fs/quota/quota-4.09.ebuild                     | 84 ++++++++++++++++++++++
 4 files changed, 115 insertions(+)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index ebd4c38e4346..c18c1f799be4 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1 +1,2 @@
 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
+DIST quota-4.09.tar.gz 523191 BLAKE2B 30b3828a45dcd7d99ff053f362917c138b1f0bcbde5f6fd3dfc1b48cb12615e5673d852f9276f2b370f9c799a2103e220d91ddf6a770aaaf8944cfb5c1131a74 SHA512 003d45f33543d4c87446e6547079cdae293b8dade01c58cf3626623721a1400ee07681395ad656c23a9ea2a62ab27c6ad24ad55600890e6e25334aba27ab1ad5

diff --git a/sys-fs/quota/files/quota-4.09-configure-bashism.patch b/sys-fs/quota/files/quota-4.09-configure-bashism.patch
new file mode 100644
index 000000000000..5866d3873dde
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.09-configure-bashism.patch
@@ -0,0 +1,16 @@
+https://sourceforge.net/p/linuxquota/patches/56/
+
+configure: WARNING: tcpd.h not found
+./configure: 8453: test: X: unexpected operator
+checking that generated files are newer than configure... done
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,7 +283,7 @@ AC_ARG_WITH([pid-dir],
+     [AS_HELP_STRING([--with-pid-dir=DIRECTORY], [Create PID files in this directory instead of /var/run])],
+     [with_pid_dir="$withval"]
+ )
+-AS_IF([test "X$with_pid_dir" == "X" -o "$with_pid_dir" == "yes" -o "$with_pid_dir" == "no"],[
++AS_IF([test "X$with_pid_dir" = "X" -o "$with_pid_dir" = "yes" -o "$with_pid_dir" = "no"],[
+     with_pid_dir="/var/run"
+ ])
+ AC_DEFINE_UNQUOTED([PID_DIR], ["$with_pid_dir"], [Directory for PID files])

diff --git a/sys-fs/quota/files/quota-4.09-gettext-version.patch b/sys-fs/quota/files/quota-4.09-gettext-version.patch
new file mode 100644
index 000000000000..1dc194f8b473
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.09-gettext-version.patch
@@ -0,0 +1,14 @@
+https://sourceforge.net/p/linuxquota/bugs/142/
+
+Avoids e.g. egrep warnings.
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ AC_CHECK_FUNC([nl_langinfo], [
+ # Gettext support
+ # ===============
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.12.1])
++AM_GNU_GETTEXT_VERSION([0.21])
+ 
+ AS_IF([test "$enable_nls" != "no"], [
+     enable_nls="yes"

diff --git a/sys-fs/quota/quota-4.09.ebuild b/sys-fs/quota/quota-4.09.ebuild
new file mode 100644
index 000000000000..2c2297f50915
--- /dev/null
+++ b/sys-fs/quota/quota-4.09.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ldap netlink nls rpc tcpd"
+
+RDEPEND="
+	sys-fs/e2fsprogs
+	ldap? ( >=net-nds/openldap-2.3.35:= )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? (
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc:=
+		net-libs/rpcsvc-proto
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+PDEPEND="rpc? ( net-nds/rpcbind )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.09-configure-bashism.patch
+	"${FILESDIR}"/${PN}-4.09-gettext-version.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for bashism patch and stale macros patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ext2direct
+		$(use_enable nls)
+		$(use_enable ldap ldapmail)
+		$(use_enable netlink)
+		$(use_enable rpc)
+		$(use_enable rpc rpcsetquota)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2022-12-26  8:35 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-12-26  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6bb6fbc076b1d9e9cf16bb9af8e79c672ec42203
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 08:29:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 08:33:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb6fbc0

sys-fs/quota: drop 4.06-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/quota/Manifest                          |  1 -
 sys-fs/quota/files/quota-4.06-musl-cdefs.patch | 20 -------
 sys-fs/quota/quota-4.06-r1.ebuild              | 82 --------------------------
 3 files changed, 103 deletions(-)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index c18c1f799be4..de8eeb05f7a9 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,2 +1 @@
-DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
 DIST quota-4.09.tar.gz 523191 BLAKE2B 30b3828a45dcd7d99ff053f362917c138b1f0bcbde5f6fd3dfc1b48cb12615e5673d852f9276f2b370f9c799a2103e220d91ddf6a770aaaf8944cfb5c1131a74 SHA512 003d45f33543d4c87446e6547079cdae293b8dade01c58cf3626623721a1400ee07681395ad656c23a9ea2a62ab27c6ad24ad55600890e6e25334aba27ab1ad5

diff --git a/sys-fs/quota/files/quota-4.06-musl-cdefs.patch b/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
deleted file mode 100644
index 286fc481b6b3..000000000000
--- a/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://sourceforge.net/p/linuxquota/code/ci/1959f3768a284315250acd4d17a9f5ef0b8ea189/tree/quota.h?diff=43b6e31f39edbe7de4f4feeef4d0cf6be093e021
-https://bugs.gentoo.org/713390
---- a/quota.h
-+++ b/quota.h
-@@ -1,7 +1,6 @@
- #ifndef GUARD_QUOTA_H
- #define GUARD_QUOTA_H
- 
--#include <sys/cdefs.h>
- #include <sys/types.h>
- #include <stdint.h>
- 
-@@ -182,6 +181,6 @@
- 	#endif
- #endif
- 
--long quotactl __P((int, const char *, qid_t, caddr_t));
-+long quotactl(int, const char *, qid_t, caddr_t);
- 
- #endif /* _QUOTA_ */

diff --git a/sys-fs/quota/quota-4.06-r1.ebuild b/sys-fs/quota/quota-4.06-r1.ebuild
deleted file mode 100644
index 60b635e13264..000000000000
--- a/sys-fs/quota/quota-4.06-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="ldap netlink nls rpc tcpd"
-
-RDEPEND="
-	sys-fs/e2fsprogs
-	ldap? ( >=net-nds/openldap-2.3.35:= )
-	netlink? (
-		sys-apps/dbus
-		dev-libs/libnl:3
-	)
-	rpc? (
-		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
-		net-libs/libtirpc:=
-		net-libs/rpcsvc-proto
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-PDEPEND="rpc? ( net-nds/rpcbind )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-cdefs.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-ext2direct
-		$(use_enable nls)
-		$(use_enable ldap ldapmail)
-		$(use_enable netlink)
-		$(use_enable rpc)
-		$(use_enable rpc rpcsetquota)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	newinitd "${FILESDIR}"/quota.rc7 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		insopts -m0644
-		doins "${FILESDIR}"/ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe "${FILESDIR}"/ldap-scripts/*.pl
-		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
-	fi
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/
@ 2024-08-04 20:56 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2024-08-04 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e3a356162a1a5781b91fdd1722bb75421ac9cad0
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 22 17:15:36 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 20:55:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a35616

sys-fs/quota: Fix implicit declaration of function basename

Closes: https://bugs.gentoo.org/935812
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37675
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../files/quota-4.09-fix-building-on-musl.patch    | 187 +++++++++++++++++++++
 sys-fs/quota/quota-4.09-r1.ebuild                  |  86 ++++++++++
 2 files changed, 273 insertions(+)

diff --git a/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch
new file mode 100644
index 000000000000..5c8e0fdbb4ad
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch
@@ -0,0 +1,187 @@
+https://sourceforge.net/p/linuxquota/code/ci/e73c5b48e12c3f02e532864a1107cdc8a4feafc3/
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sun, 14 Jul 2024 07:58:50 +0000
+Subject: [PATCH 1/1] Fix building on musl
+
+basename(3) is defined in libgen.h in MUSL. Include libgen.h where
+basename(3) is used.
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+Signed-off-by: Jan Kara <jack@suse.cz>
+--- a/convertquota.c
++++ b/convertquota.c
+@@ -14,6 +14,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ 
+ #include <endian.h>
+ 
+--- a/edquota.c
++++ b/edquota.c
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <getopt.h>
++#include <libgen.h>
+ 
+ #include "pot.h"
+ #include "quotaops.h"
+@@ -38,7 +39,7 @@ char *progname;
+ static int flags, quotatype;
+ static int fmt = -1;
+ static char *protoname;
+-static char *dirname;
++static char *dir_name;
+ 
+ static void usage(void)
+ {
+@@ -138,7 +139,7 @@ static int parse_options(int argc, char **argv)
+ 				  exit(1);
+ 			  break;
+ 		  case 'f':
+-			  dirname = optarg;
++			  dir_name = optarg;
+ 			  break;
+ 		  case 256:
+ 			  flags |= FL_NUMNAMES;
+@@ -176,7 +177,7 @@ static void copy_prototype(int argc, char **argv, struct quota_handle **handles)
+ 	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, !dir_name);
+ 		if (!curprivs)
+ 			die(1, _("Cannot get quota information for user %s\n"), *argv);
+ 		argv++;
+@@ -223,7 +224,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(dir_name ? 1 : 0, dir_name ? &dir_name : NULL, quotatype, fmt,
+ 			(flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS,
+ 			(flags & FL_REMOTE) ? 0 : MS_LOCALONLY);
+ 	if (!handles[0]) {
+@@ -296,7 +297,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, !dir_name);
+ 			if (!curprivs)
+ 				die(1, _("Cannot get quota information for user %s.\n"), *argv);
+ 			if (flags & FL_EDIT_TIMES) {
+--- a/quota.c
++++ b/quota.c
+@@ -20,6 +20,7 @@
+ #include <unistd.h>
+ #include <limits.h>
+ #include <ctype.h>
++#include <libgen.h>
+ #ifdef RPC
+ #include <rpc/rpc.h>
+ #include "rquota.h"
+--- a/quota_nld.c
++++ b/quota_nld.c
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <limits.h>
+ #include <signal.h>
++#include <libgen.h>
+ #include <sys/stat.h>
+ #include <asm/types.h>
+ 
+--- a/quotacheck.c
++++ b/quotacheck.c
+@@ -19,6 +19,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <libgen.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+--- a/quotaon.c
++++ b/quotaon.c
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <libgen.h>
+ 
+ #include "quotaon.h"
+ #include "quota.h"
+--- a/quotastats.c
++++ b/quotastats.c
+@@ -24,6 +24,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <signal.h>
++#include <libgen.h>
+ 
+ #include "pot.h"
+ #include "common.h"
+--- a/quotasync.c
++++ b/quotasync.c
+@@ -7,6 +7,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ 
+ #include "pot.h"
+ #include "common.h"
+--- a/repquota.c
++++ b/repquota.c
+@@ -18,6 +18,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <getopt.h>
++#include <libgen.h>
+ 
+ #include "pot.h"
+ #include "common.h"
+--- a/rquota_svc.c
++++ b/rquota_svc.c
+@@ -34,6 +34,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <netconfig.h>
++#include <libgen.h>
+ #ifdef HOSTS_ACCESS
+ #include <tcpd.h>
+ #include <netdb.h>
+--- a/setquota.c
++++ b/setquota.c
+@@ -18,6 +18,7 @@
+ #include <time.h>
+ #include <ctype.h>
+ #include <stdlib.h>
++#include <libgen.h>
+ 
+ #if defined(RPC)
+ #include "rquota.h"
+--- a/warnquota.c
++++ b/warnquota.c
+@@ -31,6 +31,7 @@
+ #include <time.h>
+ #include <getopt.h>
+ #include <locale.h>
++#include <libgen.h>
+ #ifdef HAVE_NL_LANGINFO
+ #include <langinfo.h>
+ #endif
+--- a/xqmstats.c
++++ b/xqmstats.c
+@@ -8,6 +8,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <libgen.h>
+ #include "common.h"
+ #include "pot.h"
+ 
+-- 
+2.45.2

diff --git a/sys-fs/quota/quota-4.09-r1.ebuild b/sys-fs/quota/quota-4.09-r1.ebuild
new file mode 100644
index 000000000000..10e3bf5b8c7a
--- /dev/null
+++ b/sys-fs/quota/quota-4.09-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
+SRC_URI="https://downloads.sourceforge.net/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ldap netlink nls rpc selinux tcpd"
+
+RDEPEND="
+	sys-fs/e2fsprogs
+	ldap? ( >=net-nds/openldap-2.3.35:= )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? (
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc:=
+		net-libs/rpcsvc-proto
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+PDEPEND="rpc? ( net-nds/rpcbind )"
+RDEPEND+=" selinux? ( sec-policy/selinux-quota )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.09-configure-bashism.patch
+	"${FILESDIR}"/${PN}-4.09-gettext-version.patch
+	"${FILESDIR}"/${PN}-4.09-fix-building-on-musl.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for bashism patch and stale macros patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ext2direct
+		$(use_enable nls)
+		$(use_enable ldap ldapmail)
+		$(use_enable netlink)
+		$(use_enable rpc)
+		$(use_enable rpc rpcsetquota)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-08-04 20:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-04 20:56 [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/ Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2022-12-26  8:35 Sam James
2022-09-23  2:54 Sam James
2022-01-13 10:25 Sam James
2020-11-10 13:34 Lars Wendler
2018-09-18  8:54 Lars Wendler
2017-09-16 11:54 Andreas Hüttel
2017-09-05 20:40 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox