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

(Portage version: 2.2_rc67/cvs/Linux i686)

6 files changed, 8 insertions, 156 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/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: