user/netqmail: Rename mbox.5 to qmail-mbox.5

Rationale in patch file.

Ref: #1089

2 files changed, 170 insertions, 1 deletions

diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index cc91b3b2a..d0a7bcd2e 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=netqmail
 pkgver=1.06
-pkgrel=9
+pkgrel=10
 pkgdesc="The qmail mail transfer agent (community version)"
 url="http://www.netqmail.org/"
 arch="all"
@@ -20,6 +20,7 @@ source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz
 	0003-qmailremote-20170716.patch
 	0004-notifyfd.patch
 	0005-CVE-2005-1513.patch
+	rename-mbox-man.patch
 	qmail.run
 	smtpd.run
 	smtpd-notls.run
@@ -65,6 +66,11 @@ makeservicedir()
 	chmod 0755 "$1"/run "$1"/log/run
 }
 
+prepare() {
+	default_prepare
+	mv "$builddir"/mbox.5 "$builddir"/qmail-mbox.5
+}
+
 build() {
         echo "$CC $CFLAGS" > conf-cc
         echo "$CC $LDFLAGS -s -static" > conf-ld
@@ -105,6 +111,7 @@ b3af9c29e6d46daa2a1b9f677c6f32892d5f8c9b8d5c2bdd6f34b106dd5ad41394c05a5ebe145c6e
 cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997abab73075d1b517cc0929dd65674d468d517b0ca38196e2b4  0003-qmailremote-20170716.patch
 b32a8a36c8ab8872abd4f1a117482f064a6d631a6bb2ba75cafe61743bef09f923d26935d9514eec33a7dec5aeb3d0b517d677e55924859d2db5233bc11f9f11  0004-notifyfd.patch
 ac8406c1d16ce2e55e47bc83ca6e095833a54de73cecee222cad3fcececa518386b95a11cb0c9c2dcc6851bae28aa539b11069305aa887a291177bf177ee7b01  0005-CVE-2005-1513.patch
+6ab1751b6ae1b932505a11ebaa4661edf9dd1b64da66a117c6b97c70cee7e429aaf8db98a3cabf25072d23ef39dc82f586a9adfe848635f6f1bdb0b20abed509  rename-mbox-man.patch
 954a905bac5e3bc49f180dc0de7f6ee4c4ae8f94dd400ee4b06d3c944f1ff1cfc44bddccb07ae439f2523ad06fcb89023e57d091737da88f836013757794e931  qmail.run
 8a887769fc8c5e1abbc56b72c913b435874549c213a10219124c554640eff09ace0a00a894907d633bdf424c7f351064b94e9e12635f725edc700db8cbf25ccd  smtpd.run
 721f4ae97ca302e6e1a8a8f685aed8542e408f580b51362006b385a48cbbec185080048bc3ef0953d10af1aaa15fa661dced930f321d594cbbcda8fe19f49abb  smtpd-notls.run
diff --git a/user/netqmail/rename-mbox-man.patch b/user/netqmail/rename-mbox-man.patch
new file mode 100644
index 000000000..753417352
--- /dev/null
+++ b/user/netqmail/rename-mbox-man.patch
@@ -0,0 +1,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)