summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch (renamed from meta-networking/recipes-daemons/postfix/files/makedefs.patch)23
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch (renamed from meta-networking/recipes-daemons/postfix/files/install.patch)40
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch (renamed from meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch)16
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch (renamed from meta-networking/recipes-daemons/postfix/files/icu-config.patch)21
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch (renamed from meta-networking/recipes-daemons/postfix/files/0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch)10
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch (renamed from meta-networking/recipes-daemons/postfix/files/0007-correct-signature-of-closefrom-API.patch)5
-rw-r--r--[-rwxr-xr-x]meta-networking/recipes-daemons/postfix/files/aliasesdb0
-rw-r--r--[-rwxr-xr-x]meta-networking/recipes-daemons/postfix/files/check_hostname.sh0
-rw-r--r--[-rwxr-xr-x]meta-networking/recipes-daemons/postfix/files/postfix0
-rw-r--r--meta-networking/recipes-daemons/postfix/files/postfix-install.patch26
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix_3.6.3.bb19
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb18
12 files changed, 90 insertions, 88 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch
index 98d5f7ed60..e83085d20d 100644
--- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch
@@ -1,8 +1,9 @@
1From 4f49e2ce420fb3c17415937530493158ef312733 Mon Sep 17 00:00:00 2001 1From 9000ee4d8bb5c5e0bcc588e9bec86eb56f4285e1 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 19 Jun 2015 16:45:54 +0900 3Date: Fri, 19 Jun 2015 16:45:54 +0900
4Subject: [PATCH] 1)remove RANLIB, SYSLIBS, AR and get them from env. 4Subject: [PATCH] Fix makedefs
5 5
61)remove RANLIB, SYSLIBS, AR and get them from env.
62)reference sysroot when searching header files 72)reference sysroot when searching header files
73)include sysroot path instead of absolute include path 83)include sysroot path instead of absolute include path
8for Linux2 and Linux3 systems. 9for Linux2 and Linux3 systems.
@@ -18,10 +19,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
18 1 file changed, 11 insertions(+), 16 deletions(-) 19 1 file changed, 11 insertions(+), 16 deletions(-)
19 20
20diff --git a/makedefs b/makedefs 21diff --git a/makedefs b/makedefs
21index 8b84e47..893fb0d 100644 22index 3448c1e..78e0717 100644
22--- a/makedefs 23--- a/makedefs
23+++ b/makedefs 24+++ b/makedefs
24@@ -170,9 +170,6 @@ echo "# pie=$pie" 25@@ -197,9 +197,6 @@ echo "# pie=$pie"
25 26
26 # Defaults for most sane systems 27 # Defaults for most sane systems
27 28
@@ -31,7 +32,7 @@ index 8b84e47..893fb0d 100644
31 ARFL=rv 32 ARFL=rv
32 33
33 # Ugly function to make our error message more visible among the 34 # Ugly function to make our error message more visible among the
34@@ -424,12 +421,12 @@ case "$SYSTEM.$RELEASE" in 35@@ -492,12 +489,12 @@ case "$SYSTEM.$RELEASE" in
35 case "$CCARGS" in 36 case "$CCARGS" in
36 *-DNO_DB*) ;; 37 *-DNO_DB*) ;;
37 *-DHAS_DB*) ;; 38 *-DHAS_DB*) ;;
@@ -47,7 +48,7 @@ index 8b84e47..893fb0d 100644
47 else 48 else
48 # No, we're not going to try db1 db2 db3 etc. 49 # No, we're not going to try db1 db2 db3 etc.
49 # On a properly installed system, Postfix builds 50 # On a properly installed system, Postfix builds
50@@ -438,12 +435,12 @@ case "$SYSTEM.$RELEASE" in 51@@ -506,12 +503,12 @@ case "$SYSTEM.$RELEASE" in
51 echo "Install the appropriate db*-devel package first." 1>&2 52 echo "Install the appropriate db*-devel package first." 1>&2
52 exit 1 53 exit 1
53 fi 54 fi
@@ -62,7 +63,7 @@ index 8b84e47..893fb0d 100644
62 do 63 do
63 test -e $lib/lib$name.a -o -e $lib/lib$name.so && { 64 test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
64 SYSLIBS="$SYSLIBS -l$name" 65 SYSLIBS="$SYSLIBS -l$name"
65@@ -463,7 +460,7 @@ case "$SYSTEM.$RELEASE" in 66@@ -531,7 +528,7 @@ case "$SYSTEM.$RELEASE" in
66 if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] 67 if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ]
67 then 68 then
68 : 69 :
@@ -71,7 +72,7 @@ index 8b84e47..893fb0d 100644
71 then 72 then
72 echo CCARGS="$CCARGS -DNO_EPOLL" 73 echo CCARGS="$CCARGS -DNO_EPOLL"
73 else 74 else
74@@ -487,8 +484,6 @@ int main(int argc, char **argv) 75@@ -555,8 +552,6 @@ int main(int argc, char **argv)
75 } 76 }
76 EOF 77 EOF
77 ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 78 ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1
@@ -80,7 +81,7 @@ index 8b84e47..893fb0d 100644
80 rm -f makedefs.test makedefs.test.[co] 81 rm -f makedefs.test makedefs.test.[co]
81 fi;; 82 fi;;
82 esac 83 esac
83@@ -504,12 +499,12 @@ EOF 84@@ -572,12 +567,12 @@ EOF
84 case "$CCARGS" in 85 case "$CCARGS" in
85 *-DNO_DB*) ;; 86 *-DNO_DB*) ;;
86 *-DHAS_DB*) ;; 87 *-DHAS_DB*) ;;
@@ -96,7 +97,7 @@ index 8b84e47..893fb0d 100644
96 else 97 else
97 # On a properly installed system, Postfix builds 98 # On a properly installed system, Postfix builds
98 # by including <db.h> and by linking with -ldb 99 # by including <db.h> and by linking with -ldb
99@@ -517,12 +512,12 @@ EOF 100@@ -585,12 +580,12 @@ EOF
100 echo "Install the appropriate db*-devel package first." 1>&2 101 echo "Install the appropriate db*-devel package first." 1>&2
101 exit 1 102 exit 1
102 fi 103 fi
@@ -112,5 +113,5 @@ index 8b84e47..893fb0d 100644
112 test -e $lib/lib$name.a -o -e $lib/lib$name.so && { 113 test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
113 SYSLIBS="$SYSLIBS -l$name" 114 SYSLIBS="$SYSLIBS -l$name"
114-- 115--
1151.8.4.2 1162.17.1
116 117
diff --git a/meta-networking/recipes-daemons/postfix/files/install.patch b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch
index d023680f3b..347b9de0a3 100644
--- a/meta-networking/recipes-daemons/postfix/files/install.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch
@@ -1,4 +1,4 @@
1From 190650e1cd5700cd6950ead3fcb17ebcec192a2e Mon Sep 17 00:00:00 2001 1From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 19 Jun 2015 17:14:58 +0900 3Date: Fri, 19 Jun 2015 17:14:58 +0900
4Subject: [PATCH] Change fixed postconf to a variable for cross-compiling 4Subject: [PATCH] Change fixed postconf to a variable for cross-compiling
@@ -7,14 +7,28 @@ Upstreamstatus: Inappropriate [embedded specific]
7 7
8Signed-off-by: Yao Zhao <yao.zhao@windriver.com> 8Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
9--- 9---
10 Makefile.in | 2 +-
10 postfix-install | 18 ++++++++++-------- 11 postfix-install | 18 ++++++++++--------
11 1 file changed, 10 insertions(+), 8 deletions(-) 12 2 files changed, 11 insertions(+), 9 deletions(-)
12 13
14diff --git a/Makefile.in b/Makefile.in
15index 65e7911..40295be 100644
16--- a/Makefile.in
17+++ b/Makefile.in
18@@ -22,7 +22,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \
19 EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
20 -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
21 SHLIB_DIR_OVERRIDE = \
22- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
23+ $${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
24
25 default: update
26
13diff --git a/postfix-install b/postfix-install 27diff --git a/postfix-install b/postfix-install
14index 1662c3d..d11fa12 100644 28index e498cd3..8049f43 100644
15--- a/postfix-install 29--- a/postfix-install
16+++ b/postfix-install 30+++ b/postfix-install
17@@ -226,8 +226,8 @@ test -z "$non_interactive" -a ! -t 0 && { 31@@ -244,8 +244,8 @@ test -z "$non_interactive" -a ! -t 0 && {
18 exit 1 32 exit 1
19 } 33 }
20 34
@@ -25,7 +39,7 @@ index 1662c3d..d11fa12 100644
25 exit 1 39 exit 1
26 } 40 }
27 41
28@@ -248,7 +248,7 @@ do 42@@ -266,7 +266,7 @@ do
29 case "$junk" in 43 case "$junk" in
30 *MAIL_VERSION*) 44 *MAIL_VERSION*)
31 case "$mail_version" in 45 case "$mail_version" in
@@ -34,7 +48,7 @@ index 1662c3d..d11fa12 100644
34 esac 48 esac
35 val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1 49 val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
36 case "$val" in 50 case "$val" in
37@@ -434,7 +434,7 @@ template files main.cf.proto and master.cf.proto." 51@@ -454,7 +454,7 @@ template files main.cf.proto and master.cf.proto."
38 52
39 : ${install_root=/} 53 : ${install_root=/}
40 : ${tempdir=`pwd`} 54 : ${tempdir=`pwd`}
@@ -43,7 +57,7 @@ index 1662c3d..d11fa12 100644
43 57
44 # Find out the location of installed configuration files. 58 # Find out the location of installed configuration files.
45 59
46@@ -500,7 +500,7 @@ test -f $CONFIG_DIRECTORY/main.cf && { 60@@ -520,7 +520,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
47 case "$junk" in 61 case "$junk" in
48 "") eval unset $name;; 62 "") eval unset $name;;
49 esac 63 esac
@@ -52,7 +66,7 @@ index 1662c3d..d11fa12 100644
52 exit 1 66 exit 1
53 done 67 done
54 } 68 }
55@@ -513,7 +513,7 @@ do 69@@ -533,7 +533,7 @@ do
56 case "$junk" in 70 case "$junk" in
57 "") eval unset $name;; 71 "") eval unset $name;;
58 esac 72 esac
@@ -61,7 +75,7 @@ index 1662c3d..d11fa12 100644
61 done 75 done
62 76
63 # Override settings manually. 77 # Override settings manually.
64@@ -639,6 +639,8 @@ README_DIRECTORY=$install_root$readme_directory 78@@ -670,6 +670,8 @@ README_DIRECTORY=$install_root$readme_directory
65 SHLIB_DIRECTORY=$install_root$shlib_directory 79 SHLIB_DIRECTORY=$install_root$shlib_directory
66 META_DIRECTORY=$install_root$meta_directory 80 META_DIRECTORY=$install_root$meta_directory
67 81
@@ -70,16 +84,16 @@ index 1662c3d..d11fa12 100644
70 # Avoid repeated tests for existence of these; default permissions suffice. 84 # Avoid repeated tests for existence of these; default permissions suffice.
71 85
72 test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 86 test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
73@@ -810,7 +812,7 @@ IFS="$BACKUP_IFS" 87@@ -841,7 +843,7 @@ IFS="$BACKUP_IFS"
74 # the wrong place when Postfix is being upgraded. 88 # the wrong place when Postfix is being upgraded.
75 89
76 case "$mail_version" in 90 case "$mail_version" in
77-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1 91-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
78+"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1 92+"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
79 esac 93 esac
80 94
81 # Undo MAIL_VERSION expansion at the end of a parameter value. If 95 # Undo MAIL_VERSION expansion at the end of a parameter value. If
82@@ -830,7 +832,7 @@ do 96@@ -861,7 +863,7 @@ do
83 esac 97 esac
84 done 98 done
85 99
@@ -89,5 +103,5 @@ index 1662c3d..d11fa12 100644
89 "data_directory = $data_directory" \ 103 "data_directory = $data_directory" \
90 "command_directory = $command_directory" \ 104 "command_directory = $command_directory" \
91-- 105--
921.8.4.2 1062.17.1
93 107
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch
index 763a4a9b98..0fc938e13d 100644
--- a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch
@@ -1,4 +1,4 @@
1From a0d0de10e4c5ab55bc2fa48798079e2876b1211d Mon Sep 17 00:00:00 2001 1From 995bddd9563b1aecca2369f2f9c675f88bdc0053 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 26 Aug 2017 10:29:37 -0700 3Date: Sat, 26 Aug 2017 10:29:37 -0700
4Subject: [PATCH] makedefs: Use native compiler to build makedefs.test 4Subject: [PATCH] makedefs: Use native compiler to build makedefs.test
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 5 insertions(+), 5 deletions(-) 11 1 file changed, 5 insertions(+), 5 deletions(-)
12 12
13diff --git a/makedefs b/makedefs 13diff --git a/makedefs b/makedefs
14index 9fd4bc2..5ee7747 100644 14index 78e0717..3299eba 100644
15--- a/makedefs 15--- a/makedefs
16+++ b/makedefs 16+++ b/makedefs
17@@ -526,7 +526,7 @@ int main(int argc, char **argv) 17@@ -551,7 +551,7 @@ int main(int argc, char **argv)
18 exit(0); 18 exit(0);
19 } 19 }
20 EOF 20 EOF
@@ -23,7 +23,7 @@ index 9fd4bc2..5ee7747 100644
23 rm -f makedefs.test makedefs.test.[co] 23 rm -f makedefs.test makedefs.test.[co]
24 fi;; 24 fi;;
25 esac 25 esac
26@@ -762,7 +762,7 @@ int main(int argc, char **argv) 26@@ -787,7 +787,7 @@ int main(int argc, char **argv)
27 exit(0); 27 exit(0);
28 } 28 }
29 EOF 29 EOF
@@ -32,7 +32,7 @@ index 9fd4bc2..5ee7747 100644
32 ./makedefs.test 2>/dev/null || 32 ./makedefs.test 2>/dev/null ||
33 CCARGS="$CCARGS -DNO_SIGSETJMP" 33 CCARGS="$CCARGS -DNO_SIGSETJMP"
34 rm -f makedefs.test makedefs.test.[co] 34 rm -f makedefs.test makedefs.test.[co]
35@@ -796,7 +796,7 @@ int main(int argc, char **argv) 35@@ -823,7 +823,7 @@ int main(int argc, char **argv)
36 &error) != 14); 36 &error) != 14);
37 } 37 }
38 EOF 38 EOF
@@ -41,7 +41,7 @@ index 9fd4bc2..5ee7747 100644
41 $icu_ldflags >/dev/null 2>&1 41 $icu_ldflags >/dev/null 2>&1
42 if ./makedefs.test 2>/dev/null ; then 42 if ./makedefs.test 2>/dev/null ; then
43 CCARGS="$CCARGS $icu_cppflags" 43 CCARGS="$CCARGS $icu_cppflags"
44@@ -911,7 +911,7 @@ int main(void) 44@@ -938,7 +938,7 @@ int main(void)
45 exit(ferror(stdout) ? 1 : 0); 45 exit(ferror(stdout) ? 1 : 0);
46 } 46 }
47 EOF 47 EOF
@@ -50,7 +50,7 @@ index 9fd4bc2..5ee7747 100644
50 ./makedefs.test || exit 1 50 ./makedefs.test || exit 1
51 rm -f makedefs.test makedefs.test.[co] 51 rm -f makedefs.test makedefs.test.[co]
52 } 52 }
53@@ -1067,7 +1067,7 @@ int main(void) 53@@ -1094,7 +1094,7 @@ int main(void)
54 exit(ferror(stdout) ? 1 : 0); 54 exit(ferror(stdout) ? 1 : 0);
55 } 55 }
56 EOF 56 EOF
@@ -60,5 +60,5 @@ index 9fd4bc2..5ee7747 100644
60 rm -f makedefs.test makedefs.test.[co] 60 rm -f makedefs.test makedefs.test.[co]
61 eval ${parm_name}=\""\$parm_val"\" 61 eval ${parm_name}=\""\$parm_val"\"
62-- 62--
632.14.1 632.17.1
64 64
diff --git a/meta-networking/recipes-daemons/postfix/files/icu-config.patch b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch
index 9bd9c2f03e..6b4a5f7a0c 100644
--- a/meta-networking/recipes-daemons/postfix/files/icu-config.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch
@@ -1,3 +1,8 @@
1From afef4a9391e6bb1a6c3e73d370f240577ed8b0dd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 16 Jan 2022 11:21:54 +0800
4Subject: [PATCH] Fix icu config
5
1do not entertain cppflags from icu, this is because 6do not entertain cppflags from icu, this is because
2icu-config feeds the -I path without sysroot which 7icu-config feeds the -I path without sysroot which
3caused native headers to be included and build is 8caused native headers to be included and build is
@@ -6,12 +11,15 @@ to the CCARGS which we loose nothing if its not
6entertained. 11entertained.
7 12
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 makedefs | 1 -
16 1 file changed, 1 deletion(-)
9 17
10Index: postfix-3.2.2/makedefs 18diff --git a/makedefs b/makedefs
11=================================================================== 19index 3299eba..2a76f20 100644
12--- postfix-3.2.2.orig/makedefs 20--- a/makedefs
13+++ postfix-3.2.2/makedefs 21+++ b/makedefs
14@@ -799,7 +799,6 @@ EOF 22@@ -826,7 +826,6 @@ EOF
15 ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \ 23 ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \
16 $icu_ldflags >/dev/null 2>&1 24 $icu_ldflags >/dev/null 2>&1
17 if ./makedefs.test 2>/dev/null ; then 25 if ./makedefs.test 2>/dev/null ; then
@@ -19,3 +27,6 @@ Index: postfix-3.2.2/makedefs
19 SYSLIBS="$SYSLIBS $icu_ldflags" 27 SYSLIBS="$SYSLIBS $icu_ldflags"
20 else 28 else
21 CCARGS="$CCARGS -DNO_EAI" 29 CCARGS="$CCARGS -DNO_EAI"
30--
312.17.1
32
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch
index 565098400b..b425cf8432 100644
--- a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch
@@ -1,4 +1,4 @@
1From 4caa18feb70f8f3d133657c1250a53f4e292bb42 Mon Sep 17 00:00:00 2001 1From 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 12 Oct 2018 12:38:02 +0800 3Date: Fri, 12 Oct 2018 12:38:02 +0800
4Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default 4Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default
@@ -14,10 +14,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14 1 file changed, 2 insertions(+), 20 deletions(-) 14 1 file changed, 2 insertions(+), 20 deletions(-)
15 15
16diff --git a/makedefs b/makedefs 16diff --git a/makedefs b/makedefs
17index 2683bce..8f1b3f4 100644 17index 2a76f20..9d5db9f 100644
18--- a/makedefs 18--- a/makedefs
19+++ b/makedefs 19+++ b/makedefs
20@@ -484,16 +484,7 @@ case "$SYSTEM.$RELEASE" in 20@@ -506,16 +506,7 @@ case "$SYSTEM.$RELEASE" in
21 SYSLIBS="$SYSLIBS -ldb" 21 SYSLIBS="$SYSLIBS -ldb"
22 ;; 22 ;;
23 esac 23 esac
@@ -35,7 +35,7 @@ index 2683bce..8f1b3f4 100644
35 # Kernel 2.4 added IPv6 35 # Kernel 2.4 added IPv6
36 case "$RELEASE" in 36 case "$RELEASE" in
37 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; 37 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
38@@ -561,16 +552,7 @@ EOF 38@@ -583,16 +574,7 @@ EOF
39 SYSLIBS="$SYSLIBS -ldb" 39 SYSLIBS="$SYSLIBS -ldb"
40 ;; 40 ;;
41 esac 41 esac
@@ -54,5 +54,5 @@ index 2683bce..8f1b3f4 100644
54 : ${SHLIB_SUFFIX=.so} 54 : ${SHLIB_SUFFIX=.so}
55 : ${SHLIB_CFLAGS=-fPIC} 55 : ${SHLIB_CFLAGS=-fPIC}
56-- 56--
572.7.4 572.17.1
58 58
diff --git a/meta-networking/recipes-daemons/postfix/files/0007-correct-signature-of-closefrom-API.patch b/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch
index e583354ccb..95ca03b223 100644
--- a/meta-networking/recipes-daemons/postfix/files/0007-correct-signature-of-closefrom-API.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch
@@ -1,4 +1,4 @@
1From 1e451ddc15af1a4e19318c8b1ced46c5c41610d3 Mon Sep 17 00:00:00 2001 1From 56bec31c4117fddee3a141bcca6c585aa8ddbbe2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Jul 2021 18:08:30 -0700 3Date: Wed, 14 Jul 2021 18:08:30 -0700
4Subject: [PATCH] correct signature of closefrom() API 4Subject: [PATCH] correct signature of closefrom() API
@@ -99,3 +99,6 @@ index 2e1c953..515de6c 100644
99 * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary 99 * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary
100 * because the ISASCII() guard already ensures that the values are 100 * because the ISASCII() guard already ensures that the values are
101 * non-negative; the casts are done anyway to shut up chatty compilers. 101 * non-negative; the casts are done anyway to shut up chatty compilers.
102--
1032.17.1
104
diff --git a/meta-networking/recipes-daemons/postfix/files/aliasesdb b/meta-networking/recipes-daemons/postfix/files/aliasesdb
index 855a64f705..855a64f705 100755..100644
--- a/meta-networking/recipes-daemons/postfix/files/aliasesdb
+++ b/meta-networking/recipes-daemons/postfix/files/aliasesdb
diff --git a/meta-networking/recipes-daemons/postfix/files/check_hostname.sh b/meta-networking/recipes-daemons/postfix/files/check_hostname.sh
index 37a0dd088c..37a0dd088c 100755..100644
--- a/meta-networking/recipes-daemons/postfix/files/check_hostname.sh
+++ b/meta-networking/recipes-daemons/postfix/files/check_hostname.sh
diff --git a/meta-networking/recipes-daemons/postfix/files/postfix b/meta-networking/recipes-daemons/postfix/files/postfix
index 8c7a60175a..8c7a60175a 100755..100644
--- a/meta-networking/recipes-daemons/postfix/files/postfix
+++ b/meta-networking/recipes-daemons/postfix/files/postfix
diff --git a/meta-networking/recipes-daemons/postfix/files/postfix-install.patch b/meta-networking/recipes-daemons/postfix/files/postfix-install.patch
deleted file mode 100644
index 45479bd52a..0000000000
--- a/meta-networking/recipes-daemons/postfix/files/postfix-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Index: postfix-3.2.2/postfix-install
2===================================================================
3--- postfix-3.2.2.orig/postfix-install
4+++ postfix-3.2.2/postfix-install
5@@ -843,7 +843,7 @@ IFS="$BACKUP_IFS"
6 # the wrong place when Postfix is being upgraded.
7
8 case "$mail_version" in
9-"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
10+"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
11 esac
12
13 # Undo MAIL_VERSION expansion at the end of a parameter value. If
14Index: postfix-3.2.2/Makefile.in
15===================================================================
16--- postfix-3.2.2.orig/Makefile.in
17+++ postfix-3.2.2/Makefile.in
18@@ -20,7 +20,7 @@ META = meta/main.cf.proto meta/master.cf
19 EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
20 -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
21 SHLIB_DIR_OVERRIDE = \
22- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
23+ $${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
24
25 default: update
26
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.6.3.bb b/meta-networking/recipes-daemons/postfix/postfix_3.6.3.bb
deleted file mode 100644
index 98005797d9..0000000000
--- a/meta-networking/recipes-daemons/postfix/postfix_3.6.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require postfix.inc
2
3SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
4 file://makedefs.patch \
5 file://install.patch \
6 file://main.cf \
7 file://postfix \
8 file://internal_recipient \
9 file://postfix.service \
10 file://aliasesdb \
11 file://check_hostname.sh \
12 file://0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch \
13 file://postfix-install.patch \
14 file://icu-config.patch \
15 file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \
16 file://0007-correct-signature-of-closefrom-API.patch \
17 "
18SRC_URI[sha256sum] = "0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc"
19UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz"
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb b/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb
new file mode 100644
index 0000000000..54c8eab5c9
--- /dev/null
+++ b/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb
@@ -0,0 +1,18 @@
1require postfix.inc
2
3SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
4 file://main.cf \
5 file://postfix \
6 file://internal_recipient \
7 file://postfix.service \
8 file://aliasesdb \
9 file://check_hostname.sh \
10 file://0001-Fix-makedefs.patch \
11 file://0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch \
12 file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \
13 file://0004-Fix-icu-config.patch \
14 file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \
15 file://0006-correct-signature-of-closefrom-API.patch \
16 "
17SRC_URI[sha256sum] = "8de0619dcf2fa7c215a80cf84b82ab71631d4d4722cba0949725ce3e18031d4e"
18UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz"