deleted file mode 100644
@@ -1,35 +0,0 @@
-From e5ddcf9575437bacd64c2b68501b413014186a6a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 19 Oct 2022 10:15:01 -0700
-Subject: [PATCH] makedefs: Account for linux 6.x version
-
-Major version has bumped to 6 and script needs to know that
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- makedefs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/makedefs
-+++ b/makedefs
-@@ -613,7 +613,7 @@ EOF
- : ${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*) ;;
---- a/src/util/sys_defs.h
-+++ b/src/util/sys_defs.h
-@@ -751,7 +751,7 @@ extern int initgroups(const char *, int)
- /*
- * 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
deleted file mode 100644
@@ -1,18 +0,0 @@
-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-makedefs-Account-for-linux-6.x-version.patch \
- "
-SRC_URI[sha256sum] = "d22f3d37ef75613d5d573b56fc51ef097f2c0d0b0e407923711f71c1fb72911b"
-UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz"
similarity index 92%
rename from meta-networking/recipes-daemons/postfix/postfix.inc
rename to meta-networking/recipes-daemons/postfix/postfix_3.8.5.bb
@@ -14,6 +14,24 @@ DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \
LICENSE = "IPL-1.0 | EPL-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b181651ad99a7dc4cc8c4ce2f491ed1a"
+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 \
+ "
+
+SRC_URI[sha256sum] = "f3e827a2b2e410359ad25d31341970434ab07e36139f9a2ef93981b0ec564c85"
+
+UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.8(\.\d+)+).tar.gz"
+
S = "${WORKDIR}/postfix-${PV}"
CLEANBROKEN = "1"
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> --- ...kedefs-Account-for-linux-6.x-version.patch | 35 ------------------- .../recipes-daemons/postfix/postfix_3.7.3.bb | 18 ---------- .../postfix/{postfix.inc => postfix_3.8.5.bb} | 18 ++++++++++ 3 files changed, 18 insertions(+), 53 deletions(-) delete mode 100644 meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch delete mode 100644 meta-networking/recipes-daemons/postfix/postfix_3.7.3.bb rename meta-networking/recipes-daemons/postfix/{postfix.inc => postfix_3.8.5.bb} (92%)