uudeview-0.5.20-bugfixes.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101
  1. +uudeview (0.5.20-3) unstable; urgency=low
  2. +
  3. + * Ack NMU. (closes: Bug#373630)
  4. + * Don't force overwrite mode if auto-rename enabled. (closes: Bug#378076)
  5. + * Don't ignore special chars when parsing MIME. (closes: Bug#341440)
  6. + * Fix for #320541 also fixes #242999. (closes: Bug#242999)
  7. + * Incorporate suspicious-file patch from Peter Muir. (closes: Bug#166077)
  8. ...
  9. + -- Chris Hanson <cph@debian.org> Tue, 15 Aug 2006 00:40:50 -0400
  10. Index: uudeview-0.5.20/unix/uudeview.c
  11. ===================================================================
  12. --- uudeview-0.5.20.orig/unix/uudeview.c
  13. +++ uudeview-0.5.20/unix/uudeview.c
  14. @@ -657,9 +657,6 @@ work_comline (int argc, char *argv[])
  15. else switch (*(argv[number] + 1)) {
  16. case '\0':
  17. interact = 0;
  18. - if (overwrite == 0) {
  19. - overwrite = 1;
  20. - }
  21. proc_stdin ();
  22. break;
  23. case 'a':
  24. @@ -699,10 +696,7 @@ work_comline (int argc, char *argv[])
  25. fprintf (stderr, "WARNING: cannot interact when reading from stdin\n");
  26. }
  27. else {
  28. - interact = (*argv[number] == '+') ? 1 : 0;
  29. - if (overwrite == 0 && *argv[number] == '-') {
  30. - overwrite = 1;
  31. - }
  32. + interact = (*argv[number] == '+') ? 1 : 0;
  33. }
  34. break;
  35. case 'm':
  36. @@ -773,6 +767,8 @@ work_comline (int argc, char *argv[])
  37. break;
  38. }
  39. }
  40. + if (overwrite == 0 && interact == 0 && autoren == 0)
  41. + overwrite = 1;
  42. return 1;
  43. }
  44. Index: uudeview-0.5.20/uulib/uunconc.c
  45. ===================================================================
  46. --- uudeview-0.5.20.orig/uulib/uunconc.c
  47. +++ uudeview-0.5.20/uulib/uunconc.c
  48. @@ -1437,6 +1437,9 @@ UUDecode (uulist *data)
  49. res = UURET_IOERR;
  50. break;
  51. }
  52. + UUMessage (uunconc_id, __LINE__, UUMSG_MESSAGE,
  53. + uustring (S_OPEN_FILE),
  54. + iter->data->sfname);
  55. _FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024);
  56. }
  57. Index: uudeview-0.5.20/uulib/uuscan.c
  58. ===================================================================
  59. --- uudeview-0.5.20.orig/uulib/uuscan.c
  60. +++ uudeview-0.5.20/uulib/uuscan.c
  61. @@ -387,10 +387,10 @@ ParseValue (char *attribute)
  62. *attribute != '(' && *attribute != ')' &&
  63. *attribute != '<' && *attribute != '>' &&
  64. *attribute != '@' && *attribute != ',' &&
  65. - /* *attribute != ';' && */ *attribute != ':' &&
  66. - *attribute != '\\' &&*attribute != '"' &&
  67. - *attribute != '/' && /* *attribute != '[' &&
  68. - *attribute != ']' && */ *attribute != '?' &&
  69. + *attribute != ';' && *attribute != ':' &&
  70. + *attribute != '\\' && *attribute != '"' &&
  71. + *attribute != '/' && *attribute != '[' &&
  72. + *attribute != ']' && *attribute != '?' &&
  73. *attribute != '=' && length < 255) {
  74. *ptr++ = *attribute++;
  75. length++;
  76. Index: uudeview-0.5.20/uulib/uustring.c
  77. ===================================================================
  78. --- uudeview-0.5.20.orig/uulib/uustring.c
  79. +++ uudeview-0.5.20/uulib/uustring.c
  80. @@ -107,6 +107,7 @@ static stringmap messages[] = {
  81. { S_MIME_B_NOT_FOUND, "Boundary expected on Multipart message but found EOF" },
  82. { S_MIME_MULTI_DEPTH, "Multipart message nested too deep" },
  83. { S_MIME_PART_MULTI, "Handling partial multipart message as plain text" },
  84. + { S_OPEN_FILE, "Opened file %s" },
  85. { 0, "" }
  86. };
  87. Index: uudeview-0.5.20/uulib/uustring.h
  88. ===================================================================
  89. --- uudeview-0.5.20.orig/uulib/uustring.h
  90. +++ uudeview-0.5.20/uulib/uustring.h
  91. @@ -36,3 +36,4 @@
  92. #define S_MIME_B_NOT_FOUND 35
  93. #define S_MIME_MULTI_DEPTH 36
  94. #define S_MIME_PART_MULTI 37
  95. +#define S_OPEN_FILE 38