diff --git a/.gitignore b/.gitignore index 0d04370..9ec853d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/ncurses-6.1-20180224.tgz +/ncurses-6.1-20180714.tgz diff --git a/ncurses-config.patch b/ncurses-config.patch index b494768..4fcc35b 100644 --- a/ncurses-config.patch +++ b/ncurses-config.patch @@ -1,6 +1,6 @@ -diff -up ncurses-6.1-20180127/misc/ncurses-config.in.config ncurses-6.1-20180127/misc/ncurses-config.in ---- ncurses-6.1-20180127/misc/ncurses-config.in.config 2017-12-09 23:45:44.000000000 +0100 -+++ ncurses-6.1-20180127/misc/ncurses-config.in 2018-01-29 10:57:48.596590822 +0100 +diff -up ncurses-6.1-20180714/misc/ncurses-config.in.config ncurses-6.1-20180714/misc/ncurses-config.in +--- ncurses-6.1-20180714/misc/ncurses-config.in.config 2018-06-10 00:29:01.000000000 +0200 ++++ ncurses-6.1-20180714/misc/ncurses-config.in 2018-07-16 16:23:22.202581815 +0200 @@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@" bindir="@bindir@" @@ -9,20 +9,16 @@ diff -up ncurses-6.1-20180127/misc/ncurses-config.in.config ncurses-6.1-20180127 datarootdir="@datarootdir@" datadir="@datadir@" mandir="@mandir@" -@@ -111,12 +110,7 @@ while test $# -gt 0; do +@@ -111,7 +110,7 @@ while test $# -gt 0; do ENDECHO ;; --libs) - if test "$libdir" = /usr/lib -- then ++ if true + then LIBDIR= -- else -- LIBDIR=-L$libdir -- fi - if test @TINFO_NAME@ = @LIB_NAME@ ; then - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO - $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ -@@ -154,7 +148,6 @@ ENDECHO + else +@@ -155,7 +154,6 @@ ENDECHO echo $INCS ;; --libdir) diff --git a/ncurses-usecap.patch b/ncurses-usecap.patch deleted file mode 100644 index 52079b4..0000000 --- a/ncurses-usecap.patch +++ /dev/null @@ -1,22 +0,0 @@ -20180414 - + add a null-pointer check in _nc_parse_entry to handle an error when - a use-name is invalid syntax (report by Chung-Yi Lin). - -diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c -index 2b54f45d..437f1223 100644 ---- a/ncurses/tinfo/parse_entry.c -+++ b/ncurses/tinfo/parse_entry.c -@@ -543,9 +543,11 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) - * Otherwise, look for a base entry that will already - * have picked up defaults via translation. - */ -- for (i = 0; i < entryp->nuses; i++) -- if (!strchr((char *) entryp->uses[i].name, '+')) -+ for (i = 0; i < entryp->nuses; i++) { -+ if (entryp->uses[i].name != 0 -+ && !strchr(entryp->uses[i].name, '+')) - has_base_entry = TRUE; -+ } - } - - postprocess_termcap(&entryp->tterm, has_base_entry); diff --git a/ncurses.spec b/ncurses.spec index 4101fde..2bf67ed 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,4 +1,4 @@ -%global revision 20180224 +%global revision 20180714 Summary: Ncurses support utilities Name: ncurses Version: 6.1 @@ -8,7 +8,6 @@ Group: System Environment/Base URL: https://invisible-island.net/ncurses/ncurses.html Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{version}-%{revision}.tgz -Patch1: ncurses-usecap.patch Patch8: ncurses-config.patch Patch9: ncurses-libs.patch Patch11: ncurses-urxvt.patch @@ -122,7 +121,6 @@ The ncurses-static package includes static libraries of the ncurses library. %prep %setup -q -n %{name}-%{version}-%{revision} -%patch1 -p1 -b .usecap %patch8 -p1 -b .config %patch9 -p1 -b .libs %patch11 -p1 -b .urxvt diff --git a/sources b/sources index 635b553..592b198 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ncurses-6.1-20180224.tgz) = 26a0b8a88e965fa4089a48cd0af46b0ffa90d621a7d207c5c09c8cbd60f2cf073953c64ad109469bef9f52e5137067924148c33880cdd2161024a6e42ea4607d +SHA512 (ncurses-6.1-20180714.tgz) = ecac10957134288dc5af6d155f74f5158e278ae2cee39d5e512d82a24289061c87ba5065cb68d1de2858d84db1886e6b817e8a2d1933295cc58502eca5bf1c9d