Update to new upstream release 1.19.1.

3 files changed, 7 insertions, 112 deletions

diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 63bc0d7e13db..f69444558f07 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -6,19 +6,13 @@
 #
 
 PORTNAME=	busybox
-PORTVERSION=	1.19.0
-PORTREVISION=	2
+PORTVERSION=	1.19.1
+PORTREVISION=	0
 CATEGORIES=	sysutils misc shells
 MASTER_SITES=	http://www.busybox.net/downloads/
 
 PATCH_SITES=	http://www.busybox.net/downloads/fixes-${PORTVERSION}/
-PATCHFILES=	busybox-1.19.0-cttyhack.patch \
-		busybox-1.19.0-find.patch \
-		busybox-1.19.0-less.patch \
-		busybox-1.19.0-sed.patch \
-		busybox-1.19.0-swap.patch \
-		busybox-1.19.0-top.patch \
-		busybox-1.19.0-uncompress.patch
+PATCHFILES=	busybox-1.19.1-patch.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mandree@FreeBSD.org
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index 7d0f34104f10..8938559db868 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -1,18 +1,4 @@
-SHA256 (busybox-1.19.0.tar.bz2) = 19cf44a096d7796800780d6344c4cc5054dac9f50d1c9b7a5c506c4777f7620c
-SIZE (busybox-1.19.0.tar.bz2) = 2168657
-SHA256 (busybox-1.19.0-cttyhack.patch) = f315e48a9c586fb5e77921eda59c773ba8afbb1e4ac9fd422c66b5c482dca6d2
-SIZE (busybox-1.19.0-cttyhack.patch) = 592
-SHA256 (busybox-1.19.0-find.patch) = 4056fd1899236ae2f54f1688ba1000c0586c034ee92d6216961dc9907b232abb
-SIZE (busybox-1.19.0-find.patch) = 470
-SHA256 (busybox-1.19.0-freebsd.patch) = 52372b7484f1e8b8a10c8441b0c544c3ee00553537e7a0c4fe2ad9c5ecb0d979
-SIZE (busybox-1.19.0-freebsd.patch) = 2544
-SHA256 (busybox-1.19.0-less.patch) = e0d1a306bf3be7802ef19c0033b278ae2ecf8fd4f271bad7d93209c9c6a0f019
-SIZE (busybox-1.19.0-less.patch) = 278
-SHA256 (busybox-1.19.0-sed.patch) = b21ac5eb86519fbcbe0a74fc531cb707a878e988b6fdb298be6083760e04fb89
-SIZE (busybox-1.19.0-sed.patch) = 8081
-SHA256 (busybox-1.19.0-swap.patch) = d9d70a607d877646b4e2087ddf4c3ad14d5bcb2b5973b33fed30ee8e6d69b40d
-SIZE (busybox-1.19.0-swap.patch) = 402
-SHA256 (busybox-1.19.0-top.patch) = 23be49b8fa9114251e9bdfb8a53b78148dc101fc8f2fc8cc91903de01ea04cb9
-SIZE (busybox-1.19.0-top.patch) = 2093
-SHA256 (busybox-1.19.0-uncompress.patch) = 442b259d55771663bd4bd21167b297e81a8bd6dc73eac4604fc4a02d0d720a6a
-SIZE (busybox-1.19.0-uncompress.patch) = 1513
+SHA256 (busybox-1.19.1.tar.bz2) = 376385dee54e342f60f65aa643b92cfb3a2891ea3923db93a7434513157533b7
+SIZE (busybox-1.19.1.tar.bz2) = 2167139
+SHA256 (busybox-1.19.1-patch.patch) = 219e4476feff43fdf66db2873a0191d01fa22ccdda30e25af1182c0358472ea0
+SIZE (busybox-1.19.1-patch.patch) = 1083
diff --git a/sysutils/busybox/files/patch-freebsd-upstream b/sysutils/busybox/files/patch-freebsd-upstream
deleted file mode 100644
index 9a2673a5e952..000000000000
--- a/sysutils/busybox/files/patch-freebsd-upstream
+++ /dev/null
@@ -1,85 +0,0 @@
---- ./include/platform.h
-+++ ./include/platform.h
-@@ -417,6 +417,8 @@ typedef unsigned smalluint;
- # undef HAVE_STRVERSCMP
- # undef HAVE_XTABS
- # undef HAVE_DPRINTF
-+# undef HAVE_UNLOCKED_STDIO
-+# undef HAVE_UNLOCKED_LINE_OPS
- #endif
- 
- #if defined(__FreeBSD__)
---- ./libbb/getpty.c
-+++ ./libbb/getpty.c
-@@ -19,20 +19,22 @@ int FAST_FUNC xgetpty(char *line)
- 	if (p > 0) {
- 		grantpt(p); /* chmod+chown corresponding slave pty */
- 		unlockpt(p); /* (what does this do?) */
--#ifndef HAVE_PTSNAME_R
--		const char *name;
--		name = ptsname(p); /* find out the name of slave pty */
--		if (!name) {
--			bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
-+# ifndef HAVE_PTSNAME_R
-+		{
-+			const char *name;
-+			name = ptsname(p); /* find out the name of slave pty */
-+			if (!name) {
-+				bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
-+			}
-+			safe_strncpy(line, name, GETPTY_BUFSIZE);
- 		}
--		safe_strncpy(line, name, GETPTY_BUFSIZE);
--#else
-+# else
- 		/* find out the name of slave pty */
- 		if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
- 			bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
- 		}
- 		line[GETPTY_BUFSIZE-1] = '\0';
--#endif
-+# endif
- 		return p;
- 	}
- #else
---- ./libbb/match_fstype.c
-+++ ./libbb/match_fstype.c
-@@ -10,6 +10,8 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-  */
- 
- #include "libbb.h"
- 
-+#ifdef HAVE_MNTENT_H
-+
- int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
-@@ -40,3 +42,5 @@ int FAST_FUNC match_fstype(const struct 
- 
- 	return !match;
- }
-+
-+#endif /* HAVE_MNTENT_H */
---- ./libbb/udp_io.c
-+++ ./libbb/udp_io.c
-@@ -13,7 +13,7 @@
-  * We don't check for errors here. Not supported == won't be used
-  */
- void FAST_FUNC
--socket_want_pktinfo(int fd)
-+socket_want_pktinfo(int fd UNUSED_PARAM)
- {
- #ifdef IP_PKTINFO
- 	setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &const_int_1, sizeof(int));
---- ./miscutils/less.c
-+++ ./miscutils/less.c
-@@ -721,8 +721,8 @@ static void print_found(const char *line
- 	while (match_status == 0) {
- 		char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL,
- 				growline ? growline : "",
--				match_structs.rm_so, str,
--				match_structs.rm_eo - match_structs.rm_so,
-+				(int)match_structs.rm_so, str,
-+				(int)(match_structs.rm_eo - match_structs.rm_so),
- 						str + match_structs.rm_so);
- 		free(growline);
- 		growline = new;