[packages/psacct] - updated to 6.6.1 - updated info,path patches - removed obsolete build patch
qboosh
qboosh at pld-linux.org
Wed Mar 13 18:50:12 CET 2013
commit 251d3f084e3eadcc73446c80645d05a2d006e5bf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Mar 13 18:50:00 2013 +0100
- updated to 6.6.1
- updated info,path patches
- removed obsolete build patch
acct-info.patch | 12 ++++++------
psacct-build.patch | 13 -------------
psacct-path.patch | 30 +++++++++++++++---------------
psacct.spec | 15 +++++++--------
4 files changed, 28 insertions(+), 42 deletions(-)
---
diff --git a/psacct.spec b/psacct.spec
index 6bea527..85c4255 100644
--- a/psacct.spec
+++ b/psacct.spec
@@ -1,3 +1,4 @@
+# TODO: consider moving logs to /var/log/account subdir (following upstream)
Summary: Process accounting tools
Summary(es.UTF-8): Herramientas de contabilidad de procesos
Summary(pl.UTF-8): Program do logowania procesów użytkowników
@@ -5,12 +6,12 @@ Summary(pt_BR.UTF-8): Ferramentas de contabilização de processos
Summary(uk.UTF-8): Утиліти для моніторингу активності процесів
Summary(ru.UTF-8): Утилиты для мониторинга активности процессов
Name: psacct
-Version: 6.5.5
-Release: 2
+Version: 6.6.1
+Release: 1
License: GPL v3+
Group: Applications/System
Source0: http://ftp.gnu.org/gnu/acct/acct-%{version}.tar.gz
-# Source0-md5: 554a9e9c6aa3482df07e80853eac0350
+# Source0-md5: 31a7a2ea81da1fddbc92b9c62cdea1c5
Source1: acct.logrotate
Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source2-md5: 85eb213fc45fad1c7834d239ff8e28a4
@@ -18,11 +19,10 @@ Source3: acct.sysinit
Source4: acct.sysconfig
Patch0: acct-info.patch
Patch1: %{name}-path.patch
-Patch2: %{name}-build.patch
URL: http://www.gnu.org/directory/GNU/acct.html
BuildRequires: autoconf >= 2.63
-BuildRequires: automake
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: automake >= 1:1.11
+BuildRequires: libtool >= 2:2.4
BuildRequires: texinfo
Requires: logrotate
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,14 +54,13 @@ processos estão incluídas aqui.
%setup -q -n acct-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
-%{__automake}
%{__autoheader}
+%{__automake}
%configure \
--enable-linux-multiformat
diff --git a/acct-info.patch b/acct-info.patch
index ca2513b..3bdbe89 100644
--- a/acct-info.patch
+++ b/acct-info.patch
@@ -1,15 +1,15 @@
---- acct-6.5.5/accounting.texi.orig 2010-10-23 13:33:27.000000000 +0200
-+++ acct-6.5.5/accounting.texi 2011-01-29 11:00:24.368688037 +0100
-@@ -2,10 +2,9 @@
+--- acct-6.6.1/accounting.texi.orig 2013-03-13 16:59:37.166641507 +0100
++++ acct-6.6.1/accounting.texi 2013-03-13 17:39:51.596591182 +0100
+@@ -2,10 +2,10 @@
@setfilename accounting.info
@settitle Accounting Utilities Manual
- at dircategory GNU Utilities
--
+ at dircategory Miscellaneous:
+
@direntry
--* acct: (acct). The GNU Accounting utilities for process and login accounting
-+* acct: (acct). GNU Accounting utilities for process and login accounting
+-* acct: (accounting). The GNU Accounting utilities for process and login accounting
++* acct: (accounting). GNU Accounting utilities for process and login accounting
@end direntry
diff --git a/psacct-build.patch b/psacct-build.patch
deleted file mode 100644
index 26d5120..0000000
--- a/psacct-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- acct-6.5.5/lib/stdio.in.h~ 2013-02-16 23:00:04.119332820 +0100
-+++ acct-6.5.5/lib/stdio.in.h 2013-02-16 23:02:00.196823604 +0100
-@@ -453,8 +453,10 @@
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-+#ifdef gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
-
- #if 0
- # if 0
diff --git a/psacct-path.patch b/psacct-path.patch
index 155c192..a8647e1 100644
--- a/psacct-path.patch
+++ b/psacct-path.patch
@@ -1,28 +1,28 @@
---- acct-6.5.5/configure.ac Tue Mar 10 15:09:45 1998
-+++ acct-6.5.5.acme/configure.ac Mon Oct 26 18:22:11 1998
-@@ -167,7 +167,7 @@
+--- acct-6.6.1/configure.ac.orig 2013-03-13 17:40:18.763257282 +0100
++++ acct-6.6.1/configure.ac 2013-03-13 17:41:28.129922504 +0100
+@@ -259,7 +259,7 @@
#ifndef ACCT_FILE
- # if defined(__FreeBSD__) || defined(__linux__)
- || defined(__FreeBSD_kernel__)
--# define ACCT_FILE "/var/account/pacct"
+ # if defined(__FreeBSD__) || defined(__linux__) \
+ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define ACCT_FILE "/var/log/account/pacct"
+# define ACCT_FILE "/var/log/pacct"
# else
# if defined(__NetBSD__)
- # define ACCT_FILE "/var/account/acct"
-@@ -187,7 +187,7 @@
+ # define ACCT_FILE "/var/log/account/acct"
+@@ -280,7 +280,7 @@
#ifndef SAVACCT_FILE
- # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
- || defined(__FreeBSD_kernel__)
--# define SAVACCT_FILE "/var/account/savacct"
+ # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define SAVACCT_FILE "/var/log/account/savacct"
+# define SAVACCT_FILE "/var/log/savacct"
# else
# if defined(sun) || defined(AMIX)
# define SAVACCT_FILE "/var/adm/savacct"
-@@ -203,7 +203,7 @@
+@@ -297,7 +297,7 @@
#ifndef USRACCT_FILE
- # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
- || defined(__FreeBSD_kernel__)
--# define USRACCT_FILE "/var/account/usracct"
+ # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define USRACCT_FILE "/var/log/account/usracct"
+# define USRACCT_FILE "/var/log/usracct"
# else
# if defined(sun) || defined(AMIX)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/psacct.git/commitdiff/251d3f084e3eadcc73446c80645d05a2d006e5bf
More information about the pld-cvs-commit
mailing list