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
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
The mbox.5 file is provided by both mutt and qmail. The version provided
by mutt is a generic description of the mbox format. The qmail version
has specific information about qmail's mbox format. Hence, we rename it
to qmail-mbox.5.
diff -Nau netqmail-1.06-orig/FILES netqmail-1.06/FILES
--- netqmail-1.06-orig/FILES 2007-11-30 14:22:54.000000000 -0600
+++ netqmail-1.06/FILES 2023-12-01 20:05:06.120121122 -0600
@@ -67,7 +67,6 @@
maildirmake.1
maildirwatch.1
mailsubj.1
-mbox.5
preline.1
qbiff.1
qmail-clean.8
@@ -80,6 +79,7 @@
qmail-local.8
qmail-log.5
qmail-lspawn.8
+qmail-mbox.5
qmail-newmrh.9
qmail-newu.9
qmail-pop3d.8
diff -Nau netqmail-1.06-orig/Makefile netqmail-1.06/Makefile
--- netqmail-1.06-orig/Makefile 2023-12-01 20:02:18.368178573 -0600
+++ netqmail-1.06/Makefile 2023-12-01 20:06:17.272462017 -0600
@@ -952,12 +952,12 @@
preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
-qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
+qmail-command.0 tcp-environ.0 maildir.0 qmail-mbox.0 addresses.0 \
envelopes.0 forgeries.0
-mbox.0: \
-mbox.5
- nroff -man mbox.5 > mbox.0
+qmail-mbox.0: \
+qmail-mbox.5
+ nroff -man qmail-mbox.5 > qmail-mbox.0
myctime.o: \
compile myctime.c datetime.h fmt.h myctime.h
@@ -1783,7 +1783,7 @@
auto_patrn.h conf-users conf-groups auto_uids.h auto_usera.h extra.h \
addresses.5 except.1 bouncesaying.1 condredirect.1 dot-qmail.9 \
envelopes.5 forgeries.7 forward.1 maildir2mbox.1 maildirmake.1 \
-maildirwatch.1 mailsubj.1 mbox.5 preline.1 qbiff.1 qmail-clean.8 \
+maildirwatch.1 mailsubj.1 qmail-mbox.5 preline.1 qbiff.1 qmail-clean.8 \
qmail-command.8 qmail-control.9 qmail-getpw.9 qmail-header.5 \
qmail-inject.8 qmail-limits.9 qmail-local.8 qmail-log.5 \
qmail-lspawn.8 qmail-newmrh.9 qmail-newu.9 qmail-pop3d.8 \
diff -Nau netqmail-1.06-orig/Makefile.orig netqmail-1.06/Makefile.orig
--- netqmail-1.06-orig/Makefile.orig 2023-12-01 20:02:18.368178573 -0600
+++ netqmail-1.06/Makefile.orig 2023-12-01 20:06:58.588015563 -0600
@@ -952,12 +952,12 @@
preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
-qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
+qmail-command.0 tcp-environ.0 maildir.0 qmail-mbox.0 addresses.0 \
envelopes.0 forgeries.0
-mbox.0: \
-mbox.5
- nroff -man mbox.5 > mbox.0
+qmail-mbox.0: \
+qmail-mbox.5
+ nroff -man qmail-mbox.5 > qmail-mbox.0
myctime.o: \
compile myctime.c datetime.h fmt.h myctime.h
@@ -1783,7 +1783,7 @@
auto_patrn.h conf-users conf-groups auto_uids.h auto_usera.h extra.h \
addresses.5 except.1 bouncesaying.1 condredirect.1 dot-qmail.9 \
envelopes.5 forgeries.7 forward.1 maildir2mbox.1 maildirmake.1 \
-maildirwatch.1 mailsubj.1 mbox.5 preline.1 qbiff.1 qmail-clean.8 \
+maildirwatch.1 mailsubj.1 qmail-mbox.5 preline.1 qbiff.1 qmail-clean.8 \
qmail-command.8 qmail-control.9 qmail-getpw.9 qmail-header.5 \
qmail-inject.8 qmail-limits.9 qmail-local.8 qmail-log.5 \
qmail-lspawn.8 qmail-newmrh.9 qmail-newu.9 qmail-pop3d.8 \
diff -Nau netqmail-1.06-orig/dot-qmail.9 netqmail-1.06/dot-qmail.9
--- netqmail-1.06-orig/dot-qmail.9 2007-11-30 14:52:30.000000000 -0600
+++ netqmail-1.06/dot-qmail.9 2023-12-01 20:04:47.292147838 -0600
@@ -115,7 +115,7 @@
stores the mail message in
.I mbox
format, as described in
-.BR mbox(5) .
+.BR qmail-mbox(5) .
.B WARNING:
On many systems,
@@ -386,7 +386,7 @@
.SH "SEE ALSO"
envelopes(5),
maildir(5),
-mbox(5),
+qmail-mbox(5),
qmail-users(5),
qmail-local(8),
qmail-command(8),
diff -Nau netqmail-1.06-orig/hier.c netqmail-1.06/hier.c
--- netqmail-1.06-orig/hier.c 2023-12-01 20:02:18.368178573 -0600
+++ netqmail-1.06/hier.c 2023-12-01 20:04:22.854778368 -0600
@@ -166,8 +166,8 @@
c(base_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
c(base_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
c(base_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
- c(base_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
- c(base_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
+ c(base_qmail,"man/man5","qmail-mbox.5",auto_uido,auto_gidq,0644);
+ c(base_qmail,"man/cat5","qmail-mbox.0",auto_uido,auto_gidq,0644);
c(base_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
c(base_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
c(base_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
diff -Nau netqmail-1.06-orig/install-big.c netqmail-1.06/install-big.c
--- netqmail-1.06-orig/install-big.c 1998-06-15 05:53:16.000000000 -0500
+++ netqmail-1.06/install-big.c 2023-12-01 20:05:20.048621806 -0600
@@ -150,8 +150,8 @@
c(auto_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
c(auto_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
c(auto_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
- c(auto_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
- c(auto_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
+ c(auto_qmail,"man/man5","qmail-mbox.5",auto_uido,auto_gidq,0644);
+ c(auto_qmail,"man/cat5","qmail-mbox.0",auto_uido,auto_gidq,0644);
c(auto_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
c(auto_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
c(auto_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
diff -Nau netqmail-1.06-orig/maildir.5 netqmail-1.06/maildir.5
--- netqmail-1.06-orig/maildir.5 1998-06-15 05:53:16.000000000 -0500
+++ netqmail-1.06/maildir.5 2023-12-01 20:06:32.630809068 -0600
@@ -235,5 +235,5 @@
environment variable
as the name of the user's primary mail directory.
.SH "SEE ALSO"
-mbox(5),
+qmail-mbox(5),
qmail-local(8)
diff -Nau netqmail-1.06-orig/mbox.5 netqmail-1.06/mbox.5
--- netqmail-1.06-orig/mbox.5 1998-06-15 05:53:16.000000000 -0500
+++ netqmail-1.06/mbox.5 2023-12-01 20:06:23.661774312 -0600
@@ -1,4 +1,4 @@
-.TH mbox 5
+.TH qmail-mbox 5
.SH "NAME"
mbox \- file containing mail messages
.SH "INTRODUCTION"
Common subdirectories: netqmail-1.06-orig/old-patches and netqmail-1.06/old-patches
Common subdirectories: netqmail-1.06-orig/other-patches and netqmail-1.06/other-patches
diff -Nau netqmail-1.06-orig/preline.1 netqmail-1.06/preline.1
--- netqmail-1.06-orig/preline.1 1998-06-15 05:53:16.000000000 -0500
+++ netqmail-1.06/preline.1 2023-12-01 20:05:28.147749986 -0600
@@ -53,5 +53,5 @@
.B Return-Path
line.
.SH "SEE ALSO"
-mbox(5),
+qmail-mbox(5),
qmail-command(8)
|