diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2009-10-12 15:28:22 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2009-10-12 15:28:22 +0000 |
| commit | 484e14b4223561d391f98a0a953dd2b2000ebf8c (patch) | |
| tree | be403c36b5432761454fbe011530fbb8580a7783 | |
| parent | 53ec0f4e53b42181cc8fe8398ee2edeac5c05d5c (diff) | |
| download | ports-484e14b4223561d391f98a0a953dd2b2000ebf8c.tar.gz ports-484e14b4223561d391f98a0a953dd2b2000ebf8c.zip | |
- Fix SIGINT signal handling.
PR: ports/136804
Submitted by: Emiel van de Laar <gemiel@gmail.com>
Obtained from: ruby-lang SVN
Notes
Notes:
svn path=/head/; revision=242736
| -rw-r--r-- | Mk/bsd.ruby.mk | 2 | ||||
| -rw-r--r-- | lang/ruby19/files/patch-ext_readline_readline.c | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index eb00a95d61bd..927694d6bd64 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -198,7 +198,7 @@ RUBY19= "@comment " # Ruby 1.9 # RUBY_RELVERSION= 1.9.1 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 243 diff --git a/lang/ruby19/files/patch-ext_readline_readline.c b/lang/ruby19/files/patch-ext_readline_readline.c new file mode 100644 index 000000000000..2f0403124c23 --- /dev/null +++ b/lang/ruby19/files/patch-ext_readline_readline.c @@ -0,0 +1,21 @@ +Index: trunk/ext/readline/readline.c +=================================================================== +--- ext/readline/readline.c (revision 24139) ++++ ext/readline/readline.c (revision 24140) +@@ -253,6 +253,7 @@ + if (status) { + #if defined HAVE_RL_CLEANUP_AFTER_SIGNAL + /* restore terminal mode and signal handler*/ ++ rl_free_line_state(); + rl_cleanup_after_signal(); + #elif defined HAVE_RL_DEPREP_TERM_FUNCTION + /* restore terminal mode */ +@@ -1450,6 +1451,8 @@ + #elif defined HAVE_RL_EVENT_HOOK + rl_event_hook = readline_event; + #endif ++ rl_catch_signals = 0; ++ rl_catch_sigwinch = 0; + #ifdef HAVE_RL_CLEAR_SIGNALS + rl_clear_signals(); + #endif |