Add check() to initscript, #357089

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index ea5363295ba8..a60a461df082 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/quota
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.49 2011/02/26 16:49:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.50 2011/03/03 07:26:27 jlec Exp $
+
+*quota-3.17-r1 (03 Mar 2011)
+
+  03 Mar 2011; Justin Lecher <jlec@gentoo.org> +quota-3.17-r1.ebuild,
+  +files/quota.rc7:
+  Add check() to initscript, #357089
 
   26 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> quota-3.17.ebuild:
   Marked ~ppc64 wrt #340455
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index d45072d6cacc..5f8362004ab9 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX quota-3.06-no-stripping.patch 583 RMD160 7ccf602a30a714284b2f1fb205c6b7f36601a64f SHA1 f2ba9a26a260fdaec8028f8e7dd18c276f5f561d SHA256 89840a957563191b3bec910c8564fc46c00f972e46409aa3bc329d6966985d25
 AUX quota-3.13-configure-LANG.patch 1464 RMD160 75cb1ee7f63098c95515c6fda47f1c63e1d83487 SHA1 cbe4cb2ffad094da09ec271e67b3bbe49d9e5e14 SHA256 f3cfc4ecd3a59a02163dc865f6948239082629ed740e5e583f34e159b8fe8b2f
 AUX quota-3.14-headers.patch 183 RMD160 b0e2a9365c5802d8b316efabc6316571b48ffdad SHA1 fe0ce566d2a467e0e732d9733bb2b11dec0d3a57 SHA256 d66c88ab3ae48ebb9a1d4221b4d65e79d396e0624666da21beb8304f1ffabab0
@@ -5,6 +8,7 @@ AUX quota-no-quotactl-manpage.patch 958 RMD160 48c27b48d02a6e53ef3728abbe534d9c2
 AUX quota.confd 359 RMD160 bff7566a6b1c112e3e705f2beda90e59222e2546 SHA1 fc924c1778da226f74e88d1dda48441b4ad45a0e SHA256 00d1dfb3b893db5d6a213a4edda622c7d64dcafa40b3019f15e070c164286632
 AUX quota.rc 650 RMD160 2230f40a5a45fb96187ebf0eb3a718fa9c5a0c26 SHA1 fab9137db90d64be88222105ecb631cefa86470b SHA256 57111082dc0283d724b49f3ba2be4d3f4cda45cb2353a902fc83fc28bd2b5fd2
 AUX quota.rc6 585 RMD160 2fe2f1bfdf53915d74e430917ecc6f3834bce723 SHA1 ff646c87af93c1e154a4d87e3b5fba6eb8157597 SHA256 12b803803453100e5562a7f8a9b612e73f1a7c64f991a9039fe3e693cc4f1b97
+AUX quota.rc7 789 RMD160 71a1faf7a3c270c84693f4e8308c2d7af4e633f2 SHA1 135ea9bced26e89f22906248f99b63590d5166be SHA256 2052d37738b9285658461cbcb4fda81294567bac30a379fb1af9538ee1a010fc
 AUX rpc.rquotad.initd 563 RMD160 4a05fe22437adcf6498d0301a356b8a3b6eb00ec SHA1 a3612610f7dd47e57dcb43e5f2b0847b91805528 SHA256 c3896303d6cfebf314a3f6b8aeed0f6cb6ae421c4c0923b0121c76b3251314e5
 DIST quota-3.14.tar.gz 249016 RMD160 2282bb8b14d6e61beea0841cac5a67eec9f3d85d SHA1 46f862737a7530e84bb7c86cf7f1f82c010a7ccd SHA256 e4226a5dc77303d417905658210ce861e1eb904bc2c7acd401c3a1373715942d
 DIST quota-3.15.tar.gz 313030 RMD160 a6ae9091c000bed092f7dd2a9bcc66b730d0b7af SHA1 3a1ea8d48910ef760950e2c2e236e9c2e44dea3a SHA256 9272806f605a1df889e7e9ae903a65c1ac4e80bcaf83f9bcb25fb51092ebd1ae
