From patchwork Sat Jan 7 11:46:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 6411 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 4Npz3321WTz40Qr for ; Sat, 7 Jan 2023 11:47:27 +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 4Npz2z2D1Bz38X; Sat, 7 Jan 2023 11:47:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Npz2y6bdJz2xbt; Sat, 7 Jan 2023 11:47:22 +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 4Npz2x3t9Gz2xbt for ; Sat, 7 Jan 2023 11:47:21 +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 4Npz2w5p8nzh3; Sat, 7 Jan 2023 11:47:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1673092041; 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=25RrRiWCva10rx5ocB448o5BFDxAFI2pj7fsJhKAqJ0=; b=08aWGW72Q7t/C64N6GC6Ere7s4i/mlLL0S5mZEdbsXsGCjwFGwJd94fFRyfawh6R8o1+kZ tj1V/hPyIDjPzdBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1673092041; 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=25RrRiWCva10rx5ocB448o5BFDxAFI2pj7fsJhKAqJ0=; b=WK8mZjq4F4WfguSkKNrYn/oTOvzr+sAPajVj5rM0LvbSzM/LAlkAx0t+mVgCZ7zE0MR2XB WEAJKmOGOZBFrFZ8EFymNbtl2KNq+hR4w9s43bvwh1gjHODl11BIen0Ho4MqsXMsyzwPiX IF0ZdvOjrqr0nWI/zaNCmbcQtw38c3CvmMUtI1BIyuCoOG4Xf7MtebDoJ4xcvuTLB3fiNw bbfrBi/baC7kLIP/ZOFB+ucA/lTDoegZuJ8UdrBRHNyyRt0Q2WwqxRuLfBdQ7rpvdNM+ry wtlLk9yKG0lk4wMH/t9gwWwwdXM4z7XVnh4LCRoDRnBacbHmKxixwAjuFIKl0A== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH 1/9] postfix: patch for build with kernel 6.x Date: Sat, 7 Jan 2023 11:46:53 +0000 Message-Id: <20230107114701.4075482-2-arne_f@ipfire.org> In-Reply-To: <20230107114701.4075482-1-arne_f@ipfire.org> References: <20230107114701.4075482-1-arne_f@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: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- lfs/postfix | 3 ++- .../postfix/postfix-3.7.2-fix_linux6.patch | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/patches/postfix/postfix-3.7.2-fix_linux6.patch diff --git a/lfs/postfix b/lfs/postfix index 0a078b8d2..160772bee 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -103,6 +103,7 @@ $(subst %,%_BLAKE2,$(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/postfix-3.7.2-fix_linux6.patch 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)" diff --git a/src/patches/postfix/postfix-3.7.2-fix_linux6.patch b/src/patches/postfix/postfix-3.7.2-fix_linux6.patch new file mode 100644 index 000000000..f5a9c5826 --- /dev/null +++ b/src/patches/postfix/postfix-3.7.2-fix_linux6.patch @@ -0,0 +1,24 @@ +diff -Naur postfix-3.7.2.org/makedefs postfix-3.7.2/makedefs +--- postfix-3.7.2.org/makedefs 2022-01-23 21:53:41.000000000 +0100 ++++ postfix-3.7.2/makedefs 2022-10-18 16:11:50.259575443 +0200 +@@ -627,7 +627,7 @@ + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; +- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR ++ Linux.[3-6].*) SYSTYPE=LINUX$RELEASE_MAJOR + case "$CCARGS" in + *-DNO_DB*) ;; + *-DHAS_DB*) ;; +diff -Naur postfix-3.7.2.org/src/util/sys_defs.h postfix-3.7.2/src/util/sys_defs.h +--- postfix-3.7.2.org/src/util/sys_defs.h 2021-12-05 19:59:27.000000000 +0100 ++++ postfix-3.7.2/src/util/sys_defs.h 2022-10-18 16:09:29.682371415 +0200 +@@ -751,7 +751,7 @@ + /* + * LINUX. + */ +-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) ++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) || defined(LINUX6) + #define SUPPORTED + #define UINT32_TYPE unsigned int + #define UINT16_TYPE unsigned short