[Pkg-gnupg-commit] r109 - /gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Fri May 29 16:20:07 2009
New Revision: 109

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=109
Log:
* debian/patches/101_321871_unset_noecho_on_sigint.dpatch: Fixed.
  - Upstream patch is incomplete and leads to an FTBFS for us. This hopefully
    fixes the failure.


Modified:
    gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch

Modified: gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch?rev=109&op=diff
==============================================================================
--- gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch (original)
+++ gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch Fri May 29 16:20:07 2009
@@ -12,9 +12,20 @@
 ## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2009-May/008256.html>
 
 @DPATCH@
+diff -urNad lenny~/g10/gpgv.c lenny/g10/gpgv.c
+--- lenny~/g10/gpgv.c	2007-10-23 09:50:34.000000000 +0200
++++ lenny/g10/gpgv.c	2009-05-29 18:04:54.000000000 +0200
+@@ -417,6 +417,7 @@
+ void tty_kill_prompt(void) {}
+ int tty_get_answer_is_yes( const char *prompt ) {return 0;}
+ int tty_no_terminal(int onoff) {return 0;}
++void tty_cleanup_after_signal (void) {}
+ #ifdef HAVE_LIBREADLINE
+ void tty_enable_completion(rl_completion_func_t *completer) {}
+ void tty_disable_completion(void) {}
 diff -urNad lenny~/g10/signal.c lenny/g10/signal.c
 --- lenny~/g10/signal.c	2007-10-23 09:50:34.000000000 +0200
-+++ lenny/g10/signal.c	2009-05-22 16:59:35.000000000 +0200
++++ lenny/g10/signal.c	2009-05-29 18:03:28.000000000 +0200
 @@ -88,6 +88,7 @@
      rl_free_line_state ();
      rl_cleanup_after_signal ();
@@ -25,7 +36,7 @@
      write(2, "\n", 1 );
 diff -urNad lenny~/include/ttyio.h lenny/include/ttyio.h
 --- lenny~/include/ttyio.h	2007-10-23 10:47:28.000000000 +0200
-+++ lenny/include/ttyio.h	2009-05-22 16:59:35.000000000 +0200
++++ lenny/include/ttyio.h	2009-05-29 18:03:28.000000000 +0200
 @@ -53,5 +53,6 @@
  #define tty_enable_completion(x)
  #define tty_disable_completion()
@@ -35,7 +46,7 @@
  #endif /*G10_TTYIO_H*/
 diff -urNad lenny~/util/ttyio.c lenny/util/ttyio.c
 --- lenny~/util/ttyio.c	2007-10-23 09:55:31.000000000 +0200
-+++ lenny/util/ttyio.c	2009-05-22 16:59:35.000000000 +0200
++++ lenny/util/ttyio.c	2009-05-29 18:03:28.000000000 +0200
 @@ -122,6 +122,14 @@
  }
  #endif