<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/efb296b8757d127b245b03b302dddd24482de513">https://github.com/macports/macports-ports/commit/efb296b8757d127b245b03b302dddd24482de513</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 efb296b cuneiform: add debian patches
</span>efb296b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit efb296b8757d127b245b03b302dddd24482de513
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Dec 3 01:00:14 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> cuneiform: add debian patches
</span>---
textproc/cuneiform/Portfile | 15 ++++--
textproc/cuneiform/files/fix_buffer_overflow.diff | 27 +++++++++++
.../cuneiform/files/fix_buffer_overflow_2.diff | 18 ++++++++
textproc/cuneiform/files/typos.patch | 54 ++++++++++++++++++++++
4 files changed, 109 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/cuneiform/Portfile b/textproc/cuneiform/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0a70b6..55fee3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/cuneiform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/cuneiform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span>
name cuneiform
version 1.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,13 +31,18 @@ checksums sha1 b78ebcf987c4792c360f23bdbe054d554ce2251c \
</span> depends_lib port:ImageMagick
platform darwin powerpc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-perc.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-perc.c.diff \
</span> patch-CMakeLists.txt.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cuneiform_src-Kern-rimage-sources-main-cricontrol-abs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cuneiform_src-Kern-rimage-sources-main-cricontrol-abs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From https://sources.debian.org/src/cuneiform/1.1.0+dfsg-7/debian/patches/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append fix_buffer_overflow.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_buffer_overflow_2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typos.patch
</span>
# https://trac.macports.org/ticket/59676
configure.cxxflags-append -std=c++03
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/cuneiform/files/fix_buffer_overflow.diff b/textproc/cuneiform/files/fix_buffer_overflow.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3b3a6a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/cuneiform/files/fix_buffer_overflow.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix buffer overflow during crash when using user supplied image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sławomir Nizio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2017-04-05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cuneiform_src/Kern/rstr/src/acc_tabs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/rstr/src/acc_tabs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1233,7 +1233,7 @@ if(is_cen_language(language))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_i ], "_i_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!!_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)right_quocket], "\xbb");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_CC ], "\xa9");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_CR ], "\xae");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cuneiform_src/Kern/rstr/src/match_wd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/rstr/src/match_wd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -484,7 +484,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str_raster->w=(int32_t)(right-left);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str_raster->h=(int32_t)(bottom-top);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (str_raster->w > LINE_WIDTH || str_raster->h > LINE_HEIGHT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((str_raster->w+7) > LINE_WIDTH || str_raster->h > LINE_HEIGHT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(&str_raster->pict,0,(str_raster->w+7)/8*str_raster->h);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/cuneiform/files/fix_buffer_overflow_2.diff b/textproc/cuneiform/files/fix_buffer_overflow_2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ebcf2cf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/cuneiform/files/fix_buffer_overflow_2.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;'>+Description: Split original patch by Slawomir and update the same to apply
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+neatly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Bhavani Shankar <bhavi@ubuntu.com>
</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;'>+--- cuneiform_src/Kern/rstr/src/acc_tabs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/rstr/src/acc_tabs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2821,8 +2821,8 @@ if( CodePages[language]==CSTR_EASTEUROPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_j ], "_j_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_qm ], "_?_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!!_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ], "_??_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ], "_?_");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)liga_bull ], "\xB0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)left_quocket], "�");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(decode_ASCII_to_[(uchar)right_quocket], "�");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/cuneiform/files/typos.patch b/textproc/cuneiform/files/typos.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..99b3e37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/cuneiform/files/typos.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: fix typos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Andreas Beckmann <anbe@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cuneiform_src/Kern/rblock/sources/c/ltmain.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/rblock/sources/c/ltmain.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,7 +344,7 @@ i=0; i=i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef LT_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //if (LT_DebugGraphicsLevel >= 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!LDPUMA_Skip(hFirstDustAbsorbtion))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LT_GraphicsBlocksOutput ("After first dust absorbtion");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LT_GraphicsBlocksOutput ("After first dust absorption");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PageMatrixExcludeSeparators (TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@ i=0; i=i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef LT_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //if (LT_DebugGraphicsLevel >= 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!LDPUMA_Skip(hSecondDustAbsorbtion))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LT_GraphicsBlocksOutput ("After second dust absorbtion");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LT_GraphicsBlocksOutput ("After second dust absorption");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cut_page_left || cut_page_right)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cuneiform_src/Kern/rstr/src/pass3.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/rstr/src/pass3.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -648,7 +648,7 @@ ready_BL:;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (snap_activity('d'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- snap_show_text("Skiped as dust");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ snap_show_text("Skipped as dust");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snap_monitor();
</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;'>+@@ -3135,7 +3135,7 @@ Bool match_word_prepare(CSTR_line ln, uc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (snap_activity('n'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- snap_show_text("Skiped as dust");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ snap_show_text("Skipped as dust");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snap_monitor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cuneiform_src/Kern/rstr/src/snap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/rstr/src/snap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,7 +542,7 @@ if( short_spell_re(wrd,lang) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(buf," n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-strcat(buf," new agressive : ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++strcat(buf," new aggressive : ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( _spell_agressive(wrd,lang) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(buf,"y ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span></pre><pre style='margin:0'>
</pre>