postfix: upgrade 3.6.3 -> 3.6.4

Refresh patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch

@@ -1,8 +1,9 @@
-From 4f49e2ce420fb3c17415937530493158ef312733 Mon Sep 17 00:00:00 2001
+From 9000ee4d8bb5c5e0bcc588e9bec86eb56f4285e1 Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Fri, 19 Jun 2015 16:45:54 +0900
-Subject: [PATCH] 1)remove RANLIB, SYSLIBS, AR and get them from env.
+Subject: [PATCH] Fix makedefs
 
+1)remove RANLIB, SYSLIBS, AR and get them from env.
 2)reference sysroot when searching header files
 3)include sysroot path instead of absolute include path
 for Linux2 and Linux3 systems.
@@ -18,10 +19,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
  1 file changed, 11 insertions(+), 16 deletions(-)
 
 diff --git a/makedefs b/makedefs
-index 8b84e47..893fb0d 100644
+index 3448c1e..78e0717 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -170,9 +170,6 @@ echo "# pie=$pie"
+@@ -197,9 +197,6 @@ echo "# pie=$pie"
  
  # Defaults for most sane systems
  
@@ -31,7 +32,7 @@ index 8b84e47..893fb0d 100644
  ARFL=rv
  
  # Ugly function to make our error message more visible among the
-@@ -424,12 +421,12 @@ case "$SYSTEM.$RELEASE" in
+@@ -492,12 +489,12 @@ case "$SYSTEM.$RELEASE" in
  		case "$CCARGS" in
  		 *-DNO_DB*) ;;
  		 *-DHAS_DB*) ;;
@@ -47,7 +48,7 @@ index 8b84e47..893fb0d 100644
  		    else
  			# No, we're not going to try db1 db2 db3 etc.
  			# On a properly installed system, Postfix builds
-@@ -438,12 +435,12 @@ case "$SYSTEM.$RELEASE" in
+@@ -506,12 +503,12 @@ case "$SYSTEM.$RELEASE" in
  			echo "Install the appropriate db*-devel package first." 1>&2
  			exit 1
  		    fi
@@ -62,7 +63,7 @@ index 8b84e47..893fb0d 100644
  		    do
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
-@@ -463,7 +460,7 @@ case "$SYSTEM.$RELEASE" in
+@@ -531,7 +528,7 @@ case "$SYSTEM.$RELEASE" in
  		       if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ]
  		       then
  			   :
@@ -71,7 +72,7 @@ index 8b84e47..893fb0d 100644
  		       then
  			   echo CCARGS="$CCARGS -DNO_EPOLL"
  		       else
-@@ -487,8 +484,6 @@ int     main(int argc, char **argv)
+@@ -555,8 +552,6 @@ int     main(int argc, char **argv)
  }
  EOF
  			   ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1
@@ -80,7 +81,7 @@ index 8b84e47..893fb0d 100644
  			   rm -f makedefs.test makedefs.test.[co]
  		       fi;;
  		esac
-@@ -504,12 +499,12 @@ EOF
+@@ -572,12 +567,12 @@ EOF
  		case "$CCARGS" in
  		 *-DNO_DB*) ;;
  		 *-DHAS_DB*) ;;
@@ -96,7 +97,7 @@ index 8b84e47..893fb0d 100644
  		    else
  			# On a properly installed system, Postfix builds
  			# by including <db.h> and by linking with -ldb
-@@ -517,12 +512,12 @@ EOF
+@@ -585,12 +580,12 @@ EOF
  			echo "Install the appropriate db*-devel package first." 1>&2
  			exit 1
  		    fi
@@ -112,5 +113,5 @@ index 8b84e47..893fb0d 100644
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
 -- 
-1.8.4.2
+2.17.1
 

meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch

@@ -1,4 +1,4 @@
-From 190650e1cd5700cd6950ead3fcb17ebcec192a2e Mon Sep 17 00:00:00 2001
+From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Fri, 19 Jun 2015 17:14:58 +0900
 Subject: [PATCH] Change fixed postconf to a variable for cross-compiling
