03_mailcap-mime-security.dpatch 2.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. #!/bin/sh -e
  2. ## 03_mailcap-mime-security.dpatch (originally) by Tom Parker <palfrey@tevp.net>
  3. ##
  4. ## All lines beginning with `## DP:' are a description of the patch.
  5. ## DP: Fix the default config for Debian.
  6. if [ $# -lt 1 ]; then
  7. echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
  8. exit 1
  9. fi
  10. [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
  11. patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
  12. case "$1" in
  13. -patch) patch $patch_opts -p2 < $0;;
  14. -unpatch) patch $patch_opts -p2 -R < $0;;
  15. *)
  16. echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
  17. exit 1;;
  18. esac
  19. exit 0
  20. @DPATCH@
  21. diff -ur ../lynx-2.8.5~/src/LYMain.c ../lynx-2.8.5/src/LYMain.c
  22. --- ../lynx-2.8.5~/src/LYMain.c 2004-01-28 20:30:38.000000000 +0100
  23. +++ ../lynx-2.8.5/src/LYMain.c 2006-11-27 07:45:51.000000000 +0100
  24. @@ -1145,9 +1145,17 @@
  25. LYEscapeStartfile(&startfile);
  26. StrAllocCopy(indexfile, DEFAULT_INDEX_FILE);
  27. StrAllocCopy(global_type_map, GLOBAL_MAILCAP);
  28. - StrAllocCopy(personal_type_map, PERSONAL_MAILCAP);
  29. +
  30. + StrAllocCopy(personal_type_map, Home_Dir());
  31. + StrAllocCat(personal_type_map, "/");
  32. + StrAllocCat(personal_type_map, PERSONAL_MAILCAP);
  33. +
  34. StrAllocCopy(global_extension_map, GLOBAL_EXTENSION_MAP);
  35. - StrAllocCopy(personal_extension_map, PERSONAL_EXTENSION_MAP);
  36. +
  37. + StrAllocCopy(personal_extension_map, Home_Dir());
  38. + StrAllocCat(personal_extension_map, "/");
  39. + StrAllocCat(personal_extension_map, PERSONAL_EXTENSION_MAP);
  40. +
  41. StrAllocCopy(language, PREFERRED_LANGUAGE);
  42. StrAllocCopy(pref_charset, PREFERRED_CHARSET);
  43. StrAllocCopy(system_mail, SYSTEM_MAIL);
  44. diff -ur ../lynx-2.8.5~/src/LYReadCFG.c ../lynx-2.8.5/src/LYReadCFG.c
  45. --- ../lynx-2.8.5~/src/LYReadCFG.c 2004-01-28 20:30:38.000000000 +0100
  46. +++ ../lynx-2.8.5/src/LYReadCFG.c 2006-11-27 07:45:51.000000000 +0100
  47. @@ -451,6 +451,15 @@
  48. Config_Enum *table;
  49. } Config_Type;
  50. +static int set_personal_extension_map(char *value)
  51. +{
  52. + StrAllocCopy(personal_extension_map, Home_Dir());
  53. + StrAllocCat(personal_extension_map, "/");
  54. + StrAllocCat(personal_extension_map, value);
  55. + return 0;
  56. +}
  57. +
  58. +
  59. static int assume_charset_fun(char *value)
  60. {
  61. UCLYhndl_for_unspec = safeUCGetLYhndl_byMIME(value);
  62. @@ -1454,7 +1463,7 @@
  63. #ifdef USE_PERSISTENT_COOKIES
  64. PARSE_SET(RC_PERSISTENT_COOKIES, persistent_cookies),
  65. #endif /* USE_PERSISTENT_COOKIES */
  66. - PARSE_STR(RC_PERSONAL_EXTENSION_MAP, personal_extension_map),
  67. + PARSE_FUN(RC_PERSONAL_EXTENSION_MAP, set_personal_extension_map),
  68. PARSE_STR(RC_PERSONAL_MAILCAP, personal_type_map),
  69. PARSE_STR(RC_PREFERRED_CHARSET, pref_charset),
  70. PARSE_ENU(RC_PREFERRED_ENCODING, LYAcceptEncoding, tbl_preferred_encoding),