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