Your message dated Sun, 27 Feb 2011 11:17:08 +0000
with message-id <[email protected]>
and subject line Bug#600284: fixed in acct 6.5.5-1
has caused the Debian Bug report #600284,
regarding acct: FTBFS on GNU/kFreeBSD. Patch included.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
600284: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600284
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: acct
Version: 6.5.4-2.1
Severity: important
Dear Acct maintainer, and Debian-BSD list.
The package Acct does not even manage to be configured due
to unmet dependencies in a test case built by "configure.ac".
I supply a patch together with this report that improves the
detection of GNU/kFreeBSD for the autotools and the source itself.
The resulting package has been quickly installed on kfreebsd-i386
and seems to be working correctly. The new source package has
also been built with success on i386 and amd64, and is working
on the latter architecture.
Hopefully the experts in "debian-bsd" will correct or decline
my patch suggestion based on their superior experience.
By the way, the packaging of Acct is in error at the moment.
It was recently migrated to use the format "3.0 (quilt)",
yet the build-dependency on Quilt is left in the control file,
and furthermore, the rules file itself makes active use of
Quilt in spite of Dpkg taking care of all necassary patch work.
This should be improved at the first opportunity.
Best regards,
Mats Erik Andersson
Description: FTBFS on GNU/kFreeBSD.
Incomplete detection of __FreeBSD_kernel__ as well
as unsatisfied dependency on <stdint.h> prevented
even configuration to succeed for GNU/kFreeBSD.
.
Manipulations of the macros 'acct' and 'ac_flag'
completes the road to a functional software.
.
The test "__FreeBSD_kernel_version__ >= 801000"
can certainly be relaxed to a version closer to 7.0.
Author: Mats Erik Andersson <[email protected]>
Forwarded: no
Last-Update: 2010-10-15
diff -Naurp acct-6.5.4.orig/accton.c acct-6.5.4/accton.c
--- acct-6.5.4.orig/accton.c
+++ acct-6.5.4/accton.c
@@ -37,6 +37,13 @@ extern int errno;
#include "common.h"
#include "files.h"
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__
+/* The present day structure is 'struct acctv2' and a
+ * macro for 'acct' attained the transition in "files.h".
+ * In this file "accton.c" only the call acct(2) is relevant.
+ */
+# undef acct
+#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
#ifdef HAVE_GETOPT_LONG_ONLY
#include <getopt.h>
#else
diff -Naurp acct-6.5.4.orig/configure.ac acct-6.5.4/configure.ac
--- acct-6.5.4.orig/configure.ac
+++ acct-6.5.4/configure.ac
@@ -165,12 +165,13 @@ dnl
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h> /* uint8_t */
#include <sys/types.h>
#include <sys/acct.h>
#include <utmp.h>
#ifndef WTMP_FILE
-# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__)
+# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) || defined(__GLIBC__)
# define WTMP_FILE "/var/log/wtmp"
# else
# if defined(sun) || defined(AMIX)
@@ -186,7 +187,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#endif
#ifndef ACCT_FILE
-# if defined(__FreeBSD__) || defined(__linux__)
+# if defined(__FreeBSD__) || defined(__linux__) || defined(__GLIBC__)
# define ACCT_FILE "/var/log/account/pacct"
# else
# if defined(__NetBSD__)
@@ -206,7 +207,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#endif
#ifndef SAVACCT_FILE
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) || defined(__GLIBC__)
# define SAVACCT_FILE "/var/log/account/savacct"
# else
# if defined(sun) || defined(AMIX)
@@ -222,7 +223,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#endif
#ifndef USRACCT_FILE
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) || defined(__GLIBC__)
# define USRACCT_FILE "/var/log/account/usracct"
# else
# if defined(sun) || defined(AMIX)
diff -Naurp acct-6.5.4.orig/files.h.in acct-6.5.4/files.h.in
--- acct-6.5.4.orig/files.h.in
+++ acct-6.5.4/files.h.in
@@ -14,10 +14,15 @@
#ifdef LINUX_MULTIFORMAT
# include "linux-acct.h"
#else
+# include <stdint.h> /* uint8_h */
# include <sys/acct.h>
- #ifdef __FreeBSD__
- # if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
+ #ifdef __FreeBSD_kernel__
+ # include <osreldate.h>
+ #endif
+ #if defined __FreeBSD__ || defined __FreeBSD_kernel__
+ # if __FreeBSD_version >= 700100 || __FreeBSD_kernel_version >= 801000
# define acct acctv2
+ # define ac_flag ac_flagx
# endif
#endif
#endif
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: acct
Source-Version: 6.5.5-1
We believe that the bug you reported is fixed in the latest version of
acct, which is due to be installed in the Debian FTP archive:
acct_6.5.5-1.debian.tar.gz
to main/a/acct/acct_6.5.5-1.debian.tar.gz
acct_6.5.5-1.dsc
to main/a/acct/acct_6.5.5-1.dsc
acct_6.5.5-1_amd64.deb
to main/a/acct/acct_6.5.5-1_amd64.deb
acct_6.5.5.orig.tar.gz
to main/a/acct/acct_6.5.5.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mathieu Trudel-Lapierre <[email protected]> (supplier of updated acct
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 25 Feb 2011 20:31:15 -0500
Source: acct
Binary: acct
Architecture: source amd64
Version: 6.5.5-1
Distribution: unstable
Urgency: low
Maintainer: Mathieu Trudel-Lapierre <[email protected]>
Changed-By: Mathieu Trudel-Lapierre <[email protected]>
Description:
acct - The GNU Accounting utilities for process and login accounting
Closes: 441927 600284
Changes:
acct (6.5.5-1) unstable; urgency=low
.
* Acknowledge NMU.
* New upstream release: 6.5.5
* debian/patches/03-acct-file.patch: update for new release.
* Bump Standards-Version to 3.9.1.
* debian/control: Drop quilt Build-Depends (not needed in 3.0 quilt format).
* debian/rules: Drop the usage of quilt.mk (and calls to patch/unpatch).
* debian/patches/581421-sa-hz-division.patch: update to unbreak specifying
--other-acct-file for 'sa', remove other unnecessary hunks as well.
* debian/patches/12-ftbfs-kfreebsd.patch: apply patch to fix builds
on kfreebsd, with some adjustements due to parts of the patch already
applied upstream. Many thanks to Mats Erik Andersson for the patch.
(Closes: 600284)
* debian/patches/441927-accton-without-args.patch: slightly update docs
to have it agree with accton, which can't be called without arguments.
(Closes: 441927)
* debian/control: update Maintainer entry for GPG key change.
Checksums-Sha1:
c2df985b4178d454811b9f10fa7ee0a35d5aa132 1699 acct_6.5.5-1.dsc
907456b1dcf14c5079f834338e2de32cd7371a73 747225 acct_6.5.5.orig.tar.gz
c8100bc0cf8be1e77be5f2a4432d70f69faf7ccc 19910 acct_6.5.5-1.debian.tar.gz
71cca4985c7fb87ec8e3ac8aeb63f936c7ae7297 120424 acct_6.5.5-1_amd64.deb
Checksums-Sha256:
3907383351a4a06243f7780c876d0bf8b9090b07b5df7915f74632466239cf5b 1699
acct_6.5.5-1.dsc
4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5 747225
acct_6.5.5.orig.tar.gz
5a9c76f704ee7125ecce5f26b9337ccc726999de7a9c932cbe5b9f8056fc864c 19910
acct_6.5.5-1.debian.tar.gz
1e5719f704770353cb53a3ff4e04bb66a601607f1d1fc5fbd32ffce504a4bd20 120424
acct_6.5.5-1_amd64.deb
Files:
9ce18ed9752c309b465012627615967f 1699 admin optional acct_6.5.5-1.dsc
554a9e9c6aa3482df07e80853eac0350 747225 admin optional acct_6.5.5.orig.tar.gz
4250af6da18ce14300b8c32e24e8bc59 19910 admin optional
acct_6.5.5-1.debian.tar.gz
d7deb649c41ab436270cd7746b7b4cd8 120424 admin optional acct_6.5.5-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJNajF7AAoJEBLZsEqQy9jk8GgQAIher3JU/2RWglLXyyhG+9wr
LsAmn3jHn6c60X466sL2OTqYi6gnAg378CM+s9WcOJ8UESa+FKHRzB9mUU2i7Zzw
zYS7bqIAPw+ROIzsVfaBFiN2UjHy8fKB33NzvAib6OD5feySBOAALNKl5OgEm7J9
ZPtHBszQdGxaELz+lfXhLzXU3T8Kj1ZoeWuQoXGHF0JWk6wwlGYq2Z8L9ngwwSUo
oUIMLNYzNoh8H8rfv7tN0kXVbu0e8+HIYK9/1chtQpqbP9e7+ny+SHRGi0v4wxWv
oe/1DQjlqjDXFSUCAPJbAKw7Ah9cSFtBMeYs9yxmTf5fw78CmiWpj9RjCOB91meH
ndi74bL/eJ/9PmHUubKXMcz9FXZblecQ28LcbGnPYG6EmNg+ipb9PUlYLgUoxsqr
B8yBOZPq7K/AMSlp6hFhla08TfxIXLAds8IiSOKOAlL1OdgnnD2qGBBPya1nRsuM
fK6sZ56oV/MILpQhg4wT4UQjS5gao0Wi06FiKEh94wE7e/KUe0e+9Ei2htdm59La
jAEn75x04iE13V17dp8Bp4C60xRdmoporpIdrsxXXVEvushKXDpqglX7oWjwwtDY
oyt+Xn/YC/oxdSjZQLw60oPT7xhpqXLb2rYsoDHi9SNvx6W5EkHkG+KGC11DGMuN
5eis/KX/I2/a0ZQSgX7j
=oSY4
-----END PGP SIGNATURE-----
--- End Message ---
