<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87b55a9fa8934281f02219876850b14a911be006">https://github.com/macports/macports-ports/commit/87b55a9fa8934281f02219876850b14a911be006</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 87b55a9fa89 libmcrypt: Fix build failure due to implicit int
</span>87b55a9fa89 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 87b55a9fa8934281f02219876850b14a911be006
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Sep 23 11:40:42 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> libmcrypt: Fix build failure due to implicit int
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix configure script detection of bcopy and readdir and fix a bug
</span><span style='display:block; white-space:pre;color:#404040;'> in tripledes so increase revision.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70875
</span>---
devel/libmcrypt/Portfile | 10 ++++++----
devel/libmcrypt/files/Makefile.in.patch | 18 ++++++++++++++++++
devel/libmcrypt/files/configure.patch | 23 +++++++++++++++++++++++
devel/libmcrypt/files/tripledes.c.patch | 16 ++++++++++++++++
4 files changed, 63 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmcrypt/Portfile b/devel/libmcrypt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc0cbdab2bf..e878440fa81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libmcrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmcrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,12 @@ PortSystem 1.0
</span>
name libmcrypt
version 2.5.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 4dba23286aa00d88a7f6763629bb3cde7dd2fe6b \
sha256 bf2f1671f44af88e66477db0982d5ecb5116a5c767b0a0d68acb34499d41b793 \
size 875425
categories devel security
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license GPL-2+ LGPL-2.1+
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,13 +19,16 @@ description The encryption library used by mcrypt
</span> long_description libmcrypt is the library which implements all the \
algorithms and modes found in mcrypt.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://mcrypt.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mcrypt.sourceforge.net
</span> master_sites sourceforge:project/mcrypt/Libmcrypt/${version} \
freebsd
depends_build port:automake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tripledes.c.patch
</span>
post-patch {
# Use newer config.guess and config.sub to support Apple Silicon.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmcrypt/files/Makefile.in.patch b/devel/libmcrypt/files/Makefile.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4fd52fd9b3c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmcrypt/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add return and argument types to fake prototypes in mcrypt_symb.c. Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/mcrypt/patches/15/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Makefile.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -561,8 +561,8 @@ mcrypt_symb.c: mcrypt_internal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "/* This is automatically created. Don't touch... */" >> mcrypt_symb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "" >> mcrypt_symb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -@for i in $(EXTRA_ALGOS); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "" >> mcrypt_symb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "const mcrypt_preloaded mps[] = {" >> mcrypt_symb.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmcrypt/files/configure.patch b/devel/libmcrypt/files/configure.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..222ffc1c6db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmcrypt/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix invalid checks for readdir and bcopy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/mcrypt/patches/15/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6639,7 +6639,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for ac_func in readdir,,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for ac_func in readdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me:$LINENO: checking for $ac_func" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6741,7 +6741,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for ac_func in bcopy,,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for ac_func in bcopy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me:$LINENO: checking for $ac_func" >&5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmcrypt/files/tripledes.c.patch b/devel/libmcrypt/files/tripledes.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c9252edf38f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmcrypt/files/tripledes.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix a minor type error in the perminit calls in the Triple DES implementation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/mcrypt/patches/15/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/algorithms/tripledes.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/algorithms/tripledes.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,8 +201,8 @@ static int _mcrypt_desinit(TRIPLEDES_KEY * key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spinit(key, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spinit(key, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spinit(key, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perminit(&key->iperm, ip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perminit(&key->fperm, fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perminit(key->iperm, ip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perminit(key->fperm, fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span></pre><pre style='margin:0'>
</pre>