new patch: 030_fix_dialmessage

diff --git a/ckuus4.c b/ckuus4.c
index 946603a..defa68d 100644 (file)
--- a/ckuus4.c
+++ b/ckuus4.c
@@ -12681,7 +12681,9 @@ nvlook(s) char *s; {
 #ifndef NODIAL
       case VN_DMSG:
 #ifdef BIGBUFOK
 #ifndef NODIAL
       case VN_DMSG:
 #ifdef BIGBUFOK

-       ckstrncpy(vvbuf,dialmsg[dialsta],VVBUFL); /* Safe if src == NULL */
+       ckstrncpy(vvbuf,
+              ((dialsta < 0) ? "(none)" : dialmsg[dialsta]),
+              VVBUFL); /* Safe if src == NULL */

 #endif /* BIGBUFOK */
        return((char *)vvbuf);
 #endif /* NODIAL */
 #endif /* BIGBUFOK */
        return((char *)vvbuf);
 #endif /* NODIAL */

diff --git a/debian/changelog b/debian/changelog
index 73c81c7..24667b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,16 @@ ckermit (302-2) unstable; urgency=low
 
   * Fix FTBFS on hurd-i386 (Closes: #671892)
     Thanks to Svante Signell.
 
   * Fix FTBFS on hurd-i386 (Closes: #671892)
     Thanks to Svante Signell.

-  * New patch: 020_fix_ptys. Thanks to Mark Wooding (Closes: #660066).
+  * New patch: 020_fix_ptys: pull in ptsname() prototype.
+    Thanks to Mark Wooding (Closes: #660066).
+  * New patch: 030_fix_dialmessage: fix \v(dialmessage) when dialsta
+    is unset. Further thanks to Mark Wooding (Closes: #660276).

   * Fix pending l10n issues. Debconf translations:
     + Dutch; (Thanks to Jeroen Schot).  Closes: #660843
     + Polish (Thanks to Michał Kułach).  Closes: #670771
     + and thanks to Christian Perrier for his usual sterling l10n work.
 
   * Fix pending l10n issues. Debconf translations:
     + Dutch; (Thanks to Jeroen Schot).  Closes: #660843
     + Polish (Thanks to Michał Kułach).  Closes: #670771
     + and thanks to Christian Perrier for his usual sterling l10n work.
 

- -- Ian Beckwith <ianb@debian.org>  Tue, 08 May 2012 04:07:28 +0100
+ --

 
 ckermit (302-1) unstable; urgency=low
 
 
 ckermit (302-1) unstable; urgency=low
 

diff --git a/debian/patches/030_fix_dialmessage.patch b/debian/patches/030_fix_dialmessage.patch
new file mode 100644 (file)
index 0000000..3f3addf
--- /dev/null
+++ b/debian/patches/030_fix_dialmessage.patch
@@ -0,0 +1,15 @@
+Index: ckermit/ckuus4.c
+===================================================================
+--- ckermit.orig/ckuus4.c      2012-05-09 02:16:15.000000000 +0100
++++ ckermit/ckuus4.c   2012-05-09 02:16:48.000000000 +0100
+@@ -12681,7 +12681,9 @@
+ #ifndef NODIAL
+       case VN_DMSG:
+ #ifdef BIGBUFOK
+-      ckstrncpy(vvbuf,dialmsg[dialsta],VVBUFL); /* Safe if src == NULL */
++      ckstrncpy(vvbuf,
++              ((dialsta < 0) ? "(none)" : dialmsg[dialsta]),
++              VVBUFL); /* Safe if src == NULL */
+ #endif        /* BIGBUFOK */
+       return((char *)vvbuf);
+ #endif        /* NODIAL */

diff --git a/debian/patches/series b/debian/patches/series
index f698667..6f161a9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 010_multiarch-makefile.patch
 020_fix_ptys.patch
 010_multiarch-makefile.patch
 020_fix_ptys.patch

+030_fix_dialmessage.patch