rpms/postfix
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed pflogsumm to allow underscores in the syslog_name

Browse Source 
Resolves: rhbz#1931403
This commit is contained in:
Jaroslav Škarvada 2022-01-17 17:25:05 +01:00
parent 6a08ebfa4b
commit 0b687772b3
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pflogsumm-1.1.5-syslog-name-underscore-fix.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/pflogsumm-1.1.5/pflogsumm.pl b/pflogsumm-1.1.5/pflogsumm.pl
index eb527d0..7e26206 100755
--- a/pflogsumm-1.1.5/pflogsumm.pl
+++ b/pflogsumm-1.1.5/pflogsumm.pl
@@ -503,7 +503,12 @@ $usageMsg =
# Accept either "_"s or "-"s in --switches
foreach (@ARGV) {
last if($_ eq "--");
- tr/_/-/ if(/^--\w/);
+ if (/^--\w/)
+ {
+ my @argspl = split("=", $_, 2);
+ $argspl[0] =~ tr/_/-/;
+ $_ = join("=", @argspl);
+ }
}
# Some pre-inits for convenience

9
postfix.spec
View File

@ -49,7 +49,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.6.3 Version: 3.6.3
Release: 4%{?dist} Release: 5%{?dist}
Epoch: 2 Epoch: 2
URL: http://www.postfix.org URL: http://www.postfix.org
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@ -101,6 +101,8 @@ Patch11: postfix-3.4.4-chroot-example-fix.patch
Patch12: postfix-3.6.2-glibc-234-build-fix.patch Patch12: postfix-3.6.2-glibc-234-build-fix.patch
# sent upstream # sent upstream
Patch13: postfix-3.6.2-whitespace-name-fix.patch Patch13: postfix-3.6.2-whitespace-name-fix.patch
# rhbz#1931403, sent upstream
Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
# Optional patches - set the appropriate environment variables to include # Optional patches - set the appropriate environment variables to include
# them when building the package/spec file # them when building the package/spec file
@ -253,6 +255,7 @@ popd
%patch11 -p1 -b .chroot-example-fix %patch11 -p1 -b .chroot-example-fix
%patch12 -p1 -b .glibc-234-build-fix %patch12 -p1 -b .glibc-234-build-fix
%patch13 -p1 -b .whitespace-name-fix %patch13 -p1 -b .whitespace-name-fix
%patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} && iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@ -803,6 +806,10 @@ fi
%endif %endif
%changelog %changelog
* Mon Jan 17 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-5
- Fixed pflogsumm to allow underscores in the syslog_name
Resolves: rhbz#1931403
* Tue Dec 14 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-4 * Tue Dec 14 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-4
- Added SELinux workound for systemd service to work after 'postfix start' - Added SELinux workound for systemd service to work after 'postfix start'