From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../recipes-daemons/postfix/files/linux_5.x.patch | 27 ++++++++++++++++++++++ .../recipes-daemons/postfix/postfix_3.3.1.bb | 12 ---------- .../recipes-daemons/postfix/postfix_3.4.1.bb | 12 ++++++++++ 3 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 meta-openembedded/meta-networking/recipes-daemons/postfix/files/linux_5.x.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.3.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.1.bb (limited to 'meta-openembedded/meta-networking/recipes-daemons/postfix') diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/files/linux_5.x.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/linux_5.x.patch new file mode 100644 index 000000000..fbb811c06 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/linux_5.x.patch @@ -0,0 +1,27 @@ +Recognise kernel 5.x versioning scheme + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/makedefs ++++ b/makedefs +@@ -543,7 +543,7 @@ EOF + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; +- Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR ++ Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR + case "$CCARGS" in + *-DNO_DB*) ;; + *-DHAS_DB*) ;; +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -749,7 +749,7 @@ extern int initgroups(const char *, int) + /* + * LINUX. + */ +-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) ++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) + #define SUPPORTED + #define UINT32_TYPE unsigned int + #define UINT16_TYPE unsigned short diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.3.1.bb deleted file mode 100644 index 6718b7ef9..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.3.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postfix.inc - -SRC_URI += "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 \ - " - -SRC_URI[md5sum] = "4381c6492f415e4a69cf5099d4acea76" -SRC_URI[sha256sum] = "54f514dae42b5275cb4bc9c69283f16c06200b71813d0bb696568c4ba7ae7e3b" - -UPSTREAM_CHECK_REGEX = "postfix\-(?P3\.3(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.1.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.1.bb new file mode 100644 index 000000000..73380d8c6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.1.bb @@ -0,0 +1,12 @@ +require postfix.inc + +SRC_URI += "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://linux_5.x.patch \ + " +SRC_URI[md5sum] = "d292bb49a1c79ff6d2eb9c5e88c51425" +SRC_URI[sha256sum] = "8c9763f7a8ec70d499257b7f25bb50e1f3da8a4c43e59826ba8a26c4a778d0ce" + +UPSTREAM_CHECK_REGEX = "postfix\-(?P3\.3(\.\d+)+).tar.gz" -- cgit v1.2.3