rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 425239 from home:rhcoe:branches:Base:System

Browse Source 
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
This commit is contained in:
Dirk Mueller 2016-09-12 08:20:44 +00:00 committed by Git OBS Bridge
parent 061bbd8974
commit 22620fd79d
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ncurses-6.0-signal.dif Normal file
View File

@ -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 */

7
ncurses.changes
View File

@ -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

2
ncurses.spec
View File

@ -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