Am 12.04.2017 um 12:45 schrieb Timo Sirainen:
> https://dovecot.org/releases/2.2/dovecot-2.2.29.1.tar.gz
Am 12.04.2017 um 02:54 schrieb Stephan Bosch:
> https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.18.tar.gz
Hello,
while building the new releases for Debian, lintian complained about spelling
errors in binaries and manpages.
The attached patches correct them.
lintian complain also "spelling-error-in-binary
usr/lib/dovecot/libdovecot-sieve.so.0.0.0 addres address"
So I did
$ grep -r addres | grep -v address
src/lib-sieve/sieve-match.h: (const struct sieve_dumptime_env *denv,
sieve_size_t *addres, int *opt_code);
But as this isn't obviously text I don't touch that.
Andreas
Description: lintian: reseting -> resetting
Author: A. Schulze
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: dovecot-2.2.29.1/src/director/director-connection.c
===================================================================
--- dovecot-2.2.29.1.orig/src/director/director-connection.c
+++ dovecot-2.2.29.1/src/director/director-connection.c
@@ -727,7 +727,7 @@ static bool director_cmd_director(struct
}
/* just forward this to the entire ring until it reaches back to
itself. some hosts may see this twice, but that's the only way to
- guarantee that it gets seen by everyone. reseting the host multiple
+ guarantee that it gets seen by everyone. resetting the host multiple
times may cause us to handle its commands multiple times, but the
commands can handle that. however, we need to also handle a
situation where the added director never comes back - we don't want
@@ -1426,7 +1426,7 @@ director_connection_sync_host(struct dir
timestamp);
return FALSE;
} else if (seq < host->last_sync_seq) {
- i_warning("Last SYNC seq for %s appears to be stale, reseting "
+ i_warning("Last SYNC seq for %s appears to be stale, resetting "
"(seq=%u, timestamp=%u -> seq=%u, timestamp=%u)",
host->name, host->last_sync_seq,
host->last_sync_timestamp, seq, timestamp);
Description: lintian: wich -> which
Author: A. Schulze
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: dovecot-2.2.29.1/doc/man/doveadm-exec.1.in
===================================================================
--- dovecot-2.2.29.1.orig/doc/man/doveadm-exec.1.in
+++ dovecot-2.2.29.1/doc/man/doveadm-exec.1.in
@@ -28,7 +28,7 @@ the name of an executable located in
.\"-------------------------------------
.TP
.I binary arguments
-options and arguments, wich will be passed through to the
+options and arguments, which will be passed through to the
.IR binary .
.\"------------------------------------------------------------------------
.SH EXAMPLE
Description: lintian: occured -> occurred
depricated -> deprecated
Author: A. Schulze
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: dovecot-2.2-pigeonhole-0.4.18/src/managesieve/managesieve-common.h
===================================================================
--- dovecot-2.2-pigeonhole-0.4.18.orig/src/managesieve/managesieve-common.h
+++ dovecot-2.2-pigeonhole-0.4.18/src/managesieve/managesieve-common.h
@@ -19,7 +19,7 @@
#define CLIENT_MAX_BAD_COMMANDS 20
#define CRITICAL_MSG \
- "Internal error occured. Refer to server log for more information."
+ "Internal error occurred. Refer to server log for more information."
#define CRITICAL_MSG_STAMP CRITICAL_MSG " [%Y-%m-%d %H:%M:%S]"
#include "lib.h"
Index: dovecot-2.2-pigeonhole-0.4.18/src/lib-sieve/plugins/notify/cmd-notify.c
===================================================================
--- dovecot-2.2-pigeonhole-0.4.18.orig/src/lib-sieve/plugins/notify/cmd-notify.c
+++ dovecot-2.2-pigeonhole-0.4.18/src/lib-sieve/plugins/notify/cmd-notify.c
@@ -624,7 +624,7 @@ static void act_notify_print
unsigned int count, i;
sieve_result_action_printf
- ( rpenv, "send (depricated) notification with method 'mailto':");
+ ( rpenv, "send (deprecated) notification with method 'mailto':");
/* Print main method parameters */
Index: dovecot-2.2-pigeonhole-0.4.18/src/lib-sieve/sieve-storage.c
===================================================================
--- dovecot-2.2-pigeonhole-0.4.18.orig/src/lib-sieve/sieve-storage.c
+++ dovecot-2.2-pigeonhole-0.4.18/src/lib-sieve/sieve-storage.c
@@ -23,7 +23,7 @@
#include <utime.h>
#define CRITICAL_MSG \
- "Internal error occured. Refer to server log for more information."
+ "Internal error occurred. Refer to server log for more information."
#define CRITICAL_MSG_STAMP CRITICAL_MSG " [%Y-%m-%d %H:%M:%S]"
/*
Description: lintian: orignal -> original
Author: A. Schulze
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: dovecot-2.2-pigeonhole-0.4.18/doc/man/sieve-test.1.in
===================================================================
--- dovecot-2.2-pigeonhole-0.4.18.orig/doc/man/sieve-test.1.in
+++ dovecot-2.2-pigeonhole-0.4.18/doc/man/sieve-test.1.in
@@ -101,7 +101,7 @@ option may be specified multiple times.
The final envelope recipient address. Some tests and actions will
use this as the script owner\(aqs e\-mail address. For example, this is what is
used by the vacation action to check whether a reply is appropriate. If the
-\fB\-r\fP option is omitted, the orignal envelope recipient address will be used
+\fB\-r\fP option is omitted, the original envelope recipient address will be used
instead (see \fB\-a\fP option for more info).
.TP
.BI \-s\ script\-file
