Dropped whitespace-name-fix patch, not needed

This commit is contained in:
Jaroslav Škarvada 2023-04-26 18:59:11 +02:00
parent a48b20209c
commit ecc0e9b344
2 changed files with 4 additions and 17 deletions

View File

@ -1,13 +0,0 @@
diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c
index f2b86d0..018e39e 100644
--- a/src/cleanup/cleanup_message.c
+++ b/src/cleanup/cleanup_message.c
@@ -772,6 +772,8 @@ static void cleanup_header_done_callback(void *context)
/* Normalize whitespace. */
token = tok822_scan_limit(state->fullname, &dummy_token,
var_token_limit);
+ if (!token)
+ token = tok822_alloc(TOK822_QSTRING, state->fullname);
} else {
token = tok822_alloc(TOK822_QSTRING, state->fullname);
}

View File

@ -49,7 +49,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.8.0 Version: 3.8.0
Release: 1%{?dist} Release: 2%{?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+)
@ -98,8 +98,6 @@ Patch9: pflogsumm-1.1.5-datecalc.patch
# rhbz#1384871, sent upstream # rhbz#1384871, sent upstream
Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
Patch11: postfix-3.4.4-chroot-example-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch
# rhbz#1977732, sent upstream, https://marc.info/?t=162531022900002
Patch12: postfix-3.7.0-whitespace-name-fix.patch
# rhbz#1931403, sent upstream # rhbz#1931403, sent upstream
Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
@ -252,7 +250,6 @@ pushd pflogsumm-%{pflogsumm_ver}
popd popd
%endif %endif
%patch11 -p1 -b .chroot-example-fix %patch11 -p1 -b .chroot-example-fix
%patch12 -p1 -b .whitespace-name-fix
%patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix %patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
# Backport 3.8-20221006 fix for uname -r detection # Backport 3.8-20221006 fix for uname -r detection
@ -807,6 +804,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Apr 26 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.0-2
- Dropped whitespace-name-fix patch, not needed
* Wed Apr 26 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.0-1 * Wed Apr 26 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.0-1
- New version - New version
Resolves: rhbz#2187121 Resolves: rhbz#2187121