Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- lfs/postfix | 1 + .../postfix-3.4.8-build-fix-glibc-2.30.patch | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 src/patches/postfix-3.4.8-build-fix-glibc-2.30.patch
diff --git a/lfs/postfix b/lfs/postfix index 887051470..f23636478 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -99,6 +99,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/postfix-3.4.8-build-fix-glibc-2.30.patch cd $(DIR_APP) && make -f Makefile.init makefiles \ DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)" cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/postfix-3.4.8-build-fix-glibc-2.30.patch b/src/patches/postfix-3.4.8-build-fix-glibc-2.30.patch new file mode 100644 index 000000000..c36baf0b9 --- /dev/null +++ b/src/patches/postfix-3.4.8-build-fix-glibc-2.30.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 <resolv.h>. + """ + 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/3274c3cea9d739f86e84b65664aabb69... +Bug: http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.... +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