<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/48afae58fb6333ef5a4767724fe0f472e228ff10">https://github.com/macports/macports-ports/commit/48afae58fb6333ef5a4767724fe0f472e228ff10</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 48afae5 php-mailparse: update to 3.0.3
</span>48afae5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 48afae58fb6333ef5a4767724fe0f472e228ff10
</span>Author: Chris Minett <chris@minett.me.uk>
AuthorDate: Mon Jul 22 11:22:54 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> php-mailparse: update to 3.0.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> First version with official php73 compatibility so patch file no longer needed.
</span><span style='display:block; white-space:pre;color:#404040;'> http://pecl.php.net/package/mailparse/3.0.3
</span><span style='display:block; white-space:pre;color:#404040;'> Filename of README has changed, so the post-destroot now needs to account for this.
</span><span style='display:block; white-space:pre;color:#404040;'> mbstring is required at build for access to /opt/local/include/php73/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/58111
</span>---
php/php-mailparse/Portfile | 17 ++++---
php/php-mailparse/files/php73-mailparse.patch | 65 ---------------------------
2 files changed, 11 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-mailparse/Portfile b/php/php-mailparse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4207b1b..7419e5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-mailparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-mailparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,12 +13,11 @@ php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3
</span> php.pecl yes
if {[vercmp ${php.branch} 7] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.0.3
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c96c24aa440f302ad8b65d1b44d947bb4a8e1ebd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d81a6f8a48e43fca1c0f0d6c90d666830c24d584a23a60add43062aaf221843b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38206
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles php73-mailparse.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 941a05ca1b6ec252eb7a2351a8bea6191bc0ef87 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bfaeae61342c147bcb66b9a90949722e04b65548e6a9d1eb4896aeb62409d302 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 940370
</span> } else {
version 2.1.6
revision 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +33,7 @@ long_description \
</span> It can deal with rfc822 and rfc2045 (MIME) compliant messages.
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:autoconf port:${php}-mbstring
</span> depends_run port:${php}-mbstring
configure.cppflags-append -DHAVE_MBSTRING
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,11 @@ if {${name} ne ${subport}} {
</span> post-destroot {
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} CREDITS README ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} CREDITS ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} 3.0.3] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} README.md ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} README ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-mailparse/files/php73-mailparse.patch b/php/php-mailparse/files/php73-mailparse.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a24272..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-mailparse/files/php73-mailparse.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with PHP 7.3+.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.php.net/bug.php?id=77045
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://git.php.net/?p=pecl/mail/mailparse.git;a=commitdiff;h=13c2c425e519b22660a03d566c35e76b3d4751dc;hp=720ed5b77591922596564c414a655f3c7fcd6200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mailparse.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mailparse.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -984,12 +984,21 @@ PHP_FUNCTION(mailparse_stream_encode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf = emalloc(bufsize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETVAL_TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PHP_VERSION_ID >= 70300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conv = mbfl_convert_filter_new(mbfl_no2encoding(mbfl_no_encoding_8bit),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mbfl_no2encoding(enc),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mailparse_stream_output,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mailparse_stream_flush,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ deststream
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conv = mbfl_convert_filter_new(mbfl_no_encoding_8bit,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailparse_stream_output,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailparse_stream_flush,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deststream
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (enc == mbfl_no_encoding_qprint) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If the qp encoded section is going to be digitally signed,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1165,9 +1174,13 @@ PHP_FUNCTION(mailparse_msg_get_structure)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailparse_fetch_mimepart_resource(part, arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PHP_VERSION_ID >= 70300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ array_init(return_value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (array_init(return_value) == FAILURE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETURN_FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- php_mimepart_enum_parts(part, &get_structure_callback, return_value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* }}} */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- php_mailparse_mime.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ php_mailparse_mime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -906,12 +906,21 @@ PHP_MAILPARSE_API void php_mimepart_decoder_prepare(php_mimepart *part, int do_d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (from == mbfl_no_encoding_8bit || from == mbfl_no_encoding_7bit) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- part->extract_filter = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PHP_VERSION_ID >= 70300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ part->extract_filter = mbfl_convert_filter_new(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mbfl_no2encoding(from), mbfl_no2encoding(mbfl_no_encoding_8bit),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ filter_into_work_buffer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ part
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- part->extract_filter = mbfl_convert_filter_new(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from, mbfl_no_encoding_8bit,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filter_into_work_buffer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- part
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>