<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0362d00ac3e88432979d704a42d32e9a912c4aa0">https://github.com/macports/macports-ports/commit/0362d00ac3e88432979d704a42d32e9a912c4aa0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0362d00ac3e88432979d704a42d32e9a912c4aa0
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Fri Feb 5 16:35:36 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> procmail: properly fix build on Big Sur
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't use -Wno-error=implicit-function-declaration everywhere since
</span><span style='display:block; white-space:pre;color:#404040;'> that can result on crashing programs on Apple Silicon. However, use
</span><span style='display:block; white-space:pre;color:#404040;'> the flag only on a test program that OS capabilities since this
</span><span style='display:block; white-space:pre;color:#404040;'> program is only run at build time.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61663
</span>---
mail/procmail/Portfile | 7 ++++---
mail/procmail/files/patch-Makefile.diff | 11 -----------
mail/procmail/files/patch-src-Makefile.0.diff | 18 ++++++++++++++++++
mail/procmail/files/patch-src-foldinfo.c.diff | 10 ++++++++++
4 files changed, 32 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/Portfile b/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0342fca7656..2dc574f7942 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name procmail
version 3.22
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span> categories mail
license {Artistic-1 GPL-2+}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,9 +71,10 @@ patchfiles getline.patch \
</span> patch-CVE-2014-3618.diff \
patch-CVE-2017-16844.diff \
patch-security-fixes.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-foldinfo.c.diff \
</span> patch-src-manconf.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-avoid-strlcat-strlcpy.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-Makefile.0.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-avoid-strlcat-strlcpy.diff
</span>
post-patch {
reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin\"%" ${worksrcpath}/config.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-Makefile.diff b/mail/procmail/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f56991cea1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/patch-Makefile.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;'>---- Makefile.orig 2001-09-10 21:53:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2021-02-04 16:47:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The place to put your favourite extra cc flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS0 = -O #$(GCC_WARNINGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS0 = -O -Wno-error=implicit-function-declaration #$(GCC_WARNINGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS0= -s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Read my libs :-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-src-Makefile.0.diff b/mail/procmail/files/patch-src-Makefile.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9b9f9cba764
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/files/patch-src-Makefile.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.0.orig 2001-06-28 19:20:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.0 2021-02-05 16:41:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../config.check:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @cd ..; $(MAKE) config.check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Don't use -Wno-error=implicit-function-declaration everywhere since
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# that can result in crashing programs on Apple Silicon. However, use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -Wno-error=implicit-function-declaration for _autotst since this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# program is only run at build time to determine OS capabilities and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# presumably a crash would be observed then and a source code change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# could be fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_autotst.$(O): _autotst.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-error=implicit-function-declaration -c $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _autotst: _autotst.$(O) sublib.c sublib.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) $@.$(O) -o $@ $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-src-foldinfo.c.diff b/mail/procmail/files/patch-src-foldinfo.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ecf05c4268
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/files/patch-src-foldinfo.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/foldinfo.c.orig 2001-09-10 21:57:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/foldinfo.c 2021-02-05 16:30:06.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$Id: foldinfo.c,v 1.11 2001/08/04 07:07:42 guenther Exp $";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "procmail.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "acommon.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "misc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "lastdirsep.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "robust.h"
</span></pre><pre style='margin:0'>
</pre>