aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-07-14 00:50:19 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-07-15 19:28:04 +0000
commitd3d503093e99ff3a1d7c65af8ca79f32c2275632 (patch)
tree6bb639714c797e02fa3730c8dd02a43c5d16d0d3
parent45c7d281d4f785f11bd887f9fa6ec93d16bbd18c (diff)
downloadaports-d3d503093e99ff3a1d7c65af8ca79f32c2275632.tar.gz
aports-d3d503093e99ff3a1d7c65af8ca79f32c2275632.tar.bz2
aports-d3d503093e99ff3a1d7c65af8ca79f32c2275632.tar.xz
main/less: upgrade to 590
-rw-r--r--main/less/0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch28
-rw-r--r--main/less/APKBUILD12
2 files changed, 5 insertions, 35 deletions
diff --git a/main/less/0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch b/main/less/0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch
deleted file mode 100644
index b6381d1320..0000000000
--- a/main/less/0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From df845a5315e1e12df352beca4bd722206d5e081e Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Sun, 16 May 2021 11:10:38 -0700
-Subject: [PATCH] Shouldn't use memcpy to copy to overlapping range.
-
----
- line.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/line.c b/line.c
-index 5d4596d..5414af8 100644
---- a/line.c
-+++ b/line.c
-@@ -740,8 +740,12 @@ store_char(ch, a, rep, pos)
- if (linebuf.end > linebuf.print)
- {
- /* Shift left enough to put last byte of this char at print-1. */
-- memcpy(&linebuf.buf[0], &linebuf.buf[replen], linebuf.print);
-- memcpy(&linebuf.attr[0], &linebuf.attr[replen], linebuf.print);
-+ int i;
-+ for (i = 0; i < linebuf.print; i++)
-+ {
-+ linebuf.buf[i] = linebuf.buf[i+replen];
-+ linebuf.attr[i] = linebuf.attr[i+replen];
-+ }
- linebuf.end -= replen;
- cshift += w;
- /*
diff --git a/main/less/APKBUILD b/main/less/APKBUILD
index c214dbd2eb..f55926d688 100644
--- a/main/less/APKBUILD
+++ b/main/less/APKBUILD
@@ -1,17 +1,16 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=less
-pkgver=581
-pkgrel=1
+pkgver=590
+pkgrel=0
pkgdesc="File pager"
-url="http://www.greenwoodsoftware.com/less/"
+url="https://www.greenwoodsoftware.com/less/"
arch="all"
license="GPL-3.0-or-later OR BSD-2-Clause"
options="!check"
makedepends="ncurses-dev"
subpackages="$pkgname-doc"
-source="http://www.greenwoodsoftware.com/less/less-$pkgver.tar.gz
- 0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch"
+source="https://www.greenwoodsoftware.com/less/less-$pkgver.tar.gz"
build() {
./configure \
@@ -29,6 +28,5 @@ package() {
}
sha512sums="
-b2892c73fb6e8a5cb5d5c22280c653194d6a1667a7d65a4b972a76038818cce827f1d00f266d6222e65f93fecfe1760d30109e9d2cf1aa6872b476b49eecefd9 less-581.tar.gz
-e22b694c0cc8bb2c660479410b413078c7d13ae325df93a295c03eb86c9afbb1a7c12687b031807a2dbb9123a3a6a3132e65a05e954f0f5fc77e8a6be568db2b 0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch
+426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903 less-590.tar.gz
"