diff options
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/files/0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch | 37 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix.inc | 2 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix_3.4.12.bb (renamed from meta-networking/recipes-daemons/postfix/postfix_3.4.10.bb) | 3 |
3 files changed, 2 insertions, 40 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch deleted file mode 100644 index 22adaff729..0000000000 --- a/meta-networking/recipes-daemons/postfix/files/0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8b3792830f4930fee7fbb00c854d9766f2b74dca Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 27 Jul 2019 11:35:38 -0700 -Subject: [PATCH] Fixed build failure with glibc 2.30 due to dropped - RES_INSECURE1/2 macros - -see [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=333221862ecbebde60dd16e7ca17d26444e62f50 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/dns/dns_str_resflags.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c -index 5f2cce5..df32345 100644 ---- a/src/dns/dns_str_resflags.c -+++ b/src/dns/dns_str_resflags.c -@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { - "RES_DEFNAMES", RES_DEFNAMES, - "RES_STAYOPEN", RES_STAYOPEN, - "RES_DNSRCH", RES_DNSRCH, -+#ifdef RES_INSECURE1 - "RES_INSECURE1", RES_INSECURE1, -+#endif -+#ifdef RES_INSECURE2 - "RES_INSECURE2", RES_INSECURE2, -+#endif - "RES_NOALIASES", RES_NOALIASES, -+#ifdef RES_USE_INET6 - "RES_USE_INET6", RES_USE_INET6, -+#endif - #ifdef RES_ROTATE - "RES_ROTATE", RES_ROTATE, - #endif diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index a8d55a6c93..4b9940cc7a 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -61,7 +61,7 @@ export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = "" # PCRE, TLS support default -export CCARGS = "${CFLAGS} -fcommon -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" +export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.4.10.bb b/meta-networking/recipes-daemons/postfix/postfix_3.4.12.bb index d0ef708c50..db5b41bfbd 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.4.10.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.4.12.bb @@ -13,7 +13,6 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://postfix-install.patch \ file://icu-config.patch \ file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ - file://0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch \ " -SRC_URI[sha256sum] = "908a66fc38537a0047e8561e1bc0ef096c53357ffad16d2d728cd4fc8ae56654" +SRC_URI[sha256sum] = "18555183ae8b52a9e76067799279c86f9f2770cdef3836deb8462ee0a0855dec" UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" |