Your message dated Sun, 26 Jan 2014 18:33:19 +0000
with message-id <[email protected]>
and subject line Bug#696204: fixed in acct 6.5.5-2
has caused the Debian Bug report #696204,
regarding acct: Build fixes for acct: libtool, gnulib C11, cross-building,
hardening
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.)
--
696204: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696204
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: acct
Version: 6.5.5-1
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu raring ubuntu-patch
Hi Mathieu,
I've just uploaded a modified acct package to Ubuntu. The original purpose
of the upload was to fix cross-compilation support, but in the process of
addressing this I found a number of other issues - including the fact that
the package did not build as-is in raring, apparently due to a newer glibc
(2.16).
The changelog for this upload is as follows:
* Correct cross-build handling in debian/rules to pass the proper
--host, --build arguments to configure instead of trying to set CC
directly.
* debian/patches/cross-build-support.patch: remove pointless configure
check that tries to run a program to define wtmp/acct file paths; we can
just as well include this in files.h.in and use the results of the macro
checks directly.
* add build-dependency on libtool, needed for a full autoreconf.
* Call autoreconf -f to force update of the libtool macros.
* debian/patches/gnulib-c11-compat.patch: Fix gnulib stdio.h
compatibility with C11.
* Call dpkg-buildflags in debian/rules, to build with hardening support.
I believe all of these changes are appropriate to apply in Debian as well,
and the cross-build-support.patch should be suitable for submitting
upstream. The gnulib-c11-compat.patch may be fixed differently in gnulib
upstream, so perhaps acct upstream just needs to pull in an update to
gnulib.
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[email protected] [email protected]
=== modified file 'debian/control'
--- debian/control 2011-05-06 14:01:39 +0000
+++ debian/control 2012-12-18 03:29:41 +0000
@@ -4,7 +4,7 @@
Maintainer: Ubuntu Developers <[email protected]>
XSBC-Original-Maintainer: Mathieu Trudel-Lapierre <[email protected]>
Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake,
- texi2html, texinfo
+ libtool, texi2html, texinfo
Standards-Version: 3.9.1
Homepage: http://www.gnu.org/software/acct/
=== added file 'debian/patches/cross-build-support.patch'
--- debian/patches/cross-build-support.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/cross-build-support.patch 2012-12-18 01:48:03 +0000
@@ -0,0 +1,241 @@
+Description: remove pointless configure check that breaks cross-building
+ Remove pointless configure check that tries to run a program to define
+ wtmp/acct file paths; we can just as well include this in files.h.in and
+ use the results of the macro checks directly.
+Author: Steve Langasek <[email protected]>
+
+Index: trunk/Makefile.am
+===================================================================
+--- trunk.orig/Makefile.am
++++ trunk/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"
+Index: trunk/files.h.in
+===================================================================
+--- trunk.orig/files.h.in
++++ trunk/files.h.in
+@@ -30,10 +30,91 @@
+
+ #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@"
++#include <stdio.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <stdint.h> /* GNU/kFreeBSD */
++#include <utmp.h>
++
++#ifndef WTMP_FILE
++# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
++ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++# 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__) || defined(__GLIBC__)
++# define ACCT_FILE "/var/log/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__) || 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
++
++#if !defined(WTMP_FILE) || !defined(ACCT_FILE) || !defined(SAVACCT_FILE) \
++ || !defined(USRACCT_FILE)
++#error Could not locate your wtmp and acct files.
++#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__)
+Index: trunk/configure.ac
+===================================================================
+--- trunk.orig/configure.ac
++++ trunk/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__) || defined(__GLIBC__)
+-# 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__) || defined(__GLIBC__)
+-# define ACCT_FILE "/var/log/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__) || 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
+-
+-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
+@@ -290,12 +195,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_OUTPUT
=== added file 'debian/patches/gnulib-c11-compat.patch'
--- debian/patches/gnulib-c11-compat.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/gnulib-c11-compat.patch 2012-12-18 01:35:59 +0000
@@ -0,0 +1,25 @@
+Description: Fix gnulib stdio.h compatibility with C11
+ C11 eliminates gets(), so if we're building C11 source the deprecation
+ warning is redundant and causes a build failure. Check for the
+ (gcc-specific) _ISOC11_SOURCE define and don't do any gets handling if
+ set.
+Author: Steve Langasek <[email protected]>
+
+Index: trunk/lib/stdio.in.h
+===================================================================
+--- trunk.orig/lib/stdio.in.h
++++ trunk/lib/stdio.in.h
+@@ -138,11 +138,13 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
++#ifndef _ISOC11_SOURCE
+ /* 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. */
+ #undef gets
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-02-25 20:31:15 +0000
+++ debian/patches/series 2012-12-18 01:32:11 +0000
@@ -7,3 +7,5 @@
488731-sa-manpage-default-unit.patch
581421-sa-hz-division.patch
441927-accton-without-args.patch
+cross-build-support.patch
+gnulib-c11-compat.patch
=== modified file 'debian/rules'
--- debian/rules 2011-05-06 14:01:39 +0000
+++ debian/rules 2012-12-18 02:54:16 +0000
@@ -3,10 +3,9 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+CROSS=--build=$(DEB_BUILD_GNU_TYPE)
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
- CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
-else
- CROSS=
+ CROSS += --host=$(DEB_HOST_GNU_TYPE)
endif
clean:
@@ -30,8 +29,8 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- autoreconf
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"
+ autoreconf -f
+ ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(shell dpkg-buildflags --export=configure)
build: build-stamp
build-stamp: config.status
--- End Message ---
--- Begin Message ---
Source: acct
Source-Version: 6.5.5-2
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.
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: Sun, 26 Jan 2014 18:17:38 +0000
Source: acct
Binary: acct
Architecture: source amd64
Version: 6.5.5-2
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: 647015 696204 701386
Changes:
acct (6.5.5-2) unstable; urgency=low
.
* debian/rules:
- Update to use dh. (Closes: 647015)
- Run dh_autoreconf properly (Closes: 696204)
* debian/compat: update to compat 9.
* debian/control:
- Bump debhelper build-depends to >= 9.
- Update to Standards-Version 3.9.4.
- Add a Build-Depends on dh-autoreconf.
- Drop Build-Depends for autoconf, automake, autotools-dev.
* debian/patches/isoc11_drops_gets.patch: don't try to warn for use of gets,
it's not actually used in acct and no longer in C11, which causes the
attempt to set a warning to fail the build. (Closes: 701386)
* debian/patches/fix-texi-warnings.patch: fix warnings when building
documentation from texi source. Thanks, Dimitry Ledkov.
* debian/patches/cross-build-support.patch: fix cross-building by removing
the unnecessary configure checks that run a program to attempt to determine
accounting file locations. Thanks to Steve Langasek for the patch.
(Closes: 696204)
Checksums-Sha1:
1ffe83a740f6748bfd27334e724716c47e1d2d29 1719 acct_6.5.5-2.dsc
db47bdbc0329ff12887c4d61f2ca9bc8cd3c81be 22572 acct_6.5.5-2.debian.tar.gz
e25bb77577dd557e1e2cc09712250efbefc8e5bf 103452 acct_6.5.5-2_amd64.deb
Checksums-Sha256:
5313165b5cba99b64ab0e20f35a53b795a05acfb45e4881e9e633015efed5872 1719
acct_6.5.5-2.dsc
da104f0240d1a483f81ea7c5f71245fcc371071c7853e0d9170afd345dcd7cad 22572
acct_6.5.5-2.debian.tar.gz
50fa2789e45f4e84f0d226f706b6eed19494a2a54d37bc65686d38cc422f3be0 103452
acct_6.5.5-2_amd64.deb
Files:
66751d1f843334b1aeda3ae98248c451 1719 admin optional acct_6.5.5-2.dsc
f75d91f556e8b667c5d2045c217a00c3 22572 admin optional
acct_6.5.5-2.debian.tar.gz
4144b0539400937cb924be1a5cd90086 103452 admin optional acct_6.5.5-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
iQIcBAEBCAAGBQJS5VLzAAoJEFaNMPMhshM9/KwP+wRTMTgjJP8nDI2kDUXU6uJ3
XnIBHM0NbvOcEmxsF13tgc+XGnxtngOAUgeskpLpsFPUR+xb9Rjk3yrwqDSWl4Vx
WnTCnH07w4b5ZnonNCXUy7ZY3A/mMkc09Aq2ZALyda4Lfo0hzuzOadMtotWLGwqp
vJT22lftGqdpiphdQkutbZcb36nwnd4hhnAqNfeVmIOvUZbHMVMLgt3GvJOk5or1
UXpRLsUerU4m5csVz9KsxBkPefNpg045rxjY2lPo/OicROvnI4H99NdFVi3x25iF
tTk+83Sm2s1s3XDYJZb0pRS4LAopYaP02B0VxDwXSaqgpveWKnh8N1rKuSGh1KJb
uD/7Lhq5UDr2dPhj1K/VurzKBTV+c/C80Qa4DHGxmvtnJq3Lmj5fOmeCMYocq4gQ
C3xz3rNXLjt1doOQ3EGGMSfcmFd3XdN4Zvm4oE4t1ff0bmHlJyJl6yGROIKUAJ0r
eWQPW05fozHGIV9g0xm8cqkEkaB/ReY+xViSviaeNW97WkSdW0q1WgK862+FO2r9
+a2VOZhDOszKD0wHdVP2Kw1rP2qRgxHpoveQ1I14Rh0KyogAKcF1W86im4vKTedS
GvYwAhAiiav/o1sed74IjN/4X7wD0nPunk8w6aI2Uk9J5J+ZnSP3n0+a18p5CWAI
gSVUEjFI/zGmTKSmCzBd
=kYYR
-----END PGP SIGNATURE-----
--- End Message ---
