diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 22a8f99..eb6f99d 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d9cc452df795d4f87bd57bcb53fedbae97ef0b3cb89278e4069fba6e6cafef -size 2280232 +oid sha256:a5b5257f3e447fba05623dd8c4a88dca3bc7ab6d5e2362b0131e1e5a89ede7cd +size 2338714 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index c8558cd..3cc3358 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -22,7 +22,7 @@ 20 files changed, 233 insertions(+), 70 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2021-03-25 07:31:47.855523893 +0000 ++++ aclocal.m4 2021-05-03 07:10:26.872868212 +0000 @@ -639,7 +639,7 @@ AC_CHECK_SIZEOF(bool,,[ AC_CACHE_CHECK(for type of bool, cf_cv_type_of_bool,[ rm -f cf_test.out @@ -32,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -5637,12 +5637,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -5767,9 +5770,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <&6 +@@ -7451,7 +7451,7 @@ echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then cf_with_pcre2_ok=no @@ -170,7 +170,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -14481,12 +14481,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -14611,9 +14614,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/curses.priv.h 2021-05-03 07:10:26.876868138 +0000 @@ -2277,6 +2277,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); @@ -681,7 +681,7 @@ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); --- ncurses/run_cmd.sh -+++ ncurses/run_cmd.sh 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/run_cmd.sh 2021-05-03 07:10:26.876868138 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -695,7 +695,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/tinfo/MKfallback.sh 2021-05-03 07:10:26.876868138 +0000 @@ -74,6 +74,12 @@ else tmp_info= fi @@ -728,7 +728,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/tinfo/access.c 2021-05-03 07:10:26.876868138 +0000 @@ -31,6 +31,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -772,7 +772,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/tinfo/lib_setup.c 2021-05-03 07:10:26.876868138 +0000 @@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -784,7 +784,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/tinfo/read_entry.c 2021-05-03 07:10:26.876868138 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -802,7 +802,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2021-03-25 07:31:47.867523668 +0000 ++++ ncurses/tinfo/read_termcap.c 2021-05-03 07:10:26.880868063 +0000 @@ -323,14 +323,18 @@ _nc_getent( */ if (fd >= 0) { @@ -849,7 +849,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2021-03-25 07:31:47.867523668 +0000 ++++ progs/Makefile.in 2021-05-03 07:10:26.880868063 +0000 @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE @@ -869,7 +869,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2021-03-25 07:31:47.867523668 +0000 ++++ test/test.priv.h 2021-05-03 07:10:26.880868063 +0000 @@ -1037,12 +1037,12 @@ extern char *_nc_strstr(const char *, co #endif @@ -886,7 +886,7 @@ #define CANCELLED_STRING (char *)(-1) --- test/tracemunch -+++ test/tracemunch 2021-03-25 07:31:47.867523668 +0000 ++++ test/tracemunch 2021-05-03 07:10:26.880868063 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/ncurses.changes b/ncurses.changes index b4236c5..d15dc0f 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon May 3 07:08:48 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210501 + + add a special case in the configure script to work around one of the + build-time breakages reported for OpenBSD 6 here: + https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + There is no workaround for the other issue, a broken linker spec. + + modify configure check for libtool to prevent accidental use of an + OpenBSD program which uses the same name. + + update config.guess, config.sub +- Correct offsets of patch ncurses-6.2.dif + ------------------------------------------------------------------- Mon Apr 26 07:02:43 UTC 2021 - Dr. Werner Fink