From 26e2aca4359bc7cff080c8446a67b838a5026d15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 Oct 2015 07:58:13 +0200 Subject: ssl: rework ssl support Use libressl as default, where SSL is required. Allow to choose openssl. Disable SSL where not strictly required to build. --- package/fetchmail/Makefile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'package/fetchmail/Makefile') diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 316916380..bd981b9ee 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -12,10 +12,14 @@ PKG_SECTION:= net/mail PKG_URL:= http://www.fetchmail.info PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fetchmail/} -PKG_FLAVOURS_FETCHMAIL:=WITH_SSL -PKGFD_WITH_SSL:= enable SSL support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl +PKG_CHOICES_FETCHMAIL:= WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL +PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates include ${ADK_TOPDIR}/mk/package.mk @@ -23,9 +27,13 @@ $(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${P CONFIGURE_ARGS+= --without-hesiod -ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_SSL},y) +ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-ssl='${STAGING_TARGET_DIR}/usr' -else +endif +ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-ssl='${STAGING_TARGET_DIR}/usr' +endif +ifeq (${ADK_PACKAGE_FETCHMAIL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl endif -- cgit v1.2.3