Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package amavisd-milter for openSUSE:Factory
checked in at 2022-01-08 23:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amavisd-milter (Old)
and /work/SRC/openSUSE:Factory/.amavisd-milter.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-milter"
Sat Jan 8 23:24:17 2022 rev:3 rq:944922 version:1.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/amavisd-milter/amavisd-milter.changes
2021-07-31 18:52:33.190447047 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-milter.new.1892/amavisd-milter.changes
2022-01-08 23:25:10.646307961 +0100
@@ -1,0 +2,6 @@
+Tue Jan 4 18:17:08 UTC 2022 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- Update to version 1.7.2
+ * The SMTP_AUTH* attributes are missing in policy_bank.
+
+-------------------------------------------------------------------
Old:
----
amavisd-milter-1.7.1.tar.gz
New:
----
amavisd-milter-1.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amavisd-milter.spec ++++++
--- /var/tmp/diff_new_pack.h1kTFq/_old 2022-01-08 23:25:11.074308311 +0100
+++ /var/tmp/diff_new_pack.h1kTFq/_new 2022-01-08 23:25:11.082308318 +0100
@@ -1,7 +1,7 @@
#
# spec file for package amavisd-milter
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: amavisd-milter
-Version: 1.7.1
+Version: 1.7.2
Release: 0
Summary: Sendmail milter for amavisd-new using the AM.PDP protocol
License: BSD-3-Clause
@@ -27,7 +27,7 @@
Source1: %{name}.service
BuildRequires: sendmail-devel >= 8.12.0
Requires: amavisd-new
-Supplements: packageand(amavisd-new:sendmail)
+Supplements: (amavisd-new and sendmail)
Conflicts: %{name} < %{version}
%{?systemd_ordering}
++++++ amavisd-milter-1.7.1.tar.gz -> amavisd-milter-1.7.2.tar.gz ++++++
++++ 4066 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/AMAVISD-MILTER.md
new/amavisd-milter-1.7.2/AMAVISD-MILTER.md
--- old/amavisd-milter-1.7.1/AMAVISD-MILTER.md 2020-09-07 00:01:10.000000000
+0200
+++ new/amavisd-milter-1.7.2/AMAVISD-MILTER.md 2021-04-08 18:48:21.000000000
+0200
@@ -62,7 +62,7 @@
**-f**
: Run amavisd-milter in the foreground (i.e. do not daemonize).
- Print debuging messages to the terminal.
+ Print debugging messages to the terminal.
**-h**
: Print the help page and exit.
@@ -136,7 +136,7 @@
## POLICY BANKS
If the option **-B** is enabled, amavisd-milter uses the value of the milter
-macro *{daemon_name}* as the name of the amavis policy bank. Usualy, this
milter
+macro *{daemon_name}* as the name of the amavis policy bank. Usually, this
milter
macro is set to name of the MTA.
When remote client is authenticated, amavisd-milter uses authentication
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/CHANGES new/amavisd-milter-1.7.2/CHANGES
--- old/amavisd-milter-1.7.1/CHANGES 2020-09-07 00:01:10.000000000 +0200
+++ new/amavisd-milter-1.7.2/CHANGES 2022-01-03 11:19:26.000000000 +0100
@@ -1,5 +1,13 @@
This is the CHANGELOG for amavisd-milter.
+20210103:
+ amavisd-milter-1.7.2:
+
+ Bug and compatibility fixies:
+ - The SMTP_AUTH* attributes are missing in policy_bank.
+
+ Thanks to: @damluk
+
20200906:
amavisd-milter-1.7.1:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/aclocal/ar-lib new/amavisd-milter-1.7.2/aclocal/ar-lib
--- old/amavisd-milter-1.7.1/aclocal/ar-lib 2020-09-07 00:01:16.000000000
+0200
+++ new/amavisd-milter-1.7.2/aclocal/ar-lib 2019-07-12 19:43:01.000000000
+0200
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
# Written by Peter Rosin <p...@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/aclocal/compile
new/amavisd-milter-1.7.2/aclocal/compile
--- old/amavisd-milter-1.7.1/aclocal/compile 2020-09-07 00:01:16.000000000
+0200
+++ new/amavisd-milter-1.7.2/aclocal/compile 2019-07-12 19:43:01.000000000
+0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/aclocal/missing
new/amavisd-milter-1.7.2/aclocal/missing
--- old/amavisd-milter-1.7.1/aclocal/missing 2020-09-07 00:01:16.000000000
+0200
+++ new/amavisd-milter-1.7.2/aclocal/missing 2019-07-12 19:43:01.000000000
+0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/amavisd-milter/amavisd-milter.8
new/amavisd-milter-1.7.2/amavisd-milter/amavisd-milter.8
--- old/amavisd-milter-1.7.1/amavisd-milter/amavisd-milter.8 2020-09-07
00:01:23.000000000 +0200
+++ new/amavisd-milter-1.7.2/amavisd-milter/amavisd-milter.8 2022-01-04
17:54:44.000000000 +0100
@@ -1,292 +1,252 @@
-.\" Automatically generated by Pandoc 1.17.2
+.\" Automatically generated by Pandoc 2.9.2.1
.\"
-.TH "amavisd\-milter" "8" "" "Version 1.7.1" "System Manager\[aq]s Manual"
+.TH "amavisd-milter" "8" "" "Version 1.7.2" "System Manager\[cq]s Manual"
.hy
.SH NAME
.PP
-\f[B]amavisd\-milter\f[] \- sendmail milter for amavis
+\f[B]amavisd-milter\f[R] - sendmail milter for amavis
.SH SYNOPSIS
.PP
-\f[B]amavisd\-milter\f[]
-[\f[B]\-Bfhv\f[]][\f[B]\-d\f[]\ \f[I]debug\-level\f[]]
-[\f[B]\-D\f[]\ \f[I]delivery\-care\-of\f[]][\f[B]\-m\f[]\ \f[I]max\-conns\f[]]
-[\f[B]\-M\f[]\ \f[I]max\-wait\f[]][\f[B]\-p\f[]\ \f[I]pidfile\f[]]
-[\f[B]\-P\f[]][\f[B]\-q\f[]\ \f[I]backlog\f[]]
-[\f[B]\-s\f[]\ \f[I]socket\f[]][\f[B]\-t\f[]\ \f[I]timeout\f[]]
-[\f[B]\-S\f[]\ \f[I]socket\f[]][\f[B]\-T\f[]\ \f[I]timeout\f[]]
-[\f[B]\-w\f[]\ \f[I]directory\f[]]
+\f[B]amavisd-milter\f[R] [\f[B]-Bfhv\f[R]]
+[\f[B]-d\f[R]\ \f[I]debug-level\f[R]]
+[\f[B]-D\f[R]\ \f[I]delivery-care-of\f[R]]
+[\f[B]-m\f[R]\ \f[I]max-conns\f[R]] [\f[B]-M\f[R]\ \f[I]max-wait\f[R]]
+[\f[B]-p\f[R]\ \f[I]pidfile\f[R]] [\f[B]-P\f[R]]
+[\f[B]-q\f[R]\ \f[I]backlog\f[R]] [\f[B]-s\f[R]\ \f[I]socket\f[R]]
+[\f[B]-t\f[R]\ \f[I]timeout\f[R]] [\f[B]-S\f[R]\ \f[I]socket\f[R]]
+[\f[B]-T\f[R]\ \f[I]timeout\f[R]] [\f[B]-w\f[R]\ \f[I]directory\f[R]]
.SH DESCRIPTION
.PP
-The amavisd\-milter is a sendmail milter (mail filter) for amavis 2.4.3
+The amavisd-milter is a sendmail milter (mail filter) for amavis 2.4.3
and above and sendmail 8.13 and above.
.PP
-With the amavisd\-milter, a full amavis functionality is available,
+With the amavisd-milter, a full amavis functionality is available,
including adding spam and virus information header fields, modifying the
Subject, adding address extensions and removing certain recipients from
delivery, while delivering the same message to the rest.
.PP
-For more information you can visit amavisd\-milter website:
+For more information you can visit amavisd-milter website:
.RS
.PP
-https://github.com/prehor/amavisd\-milter
+https://github.com/prehor/amavisd-milter
.RE
.SS Options
.PP
The options are as follows:
.TP
-.B \f[B]\-B\f[]
-Uses the milter macro \f[I]{daemon_name}\f[] as the policy bank name
-(see POLICY BANKS (#policy-banks) below).
-.RS
-.RE
+\f[B]-B\f[R]
+Uses the milter macro \f[I]{daemon_name}\f[R] as the policy bank name
+(see POLICY BANKS below).
.TP
-.B \f[B]\-d\f[] \f[I]debug\-level\f[]
+\f[B]-d\f[R] \f[I]debug-level\f[R]
Set the debug level.
The debugging traces become more detailed as the debug level increases.
Maximum is 9.
-.RS
-.RE
.TP
-.B \f[B]\-D\f[] \f[I]delivery\-care\-of\f[]
-Set AM.PDP request attribute \f[I]delivery_care_of\f[] to
-\f[I]client\f[] (default) or \f[I]server\f[].
-.RS
-.RE
+\f[B]-D\f[R] \f[I]delivery-care-of\f[R]
+Set AM.PDP request attribute \f[I]delivery_care_of\f[R] to
+\f[I]client\f[R] (default) or \f[I]server\f[R].
.PP
-When the \f[I]client\f[] method is used, then amavisd\-milter is
+When the \f[I]client\f[R] method is used, then amavisd-milter is
responsible for forwarding the message to the recipients.
This method does not allow personalized header or body modification.
.PP
-When the \f[I]server\f[] method is used, then amavis is responsible for
+When the \f[I]server\f[R] method is used, then amavis is responsible for
forwarding the message to the recipients and may personalize the headers
and the body of the messages.
-\f[I]$forward_method\f[] variable in \f[B]amavisd.conf\f[] must point to
-a place willing to accept the message without further checking in
+\f[I]$forward_method\f[R] variable in \f[B]amavisd.conf\f[R] must point
+to a place willing to accept the message without further checking in
amavis.
.TP
-.B \f[B]\-f\f[]
-Run amavisd\-milter in the foreground (i.e.
-do not daemonize).
-Print debuging messages to the terminal.
-.RS
-.RE
+\f[B]-f\f[R]
+Run amavisd-milter in the foreground (i.e.\ do not daemonize).
+Print debugging messages to the terminal.
.TP
-.B \f[B]\-h\f[]
+\f[B]-h\f[R]
Print the help page and exit.
-.RS
-.RE
.TP
-.B \f[B]\-m\f[] \f[I]max\-conns\f[]
+\f[B]-m\f[R] \f[I]max-conns\f[R]
Maximum concurrent amavis connections (default 0 = unlimited number of
connections).
-It must be the same as the \f[I]$max_servers\f[] variable in
-\f[B]amavisd.conf\f[].
-.RS
-.RE
+It must be the same as the \f[I]$max_servers\f[R] variable in
+\f[B]amavisd.conf\f[R].
.TP
-.B \f[B]\-M\f[] \f[I]timeout\f[]
+\f[B]-M\f[R] \f[I]timeout\f[R]
Timeout for message processing in seconds (default 300 seconds = 5
minutes).
-Must be less then timeout for a response to the final "." that
+Must be less then timeout for a response to the final \[lq].\[rq] that
terminates a message on sending MTA.
-\f[B]Sendmail\f[] uses default value 1 hour, \f[B]postfix\f[] 10 minutes
-and \f[B]qmail\f[] 20 minutes.
+\f[B]Sendmail\f[R] uses default value 1 hour, \f[B]postfix\f[R] 10
+minutes and \f[B]qmail\f[R] 20 minutes.
Recommended value is less than 10 minutes.
-.RS
-.RE
.PP
-If you use other milters (especially time\-consuming), the timeout must
+If you use other milters (especially time-consuming), the timeout must
be sufficient to process message in all milters.
.TP
-.B \f[B]\-p\f[] \f[I]pidfile\f[]
+\f[B]-p\f[R] \f[I]pidfile\f[R]
Use this pid file.
-.RS
-.RE
.TP
-.B \f[B]\-P\f[]
+\f[B]-P\f[R]
When the amavis fails, the message will be passed through unchecked.
-.RS
-.RE
.TP
-.B \f[B]\-q\f[] \f[I]backlog\f[]
-Sets the incoming socket backlog used by \f[B]listen(2)\f[].
+\f[B]-q\f[R] \f[I]backlog\f[R]
+Sets the incoming socket backlog used by \f[B]listen(2)\f[R].
If it is not set or set to zero, the operating system default is used.
-.RS
-.RE
.TP
-.B \f[B]\-s\f[] \f[I]socket\f[]
-Communication socket between sendmail and amavisd\-milter.
-The protocol spoken over this socket is \f[I]MILTER\f[] (Mail FILTER).
-It must have the same vale as the \f[I]INPUT_MAIL_FILTER\f[] macro in
-\f[B]sendmail.mc\f[].
-.RS
-.RE
+\f[B]-s\f[R] \f[I]socket\f[R]
+Communication socket between sendmail and amavisd-milter.
+The protocol spoken over this socket is \f[I]MILTER\f[R] (Mail FILTER).
+It must have the same vale as the \f[I]INPUT_MAIL_FILTER\f[R] macro in
+\f[B]sendmail.mc\f[R].
.PP
-The \f[I]socket\f[] must be in format \f[I]proto:address\f[]:
+The \f[I]socket\f[R] must be in format \f[I]proto:address\f[R]:
.RS
.IP \[bu] 2
-\f[I]{unix|local}:/path/to/file\f[] \- A named pipe.
+\f[I]{unix|local}:/path/to/file\f[R] - A named pipe.
.IP \[bu] 2
-\f[I]inet:port\@{hostname|ip\-address}\f[] \- An IPV4 socket.
+\f[I]inet:port\[at]{hostname|ip-address}\f[R] - An IPV4 socket.
.IP \[bu] 2
-\f[I]inet6:port\@{hostname|ip\-address}\f[] \- An IPV6 socket.
+\f[I]inet6:port\[at]{hostname|ip-address}\f[R] - An IPV6 socket.
.RE
.TP
-.B \f[B]\-S\f[] \f[I]socket\f[]
-Communication socket between amavisd\-milter and amavis.
-The protocol spoken over this socket is \f[I]AM.PDP\f[] (AMavis Policy
+\f[B]-S\f[R] \f[I]socket\f[R]
+Communication socket between amavisd-milter and amavis.
+The protocol spoken over this socket is \f[I]AM.PDP\f[R] (AMavis Policy
Delegation Protocol).
-It must have the same value as the \f[I]$unix_socketname\f[] variable in
-\f[B]amavisd.conf\f[].
-.RS
-.RE
+It must have the same value as the \f[I]$unix_socketname\f[R] variable
+in \f[B]amavisd.conf\f[R].
.PP
-The \f[I]socket\f[] must be in format \f[I]proto:address\f[]:
+The \f[I]socket\f[R] must be in format \f[I]proto:address\f[R]:
.RS
.IP \[bu] 2
-\f[I]{unix|local}:/path/to/file\f[] \- A named pipe.
+\f[I]{unix|local}:/path/to/file\f[R] - A named pipe.
.IP \[bu] 2
-\f[I]inet:port\@{hostname|ip\-address}\f[] \- An IPV4 socket.
+\f[I]inet:port\[at]{hostname|ip-address}\f[R] - An IPV4 socket.
.IP \[bu] 2
-\f[I]inet6:port\@{hostname|ip\-address}\f[] \- An IPV6 socket.
+\f[I]inet6:port\[at]{hostname|ip-address}\f[R] - An IPV6 socket.
.RE
.TP
-.B \f[B]\-t\f[] \f[I]timeout\f[]
+\f[B]-t\f[R] \f[I]timeout\f[R]
Sendmail connection timeout in seconds (default 600 = 10 minutes).
-It must have the same vale as the \f[I]INPUT_MAIL_FILTER\f[] macro in
-\f[B]sendmail.mc\f[] and must be greater than or equal to the amavis
+It must have the same vale as the \f[I]INPUT_MAIL_FILTER\f[R] macro in
+\f[B]sendmail.mc\f[R] and must be greater than or equal to the amavis
connection timeout.
-.RS
-.RE
.PP
-If you use other milters (especially time\-consuming), the timeout must
+If you use other milters (especially time-consuming), the timeout must
be sufficient to process message in all milters.
.TP
-.B \f[B]\-T\f[] \f[I]timeout\f[]
+\f[B]-T\f[R] \f[I]timeout\f[R]
Amavis connection timeout in seconds (default 600 = 10 minutes).
Must be sufficient to process message in amavis.
Usually, it is a good idea to set them to the same value as sendmail
connection timeout.
-.RS
-.RE
.TP
-.B \f[B]\-v\f[]
+\f[B]-v\f[R]
Report the version number and exit.
-.RS
-.RE
.TP
-.B \f[B]\-w\f[] \f[I]directory\f[]
+\f[B]-w\f[R] \f[I]directory\f[R]
Set working directory.
-.RS
-.RE
.SH POLICY BANKS
.PP
-If the option \f[B]\-B\f[] is enabled, amavisd\-milter uses the value of
-the milter macro \f[I]{daemon_name}\f[] as the name of the amavis policy
-bank.
-Usualy, this milter macro is set to name of the MTA.
+If the option \f[B]-B\f[R] is enabled, amavisd-milter uses the value of
+the milter macro \f[I]{daemon_name}\f[R] as the name of the amavis
+policy bank.
+Usually, this milter macro is set to name of the MTA.
.PP
-When remote client is authenticated, amavisd\-milter uses authentication
+When remote client is authenticated, amavisd-milter uses authentication
information as the name of the amavis policy banks:
.TP
-.B \f[B]\f[C]SMTP_AUTH\f[]\f[]
+\f[B]\f[R]\f[C]SMTP_AUTH\f[R]\f[B]\f[R]
Remote client has been authenticated.
-.RS
-.RE
.TP
-.B \f[B]\f[C]SMTP_AUTH_<MECH>\f[]\f[]
+\f[B]\f[R]\f[C]SMTP_AUTH_<MECH>\f[R]\f[B]\f[R]
The remote client authentication mechanism.
-.RS
-.RE
.TP
-.B \f[B]\f[C]SMTP_AUTH_<MECH>_<BITS>\f[]\f[]
+\f[B]\f[R]\f[C]SMTP_AUTH_<MECH>_<BITS>\f[R]\f[B]\f[R]
The number of bits used for the key of the symmetric cipher when
authentication mechanism uses it.
-.RS
-.RE
.SH EXAMPLES
.SS Configuring amavis
.PP
-In the \f[B]amavisd.conf\f[] file set protocol and amavis socket to:
+In the \f[B]amavisd.conf\f[R] file set protocol and amavis socket to:
.IP
.nf
\f[C]
-$protocol\ =\ "AM.PDP";\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ #\ Use\
AM.PDP\ protocol
-$unix_socketname\ =\ "$MYHOME/amavisd.sock";\ #\ Listen\ on\ Unix\ socket
-###\ $inet_socket_port\ =\ 10024;\ \ \ \ \ \ \ \ \ \ \ \ \ #\ Do\ not\ listen\
on\ TCP\ port
-\f[]
+$protocol = \[dq]AM.PDP\[dq]; # Use AM.PDP protocol
+$unix_socketname = \[dq]$MYHOME/amavisd.sock\[dq]; # Listen on Unix socket
+### $inet_socket_port = 10024; # Do not listen on TCP port
+\f[R]
.fi
.PP
Then (re)start the amavisd daemon.
.SS Configuring Postfix
.PP
-Add the following entries to Postfix \f[B]main.cf\f[]*:
+Add the following entries to Postfix \f[B]main.cf\f[R]*:
.IP
.nf
\f[C]
-smtpd_milters\ =\ local:<AMAVISD_MILTER.SOCK>
-milter_connect_macros\ =\ j\ {client_name}\ {daemon_name}\ v
-milter_protocol\ =\ 6
-\f[]
+smtpd_milters = local:<AMAVISD_MILTER.SOCK>
+milter_connect_macros = j {client_name} {daemon_name} v
+milter_protocol = 6
+\f[R]
.fi
.PP
Then (re)start the Postfix daemon.
.SS Configuring sendmail
.PP
-Add the following entries to file \f[B]sendmail.mc\f[]:
+Add the following entries to file \f[B]sendmail.mc\f[R]:
.IP
.nf
\f[C]
-define(`confMILTER_MACROS_CONNECT\[aq],
-\ \ confMILTER_MACROS_CONNECT`,\ {client_resolve}\[aq])
-define(`confMILTER_MACROS_ENVFROM\[aq],
-\ \ confMILTER_MACROS_ENVFROM`,\ r,\ b\[aq])
-INPUT_MAIL_FILTER(`amavisd\-milter\[aq],
-\ \ `S=local:<AMAVISD_MILTER.SOCK>,\ F=T,\ T=S:10m;R:10m;E:10m\[aq])
-\f[]
+define(\[ga]confMILTER_MACROS_CONNECT\[aq],
+ confMILTER_MACROS_CONNECT\[ga], {client_resolve}\[aq])
+define(\[ga]confMILTER_MACROS_ENVFROM\[aq],
+ confMILTER_MACROS_ENVFROM\[ga], r, b\[aq])
+INPUT_MAIL_FILTER(\[ga]amavisd-milter\[aq],
+ \[ga]S=local:<AMAVISD_MILTER.SOCK>, F=T, T=S:10m;R:10m;E:10m\[aq])
+\f[R]
.fi
.PP
-Then rebuild \f[B]sendmail.cf\f[] file, install it and (re)start the
+Then rebuild \f[B]sendmail.cf\f[R] file, install it and (re)start the
sendmail daemon.
-.SS Running amavisd\-milter
+.SS Running amavisd-milter
.PP
-This examples assumes that amavis is running as user \f[I]vscan\f[].
-The actual name is shown in the \f[I]$daemon_user\f[] variable in
-\f[B]amavisd.conf\f[].
+This examples assumes that amavis is running as user \f[I]vscan\f[R].
+The actual name is shown in the \f[I]$daemon_user\f[R] variable in
+\f[B]amavisd.conf\f[R].
.SS Limiting maximum concurrent connections to amavisd
.PP
To limit the maximum concurrent connections to amavis, run
-amavisd\-milter with this options:
+amavisd-milter with this options:
.IP
.nf
\f[C]
-su\ \-\ vscan\ \-c\ "amavisd\-milter\ \-m\ 4"
-\f[]
+su - vscan -c \[dq]amavisd-milter -m 4\[dq]
+\f[R]
.fi
.SS Troubleshooting
.PP
-For troubleshooting, run amavisd\-milter on the foreground and set the
+For troubleshooting, run amavisd-milter on the foreground and set the
debug level to the appropriate value:
.IP
.nf
\f[C]
-su\ \-\ vscan\ \-c\ "amavisd\-milter\ \-f\ \-d\ 4"
-\f[]
+su - vscan -c \[dq]amavisd-milter -f -d 4\[dq]
+\f[R]
.fi
.PP
Debug levels are:
.IP \[bu] 2
-1 \- Not errors but unexpected states (connection abort etc).
+1 - Not errors but unexpected states (connection abort etc).
.IP \[bu] 2
-2 \- Main states in message processing.
+2 - Main states in message processing.
.IP \[bu] 2
-3 \- All amavisd\-milter debug messages.
+3 - All amavisd-milter debug messages.
.IP \[bu] 2
-4\-9 \- Milter communication debugging (set \f[B]smfi_setdbg\f[] to
-1\-6).
+4-9 - Milter communication debugging (set \f[B]smfi_setdbg\f[R] to 1-6).
.SH SEE ALSO
.IP \[bu] 2
-https://github.com/prehor/amavisd\-milter
+https://github.com/prehor/amavisd-milter
.IP \[bu] 2
https://www.ijs.si/software/amavisd/
.IP \[bu] 2
@@ -300,14 +260,14 @@
Issues can be reported by using GitHub at:
.RS
.PP
-https://github.com/prehor/amavisd\-milter/issues
+https://github.com/prehor/amavisd-milter/issues
.RE
.PP
Full detailed information on how to report issues, please see the
Contribution Guidelines at:
.RS
.PP
-https://github.com/prehor/amavisd\-milter/blob/master/CONTRIBUTING.md
+https://github.com/prehor/amavisd-milter/blob/master/CONTRIBUTING.md
.RE
.PP
Enhancements, requests and problem reports are welcome.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/amavisd-milter-1.7.1/amavisd-milter/mlfi.c
new/amavisd-milter-1.7.2/amavisd-milter/mlfi.c
--- old/amavisd-milter-1.7.1/amavisd-milter/mlfi.c 2020-09-07
00:01:10.000000000 +0200
+++ new/amavisd-milter-1.7.2/amavisd-milter/mlfi.c 2022-01-03
10:50:16.000000000 +0100
@@ -736,17 +736,17 @@
l = 0;
*mlfi->mlfi_amabuf = '\0';
if ((policybank_from_daemon_name == 1) && (mlfi->mlfi_daemon_name !=
NULL)) {
- l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+ l = snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
"%s", mlfi->mlfi_daemon_name);
}
if (auth_type != NULL) {
if (l > 0) {
- l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
",");
+ l = snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
",");
}
- l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+ l = snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
"SMTP_AUTH,SMTP_AUTH_%s", auth_type);
if (auth_ssf != NULL && *auth_ssf != '\0') {
- l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+ l = snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
",SMTP_AUTH_%s_%s", auth_type, auth_ssf);
}
}
