summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/minicom/minicom
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/minicom/minicom')
-rw-r--r--meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch35
-rw-r--r--meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch47
-rw-r--r--meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch35
-rw-r--r--meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch37
-rw-r--r--meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch42
-rw-r--r--meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch21
6 files changed, 0 insertions, 217 deletions
diff --git a/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch
deleted file mode 100644
index 4c6e249315..0000000000
--- a/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From b65152ebc03832972115e6d98e50cb6190d01793 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
3Date: Mon, 3 Feb 2020 13:18:13 +0100
4Subject: [PATCH 1/3] Drop superfluous global variable definitions
5
6The file minicom.c, by including the minicom.h header, already defines
7the global variables 'dial_user' and 'dial_pass'. The object file
8minicom.o is always linked to dial.o. Thus the definitions in dial.c
9can be dropped.
10
11This fixes linking with gcc 10 which uses -fno-common by default,
12disallowing multiple global variable definitions.
13
14Upstream-Status: Pending
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/dial.c | 2 --
18 1 file changed, 2 deletions(-)
19
20diff --git a/src/dial.c b/src/dial.c
21index eada5ee..d9d481f 100644
22--- a/src/dial.c
23+++ b/src/dial.c
24@@ -146,8 +146,6 @@ static int newtype;
25 /* Access to ".dialdir" denied? */
26 static int dendd = 0;
27 static char *tagged;
28-char *dial_user;
29-char *dial_pass;
30
31 /* Change the baud rate. Treat all characters in the given array as if
32 * they were key presses within the comm parameters dialog (C-A P) and
33--
342.24.1
35
diff --git a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
deleted file mode 100644
index fec67fdd3f..0000000000
--- a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 31 Aug 2015 22:35:31 +0000
4Subject: [PATCH] Fix build issus surfaced due to musl
5
6src/getsdir.h:28:14: error: 'MAXNAMLEN' undeclared here (not in a function)
7 char fname[MAXNAMLEN + 1]; /* filename + terminating null */
8
9src/dial.c:352:22: error: 'KIOCSOUND' undeclared (first use in this function)
10| ioctl(consolefd, KIOCSOUND, k);
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16 src/dial.c | 2 +-
17 src/getsdir.c | 1 +
18 2 files changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/src/dial.c b/src/dial.c
21index a90c1d2..bf02574 100644
22--- a/src/dial.c
23+++ b/src/dial.c
24@@ -39,7 +39,7 @@
25 #include "intl.h"
26
27 #ifdef VC_MUSIC
28-# if defined(__GLIBC__)
29+# if defined(__GLIBC__) || defined(__linux__)
30 # include <sys/ioctl.h>
31 # include <sys/kd.h>
32 # include <sys/time.h>
33diff --git a/src/getsdir.c b/src/getsdir.c
34index 2195b27..b61a361 100644
35--- a/src/getsdir.c
36+++ b/src/getsdir.c
37@@ -30,6 +30,7 @@
38 #include <string.h>
39 #include <sys/types.h>
40 #include <sys/stat.h>
41+#include <sys/param.h>
42 #include <errno.h>
43
44 #include "getsdir.h"
45--
462.5.1
47
diff --git a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch b/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
deleted file mode 100644
index bd8261c979..0000000000
--- a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Subject: [PATCH] fix minicom -h/-v return value is not 0
2
3Upstream-Status: Pending
4
5Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
6
7---
8 src/minicom.c | 6 ++----
9 1 file changed, 2 insertions(+), 4 deletions(-)
10
11diff --git a/src/minicom.c b/src/minicom.c
12index e1a557b..730da7c 100644
13--- a/src/minicom.c
14+++ b/src/minicom.c
15@@ -1166,15 +1166,13 @@ int main(int argc, char **argv)
16 "modify it under the terms of the GNU General Public License\n"
17 "as published by the Free Software Foundation; either version\n"
18 "2 of the License, or (at your option) any later version.\n\n");
19- exit(1);
20- break;
21+ exit(0);
22 case 's': /* setup mode */
23 dosetup = 1;
24 break;
25 case 'h':
26 helpthem();
27- exit(1);
28- break;
29+ exit(0);
30 case 'p': /* Pseudo terminal to use. */
31 if (strncmp(optarg, "/dev/", 5) == 0)
32 optarg += 5;
33--
341.7.9.5
35
diff --git a/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch
deleted file mode 100644
index 1740051e0a..0000000000
--- a/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 924bd2da3a00e030e29d82b74ef82900bd50b475 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
3Date: Mon, 3 Feb 2020 13:18:33 +0100
4Subject: [PATCH 2/3] Drop superfluous global variable definitions
5
6The only place where the EXTERN macro mechanism is used to define the
7global variables 'vt_outmap' and 'vt_inmap' is minicom.c (by defining
8an empty EXTERN macro and including the minicom.h header). The file
9vt100.c already defines these variables. The vt100.o object file is
10always linked to minicom.o. Thus it is safe not to define the
11variables in minicom.c and only declare them in the minicom.h header.
12
13This fixes linking with gcc 10 which uses -fno-common by default,
14disallowing multiple global variable definitions.
15
16Upstream-Status: Pending
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/minicom.h | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/src/minicom.h b/src/minicom.h
23index 061c013..0f9693b 100644
24--- a/src/minicom.h
25+++ b/src/minicom.h
26@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */
27 EXTERN int st_attr; /* Status Bar attributes. */
28
29 /* jl 04.09.97 conversion tables */
30-EXTERN unsigned char vt_outmap[256], vt_inmap[256];
31+extern unsigned char vt_outmap[256], vt_inmap[256];
32
33 /* MARK updated 02/17/95 - history buffer */
34 EXTERN int num_hist_lines; /* History buffer size */
35--
362.24.1
37
diff --git a/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch
deleted file mode 100644
index 58cd58eda8..0000000000
--- a/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From a4fc603b3641d2efe31479116eb7ba66932901c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
3Date: Mon, 3 Feb 2020 13:21:41 +0100
4Subject: [PATCH 3/3] Drop superfluous global variable definitions
5
6The only place where the EXTERN macro mechanism is used to define the
7global variables 'portfd_is_socket', 'portfd_is_connected' and
8'portfd_sock_addr' is minicom.c (by defining an empty EXTERN macro and
9including the minicom.h header). The source file sysdep1_s.c already
10defines these variables. The sysdep1_s.o object file is always linked
11to minicom.o. Thus it is safe to drop the definitions from minicom.c
12and only declare the variables in the minicom.h header.
13
14This fixes linking with gcc 10 which uses -fno-common by default,
15disallowing multiple global variable definitions.
16
17Upstream-Status: Pending
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 src/minicom.h | 6 +++---
21 1 file changed, 3 insertions(+), 3 deletions(-)
22
23diff --git a/src/minicom.h b/src/minicom.h
24index 0f9693b..1e7cb8c 100644
25--- a/src/minicom.h
26+++ b/src/minicom.h
27@@ -113,9 +113,9 @@ EXTERN char *dial_user; /* Our username there */
28 EXTERN char *dial_pass; /* Our password */
29
30 #ifdef USE_SOCKET
31-EXTERN int portfd_is_socket; /* File descriptor is a unix socket */
32-EXTERN int portfd_is_connected; /* 1 if the socket is connected */
33-EXTERN struct sockaddr_un portfd_sock_addr; /* the unix socket address */
34+extern int portfd_is_socket; /* File descriptor is a unix socket */
35+extern int portfd_is_connected; /* 1 if the socket is connected */
36+extern struct sockaddr_un portfd_sock_addr; /* the unix socket address */
37 #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \
38 ? -1 : portfd)
39 #else
40--
412.24.1
42
diff --git a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
deleted file mode 100644
index f5c08896ff..0000000000
--- a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
4
5--- a/configure.in 2013-02-06 18:18:13.000000000 +0100
6+++ b/configure.in 2013-07-21 15:31:27.614828894 +0200
7@@ -40,7 +40,13 @@
8 fi
9
10 PKG_PROG_PKG_CONFIG
11-if test -n "$PKG_CONFIG"; then
12+
13+AC_ARG_ENABLE([lockdev],
14+ AS_HELP_STRING([--enable-lockdev],
15+ [Enable lockdev support (def: enabled)]),
16+ [], [enable_lockdev="yes"])
17+
18+if test -n "$PKG_CONFIG" && test "x$enable_lockdev" = xyes; then
19 PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define if you have lockdev]),[:])
20 fi
21