From b56ee5a0af527ee7c65f50b552f0eb89c4ba156c Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Wed, 9 May 2012 02:19:47 +0100 Subject: [PATCH] new patch: 030_fix_dialmessage --- ckuus4.c | 4 +++- debian/changelog | 7 +++++-- debian/patches/030_fix_dialmessage.patch | 15 +++++++++++++++ debian/patches/series | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 debian/patches/030_fix_dialmessage.patch diff --git a/ckuus4.c b/ckuus4.c index 946603a..defa68d 100644 --- a/ckuus4.c +++ b/ckuus4.c @@ -12681,7 +12681,9 @@ nvlook(s) char *s; { #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/changelog b/debian/changelog index 73c81c7..24667b7 100644 --- 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. - * 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. - -- Ian Beckwith Tue, 08 May 2012 04:07:28 +0100 + -- 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 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 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 010_multiarch-makefile.patch 020_fix_ptys.patch +030_fix_dialmessage.patch -- 2.11.0