From a1ef3f35c1d3b08bc0337b4032004e42de428172 Mon Sep 17 00:00:00 2001 From: eaglegai Date: Thu, 30 Jul 2020 16:03:48 +0800 Subject: [PATCH] fix build fail with glibc new version --- fix-build-error-with_glibc2.30-ftbfs.patch | 51 ++++++++++++++++++++++ postfix.spec | 25 +++++++---- 2 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 fix-build-error-with_glibc2.30-ftbfs.patch diff --git a/fix-build-error-with_glibc2.30-ftbfs.patch b/fix-build-error-with_glibc2.30-ftbfs.patch new file mode 100644 index 0000000..c36baf0 --- /dev/null +++ b/fix-build-error-with_glibc2.30-ftbfs.patch @@ -0,0 +1,51 @@ +Description: fix build with glibc 2.30 + glibc 2.30 release notes at + https://savannah.gnu.org/forum/forum.php?forum_id=9515 states: + """ + Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6 + resolver flag (deprecated in glibc 2.25) have been removed. + ... + The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub + resolver have been removed from . + """ + And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are + being guarded with the same fix. +Origin: upstream, https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa +Bug: http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923 +Last-Update: 2019-09-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/postfix/src/dns/dns_str_resflags.c b/postfix/src/dns/dns_str_resflags.c +index 5f2cce5e..472394c3 100644 +--- a/src/dns/dns_str_resflags.c ++++ b/src/dns/dns_str_resflags.c +@@ -52,18 +52,28 @@ + static const LONG_NAME_MASK resflag_table[] = { + "RES_INIT", RES_INIT, + "RES_DEBUG", RES_DEBUG, ++#ifdef RES_AAONLY + "RES_AAONLY", RES_AAONLY, ++#endif + "RES_USEVC", RES_USEVC, ++#ifdef RES_PRIMARY + "RES_PRIMARY", RES_PRIMARY, ++#endif + "RES_IGNTC", RES_IGNTC, + "RES_RECURSE", RES_RECURSE, + "RES_DEFNAMES", RES_DEFNAMES, + "RES_STAYOPEN", RES_STAYOPEN, + "RES_DNSRCH", RES_DNSRCH, ++#ifdef RES_INSECURE1 + "RES_INSECURE1", RES_INSECURE1, ++#endif ++#ifdef RES_INSECURE2 + "RES_INSECURE2", RES_INSECURE2, ++#endif + "RES_NOALIASES", RES_NOALIASES, ++#ifdef RES_USE_INET6 + "RES_USE_INET6", RES_USE_INET6, ++#endif + #ifdef RES_ROTATE + "RES_ROTATE", RES_ROTATE, + #endif diff --git a/postfix.spec b/postfix.spec index 4467b3a..b335c99 100644 --- a/postfix.spec +++ b/postfix.spec @@ -23,7 +23,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.3.1 -Release: 10 +Release: 11 Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -40,10 +40,10 @@ Patch1: postfix-3.2.0-config.patch Patch2: postfix-3.1.0-files.patch Patch3: postfix-3.1.0-alternatives.patch Patch4: postfix-3.2.0-large-fs.patch -Patch9: pflogsumm-1.1.5-datecalc.patch -Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch - -Patch6000: fix-postfix-build-failed.patch +Patch5: pflogsumm-1.1.5-datecalc.patch +Patch6: pflogsumm-1.1.5-ipv6-warnings-fix.patch +Patch7: fix-postfix-build-failed.patch +Patch8: fix-build-error-with_glibc2.30-ftbfs.patch BuildRequires: libdb-devel perl-generators pkgconfig zlib-devel systemd-units libicu-devel libnsl2-devel gcc m4 openldap-devel BuildRequires: cyrus-sasl-devel pcre-devel mariadb-connector-c-devel postgresql-devel sqlite-devel tinycdb-devel openssl-devel procps-ng @@ -105,13 +105,14 @@ maps with Postfix, you need this. %package_help %prep -%setup -q +%setup -qn %{name}-%{version} %patch1 -p1 -b .config %patch2 -p1 -b .files %patch3 -p1 -b .alternatives %patch4 -p1 -b .large-fs -%patch6000 -p1 +%patch7 -p1 +%patch8 -p1 sed -i \ 's|^\(\s*#define\s\+DEF_SHLIB_DIR\s\+\)"/usr/lib/postfix"|\1"%{_libdir}/postfix"|' \ @@ -121,8 +122,8 @@ src/util/dict_db.c gzip -dc %{SOURCE53} | tar xf - pushd pflogsumm-1.1.5 -%patch9 -p1 -b .datecalc -%patch10 -p1 -b .ipv6-warnings-fix +%patch5 -p1 -b .datecalc +%patch6 -p1 -b .ipv6-warnings-fix popd for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do @@ -505,6 +506,12 @@ fi %{postfix_doc_dir}/README_FILES/* %changelog +* Thu Jul 30 2020 gaihuiying - 2:3.3.1-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix build fail with glibc new version + * Wed Dec 25 2019 openEuler Buildteam - 2:3.3.1-10 - change permission of files