File cyrus-imapd-3.12.1-rename.patch of Package cyrus-imapd
From: Matthias Fehring <buschmann23@opensuse.org>
Date: 2025-10-07 09:05:00 +0200
Subject: Rename conflicting binaries and man pages
Upstream: no
Cyrus IMAPD ships some binaries that conflict with binaries
from other packages. This renames some binaries and their man
pages into names prefixed by cyr_.
---
imap/imapd.c | 2 +-
man/fetchnews.8 | 14 +++++++-------
man/quota.8 | 16 ++++++++--------
3 files changed, 16 insertions(+), 16 deletions(-)
--- a/imap/imapd.c 2025-06-27 06:15:42.000000000 +0200
+++ b/imap/imapd.c 2025-10-07 08:59:37.776230765 +0200
@@ -8297,7 +8297,7 @@ static void cmd_reconstruct(const char *
fclose(stdout);
fclose(stderr);
- ret = snprintf(buf, sizeof(buf), "%s/quota", SBIN_DIR);
+ ret = snprintf(buf, sizeof(buf), "%s/cyr_quota", SBIN_DIR);
if(ret < 0 || ret >= (int) sizeof(buf)) {
/* in child, so fatailing won't disconnect our user */
fatal("quota buffer not sufficiently big", EX_CONFIG);
--- a/man/fetchnews.8 2025-06-27 06:17:58.000000000 +0200
+++ b/man/fetchnews.8 2025-10-07 09:01:30.087215784 +0200
@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
-.TH "FETCHNEWS" "8" "Jun 27, 2025" "3.12.1" "Cyrus IMAP"
+.TH "CYR_FETCHNEWS" "8" "Jun 27, 2025" "3.12.1" "Cyrus IMAP"
.SH NAME
-fetchnews \- Cyrus IMAP documentation
+cyr_fetchnews \- Cyrus IMAP documentation
.sp
Retrieve new articles from peer and feed to Cyrus
.SH SYNOPSIS
@@ -38,7 +38,7 @@ Retrieve new articles from peer and feed
.sp
.nf
.ft C
-\fBfetchnews\fP [ \fB\-C\fP \fIconfig\-file\fP ] [ \fB\-s\fP \fIservername\fP[:\fIport\fP]]
+\fBcyr_fetchnews\fP [ \fB\-C\fP \fIconfig\-file\fP ] [ \fB\-s\fP \fIservername\fP[:\fIport\fP]]
[ \fB\-n\fP ] [ \fB\-y\fP ] [ \fB\-w\fP \fIwildmat\fP ] [ \fB\-f\fP \fItstampfile\fP ]
[ \fB\-a\fP \fIauthname\fP [ \fB\-p\fP \fIpassword\fP ]] \fIpeername\fP
.ft P
@@ -47,12 +47,12 @@ Retrieve new articles from peer and feed
.UNINDENT
.SH DESCRIPTION
.sp
-\fBfetchnews\fP retrieves news articles from a peer news server and
-feeds them to a Cyrus server. \fBfetchnews\fP connects to the peer
+\fBcyr_fetchnews\fP retrieves news articles from a peer news server and
+feeds them to a Cyrus server. \fBcyr_fetchnews\fP connects to the peer
specified by \fIpeername\fP, requests new articles since the time stored in
\fItstampfile\fP and feeds them to \fIservername\fP\&.
.sp
-\fBfetchnews\fP reads its configuration options out of the \fI\%imapd.conf(5)\fP file unless specified otherwise by \fB\-C\fP\&.
+\fBcyr_fetchnews\fP reads its configuration options out of the \fI\%imapd.conf(5)\fP file unless specified otherwise by \fB\-C\fP\&.
.SH OPTIONS
.INDENT 0.0
.TP
@@ -68,7 +68,7 @@ should be fed. Defaults to \(dqlocalhos
.INDENT 0.0
.TP
.B \-n, \-\-no\-newnews
-Don\(aqt use the NEWNEWS command. \fBfetchnews\fP will keep track of the
+Don\(aqt use the NEWNEWS command. \fBcyr_fetchnews\fP will keep track of the
high and low water marks for each group and use them to fetch new
articles.
.UNINDENT
--- a/man/quota.8 2025-06-27 06:17:58.000000000 +0200
+++ b/man/quota.8 2025-10-07 09:02:43.527482583 +0200
@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
-.TH "QUOTA" "8" "Jun 27, 2025" "3.12.1" "Cyrus IMAP"
+.TH "CYR_QUOTA" "8" "Jun 27, 2025" "3.12.1" "Cyrus IMAP"
.SH NAME
-quota \- Cyrus IMAP documentation
+cyr_quota \- Cyrus IMAP documentation
.sp
Report and optionally fix storage and message quota usage.
.SH SYNOPSIS
@@ -38,17 +38,17 @@ Report and optionally fix storage and me
.sp
.nf
.ft C
-\fBquota\fP [ \fB\-C\fP \fIconfig\-file\fP ] [ \fB\-d\fP \fIdomain\fP ] [ \fB\-f\fP ] [ \fB\-u\fP ] [ \fImailbox\-spec\fP\&... ]
+\fBcyr_quota\fP [ \fB\-C\fP \fIconfig\-file\fP ] [ \fB\-d\fP \fIdomain\fP ] [ \fB\-f\fP ] [ \fB\-u\fP ] [ \fImailbox\-spec\fP\&... ]
.ft P
.fi
.UNINDENT
.UNINDENT
.SH DESCRIPTION
.sp
-\fBquota\fP generates a report listing quota roots, giving their limits and
+\fBcyr_quota\fP generates a report listing quota roots, giving their limits and
usage.
.sp
-If the \fB\-f\fP option is specified, \fBquota\fP first fixes any
+If the \fB\-f\fP option is specified, \fBcyr_quota\fP first fixes any
inconsistencies in the quota subsystem, such as mailboxes with the wrong
quota root or quota roots with the wrong quota usage reported.
.sp
@@ -66,12 +66,12 @@ quota roots for only the specified users
\fBWARNING:\fP
.INDENT 0.0
.INDENT 3.5
-Running \fBquota\fP with both the \fB\-f\fP option and \fImailbox\-spec\fP
+Running \fBcyr_quota\fP with both the \fB\-f\fP option and \fImailbox\-spec\fP
arguments is not recommended.
.UNINDENT
.UNINDENT
.sp
-\fBquota\fP reads its configuration options out of the \fI\%imapd.conf(5)\fP file unless specified otherwise by \fB\-C\fP\&.
+\fBcyr_quota\fP reads its configuration options out of the \fI\%imapd.conf(5)\fP file unless specified otherwise by \fB\-C\fP\&.
.SH OPTIONS
.INDENT 0.0
.TP
@@ -124,7 +124,7 @@ Only report and/or fix quota in mailboxe
.sp
.nf
.ft C
-\fBquota\fP
+\fBcyr_quota\fP
.ft P
.fi
.UNINDENT
