Stop accounting properly thanks to Eugeny Shkrigunov (bug #316517).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

7 files changed, 10 insertions, 164 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index cfcb3bb6ae37..49b5695c16a3 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.23 2010/03/11 18:35:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.24 2010/04/28 19:09:13 jer Exp $
+
+  28 Apr 2010; Jeroen Roovers <jer@gentoo.org> -acct-6.3.5-r1.ebuild,
+  -acct-6.3.5-r2.ebuild, -files/acct.rc6-6.3.5-r3, -acct-6.3.5-r3.ebuild,
+  files/acct.rc6:
+  Stop accounting properly thanks to Eugeny Shkrigunov (bug #316517).
 
   11 Mar 2010; Markos Chandras <hwoarang@gentoo.org> acct-6.5.1.ebuild:
   Stable on amd64 wrt bug #302285
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index d229594d0925..5f13aee85193 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,16 +1,10 @@
 AUX acct.confd 389 RMD160 4059420389cfe442983e55f7e23e4a9df7473743 SHA1 0dd7b18b9c0a76218ceec46607fe34b63d80e4ba SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31
-AUX acct.rc6 668 RMD160 9bbe7ef507b731dff9c7505797e02ccbcdc188c3 SHA1 107930df231ac18fb2ef53b13aa51d0acfcc8ac3 SHA256 66ebb05426462340b3330e94689f7a7af9aefcbda38a35a058b243de7800f7ee
-AUX acct.rc6-6.3.5-r3 690 RMD160 9148a0f47d80e545a01cedc54e49f3a6743dcf99 SHA1 a6700a3085128eb87b31742b95f316939b94cb92 SHA256 8706de6196a8896c1b372fe5af67aca3e9add421d5e0e19f6a4fc90b3a94ec87
-DIST acct-6.3.5-ts02-11.tar.gz 307681 RMD160 8e7d2c1894394fee1904cd5320f8188fc1eedde9 SHA1 3567231bfd63d3d463f3ff85bbe260c6ab96fa9b SHA256 2971ba98600c60239c42f0427b53daad0c9535f398e91f2c9445b8369b811400
-DIST acct-6.3.5-ts02-12.tar.gz 295925 RMD160 9a988eb73c17b87838cd8d7d91022cbdb489200e SHA1 8fdba38ed54ae355a99727a51ad43832be305219 SHA256 a313700af0b655a2e9b97cf6d8fb97ba65372d25fc2016aab1ab722dc3010870
+AUX acct.rc6 669 RMD160 189df29d95eae20ba040aaeb33baae1db5a229b6 SHA1 5b58d4d46add183632fa5c11f64389fc893529fc SHA256 f8d09eeaff38c4e442d19966d7bbfa0e9d08d2173a661e22e3ec25ffef119413
 DIST acct-6.5.1.tar.gz 625140 RMD160 862bec0dc5f17ff31a2958dc7ef66d6781351df1 SHA1 e7393004864699daa73d5981af060fad2e0cb76e SHA256 c08fd478e452493467d0142dc5b405784e9efec9b279e6205d2650173324c211
 DIST acct-6.5.3.tar.gz 649490 RMD160 a76dd2f981db59f247d127d1df9809b505c515d8 SHA1 2b2b9f0e90281dee0f26f7325a5396ea11637eab SHA256 b45603b2b8c13b1f495d89720c458dd8f485fdbac4835cad3dcbb1b078fa8828
 DIST acct-6.5.4.tar.gz 643605 RMD160 3750b49ced07f028ca5881e94d7b6e29c4c0a62d SHA1 0102c906160225303014af0d1f76d5542d305622 SHA256 6ac2f5d7dd327b8434b05671fe49815c19e14af920c860efc121529bc1d979bb
-EBUILD acct-6.3.5-r1.ebuild 965 RMD160 e37eb4cd0e1196f6d9998f87c15ae33d5de22325 SHA1 5bf957b2176edafd1a6589c6fd3c4e7d004cd60a SHA256 3faab53655d0bf523ca0ac41302e329a653975ab3114a6c6708aa0d76720ad23
-EBUILD acct-6.3.5-r2.ebuild 1007 RMD160 5ce5ce3fe4123ebb17b61d231f68272320a36a2f SHA1 d5ee1ea61cae86fbe3ae55791b4cef17a58163a3 SHA256 11479bef5de43ae2eabeb229113941e2818aaed10051e86db6990ce2f80c537b
-EBUILD acct-6.3.5-r3.ebuild 1149 RMD160 cd8203c0702823c27d293e032dec6e6dd9e8fda3 SHA1 5be1f9969815e4a487eddd3a175cf656d66f1b93 SHA256 588a101cdecadcba9157135c503eaa4ac9374e07332de9efd8b228fa643fb96b
 EBUILD acct-6.5.1.ebuild 929 RMD160 d6bfced11609b7782ecfcfd83f20fe9c8628517a SHA1 bf50382160ef231703a67426e837c47f5530f37b SHA256 35b6807ff0597007289258dff7c143da916530aba5133a8f41ca0b39ce94abe0
 EBUILD acct-6.5.3.ebuild 929 RMD160 aa11cb8aab21e5cff003d0153d5633b7a69475a5 SHA1 1761e5938bfc237db828c64b81011237db11ccc6 SHA256 cd88625c10e93b529da6e9033f0a17af330deb87da6ebfa5922bf578d9639d97
 EBUILD acct-6.5.4.ebuild 929 RMD160 e2600febd4d1204b044b2c4bd990e875d53e7d5f SHA1 cbbca0a3912d504b84658ac4decbccad22e19b02 SHA256 ef01e4d6273aa63279cda0eca92603e6532fb62f29b797ccd72ad0a575aeab25
-MISC ChangeLog 4056 RMD160 5bebf2a31f33d6116671e83be92eadcb23402bdb SHA1 b525000f838aa47a689f4bb1e0d25884c8db9425 SHA256 9a186c1cb8913ef391e36ae297a72b300754c042ee16b9f8ed8626cd6e88fe14
+MISC ChangeLog 4284 RMD160 8f753f1817a0c1068591e380c04cc6504042a0bb SHA1 0368402c5ffceb863b043595771cc211ebd1a645 SHA256 cbd365e687190a0c3536a07b6f60031987e5ec5e2908916ea12c6421ba897e1d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-process/acct/acct-6.3.5-r1.ebuild b/sys-process/acct/acct-6.3.5-r1.ebuild
deleted file mode 100644
index 511b6dc2b46e..000000000000
--- a/sys-process/acct/acct-6.3.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.3.5-r1.ebuild,v 1.6 2005/10/04 23:48:01 vapier Exp $
-
-inherit eutils
-
-PATCH_VER="ts02-11"
-MY_P=${P}-${PATCH_VER}
-DESCRIPTION="GNU system accounting utilities"
-HOMEPAGE="http://www.gnu.org/directory/acct.html"
-SRC_URI="http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/old/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf --enable-linux-multiformat || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	dobin ac lastcomm || die "dobin failed"
-	dosbin dump-utmp dump-acct accton sa || die "dosbin failed"
-	doinfo accounting.info
-	doman {ac,lastcomm}.1 {accton,sa}.8
-	dodoc AUTHORS ChangeLog INSTALL NEWS README ToDo
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.rc6 acct
-}
diff --git a/sys-process/acct/acct-6.3.5-r2.ebuild b/sys-process/acct/acct-6.3.5-r2.ebuild
deleted file mode 100644
index d9208c46c1d8..000000000000
--- a/sys-process/acct/acct-6.3.5-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.3.5-r2.ebuild,v 1.6 2007/11/29 07:19:45 opfer Exp $
-
-inherit eutils
-
-PATCH_VER="ts02-12"
-MY_P=${P}-${PATCH_VER}
-DESCRIPTION="GNU system accounting utilities"
-HOMEPAGE="http://www.gnu.org/directory/acct.html"
-SRC_URI="http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ppc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf --enable-linux-multiformat || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	dobin ac lastcomm || die "dobin failed"
-	dosbin dump-utmp dump-acct accton sa || die "dosbin failed"
-	doinfo accounting.info
-	doman {ac,lastcomm}.1 {accton,sa}.8
-	dodoc AUTHORS ChangeLog INSTALL NEWS README ToDo
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.rc6 acct
-	newconfd "${FILESDIR}"/acct.confd acct
-}
diff --git a/sys-process/acct/acct-6.3.5-r3.ebuild b/sys-process/acct/acct-6.3.5-r3.ebuild
deleted file mode 100644
index 1722bb248d0a..000000000000
--- a/sys-process/acct/acct-6.3.5-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.3.5-r3.ebuild,v 1.2 2008/10/26 05:38:29 vapier Exp $
-
-inherit eutils
-
-PATCH_VER="ts02-12"
-MY_P=${P}-${PATCH_VER}
-DESCRIPTION="GNU system accounting utilities"
-HOMEPAGE="http://www.gnu.org/directory/acct.html"
-SRC_URI="http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf --enable-linux-multiformat || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# accton in / is only a temp workaround for #239748
-	into /
-	dosbin accton || die "dosbin failed"
-	into /usr
-	dobin ac lastcomm || die "dobin failed"
-	dosbin dump-utmp dump-acct sa || die "dosbin failed"
-	dosym /sbin/accton /usr/sbin/accton
-	doinfo accounting.info
-	doman {ac,lastcomm}.1 {accton,sa}.8
-	dodoc AUTHORS ChangeLog INSTALL NEWS README ToDo
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.rc6-6.3.5-r3 acct
-	newconfd "${FILESDIR}"/acct.confd acct
-}
diff --git a/sys-process/acct/files/acct.rc6 b/sys-process/acct/files/acct.rc6
index 7e0e0543a7b7..b90ba3c7ea06 100644
--- a/sys-process/acct/files/acct.rc6
+++ b/sys-process/acct/files/acct.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.rc6,v 1.4 2009/10/10 16:18:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.rc6,v 1.5 2010/04/28 19:09:13 jer Exp $
 
 opts="report"
 
@@ -28,7 +28,7 @@ start() {
 
 stop() {
 	ebegin "Stopping accounting"
-	accton
+	accton off
 	eend $?
 }
 
diff --git a/sys-process/acct/files/acct.rc6-6.3.5-r3 b/sys-process/acct/files/acct.rc6-6.3.5-r3
deleted file mode 100644
index 3d9da2ec03d4..000000000000
--- a/sys-process/acct/files/acct.rc6-6.3.5-r3
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.rc6-6.3.5-r3,v 1.1 2008/10/06 23:35:02 robbat2 Exp $
-
-opts="report"
-
-depend() {
-    need localmount
-}
-
-checkconfig() {
-	export ACCT_LOG=${ACCT_LOG:-/var/account/pacct}
-	if [[ ! -e ${ACCT_LOG} ]] ; then
-		touch "${ACCT_LOG}"
-		chmod 600 "${ACCT_LOG}"
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting accounting"
-	/sbin/accton "${ACCT_LOG}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping accounting"
-	/sbin/accton
-	eend $?
-}
-
-report() {
-	sa ${REPORT_OPTS} "${ACCT_LOG}"
-}
-
-# vim:ts=4 sw=4: