diff options
author | Adrian Bunk <bunk@stusta.de> | 2020-05-20 21:05:19 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-05-21 15:07:44 -0700 |
commit | 3d81f6d013b21a5db8e71328648aa896177e40eb (patch) | |
tree | 02dfcc363899d13cd777fbea576199997ead6abb | |
parent | 95d7ee4a95761f2676e6819dee9b616224be777f (diff) | |
download | meta-openembedded-3d81f6d013b21a5db8e71328648aa896177e40eb.tar.gz |
postfix: Upgrade 3.4.10 -> 3.4.12
Remove patch applied upstream.
Manual -fcommon is no longer necessary.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-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 22adaff72..000000000 --- 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 @@ | |||
1 | From 8b3792830f4930fee7fbb00c854d9766f2b74dca Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 27 Jul 2019 11:35:38 -0700 | ||
4 | Subject: [PATCH] Fixed build failure with glibc 2.30 due to dropped | ||
5 | RES_INSECURE1/2 macros | ||
6 | |||
7 | see [1] | ||
8 | |||
9 | [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=333221862ecbebde60dd16e7ca17d26444e62f50 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | src/dns/dns_str_resflags.c | 6 ++++++ | ||
15 | 1 file changed, 6 insertions(+) | ||
16 | |||
17 | diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c | ||
18 | index 5f2cce5..df32345 100644 | ||
19 | --- a/src/dns/dns_str_resflags.c | ||
20 | +++ b/src/dns/dns_str_resflags.c | ||
21 | @@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { | ||
22 | "RES_DEFNAMES", RES_DEFNAMES, | ||
23 | "RES_STAYOPEN", RES_STAYOPEN, | ||
24 | "RES_DNSRCH", RES_DNSRCH, | ||
25 | +#ifdef RES_INSECURE1 | ||
26 | "RES_INSECURE1", RES_INSECURE1, | ||
27 | +#endif | ||
28 | +#ifdef RES_INSECURE2 | ||
29 | "RES_INSECURE2", RES_INSECURE2, | ||
30 | +#endif | ||
31 | "RES_NOALIASES", RES_NOALIASES, | ||
32 | +#ifdef RES_USE_INET6 | ||
33 | "RES_USE_INET6", RES_USE_INET6, | ||
34 | +#endif | ||
35 | #ifdef RES_ROTATE | ||
36 | "RES_ROTATE", RES_ROTATE, | ||
37 | #endif | ||
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index a8d55a6c9..4b9940cc7 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 = "" | |||
61 | export AUXLIBS-sasl_class-native = "" | 61 | export AUXLIBS-sasl_class-native = "" |
62 | 62 | ||
63 | # PCRE, TLS support default | 63 | # PCRE, TLS support default |
64 | export CCARGS = "${CFLAGS} -fcommon -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" | 64 | export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" |
65 | export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" | 65 | export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" |
66 | export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" | 66 | export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" |
67 | 67 | ||
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 d0ef708c5..db5b41bfb 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 | |||
13 | file://postfix-install.patch \ | 13 | file://postfix-install.patch \ |
14 | file://icu-config.patch \ | 14 | file://icu-config.patch \ |
15 | file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ | 15 | file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ |
16 | file://0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch \ | ||
17 | " | 16 | " |
18 | SRC_URI[sha256sum] = "908a66fc38537a0047e8561e1bc0ef096c53357ffad16d2d728cd4fc8ae56654" | 17 | SRC_URI[sha256sum] = "18555183ae8b52a9e76067799279c86f9f2770cdef3836deb8462ee0a0855dec" |
19 | UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" | 18 | UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" |