From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sat, 23 Jan 2016 14:41:58 +0000 (+0100)
Subject: package/minicom: fix musl build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e01ec28d2757463e302e7d5b9e825302a62de3f8;p=buildroot.git

package/minicom: fix musl build

Add two upstream patches to fix the build of minicom with the musl C
library.

Fixes:

  http://autobuild.buildroot.net/results/ea7/ea72a5aee30a89251c06e6a916499e39128437c0/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: use upstream patches instead of OpenEmbedded patch.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/minicom/0001-musl-libc-compile-fix.patch b/package/minicom/0001-musl-libc-compile-fix.patch
new file mode 100644
index 0000000000..94c0da06a5
--- /dev/null
+++ b/package/minicom/0001-musl-libc-compile-fix.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Adam Lackorzynski <adam@os.inf.tu-dresden.de>
+# Date 1432407431 -7200
+#      Sat May 23 20:57:11 2015 +0200
+# Node ID 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
+# Parent  8c784c80c17aa7a346d982db23bca5df67302cda
+musl-libc compile fix
+
+By Felix Janda <felix.janda@posteo.de>:
+VC_MUSIC is enabled by default on linux and in dial.c the
+necessary header are only included for glibc. (The wrong conditional
+include has likely been introduced by the 2003-03-30 GNU/Hurd patch.)
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Taken from upstream Mercurial commit 8bf81e6a8e60]
+
+diff -r 8c784c80c17a -r 8bf81e6a8e60 src/dial.c
+--- a/src/dial.c	Sat May 23 20:56:29 2015 +0200
++++ b/src/dial.c	Sat May 23 20:57:11 2015 +0200
+@@ -39,7 +39,7 @@
+ #include "intl.h"
+ 
+ #ifdef VC_MUSIC
+-#  if defined(__GLIBC__)
++#  if defined(__linux__) || defined(__GLIBC__)
+ #    include <sys/ioctl.h>
+ #    include <sys/kd.h>
+ #    include <sys/time.h>
diff --git a/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch b/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
new file mode 100644
index 0000000000..83e1530600
--- /dev/null
+++ b/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
@@ -0,0 +1,51 @@
+# HG changeset patch
+# User Adam Lackorzynski <adam@os.inf.tu-dresden.de>
+# Date 1432407475 -7200
+#      Sat May 23 20:57:55 2015 +0200
+# Node ID 93e5dd955c8bd944fd64bb04fd117c963c3758bc
+# Parent  8bf81e6a8e60e37c2dec9577a1be6357b8d56165
+Change MAXNAMLEN to POSIX's NAME_MAX
+
+By Felix Janda <felix.janda@posteo.de>:
+MAXNAMLEN is usually defined in <sys/param.h> but it is
+better to use the equivalent POSIX NAME_MAX.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Taken from upstream Mercurial commit 93e5dd955c8b]
+
+diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.c
+--- a/src/getsdir.c	Sat May 23 20:57:11 2015 +0200
++++ b/src/getsdir.c	Sat May 23 20:57:55 2015 +0200
+@@ -145,7 +145,7 @@
+  *
+  *			    The data will be in the form:
+  *				typedef struct dirEntry {
+- *				    char fname[MAXNAMLEN + 1];
++ *				    char fname[NAME_MAX + 1];
+  *				    time_t time;
+  *				    mode_t mode;
+  *				} GETSDIR_ENTRY;
+@@ -232,7 +232,7 @@
+             }
+ 
+           /* copy the filename */
+-          strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN);
++          strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX);
+ 
+           /* get information about the directory entry */
+           snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);
+diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.h
+--- a/src/getsdir.h	Sat May 23 20:57:11 2015 +0200
++++ b/src/getsdir.h	Sat May 23 20:57:55 2015 +0200
+@@ -23,9 +23,10 @@
+  */
+ 
+ #include <dirent.h>
++#include <limits.h>
+ 
+ typedef struct dirEntry {		/* structure of data item */
+-  char fname[MAXNAMLEN + 1];		/* filename + terminating null */
++  char fname[NAME_MAX + 1];		/* filename + terminating null */
+   time_t time;				/* last modification date */
+   mode_t mode;				/* file mode (dir? etc.) */
+   ushort cflags;			/* caller field for convenience */