From 22620fd79d1f90d417927b305798a58c9fe9c20b36e31ae4b36ce1be47717dbd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 12 Sep 2016 08:20:44 +0000 Subject: [PATCH 1/6] Accepting request 425239 from home:rhcoe:branches:Base:System fix for bnc#995148 with comments fixed OBS-URL: https://build.opensuse.org/request/show/425239 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=257 --- ncurses-6.0-signal.dif | 35 +++++++++++++++++++++++++++++++++++ ncurses.changes | 7 +++++++ ncurses.spec | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 ncurses-6.0-signal.dif diff --git a/ncurses-6.0-signal.dif b/ncurses-6.0-signal.dif new file mode 100644 index 0000000..ef15a51 --- /dev/null +++ b/ncurses-6.0-signal.dif @@ -0,0 +1,35 @@ +# bnc#995148 cscope hangs indefinitely after control-z +# recurisve macro definition of sigprocmask + +--- ncurses/tinfo/lib_data.c 2016-09-03 11:37:20.223406956 -0500 ++++ ncurses/tinfo/lib_data.c 2016-09-03 11:39:07.885069978 -0500 +@@ -371,7 +371,7 @@ _nc_sigprocmask(int how, const sigset_t + if ((pthread_sigmask)) + return pthread_sigmask(how, newmask, oldmask); + else +- return sigprocmask(how, newmask, oldmask); ++ return (sigprocmask)(how, newmask, oldmask); + } + #endif + #endif /* USE_PTHREADS */ + +--- ncurses/curses.priv.h.orig 2016-09-04 18:52:55.639691452 -0500 ++++ ncurses/curses.priv.h 2016-09-04 18:53:34.248200946 -0500 +@@ -561,7 +561,7 @@ weak_symbol(pthread_mutexattr_settype); + weak_symbol(pthread_mutexattr_init); + extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *); + # undef sigprocmask +-# define sigprocmask _nc_sigprocmask ++# define sigprocmask(a, b, c) _nc_sigprocmask(a, b, c) + # endif + #endif + +@@ -581,7 +581,7 @@ weak_symbol(pthread_self); + weak_symbol(pthread_equal); + extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *); + # undef sigprocmask +-# define sigprocmask _nc_sigprocmask ++# define sigprocmask(a, b, c) _nc_sigprocmask(a, b, c) + # endif + #endif /* USE_PTHREADS_EINTR */ + diff --git a/ncurses.changes b/ncurses.changes index 6f176ba..8eba0d9 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 5 00:14:00 UTC 2016 - rcoe@wi.rr.com + +- Add patch ncurses-6.0-signal for bnc#995148 + + redfine sigprocmask macro + + wrap sigprocmask to call system sigprocmask instead of self + ------------------------------------------------------------------- Mon Aug 15 11:55:32 UTC 2016 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 583da87..e8db2cf 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -67,6 +67,7 @@ Patch0: ncurses-6.0.dif Patch1: ncurses-5.9-ibm327x.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif +Patch6: ncurses-6.0-signal.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} @@ -281,6 +282,7 @@ mv tack-* tack %patch4 -p0 -b .hs %patch5 -p0 -b .lc %patch0 -p0 -b .p0 +%patch6 -p0 -b .p6 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh From b21c0f58a8fd4427a6a952a28994874098fe255cb2553927a9ff7ccc4855b862 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 12 Sep 2016 10:48:19 +0000 Subject: [PATCH 2/6] - Add patch ncurses-6.0-signal.dif for bnc#995148: OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=258 --- ncurses.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncurses.changes b/ncurses.changes index 8eba0d9..9a9efab 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Sep 5 00:14:00 UTC 2016 - rcoe@wi.rr.com -- Add patch ncurses-6.0-signal for bnc#995148 +- Add patch ncurses-6.0-signal.dif for bnc#995148: + redfine sigprocmask macro + wrap sigprocmask to call system sigprocmask instead of self From 7633cdb49e2278a675ba2b24754f5e3f39c958b76890cdd54c00133ccee06a1c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 12 Sep 2016 12:58:32 +0000 Subject: [PATCH 3/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=259 --- ncurses-6.0-patches.tar.bz2 | 4 +- ncurses-6.0.dif | 80 ++++++++++++++++++------------------- ncurses.changes | 48 ++++++++++++++++++++++ ncurses.spec | 2 - 4 files changed, 90 insertions(+), 44 deletions(-) diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 80b6438..6600aed 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:398346657cc4269adaceaedf258871096f914265c7f3c9b4ce2e7a3e8c259a56 -size 874293 +oid sha256:ecdf159ed89b4babebc810d28171df85b0d0a3fc7df09b21597388f6655dad5b +size 1106137 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 82a79e7..d406099 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 239 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2016-08-08 12:33:42.740866267 +0000 ++++ aclocal.m4 2016-09-12 12:57:28.319002677 +0000 @@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -4700,12 +4700,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 -@@ -4830,9 +4833,9 @@ 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 <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -11743,9 +11746,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2016-08-08 12:33:42.748866115 +0000 ++++ ncurses/curses.priv.h 2016-09-12 12:57:28.327002524 +0000 @@ -2024,6 +2024,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); @@ -795,7 +795,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 2016-08-08 12:33:42.748866115 +0000 ++++ ncurses/run_cmd.sh 2016-09-12 12:57:28.331002449 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -809,7 +809,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2016-08-08 12:33:42.748866115 +0000 ++++ ncurses/tinfo/MKfallback.sh 2016-09-12 12:57:28.331002449 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -842,7 +842,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2016-08-08 12:33:42.748866115 +0000 ++++ ncurses/tinfo/access.c 2016-09-12 12:57:28.331002449 +0000 @@ -35,6 +35,9 @@ #include @@ -885,7 +885,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2016-08-08 12:33:42.752866041 +0000 ++++ ncurses/tinfo/lib_setup.c 2016-09-12 12:57:28.331002449 +0000 @@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -897,7 +897,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2016-08-08 12:33:42.752866041 +0000 ++++ ncurses/tinfo/read_entry.c 2016-09-12 12:57:28.331002449 +0000 @@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -915,7 +915,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2016-08-08 12:33:42.752866041 +0000 ++++ ncurses/tinfo/read_termcap.c 2016-09-12 12:57:28.331002449 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -942,7 +942,7 @@ myfd = TRUE; } lineno = 0; -@@ -1117,8 +1121,10 @@ _nc_read_termcap_entry(const char *const +@@ -1118,8 +1122,10 @@ _nc_read_termcap_entry(const char *const for (i = 0; i < filecount; i++) { TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i])); @@ -953,7 +953,7 @@ _nc_set_source(termpaths[i]); /* -@@ -1130,6 +1136,7 @@ _nc_read_termcap_entry(const char *const +@@ -1131,6 +1137,7 @@ _nc_read_termcap_entry(const char *const (void) fclose(fp); } @@ -962,8 +962,8 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2016-08-08 12:33:42.752866041 +0000 -@@ -736,12 +736,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2016-09-12 12:57:28.331002449 +0000 +@@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index 9a9efab..901043e 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Mon Sep 12 12:55:25 UTC 2016 - werner@suse.de + +- Add ncurses patch 20160910 + + trim dead code ifdef'd with HIDE_EINTR since 970830 (discussion with + Leon Winter). + + trim some obsolete/incorrect wording about EINTR from wgetch manual + page (patch by Leon Winter). + + really correct 20100515 change (patch by Rich Coe). + + add "--enable-string-hacks" option to test/configure + + completed string-hacks for "sprintf", etc., including test-programs. + + make "--enable-string-hacks" work with Debian by checking for the + "bsd" library and its associated "" header. +- Add ncurses patch 20160903 + + correct 20100515 change for weak signals versus sigprocmask (report + by Rich Coe). + + modify misc/Makefile.in to work around OpenBSD "make" which unlike + all other versions of "make" does not recognize continuation lines + of comments. + + amend the last change to CF_C_ENV_FLAGS to move only the + preprocessor, optimization and warning flags to CPPFLAGS and CFLAGS, + leaving the residue in CC. That happens to work for gcc's various + "model" options, but may require tuning for other compilers (report + by Sven Joachim). +- Add ncurses patch 20160827 + + add "v" menu entry to test/ncurses.c to show baudrate and other + values. + + add "newer" baudrate symbols from Linux and FreeBSD to progs/tset.c, + lib_baudrate.c + + modify CF_XOPEN_SOURCE macro: + + add "uclinux" to case for "linux" (patch by Yann E. Morin) + + modify _GNU_SOURCE for cygwin headers, tested with cygwin 2.3, 2.5 + (patch by Corinna Vinschen, from changes to tin). + + improve CF_CC_ENV_FLAGS macro to allow for compiler wrappers such + as "ccache" (report by Enrico Scholz). + + update config.guess, config.sub from + http://git.savannah.gnu.org/cgit/config.git +- Add ncurses patch 20160820 + + update tput manual page to reflect changes to manipulate terminal + modes by sharing functions with tset. + + add the terminal-mode parts of "reset" (aka tset) to the "tput reset" + command, making the two almost the same except for window-size. + + adapt logic used in dialog "--keep-tite" option for test/filter.c as + "-a" option. When set, test/filter attempts to suppress the + alternate screen. + + correct a typo in interix entry -TD +- Drop patch ncurses-6.0-signal.dif as now upstream + ------------------------------------------------------------------- Mon Sep 5 00:14:00 UTC 2016 - rcoe@wi.rr.com diff --git a/ncurses.spec b/ncurses.spec index e8db2cf..583da87 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -67,7 +67,6 @@ Patch0: ncurses-6.0.dif Patch1: ncurses-5.9-ibm327x.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif -Patch6: ncurses-6.0-signal.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} @@ -282,7 +281,6 @@ mv tack-* tack %patch4 -p0 -b .hs %patch5 -p0 -b .lc %patch0 -p0 -b .p0 -%patch6 -p0 -b .p6 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh From 40a77d90d105ecc9cb14c3e2b0b95ffdac712ff92df26503be5c2cd6b64135b6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Sep 2016 11:52:37 +0000 Subject: [PATCH 4/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=260 --- ncurses-6.0-patches.tar.bz2 | 4 ++-- ncurses-6.0-signal.dif | 35 ----------------------------------- ncurses.changes | 7 +++++++ 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 ncurses-6.0-signal.dif diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 6600aed..9d3f3e5 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecdf159ed89b4babebc810d28171df85b0d0a3fc7df09b21597388f6655dad5b -size 1106137 +oid sha256:b133dd9fc1f8a9e969c81dfbd127ad29b5e8ff86eb7197db4ee88d189c2aa2f7 +size 1109513 diff --git a/ncurses-6.0-signal.dif b/ncurses-6.0-signal.dif deleted file mode 100644 index ef15a51..0000000 --- a/ncurses-6.0-signal.dif +++ /dev/null @@ -1,35 +0,0 @@ -# bnc#995148 cscope hangs indefinitely after control-z -# recurisve macro definition of sigprocmask - ---- ncurses/tinfo/lib_data.c 2016-09-03 11:37:20.223406956 -0500 -+++ ncurses/tinfo/lib_data.c 2016-09-03 11:39:07.885069978 -0500 -@@ -371,7 +371,7 @@ _nc_sigprocmask(int how, const sigset_t - if ((pthread_sigmask)) - return pthread_sigmask(how, newmask, oldmask); - else -- return sigprocmask(how, newmask, oldmask); -+ return (sigprocmask)(how, newmask, oldmask); - } - #endif - #endif /* USE_PTHREADS */ - ---- ncurses/curses.priv.h.orig 2016-09-04 18:52:55.639691452 -0500 -+++ ncurses/curses.priv.h 2016-09-04 18:53:34.248200946 -0500 -@@ -561,7 +561,7 @@ weak_symbol(pthread_mutexattr_settype); - weak_symbol(pthread_mutexattr_init); - extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *); - # undef sigprocmask --# define sigprocmask _nc_sigprocmask -+# define sigprocmask(a, b, c) _nc_sigprocmask(a, b, c) - # endif - #endif - -@@ -581,7 +581,7 @@ weak_symbol(pthread_self); - weak_symbol(pthread_equal); - extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *); - # undef sigprocmask --# define sigprocmask _nc_sigprocmask -+# define sigprocmask(a, b, c) _nc_sigprocmask(a, b, c) - # endif - #endif /* USE_PTHREADS_EINTR */ - diff --git a/ncurses.changes b/ncurses.changes index 901043e..6fb82f4 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 19 06:52:26 UTC 2016 - werner@suse.de + +- Add ncurses patch 20160917 + + build-fix for gnat6, which unhelpfully attempts to compile C files. + + fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim). + ------------------------------------------------------------------- Mon Sep 12 12:55:25 UTC 2016 - werner@suse.de From 60647efba2f57d8b38e828948a1b42a9c22b32743bbf030a9b9a4f1d0d5dda24 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Sep 2016 12:24:39 +0000 Subject: [PATCH 5/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=261 --- ncurses.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ncurses.spec b/ncurses.spec index 583da87..01aebe4 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -261,7 +261,6 @@ Authors: %prep %setup -q rm -f Ada95/src/terminal_interface-curses.adb -rm -f Ada95/src/library.gpr rm -f mkinstalldirs tar xfj %{S:1} set +x From e8d16c3857524cbfd905a7758869c75dd694f108ad86b86d1cd22eb42fe8c1c9 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 26 Sep 2016 11:15:32 +0000 Subject: [PATCH 6/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=262 --- ncurses-6.0-patches.tar.bz2 | 4 ++-- ncurses.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 9d3f3e5..5d385fe 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b133dd9fc1f8a9e969c81dfbd127ad29b5e8ff86eb7197db4ee88d189c2aa2f7 -size 1109513 +oid sha256:4c928c91af17e9d34ff30860efeec9071b9cc525d55820118f1d17bb2fe2e9f5 +size 1116491 diff --git a/ncurses.changes b/ncurses.changes index 6fb82f4..8b9c9b0 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 26 11:13:35 UTC 2016 - werner@suse.de + +- Add ncurses patch 20160924 + + modify _nc_tic_expand to escape comma if it immediately follows a + percent sign, to work with minitel change. + + updated minitel and viewdata descriptions (Alexandre Montaron). + ------------------------------------------------------------------- Mon Sep 19 06:52:26 UTC 2016 - werner@suse.de