@@ -13,6 +17,14 @@ DIST quota-3.17.tar.gz 439168 RMD160 4bc89fd2199c0db38f42e3748c14e83787ac4d06 SH
 EBUILD quota-3.14-r1.ebuild 2010 RMD160 68af5bf609db663802483d82418fba6eda72ea33 SHA1 31cfa02c671e90975bf62e18ce70298553761a74 SHA256 d555e3acb03c05df9193aac0cb5a77a6a9f37287906afca4ed66292f20b5ac11
 EBUILD quota-3.15.ebuild 1924 RMD160 c73c980e6bf15128e6655f771a2d44d9801320cf SHA1 c60a16e6ba68ab9919733c728609be6789d0e558 SHA256 a62dc2dc6227c1c53429d8fa373b569e70404c083fe577b2052c7901ed78800b
 EBUILD quota-3.16.ebuild 1852 RMD160 ef053c379af267d6131e63fa768fce7b97df8648 SHA1 71ec610cce51f8820decb06a3b2cc3c53c0eaa24 SHA256 ead773147e1d66e22e21738fdddb3751d3e2c75be09af26e203089a9f5acb07b
+EBUILD quota-3.17-r1.ebuild 1888 RMD160 e2042ede7d11e9bee739456dd0d9f769fd30fa05 SHA1 ccb4f38f3f14d410a3e0b3433c287f0176d814fe SHA256 abb45f86dd300d1a7573f9392210886b232262aaa6e8a2e992471d091993fb8d
 EBUILD quota-3.17.ebuild 1884 RMD160 4b39b7e6f43aa3b830b1e0d791efa99fdcbc6327 SHA1 783cf59c0692c8253aac7a96ea7802174d7eab18 SHA256 09c4187c6cda2434609cf0ca8d59ed9b1105097b783a7661f8408705da545833
-MISC ChangeLog 10208 RMD160 a8366ec6dd550727c6b80f865fd808bc6cc9c7e7 SHA1 d1de3d6dd749d499d30dbe123d76f8828ed1bea8 SHA256 96b5f1abd3caac49d1630d59bb7457f306fc20515a34eafbabc5e627eaa72f57
+MISC ChangeLog 10360 RMD160 dd1cd5fb922be24ca3f20fd9eee39165a03a52d8 SHA1 09e804c88ed4130c3a72f58c729dd7c9fd86bb27 SHA256 6f8746b27626f1169517f807be04372819c3ceb3569687dbdc9b862d398ddedc
 MISC metadata.xml 235 RMD160 58f4d53082fd06bf93b41ca5229de2d9e43a4e17 SHA1 b51a92a85ef7d0d32c36238056c4ff8cecf15ce3 SHA256 4e987111842a02f68c8186dbaa83bd53c024d805ebe597d2cc6a7e1e28216023
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1vQqgACgkQgAnW8HDreRZM4ACfcSiGAEG93rzIP/VrCxt3NjNb
+kfQAoIT1kgNoqovnjBgOVXp/Vedmer32
+=a5hK
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/quota/files/quota.rc7 b/sys-fs/quota/files/quota.rc7
new file mode 100644
index 000000000000..9fd2d900cd2e
--- /dev/null
+++ b/sys-fs/quota/files/quota.rc7
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/quota.rc7,v 1.1 2011/03/03 07:26:27 jlec Exp $
+
+extra_started_commands="check"
+description_check="Running quotacheck with quota being offline"
+
+depend() {
+	need localmount
+	use portmap
+}
+
+start() {
+	if [[ ${RUN_QUOTACHECK} == "yes" ]] ; then
+		ebegin "Checking quotas (may take a while)"
+		quotacheck ${QUOTACHECK_OPTS}
+		eend $?
+	fi
+
+	ebegin "Starting quota"
+	quotaon ${QUOTAON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping quota"
+	quotaoff ${QUOTAOFF_OPTS}
+	eend $?
+}
+
+check() {
+	ebegin "Checking quota"
+	quotaoff ${QUOTAOFF_OPTS} && \
+	quotacheck ${QUOTACHECK_OPTS} && \
+	quotaon ${QUOTAON_OPTS}
+	eend $?
+}
diff --git a/sys-fs/quota/quota-3.17-r1.ebuild b/sys-fs/quota/quota-3.17-r1.ebuild
new file mode 100644
index 000000000000..0f41a756e0c9
--- /dev/null
+++ b/sys-fs/quota/quota-3.17-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.17-r1.ebuild,v 1.1 2011/03/03 07:26:27 jlec Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://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
+
+	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
+}