From unknown Sat Jun 14 19:18:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#48034: git coreutils ./bootstrap failure Resent-From: "David L. Craig" Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 26 Apr 2021 15:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48034 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: 48034@debbugs.gnu.org X-Debbugs-Original-To: bug-coreutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161944957121008 (code B ref -1); Mon, 26 Apr 2021 15:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2021 15:06:11 +0000 Received: from localhost ([127.0.0.1]:46717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb2oJ-0005Sg-79 for submit@debbugs.gnu.org; Mon, 26 Apr 2021 11:06:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:39230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1layV1-0004Q8-Ol for submit@debbugs.gnu.org; Mon, 26 Apr 2021 06:30:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1layV1-0003ml-J7 for bug-coreutils@gnu.org; Mon, 26 Apr 2021 06:29:55 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:35725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1layUw-0001Nn-Nk for bug-coreutils@gnu.org; Mon, 26 Apr 2021 06:29:55 -0400 Received: by mail-qk1-x731.google.com with SMTP id 66so16355353qkf.2 for ; Mon, 26 Apr 2021 03:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:subject:message-id:mime-version:content-disposition; bh=/kYcn3GWSQSkqb9F6PjnH5Hgm/33sAQOskH/Nrehr0w=; b=iP1s6YJ8yRUpWRzgwhemQosGcpiQ65mrRpqkL45IFkYPgt8BI9qSYdCA5raV9fzu3g uHkYfipHR4d5sXuSdrPk/eEiK6MI9e1No7Oe0Lk7zOjoHVmuoFSstfsziTdnyjf7zK/c Askq7Xps7s9CkvsUw8FnRA7WA3vIXuJUgsF20f2QrFcYBu21OYOQBdPTdyt1jfLS4gUS PGLjkwXJD09k+8s573WE72HPT+W4dBsX++F6kTvRlRWc/+StRkED23SHwjciDy7Zp8LD Sm9AbSSSwLW0lNIQusDR39Q4jGYxD+WattIy0ZJb2yozmbiputb36PKysKYDykKRdal5 ZYHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:subject:message-id:mime-version :content-disposition; bh=/kYcn3GWSQSkqb9F6PjnH5Hgm/33sAQOskH/Nrehr0w=; b=FrJfu2mcNy+GNTnLG102X704fObCVwSHrKtf0tG0N6qZ6bVSfzzF75xITyyBOfCyR7 GpPYQdezhnFCSuMM6MzZ9d21O5EdrzziorIPXtiraKohzZRJPFZR6iZzT/nVK88MO7vP y31ENxseCanXbah9vMFxYvFFKEvB/hQjQnEQMfBybWZG+FimwxESfpg22dTuu9RAe1EG G1cYlJyT+AikLF8yB46lqu0CLO80vwPAeerNZ/E/WAAdgIV5tGjED9p0YIXGuwqxdzmG sAjeyNAL/nEYi4WcqjLY0NnH8zAZc73wPmi+gPzVM/jDsipl8yTo63rp2OBb15vh4yVc NugA== X-Gm-Message-State: AOAM532ix6DcnAPyW2PWtNtKK8HquV5cIO0FbDf7EZTpGR2KUpot88L1 bRHCJLg59R1NbA3Lq5wQeywHPTqw4G8= X-Google-Smtp-Source: ABdhPJzP5a6/psG8GqpIZQhINYkPzh5pzu2BqHp4pROiikDXXlR23AsUR6+nAQyhKoA6d5yTy7vY4g== X-Received: by 2002:a37:b807:: with SMTP id i7mr16486843qkf.126.1619432987439; Mon, 26 Apr 2021 03:29:47 -0700 (PDT) Received: from able.home (pool-108-51-182-148.washdc.fios.verizon.net. [108.51.182.148]) by smtp.gmail.com with ESMTPSA id d68sm10498674qkf.93.2021.04.26.03.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 03:29:46 -0700 (PDT) From: "David L. Craig" X-Google-Original-From: "David L. Craig" Received: from dlc by able.home with local (Exim 4.94) (envelope-from ) id 1layUq-0005GT-H7; Mon, 26 Apr 2021 10:29:44 +0000 Date: Mon, 26 Apr 2021 10:29:44 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WetDnInGquMwZ35u" Content-Disposition: inline Received-SPF: pass client-ip=2607:f8b0:4864:20::731; envelope-from=dlc.usa@gmail.com; helo=mail-qk1-x731.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Mailman-Approved-At: Mon, 26 Apr 2021 11:06:05 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --WetDnInGquMwZ35u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I followed the README-hacking instructions which led me to install texinfo on the CRUX 3.6 (http://crux.nu) platform I'm using for this, then invoked ./bootstrap which produced the following failure: > [...] > Don't forget to > - "include gnulib.mk" from within "lib/Makefile.am", > - "include gnulib.mk" from within "gnulib-tests/Makefile.am", > - mention "-I m4" in ACLOCAL_AMFLAGS in Makefile.am, > - mention "m4/gnulib-cache.m4" in EXTRA_DIST in Makefile.am, > - invoke gl_EARLY in ./configure.ac, right after AC_PROG_CC_STDC, > - invoke gl_INIT in ./configure.ac. > prefix=3Dlib/ > running: AUTOPOINT=3Dtrue LIBTOOLIZE=3Dtrue autoreconf --verbose --instal= l --force -I m4 --no-recursive > autoreconf: export WARNINGS=3D > autoreconf: Entering directory '.' > autoreconf: running: true --force > autoreconf: running: aclocal -I m4 --force -I m4 > autoreconf: configure.ac: tracing > autoreconf: configure.ac: not using Libtool > autoreconf: configure.ac: not using Intltool > autoreconf: configure.ac: not using Gtkdoc > autoreconf: running: /usr/bin/autoconf --include=3Dm4 --force > configure.ac:55: warning: The macro `AC_PROG_CC_STDC' is obsolete. > configure.ac:55: You should run autoupdate. > ./lib/autoconf/c.m4:1666: AC_PROG_CC_STDC is expanded from... > configure.ac:55: the top level > configure.ac:63: warning: The macro `AC_HELP_STRING' is obsolete. > configure.ac:63: You should run autoupdate. > ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... > m4/gnulib-comp.m4:924: gl_INIT is expanded from... > configure.ac:63: the top level > configure.ac:64: warning: The macro `AC_ISC_POSIX' is obsolete. > configure.ac:64: You should run autoupdate. > ./lib/autoconf/specific.m4:550: AC_ISC_POSIX is expanded from... > m4/jm-macros.m4:22: coreutils_MACROS is expanded from... > configure.ac:64: the top level > configure.ac:64: warning: The macro `AC_HEADER_TIME' is obsolete. > configure.ac:64: You should run autoupdate. > ./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from... > m4/check-decl.m4:14: gl_CHECK_DECLS is expanded from... > m4/jm-macros.m4:22: coreutils_MACROS is expanded from... > configure.ac:64: the top level > configure.ac:64: warning: The macro `AC_HELP_STRING' is obsolete. > configure.ac:64: You should run autoupdate. > ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... > m4/xattr.m4:11: gl_FUNC_XATTR is expanded from... > m4/prereq.m4:28: gl_PREREQ is expanded from... > m4/jm-macros.m4:22: coreutils_MACROS is expanded from... > configure.ac:64: the top level > configure.ac:64: warning: The macro `AC_HELP_STRING' is obsolete. > configure.ac:64: You should run autoupdate. > ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... > m4/jm-macros.m4:22: coreutils_MACROS is expanded from... > configure.ac:64: the top level > configure.ac:64: warning: The macro `AC_TRY_LINK' is obsolete. > configure.ac:64: You should run autoupdate. > ./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... > m4/jm-macros.m4:22: coreutils_MACROS is expanded from... > configure.ac:64: the top level > configure.ac:64: warning: The macro `AC_TRY_LINK' is obsolete. > configure.ac:64: You should run autoupdate. > ./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... > lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from... > lib/m4sugar/m4sh.m4:699: AS_IF is expanded from... > ./lib/autoconf/general.m4:2894: _AC_LINK_IFELSE is expanded from... > ./lib/autoconf/general.m4:2911: AC_LINK_IFELSE is expanded from... > ./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... > m4/jm-macros.m4:22: coreutils_MACROS is expanded from... > configure.ac:64: the top level > autoreconf: running: /usr/bin/autoheader --include=3Dm4 --force > autoreconf: running: automake --add-missing --copy --force-missing > configure.ac:55: installing 'build-aux/compile' > configure.ac:61: installing 'build-aux/config.guess' > configure.ac:61: installing 'build-aux/config.sub' > configure.ac:38: installing 'build-aux/install-sh' > configure.ac:38: installing 'build-aux/missing' > Makefile.am: installing './INSTALL' > Makefile.am: installing 'build-aux/depcomp' > configure.ac: installing 'build-aux/ylwrap' > doc/local.mk:19: installing 'build-aux/mdate-sh' > Makefile.am:213: 'doc/local.mk' included from here > doc/local.mk:19: error: required file 'build-aux/texinfo.tex' not found > Makefile.am:213: 'doc/local.mk' included from here > parallel-tests: installing 'build-aux/test-driver' > autoreconf: error: automake failed with exit status: 1 > ./bootstrap: autoreconf failed Here is my analysis of installed prerequisites: > #------------------------------------------------------------------------= ----- > From README-prereqs: > - Autoconf > - Automake > - Bison > - Gettext > - Git > - Gperf > - Gzip > - Perl > - Rsync > - Tar > - Texinfo # not in bootstrap= =2Econf > #------------------------------------------------------------------------= ----- > From coreutils/bootstrap.conf: > # Build prerequisites > buildreq=3D"\ > autoconf 2.64 # 2.71-1 is inst= alled > automake 1.11.2 # 1.16.3-1 is inst= alled > autopoint 0.19.2 # gettext in README-prereqs # 0.21-1 is inst= alled > bison - # 3.7.6-1 is inst= alled > gettext 0.19.2 # 0.21-1 is inst= alled > git 1.4.4 # 2.31.1-1 is inst= alled > gperf - # 1.10-1 is inst= alled > gzip - # 3.1-1 is inst= alled > makeinfo 6.1 # texinfo in README-prereqs # 6.7-1 is inst= alled > patch - # N/A in README-prereqs # 2.7.6.17-9c98-1 is inst= alled > perl 5.5 # 5.32.1-1 is inst= alled > rsync - # 3.2.3-1 is inst= alled > tar - # 1.34-1 is inst= alled > xz - # 5.2.5-1 is inst= alled > " > #------------------------------------------------------------------------= ----- > Installation order of dependencies per execution of > prt-get depends autoconf automake bison gettext git \ > gperf gzip perl rsync tar texinfo > -- dependencies ([i] =3D installed) > [i] autoconf 2.71-1 > [i] ncurses 6.2-1 > [i] libgmp 6.2.1-1 > [i] db 5.3.28-2 > [i] attr 2.5.1-1 > [i] expat 2.3.0-1 > [i] openssl 1.1.1k-1 > [i] zlib 1.2.11-1 > [i] xz 5.2.5-1 > [i] gperf 3.1-1 > [i] gzip 1.10-1 > [i] tar 1.34-1 > [i] readline 8.1-1 > [i] texinfo 6.7-1 > [i] libmpfr 4.1.0-1 > [i] acl 2.3.1-1 > [i] zstd 1.4.9-1 > [i] gdbm 1.19-1 > [i] gawk 5.1.0-1 > [i] gettext 0.21-1 > [i] rsync 3.2.3-1 > [i] curl 7.76.0-1 > [i] perl 5.32.1-1 > [i] bison 3.7.6-1 > [i] git 2.31.1-1 > [i] automake 1.16.3-1 > # > [i] patch 2.7.6.17-9c98-1 # patch not included in prt-get command > # patch has no dependencies > #------------------------------------------------------------------------= ----- It appears a texinfo.tex file in a build-aux directory somewhere is not in = the repo being processed. I did a find / for build-aux/texinfo.tex files in the system and found: Aug 19 2011 /_/l/ZF/_/DF/dlc/Misc/projects/debian/coreutils-8.13/build-a= ux/texinfo.tex Sep 3 2007 /_/l/ZF/_/DF/dlc/Applications/nord.2013/amd64/201309/cscratc= h/gettext-0.17/build-aux/texinfo.tex [ many more like these in the archives for lots of different GNU packages= ] Apr 24 01:32 /home/dlc/git_area/coreutils/gnulib/build-aux/texinfo.tex So I expect that last file is not what bootstrap is looking for. Please assist me with resolving this issue. --=20 May the LORD God bless you exceedingly abundantly! Dave_Craig______________________________________________ "So the universe is not quite as you thought it was. You'd better rearrange your beliefs, then. Because you certainly can't rearrange the universe." __--from_Nightfall_by_Asimov/Silverberg_________________ --WetDnInGquMwZ35u Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEETMVNFO0+WcP+ddQoFX4iU34ShUAFAmCGlgkACgkQFX4iU34S hUBD+w/+N83fXaPnSQHwjmyFxDYBsQ6X8PJUzKoLIhBVghyguFCUNRGSIKKvaeJ/ XMYMpbRPrzzEk98D6pSeYZmPYcXEFSftcXfJjzdSov4OwCeSIiAJ+SeuCSmLdc5r UhcD6ueE21GxzwgTuXNrwdsLEv6wQtVXUWAhYCeUKWW+4T6/yWP3ojjmBraJVEmX 0hmsO0H/RhYwzOP06izk+6AEeOli/tjoFN81LCzz1noG1Uaf9kA8hMom1gd03sM4 fTp76MHH8xHC3VQIGHlWuHNuI6+C9jEL5qlHZ7Hei9h3+Pdkhyx0uVvV+rh9GQkZ TPBanFK+1QpA4xrstASChtxuK+JduhihdGrPvTEpUpobc5GF4jqB89jgpkEGq69k +wyiwLQkqTbLSav2whJbcwz0gi9yWME13cDT3++QoRUroMkx9XdhzD+D6ZvYZO/7 OkFLGLuG3kqDJQgq/Z6uCpidSTGQs/4wClsNCtZ1RyNZ40/zaxWF+3V9C9WSqf9j bpC0I9yLLeLjb3PtAO4xF84b9FqA3cYfO/AqCFu1caMIhA6P8HRKllxnTaM47vYC vkj9QH3wzPuKaTzDEZ0WAn2bCYJGuycTP3eNvaiDibSkkyJhMZn3aOK2ilc2P35g pnclw38VvM11pz2c9bLcdm/CoDztv5krIuE2sLDHCXmNgUMD38s= =dVaU -----END PGP SIGNATURE----- --WetDnInGquMwZ35u-- From unknown Sat Jun 14 19:18:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#48034: git coreutils ./bootstrap failure Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 27 Apr 2021 07:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48034 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: "David L. Craig" Cc: 48034@debbugs.gnu.org Received: via spool by 48034-submit@debbugs.gnu.org id=B48034.16195072238734 (code B ref 48034); Tue, 27 Apr 2021 07:08:02 +0000 Received: (at 48034) by debbugs.gnu.org; 27 Apr 2021 07:07:03 +0000 Received: from localhost ([127.0.0.1]:47876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbHoE-0002Go-SO for submit@debbugs.gnu.org; Tue, 27 Apr 2021 03:07:03 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:50860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbHo9-0002GG-2X for 48034@debbugs.gnu.org; Tue, 27 Apr 2021 03:07:01 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id CE4F8160152; Tue, 27 Apr 2021 00:06:50 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id tpkwVADQZ7aZ; Tue, 27 Apr 2021 00:06:46 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 2B8A816015B; Tue, 27 Apr 2021 00:06:46 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id xf1TxSjSljlT; Tue, 27 Apr 2021 00:06:46 -0700 (PDT) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id F2C58160152; Tue, 27 Apr 2021 00:06:45 -0700 (PDT) References: From: Paul Eggert Organization: UCLA Computer Science Department Message-ID: <028e7ead-82a0-e315-82e1-b92e3635cd5c@cs.ucla.edu> Date: Tue, 27 Apr 2021 00:06:45 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------E13D129505135FCD4FE18C3E" Content-Language: en-US X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This is a multi-part message in MIME format. --------------E13D129505135FCD4FE18C3E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable On 4/26/21 3:29 AM, David L. Craig wrote: >> configure.ac:55: warning: The macro `AC_PROG_CC_STDC' is obsolete. I reproduced these warnings; they come from Autoconf 2.71. You can=20 ignore them, or you can update to the latest coreutils on Savannah,=20 where I installed some patches (attached) to silence these. >> doc/local.mk:19: installing 'build-aux/mdate-sh' >> Makefile.am:213: 'doc/local.mk' included from here >> doc/local.mk:19: error: required file 'build-aux/texinfo.tex' not foun= d >> Makefile.am:213: 'doc/local.mk' included from here I don't observe this problem. gnulib-tool sets up a symlink that works: $ ls -l build-aux/texinfo.tex gnulib/build-aux/texinfo.tex lrwxrwxrwx 1 eggert eggert 31 Apr 26 23:59 build-aux/texinfo.tex ->=20 ../gnulib/build-aux/texinfo.tex -rw-rw-r-- 1 eggert eggert 379274 Apr 26 23:56 gnulib/build-aux/texinfo.t= ex If you still observe a problem with a fresh build from scratch, please=20 investigate why gnulib-tool isn't setting up that link for you --------------E13D129505135FCD4FE18C3E Content-Type: text/x-patch; charset=UTF-8; name="0001-build-update-gnulib-submodule-to-latest.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-build-update-gnulib-submodule-to-latest.patch" =46rom 1c97d9e2af40003a8ad872fb7f31d4e616f52532 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 26 Apr 2021 18:02:16 -0700 Subject: [PATCH 1/3] build: update gnulib submodule to latest * src/csplit.c (load_buffer): * src/pinky.c (create_fullname): Use intprops-based checks rather than xalloc_oversized, since Gnulib xalloc.h no longer includes xalloc-oversized.h. --- gnulib | 2 +- src/csplit.c | 3 +-- src/pinky.c | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gnulib b/gnulib index e54b645fc..354b9691a 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit e54b645fc6b8422562327443bda575c65d931fbd +Subproject commit 354b9691accd00a531358b652689ce7f580fbe54 diff --git a/src/csplit.c b/src/csplit.c index ee9aa6503..79bd034e3 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -518,9 +518,8 @@ load_buffer (void) if (lines_found || have_read_eof) break; =20 - if (xalloc_oversized (2, b->bytes_alloc)) + if (INT_MULTIPLY_WRAPV (b->bytes_alloc, 2, &bytes_wanted)) xalloc_die (); - bytes_wanted =3D 2 * b->bytes_alloc; free_buffer (b); free (b); } diff --git a/src/pinky.c b/src/pinky.c index 23a43f5e4..6fea94923 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -110,9 +110,9 @@ create_fullname (char const *gecos_name, char const *= user_name) if (ampersands !=3D 0) { size_t ulen =3D strlen (user_name); - size_t product =3D ampersands * ulen; - rsize +=3D product - ampersands; - if (xalloc_oversized (ulen, ampersands) || rsize < product) + size_t product; + if (INT_MULTIPLY_WRAPV (ulen, ampersands - 1, &product) + || INT_ADD_WRAPV (rsize, product, &rsize)) xalloc_die (); } =20 --=20 2.27.0 --------------E13D129505135FCD4FE18C3E Content-Type: text/x-patch; charset=UTF-8; name="0002-csplit-size_t-overflow-check.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-csplit-size_t-overflow-check.patch" =46rom 1671951effff05096200aeb87ca6729fcccd2901 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 26 Apr 2021 20:04:19 -0700 Subject: [PATCH 2/3] csplit: size_t overflow check * src/csplit.c (get_new_buffer): Fix unlikely size_t overflow. --- src/csplit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/csplit.c b/src/csplit.c index 79bd034e3..f188e8894 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -416,7 +416,8 @@ get_new_buffer (size_t min_size) if (alloc_size < min_size) { size_t s =3D min_size - alloc_size + INCR_SIZE - 1; - alloc_size +=3D s - s % INCR_SIZE; + if (INT_ADD_WRAPV (alloc_size, s - s % INCR_SIZE, &alloc_size)) + xalloc_die (); } =20 new_buffer =3D create_new_buffer (alloc_size); --=20 2.27.0 --------------E13D129505135FCD4FE18C3E Content-Type: text/x-patch; charset=UTF-8; name="0003-maint-port-to-Autoconf-2.71.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-maint-port-to-Autoconf-2.71.patch" =46rom 96a034f490595258f9069a3fed037ddc65df2c71 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 26 Apr 2021 23:27:59 -0700 Subject: [PATCH 3/3] maint: port to Autoconf 2.71 * configure.ac: Use AC_PROG_CC, not AC_PROG_CC_STDC. * gl/modules/smack (configure.ac): * m4/jm-macros.m4 (coreutils_MACROS): * m4/xattr.m4 (gl_FUNC_XATTR): Use AS_HELP_STRING, not AC_HELP_STRING. * m4/check-decl.m4 (gl_CHECK_DECLS): Do not require AC_HEADER_TIME; we no longer care about it directly. * m4/jm-macros.m4 (coreutils_MACROS): Do not require AC_ISC_POSIX, which became obsolete in 2006. Use AC_LINK_IFELSE instead of AC_TRY_LINK. --- configure.ac | 2 +- gl/modules/smack | 2 +- m4/check-decl.m4 | 4 +--- m4/jm-macros.m4 | 54 +++++++++++++++++++++++++++--------------------- m4/xattr.m4 | 4 ++-- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index 7fbecbf8d..02291a4ae 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ m4_syscmd([test "${GNULIB_POSIXCHECK+set}" =3D set]) m4_if(m4_sysval, [0], [], [dnl gl_ASSERT_NO_GNULIB_POSIXCHECK]) =20 -AC_PROG_CC_STDC +AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_GCC_TRADITIONAL diff --git a/gl/modules/smack b/gl/modules/smack index a6dcbaa62..1c4a541a6 100644 --- a/gl/modules/smack +++ b/gl/modules/smack @@ -10,7 +10,7 @@ configure.ac: # Check whether libsmack is available LIB_SMACK=3D AC_ARG_ENABLE([libsmack], - AC_HELP_STRING([--disable-libsmack], [disable libsmack support])) + AS_HELP_STRING([--disable-libsmack], [disable libsmack support])) if test "X$enable_libsmack" !=3D "Xno"; then AC_CHECK_LIB([smack], [smack_new_label_from_self], [AC_CHECK_LIB([smack], [smack_new_label_from_path], diff --git a/m4/check-decl.m4 b/m4/check-decl.m4 index c67a95edb..02db0f330 100644 --- a/m4/check-decl.m4 +++ b/m4/check-decl.m4 @@ -1,4 +1,4 @@ -#serial 26 +#serial 27 # Check declarations for this package. =20 dnl Copyright (C) 1997-2021 Free Software Foundation, Inc. @@ -13,8 +13,6 @@ dnl Putting it in a separate file like this helps share= it between dnl different packages. AC_DEFUN([gl_CHECK_DECLS], [ - AC_REQUIRE([AC_HEADER_TIME]) - AC_CHECK_HEADERS_ONCE([grp.h pwd.h]) headers=3D' #include diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index db32cf483..fb66907f4 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,4 +1,4 @@ -#serial 112 -*- autoconf -*- +#serial 113 -*- autoconf -*- =20 dnl Misc type-related macros for coreutils. =20 @@ -24,9 +24,6 @@ AC_DEFUN([coreutils_MACROS], AM_MISSING_PROG(HELP2MAN, help2man) AC_SUBST([MAN]) =20 - dnl This macro actually runs replacement code. See isc-posix.m4. - AC_REQUIRE([AC_ISC_POSIX])dnl - gl_CHECK_ALL_TYPES =20 AC_REQUIRE([gl_CHECK_DECLS]) @@ -116,7 +113,7 @@ AC_DEFUN([coreutils_MACROS], # Check whether libcap is usable -- for ls --color support LIB_CAP=3D AC_ARG_ENABLE([libcap], - AC_HELP_STRING([--disable-libcap], [disable libcap support])) + AS_HELP_STRING([--disable-libcap], [disable libcap support])) if test "X$enable_libcap" !=3D "Xno"; then AC_CHECK_LIB([cap], [cap_get_file], [AC_CHECK_HEADER([sys/capability.h], @@ -142,29 +139,38 @@ AC_DEFUN([coreutils_MACROS], # and doesn't have a separate math library. =20 AC_SUBST([SEQ_LIBM]) - ac_seq_body=3D' - static double x, y; - x =3D floor (x); - x =3D rint (x); - x =3D modf (x, &y);' - AC_TRY_LINK([#include ], [$ac_seq_body], , - [ac_seq_save_LIBS=3D"$LIBS" - LIBS=3D"$LIBS -lm" - AC_TRY_LINK([#include ], [$ac_seq_body], [SEQ_LIBM=3D-lm]) - LIBS=3D"$ac_seq_save_LIBS" - ]) - + jm_break=3D: + for jm_seqlibs in '' '-lm'; do + jm_seq_save_LIBS=3D$LIBS + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[static double x, y; + x =3D floor (x); + x =3D rint (x); + x =3D modf (x, &y);]])], + [SEQ_LIBM=3D$jm_seqlibs + jm_break=3Dbreak]) + LIBS=3D$jm_seq_save_LIBS + $jm_break + done =20 # See is fpsetprec() required to use extended double precision # This is needed on 32 bit FreeBSD to give accurate conversion of: # `numfmt 9223372036854775808` - AC_TRY_LINK([#include ], - [#ifdef __i386__ - fpsetprec(FP_PE); - #else - # error not required on 64 bit - #endif - ], [ac_have_fpsetprec=3Dyes], [ac_have_fpsetprec=3Dno]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[#ifdef __i386__ + fpsetprec(FP_PE); + #else + # error not required on 64 bit + #endif + ]])], + [ac_have_fpsetprec=3Dyes], + [ac_have_fpsetprec=3Dno]) if test "$ac_have_fpsetprec" =3D "yes" ; then AC_DEFINE([HAVE_FPSETPREC], 1, [whether fpsetprec is present and req= uired]) fi diff --git a/m4/xattr.m4 b/m4/xattr.m4 index 3fbcd9104..5f9248939 100644 --- a/m4/xattr.m4 +++ b/m4/xattr.m4 @@ -1,5 +1,5 @@ # xattr.m4 - check for Extended Attributes (Linux) -# serial 3 +# serial 4 =20 # Copyright (C) 2003-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_XATTR], [ AC_ARG_ENABLE([xattr], - AC_HELP_STRING([--disable-xattr], + AS_HELP_STRING([--disable-xattr], [do not support extended attributes]), [use_xattr=3D$enableval], [use_xattr=3Dyes]) =20 --=20 2.27.0 --------------E13D129505135FCD4FE18C3E-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 21 04:05:32 2022 Received: (at control) by debbugs.gnu.org; 21 Feb 2022 09:05:32 +0000 Received: from localhost ([127.0.0.1]:35002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM4dP-0000to-SQ for submit@debbugs.gnu.org; Mon, 21 Feb 2022 04:05:32 -0500 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:46606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM4dO-0000tb-BH for control@debbugs.gnu.org; Mon, 21 Feb 2022 04:05:30 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 171C4160103 for ; Mon, 21 Feb 2022 01:05:25 -0800 (PST) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id vnTSdSJi1XQc for ; Mon, 21 Feb 2022 01:05:24 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 79449160106 for ; Mon, 21 Feb 2022 01:05:24 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id m9CYyoW0WpMh for ; Mon, 21 Feb 2022 01:05:24 -0800 (PST) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 586BF160103 for ; Mon, 21 Feb 2022 01:05:24 -0800 (PST) Message-ID: <80fc1cea-fd38-bd78-af7e-29bc021c0574@cs.ucla.edu> Date: Mon, 21 Feb 2022 01:05:24 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: control@debbugs.gnu.org From: Paul Eggert Organization: UCLA Computer Science Department Subject: close 48070 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 48070 tags 48034 moreinfo close 48034 unmerge 47883 unmerge 48002