From patchwork Fri Feb 4 16:47:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5060 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jr1gf30xxz3wsl for ; Fri, 4 Feb 2022 16:48:14 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jr1gN17hnz5Mr; Fri, 4 Feb 2022 16:48:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jr1gM4Kktz32MW; Fri, 4 Feb 2022 16:47:59 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jr1gJ6rzCz2ynw for ; Fri, 4 Feb 2022 16:47:56 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jr1gJ5qtXzWG; Fri, 4 Feb 2022 16:47:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643993276; 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=OhZsPXocnpjhdCZpCPdV365NXrgUvhoaLnaBVtSvdEw=; b=XFX5L8oxnnF1U47Wie81tjjWlVqA0QUXOrwBU8s95qgdaGuJKu1j630pIbQp8L/4Ed1pzd 4TZu/78pNXoYM6BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643993276; 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=OhZsPXocnpjhdCZpCPdV365NXrgUvhoaLnaBVtSvdEw=; b=v+7FLkltLIlfgdxdjzZvVfxg4d4UJ9Va0ok1yWLZfjAR9c0CJa+AZRNVroMdxfP2UppLhD bXREkUHAksezMkWprhIn4ED0ikA7CzCmmszBCPCbKQibOD1xtJmhKeICMRkhuA61jSoFad WX4ztU46RdxjR5+HYrhL+bBYoYMBIL3llXPCNt7RfEJwWhjn+zdff9coOcl/M1TJAChp4F VycQg19hSuTcCYAVZ0+UrS1m32bLLrJauvCba/j5QSL9SNOhTMGHp1WnH85cAny/J82RwJ hlTrPnPasAhA1rKSBHKVTzzOGJykcp5dlmjTqVVwrdaalZvd1bi5lN2WlkjNAA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/28] postfix: Fix FTBFS with glibc 2.34 Date: Fri, 4 Feb 2022 16:47:29 +0000 Message-Id: <20220204164748.315559-9-michael.tremer@ipfire.org> In-Reply-To: <20220204164748.315559-1-michael.tremer@ipfire.org> References: <20220204164748.315559-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.6.2-glibc-234-build-fix.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 src/patches/postfix-3.6.2-glibc-234-build-fix.patch diff --git a/lfs/postfix b/lfs/postfix index 6fe46d9a8..0dcccadb6 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.6.2-glibc-234-build-fix.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.6.2-glibc-234-build-fix.patch b/src/patches/postfix-3.6.2-glibc-234-build-fix.patch new file mode 100644 index 000000000..b678b78b6 --- /dev/null +++ b/src/patches/postfix-3.6.2-glibc-234-build-fix.patch @@ -0,0 +1,14 @@ +diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h +index 99bec9b..95c78ec 100644 +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -802,6 +803,9 @@ extern int initgroups(const char *, int); + #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" + #endif + #endif ++#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34) ++#define HAS_CLOSEFROM ++#endif + #include + #if !defined(KERNEL_VERSION) + #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1)