@@ -7,14 +7,28 @@ Upstreamstatus: Inappropriate [embedded specific]
 
 Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
 ---
+ Makefile.in     |  2 +-
  postfix-install | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 65e7911..40295be 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,7 @@ META	= meta/main.cf.proto meta/master.cf.proto meta/postfix-files \
+ EXPAND	= sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
+ 	    -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
+ SHLIB_DIR_OVERRIDE = \
+-	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
++	$${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
+ 
+ default: update
  
 diff --git a/postfix-install b/postfix-install
-index 1662c3d..d11fa12 100644
+index e498cd3..8049f43 100644
 --- a/postfix-install
 +++ b/postfix-install
-@@ -226,8 +226,8 @@ test -z "$non_interactive" -a ! -t 0 && {
+@@ -244,8 +244,8 @@ test -z "$non_interactive" -a ! -t 0 && {
      exit 1
  }
  
@@ -25,7 +39,7 @@ index 1662c3d..d11fa12 100644
      exit 1
  }
  
-@@ -248,7 +248,7 @@ do
+@@ -266,7 +266,7 @@ do
      case "$junk" in
      *MAIL_VERSION*) 
  	case "$mail_version" in
@@ -34,7 +48,7 @@ index 1662c3d..d11fa12 100644
  	esac
  	val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
  	case "$val" in
-@@ -434,7 +434,7 @@ template files main.cf.proto and master.cf.proto."
+@@ -454,7 +454,7 @@ template files main.cf.proto and master.cf.proto."
  
  : ${install_root=/}
  : ${tempdir=`pwd`}
@@ -43,7 +57,7 @@ index 1662c3d..d11fa12 100644
  
  # Find out the location of installed configuration files.
  
-@@ -500,7 +500,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
+@@ -520,7 +520,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
  	case "$junk" in
  	"") eval unset $name;;
  	esac
@@ -52,7 +66,7 @@ index 1662c3d..d11fa12 100644
  	    exit 1
      done
  }
-@@ -513,7 +513,7 @@ do
+@@ -533,7 +533,7 @@ do
      case "$junk" in
      "") eval unset $name;;
      esac
@@ -61,7 +75,7 @@ index 1662c3d..d11fa12 100644
  done
  
  # Override settings manually.
-@@ -639,6 +639,8 @@ README_DIRECTORY=$install_root$readme_directory
+@@ -670,6 +670,8 @@ README_DIRECTORY=$install_root$readme_directory
  SHLIB_DIRECTORY=$install_root$shlib_directory
  META_DIRECTORY=$install_root$meta_directory
  
@@ -70,16 +84,16 @@ index 1662c3d..d11fa12 100644
  # Avoid repeated tests for existence of these; default permissions suffice.
  
  test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
-@@ -810,7 +812,7 @@ IFS="$BACKUP_IFS"
+@@ -841,7 +843,7 @@ IFS="$BACKUP_IFS"
  # the wrong place when Postfix is being upgraded.
  
  case "$mail_version" in
 -"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
++"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
  esac
  
  # Undo MAIL_VERSION expansion at the end of a parameter value. If
-@@ -830,7 +832,7 @@ do
+@@ -861,7 +863,7 @@ do
      esac
  done
  
@@ -89,5 +103,5 @@ index 1662c3d..d11fa12 100644
      "data_directory = $data_directory" \
      "command_directory = $command_directory" \
 -- 
-1.8.4.2
+2.17.1
 

meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch

@@ -1,4 +1,4 @@
-From a0d0de10e4c5ab55bc2fa48798079e2876b1211d Mon Sep 17 00:00:00 2001
+From 995bddd9563b1aecca2369f2f9c675f88bdc0053 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 26 Aug 2017 10:29:37 -0700
 Subject: [PATCH] makedefs: Use native compiler to build makedefs.test
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/makedefs b/makedefs
-index 9fd4bc2..5ee7747 100644
+index 78e0717..3299eba 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -526,7 +526,7 @@ int     main(int argc, char **argv)
+@@ -551,7 +551,7 @@ int     main(int argc, char **argv)
      exit(0);
  }
  EOF
