Run of fresh-releases for amavisd-milter

• Worker: gke
• Codebase: amavisd-milter
• Change set: 37e8bb50-042d-4ed7-8a98-8fbb193f4d8e
• Upstream Branch URL: https://github.com/prehor/amavisd-milter.git/,branch=master
• Start time: 2022-12-21T05:02
• Duration: 4m41s
• Success probability: 0.26 (based on 2 previous runs)
• Status: success ( schedule control run )
• Description: Merged new upstream version 1.7.2
• Publish Status: approved
• Diff: raw diff, binary diffs are not available (missing control run - schedule control run )
• Command: DEB_UPDATE_CHANGELOG=auto deb-new-upstream --refresh-patches
• Build Version: 1.7.2-1~jan+nur1

Reschedule Reschedule (from scratch) Publish now Reprocess logs

File a Bug against debian-janitor

File a Bug against deb-fix-build

File a Bug against analyse-sbuild-log

File a Bug against deb-new-upstream

Merge these changes:

git pull https://janitor.debian.net/git/amavisd-milter fresh-releases/main

Full worker log

• Full codemod log
• Full build log

Summary

DEB_UPDATE_CHANGELOG=auto deb-new-upstream --refresh-patches

Diff

diff --git a/AMAVISD-MILTER.md b/AMAVISD-MILTER.md
index 94b00af..3708b97 100644
--- a/AMAVISD-MILTER.md
+++ b/AMAVISD-MILTER.md
@@ -62,7 +62,7 @@ The options are as follows:
 
 **-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 @@ The options are as follows:
 ## 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 --git a/CHANGES b/CHANGES
index ba3d4ec..3e84c14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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 --git a/README.md b/README.md
index 710dd95..39680f1 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ amavisd-milter is a milter interface for the [amavis](https://www.amavis.org) sp
 
 The simplest way to compile amavisd-milter:
 ```
-curl -L https://github.com/prehor/amavisd-milter/releases/download/1.7.1/amavisd-milter-1.7.1.tar.gz | tar xfz -
-cd amavisd-milter-1.7.1
+curl -L https://github.com/prehor/amavisd-milter/releases/download/1.7.2/amavisd-milter-1.7.2.tar.gz | tar xfz -
+cd amavisd-milter-1.7.2
 ./configure
 make all
 make install
diff --git a/amavisd-milter/mlfi.c b/amavisd-milter/mlfi.c
index ec4df59..8b2a6f9 100644
--- a/amavisd-milter/mlfi.c
+++ b/amavisd-milter/mlfi.c
@@ -736,17 +736,17 @@ mlfi_envfrom(SMFICTX *ctx, char **envfrom)
     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);
         }
     }
diff --git a/debian/changelog b/debian/changelog
index 3422470..6a2b56a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+amavisd-milter (1.7.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Drop patch manpage-typos, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 21 Dec 2022 05:03:09 -0000
+
 amavisd-milter (1.7.1-3) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/patches/manpage-typos b/debian/patches/manpage-typos
deleted file mode 100644
index 875033e..0000000
--- a/debian/patches/manpage-typos
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix typos in manpage
-Author: Harald Jenny <harald@a-little-linux-box.at>
-Last-Update: 2020-11-09
-
-Index: pkg-amavisd-milter/AMAVISD-MILTER.md
-===================================================================
---- pkg-amavisd-milter.orig/AMAVISD-MILTER.md
-+++ pkg-amavisd-milter/AMAVISD-MILTER.md
-@@ -62,7 +62,7 @@ The options are as follows:
- 
- **-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 @@ The options are as follows:
- ## 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 --git a/debian/patches/manpage-users b/debian/patches/manpage-users
index 9d01550..f0aeeac 100644
--- a/debian/patches/manpage-users
+++ b/debian/patches/manpage-users
@@ -3,10 +3,10 @@ Author: Harald Jenny <harald@a-little-linux-box.at>
 Forwarded: not-needed
 Last-Update: 2020-02-09
 
-Index: pkg-amavisd-milter/AMAVISD-MILTER.md
+Index: amavisd-milter.git/AMAVISD-MILTER.md
 ===================================================================
---- pkg-amavisd-milter.orig/AMAVISD-MILTER.md
-+++ pkg-amavisd-milter/AMAVISD-MILTER.md
+--- amavisd-milter.git.orig/AMAVISD-MILTER.md
++++ amavisd-milter.git/AMAVISD-MILTER.md
 @@ -197,14 +197,14 @@ The actual name is shown in the *$daemon
  To limit the maximum concurrent connections to amavis, run amavisd-milter with
  this options:
diff --git a/debian/patches/pidfile-location b/debian/patches/pidfile-location
index 92c64ce..4726c20 100644
--- a/debian/patches/pidfile-location
+++ b/debian/patches/pidfile-location
@@ -3,10 +3,10 @@ Author: Harald Jenny <harald@a-little-linux-box.at>
 Forwarded: not-needed
 Last-Update: 2010-10-26
 
-Index: pkg-amavisd-milter/amavisd-milter/main.c
+Index: amavisd-milter.git/amavisd-milter/main.c
 ===================================================================
---- pkg-amavisd-milter.orig/amavisd-milter/main.c
-+++ pkg-amavisd-milter/amavisd-milter/main.c
+--- amavisd-milter.git.orig/amavisd-milter/main.c
++++ amavisd-milter.git/amavisd-milter/main.c
 @@ -43,7 +43,7 @@ int             max_conns = 0;
  int             max_wait = 5 * 60;
  sem_t           max_sem_t;
diff --git a/debian/patches/series b/debian/patches/series
index bd36dbb..b4aef9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 pidfile-location
 manpage-users
-manpage-typos

Publish History

• 2022-12-21T10:44: Failed to create merge proposal: missing-build-diff-control ( Missing binary diff; requesting control run. )

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases amavisd-milter-dbgsymapt install -t fresh-releases amavisd-milter

Lintian Result

• amavisd-milter-dbgsym_1.7.2-1~jan+nur1_amd64.deb
• amavisd-milter_1.7.2-1~jan+nur1.dsc
• amavisd-milter_1.7.2-1~jan+nur1_amd64.buildinfo
• amavisd-milter_1.7.2-1~jan+nur1_amd64.deb
• amavisd-milter_1.7.2-1~jan+nur1_amd64.changes

Reviews

Reviewer	Verdict	Comment
jelmer@debian.org	approved