<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e39f07997a38d04422fceba50be9c239b3f0e764">https://github.com/macports/macports-ports/commit/e39f07997a38d04422fceba50be9c239b3f0e764</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 e39f07997a3 cdrtools: Use MacPorts flags and backport a bugfix
</span>e39f07997a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e39f07997a38d04422fceba50be9c239b3f0e764
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Sep 30 13:39:33 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> cdrtools: Use MacPorts flags and backport a bugfix
</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/34823
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/43632
</span>---
sysutils/cdrtools/Portfile | 8 +++++-
sysutils/cdrtools/files/mkisofs.c.patch | 48 +++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cdrtools/Portfile b/sysutils/cdrtools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6507f6126e9..82c9d6fec60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cdrtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cdrtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name cdrtools
version 3.01
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories sysutils
# listing all these licenses is somewhat redundant when taken as a whole,
# but different separable components are licensed differently
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +31,7 @@ depends_build port:smake
</span> depends_lib port:gettext
patchfiles patch-include_schily_sha2.h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append mkisofs.c.patch
</span> post-patch {
reinplace -locale C "s|/opt/schily|${prefix}|g" \
${worksrcpath}/DEFAULTS/Defaults.darwin \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +51,11 @@ use_configure no
</span> compiler.blacklist llvm-gcc-4.2 macports-llvm-gcc-4.2 {clang < 300}
build.cmd smake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COPTX="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFOSINCDIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDPATH=
</span>
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cdrtools/files/mkisofs.c.patch b/sysutils/cdrtools/files/mkisofs.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0dd394eaa8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cdrtools/files/mkisofs.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backport a bugfix from 3.02a07:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkisofs: when stripping off "./" and "//" from graft points, mkisofs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ now uses ovstrcpy() that supports to copy overlapping strings as Mac OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ has a strlcpy() that fails with overlapping strings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Thanks to a hint from Colin Finck <colin@reactos.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkisofs/mkisofs.c.orig 2015-01-01 08:19:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkisofs/mkisofs.c 2020-09-30 13:30:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1443,6 +1443,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **short_namep, BOOL do_insert));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT void *e_malloc __PR((size_t size));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT char *e_strdup __PR((const char *s));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LOCAL void ovstrcpy __PR((char *p2, char *p1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCAL void checkarch __PR((char *name));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCAL void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3680,7 +3681,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (*xpnt == PATH_SEPARATOR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xpnt++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strlcpy(graft_point, xpnt, glen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * The string becomes shorter, there is no need to check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the length. Make sure to support overlapping strings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ovstrcpy(graft_point, xpnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (xpnt > graft_point);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (node) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3853,6 +3858,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (ret);
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * A strcpy() that works with overlapping buffers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LOCAL void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ovstrcpy(p2, p1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register char *p2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register char *p1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while ((*p2++ = *p1++) != '\0')
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCAL void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checkarch(name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *name;
</span></pre><pre style='margin:0'>
</pre>