New bug fixes from upstream (bumping PORTREVISION),

some fixes moved into an official upstream patch,
added patch to fix getline() related failures e.g. on 8.2-RELEASE* i386.

5 files changed, 30 insertions, 25 deletions

diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 60a9bdc666d7..0ee2837c3acd 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	busybox
 PORTVERSION=	1.19.0
+PORTREVISION=	1
 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-freebsd.patch \
 		busybox-1.19.0-less.patch \
 		busybox-1.19.0-sed.patch \
 		busybox-1.19.0-swap.patch \
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index 4602491af676..34f2725ebca3 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -2,6 +2,8 @@ SHA256 (busybox-1.19.0.tar.bz2) = 19cf44a096d7796800780d6344c4cc5054dac9f50d1c9b
 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-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
diff --git a/sysutils/busybox/files/patch-include__platform.h b/sysutils/busybox/files/patch-include__platform.h
index 2547cf5db188..0049cfb5b70f 100644
--- a/sysutils/busybox/files/patch-include__platform.h
+++ b/sysutils/busybox/files/patch-include__platform.h
@@ -1,11 +1,18 @@
 --- ./include/platform.h.orig	2011-08-11 02:23:58.000000000 +0200
-+++ ./include/platform.h	2011-08-26 02:10:16.000000000 +0200
-@@ -417,6 +417,8 @@
- # undef HAVE_STRVERSCMP
- # undef HAVE_XTABS
- # undef HAVE_DPRINTF
-+# undef HAVE_UNLOCKED_STDIO
-+# undef HAVE_UNLOCKED_LINE_OPS
- #endif
++++ ./include/platform.h	2011-08-28 12:58:14.000000000 +0200
+@@ -421,6 +421,15 @@
  
  #if defined(__FreeBSD__)
+ # undef HAVE_STRCHRNUL
++
++# if __FreeBSD__ + 0 >= 2
++#  include <osreldate.h>
++#  if __FreeBSD_version >= 800067
++#   define HAVE_GETLINE 1 /* FreeBSD added getdelim(), getline(),
++			     stpncpy(), strnlen(), wcsnlen(),
++			     wcscasecmp(), and wcsncasecmp() in 800067 */
++#  endif
++# endif
+ #endif
+ 
+ #if defined(__NetBSD__)
diff --git a/sysutils/busybox/files/patch-libbb__match_fstype.c b/sysutils/busybox/files/patch-libbb__match_fstype.c
deleted file mode 100644
index 62a4c006a81e..000000000000
--- a/sysutils/busybox/files/patch-libbb__match_fstype.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./libbb/match_fstype.c.orig	2011-08-11 02:23:58.000000000 +0200
-+++ ./libbb/match_fstype.c	2011-08-26 02:10:16.000000000 +0200
-@@ -10,6 +10,8 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-  */
- 
-+#ifdef HAVE_MNTENT_H
-+
- #include "libbb.h"
- 
- int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
-@@ -40,3 +42,5 @@
- 
- 	return !match;
- }
-+
-+#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/busybox/files/patch-libbb__speed_table.c b/sysutils/busybox/files/patch-libbb__speed_table.c
new file mode 100644
index 000000000000..75c6d67e2539
--- /dev/null
+++ b/sysutils/busybox/files/patch-libbb__speed_table.c
@@ -0,0 +1,11 @@
+--- ./libbb/speed_table.c.orig	2011-08-11 02:23:58.000000000 +0200
++++ ./libbb/speed_table.c	2011-08-28 13:00:03.000000000 +0200
+@@ -10,7 +10,7 @@
+ #include "libbb.h"
+ 
+ struct speed_map {
+-	unsigned short speed;
++	unsigned int speed;
+ 	unsigned short value;
+ };
+