mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-03-07 16:16:53 +08:00
ncurses 6.0 - patch 20160416
+ add workaround in configure script for inept transition to PIE vs PIC builds documented in https://fedoraproject.org/wiki/Changes/Harden_All_Packages + add "reset" to list of programs whose names might change in manpages due to program-transformation configure options. + drop long-obsolete "-n" option from tset.
This commit is contained in:
Thomas E. Dickey
parent
11dcb05d1b
commit
5723efe1a5
10
NEWS
10
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.2591 2016/04/09 20:58:02 tom Exp $
|
||||
-- $Id: NEWS,v 1.2594 2016/04/16 20:28:00 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,14 @@ See the AUTHORS file for the corresponding full names.
|
||||
Changes through 1.9.9e did not credit all contributions;
|
||||
it is not possible to add this information.
|
||||
|
||||
20160416
|
||||
+ add workaround in configure script for inept transition to PIE vs
|
||||
PIC builds documented in
|
||||
https://fedoraproject.org/wiki/Changes/Harden_All_Packages
|
||||
+ add "reset" to list of programs whose names might change in manpages
|
||||
due to program-transformation configure options.
|
||||
+ drop long-obsolete "-n" option from tset.
|
||||
|
||||
20160409
|
||||
+ modify test/blue.c to use Unicode values for card-glyphs when
|
||||
available, as well as improving the check for CP437 and CP850.
|
||||
|
||||
19
configure.in
19
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.627 2016/03/05 23:44:23 tom Exp $
|
||||
dnl $Id: configure.in,v 1.629 2016/04/16 20:23:20 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.52.20030208)
|
||||
AC_REVISION($Revision: 1.627 $)
|
||||
AC_REVISION($Revision: 1.629 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -474,6 +474,19 @@ for model in $cf_list_models; do
|
||||
if test "$CC_SHARED_OPTS" = "unknown"; then
|
||||
AC_ERROR(Shared libraries are not supported in this version)
|
||||
fi
|
||||
# workaround for inept transition to PIE vs PIC...
|
||||
AC_MSG_CHECKING(if current CFLAGS link properly)
|
||||
AC_TRY_LINK(
|
||||
[#include <stdio.h>],
|
||||
[printf("Hello work\n");],
|
||||
[cf_cflags_work=yes],
|
||||
[cf_cflags_work=no])
|
||||
AC_MSG_RESULT($cf_cflags_work)
|
||||
if test "$cf_cflags_work" = no
|
||||
then
|
||||
CF_VERBOSE(try to work around by appending shared-options)
|
||||
CFLAGS="$CFLAGS $CC_SHARED_OPTS"
|
||||
fi
|
||||
CF_WITH_VERSIONED_SYMS
|
||||
;;
|
||||
esac
|
||||
@ -984,7 +997,7 @@ AC_MSG_RESULT($with_rcs_ids)
|
||||
test "x$with_rcs_ids" = xyes && AC_DEFINE(USE_RCS_IDS,1,[Define to 1 to compile-in RCS identifiers])
|
||||
|
||||
###############################################################################
|
||||
CF_MAN_PAGES([ captoinfo clear infocmp infotocap tabs tic toe tput tset ])
|
||||
CF_MAN_PAGES([ captoinfo clear infocmp infotocap reset tabs tic toe tput tset ])
|
||||
|
||||
###############################################################################
|
||||
CF_HELP_MESSAGE(Extensions:)
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1101 2016/04/09 00:31:41 tom Exp $
|
||||
# $Id: dist.mk,v 1.1102 2016/04/16 18:08:32 tom Exp $
|
||||
# Makefile for creating ncurses distributions.
|
||||
#
|
||||
# This only needs to be used directly as a makefile by developers, but
|
||||
@ -37,7 +37,7 @@ SHELL = /bin/sh
|
||||
# These define the major/minor/patch versions of ncurses.
|
||||
NCURSES_MAJOR = 6
|
||||
NCURSES_MINOR = 0
|
||||
NCURSES_PATCH = 20160409
|
||||
NCURSES_PATCH = 20160416
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
26
man/tset.1
26
man/tset.1
@ -26,18 +26,18 @@
|
||||
.\" authorization. *
|
||||
.\"***************************************************************************
|
||||
.\"
|
||||
.\" $Id: tset.1,v 1.31 2016/01/30 15:41:41 tom Exp $
|
||||
.\" $Id: tset.1,v 1.33 2016/04/16 18:48:44 tom Exp $
|
||||
.TH @TSET@ 1 ""
|
||||
.ie \n(.g .ds `` \(lq
|
||||
.el .ds `` ``
|
||||
.ie \n(.g .ds '' \(rq
|
||||
.el .ds '' ''
|
||||
.SH NAME
|
||||
\fB@TSET@\fR, \fBreset\fR \- terminal initialization
|
||||
\fB@TSET@\fR, \fB@RESET@\fR \- terminal initialization
|
||||
.SH SYNOPSIS
|
||||
\fB@TSET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
|
||||
.br
|
||||
\fBreset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
|
||||
\fB@RESET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
|
||||
.SH DESCRIPTION
|
||||
.SS tset - initialization
|
||||
\&\fBTset\fR initializes terminals.
|
||||
@ -78,14 +78,14 @@ versus the other initialization.
|
||||
If neither option is given, both are assumed.
|
||||
.SS reset - reinitialization
|
||||
.PP
|
||||
When invoked as \fBreset\fR, \fB@TSET@\fR sets cooked and echo modes,
|
||||
When invoked as \fB@RESET@\fR, \fB@TSET@\fR sets cooked and echo modes,
|
||||
turns off cbreak and raw modes, turns on newline translation and
|
||||
resets any unset special characters to their default values before
|
||||
doing the terminal initialization described above. This is useful
|
||||
after a program dies leaving a terminal in an abnormal state. Note,
|
||||
you may have to type
|
||||
.sp
|
||||
\fB<LF>reset<LF>\fR
|
||||
\fB<LF>@RESET@<LF>\fR
|
||||
.sp
|
||||
(the line-feed character is normally control-J) to get the terminal
|
||||
to work, as carriage-return may no longer work in the abnormal state.
|
||||
@ -225,6 +225,11 @@ The \fB@TSET@\fR command appeared in BSD 3.0. The \fBncurses\fR implementation
|
||||
was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
|
||||
S. Raymond <esr@snark.thyrsus.com>.
|
||||
.SH COMPATIBILITY
|
||||
.PP
|
||||
Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
|
||||
(POSIX.1-2008) nor
|
||||
X/Open Curses Issue 7 documents \fB@TSET@\fP or \fB@RESET@\fP.
|
||||
.PP
|
||||
The \fB@TSET@\fR utility has been provided for backward-compatibility with BSD
|
||||
environments (under most modern UNIXes, \fB/etc/inittab\fR and \fIgetty\fR(1)
|
||||
can set \fBTERM\fR appropriately for each dial-up line; this obviates what was
|
||||
@ -252,8 +257,13 @@ The \fB\-a\fR, \fB\-d\fR, and \fB\-p\fR options are similarly
|
||||
not documented or useful, but were retained as they appear to be in
|
||||
widespread use. It is strongly recommended that any usage of these
|
||||
three options be changed to use the \fB\-m\fR option instead.
|
||||
The \fB\-n\fP option remains, but has no effect.
|
||||
The \fB\-adnp\fR options are therefore omitted from the usage summary above.
|
||||
The \fB\-a\fP, \fB\-d\fP, and \fB\-p\fR options are therefore omitted from the usage summary above.
|
||||
.PP
|
||||
Very old systems, e.g., 3BSD, used a different terminal driver which
|
||||
was replaced in 4BSD in the early 1980s.
|
||||
To accommodate these older systems, the 4BSD \fB@TSET@\fP provided a
|
||||
\fB\-n\fP option to specify that the new terminal driver should be used.
|
||||
This implementation does not provide that choice.
|
||||
.PP
|
||||
It is still permissible to specify the \fB\-e\fR, \fB\-i\fR,
|
||||
and \fB\-k\fR options without arguments,
|
||||
@ -261,7 +271,7 @@ although it is strongly recommended that such usage be fixed to
|
||||
explicitly specify the character.
|
||||
.PP
|
||||
As of 4.4BSD,
|
||||
executing \fB@TSET@\fR as \fBreset\fR no longer implies the \fB\-Q\fR option.
|
||||
executing \fB@TSET@\fR as \fB@RESET@\fR no longer implies the \fB\-Q\fR option.
|
||||
Also, the interaction between the \- option and the \fIterminal\fR
|
||||
argument in some historic implementations of \fB@TSET@\fR has been removed.
|
||||
.SH ENVIRONMENT
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20160409) unstable; urgency=low
|
||||
ncurses6 (6.0+20160416) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 08 Apr 2016 20:31:41 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Apr 2016 14:08:32 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20160409) unstable; urgency=low
|
||||
ncurses6 (6.0+20160416) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 08 Apr 2016 20:31:41 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Apr 2016 14:08:32 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20160409) unstable; urgency=low
|
||||
ncurses6 (6.0+20160416) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 08 Apr 2016 20:31:41 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Apr 2016 14:08:32 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.153 2016/04/09 00:31:41 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.154 2016/04/16 18:08:32 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "0"
|
||||
!define VERSION_YYYY "2016"
|
||||
!define VERSION_MMDD "0409"
|
||||
!define VERSION_MMDD "0416"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.0
|
||||
Release: 20160409
|
||||
Release: 20160416
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.0
|
||||
Release: 20160409
|
||||
Release: 20160416
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998-2013,2015 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -119,7 +119,7 @@ char *ttyname(int fd);
|
||||
#include <dump_entry.h>
|
||||
#include <transform.h>
|
||||
|
||||
MODULE_ID("$Id: tset.c,v 1.97 2015/11/08 01:45:47 tom Exp $")
|
||||
MODULE_ID("$Id: tset.c,v 1.98 2016/04/16 18:15:35 tom Exp $")
|
||||
|
||||
/*
|
||||
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
|
||||
@ -1210,7 +1210,7 @@ main(int argc, char **argv)
|
||||
|
||||
obsolete(argv);
|
||||
noinit = noset = quiet = Sflag = sflag = showterm = 0;
|
||||
while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:np:qQSrsVw")) != -1) {
|
||||
while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:p:qQSrsVw")) != -1) {
|
||||
switch (ch) {
|
||||
case 'c': /* set control-chars */
|
||||
opt_c = TRUE;
|
||||
@ -1236,8 +1236,6 @@ main(int argc, char **argv)
|
||||
case 'm': /* map identifier to type */
|
||||
add_mapping(0, optarg);
|
||||
break;
|
||||
case 'n': /* OBSOLETE: set new tty driver */
|
||||
break;
|
||||
case 'p': /* OBSOLETE: map identifier to type */
|
||||
add_mapping("plugboard", optarg);
|
||||
break;
|
||||
|
||||
10
test/blue.c
10
test/blue.c
@ -36,7 +36,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* $Id: blue.c,v 1.42 2016/04/09 23:55:52 tom Exp $
|
||||
* $Id: blue.c,v 1.44 2016/04/16 23:20:09 tom Exp $
|
||||
*/
|
||||
|
||||
#include <test.priv.h>
|
||||
@ -105,7 +105,7 @@ static int letters[4] =
|
||||
'c', /* clubs */
|
||||
};
|
||||
|
||||
#ifdef HAVE_LANGINFO_CODESET
|
||||
#if HAVE_LANGINFO_CODESET
|
||||
|
||||
#if HAVE_TIGETSTR
|
||||
static int glyphs[] =
|
||||
@ -202,9 +202,9 @@ printcard(int value)
|
||||
} else {
|
||||
int which = (value / SUIT_LENGTH);
|
||||
int isuit = (value % SUIT_LENGTH);
|
||||
attr_t color = COLOR_PAIR(((which % 2) == 0)
|
||||
? RED_ON_WHITE
|
||||
: BLACK_ON_WHITE);
|
||||
attr_t color = (attr_t) COLOR_PAIR(((which % 2) == 0)
|
||||
? RED_ON_WHITE
|
||||
: BLACK_ON_WHITE);
|
||||
|
||||
addch(ranks[isuit][0] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
|
||||
addch(ranks[isuit][1] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
/*
|
||||
* Author: Thomas E. Dickey 1998
|
||||
*
|
||||
* $Id: filter.c,v 1.23 2016/04/09 23:52:22 tom Exp $
|
||||
* $Id: filter.c,v 1.24 2016/04/16 22:11:03 tom Exp $
|
||||
*
|
||||
* An example of the 'filter()' function in ncurses, this program prompts
|
||||
* for commands and executes them (like a command shell). It illustrates
|
||||
@ -92,7 +92,7 @@ show_prompt(int underline, bool clocked)
|
||||
move(y, x);
|
||||
}
|
||||
}
|
||||
attron((chtype) underline);
|
||||
attron(underline);
|
||||
return limit;
|
||||
}
|
||||
|
||||
@ -251,7 +251,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
attroff((chtype) underline);
|
||||
attroff(underline);
|
||||
attroff(A_BOLD);
|
||||
printw("\n");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user