diff options
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/acct/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-process/acct/Manifest | 16 | ||||
| -rw-r--r-- | sys-process/acct/acct-6.5.5-r2.ebuild | 42 | ||||
| -rw-r--r-- | sys-process/acct/files/acct-6.5.5-cross-compile.patch | 323 | ||||
| -rw-r--r-- | sys-process/acct/files/acct.initd | 18 |
5 files changed, 387 insertions, 21 deletions
diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog index f1ddc21942d5..5689734bced5 100644 --- a/sys-process/acct/ChangeLog +++ b/sys-process/acct/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-process/acct # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.51 2011/07/11 03:14:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.52 2011/10/20 05:07:52 vapier Exp $ + +*acct-6.5.5-r2 (20 Oct 2011) + + 20 Oct 2011; Mike Frysinger <vapier@gentoo.org> +acct-6.5.5-r2.ebuild, + +files/acct-6.5.5-cross-compile.patch, files/acct.initd: + Add arm love. Add cross-compile fix by Diego Elio Pettenò. Clean up init.d + script #367815 by Robert Trace. 11 Jul 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml: "was mistaken in terms of how this works" diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest index 806448c8271a..3a38d3000d69 100644 --- a/sys-process/acct/Manifest +++ b/sys-process/acct/Manifest @@ -1,17 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX acct-6.5.5-cross-compile.patch 8335 RMD160 d86fdb2841610d7f532d7e61955f95904cf0d83b SHA1 589affe37f1ab3a99eee2cfc0296088353b5c5ee SHA256 368cd7d9598c1c63a082b8aa40989b4701fc04b97ccea136ebcc66ab8b0f0e83 AUX acct.confd 389 RMD160 4059420389cfe442983e55f7e23e4a9df7473743 SHA1 0dd7b18b9c0a76218ceec46607fe34b63d80e4ba SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31 -AUX acct.initd 753 RMD160 cc252e0c813ae48983781fcaf072ea223aa277f3 SHA1 3095dec2a9f2c6c5b0b9d20f558f8ac10dced9f5 SHA256 ccb237c7b733215f204e154d2790c54252d3d4a62b93d515b8deb1b1855a24d6 +AUX acct.initd 693 RMD160 4e8b1cf96cd35708e88fab963d8f6da0df579063 SHA1 e1be63a3bcab5cf1771dd3c6078b30bc2156ce9a SHA256 88636c610e25918d3d26b8518627d22471892ed5726cda89ca2e2ac17cb59bb0 AUX acct.logrotate 209 RMD160 da0db73100fbfa3b8f17940001e92d49acbeae32 SHA1 bd402cef98435688498d55cb73aa461397609c06 SHA256 9516d7817255ef802fd2cfc3c44394f0c36e6fc076a8d18e2c05ca30a6c68891 DIST acct-6.5.5.tar.gz 747225 RMD160 f1e8d29a3433cb9c4cf650a78bc7288a1c64cd7a SHA1 907456b1dcf14c5079f834338e2de32cd7371a73 SHA256 4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5 EBUILD acct-6.5.5-r1.ebuild 1025 RMD160 3a94deac14d9859df8f593c186dbe4b36cf18b91 SHA1 a913e913196a957d58284f4bd635bbc335d7aca7 SHA256 a0a9fd9d6584a97d7ab86885f41eee84b1d929c869d372748ea98b49d8b6c839 -MISC ChangeLog 7558 RMD160 4ce8032cfbbde5f89eb30f5914e50e275141577f SHA1 e50c1367d71711c36131f7c206528f600fa31846 SHA256 09ac1a62f7c04eca5435111ca8e2023fbb17719e0c8aa1137f5b043e9ef182e5 +EBUILD acct-6.5.5-r2.ebuild 1134 RMD160 f655a132ede596f1aa6ad38c3d9c1d0ac038d779 SHA1 720006a3f3b415971b78fec39831ef6ee381f457 SHA256 cf62ced373eb7f569da51b53ac7b578579334c1bc398fafa021131294f858f9c +MISC ChangeLog 7836 RMD160 75455374cdd0b4e5be9a53ab7c16132c942c1cd7 SHA1 d81c55a65d506a7d5b973f393c3b3880030f4409 SHA256 8ec3bdfa5979e94d28920f4e3d98e2ecdbd4549803aaa13f8117002e602fb25c MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4aapYACgkQVWmRsqeSphOyRgCfVwAw/v5RGrFfYacHCCUyf/5W -l3kAnjySReGK3Gs8NaabaBo/ERMAsBSl -=L4UU +iF4EAREIAAYFAk6frLEACgkQaC/OocHi7JYBSgD/fr5cLqeTpKj9/2PUvbhRdjTa +obpV84PtBVSkLLH8e7oBAJeWe+nPyrkOR92nmOdVpHiXQB0EPgjfW7eBK3Ty3ZwH +=X/CL -----END PGP SIGNATURE----- diff --git a/sys-process/acct/acct-6.5.5-r2.ebuild b/sys-process/acct/acct-6.5.5-r2.ebuild new file mode 100644 index 000000000000..b54b45bf7bbd --- /dev/null +++ b/sys-process/acct/acct-6.5.5-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.5-r2.ebuild,v 1.1 2011/10/20 05:07:52 vapier Exp $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="GNU system accounting utilities" +HOMEPAGE="https://savannah.gnu.org/projects/acct/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86" +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-6.5.5-cross-compile.patch + eautoreconf +} + +src_configure() { + econf --enable-linux-multiformat +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO + keepdir /var/account + newinitd "${FILESDIR}"/acct.initd acct || die + newconfd "${FILESDIR}"/acct.confd acct || die + insinto /etc/logrotate.d + newins "${FILESDIR}"/acct.logrotate acct || die + + # sys-apps/sysvinit already provides this + rm "${D}"/usr/bin/last "${D}"/usr/share/man/man1/last.1 || die + + # accton in / is only a temp workaround for #239748 + dodir /sbin + mv "${D}"/usr/sbin/accton "${D}"/sbin/ || die +} diff --git a/sys-process/acct/files/acct-6.5.5-cross-compile.patch b/sys-process/acct/files/acct-6.5.5-cross-compile.patch new file mode 100644 index 000000000000..2fb7bfa7bc25 --- /dev/null +++ b/sys-process/acct/files/acct-6.5.5-cross-compile.patch @@ -0,0 +1,323 @@ +https://savannah.gnu.org/patch/?7473 + +From 8958c3cb7b77ec50d8dae0490d8c80dee798e20d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com> +Date: Fri, 18 Feb 2011 06:13:20 +0100 +Subject: [PATCH] Don't generate files.h at build-time using an execution test. + +The *_LOC variables are never used in the build itself, but only in the +built code; this means that they don't need to be known to ./configure at +all. + +Since the previous method made acct not cross-compilable at all, this is +much preferred. + +--- a/Makefile.am ++++ b/Makefile.am +@@ -66,11 +66,6 @@ + SYS_AC = @SYS_AC@ + SYS_SA = @SYS_SA@ + +-WTMP_FILE_LOC = @WTMP_FILE_LOC@ +-ACCT_FILE_LOC = @ACCT_FILE_LOC@ +-SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@ +-USRACCT_FILE_LOC = @USRACCT_FILE_LOC@ +- + compare-ac: ac + @echo + @echo "Running tests for ac" +--- a/configure.ac ++++ b/configure.ac +@@ -159,101 +159,6 @@ + AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if <sys/acct.h> uses the COMP_T type.)]) + ) ] + ) +-dnl +-dnl find out where utmp/pacct are stored +-dnl +-AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#include <stdio.h> +-#include <stdlib.h> +-#include <sys/types.h> +-#include <stdint.h> /* GNU/kFreeBSD */ +-#include <sys/acct.h> +-#include <utmp.h> +- +-#ifndef WTMP_FILE +-# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \ +- || defined(__FreeBSD_kernel__) +-# define WTMP_FILE "/var/log/wtmp" +-# else +-# if defined(sun) || defined(AMIX) +-# define WTMP_FILE "/var/adm/wtmp" +-# else +-# if defined(sgi) || defined(SVR4) +-# define WTMP_FILE "/usr/adm/wtmp" +-# else +-# define WTMP_FILE "/usr/adm/wtmp" +-# endif +-# endif +-# endif +-#endif +- +-#ifndef ACCT_FILE +-# if defined(__FreeBSD__) || defined(__linux__) \ +- || defined(__FreeBSD_kernel__) +-# define ACCT_FILE "/var/account/pacct" +-# else +-# if defined(__NetBSD__) +-# define ACCT_FILE "/var/account/acct" +-# else +-# if defined(sun) || defined(AMIX) +-# define ACCT_FILE "/var/adm/pacct" +-# else +-# if defined(sgi) || defined(SVR4) || defined(M_XENIX) +-# define ACCT_FILE "/usr/adm/pacct" +-# else +-# define ACCT_FILE "/usr/adm/acct" +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifndef SAVACCT_FILE +-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \ +- || defined(__FreeBSD_kernel__) +-# define SAVACCT_FILE "/var/account/savacct" +-# else +-# if defined(sun) || defined(AMIX) +-# define SAVACCT_FILE "/var/adm/savacct" +-# else +-# if defined(sgi) || defined(SVR4) +-# define SAVACCT_FILE "/usr/adm/savacct" +-# else +-# define SAVACCT_FILE "/usr/adm/savacct" +-# endif +-# endif +-# endif +-#endif +- +-#ifndef USRACCT_FILE +-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \ +- || defined(__FreeBSD_kernel__) +-# define USRACCT_FILE "/var/account/usracct" +-# else +-# if defined(sun) || defined(AMIX) +-# define USRACCT_FILE "/var/adm/usracct" +-# else +-# if defined(sgi) || defined(SVR4) +-# define USRACCT_FILE "/usr/adm/usracct" +-# else +-# define USRACCT_FILE "/usr/adm/usracct" +-# endif +-# endif +-# endif +-#endif +- +-main () +-{ +- FILE *fp; +- fp = fopen ("locs", "w"); +- fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE); +- fprintf (fp, "ACCT_FILE_LOC=%s\n", ACCT_FILE); +- fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE); +- fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE); +- fclose (fp); +- exit(0); +-} +-]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ]) + AC_TYPE_PID_T dnl for sys/acct.h + AC_TYPE_UID_T dnl same as above + AC_TYPE_SIZE_T +@@ -366,12 +271,6 @@ + AC_SUBST(LASTCOMM_MAN) + AC_SUBST(SA_MAN) + +-dnl Substitutions for file locations +-AC_SUBST(WTMP_FILE_LOC) +-AC_SUBST(ACCT_FILE_LOC) +-AC_SUBST(SAVACCT_FILE_LOC) +-AC_SUBST(USRACCT_FILE_LOC) +- + dnl Dump the makefiles and etc. +-AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h]) ++AC_CONFIG_FILES([Makefile lib/Makefile version.h]) + AC_OUTPUT +--- /dev/null ++++ b/files.h +@@ -0,0 +1,123 @@ ++/* files.h ++ * ++ * file locations ++ * ++ */ ++ ++#ifndef FILES_H ++#define FILES_H ++ ++#include "config.h" ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <sys/types.h> ++#include <stdint.h> /* GNU/kFreeBSD */ ++ ++#ifdef LINUX_MULTIFORMAT ++# include "linux-acct.h" ++#else ++# include <stdint.h> /* GNU/kFreeBSD */ ++# include <sys/acct.h> ++# if defined __FreeBSD__ || defined __FreeBSD_kernel__ ++# include <osreldate.h> ++# if __FreeBSD_kernel__ ++# define __FreeBSD_version __FreeBSD_kernel_version ++# endif /* __FreeBSD_kernel__ */ ++# if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */ ++# define acct acctv2 ++# define ac_flag ac_flagx ++# endif ++# endif ++#endif ++ ++#include <utmp.h> ++ ++#ifndef WTMP_FILE ++# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \ ++ || defined(__FreeBSD_kernel__) ++# define WTMP_FILE "/var/log/wtmp" ++# else ++# if defined(sun) || defined(AMIX) ++# define WTMP_FILE "/var/adm/wtmp" ++# else ++# if defined(sgi) || defined(SVR4) ++# define WTMP_FILE "/usr/adm/wtmp" ++# else ++# define WTMP_FILE "/usr/adm/wtmp" ++# endif ++# endif ++# endif ++#endif ++ ++#ifndef ACCT_FILE ++# if defined(__FreeBSD__) || defined(__linux__) \ ++ || defined(__FreeBSD_kernel__) ++# define ACCT_FILE "/var/account/pacct" ++# else ++# if defined(__NetBSD__) ++# define ACCT_FILE "/var/account/acct" ++# else ++# if defined(sun) || defined(AMIX) ++# define ACCT_FILE "/var/adm/pacct" ++# else ++# if defined(sgi) || defined(SVR4) || defined(M_XENIX) ++# define ACCT_FILE "/usr/adm/pacct" ++# else ++# define ACCT_FILE "/usr/adm/acct" ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++#ifndef SAVACCT_FILE ++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \ ++ || defined(__FreeBSD_kernel__) ++# define SAVACCT_FILE "/var/account/savacct" ++# else ++# if defined(sun) || defined(AMIX) ++# define SAVACCT_FILE "/var/adm/savacct" ++# else ++# if defined(sgi) || defined(SVR4) ++# define SAVACCT_FILE "/usr/adm/savacct" ++# else ++# define SAVACCT_FILE "/usr/adm/savacct" ++# endif ++# endif ++# endif ++#endif ++ ++#ifndef USRACCT_FILE ++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \ ++ || defined(__FreeBSD_kernel__) ++# define USRACCT_FILE "/var/account/usracct" ++# else ++# if defined(sun) || defined(AMIX) ++# define USRACCT_FILE "/var/adm/usracct" ++# else ++# if defined(sgi) || defined(SVR4) ++# define USRACCT_FILE "/usr/adm/usracct" ++# else ++# define USRACCT_FILE "/usr/adm/usracct" ++# endif ++# endif ++# endif ++#endif ++ ++#define WTMP_FILE_LOC WTMP_FILE ++#define ACCT_FILE_LOC ACCT_FILE ++#define SAVACCT_FILE_LOC SAVACCT_FILE ++#define USRACCT_FILE_LOC USRACCT_FILE ++ ++/* Workaround for a kernel includes problem */ ++#if defined(__linux__) && defined(__alpha__) ++#undef AHZ ++#define AHZ 1024 ++#endif ++ ++#ifndef AHZ ++#define AHZ 64 ++#endif ++ ++#endif /* ! FILES_H */ +--- a/files.h.in ++++ /dev/null +@@ -1,48 +0,0 @@ +-/* files.h.in +- * +- * file locations +- * +- */ +- +-#ifndef FILES_H +-#define FILES_H +- +-#include "config.h" +- +-#include <sys/types.h> +- +-#ifdef LINUX_MULTIFORMAT +-# include "linux-acct.h" +-#else +-# include <stdint.h> /* GNU/kFreeBSD */ +-# include <sys/acct.h> +-# if defined __FreeBSD__ || defined __FreeBSD_kernel__ +-# include <osreldate.h> +-# if __FreeBSD_kernel__ +-# define __FreeBSD_version __FreeBSD_kernel_version +-# endif /* __FreeBSD_kernel__ */ +-# if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */ +-# define acct acctv2 +-# define ac_flag ac_flagx +-# endif +-# endif +-#endif +- +-#include <utmp.h> +- +-#define WTMP_FILE_LOC "@WTMP_FILE_LOC@" +-#define ACCT_FILE_LOC "@ACCT_FILE_LOC@" +-#define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@" +-#define USRACCT_FILE_LOC "@USRACCT_FILE_LOC@" +- +-/* Workaround for a kernel includes problem */ +-#if defined(__linux__) && defined(__alpha__) +-#undef AHZ +-#define AHZ 1024 +-#endif +- +-#ifndef AHZ +-#define AHZ 64 +-#endif +- +-#endif /* ! FILES_H */ diff --git a/sys-process/acct/files/acct.initd b/sys-process/acct/files/acct.initd index 2f66068625c0..fa7c5049aca1 100644 --- a/sys-process/acct/files/acct.initd +++ b/sys-process/acct/files/acct.initd @@ -1,12 +1,12 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd,v 1.2 2011/01/26 05:36:22 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd,v 1.3 2011/10/20 05:07:52 vapier Exp $ -opts="report reload" +extra_started_commands="report" depend() { - need localmount + need localmount } checkconfig() { @@ -22,24 +22,16 @@ start() { checkconfig || return 1 ebegin "Starting accounting" - accton "${ACCT_LOG}" + accton "${ACCT_LOG}" >/dev/null eend $? } stop() { ebegin "Stopping accounting" - accton off + accton off >/dev/null eend $? } report() { sa ${REPORT_OPTS} "${ACCT_LOG}" } - -reload() { - service_started "${SVCNAME}" || return - svc_stop - svc_start -} - -# vim:ts=4 sw=4: |