- fix initscript (accton parameters changed)

- fix lastcomm setings (#550229 - confusion about accounting file location)
This commit is contained in:
Ivana Varekova 2010-01-04 13:35:55 +00:00
parent 8877b46a82
commit aeeb9ad168
3 changed files with 45 additions and 4 deletions

View File

@ -0,0 +1,34 @@
diff -up acct-6.5.1/configure.pom acct-6.5.1/configure
--- acct-6.5.1/configure.pom 2010-01-04 14:24:09.000000000 +0100
+++ acct-6.5.1/configure 2010-01-04 14:23:33.000000000 +0100
@@ -21351,10 +21351,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifndef ACCT_FILE
# if defined(__FreeBSD__) || defined(__linux__)
-# define ACCT_FILE "/var/log/account/pacct"
+# define ACCT_FILE "/var/account/pacct"
# else
# if defined(__NetBSD__)
-# define ACCT_FILE "/var/log/account/acct"
+# define ACCT_FILE "/var/account/acct"
# else
# if defined(sun) || defined(AMIX)
# define ACCT_FILE "/var/adm/pacct"
@@ -21371,7 +21371,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifndef SAVACCT_FILE
# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
-# define SAVACCT_FILE "/var/log/account/savacct"
+# define SAVACCT_FILE "/var/account/savacct"
# else
# if defined(sun) || defined(AMIX)
# define SAVACCT_FILE "/var/adm/savacct"
@@ -21387,7 +21387,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifndef USRACCT_FILE
# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
-# define USRACCT_FILE "/var/log/account/usracct"
+# define USRACCT_FILE "/var/account/usracct"
# else
# if defined(sun) || defined(AMIX)
# define USRACCT_FILE "/var/adm/usracct"

View File

@ -37,7 +37,7 @@ start() {
stop() { stop() {
action $"Shutting down process accounting: " /sbin/accton action $"Shutting down process accounting: " /sbin/accton off
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
rm -f $LOCKFILE rm -f $LOCKFILE

View File

@ -12,7 +12,7 @@
Summary: Utilities for monitoring process activities Summary: Utilities for monitoring process activities
Name: psacct Name: psacct
Version: 6.5.1 Version: 6.5.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: ftp://ftp.gnu.org/pub/gnu/acct/ URL: ftp://ftp.gnu.org/pub/gnu/acct/
@ -30,6 +30,7 @@ Patch7: psacct-6.5.1-LargeFile.patch
Patch8: psacct-6.3.2-lastcomm_man.patch Patch8: psacct-6.3.2-lastcomm_man.patch
Patch9: acct-6.3.2-sa_manpage.patch Patch9: acct-6.3.2-sa_manpage.patch
Patch11: psacct-6.3.2-man-pages.patch Patch11: psacct-6.3.2-man-pages.patch
Patch12: psacct-6.5.1-acct_log.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: /sbin/chkconfig /sbin/install-info Requires: /sbin/chkconfig /sbin/install-info
@ -64,6 +65,7 @@ commands.
%patch8 -p1 -b .man %patch8 -p1 -b .man
%patch9 -p1 -b .pct %patch9 -p1 -b .pct
%patch11 -p1 -b .new %patch11 -p1 -b .new
%patch12 -p1 -b .log
%build %build
%if ! %{FHS_compliant} %if ! %{FHS_compliant}
@ -177,8 +179,13 @@ fi
%{_infodir}/accounting.info.gz %{_infodir}/accounting.info.gz
%changelog %changelog
* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova@redhat.com> - 6.5-1 * Mon Jan 4 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 6.5.1-2
- update to 6.5 - fix initscript (accton parameters changed)
- fix lastcomm setings (#550229 - confusion about accounting file
location)
* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova@redhat.com> - 6.5.1-1
- update to 6.5.1
remove unnecessary patches, spec file changes remove unnecessary patches, spec file changes
* Fri Dec 9 2009 Ivana Hutarova Varekova <varekova@redhat.com> - 6.2.3-57 * Fri Dec 9 2009 Ivana Hutarova Varekova <varekova@redhat.com> - 6.2.3-57