From patchwork Wed Feb 5 11:45:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2756 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48CKWm4GG1z3xyL for ; Wed, 5 Feb 2020 11:45:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48CKWl5FZVz6ZZ; Wed, 5 Feb 2020 11:45:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48CKWl1xS0z2yZv; Wed, 5 Feb 2020 11:45:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48CKWh5WxMz2yRX for ; Wed, 5 Feb 2020 11:45:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48CKWh0HN8z6ZP; Wed, 5 Feb 2020 11:45:52 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1580903152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AzUFsaWpGuiKDpg0nMolnvkA+PGLszq+IESTE8jpUkY=; b=r+QO0cWka4w/8ABAj9ET7niOW7Lv16cWGlykyZ2zN+nKsuFPa07P5MhgBNNuDnWbQTodUB 2JPYc4rsGjRANNBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1580903152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AzUFsaWpGuiKDpg0nMolnvkA+PGLszq+IESTE8jpUkY=; b=JlyyARjUvvbjaXqetb1qaPSXLEAlRiricYFGgO9IangR0X9JVaUizaBCHHz5Bbwv+hAxSc +LBdeU43sbWcWGfQqa4g8LoRWAJxjMJEJlV6pMbnhlfpEk5GAAOkEKXdf8q5RGoxvIxr8m zfg0SkTM337V4MMwd6UVygXvojkC/Lt7zMRBb9aWa/kl5pYiFFBiEAlo8OV6okzFUbQpx/ 7OPXdEaontlFWi1VjxZ9vRPisreXXGDTVrJtTxyO8rAsm1Uke0XUponfM0YpfGj6ZE5QfY dK6a5Lb8Y04PfpPFEyvvOK+f2vg679FTjEFTMmM7xy/hUUsvE0qrjRgG7UwWkw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/5] postfix: Fix FTBFS with glibc >= 2.30 Date: Wed, 5 Feb 2020 11:45:44 +0000 Message-Id: <20200205114547.16047-2-michael.tremer@ipfire.org> In-Reply-To: <20200205114547.16047-1-michael.tremer@ipfire.org> References: <20200205114547.16047-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- 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 . + """ + 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