<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/041ce59be03044ea0e17615aed5e15816211b66f">https://github.com/macports/macports-ports/commit/041ce59be03044ea0e17615aed5e15816211b66f</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 041ce59be03 md5deep: fix invalid suffix on literal error
</span>041ce59be03 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 041ce59be03044ea0e17615aed5e15816211b66f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Oct 30 05:34:14 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> md5deep: fix invalid suffix on literal error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also correct license.
</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/71198
</span>---
security/md5deep/Portfile | 8 +-
security/md5deep/files/space-after-literals.patch | 107 ++++++++++++++++++++++
2 files changed, 111 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/md5deep/Portfile b/security/md5deep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 555aa49560a..cfb9c033a32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/md5deep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/md5deep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,8 @@ github.setup jessek hashdeep 4.4 v
</span> revision 0
name md5deep
categories security sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license {public-domain GPL-2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# tiger.c is LGPL, sha1.c is GPL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license public-domain GPL-2+ LGPL-2.1+
</span> maintainers nomaintainer
description Recursively compute digests on files/directories
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,13 +14,12 @@ long_description \
</span> compute MD5, SHA-1, or SHA-256 message digests on an arbitrary number of \
files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 d92dcc3d9154a84d79e7807918eb5abb2e80940a \
sha256 ec9d74a20016ec4f03914b6c42776d5fe4c7ffa63b73c85d07330abcb8327b3f \
size 4534769
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-hash.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-hash.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ space-after-literals.patch
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/md5deep/files/space-after-literals.patch b/security/md5deep/files/space-after-literals.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9a6ccb1fa58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/md5deep/files/space-after-literals.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,107 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xml.h.orig 2015-04-01 11:12:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xml.h 2024-10-30 05:09:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,7 @@ class XML { (public)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void xmlout(const std::string &tag,const std::string &value){ xmlout(tag,value,"",true); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void xmlout(const std::string &tag,const int value){ xmlprintf(tag,"","%d",value); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void xmloutl(const std::string &tag,const long value){ xmlprintf(tag,"","%ld",value); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%" PRId64,value); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void xmlout(const std::string &tag,const double value){ xmlprintf(tag,"","%f",value); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void xmlout(const std::string &tag,const struct timeval &ts){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlprintf(tag,"","%d.%06d",(int)ts.tv_sec, (int)ts.tv_usec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hash.cpp.orig 2024-10-30 05:02:58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hash.cpp 2024-10-30 05:11:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +124,7 @@ bool file_data_hasher_t::compute_hash(uint64_t request
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If an error occured, display a message and see if we need to quit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((current_read_bytes<0) || (this->handle && ferror(this->handle))){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocb->error_filename(this->file_name,"error at offset %"PRIu64": %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocb->error_filename(this->file_name,"error at offset %" PRIu64": %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ request_start, strerror(errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (file_fatal_error()){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/files.cpp.orig 2015-04-01 11:12:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/files.cpp 2024-10-30 05:12:42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -509,7 +509,7 @@ int state::parse_encase_file(const char *fn, FILE *han
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Users expect the line numbers to start at one, not zero.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((!ocb.opt_silent) || (mode_warn_only)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocb.error("%s: No hash found in line %"PRIu32, fn, count + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocb.error("%s: No hash found in line %" PRIu32, fn, count + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocb.error("%s: %s", fn, strerror(errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status_t::STATUS_USER_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,7 +542,7 @@ int state::parse_encase_file(const char *fn, FILE *han
</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;'>+ if (expected_hashes != count){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocb.error("%s: Expecting %"PRIu32" hashes, found %"PRIu32"\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocb.error("%s: Expecting %" PRIu32 " hashes, found %" PRIu32 "\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fn, expected_hashes, count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status_t::status_ok;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dig.cpp.orig 2015-04-01 11:12:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dig.cpp 2024-10-30 05:13:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,7 +339,7 @@ bool state::is_junction_point(const std::wstring &fn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocb.error_filename(fn,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Unknown reparse point 0x%"PRIx32", skipping",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Unknown reparse point 0x%" PRIx32 ", skipping",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FindFileData.dwReserved0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocb.error_filename(fn,"Please report this to the developers!");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hashlist.cpp.orig 2015-04-01 11:12:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hashlist.cpp 2024-10-30 05:14:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,7 +342,7 @@ hashlist::load_hash_file(display *ocb,const std::strin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file_data_t *t = new (std::nothrow) file_data_t();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NULL == t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocb->fatal_error("%s: Out of memory in line %"PRIu64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocb->fatal_error("%s: Out of memory in line %" PRIu64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fn.c_str(), line_number);
</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;'>+@@ -390,7 +390,7 @@ hashlist::load_hash_file(display *ocb,const std::strin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( !algorithm_t::valid_hash(hash_column[column_number],word))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ocb)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocb->error("%s: Invalid %s hash in line %"PRIu64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocb->error("%s: Invalid %s hash in line %" PRIu64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fn.c_str(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hashes[hash_column[column_number]].name.c_str(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ line_number);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/display.cpp.orig 2015-04-01 11:12:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/display.cpp 2024-10-30 05:15:08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +311,7 @@ void display::display_realtime_stats(const file_data_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ss << mb_read << "MB of " << fdht->stat_megs() << "MB done, ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char msg[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- snprintf(msg,sizeof(msg),"%02"PRIu64":%02"PRIu64":%02"PRIu64" left", hour, min, seconds);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ snprintf(msg,sizeof(msg),"%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64 " left", hour, min, seconds);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ss << msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ss << "\r";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -424,14 +424,14 @@ void display::display_audit_results()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (opt_verbose) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(opt_verbose >= MORE_VERBOSE){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status(" Input files examined: %"PRIu64, this->match.total);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status(" Known files expecting: %"PRIu64, this->match.expect);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status(" Input files examined: %" PRIu64, this->match.total);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status(" Known files expecting: %" PRIu64, this->match.expect);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status(" Files matched: %"PRIu64, this->match.exact);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status("Files partially matched: %"PRIu64, this->match.partial);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status(" Files moved: %"PRIu64, this->match.moved);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status(" New files found: %"PRIu64, this->match.unknown);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status(" Known files not found: %"PRIu64, this->match.unused);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status(" Files matched: %" PRIu64, this->match.exact);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status("Files partially matched: %" PRIu64, this->match.partial);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status(" Files moved: %" PRIu64, this->match.moved);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status(" New files found: %" PRIu64, this->match.unknown);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status(" Known files not found: %" PRIu64, this->match.unused);
</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;'>+
</span></pre><pre style='margin:0'>
</pre>