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

Fixed cleanup crash when processing messages with whitespace only fullname

Browse Source 
Fixed whitespaces in the glibc-234-build-fix patch
This commit is contained in:
Jaroslav Škarvada 2021-08-05 11:24:52 +02:00
parent d71adada04
commit 2f9d42453e
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postfix-3.6.2-glibc-234-build-fix.patch
View File

@ -2,14 +2,6 @@ diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
index 99bec9b..95c78ec 100644 index 99bec9b..95c78ec 100644
--- a/src/util/sys_defs.h --- a/src/util/sys_defs.h
+++ b/src/util/sys_defs.h +++ b/src/util/sys_defs.h
@@ -1,6 +1,7 @@
#ifndef _SYS_DEFS_H_INCLUDED_
#define _SYS_DEFS_H_INCLUDED_
+
/*++
/* NAME
/* sys_defs 3h
@@ -802,6 +803,9 @@ extern int initgroups(const char *, int); @@ -802,6 +803,9 @@ extern int initgroups(const char *, int);
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#endif #endif

13
postfix-3.6.2-whitespace-name-fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c
index 391c711..be5ce42 100644
--- a/src/cleanup/cleanup_message.c
+++ b/src/cleanup/cleanup_message.c
@@ -773,6 +773,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);
}

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.2 Version: 3.6.2
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+)
@ -96,6 +96,8 @@ 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
# upstream patch # upstream patch
Patch12: postfix-3.6.2-glibc-234-build-fix.patch Patch12: postfix-3.6.2-glibc-234-build-fix.patch
# sent upstream
Patch13: postfix-3.6.2-whitespace-name-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
@ -247,6 +249,7 @@ popd
%endif %endif
%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
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}{_,} &&
@ -796,6 +799,10 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-5
- Fixed cleanup crash when processing messages with whitespace only fullname
- Fixed whitespaces in the glibc-234-build-fix patch
* Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-4 * Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-4
- Updated patch fixing FTBFS with the glibc-2.34 - Updated patch fixing FTBFS with the glibc-2.34