Control: tags 1078150 + pending Dear maintainer,
I've prepared an NMU for rspamd (versioned as 3.8.1-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
diff -Nru rspamd-3.8.1/debian/changelog rspamd-3.8.1/debian/changelog --- rspamd-3.8.1/debian/changelog 2024-06-11 00:57:11.000000000 +0200 +++ rspamd-3.8.1/debian/changelog 2024-09-16 23:23:06.000000000 +0200 @@ -1,3 +1,12 @@ +rspamd (3.8.1-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "autopkgtest regression with Perl 5.40: FAIL stderr: Duplicate + specification": add patches from Niko Tiny to fix Getopt::Long usage with + Perl 5.40. (Closes: #1078150) + + -- gregor herrmann <gre...@debian.org> Mon, 16 Sep 2024 23:23:06 +0200 + rspamd (3.8.1-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru rspamd-3.8.1/debian/patches/rspamd_stats-configure-getoptlong-to-not.patch rspamd-3.8.1/debian/patches/rspamd_stats-configure-getoptlong-to-not.patch --- rspamd-3.8.1/debian/patches/rspamd_stats-configure-getoptlong-to-not.patch 1970-01-01 01:00:00.000000000 +0100 +++ rspamd-3.8.1/debian/patches/rspamd_stats-configure-getoptlong-to-not.patch 2024-09-16 23:03:42.000000000 +0200 @@ -0,0 +1,22 @@ +From: Niko Tyni <nt...@debian.org> +Date: Sun, 25 Aug 2024 08:21:34 +0100 +X-Dgit-Generated: 3.8.1-1.2 3ca6f8d9d29d6645788ec3802225997b51813713 +Subject: rspamd_stats: Configure Getopt::Long to not ignore case + +Bug-Debian: https://bugs.debian.org/1078150 + +--- + +diff --git a/utils/rspamd_stats.pl b/utils/rspamd_stats.pl +index 4fdcf55..b757d20 100755 +--- a/utils/rspamd_stats.pl ++++ b/utils/rspamd_stats.pl +@@ -2,7 +2,7 @@ + + use 5.010; + use Data::Dumper; +-use Getopt::Long; ++use Getopt::Long qw( :config no_ignore_case ); + use Pod::Usage; + use Time::Local; + use IO::Handle; diff -Nru rspamd-3.8.1/debian/patches/rspamd_stats-use--j-for---json-to-fix-co.patch rspamd-3.8.1/debian/patches/rspamd_stats-use--j-for---json-to-fix-co.patch --- rspamd-3.8.1/debian/patches/rspamd_stats-use--j-for---json-to-fix-co.patch 1970-01-01 01:00:00.000000000 +0100 +++ rspamd-3.8.1/debian/patches/rspamd_stats-use--j-for---json-to-fix-co.patch 2024-09-16 23:04:00.000000000 +0200 @@ -0,0 +1,22 @@ +From: Niko Tyni <nt...@debian.org> +Date: Sun, 25 Aug 2024 08:32:30 +0100 +X-Dgit-Generated: 3.8.1-1.2 7709132449186bfab0802c0bb4a013c79363e82e +Subject: rspamd_stats: use -J for --json to fix conflict with --junk-score + +Bug-Debian: https://bugs.debian.org/1078150 + +--- + +diff --git a/utils/rspamd_stats.pl b/utils/rspamd_stats.pl +index b757d20..e262c39 100755 +--- a/utils/rspamd_stats.pl ++++ b/utils/rspamd_stats.pl +@@ -57,7 +57,7 @@ GetOptions( + "end=s" => \$endTime, + "num-logs|n=i" => \$num_logs, + "exclude-logs|x=i" => \$exclude_logs, +- "json|j" => \$json, ++ "json|J" => \$json, + "help|?" => \$help, + "man" => \$man + ) or pod2usage(2); diff -Nru rspamd-3.8.1/debian/patches/series rspamd-3.8.1/debian/patches/series --- rspamd-3.8.1/debian/patches/series 2024-01-27 11:28:40.000000000 +0100 +++ rspamd-3.8.1/debian/patches/series 2024-09-16 23:04:00.000000000 +0200 @@ -2,3 +2,5 @@ 0003-add-versions-to-shared-libraries.patch 0004-drop-js-scripts-packaged-by-Debian.patch 0006-do-not-install-fonts-packaged-by-Debian.patch +rspamd_stats-configure-getoptlong-to-not.patch +rspamd_stats-use--j-for---json-to-fix-co.patch
signature.asc
Description: Digital Signature
