200-manpages.patch 3.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. diff -Naur postfix-2.10.2/conf/post-install postfix-2.10.2_patched/conf/post-install
  2. --- postfix-2.10.2/conf/post-install 2013-06-13 18:07:46.000000000 +0400
  3. +++ postfix-2.10.2_patched/conf/post-install 2013-11-19 21:17:49.572820573 +0400
  4. @@ -361,10 +361,10 @@
  5. # Sanity checks
  6. -case $manpage_directory in
  7. - no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
  8. - echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
  9. -esac
  10. +#case $manpage_directory in
  11. +# no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
  12. +# echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
  13. +#esac
  14. case $setgid_group in
  15. no) echo $0: Error: setgid_group no longer accepts \"no\" values. 1>&2
  16. @@ -372,7 +372,7 @@
  17. esac
  18. for path in "$daemon_directory" "$command_directory" "$queue_directory" \
  19. - "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
  20. + "$sendmail_path" "$newaliases_path" "$mailq_path" \
  21. "$meta_directory"
  22. do
  23. case "$path" in
  24. @@ -381,7 +381,7 @@
  25. esac
  26. done
  27. -for path in "$html_directory" "$readme_directory" "$shlib_directory"
  28. +for path in "$html_directory" "$readme_directory" "$shlib_directory" "$manpage_directory"
  29. do
  30. case "$path" in
  31. /*) ;;
  32. diff -Naur postfix-2.10.2/postfix-install postfix-2.10.2_patched/postfix-install
  33. --- postfix-2.10.2/postfix-install 2012-05-22 23:40:29.000000000 +0400
  34. +++ postfix-2.10.2_patched/postfix-install 2013-11-19 21:12:20.694160734 +0400
  35. @@ -554,13 +554,13 @@
  36. exit 1;;
  37. esac
  38. -case "$manpage_directory" in
  39. - no) (echo $0: Error: the manpage_directory parameter no longer accepts
  40. - echo \"no\" values. Try again with \"manpage_directory=/path/name\"
  41. - echo on the command line or execute \"make install\" and specify
  42. - echo manpage_directory interactively.) | ${FMT} 1>&2
  43. - exit 1;;
  44. -esac
  45. +#case "$manpage_directory" in
  46. +# no) (echo $0: Error: the manpage_directory parameter no longer accepts
  47. +# echo \"no\" values. Try again with \"manpage_directory=/path/name\"
  48. +# echo on the command line or execute \"make install\" and specify
  49. +# echo manpage_directory interactively.) | ${FMT} 1>&2
  50. +# exit 1;;
  51. +#esac
  52. for path in "$html_directory" "$readme_directory" "$shlib_directory"
  53. do
  54. @@ -573,7 +573,7 @@
  55. done
  56. for path in "$daemon_directory" "$data_directory" "$command_directory" "$queue_directory" \
  57. - "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
  58. + "$sendmail_path" "$newaliases_path" "$mailq_path" \
  59. "$meta_directory"
  60. do
  61. case "$path" in
  62. @@ -780,8 +780,8 @@
  63. compare_or_replace $mode "$owner" "$group" html/$file \
  64. $HTML_DIRECTORY/$file || exit 1;;
  65. '$manpage_directory')
  66. - check_parent $MANPAGE_DIRECTORY/$file || exit 1
  67. - compare_or_replace $mode "$owner" "$group" man/$file \
  68. + test "$manpage_directory" = "no" || check_parent $MANPAGE_DIRECTORY/$file || exit 1
  69. + test "$manpage_directory" = "no" || compare_or_replace $mode "$owner" "$group" man/$file \
  70. $MANPAGE_DIRECTORY/$file || exit 1;;
  71. '$readme_directory')
  72. test "$readme_directory" = "no" ||