main/dev86: upgrade to 0.16.21

3 files changed, 11 insertions, 62 deletions

diff --git a/main/dev86/APKBUILD b/main/dev86/APKBUILD
index e18929f9c..e9f360a59 100644
--- a/main/dev86/APKBUILD
+++ b/main/dev86/APKBUILD
@@ -1,22 +1,21 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dev86
-pkgver=0.16.19
-pkgrel=1
+pkgver=0.16.21
+pkgrel=0
 pkgdesc="A real mode 80x86 assembler and linker"
-url="http://www.debath.co.uk/dev86/"
+url="http://v3.sk/~lkundrak/dev86/"
 arch="all"
 license="GPL+ and GPLv2+ and LGPLv2+"
 depends=
 makedepends="bash coreutils"
 install=""
 subpackages="$pkgname-doc"
-source="http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz
+source="http://v3.sk/~lkundrak/dev86/Dev86src-$pkgver.tar.gz
 	dev86-noelks.patch
 	dev86-pic.patch
-	dev86-print-overflow.patch
 	dev86-long.patch
-	dev86-0.16.19-memmove.patch"
+	"
 
 _builddir="$srcdir"/dev86-$pkgver
 prepare() {
@@ -75,21 +74,15 @@ package() {
 		install install-man
 }
 
-md5sums="442e98e1afa23fe00d40c5a996385942  Dev86src-0.16.19.tar.gz
+md5sums="6b96fe9d2d1c546842a4d1c7ef387e4c  Dev86src-0.16.21.tar.gz
 eba7081bc5dbd72b7b9b902275251499  dev86-noelks.patch
 d508a2a8ededa9e34dbd9105dfd66290  dev86-pic.patch
-7ce097efcb8c043727b4b3bf6c396c75  dev86-print-overflow.patch
-95e9df3245d46a02154fbe2f8b907782  dev86-long.patch
-cbb648a57fd13b716ba91c26af248885  dev86-0.16.19-memmove.patch"
-sha256sums="33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e  Dev86src-0.16.19.tar.gz
+95e9df3245d46a02154fbe2f8b907782  dev86-long.patch"
+sha256sums="234b110e6df9b7f6843e2ee53473127c2211243a16748f229fc0127845f68d94  Dev86src-0.16.21.tar.gz
 3846e55cec22149e99e25540f84ac2e2ff640881fe6f21b6558766522181354d  dev86-noelks.patch
 cae90d286eae1230566e423dfee37cd339fe17ba7c32f49de9c4a17fd357f1b2  dev86-pic.patch
-831dc73d4754093c0fc00de15e5bf1af15d88aa6be1452c7c97805900a17f7c6  dev86-print-overflow.patch
-eda9999b6ab2baf9a62e7fb720f56d3d5727b79dbb825a29bf42f685a3299355  dev86-long.patch
-6e40de6505cbd8233787f735f353ad37f8472dd7b1c81d20faac5553bc9531f7  dev86-0.16.19-memmove.patch"
-sha512sums="4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3  Dev86src-0.16.19.tar.gz
+eda9999b6ab2baf9a62e7fb720f56d3d5727b79dbb825a29bf42f685a3299355  dev86-long.patch"
+sha512sums="6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016  Dev86src-0.16.21.tar.gz
 70eb52bd314a10b2f2b2ea00c88b398772f0a998cdd9db2d73904bc3e7db6cac8317f10b8dd838c04659d54cd5411d1a8b63dc89257ef04048c07b85b182e966  dev86-noelks.patch
 1dafea998e3d62e71f069eb6bd6e0e05c7152a0470fbf9baa82c3ac9e3f5fe20c342ed0b35be91e82ce83638346a3e8c9855e77f4a71656f2ee7590e999e55fb  dev86-pic.patch
-6e916c8f0891559fc8d1019dfcfe66575d0e3b4a562f721bbe38db976c18f27360bb13f0408fa759a4081b0e636ac94eefd3defae290fbe49ca15f200fb245ad  dev86-print-overflow.patch
-94c7532724d6c02a389303f1ce023e13fe95abecb86e1e4126504701cc755053ad810514e599c1151d166c45c51e1af15cbfac9e25895408b1133feb86dce21e  dev86-long.patch
-5b003ec7e263b71fee0af6371c5693ba4d35a1aeb214046b7ff124e7b7254bab824574814f479592112d206a75c423c1ef7ed783e33adaa9c302d9444143639b  dev86-0.16.19-memmove.patch"
+94c7532724d6c02a389303f1ce023e13fe95abecb86e1e4126504701cc755053ad810514e599c1151d166c45c51e1af15cbfac9e25895408b1133feb86dce21e  dev86-long.patch"
diff --git a/main/dev86/dev86-0.16.19-memmove.patch b/main/dev86/dev86-0.16.19-memmove.patch
deleted file mode 100644
index e0bd8b7ce..000000000
--- a/main/dev86/dev86-0.16.19-memmove.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/354351
-
-fix sniped from Debian:
-* Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
-  by memmove (closes: #591133).
-
---- a/copt/copt.c
-+++ b/copt/copt.c
-@@ -174,7 +174,7 @@
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+	memmove(buf, cp, strlen(cp) + 1);
- 
-   return(buf);
- }
diff --git a/main/dev86/dev86-print-overflow.patch b/main/dev86/dev86-print-overflow.patch
deleted file mode 100644
index c75e18c9b..000000000
--- a/main/dev86/dev86-print-overflow.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-
-There are off-by-one errors when filling the ar headers, the trailing nul
-would overflow the target buffer.
-
-diff -urp dev86-0.16.17/ld/mkar.c dev86-0.16.17.fixed/ld/mkar.c
---- dev86-0.16.17/ld/mkar.c	2004-06-20 09:23:27.000000000 +0200
-+++ dev86-0.16.17.fixed/ld/mkar.c	2010-03-29 23:34:30.351426404 +0200
-@@ -51,12 +51,12 @@ char buf[128];
-       memset(&arbuf, ' ', sizeof(arbuf));
-       strcpy(buf, ptr); strcat(buf, "/                 ");
-       strncpy(arbuf.ar_name, buf, sizeof(arbuf.ar_name));
--      
--      sprintf(arbuf.ar_date, "%-12ld", (long)st.st_mtime);
--      sprintf(arbuf.ar_uid, "%-6d",    (int)(st.st_uid%1000000L));
--      sprintf(arbuf.ar_gid, "%-6d",    (int)(st.st_gid%1000000L));
--      sprintf(arbuf.ar_mode, "%-8lo",  (long)st.st_mode);
--      sprintf(arbuf.ar_size, "%-10ld", (long)st.st_size);
-+     
-+      snprintf(arbuf.ar_date, 12, "%-12ld", (long)st.st_mtime);
-+      snprintf(arbuf.ar_uid, 6, "%-6d", (int)(st.st_uid%1000000L));
-+      snprintf(arbuf.ar_gid, 6, "%-6d", (int)(st.st_gid%1000000L));
-+      snprintf(arbuf.ar_mode, 8, "%-8lo", (long)st.st_mode);
-+      snprintf(arbuf.ar_size, 10, "%-10ld", (long)st.st_size);
-       memcpy(arbuf.ar_fmag, ARFMAG, sizeof(arbuf.ar_fmag));
- 
-       if( fwrite(&arbuf, 1, sizeof(arbuf), fd) != sizeof(arbuf) )