[Pkg-gnupg-commit] r104 - in /gnupg/branches/lenny/debian: changelog patches/00list patches/101_321871_unset_noecho_on_sigint.dpatch

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

Author: dleidert-guest
Date: Fri May 22 15:10:00 2009
New Revision: 104

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=104
Log:
* debian/patches/101_321871_unset_noecho_on_sigint.dpatch: Added.
  - g10/signal.c (got_fatal_signal), util/ttyio.c (tty_cleanup_after_signal),
    include/ttyio.h: Cleanup terminal attributes on interrupt (#321871).

Added:
    gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch   (with props)
Modified:
    gnupg/branches/lenny/debian/changelog
    gnupg/branches/lenny/debian/patches/00list

Modified: gnupg/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/lenny/debian/changelog?rev=104&op=diff
==============================================================================
--- gnupg/branches/lenny/debian/changelog (original)
+++ gnupg/branches/lenny/debian/changelog Fri May 22 15:10:00 2009
@@ -1,9 +1,12 @@
 gnupg (1.4.9-3+lenny1) UNRELEASED; urgency=low
 
   * debian/patches/101_172115_fix_keyring_memory_leak.dpatch: Added.
-    -  g10/keyring.c (keyring_get_keyblock): Fix a memory leak due to
-       ring_trust packets, which slowed down import of large keyrings
-       leading to potential DoS (#172115, #345911).
+    - g10/keyring.c (keyring_get_keyblock): Fix a memory leak due to
+      ring_trust packets, which slowed down import of large keyrings
+      leading to potential DoS (#172115, #345911).
+  * debian/patches/101_321871_unset_noecho_on_sigint.dpatch: Added.
+    - g10/signal.c (got_fatal_signal), util/ttyio.c (tty_cleanup_after_signal),
+      include/ttyio.h: Cleanup terminal attributes on interrupt (#321871).
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 22 May 2009 16:03:39 +0200
 

Modified: gnupg/branches/lenny/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/lenny/debian/patches/00list?rev=104&op=diff
==============================================================================
--- gnupg/branches/lenny/debian/patches/00list (original)
+++ gnupg/branches/lenny/debian/patches/00list Fri May 22 15:10:00 2009
@@ -6,3 +6,4 @@
 25_fr.po_fixes
 99_yat2m_fix_samp_handling
 101_172115_fix_keyring_memory_leak
+101_321871_unset_noecho_on_sigint

Added: 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=104&op=file
==============================================================================
--- gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch (added)
+++ gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch Fri May 22 15:10:00 2009
@@ -1,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 101_321871_unset_noecho_on_sigint.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##     taken from Werner Kock (SVN upstream revision 5021)
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * g10/signal.c (got_fatal_signal): Call tty_cleanup_after_signal.
+## DP: * include/ttyio.h, util/ttyio.c (tty_cleanup_after_signal): New
+## DP:   function to cleanup terminal attributes on interrupt.
+## DP:
+## DP: <URL:http://bugs.debian.org/321871>
+## DP: <URL:https://bugs.launchpad.net/bugs/294115>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1058>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2009-May/008256.html>
+
+ at DPATCH@
+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
+@@ -88,6 +88,7 @@
+     rl_free_line_state ();
+     rl_cleanup_after_signal ();
+ #endif
++    tty_cleanup_after_signal ();
+ 
+     /* Better don't translate these messages. */
+     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
+@@ -53,5 +53,6 @@
+ #define tty_enable_completion(x)
+ #define tty_disable_completion()
+ #endif
++void tty_cleanup_after_signal (void);
+ 
+ #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
+@@ -122,6 +122,14 @@
+ }
+ #endif
+ 
++void
++tty_cleanup_after_signal (void)
++{
++#ifdef HAVE_TCGETATTR
++  cleanup ();
++#endif
++}
++
+ static void
+ init_ttyfp(void)
+ {

Propchange: gnupg/branches/lenny/debian/patches/101_321871_unset_noecho_on_sigint.dpatch
------------------------------------------------------------------------------
    svn:executable = *