<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b58da074e58f314a0a760a21c28cfae4ad6aa03e">https://github.com/macports/macports-ports/commit/b58da074e58f314a0a760a21c28cfae4ad6aa03e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b58da074e58f314a0a760a21c28cfae4ad6aa03e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Apr 29 10:57:51 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> coreutils{,-devel}, m4: avoid a patch to overstep max path bug
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is is much more stright forward way to overstep that bug that
</span><span style='display:block; white-space:pre;color:#404040;'> makes supporting it much easy.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Half year ago I've tried to sent it to upstream, but hasn't been
</span><span style='display:block; white-space:pre;color:#404040;'> successful, but still we may enjoy it as an easy workaround
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62994
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://lists.gnu.org/r/bug-gnulib/2022-09/msg00045.html
</span>---
devel/m4/Portfile | 2 +-
devel/m4/files/patch-m4-confdir-error.diff | 11 -----------
sysutils/coreutils-devel/Portfile | 9 +++------
.../patch-coreutiles-leopeard-path-issues.diff | 21 ---------------------
sysutils/coreutils/Portfile | 9 +++------
.../patch-coreutiles-leopeard-path-issues.diff | 21 ---------------------
6 files changed, 7 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/m4/Portfile b/devel/m4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30f3e3ab9b4..6878dee9124 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/m4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/m4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ platform darwin 8 {
</span>
if {${os.platform} eq "darwin" && ${os.major} < 10} {
# https://trac.macports.org/ticket/62994
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-m4-confdir-error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append gl_cv_func_getcwd_path_max=yes
</span> }
patchfiles-append patch-clang-before-34.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/m4/files/patch-m4-confdir-error.diff b/devel/m4/files/patch-m4-confdir-error.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e97b2c42ebb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/m4/files/patch-m4-confdir-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.old 2021-06-05 17:36:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-06-05 18:48:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36350,7 +36350,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bug_possible = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (! bug_possible)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cwd = getcwd (NULL, 0);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/coreutils-devel/Portfile b/sysutils/coreutils-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28a77772f28..5125d6cf309 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/coreutils-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/coreutils-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,9 @@ checksums rmd160 6c476d5dcbff07ef18f5d0bf0a5e4f9442d5ede5 \
</span> sha256 adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa \
size 5808696
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # there is a unique error on Leopard involving deep directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this patch disables these tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/66028
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62994
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-coreutiles-leopeard-path-issues.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://trac.macports.org/ticket/62994
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append gl_cv_func_getcwd_path_max=yes
</span> }
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/coreutils-devel/files/patch-coreutiles-leopeard-path-issues.diff b/sysutils/coreutils-devel/files/patch-coreutiles-leopeard-path-issues.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 40a3790ecb7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/coreutils-devel/files/patch-coreutiles-leopeard-path-issues.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-12-11 09:21:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2022-12-11 09:24:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43016,6 +43016,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* just skip this */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exit (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef PATH_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The Hurd doesn't define this, so getcwd can't exhibit the bug --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- at least not on a local file system. And if we were to start worrying
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43297,7 +43300,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The bug is triggered when PATH_MAX < getpagesize (), so skip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this relatively expensive and invasive test if that's not true. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PATH_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int bug_possible = PATH_MAX < getpagesize ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int bug_possible = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bug_possible = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/coreutils/Portfile b/sysutils/coreutils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b186a39def5..825ae5b9ee7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/coreutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/coreutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,9 @@ checksums rmd160 6c476d5dcbff07ef18f5d0bf0a5e4f9442d5ede5 \
</span> sha256 adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa \
size 5808696
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # there is a unique error on Leopard involving deep directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this patch disables these tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/66028
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62994
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-coreutiles-leopeard-path-issues.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://trac.macports.org/ticket/62994
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append gl_cv_func_getcwd_path_max=yes
</span> }
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/coreutils/files/patch-coreutiles-leopeard-path-issues.diff b/sysutils/coreutils/files/patch-coreutiles-leopeard-path-issues.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 40a3790ecb7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/coreutils/files/patch-coreutiles-leopeard-path-issues.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-12-11 09:21:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2022-12-11 09:24:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43016,6 +43016,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* just skip this */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exit (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef PATH_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The Hurd doesn't define this, so getcwd can't exhibit the bug --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- at least not on a local file system. And if we were to start worrying
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43297,7 +43300,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The bug is triggered when PATH_MAX < getpagesize (), so skip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this relatively expensive and invasive test if that's not true. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PATH_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int bug_possible = PATH_MAX < getpagesize ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int bug_possible = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bug_possible = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>