X-Loop: help-debbugs@HIDDEN Subject: bug#72800: maint: adjust to Gnulib acl changes Resent-From: Collin Funk <collin.funk1@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-sed@HIDDEN Resent-Date: Sun, 25 Aug 2024 07:05:01 +0000 Resent-Message-ID: <handler.72800.B.172456947814025 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 72800 X-GNU-PR-Package: sed X-GNU-PR-Keywords: To: 72800 <at> debbugs.gnu.org X-Debbugs-Original-To: bug-sed@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.172456947814025 (code B ref -1); Sun, 25 Aug 2024 07:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Aug 2024 07:04:38 +0000 Received: from localhost ([127.0.0.1]:42186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1si7Ik-0003e9-3c for submit <at> debbugs.gnu.org; Sun, 25 Aug 2024 03:04:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:48004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <collin.funk1@HIDDEN>) id 1si7Ig-0003dy-Mk for submit <at> debbugs.gnu.org; Sun, 25 Aug 2024 03:04:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <collin.funk1@HIDDEN>) id 1si7Hs-0001LV-Qp for bug-sed@HIDDEN; Sun, 25 Aug 2024 03:03:44 -0400 Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <collin.funk1@HIDDEN>) id 1si7Hp-0003jb-SE for bug-sed@HIDDEN; Sun, 25 Aug 2024 03:03:43 -0400 Received: by mail-ot1-x332.google.com with SMTP id 46e09a7af769-709428a9469so3203050a34.3 for <bug-sed@HIDDEN>; Sun, 25 Aug 2024 00:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724569420; x=1725174220; darn=gnu.org; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=weIrR7x3L1r9EclVO2S7mXYWK+yanDMytCDk5QWjh4Q=; b=KfCdV8b3I7i4VHwGCLxGDZmpr74Qt7XVnhNkM55HqslcgZOlnFhip39rmh9Iraw8ZD 6KiNH2eKCcAvz1ISeM3w6ZupiEB3XpRi8lRXCtg4DOY6Wt70Ufqw58LGb+e17cPH2fny L21Ha7s08BezXaGPBaezg5J1bf0I/qLtKMe8aXOE3FTKPp2WWvogAMPJ/QFyL7F2D1go Zj9hK9RSbZeavGsN/y7xVVeNbL3i0ms7uf2PqzrN24As7Uf8EDR5Z0qindZCacbwWfXv BYOCK+my/OHb6MEmXBqR5TXXDrPPKIUAwW5OInc1tc08RlxsjmRj3HDjVRmIK8YIzJt4 jNRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724569420; x=1725174220; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=weIrR7x3L1r9EclVO2S7mXYWK+yanDMytCDk5QWjh4Q=; b=NUKnjWB+CjiiUyXY/8BQQso47xo58jzBuJBrZ0NCLHhHFIPcMWQot1Gbpjj7kvPOuW OPQzFLzY7QwFvwVDnOsEf0W7yrkFtAist4n0mDeEY3HdKG8vxmw1zl9ASsVqhkvG0O4k tvDO4Vr9wLp05UKaL1fvnlPBkE+UaQE5qblOkfm1tATpPbf6lZSuqdHRKGX/plz9hYr3 2f5zmAJ5AUeKl3luF6HWlNQm8Ai9OGsFs7l2lasVf5Tvr1EpTOck5Jp5xZ/jKa78LcNu q8Uhe+qM3H0d0JjF7q65ax0XoAfJaZbYOG+jmEuKEldHTLDRBTTAKO3LFHe7Aix+TG+x Z2IQ== X-Gm-Message-State: AOJu0YztleWfUx2Np8AwmeicWBb6QMFj34QekP8Ml7tDPsKZk2q3gMCo KbliDSMiB2KYMVj40H5zMW/0gMuuwx0C8kZLzjEKqnwVLlwwHlUVS7d1eEPB X-Google-Smtp-Source: AGHT+IE+S3939YVJo2kvQ0iximtWozfbhmFOHsqeUUp5V0LOkk1ZHf7B7m9ghTLaBbneXQ3plVPfkA== X-Received: by 2002:a05:6808:2e99:b0:3da:a5fa:98fe with SMTP id 5614622812f47-3de2a8d72a4mr8462907b6e.39.1724569419568; Sun, 25 Aug 2024 00:03:39 -0700 (PDT) Received: from fedora (c-73-93-224-2.hsd1.ca.comcast.net. [73.93.224.2]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9ad6ba10sm4926858a12.78.2024.08.25.00.03.38 for <bug-sed@HIDDEN> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 00:03:38 -0700 (PDT) From: Collin Funk <collin.funk1@HIDDEN> Date: Sun, 25 Aug 2024 00:03:36 -0700 Message-ID: <87wmk59j93.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::332; envelope-from=collin.funk1@HIDDEN; helo=mail-ot1-x332.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.1 (--) --=-=-= Content-Type: text/plain Hi, This patch changes copy_acl to xcopy_acl per Bruno's change in Gnulib yesterday [1]. Collin [1] https://lists.gnu.org/archive/html/bug-gnulib/2024-08/msg00146.html --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-build-update-gnulib-submodule-to-latest.patch From 81dc0dfc43c596eddb33ff56529dbfd90b0d5c4c Mon Sep 17 00:00:00 2001 From: Collin Funk <collin.funk1@HIDDEN> Date: Sat, 24 Aug 2024 23:53:26 -0700 Subject: [PATCH 1/2] build: update gnulib submodule to latest * bootstrap: Sync from Gnulib. * lib/.gitignore: Ignore more Gnulib files. * m4/.gitignore: Likewise. --- bootstrap | 16 +++++++++++++++- gnulib | 2 +- lib/.gitignore | 28 ++++++++++++++++++++++++++++ m4/.gitignore | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index d78c8c3..3758683 100755 --- a/bootstrap +++ b/bootstrap @@ -37,7 +37,7 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2024-06-29.23; # UTC +scriptlibversion=2024-07-21.12; # UTC # Copyright (C) 2003-2024 Free Software Foundation, Inc. # @@ -1255,6 +1255,20 @@ autogen() $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ || die "gnulib-tool failed" + if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then + # The gnulib-tool invocation has removed $m4_base/gettext.m4, that the + # AUTOPOINT invocation had installed. This can occur when the gnulib + # module 'gettext' was previously present but is now not present any more. + # Repeat the AUTOPOINT invocation and the gnulib-tool invocation. + + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || return + + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" + fi + for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ || die "failed to symlink $file" diff --git a/gnulib b/gnulib index 71dd87c..3fef5ed 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 71dd87c3723e9c9dd3ae50d562b9ff04ff0ee660 +Subproject commit 3fef5edc95b855a4ea3326926c69641b2fe205b3 diff --git a/lib/.gitignore b/lib/.gitignore index e0db893..1cc7443 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -210,7 +210,9 @@ /time.in.h /uchar.h /unicase.h +/unicase/ /unictype.h +/unictype/ /uninorm.h /unistd.c /unistd.h @@ -244,3 +246,29 @@ /xalloc-oversized.h /xalloc.h /xmalloc.c +/c32is-impl.h +/c32isprint.c +/c32isspace.c +/c32rtomb.c +/c32to-impl.h +/c32tob.c +/c32tolower.c +/c32toupper.c +/iswblank.c +/iswctype-impl.h +/iswctype.c +/iswdigit.c +/iswpunct.c +/iswxdigit.c +/mbrtoc32.c +/mbszero.c +/obstack.in.h +/same-inode.c +/setlocale_null-unlocked.c +/uchar.in.h +/unicase.in.h +/unictype.in.h +/uninorm.in.h +/unitypes.in.h +/wctype-impl.h +/wctype.c diff --git a/m4/.gitignore b/m4/.gitignore index 973ec19..44aab4a 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -235,3 +235,47 @@ /semaphore.m4 /sys_cdefs_h.m4 /yield.m4 +/c32rtomb.m4 +/chdir-long.m4 +/d-ino.m4 +/dup.m4 +/exponentd.m4 +/exponentf.m4 +/exponentl.m4 +/extensions-aix.m4 +/fchdir.m4 +/fclose.m4 +/fdopendir.m4 +/filenamecat.m4 +/float_h.m4 +/fpieee.m4 +/fstatat.m4 +/getcwd-abort-bug.m4 +/getcwd-path-max.m4 +/isnand.m4 +/isnanf.m4 +/isnanl.m4 +/iswblank.m4 +/iswctype.m4 +/iswdigit.m4 +/iswpunct.m4 +/iswxdigit.m4 +/libunistring-base.m4 +/math_h.m4 +/mbrtoc32.m4 +/nan-mips.m4 +/once.m4 +/openat.m4 +/rewinddir.m4 +/save-cwd.m4 +/signbit.m4 +/snan.m4 +/stpcpy.m4 +/time.m4 +/uchar_h.m4 +/unicase_h.m4 +/unictype_h.m4 +/uninorm_h.m4 +/unistd-safer.m4 +/wctype.m4 +/xgetcwd.m4 -- 2.46.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-maint-adjust-to-Gnulib-acl-changes.patch From e5e940304ca8b1bc857052e29922b6ef1dd6d752 Mon Sep 17 00:00:00 2001 From: Collin Funk <collin.funk1@HIDDEN> Date: Sat, 24 Aug 2024 23:59:32 -0700 Subject: [PATCH 2/2] maint: adjust to Gnulib acl changes * src/execute.c (closedown): Use xcopy_acl instead of copy_acl. --- sed/execute.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sed/execute.c b/sed/execute.c index 1d38a5c..6245b3d 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -664,9 +664,9 @@ closedown (struct input *input) if (fchown (output_fd, input->st.st_uid, input->st.st_gid) == -1) ignore_value (fchown (output_fd, -1, input->st.st_gid)); #endif - copy_acl (input->in_file_name, input_fd, - input->out_file_name, output_fd, - input->st.st_mode); + xcopy_acl (input->in_file_name, input_fd, + input->out_file_name, output_fd, + input->st.st_mode); ck_fclose (input->fp); ck_fclose (output_file.fp); -- 2.46.0 --=-=-=--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Collin Funk <collin.funk1@HIDDEN> Subject: bug#72800: Acknowledgement (maint: adjust to Gnulib acl changes) Message-ID: <handler.72800.B.172456947814025.ack <at> debbugs.gnu.org> References: <87wmk59j93.fsf@HIDDEN> X-Gnu-PR-Message: ack 72800 X-Gnu-PR-Package: sed Reply-To: 72800 <at> debbugs.gnu.org Date: Sun, 25 Aug 2024 07:05:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): bug-sed@HIDDEN If you wish to submit further information on this problem, please send it to 72800 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 72800: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72800 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.