diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-09-11 16:57:58 +0200 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-09-30 23:23:30 +0200 |
commit | 620968a43a5f9bb3fa98ab20f257a4c0d864caa7 (patch) | |
tree | 09bef799707f4b6e715b912429bd3b73c1addf4c /mail | |
parent | b9a93c0bf4778b9ec327c1be6f819eb1ff90ec19 (diff) | |
download | freebsd-ports-620968a43a5f9bb3fa98ab20f257a4c0d864caa7.zip |
cleanup: drop support for EOL FreeBSD 11.X
Search criteria used:
- 11.4
- OSREL*
- OSVER*
- *_FreeBSD_11
Input from:
- adridg: devel/qca-legacy
- jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds
- sunpoet: security/p5-*OpenSSL*
Reviewed by: doceng, kde, multimedia, perl, python, ruby, rust
Differential Revision: https://reviews.freebsd.org/D32008
Test Plan: make index
Diffstat (limited to 'mail')
-rw-r--r-- | mail/imapfilter/Makefile | 2 | ||||
-rw-r--r-- | mail/isync/Makefile | 8 | ||||
-rw-r--r-- | mail/opensmtpd/Makefile | 9 | ||||
-rw-r--r-- | mail/postfix-current/Makefile | 6 | ||||
-rw-r--r-- | mail/postfix/Makefile | 6 | ||||
-rw-r--r-- | mail/qpopper/Makefile | 2 | ||||
-rw-r--r-- | mail/sendmail-devel/Makefile | 6 | ||||
-rw-r--r-- | mail/sendmail/Makefile | 10 | ||||
-rw-r--r-- | mail/sid-milter/Makefile | 2 | ||||
-rw-r--r-- | mail/thunderbird/files/patch-cubeb-oss | 5 |
10 files changed, 10 insertions, 46 deletions
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile index ba913e7bbd60..09e3095d9e36 100644 --- a/mail/imapfilter/Makefile +++ b/mail/imapfilter/Makefile @@ -10,8 +10,6 @@ COMMENT= IMAP mail filtering utility LICENSE= MIT -BROKEN_FreeBSD_11=Requires openssl111 to build - LIB_DEPENDS= libpcre2-8.so:devel/pcre2 USES= lua ssl diff --git a/mail/isync/Makefile b/mail/isync/Makefile index 9bccb2f52444..2648cb462191 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -27,16 +27,10 @@ MAKE_ARGS+= SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base -BROKEN= requires OpenSSL 1.1.1, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf -.endif - post-patch: @${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\$$(docdir)/examples|\$$(sysconfdir)|g' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|-ansi||g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index 98422f77b40a..9499ce2b8723 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -55,14 +55,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/mail/ \ --with-user-queue=_smtpq \ --with-group-queue=_smtpq -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && \ - (${OSVERSION} < 1200084 && ${SSL_DEFAULT} == "base") -BROKEN= Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl|libressl*] to /etc/make.conf -.endif - post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index c4d64320a1c5..deeb92d4f18c 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -58,7 +58,7 @@ SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite -BLACKLISTD_DESC= Enable blacklistd support (FreeBSD 11.0 and later only) +BLACKLISTD_DESC= Enable blacklistd support CDB_DESC= CDB maps lookups EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix @@ -87,7 +87,7 @@ MAKEFILEFLAGS+= DEBUG= MAKEFILEFLAGS+= pie=yes CC="${CC}" OPT="${CFLAGS}" -.if (${OSREL:R} < 12 && ${SSL_DEFAULT} == base) || (${SSL_DEFAULT} == libressl) +.if ${SSL_DEFAULT} == libressl BROKEN= error: OpenSSL-1.1.1 is the minimum supported version. \ LibreSSL is not supported .endif @@ -203,7 +203,7 @@ POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} . if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else -IGNORE= blacklistd is only supported on FreeBSD >= 11.0 +IGNORE= blacklistd is only supported on FreeBSD . endif .endif diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index a735a9ddb303..fd2a67c73209 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -58,7 +58,7 @@ SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite -BLACKLISTD_DESC= Enable blacklistd support (FreeBSD 11.0 and later only) +BLACKLISTD_DESC= Enable blacklistd support CDB_DESC= CDB maps lookups EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix @@ -87,7 +87,7 @@ MAKEFILEFLAGS+= DEBUG= MAKEFILEFLAGS+= pie=yes CC="${CC}" OPT="${CFLAGS}" -.if (${OSREL:R} < 12 && ${SSL_DEFAULT} == base) || (${SSL_DEFAULT} == libressl) +.if ${SSL_DEFAULT} == libressl BROKEN= error: OpenSSL-1.1.1 is the minimum supported version. \ LibreSSL is not supported .endif @@ -203,7 +203,7 @@ POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} . if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else -IGNORE= blacklistd is only supported on FreeBSD >= 11.0 +IGNORE= blacklistd is only supported on FreeBSD . endif .endif diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 98bbc202d198..e6e6260465ef 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -122,7 +122,7 @@ CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif # openssl-1.1.1 no longer has SSLv2 support -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 +.if ${OPSYS} == FreeBSD CFLAGS+= -DOPENSSL_NO_SSL2 CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" .endif diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index 00ca743a241c..e4c7a1307b78 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -165,12 +165,6 @@ do-configure: ${FALSE}; \ fi) .endif -.if ${PORT_OPTIONS:MBLACKLISTD} - @(if [ ! -e "${DESTDIR}/usr/lib/libblacklist.so" ] ; then \ - ${ECHO_MSG} "===> libblacklist.so not found. Please update to FreeBSD 11"; \ - ${FALSE}; \ - fi) -.endif ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \ diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index f28c8155c635..b25fa63e120e 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -77,10 +77,6 @@ SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 -PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2} -.endif - .if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX) IPCCHECK!= ipcrm -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} @@ -168,12 +164,6 @@ do-configure: ${FALSE}; \ fi) .endif -.if ${PORT_OPTIONS:MBLACKLISTD} - @(if [ ! -e "${DESTDIR}/usr/lib/libblacklist.so" ] ; then \ - ${ECHO_MSG} "===> libblacklist.so not found. Please update to FreeBSD 11"; \ - ${FALSE}; \ - fi) -.endif ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \ diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile index dc9a12019b94..2f4a2cd38805 100644 --- a/mail/sid-milter/Makefile +++ b/mail/sid-milter/Makefile @@ -8,8 +8,6 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Milter module for sid and spf USES= groff -# on FreeBSD 11 optimized code fails with 'MalformedDomain' -CFLAGS:= ${CFLAGS:S/-O2//g} WCONF= ${WRKSRC}/devtools/Site DOCSFILES= FEATURES INSTALL KNOWNBUGS LICENSE README README-SenderID \ RELEASE_NOTES rfc4406.txt rfc4407.txt rfc4408.txt diff --git a/mail/thunderbird/files/patch-cubeb-oss b/mail/thunderbird/files/patch-cubeb-oss index 2b151a07fb20..41185cf141fd 100644 --- a/mail/thunderbird/files/patch-cubeb-oss +++ b/mail/thunderbird/files/patch-cubeb-oss @@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600 #endif --- /dev/null +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,1263 @@ +@@ -0,0 +1,1260 @@ +/* + * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org> + * Copyright © 2020 Ka Ho Ng <khng300@gmail.com> @@ -74,9 +74,6 @@ https://github.com/kinetiknz/cubeb/pull/600 + * accompanying file LICENSE for details. + */ + -+#if defined(__FreeBSD__) && __FreeBSD__ < 12 -+#define _WITH_GETLINE -+#endif +#include <assert.h> +#include <ctype.h> +#include <limits.h> |