diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-12-12 10:19:06 -0500 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-12 16:06:59 +0000 |
| commit | 888086445f31ee79e91343d2dab7f78e3ef56011 (patch) | |
| tree | 772e3618239ee645e44c5ca3a40ba8993904a1f7 /main/libedit | |
| parent | a8089c68ce8dbec8ddf03c399ee680b695362678 (diff) | |
| download | aports-888086445f31ee79e91343d2dab7f78e3ef56011.tar.bz2 aports-888086445f31ee79e91343d2dab7f78e3ef56011.tar.xz | |
main/libedit: upgrade to 20191211.3.1
Diffstat (limited to 'main/libedit')
| -rw-r--r-- | main/libedit/APKBUILD | 10 | ||||
| -rw-r--r-- | main/libedit/fix-segfault-54654.patch | 30 |
2 files changed, 4 insertions, 36 deletions
diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD index ddec9c2c71..a741146d49 100644 --- a/main/libedit/APKBUILD +++ b/main/libedit/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Drew DeVault <sir@cmpwn.com> pkgname=libedit -pkgver=20191025.3.1 +pkgver=20191211.3.1 _ver=${pkgver/./-} -pkgrel=1 +pkgrel=0 pkgdesc="BSD line editing library" url="https://www.thrysoee.dk/editline" arch="all" @@ -11,8 +11,7 @@ depends_dev="ncurses-dev" makedepends_build="" makedepends_host="$depends_dev" subpackages="$pkgname-static $pkgname-dev $pkgname-doc" -source="https://www.thrysoee.dk/editline/libedit-$_ver.tar.gz - fix-segfault-54654.patch" +source="https://www.thrysoee.dk/editline/libedit-$_ver.tar.gz" builddir="$srcdir"/libedit-$_ver build() { @@ -39,5 +38,4 @@ package() { rm "$pkgdir"/usr/share/man/man3/history.3* } -sha512sums="9f475249b984e02ece0af3a0efe353233fef644ecf37482e28597a3ce552ca5a07678939b2c4ecbe3d2b14761fa67f23d2e839a322b94c0feeeba9e403b2be00 libedit-20191025-3.1.tar.gz -f31b4dee12be07f16d0dd20be37da982b2f2a13a7ac4e52e0a7cb97112d1544df527d65bad200db5c704ca977f495e0601777bcb7928564804e4643c7d95743a fix-segfault-54654.patch" +sha512sums="8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547 libedit-20191211-3.1.tar.gz" diff --git a/main/libedit/fix-segfault-54654.patch b/main/libedit/fix-segfault-54654.patch deleted file mode 100644 index 282ee4bc3e..0000000000 --- a/main/libedit/fix-segfault-54654.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch fixes a segfault in re_fastputc. This segfault happens in -one-line terminals. It is a backport from upstream netbsd. - -See: - - * https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54654 - * https://freshbsd.org/commit/netbsd/src/PxLOa0eNmIl1zBKB - -diff -upr libedit-20191025-3.1.orig/src/terminal.c libedit-20191025-3.1/src/terminal.c ---- libedit-20191025-3.1.orig/src/terminal.c 2019-11-14 10:41:42.834954338 +0100 -+++ libedit-20191025-3.1/src/terminal.c 2019-11-14 10:43:13.164941706 +0100 -@@ -497,7 +497,7 @@ terminal_move_to_line(EditLine *el, int - if (where == el->el_cursor.v) - return; - -- if (where > el->el_terminal.t_size.v) { -+ if (where >= el->el_terminal.t_size.v) { - #ifdef DEBUG_SCREEN - (void) fprintf(el->el_errfile, - "%s: where is ridiculous: %d\r\n", __func__, where); -@@ -647,7 +647,8 @@ terminal_overwrite(EditLine *el, const w - if (el->el_cursor.h >= el->el_terminal.t_size.h) { /* wrap? */ - if (EL_HAS_AUTO_MARGINS) { /* yes */ - el->el_cursor.h = 0; -- el->el_cursor.v++; -+ if (el->el_cursor.v + 1 < el->el_terminal.t_size.v) -+ el->el_cursor.v++; - if (EL_HAS_MAGIC_MARGINS) { - /* force the wrap to avoid the "magic" - * situation */ |