diff mbox series

[1/9] postfix: patch for build with kernel 6.x

Message ID 20230107114701.4075482-2-arne_f@ipfire.org
State Accepted
Commit 0c3838cb407b76de611db906a5cc38bfc8b37562
Headers
Series [1/9] postfix: patch for build with kernel 6.x |

Commit Message

Arne Fitzenreiter Jan. 7, 2023, 11:46 a.m. UTC 
  ---
 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 mbox series

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  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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