From 822500f37501d848913ed1c3961b04f0cf4f98d7 Mon Sep 17 00:00:00 2001 From: Lu Weitao Date: Wed, 4 Aug 2021 11:28:12 +0800 Subject: [PATCH] fix compile failure by GCC-10 Signed-off-by: Lu Weitao --- fix-minicom-multi-difine.patch | 31 +++++++++++++++++++++++++++++++ minicom.spec | 8 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 fix-minicom-multi-difine.patch diff --git a/fix-minicom-multi-difine.patch b/fix-minicom-multi-difine.patch new file mode 100644 index 0000000..a3a4b32 --- /dev/null +++ b/fix-minicom-multi-difine.patch @@ -0,0 +1,31 @@ +diff -urN a/src/minicom.h b/src/minicom.h +--- a/src/minicom.h 2013-12-08 18:26:03.000000000 +0800 ++++ b/src/minicom.h 2021-08-04 11:21:06.786549316 +0800 +@@ -109,13 +109,13 @@ + + EXTERN char *dial_name; /* System we're conneced to */ + EXTERN char *dial_number; /* Number we've dialed. */ +-EXTERN char *dial_user; /* Our username there */ +-EXTERN char *dial_pass; /* Our password */ ++extern char *dial_user; /* Our username there */ ++extern char *dial_pass; /* Our password */ + + #ifdef USE_SOCKET +-EXTERN int portfd_is_socket; /* File descriptor is a unix socket */ +-EXTERN int portfd_is_connected; /* 1 if the socket is connected */ +-EXTERN struct sockaddr_un portfd_sock_addr; /* the unix socket address */ ++extern int portfd_is_socket; /* File descriptor is a unix socket */ ++extern int portfd_is_connected; /* 1 if the socket is connected */ ++extern struct sockaddr_un portfd_sock_addr; /* the unix socket address */ + #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \ + ? -1 : portfd) + #else +@@ -141,7 +141,7 @@ + EXTERN int st_attr; /* Status Bar attributes. */ + + /* jl 04.09.97 conversion tables */ +-EXTERN unsigned char vt_outmap[256], vt_inmap[256]; ++extern unsigned char vt_outmap[256], vt_inmap[256]; + + /* MARK updated 02/17/95 - history buffer */ + EXTERN int num_hist_lines; /* History buffer size */ diff --git a/minicom.spec b/minicom.spec index 7ddafb2..5386f6b 100644 --- a/minicom.spec +++ b/minicom.spec @@ -1,12 +1,13 @@ Name: minicom Version: 2.7.1 -Release: 11 +Release: 12 Summary: A modem control and terminal emulation program URL: https://elinux.org/Minicom License: GPLv2+ and LGPLv2+ and Public Domain Source0: https://fossies.org/linux/misc/minicom-2.7.1.tar.gz +Patch0: fix-minicom-multi-difine.patch BuildRequires: lockdev-devel ncurses-devel autoconf automake gettext-devel gcc git Requires: lockdev lrzsz @@ -38,7 +39,7 @@ install -d %{buildroot}%{_sysconfdir} %doc ChangeLog AUTHORS NEWS TODO doc_/* %license COPYING %{_bindir}/* -%exclude /lib/snprintf.c +%exclude /lib/snprintf.c %exclude %{_mandir}/man1/* %exclude %{_datadir}/doc/* @@ -48,5 +49,8 @@ install -d %{buildroot}%{_sysconfdir} %changelog +* Sat Jul 31 2021 luweitao - 2.7.1-12 +- fix failure by GCC-10 + * Tue Feb 18 2020 zhusongbao - 2.7.1-11 - Package init