From 170f967a4ca6cff7140349f2f36d5e1b3ceda775 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 11 2022 09:06:03 +0000 Subject: import x3270-3.3.12ga12-5.el7_9 --- diff --git a/SOURCES/rhbz2012913.patch b/SOURCES/rhbz2012913.patch new file mode 100644 index 0000000..a5173fc --- /dev/null +++ b/SOURCES/rhbz2012913.patch @@ -0,0 +1,25 @@ +diff -up x3270-3.3.12ga12/c3270-3.3/keypad.c.sigill x3270-3.3.12ga12/c3270-3.3/keypad.c +--- x3270-3.3.12ga12/c3270-3.3/keypad.c.sigill 2021-11-01 15:32:26.917775131 +0100 ++++ x3270-3.3.12ga12/c3270-3.3/keypad.c 2021-11-01 15:35:17.613383589 +0100 +@@ -52,7 +52,7 @@ + # include "windows.h" + #endif /*]*/ + +-extern int screen_changed; /* XXX Hack! */ ++extern bool screen_changed; /* XXX Hack! */ + + /* Sensitivity map: A rectangular region and a callback function. */ + typedef struct { +diff -up x3270-3.3.12ga12/c3270-3.3/menubar.c.sigill x3270-3.3.12ga12/c3270-3.3/menubar.c +--- x3270-3.3.12ga12/c3270-3.3/menubar.c.sigill 2021-11-01 15:37:13.147864928 +0100 ++++ x3270-3.3.12ga12/c3270-3.3/menubar.c 2021-11-01 15:37:23.382924337 +0100 +@@ -73,7 +73,7 @@ + # include "windows.h" + #endif /*]*/ + +-extern int screen_changed; /* XXX: Hack! */ ++extern bool screen_changed; /* XXX: Hack! */ + + /* + * The menus look like this: +diff -up x3270-3.3.12ga12/x3270-3.3/keypad.c.sigill x3270-3.3.12ga12/x3270-3.3/keypad.c diff --git a/SPECS/x3270.spec b/SPECS/x3270.spec index 0c4baed..a749406 100644 --- a/SPECS/x3270.spec +++ b/SPECS/x3270.spec @@ -5,7 +5,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 3.3.12ga12 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Internet URL: http://x3270.sourceforge.net/ @@ -16,6 +16,7 @@ Source1: x3270.png Source2: x3270.desktop Patch0: x3270-3.3.10-paths.patch Patch1: x3270-3.3.10-ibmhostpath.patch +Patch2: rhbz2012913.patch BuildRequires: ncurses-devel BuildRequires: readline-devel @@ -70,6 +71,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM rm -rf wpr3287* wc3270* ws3270* tcl3270* %patch0 -p1 %patch1 -p1 +%patch2 -p1 # update for aarch64 (#926737) for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do @@ -189,6 +191,10 @@ fi %changelog +* Tue Nov 02 2021 Jakub Čajka - 3.3.12ga12-5 +- Fix sigill in c3270 +- Resolves: BZ#2012913 + * Fri Jan 24 2014 Daniel Mach - 3.3.12ga12-4 - Mass rebuild 2014-01-24