Hello community, here is the log from the commit of package minicom for openSUSE:Factory checked in at 2020-06-10 00:48:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minicom (Old) and /work/SRC/openSUSE:Factory/.minicom.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minicom" Wed Jun 10 00:48:37 2020 rev:41 rq:812780 version:2.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/minicom/minicom.changes 2017-04-19 18:11:40.454640506 +0200 +++ /work/SRC/openSUSE:Factory/.minicom.new.3606/minicom.changes 2020-06-10 00:48:43.338993040 +0200 @@ -1,0 +2,9 @@ +Tue Jun 9 03:11:04 UTC 2020 - Simon Lees <[email protected]> + +- Fix some unneccesary global defenitions to fix build failures with + gcc10. + * fix-upstream-gcc10-build1.patch + * fix-upstream-gcc10-build2.patch + * fix-upstream-gcc10-build3.patch + +------------------------------------------------------------------- New: ---- fix-upstream-gcc10-build1.patch fix-upstream-gcc10-build2.patch fix-upstream-gcc10-build3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minicom.spec ++++++ --- /var/tmp/diff_new_pack.zOE45z/_old 2020-06-10 00:48:44.106995049 +0200 +++ /var/tmp/diff_new_pack.zOE45z/_new 2020-06-10 00:48:44.110995059 +0200 @@ -1,7 +1,7 @@ # # spec file for package minicom # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,9 +20,9 @@ Version: 2.7.1 Release: 0 Summary: A Terminal Program -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/Modem -Url: http://alioth.debian.org/projects/minicom/ +URL: http://alioth.debian.org/projects/minicom/ Source0: https://alioth.debian.org/frs/download.php/latestfile/3/%{name}-%{version}.tar.gz Patch0: minicom-2.2-defaults.diff Patch2: 03norzsz.diff @@ -30,6 +30,9 @@ Patch5: minicom-2.4-norootsetup.diff # PATCH-FIX-UPSTREAM increase permitted length of serial device (bnc#707860) Patch6: minicom-2.5-serial_device_path_length.patch +Patch7: fix-upstream-gcc10-build1.patch +Patch8: fix-upstream-gcc10-build2.patch +Patch9: fix-upstream-gcc10-build3.patch BuildRequires: ckermit BuildRequires: gettext-devel BuildRequires: lockdev-devel @@ -57,6 +60,9 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build export CFLAGS="%{optflags} $(ncursesw6-config --cflags)" ++++++ fix-upstream-gcc10-build1.patch ++++++ >From db269bba2a68fde03f5df45ac8372a8f1248ca96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <[email protected]> Date: Mon, 3 Feb 2020 16:04:54 +0100 Subject: [PATCH] Drop superfluous global variable definitions The file minicom.c, by including the minicom.h header, already defines the global variables 'dial_user' and 'dial_pass'. The object file minicom.o is always linked to dial.o. Thus the definitions in dial.c can be dropped. This fixes linking with gcc 10 which uses -fno-common by default, disallowing multiple global variable definitions. --- src/dial.c | 2 -- 1 file changed, 2 deletions(-) Index: minicom-2.7.1/src/dial.c =================================================================== --- minicom-2.7.1.orig/src/dial.c +++ minicom-2.7.1/src/dial.c @@ -137,7 +137,7 @@ struct dver { /* Forward declaration */ static void writedialdir(void); -#define dialentno(di, no) ((struct dialent *)((char *)(di) + ((no) * sizeof(struct dialent)))) +#define dialentno(di, no) ((struct dialent *)((char *)(di) + ((no) * sizeof(struct dialent)))) static struct dialent *dialents; static struct dialent *d_man; @@ -146,8 +146,6 @@ static int newtype; /* Access to ".dialdir" denied? */ static int dendd = 0; static char *tagged; -char *dial_user; -char *dial_pass; /* Change the baud rate. Treat all characters in the given array as if * they were key presses within the comm parameters dialog (C-A P) and @@ -1370,7 +1368,7 @@ static void prdir(WIN *dialw, int top, i if (d == (struct dialent *)0) break; mc_wprintf(dialw, fmt, f+1+top, (d->flags & FL_TAG) ? '>' : ' ', - d->name, d->number, d->lastdate, d->lasttime, + d->name, d->number, d->lastdate, d->lasttime, d->count, d->script); } dirflush = 1; @@ -1480,7 +1478,7 @@ static void dial_entry(struct dialent *d /* Now that everything has been set, dial. */ if ((nb = dial(d, &d2)) < 0) return; - + if (d2 != (struct dialent *)NULL) d = d2; /* jl 22.09.97 */ ++++++ fix-upstream-gcc10-build2.patch ++++++ >From c69cad5b5dda85d361a3a0c1fddc65e933f26d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <[email protected]> Date: Mon, 3 Feb 2020 16:04:55 +0100 Subject: [PATCH] Drop superfluous global variable definitions The only place where the EXTERN macro mechanism is used to define the global variables 'vt_outmap' and 'vt_inmap' is minicom.c (by defining an empty EXTERN macro and including the minicom.h header). The file vt100.c already defines these variables. The vt100.o object file is always linked to minicom.o. Thus it is safe not to define the variables in minicom.c and only declare them in the minicom.h header. This fixes linking with gcc 10 which uses -fno-common by default, disallowing multiple global variable definitions. --- src/minicom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/minicom.h b/src/minicom.h index ea32ea8..e3a68ba 100644 --- a/src/minicom.h +++ b/src/minicom.h @@ -154,7 +154,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */ 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 */ -- 2.26.2 ++++++ fix-upstream-gcc10-build3.patch ++++++ >From c8382374c5d340aa4115d527aed76e876ee5456b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <[email protected]> Date: Sun, 9 Feb 2020 16:16:59 +0100 Subject: [PATCH] Drop superfluous global variable definitions The only place where the EXTERN macro mechanism is used to define the global variables 'portfd_is_socket' and 'portfd_is_connected' is minicom.c (by defining an empty EXTERN macro and including the minicom.h header). The source file sysdep1_s.c already defines these variables. The sysdep1_s.o object file is always linked to minicom.o. Thus it is safe to drop the definitions from minicom.c and only declare the variables in the minicom.h header. This fixes linking with gcc 10 which uses -fno-common by default, disallowing multiple global variable definitions. --- src/minicom.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: minicom-2.7.1/src/minicom.h =================================================================== --- minicom-2.7.1.orig/src/minicom.h +++ minicom-2.7.1/src/minicom.h @@ -113,9 +113,9 @@ EXTERN char *dial_user; /* Our usern 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
