diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
commit | e23a08d0c97a0cc415aaa165da840b056f93c997 (patch) | |
tree | 4c5f7db60483518201fef36f8cc0712789a08db2 /sys-process/acct | |
parent | 391b5b359a346aff490103da7dddc85047f83830 (diff) |
gentoo resync : 08.10.2021
Diffstat (limited to 'sys-process/acct')
-rw-r--r-- | sys-process/acct/Manifest | 2 | ||||
-rw-r--r-- | sys-process/acct/acct-6.6.4-r1.ebuild | 46 | ||||
-rw-r--r-- | sys-process/acct/files/acct-6.6.4-cross-compile.patch | 220 |
3 files changed, 0 insertions, 268 deletions
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest index e41e08b92842..d4b15de179a6 100644 --- a/sys-process/acct/Manifest +++ b/sys-process/acct/Manifest @@ -1,10 +1,8 @@ AUX acct-6.6.4-cross-compile-fixed.patch 6906 BLAKE2B 8e8bab16813b499c316f2d47a53aab9d74261be3dd5c19078ca57d3f5de1879d38a88303f487d7d5b4daec3b95a8f797ca5a5b6358f960240607d9b239a5b95d SHA512 58dcd5a8aa14092bb1432616535e00e8078ad610fd2488f8b0af293859d8aeda5190b20c28b55cd1b4b1865942073febdc23bc8d3923c7feffae703dfaeb7d7f -AUX acct-6.6.4-cross-compile.patch 6473 BLAKE2B 6bf64a9cc3e7c695d44da4ecbe22f598000bd5f6de77ba98828613c63e8b02473011b1977402bba38c9be30db5832fb87fef670902f317ca2c78dee9987f3fa2 SHA512 225f96ceb8ae09c149a7c69093d0dd0ca3a791122c22246bd52848fcc9876c2d85e757a9ab354212299779a5fa1d622c6340eceaad0bc4042a4019f4eed5c004 AUX acct.confd-r1 389 BLAKE2B a3c142c9b66260a6d855502098988be0c18b3fc49f95b1c4dd17b25e14ffaae9809172d02bed0614540991a1e449c1e3d61bdcdd2ebc0613d75b09ffc85b2eb6 SHA512 7d4bfd60f4ef05a55f3e93535c49ad56784f24912fa84991935d3b109e46fb543afaf682fcd085c9183c6747724c9537d25af07799221153eb4659bf5b821992 AUX acct.initd-r2 1080 BLAKE2B c1d2a49530df32adf143b4b3b50059602494df57efe0ef414c089589178f57646c1b42831d712486e6237bcc5035c3168653d55521cca9a31751d199adfc0d52 SHA512 1cf6143f65ce2a00646213b40d83d7aa29a206c740f2f6b81dc6674de3fa8a96ed86bcc32fefd58e2934ded17d49a95e40dfe1b805a6e92c35fa75b420a0b2a1 AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e532277eabff670c46bb874b5dee90f1bd0d98cba9218cc47e82fd4a91e66170ffd1d367d2d8a01c1e3e00d SHA512 54fcb419f433df2a64eb51ecfc8122c4945960ca7d745d7a8816fec441586e15321cdfacb2db1feeec23c66b1b02b4191d3fc53355379a75c2956a00bc743332 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2 -EBUILD acct-6.6.4-r1.ebuild 1070 BLAKE2B 72327ad0f437dd255ad4e2fa5d8efa4a90847843991b41092ceddeacdd3b14927a0249f7569b3d04f3a9f86873498b4073130d0321229684d834c871282c9694 SHA512 136ac501b8a7f929684a518f9ef4cfa3f137e3b4caa68b9e327f6063bf064ee9291df1b2cd76e5eb285338a5f5d080ab2c08be0e0965b481bd8b999e688ca02f EBUILD acct-6.6.4-r3.ebuild 1074 BLAKE2B 6414ca5c36d518b3c6a06087fa4f90aa4d3ed0e95863b92d8df731deca291e103f64dc9251b9e228ffb5edb43a765b1285e039ab0186103480908e5ca1742fbc SHA512 49891b21188c8931669787a26dded7af2051554a91bff33136dedc3c9b4c92525254a5f9a13d42ac79dab015091fad34c19a38850a3359756f0bcf168c975ec8 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-process/acct/acct-6.6.4-r1.ebuild b/sys-process/acct/acct-6.6.4-r1.ebuild deleted file mode 100644 index 6b534384168f..000000000000 --- a/sys-process/acct/acct-6.6.4-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools systemd - -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 arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="sys-apps/texinfo" - -PATCHES=( - "${FILESDIR}"/${PN}-6.6.4-cross-compile.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --enable-linux-multiformat -} - -src_install() { - default - keepdir /var/account - newinitd "${FILESDIR}"/acct.initd-r2 acct - newconfd "${FILESDIR}"/acct.confd-r1 acct - systemd_dounit "${FILESDIR}"/acct.service - insinto /etc/logrotate.d - newins "${FILESDIR}"/acct.logrotate-r1 psacct - - # sys-apps/sysvinit already provides this - rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die - - # accton in / is only a temp workaround for #239748 - dodir /sbin - mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die -} diff --git a/sys-process/acct/files/acct-6.6.4-cross-compile.patch b/sys-process/acct/files/acct-6.6.4-cross-compile.patch deleted file mode 100644 index c4938d956dd3..000000000000 --- a/sys-process/acct/files/acct-6.6.4-cross-compile.patch +++ /dev/null @@ -1,220 +0,0 @@ -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. - -Author: Diego Elio Pettenò <flameeyes@gmail.com> -Upstream: https://savannah.gnu.org/patch/?7473 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -69,11 +69,6 @@ SYS_LASTCOMM = @SYS_LASTCOMM@ - 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 -@@ -229,97 +229,6 @@ AC_CHECK_HEADER(sys/acct.h, - 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_PROGRAM([[ --#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__) || defined(__GLIBC__) --# define WTMP_FILE "/var/log/account/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__) || defined(__GLIBC__) --# define ACCT_FILE "/var/log/account/pacct" --# else --# if defined(__NetBSD__) --# define ACCT_FILE "/var/log/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__) || defined(__GLIBC__) --# define SAVACCT_FILE "/var/log/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__) || defined(__GLIBC__) --# define USRACCT_FILE "/var/log/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 --]], [[ -- 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); --]])],[. ./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 ]) - - dnl types - AC_TYPE_PID_T dnl for sys/acct.h -@@ -363,12 +272,6 @@ AC_SUBST(ACCTON_MAN) - 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_OUTPUT ---- a/files.h.in -+++ b/files.h.in -@@ -30,6 +30,78 @@ - - #include <utmp.h> - -+#ifndef WTMP_FILE -+# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \ -+ || defined(__FreeBSD_kernel__) || defined(__GLIBC__) -+# define WTMP_FILE "/var/log/account/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__) || defined(__GLIBC__) -+# define ACCT_FILE "/var/log/account/pacct" -+# else -+# if defined(__NetBSD__) -+# define ACCT_FILE "/var/log/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__) || defined(__GLIBC__) -+# define SAVACCT_FILE "/var/log/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__) || defined(__GLIBC__) -+# define USRACCT_FILE "/var/log/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_LOC@" - #define ACCT_FILE_LOC "@ACCT_FILE_LOC@" - #define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@" |