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

Added conditional to dropped macro RES_USE_INET6

Browse Source 
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
Jaroslav Škarvada 2019-05-03 13:41:40 +02:00
parent d588b64057
commit db95d22b84
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postfix-3.4.4-res-insecure-fix.patch → postfix-3.4.4-res-macros-fix.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c
index 5f2cce5..8b50a39 100644 index 5f2cce5..df32345 100644
--- a/src/dns/dns_str_resflags.c --- a/src/dns/dns_str_resflags.c
+++ b/src/dns/dns_str_resflags.c +++ b/src/dns/dns_str_resflags.c
@@ -60,8 +60,12 @@ static const LONG_NAME_MASK resflag_table[] = { @@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = {
"RES_DEFNAMES", RES_DEFNAMES, "RES_DEFNAMES", RES_DEFNAMES,
"RES_STAYOPEN", RES_STAYOPEN, "RES_STAYOPEN", RES_STAYOPEN,
"RES_DNSRCH", RES_DNSRCH, "RES_DNSRCH", RES_DNSRCH,
@ -13,5 +13,9 @@ index 5f2cce5..8b50a39 100644
"RES_INSECURE2", RES_INSECURE2, "RES_INSECURE2", RES_INSECURE2,
+#endif +#endif
"RES_NOALIASES", RES_NOALIASES, "RES_NOALIASES", RES_NOALIASES,
+#ifdef RES_USE_INET6
"RES_USE_INET6", RES_USE_INET6, "RES_USE_INET6", RES_USE_INET6,
+#endif
#ifdef RES_ROTATE #ifdef RES_ROTATE
"RES_ROTATE", RES_ROTATE,
#endif

6
postfix.spec
View File

@ -93,7 +93,7 @@ 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
Patch12: postfix-3.4.4-res-insecure-fix.patch Patch12: postfix-3.4.4-res-macros-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
@ -229,7 +229,7 @@ pushd pflogsumm-%{pflogsumm_ver}
popd popd
%endif %endif
%patch11 -p1 -b .chroot-example-fix %patch11 -p1 -b .chroot-example-fix
%patch12 -p1 -b .res-insecure-fix %patch12 -p1 -b .res-macros-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}{_,} &&
@ -758,7 +758,7 @@ fi
%changelog %changelog
* Fri May 3 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.4-4 * Fri May 3 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.4-4
- Fixed FTBFS with new glibc due to dropped RES_INSECURE1/2 macros - Fixed FTBFS with new glibc due to dropped RES macros
* Fri May 3 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.4-3 * Fri May 3 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.4-3
- Added findutils as explicit requirement - Added findutils as explicit requirement