<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5302143a3a6ff6be4ea649419d2c76ee4717cee5">https://github.com/macports/macports-ports/commit/5302143a3a6ff6be4ea649419d2c76ee4717cee5</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 5302143 libedit: Fix history length reporting
</span>5302143 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5302143a3a6ff6be4ea649419d2c76ee4717cee5
</span>Author: Yen Chi Hsuan <yan12125@gmail.com>
AuthorDate: Sun Sep 17 01:21:31 2017 +0800
<span style='display:block; white-space:pre;color:#404040;'> libedit: Fix history length reporting
</span>---
devel/libedit/Portfile | 8 +++++++-
.../libedit/files/patch-read_history-save-length.diff | 19 +++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/Portfile b/devel/libedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9bbf47..6f3ba37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup muniversal 1.0
</span> name libedit
epoch 20090923
version 20170329-3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,12 @@ patchfiles doc__Makefile.in.patch \
</span> # https://opensource.apple.com/source/libedit/libedit-48/src/el.c.auto.html
patchfiles-append patch-non_ascii.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes an issue that calling history_get_history_state() immediately after
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# read_history() results in wrong history length.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The patch is backported from the upstream fix at [1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# [1] http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/readline.c.diff?r1=1.143&r2=1.144&only_with_tag=MAIN&f=u
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-read_history-save-length.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
copy ${filespath}/getline.c ${worksrcpath}/src
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/patch-read_history-save-length.diff b/devel/libedit/files/patch-read_history-save-length.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f901aae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/files/patch-read_history-save-length.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/readline.c.orig 2017-09-17 00:10:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/readline.c 2017-09-17 00:44:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1355,8 +1355,14 @@ read_history(const char *filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_initialize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (filename == NULL && (filename = _default_history_file()) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return history(h, &ev, H_LOAD, filename) == -1 ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (errno ? errno : EINVAL) : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (history(h, &ev, H_LOAD, filename) == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return errno ? errno : EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (history(h, &ev, H_GETSIZE) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ history_length = ev.num;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (history_length < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 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></pre><pre style='margin:0'>
</pre>