@@ -23,7 +23,7 @@ index 9fd4bc2..5ee7747 100644
  			   rm -f makedefs.test makedefs.test.[co]
  		       fi;;
  		esac
-@@ -762,7 +762,7 @@ int     main(int argc, char **argv)
+@@ -787,7 +787,7 @@ int     main(int argc, char **argv)
      exit(0);
  }
  EOF
@@ -32,7 +32,7 @@ index 9fd4bc2..5ee7747 100644
  		   ./makedefs.test 2>/dev/null ||
  			CCARGS="$CCARGS -DNO_SIGSETJMP"
  		   rm -f makedefs.test makedefs.test.[co]
-@@ -796,7 +796,7 @@ int main(int argc, char **argv)
+@@ -823,7 +823,7 @@ int main(int argc, char **argv)
  				  &error) != 14);
  }
  EOF
@@ -41,7 +41,7 @@ index 9fd4bc2..5ee7747 100644
  			$icu_ldflags >/dev/null 2>&1
  		    if ./makedefs.test 2>/dev/null ; then
  			CCARGS="$CCARGS $icu_cppflags"
-@@ -911,7 +911,7 @@ int     main(void)
+@@ -938,7 +938,7 @@ int     main(void)
      exit(ferror(stdout) ? 1 : 0);
  }
  EOF
@@ -50,7 +50,7 @@ index 9fd4bc2..5ee7747 100644
      ./makedefs.test || exit 1
      rm -f makedefs.test makedefs.test.[co]
  }
-@@ -1067,7 +1067,7 @@ int     main(void)
+@@ -1094,7 +1094,7 @@ int     main(void)
      exit(ferror(stdout) ? 1 : 0);
  }
  EOF
@@ -60,5 +60,5 @@ index 9fd4bc2..5ee7747 100644
  	rm -f makedefs.test makedefs.test.[co]
  	eval ${parm_name}=\""\$parm_val"\"
 -- 
-2.14.1
+2.17.1
 

meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch

@@ -1,3 +1,8 @@
+From afef4a9391e6bb1a6c3e73d370f240577ed8b0dd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 16 Jan 2022 11:21:54 +0800
+Subject: [PATCH] Fix icu config
+
 do not entertain cppflags from icu, this is because
 icu-config feeds the -I path without sysroot which
 caused native headers to be included and build is
@@ -6,12 +11,15 @@ to the CCARGS which we loose nothing if its not
 entertained.
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ makedefs | 1 -
+ 1 file changed, 1 deletion(-)
 
-Index: postfix-3.2.2/makedefs
+diff --git a/makedefs b/makedefs
-===================================================================
+index 3299eba..2a76f20 100644
---- postfix-3.2.2.orig/makedefs
+--- a/makedefs
-+++ postfix-3.2.2/makedefs
++++ b/makedefs
-@@ -799,7 +799,6 @@ EOF
+@@ -826,7 +826,6 @@ EOF
  		    ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \
  			$icu_ldflags >/dev/null 2>&1
  		    if ./makedefs.test 2>/dev/null ; then
@@ -19,3 +27,6 @@ Index: postfix-3.2.2/makedefs
  			SYSLIBS="$SYSLIBS $icu_ldflags"
  		    else
  			CCARGS="$CCARGS -DNO_EAI"
+-- 
+2.17.1
+

meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch

@@ -1,4 +1,4 @@
-From 4caa18feb70f8f3d133657c1250a53f4e292bb42 Mon Sep 17 00:00:00 2001
+From 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Fri, 12 Oct 2018 12:38:02 +0800
 Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default
@@ -14,10 +14,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 2 insertions(+), 20 deletions(-)
 
 diff --git a/makedefs b/makedefs
