diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2024-03-01 19:20:54 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-01 16:37:55 -0800 |
commit | a326451eb637ccdd6e27a0377c4f00d20b1494d8 (patch) | |
tree | 59cf4bf2127187516e8cf86d9d3b86f793baf1d4 | |
parent | 425f999eb93ce6056b504e20c7717555ef7856ca (diff) | |
download | meta-openembedded-a326451eb637ccdd6e27a0377c4f00d20b1494d8.tar.gz |
postfix: upgrade 3.7.3 -> 3.8.5
ChangeLog:
https://www.postfix.org/announcements/postfix-3.8.0.html
https://www.postfix.org/announcements/postfix-3.8.1.html
https://www.postfix.org/announcements/postfix-3.8.2.html
https://www.postfix.org/announcements/postfix-3.8.3.html
https://www.postfix.org/announcements/postfix-3.8.4.html
https://www.postfix.org/announcements/postfix-3.8.5.html
* Drop 0006-makedefs-Account-for-linux-6.x-version.patch as the issue
has been fixed upstream.
* Merge inc file into single recipe
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch | 35 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix_3.7.3.bb | 18 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix_3.8.5.bb (renamed from meta-networking/recipes-daemons/postfix/postfix.inc) | 18 |
3 files changed, 18 insertions, 53 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch b/meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch deleted file mode 100644 index ad1704520..000000000 --- a/meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From e5ddcf9575437bacd64c2b68501b413014186a6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 19 Oct 2022 10:15:01 -0700 | ||
4 | Subject: [PATCH] makedefs: Account for linux 6.x version | ||
5 | |||
6 | Major version has bumped to 6 and script needs to know that | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | makedefs | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | --- a/makedefs | ||
15 | +++ b/makedefs | ||
16 | @@ -613,7 +613,7 @@ EOF | ||
17 | : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} | ||
18 | : ${PLUGIN_LD="${CC-gcc} -shared"} | ||
19 | ;; | ||
20 | - Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR | ||
21 | + Linux.[3-6]*) SYSTYPE=LINUX$RELEASE_MAJOR | ||
22 | case "$CCARGS" in | ||
23 | *-DNO_DB*) ;; | ||
24 | *-DHAS_DB*) ;; | ||
25 | --- a/src/util/sys_defs.h | ||
26 | +++ b/src/util/sys_defs.h | ||
27 | @@ -751,7 +751,7 @@ extern int initgroups(const char *, int) | ||
28 | /* | ||
29 | * LINUX. | ||
30 | */ | ||
31 | -#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) | ||
32 | +#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) || defined(LINUX6) | ||
33 | #define SUPPORTED | ||
34 | #define UINT32_TYPE unsigned int | ||
35 | #define UINT16_TYPE unsigned short | ||
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.7.3.bb b/meta-networking/recipes-daemons/postfix/postfix_3.7.3.bb deleted file mode 100644 index b54a97aea..000000000 --- a/meta-networking/recipes-daemons/postfix/postfix_3.7.3.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | require postfix.inc | ||
2 | |||
3 | SRC_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-makedefs-Account-for-linux-6.x-version.patch \ | ||
16 | " | ||
17 | SRC_URI[sha256sum] = "d22f3d37ef75613d5d573b56fc51ef097f2c0d0b0e407923711f71c1fb72911b" | ||
18 | UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz" | ||
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix_3.8.5.bb index 5133caaa4..1c92c07a3 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix_3.8.5.bb | |||
@@ -14,6 +14,24 @@ DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \ | |||
14 | LICENSE = "IPL-1.0 | EPL-2.0" | 14 | LICENSE = "IPL-1.0 | EPL-2.0" |
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b181651ad99a7dc4cc8c4ce2f491ed1a" | 15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b181651ad99a7dc4cc8c4ce2f491ed1a" |
16 | 16 | ||
17 | SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ | ||
18 | file://main.cf \ | ||
19 | file://postfix \ | ||
20 | file://internal_recipient \ | ||
21 | file://postfix.service \ | ||
22 | file://aliasesdb \ | ||
23 | file://check_hostname.sh \ | ||
24 | file://0001-Fix-makedefs.patch \ | ||
25 | file://0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch \ | ||
26 | file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ | ||
27 | file://0004-Fix-icu-config.patch \ | ||
28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ | ||
29 | " | ||
30 | |||
31 | SRC_URI[sha256sum] = "f3e827a2b2e410359ad25d31341970434ab07e36139f9a2ef93981b0ec564c85" | ||
32 | |||
33 | UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.8(\.\d+)+).tar.gz" | ||
34 | |||
17 | S = "${WORKDIR}/postfix-${PV}" | 35 | S = "${WORKDIR}/postfix-${PV}" |
18 | 36 | ||
19 | CLEANBROKEN = "1" | 37 | CLEANBROKEN = "1" |