[devel] mtools-4.0.10-alt1: Sisyphus/i586 test rebuild failed

[Michael Shigorin]

On Mon, Jul 20, 2009 at 01:05:03PM +0300, I wrote:
> On Mon, Jul 20, 2009 at 01:56:59PM +0400, QA Team Robot wrote:
> > Package: mtools-4.0.10-alt1
> > Status: Sisyphus/i586 test rebuild failed
> Приму помощь в исправлении mtools (берусь отнести патч апстриму),
> иначе пакет естественным образом останется без майнтейнера.

Ладно, костыль я туда положил.  А теперь объясните мне кто-нить
понимающий, почему исходный патч-то не проконал?  Он логичней.

> > In file included from /usr/include/string.h:658,
> >                  from sysincludes.h:264,
> >                  from mlabel.c:22:
> > In function 'strcpy',
> >     inlined from 'label_name' at mlabel.c:38:
> > /usr/include/bits/string3.h:106: error: call to __builtin___strcpy_chk will always overflow destination buffer
> > make: Leaving directory `/usr/src/RPM/BUILD/mtools-4.0.10'
> > make: *** [mlabel.o] Error 1
> 

-- 
 ---- WBR, Michael Shigorin <mike at altlinux.ru>
  ------ Linux.Kiev http://www.linux.kiev.ua/
-------------- next part --------------
diff -Naur mtools-4.0.10-orig/file_name.h mtools-4.0.10/file_name.h
--- mtools-4.0.10-orig/file_name.h	2009-02-19 22:41:14 +0200
+++ mtools-4.0.10/file_name.h	2009-07-20 13:42:26 +0300
@@ -26,8 +26,8 @@
  * MYFILE  TXT
  */
 struct dos_name_t {
-  char base[8];
-  char ext[3];
+  char base[9];
+  char ext[4];
   char sentinel;
 };
 
diff -Naur mtools-4.0.10-orig/mlabel.c mtools-4.0.10/mlabel.c
--- mtools-4.0.10-orig/mlabel.c	2009-03-03 08:10:11 +0200
+++ mtools-4.0.10/mlabel.c	2009-07-20 13:34:02 +0300
@@ -35,7 +35,8 @@
 	int have_lower, have_upper;
 	wchar_t wbuffer[12];
 
-	strcpy(ans->base,"           ");
+	strcpy(ans->base,"        ");
+	strcpy(ans->ext,"   ");
 	len = native_to_wchar(filename, wbuffer, 11, 0, 0);
 	if(len > 11){
 		*mangled = 1;
-------------- next part --------------
diff -Naur mtools-4.0.10-orig/mlabel.c mtools-4.0.10/mlabel.c
--- mtools-4.0.10-orig/mlabel.c	2009-03-03 08:10:11 +0200
+++ mtools-4.0.10/mlabel.c	2009-07-20 13:34:02 +0300
@@ -35,7 +35,8 @@
 	int have_lower, have_upper;
 	wchar_t wbuffer[12];
 
-	strcpy(ans->base,"           ");
+	strcpy(ans->base,"        ");
+	strcpy(ans->ext,"   ");
 	len = native_to_wchar(filename, wbuffer, 11, 0, 0);
 	if(len > 11){
 		*mangled = 1;