From: Peter Müller <peter.mueller@ipfire.org>
Date: Mon, 24 Apr 2023 18:58:25 +0000 (+0000)
Subject: Postfix: Update to 3.8.0
X-Git-Tag: v2.27-core175~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68a18ea0a99a19ddf00d3a9295ca3cc6b94a60c3;p=ipfire-2.x.git

Postfix: Update to 3.8.0

Please refer to https://www.postfix.org/announcements/postfix-3.8.0.html
for this versions' release announcement.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/lfs/postfix b/lfs/postfix
index f19840aa62..73527c0c9a 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = A fast, secure, and flexible mailer
 
-VER        = 3.7.3
+VER        = 3.8.0
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 39
+PAK_VER    = 40
 
 DEPS       =
 
@@ -70,7 +70,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 005abf49b27e59bd3e3251e345df4da0c830314c4d4478aee11057163166afa1a0159017c46bead6572d29d9738a18e1a42a0b72fe260facd3ad77f8ed309271
+$(DL_FILE)_BLAKE2 = 3ef0c0c83eed3263c890143ae962674dfbfa01f589f1b503a01d57497e4732171aa58468357276f29a9454c577573e8442095c2db25005324754dbd305875297
 
 install : $(TARGET)
 
@@ -103,8 +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)"
 	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
deleted file mode 100644
index b678b78b6a..0000000000
--- a/src/patches/postfix-3.6.2-glibc-234-build-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 <linux/version.h>
- #if !defined(KERNEL_VERSION)
- #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1)
diff --git a/src/patches/postfix/postfix-3.7.2-fix_linux6.patch b/src/patches/postfix/postfix-3.7.2-fix_linux6.patch
deleted file mode 100644
index f5a9c5826a..0000000000
--- a/src/patches/postfix/postfix-3.7.2-fix_linux6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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