From unknown Tue Sep 09 13:17:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32025: two build/maint-related patches Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-gzip@gnu.org Resent-Date: Sun, 01 Jul 2018 14:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32025 X-GNU-PR-Package: gzip X-GNU-PR-Keywords: To: 32025@debbugs.gnu.org X-Debbugs-Original-To: bug-gzip@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15304571327921 (code B ref -1); Sun, 01 Jul 2018 14:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jul 2018 14:58:52 +0000 Received: from localhost ([127.0.0.1]:42237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZdoK-00023Z-Ps for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZdoI-00023K-NY for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZdoB-0004Q4-LC for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:44980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZdoB-0004Pv-HA for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZdo9-0008OI-BJ for bug-gzip@gnu.org; Sun, 01 Jul 2018 10:58:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZdo7-0004Ni-37 for bug-gzip@gnu.org; Sun, 01 Jul 2018 10:58:33 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:42410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZdo6-0004NH-Qb for bug-gzip@gnu.org; Sun, 01 Jul 2018 10:58:31 -0400 Received: by mail-pl0-x244.google.com with SMTP id y15-v6so4846423pll.9 for ; Sun, 01 Jul 2018 07:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version; bh=codzUEuSEXm5JqzUTmu+YfNGphjObug+dCxr0sjrnWU=; b=Vs8LzQcDnhzT1QrX266LLSXfgWYWzQ5OHCri5bsY2xOVlhxWZDyOmqndjb73At4/jf Km3th49FoH/I5dHz4zXa4vKkZi+/Go+zgKy9FR+nk1NJviV428inMW/hvQ/IBhG8RzjE FpUly7AMZfbAeif6fedvRxfs089oZv6evVWmUPZLAaFdQoVBW3+Ats/YO/xAaIekWFul fMM2goebHLGyepYQGLxqMIKUlwi8BBjKYp8I4bxnIJ15DrF3s2X5+22u59GEy1XeMuY4 oP4/hUzpOBL81IFMMXSSCxFvwBBMlPdKLxdweYr3o/e8SoIwPU9dYUt0fPML07c1FwwN 3ElA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version; bh=codzUEuSEXm5JqzUTmu+YfNGphjObug+dCxr0sjrnWU=; b=JdbBCxq1PHQo1KqwCex0yrH+HWnJuHL2BhAIB/d7alz/17CO3NuQ4/CDv/bi0+lmUf 7hieufXu3MfzSzZ6ydJUZNIYK/DO6hHqM28RTy8j9IFpeGNNE+rtVH2J1WMkYMhx4KZj sVbQAG+MkekrBPY2yWk0vPKl9pngVhpcwlLbaPfdWz30RgNQva2Pkk1xqySWRDKPBLpf XcCrQ75hVshIgIQ11yjkKtEUm1BmnsOaGxT/LEcnXFXy8pSMkv5lYnYZQvnEqFzTVuV1 XVS+WcwR03aNjKwRWDJHoj/wTyRYTYrrPytKsVmzUeVATKn9lCzqmYh+zD6bdJQrNOOU TuOw== X-Gm-Message-State: APt69E3PA4h/LnLDLWq87qXVQOYy+NBuimWOGMw+ktwmxjbHsXc8byXf pmgKkD5JxGGtUoItdGvhAregvA== X-Google-Smtp-Source: ADUXVKIstkHgEprOndiQeGHoRHzPeB/9UouZ2wjhHGKSaXni+hnUuctwYyhk97imK4CCiF313xKE4w== X-Received: by 2002:a17:902:3f81:: with SMTP id a1-v6mr22347317pld.29.1530457109087; Sun, 01 Jul 2018 07:58:29 -0700 (PDT) Received: from dhcp-172-20-161-33.DHCP.thefacebook.com ([2620:10d:c090:180::1:539c]) by smtp.gmail.com with ESMTPSA id y2-v6sm34360564pfa.43.2018.07.01.07.58.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 01 Jul 2018 07:58:27 -0700 (PDT) From: Jim Meyering Date: Sun, 01 Jul 2018 07:58:20 -0700 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.5 (---) 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: 0.5 (/) I've just pushed these: >>From 203e40cc4558a80998d05eb74b373a51e796ca8b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 30 Jun 2018 19:27:21 -0700 Subject: [PATCH 1/2] build: remove -Wformat-truncation=2 to avoid avoid false-positive * configure.ac (GNULIB_WARN_CFLAGS): Add -Wformat-truncation=2, to disable it when building gnulib with --enable-gcc-warnings. This avoids what looks like a false positive from GCC 9: strerror_r.c: In function 'rpl_strerror_r': strerror_r.c:453:35: error: 'Unknown error ' directive output \ truncated writing 14 bytes into a region of size 2 \ [-Werror=format-truncation=] snprintf (buf, buflen, "Unknown error %d", errnum); ~~^~~~~~~~~~~~ In file included from /usr/include/stdio.h:862, from ./stdio.h:43, from strerror_r.c:29: /usr/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' \ output between 16 and 26 bytes into a destination of size 2 return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 1f05a7e..361d877 100644 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,7 @@ if test "$gl_gcc_warnings" = yes; then # Remove the following and save the result in GNULIB_WARN_CFLAGS. nw= nw="$nw -Wstrict-overflow" + nw="$nw -Wformat-truncation=2" nw="$nw -Wuninitialized" nw="$nw -Wunused-macros" nw="$nw -Wmissing-prototypes" -- 2.18.0 >>From 9ef6a8ac4470aeac60445c7e4802349bc9272d5d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 30 Jun 2018 19:05:55 -0700 Subject: [PATCH 2/2] maint: update gnulib to latest; also update bootstrap and init.sh --- bootstrap | 258 ++++++++++++++++++++++++++++--------------------- gnulib | 2 +- lib/.gitignore | 1 - tests/init.sh | 2 +- 4 files changed, 152 insertions(+), 111 deletions(-) diff --git a/bootstrap b/bootstrap index 25920e9..ed3b0a4 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2017-09-19.08; # UTC +scriptversion=2018-07-01.02; # UTC # Bootstrap this package from checked-out sources. @@ -47,6 +47,8 @@ PERL="${PERL-perl}" me=$0 +default_gnulib_url=git://git.sv.gnu.org/gnulib + usage() { cat </dev/null; then - echo "$0: getting gnulib files..." - git submodule init -- "$gnulib_path" || exit $? - git submodule update -- "$gnulib_path" || exit $? + case ${GNULIB_SRCDIR--} in + -) + # Note that $use_git is necessarily true in this case. + if git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + git submodule init -- "$gnulib_path" || exit $? + git submodule update -- "$gnulib_path" || exit $? - elif [ ! -d "$gnulib_path" ]; then - echo "$0: getting gnulib files..." + elif [ ! -d "$gnulib_path" ]; then + echo "$0: getting gnulib files..." - trap cleanup_gnulib 1 2 13 15 + trap cleanup_gnulib 1 2 13 15 - shallow= - git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' - git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || - cleanup_gnulib + shallow= + if test -z "$GNULIB_REVISION"; then + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' + fi + git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \ + || cleanup_gnulib - trap - 1 2 13 15 - fi - GNULIB_SRCDIR=$gnulib_path - ;; -*) - # Use GNULIB_SRCDIR directly or as a reference. - if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ - git_modules_config submodule.gnulib.url >/dev/null; then - echo "$0: getting gnulib files..." - if git submodule -h|grep -- --reference > /dev/null; then - # Prefer the one-liner available in git 1.6.4 or newer. - git submodule update --init --reference "$GNULIB_SRCDIR" \ - "$gnulib_path" || exit $? - else - # This fallback allows at least git 1.5.5. - if test -f "$gnulib_path"/gnulib-tool; then - # Since file already exists, assume submodule init already complete. - git submodule update -- "$gnulib_path" || exit $? + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=$gnulib_path + ;; + *) + # Use GNULIB_SRCDIR directly or as a reference. + if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ + git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + if git submodule -h|grep -- --reference > /dev/null; then + # Prefer the one-liner available in git 1.6.4 or newer. + git submodule update --init --reference "$GNULIB_SRCDIR" \ + "$gnulib_path" || exit $? else - # Older git can't clone into an empty directory. - rmdir "$gnulib_path" 2>/dev/null - git clone --reference "$GNULIB_SRCDIR" \ - "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ - && git submodule init -- "$gnulib_path" \ - && git submodule update -- "$gnulib_path" \ - || exit $? + # This fallback allows at least git 1.5.5. + if test -f "$gnulib_path"/gnulib-tool; then + # Since file already exists, assume submodule init already complete. + git submodule update -- "$gnulib_path" || exit $? + else + # Older git can't clone into an empty directory. + rmdir "$gnulib_path" 2>/dev/null + git clone --reference "$GNULIB_SRCDIR" \ + "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ + && git submodule init -- "$gnulib_path" \ + && git submodule update -- "$gnulib_path" \ + || exit $? + fi fi + GNULIB_SRCDIR=$gnulib_path fi - GNULIB_SRCDIR=$gnulib_path + ;; + esac + + if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \ + && ! git_modules_config submodule.gnulib.url >/dev/null; then + (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib fi - ;; -esac -# $GNULIB_SRCDIR now points to the version of gnulib to use, and -# we no longer need to use git or $gnulib_path below here. + # $GNULIB_SRCDIR now points to the version of gnulib to use, and + # we no longer need to use git or $gnulib_path below here. + + if $bootstrap_sync; then + cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { + echo "$0: updating bootstrap and restarting..." + case $(sh -c 'echo "$1"' -- a) in + a) ignored=--;; + *) ignored=ignored;; + esac + exec sh -c \ + 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ + $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ + "$0" "$@" --no-bootstrap-sync + } + fi -if $bootstrap_sync; then - cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { - echo "$0: updating bootstrap and restarting..." - case $(sh -c 'echo "$1"' -- a) in - a) ignored=--;; - *) ignored=ignored;; - esac - exec sh -c \ - 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ - $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ - "$0" "$@" --no-bootstrap-sync - } + gnulib_tool=$GNULIB_SRCDIR/gnulib-tool + <$gnulib_tool || exit $? fi -gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -<$gnulib_tool || exit $? - # Get translations. download_po_files() { @@ -898,32 +939,33 @@ fi # Import from gnulib. -gnulib_tool_options="\ - --import\ - --no-changelog\ - --aux-dir $build_aux\ - --doc-base $doc_base\ - --lib $gnulib_name\ - --m4-base $m4_base/\ - --source-base $source_base/\ - --tests-base $tests_base\ - --local-dir $local_gl_dir\ - $gnulib_tool_option_extras\ -" -if test $use_libtool = 1; then - case "$gnulib_tool_options " in - *' --libtool '*) ;; - *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; - esac -fi -echo "$0: $gnulib_tool $gnulib_tool_options --import ..." -$gnulib_tool $gnulib_tool_options --import $gnulib_modules \ - || die "gnulib-tool failed" +if $use_gnulib; then + gnulib_tool_options="\ + --no-changelog\ + --aux-dir=$build_aux\ + --doc-base=$doc_base\ + --lib=$gnulib_name\ + --m4-base=$m4_base/\ + --source-base=$source_base/\ + --tests-base=$tests_base\ + --local-dir=$local_gl_dir\ + $gnulib_tool_option_extras\ + " + if test $use_libtool = 1; then + case "$gnulib_tool_options " in + *' --libtool '*) ;; + *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; + esac + fi + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" -for file in $gnulib_files; do - symlink_to_dir "$GNULIB_SRCDIR" $file \ - || die "failed to symlink $file" -done + for file in $gnulib_files; do + symlink_to_dir "$GNULIB_SRCDIR" $file \ + || die "failed to symlink $file" + done +fi bootstrap_post_import_hook \ || die "bootstrap_post_import_hook failed" @@ -1020,7 +1062,7 @@ bootstrap_epilogue echo "$0: done. Now you can run './configure'." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/gnulib b/gnulib index 7e7c5c7..8cb3181 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 7e7c5c7952b7de1e33c8eba891cc425d5d8d7803 +Subproject commit 8cb31815a5093ae1c45ab00c592fc58ac75c9e1e diff --git a/lib/.gitignore b/lib/.gitignore index 6b1ea36..cd11296 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -113,7 +113,6 @@ /malloc.c /malloca.c /malloca.h -/malloca.valgrind /math.c /math.h /math.in.h diff --git a/tests/init.sh b/tests/init.sh index 3a0e63c..93d14f5 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -527,7 +527,7 @@ rand_bytes_ () fi n_plus_50_=`expr $n_ + 50` - cmds_='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n' + cmds_='date; date +%N; free; who -a; w; ps auxww; ps -ef' data_=` (eval "$cmds_") 2>&1 | gzip ` # Ensure that $data_ has length at least 50+$n_ -- 2.18.0 From unknown Tue Sep 09 13:17:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jim Meyering Subject: bug#32025: closed (Re: bug#32025: Acknowledgement (two build/maint-related patches)) Message-ID: References: X-Gnu-PR-Message: they-closed 32025 X-Gnu-PR-Package: gzip Reply-To: 32025@debbugs.gnu.org Date: Sun, 01 Jul 2018 16:32:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1530462722-31825-1" This is a multi-part message in MIME format... ------------=_1530462722-31825-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32025: two build/maint-related patches which was filed against the gzip package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32025@debbugs.gnu.org. --=20 32025: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32025 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1530462722-31825-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32025-done) by debbugs.gnu.org; 1 Jul 2018 16:31:12 +0000 Received: from localhost ([127.0.0.1]:42282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZfFn-0008GH-Qt for submit@debbugs.gnu.org; Sun, 01 Jul 2018 12:31:11 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZfFm-0008G5-Ea for 32025-done@debbugs.gnu.org; Sun, 01 Jul 2018 12:31:10 -0400 Received: by mail-wm0-f44.google.com with SMTP id u18-v6so6413774wmc.1 for <32025-done@debbugs.gnu.org>; Sun, 01 Jul 2018 09:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=Sl9BoEnET5tlpk/5YosaEdNZnAkRVSH6rTH0nLPFovw=; b=fTZmd3ivc9ZPOP/hwicRhaK63IX1RueyjCzz7n6/NUKTntjpm9vfPiRB9emFlQyw9E UJayW9w1ie4GzcrgkdLZoWtR5jalRdGmp2RLQaOqkYe8lqrQi8q4TJwADvT+W0rrY2cw rOzw59YK4JgEfEpm++/LGGggO21SjL2mORd6cbSabqCJM94DiQt3sjt5t4JVyjvFCjQ8 1x3wOFqZhmSq3xupTik8qKrfTyC/VYEAAAVX8UcHG2A+g7/WuqAyFUN/K83eX2S+iRlQ 48gVaO6fnyAqchnCtorafSe5S8eadwGOEu2hyPrfeaYMQgDIUKpFgTuxr+RM0Fqdbtia MpbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=Sl9BoEnET5tlpk/5YosaEdNZnAkRVSH6rTH0nLPFovw=; b=EIm3a+X3wgE4kko3xY+CyCDGwWcKJaadJAbxLNhOdz55WMCCvBFMR0JK+ln9BcT+OX 1lXnnL+eX0o+8rA0kXWEvNnvCbxB7PdvisvNQ+Q9eqSvgU28wvhXuhwmAHNMumxGxy1g k7xYcERLT1tTLUgYeYpaJ3/L5+N+0J4s88yPj4HboXuYFBYqMTn50eN4oeJXiM7ki9GC acrj2mFqt7sdH8iU5RaRbJ7M59s+uZuf7rY7FYNXD2PaSjunTwEkVPKt7Ezn8lHfqnkH FcGIEDPO/bJ83rTvZekJMJp9WIBiuBobziRR5gdDXmAn/qdMCZETvGvIrZZ9y49HuKA+ c7fw== X-Gm-Message-State: APt69E3fGFV8qiVA8Y/r8ao/hNIPjn+F4rRj8MdBHhWbouIItzZm+uEe JrTusUnybpKBRFo8OtQi08+VbzoaqcS9EFTImOk= X-Google-Smtp-Source: AAOMgpeljxW3oPi0Td6p/I0LCjh41Q01yubVjDdMIH61lZV+I9x3jRYafF190VwYs9Ym9VyJ0Ztf0nCAAFGXIP5esGA= X-Received: by 2002:a1c:aacf:: with SMTP id t198-v6mr5933555wme.109.1530462664149; Sun, 01 Jul 2018 09:31:04 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:adf:ff42:0:0:0:0:0 with HTTP; Sun, 1 Jul 2018 09:30:43 -0700 (PDT) In-Reply-To: References: From: Jim Meyering Date: Sun, 1 Jul 2018 09:30:43 -0700 X-Google-Sender-Auth: LI2wUMsvk7z5eRfAltarisGaQXc Message-ID: Subject: Re: bug#32025: Acknowledgement (two build/maint-related patches) To: 32025-done@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 32025-done 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: -0.5 (/) tags 32025 notabug stop ------------=_1530462722-31825-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 1 Jul 2018 14:58:52 +0000 Received: from localhost ([127.0.0.1]:42237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZdoK-00023Z-Ps for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZdoI-00023K-NY for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZdoB-0004Q4-LC for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:44980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZdoB-0004Pv-HA for submit@debbugs.gnu.org; Sun, 01 Jul 2018 10:58:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZdo9-0008OI-BJ for bug-gzip@gnu.org; Sun, 01 Jul 2018 10:58:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZdo7-0004Ni-37 for bug-gzip@gnu.org; Sun, 01 Jul 2018 10:58:33 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:42410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZdo6-0004NH-Qb for bug-gzip@gnu.org; Sun, 01 Jul 2018 10:58:31 -0400 Received: by mail-pl0-x244.google.com with SMTP id y15-v6so4846423pll.9 for ; Sun, 01 Jul 2018 07:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version; bh=codzUEuSEXm5JqzUTmu+YfNGphjObug+dCxr0sjrnWU=; b=Vs8LzQcDnhzT1QrX266LLSXfgWYWzQ5OHCri5bsY2xOVlhxWZDyOmqndjb73At4/jf Km3th49FoH/I5dHz4zXa4vKkZi+/Go+zgKy9FR+nk1NJviV428inMW/hvQ/IBhG8RzjE FpUly7AMZfbAeif6fedvRxfs089oZv6evVWmUPZLAaFdQoVBW3+Ats/YO/xAaIekWFul fMM2goebHLGyepYQGLxqMIKUlwi8BBjKYp8I4bxnIJ15DrF3s2X5+22u59GEy1XeMuY4 oP4/hUzpOBL81IFMMXSSCxFvwBBMlPdKLxdweYr3o/e8SoIwPU9dYUt0fPML07c1FwwN 3ElA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version; bh=codzUEuSEXm5JqzUTmu+YfNGphjObug+dCxr0sjrnWU=; b=JdbBCxq1PHQo1KqwCex0yrH+HWnJuHL2BhAIB/d7alz/17CO3NuQ4/CDv/bi0+lmUf 7hieufXu3MfzSzZ6ydJUZNIYK/DO6hHqM28RTy8j9IFpeGNNE+rtVH2J1WMkYMhx4KZj sVbQAG+MkekrBPY2yWk0vPKl9pngVhpcwlLbaPfdWz30RgNQva2Pkk1xqySWRDKPBLpf XcCrQ75hVshIgIQ11yjkKtEUm1BmnsOaGxT/LEcnXFXy8pSMkv5lYnYZQvnEqFzTVuV1 XVS+WcwR03aNjKwRWDJHoj/wTyRYTYrrPytKsVmzUeVATKn9lCzqmYh+zD6bdJQrNOOU TuOw== X-Gm-Message-State: APt69E3PA4h/LnLDLWq87qXVQOYy+NBuimWOGMw+ktwmxjbHsXc8byXf pmgKkD5JxGGtUoItdGvhAregvA== X-Google-Smtp-Source: ADUXVKIstkHgEprOndiQeGHoRHzPeB/9UouZ2wjhHGKSaXni+hnUuctwYyhk97imK4CCiF313xKE4w== X-Received: by 2002:a17:902:3f81:: with SMTP id a1-v6mr22347317pld.29.1530457109087; Sun, 01 Jul 2018 07:58:29 -0700 (PDT) Received: from dhcp-172-20-161-33.DHCP.thefacebook.com ([2620:10d:c090:180::1:539c]) by smtp.gmail.com with ESMTPSA id y2-v6sm34360564pfa.43.2018.07.01.07.58.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 01 Jul 2018 07:58:27 -0700 (PDT) From: Jim Meyering To: bug-gzip@gnu.org Subject: two build/maint-related patches Date: Sun, 01 Jul 2018 07:58:20 -0700 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.5 (---) X-Debbugs-Envelope-To: submit 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: 0.5 (/) I've just pushed these: >>From 203e40cc4558a80998d05eb74b373a51e796ca8b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 30 Jun 2018 19:27:21 -0700 Subject: [PATCH 1/2] build: remove -Wformat-truncation=2 to avoid avoid false-positive * configure.ac (GNULIB_WARN_CFLAGS): Add -Wformat-truncation=2, to disable it when building gnulib with --enable-gcc-warnings. This avoids what looks like a false positive from GCC 9: strerror_r.c: In function 'rpl_strerror_r': strerror_r.c:453:35: error: 'Unknown error ' directive output \ truncated writing 14 bytes into a region of size 2 \ [-Werror=format-truncation=] snprintf (buf, buflen, "Unknown error %d", errnum); ~~^~~~~~~~~~~~ In file included from /usr/include/stdio.h:862, from ./stdio.h:43, from strerror_r.c:29: /usr/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' \ output between 16 and 26 bytes into a destination of size 2 return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 1f05a7e..361d877 100644 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,7 @@ if test "$gl_gcc_warnings" = yes; then # Remove the following and save the result in GNULIB_WARN_CFLAGS. nw= nw="$nw -Wstrict-overflow" + nw="$nw -Wformat-truncation=2" nw="$nw -Wuninitialized" nw="$nw -Wunused-macros" nw="$nw -Wmissing-prototypes" -- 2.18.0 >>From 9ef6a8ac4470aeac60445c7e4802349bc9272d5d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 30 Jun 2018 19:05:55 -0700 Subject: [PATCH 2/2] maint: update gnulib to latest; also update bootstrap and init.sh --- bootstrap | 258 ++++++++++++++++++++++++++++--------------------- gnulib | 2 +- lib/.gitignore | 1 - tests/init.sh | 2 +- 4 files changed, 152 insertions(+), 111 deletions(-) diff --git a/bootstrap b/bootstrap index 25920e9..ed3b0a4 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2017-09-19.08; # UTC +scriptversion=2018-07-01.02; # UTC # Bootstrap this package from checked-out sources. @@ -47,6 +47,8 @@ PERL="${PERL-perl}" me=$0 +default_gnulib_url=git://git.sv.gnu.org/gnulib + usage() { cat </dev/null; then - echo "$0: getting gnulib files..." - git submodule init -- "$gnulib_path" || exit $? - git submodule update -- "$gnulib_path" || exit $? + case ${GNULIB_SRCDIR--} in + -) + # Note that $use_git is necessarily true in this case. + if git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + git submodule init -- "$gnulib_path" || exit $? + git submodule update -- "$gnulib_path" || exit $? - elif [ ! -d "$gnulib_path" ]; then - echo "$0: getting gnulib files..." + elif [ ! -d "$gnulib_path" ]; then + echo "$0: getting gnulib files..." - trap cleanup_gnulib 1 2 13 15 + trap cleanup_gnulib 1 2 13 15 - shallow= - git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' - git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || - cleanup_gnulib + shallow= + if test -z "$GNULIB_REVISION"; then + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' + fi + git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \ + || cleanup_gnulib - trap - 1 2 13 15 - fi - GNULIB_SRCDIR=$gnulib_path - ;; -*) - # Use GNULIB_SRCDIR directly or as a reference. - if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ - git_modules_config submodule.gnulib.url >/dev/null; then - echo "$0: getting gnulib files..." - if git submodule -h|grep -- --reference > /dev/null; then - # Prefer the one-liner available in git 1.6.4 or newer. - git submodule update --init --reference "$GNULIB_SRCDIR" \ - "$gnulib_path" || exit $? - else - # This fallback allows at least git 1.5.5. - if test -f "$gnulib_path"/gnulib-tool; then - # Since file already exists, assume submodule init already complete. - git submodule update -- "$gnulib_path" || exit $? + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=$gnulib_path + ;; + *) + # Use GNULIB_SRCDIR directly or as a reference. + if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ + git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + if git submodule -h|grep -- --reference > /dev/null; then + # Prefer the one-liner available in git 1.6.4 or newer. + git submodule update --init --reference "$GNULIB_SRCDIR" \ + "$gnulib_path" || exit $? else - # Older git can't clone into an empty directory. - rmdir "$gnulib_path" 2>/dev/null - git clone --reference "$GNULIB_SRCDIR" \ - "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ - && git submodule init -- "$gnulib_path" \ - && git submodule update -- "$gnulib_path" \ - || exit $? + # This fallback allows at least git 1.5.5. + if test -f "$gnulib_path"/gnulib-tool; then + # Since file already exists, assume submodule init already complete. + git submodule update -- "$gnulib_path" || exit $? + else + # Older git can't clone into an empty directory. + rmdir "$gnulib_path" 2>/dev/null + git clone --reference "$GNULIB_SRCDIR" \ + "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ + && git submodule init -- "$gnulib_path" \ + && git submodule update -- "$gnulib_path" \ + || exit $? + fi fi + GNULIB_SRCDIR=$gnulib_path fi - GNULIB_SRCDIR=$gnulib_path + ;; + esac + + if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \ + && ! git_modules_config submodule.gnulib.url >/dev/null; then + (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib fi - ;; -esac -# $GNULIB_SRCDIR now points to the version of gnulib to use, and -# we no longer need to use git or $gnulib_path below here. + # $GNULIB_SRCDIR now points to the version of gnulib to use, and + # we no longer need to use git or $gnulib_path below here. + + if $bootstrap_sync; then + cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { + echo "$0: updating bootstrap and restarting..." + case $(sh -c 'echo "$1"' -- a) in + a) ignored=--;; + *) ignored=ignored;; + esac + exec sh -c \ + 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ + $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ + "$0" "$@" --no-bootstrap-sync + } + fi -if $bootstrap_sync; then - cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { - echo "$0: updating bootstrap and restarting..." - case $(sh -c 'echo "$1"' -- a) in - a) ignored=--;; - *) ignored=ignored;; - esac - exec sh -c \ - 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ - $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ - "$0" "$@" --no-bootstrap-sync - } + gnulib_tool=$GNULIB_SRCDIR/gnulib-tool + <$gnulib_tool || exit $? fi -gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -<$gnulib_tool || exit $? - # Get translations. download_po_files() { @@ -898,32 +939,33 @@ fi # Import from gnulib. -gnulib_tool_options="\ - --import\ - --no-changelog\ - --aux-dir $build_aux\ - --doc-base $doc_base\ - --lib $gnulib_name\ - --m4-base $m4_base/\ - --source-base $source_base/\ - --tests-base $tests_base\ - --local-dir $local_gl_dir\ - $gnulib_tool_option_extras\ -" -if test $use_libtool = 1; then - case "$gnulib_tool_options " in - *' --libtool '*) ;; - *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; - esac -fi -echo "$0: $gnulib_tool $gnulib_tool_options --import ..." -$gnulib_tool $gnulib_tool_options --import $gnulib_modules \ - || die "gnulib-tool failed" +if $use_gnulib; then + gnulib_tool_options="\ + --no-changelog\ + --aux-dir=$build_aux\ + --doc-base=$doc_base\ + --lib=$gnulib_name\ + --m4-base=$m4_base/\ + --source-base=$source_base/\ + --tests-base=$tests_base\ + --local-dir=$local_gl_dir\ + $gnulib_tool_option_extras\ + " + if test $use_libtool = 1; then + case "$gnulib_tool_options " in + *' --libtool '*) ;; + *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; + esac + fi + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" -for file in $gnulib_files; do - symlink_to_dir "$GNULIB_SRCDIR" $file \ - || die "failed to symlink $file" -done + for file in $gnulib_files; do + symlink_to_dir "$GNULIB_SRCDIR" $file \ + || die "failed to symlink $file" + done +fi bootstrap_post_import_hook \ || die "bootstrap_post_import_hook failed" @@ -1020,7 +1062,7 @@ bootstrap_epilogue echo "$0: done. Now you can run './configure'." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/gnulib b/gnulib index 7e7c5c7..8cb3181 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 7e7c5c7952b7de1e33c8eba891cc425d5d8d7803 +Subproject commit 8cb31815a5093ae1c45ab00c592fc58ac75c9e1e diff --git a/lib/.gitignore b/lib/.gitignore index 6b1ea36..cd11296 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -113,7 +113,6 @@ /malloc.c /malloca.c /malloca.h -/malloca.valgrind /math.c /math.h /math.in.h diff --git a/tests/init.sh b/tests/init.sh index 3a0e63c..93d14f5 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -527,7 +527,7 @@ rand_bytes_ () fi n_plus_50_=`expr $n_ + 50` - cmds_='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n' + cmds_='date; date +%N; free; who -a; w; ps auxww; ps -ef' data_=` (eval "$cmds_") 2>&1 | gzip ` # Ensure that $data_ has length at least 50+$n_ -- 2.18.0 ------------=_1530462722-31825-1--