-index 2683bce..8f1b3f4 100644
+index 2a76f20..9d5db9f 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -484,16 +484,7 @@ case "$SYSTEM.$RELEASE" in
+@@ -506,16 +506,7 @@ case "$SYSTEM.$RELEASE" in
  		    SYSLIBS="$SYSLIBS -ldb"
  		    ;;
  		esac
@@ -35,7 +35,7 @@ index 2683bce..8f1b3f4 100644
  		# Kernel 2.4 added IPv6
  		case "$RELEASE" in
  		2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
-@@ -561,16 +552,7 @@ EOF
+@@ -583,16 +574,7 @@ EOF
  		    SYSLIBS="$SYSLIBS -ldb"
  		    ;;
  		esac
@@ -54,5 +54,5 @@ index 2683bce..8f1b3f4 100644
  		: ${SHLIB_SUFFIX=.so}
  		: ${SHLIB_CFLAGS=-fPIC}
 -- 
-2.7.4
+2.17.1
 

meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch

@@ -1,4 +1,4 @@
-From 1e451ddc15af1a4e19318c8b1ced46c5c41610d3 Mon Sep 17 00:00:00 2001
+From 56bec31c4117fddee3a141bcca6c585aa8ddbbe2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 14 Jul 2021 18:08:30 -0700
 Subject: [PATCH] correct signature of closefrom() API
@@ -99,3 +99,6 @@ index 2e1c953..515de6c 100644
    * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary
    * because the ISASCII() guard already ensures that the values are
    * non-negative; the casts are done anyway to shut up chatty compilers.
+-- 
+2.17.1
+

meta-networking/recipes-daemons/postfix/files/postfix-install.patch

@@ -1,26 +0,0 @@
-Index: postfix-3.2.2/postfix-install
-===================================================================
---- postfix-3.2.2.orig/postfix-install
-+++ postfix-3.2.2/postfix-install
-@@ -843,7 +843,7 @@ IFS="$BACKUP_IFS"
- # the wrong place when Postfix is being upgraded.
- 
- case "$mail_version" in
--"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
-+"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
- esac
- 
- # Undo MAIL_VERSION expansion at the end of a parameter value. If
-Index: postfix-3.2.2/Makefile.in
-===================================================================
---- postfix-3.2.2.orig/Makefile.in
-+++ postfix-3.2.2/Makefile.in
-@@ -20,7 +20,7 @@ META	= meta/main.cf.proto meta/master.cf
- EXPAND	= sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
- 	    -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
- SHLIB_DIR_OVERRIDE = \
--	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
-+	$${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
- 
- default: update
- 

meta-networking/recipes-daemons/postfix/postfix_3.6.3.bb

@@ -1,19 +0,0 @@
-require postfix.inc
-
-SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
-           file://makedefs.patch \
-           file://install.patch \
-           file://main.cf \
-           file://postfix \
-           file://internal_recipient \
-           file://postfix.service \
-           file://aliasesdb \
-           file://check_hostname.sh \
-           file://0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch \
-           file://postfix-install.patch \
-           file://icu-config.patch \
-           file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \
-           file://0007-correct-signature-of-closefrom-API.patch \
-           "
-SRC_URI[sha256sum] = "0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc"
-UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz"

meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb

@@ -0,0 +1,18 @@
+require postfix.inc
+
+SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
+            file://main.cf \
+            file://postfix \
+            file://internal_recipient \
+            file://postfix.service \
+            file://aliasesdb \
+            file://check_hostname.sh \
+            file://0001-Fix-makedefs.patch \
+            file://0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch \
+            file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \
+            file://0004-Fix-icu-config.patch \
+            file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \
+            file://0006-correct-signature-of-closefrom-API.patch \
+           "
+SRC_URI[sha256sum] = "8de0619dcf2fa7c215a80cf84b82ab71631d4d4722cba0949725ce3e18031d4e"
+UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz"