Compare commits
No commits in common. "c8s" and "c9" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1 @@
|
||||
SOURCES/minicom-2.7.1.tar.gz
|
||||
/minicom-2.7.1.tar.gz
|
||||
|
1
.minicom.metadata
Normal file
1
.minicom.metadata
Normal file
@ -0,0 +1 @@
|
||||
915432810e7be05c684a634a2c6d45fec3c92cf9 SOURCES/minicom-2.7.1.tar.gz
|
@ -0,0 +1,32 @@
|
||||
From b65152ebc03832972115e6d98e50cb6190d01793 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||
Date: Mon, 3 Feb 2020 13:18:13 +0100
|
||||
Subject: [PATCH 1/3] 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(-)
|
||||
|
||||
diff --git a/src/dial.c b/src/dial.c
|
||||
index eada5ee..d9d481f 100644
|
||||
--- a/src/dial.c
|
||||
+++ b/src/dial.c
|
||||
@@ -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
|
||||
--
|
||||
2.24.1
|
||||
|
@ -0,0 +1,34 @@
|
||||
From 924bd2da3a00e030e29d82b74ef82900bd50b475 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||
Date: Mon, 3 Feb 2020 13:18:33 +0100
|
||||
Subject: [PATCH 2/3] 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 061c013..0f9693b 100644
|
||||
--- a/src/minicom.h
|
||||
+++ b/src/minicom.h
|
||||
@@ -141,7 +141,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.24.1
|
||||
|
@ -0,0 +1,39 @@
|
||||
From a4fc603b3641d2efe31479116eb7ba66932901c7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||
Date: Mon, 3 Feb 2020 13:21:41 +0100
|
||||
Subject: [PATCH 3/3] Drop superfluous global variable definitions
|
||||
|
||||
The only place where the EXTERN macro mechanism is used to define the
|
||||
global variables 'portfd_is_socket', 'portfd_is_connected' and
|
||||
'portfd_sock_addr' 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 | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/minicom.h b/src/minicom.h
|
||||
index 0f9693b..1e7cb8c 100644
|
||||
--- a/src/minicom.h
|
||||
+++ b/src/minicom.h
|
||||
@@ -113,9 +113,9 @@ 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
|
||||
--
|
||||
2.24.1
|
||||
|
@ -1,8 +1,8 @@
|
||||
Summary: A text-based modem control and terminal emulation program
|
||||
Name: minicom
|
||||
Version: 2.7.1
|
||||
Release: 9%{?dist}
|
||||
URL: http://alioth.debian.org/projects/minicom/
|
||||
Release: 17%{?dist}
|
||||
URL: https://salsa.debian.org/minicom-team/minicom
|
||||
# Some files are built from Public Domain files in addition to GPLv2+ files
|
||||
# (/usr/bin/minicom). Some LGPLv2+ files *may* be used in building of certain
|
||||
# files (minicom, ascii-xfr, runscript). They are probably not actually used,
|
||||
@ -27,7 +27,14 @@ Patch5: 0005-Fix-a-read-past-end-of-buffer.patch
|
||||
Patch6: 0006-Fix-a-warning-about-an-unused-variable.patch
|
||||
# Upstream patch:
|
||||
Patch7: 0007-loadconv-Add-missing-fclose.patch
|
||||
# Upstream patch:
|
||||
Patch8: 0001-Drop-superfluous-global-variable-definitions.patch
|
||||
# Upstream patch:
|
||||
Patch9: 0002-Drop-superfluous-global-variable-definitions.patch
|
||||
# Upstream patch:
|
||||
Patch10: 0003-Drop-superfluous-global-variable-definitions.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: lockdev-devel ncurses-devel autoconf automake gettext-devel
|
||||
BuildRequires: gcc
|
||||
# For %%autosetup -S git:
|
||||
@ -80,6 +87,32 @@ mkdir -p %{buildroot}%{_sysconfdir}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.1-17
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.1-16
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Feb 10 2020 Ondřej Lysoněk <olysonek@redhat.com> - 2.7.1-13
|
||||
- Fix build with gcc 10
|
||||
- Resolves: rhbz#1799652
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Aug 13 2018 Ondřej Lysoněk <olysonek@redhat.com> - 2.7.1-9
|
||||
- Fix issues found by Coverity Scan
|
||||
- Resolves: rhbz#1602618
|
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
Loading…
Reference in New Issue
Block a user