ssl: rework ssl support

Use libressl as default, where SSL is required.
Allow to choose openssl.
Disable SSL where not strictly required to build.

61 files changed, 557 insertions, 158 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 29412a8e5..b47fbd52a 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -27,6 +27,11 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_SAMBA3=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_OPENSSL=n \
+			ADK_PACKAGE_LIBOPENSSL=n \
+			ADK_PACKAGE_LIBOPENSSL_DEV=n \
+			ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV=n \
+			ADK_PACKAGE_OPENSSL_PKCS11=n \
+			ADK_PACKAGE_OPENSSL_UTIL=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
 			ADK_KERNEL_MPTCP=n \
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index a0bf5a984..119f75e86 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -9,13 +9,22 @@ PKG_RELEASE:=		2
 PKG_HASH:=		b136b549b7d2a2751c21793100075ea43b28de9af4c1969508bb95bcc92224ad
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net/wifi
-PKG_DEPENDS:=		libpthread libopenssl libpcap
-PKG_BUILDDEP:=		openssl libpcap
+PKG_DEPENDS:=		libpthread libpcap
+PKG_BUILDDEP:=		libpcap
 PKG_URL:=		http://www.aircrack-ng.org/
 PKG_SITES:=		http://download.aircrack-ng.org/
 # do not build parallel, otherwise libosdep.a may not be ready when compiling airtun-ng
 PKG_NOPARALLEL:=	1
 
+PKG_CHOICES_AIRCRACK_NG:=	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
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/bind/Makefile b/package/bind/Makefile
index f532951ce..fa823b692 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -9,34 +9,42 @@ PKG_RELEASE:=		1
 PKG_HASH:=		3f23e7fcb363a2594ed1f065868c2c1080a93636a4fcb4c47f9e164e2cd74c66
 PKG_DESCR:=		dns server
 PKG_SECTION:=		net/dns
-PKG_DEPENDS:=		libopenssl libbind libxml2 libstdcxx
-PKG_BUILDDEP:=		openssl libxml2
+PKG_DEPENDS:=		libbind libxml2 libstdcxx
+PKG_BUILDDEP:=		libxml2
 PKG_URL:=		https://www.isc.org/software/bind/
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 PKG_LIBNAME:=		libbind
 PKG_OPTS:=		dev
 
+PKG_CHOICES_BIND:=	WITH_LIBRESSL WITH_OPENSSL
+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
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
 PKGSD_BIND_NSUPDATE:=	nsupdate utility
 PKGSC_BIND_NSUPDATE:=	net/dns
-PKGSS_BIND_NSUPDATE:=	libbind libopenssl libxml2
+PKGSS_BIND_NSUPDATE:=	libbind libxml2
 PKGSD_BIND_RNDC:=	rndc & rndc-confgen utilities
 PKGSC_BIND_RNDC:=	net/dns
-PKGSS_BIND_RNDC:=	libbind libopenssl libxml2
+PKGSS_BIND_RNDC:=	libbind libxml2
 PKGSD_BIND_CHECK:=	check utilities
 PKGSC_BIND_CHECK:=	net/dns
-PKGSS_BIND_CHECK:=	libbind libopenssl libxml2
+PKGSS_BIND_CHECK:=	libbind libxml2
 PKGSD_BIND_DNSSEC:=	dnssec utilities
 PKGSC_BIND_DNSSEC:=	net/dns
-PKGSS_BIND_DNSSEC:=	libbind libopenssl libxml2
+PKGSS_BIND_DNSSEC:=	libbind libxml2
 PKGSD_BIND_HOST:=	host utility
 PKGSC_BIND_HOST:=	net/dns
-PKGSS_BIND_HOST:=	libbind libopenssl libxml2
+PKGSS_BIND_HOST:=	libbind libxml2
 PKGSD_BIND_DIG:=	dig utility
 PKGSC_BIND_DIG:=	net/dns
-PKGSS_BIND_DIG:=	libbind libopenssl libxml2
+PKGSS_BIND_DIG:=	libbind libxml2
 PKGSD_LIBBIND:=		library for the bind software suite
 PKGSC_LIBBIND:=		libs/net
 
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 532a90fda..02f85f299 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -9,11 +9,19 @@ PKG_RELEASE:=		1
 PKG_HASH:=		408a737b35db4b9c407e3db09b2d2e7b528836a68e2d783373254b78812bf608
 PKG_DESCR:=		irc gateway to im chat networks
 PKG_SECTION:=		app/chat
-PKG_DEPENDS:=		glib libopenssl
-PKG_BUILDDEP:=		glib openssl
+PKG_DEPENDS:=		glib
+PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.bitlbee.org/
 PKG_SITES:=		http://get.bitlbee.org/src/
 
+PKG_CHOICES_BITLBEE:=	WITH_LIBRESSL WITH_OPENSSL
+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
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/crda/Makefile b/package/crda/Makefile
index 1b79a5f57..267a0fd7e 100644
--- a/package/crda/Makefile
+++ b/package/crda/Makefile
@@ -23,12 +23,15 @@ PKGFD_WITH_UDEV:=	install shipped udev rules
 PKGFS_WITH_UDEV:=	udev
 PKGFB_WITH_UDEV:=	eudev
 
-PKG_CHOICES_CRDA:=	WITH_OPENSSL WITH_GCRYPT
+PKG_CHOICES_CRDA:=	WITH_LIBRESSL WITH_OPENSSL WITH_GCRYPT
 PKGCD_WITH_OPENSSL:=	ssl support via openssl library
-PKGCD_WITH_GCRYPT:=	ssl support via gcrypt library
 PKGCB_WITH_OPENSSL:=	openssl
-PKGCB_WITH_GCRYPT:=	libgcrypt
 PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCD_WITH_LIBRESSL:=	ssl support via libressl library
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_GCRYPT:=	ssl support via gcrypt library
+PKGCB_WITH_GCRYPT:=	libgcrypt
 PKGCS_WITH_GCRYPT:=	libgcrypt
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index 0a2f0c9a6..3cccc0780 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -9,10 +9,17 @@ PKG_RELEASE:=		2
 PKG_HASH:=		41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25
 PKG_DESCR:=		device that allows access to kernel cryptographic drivers
 PKG_SECTION:=		app/crypto
-PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://home.gna.org/cryptodev-linux/
 PKG_SITES:=		http://download.gna.org/cryptodev-linux/
 
+PKG_CHOICES_CRYPTODEV_LINUX:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 9edbe4192..833a3853d 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -10,12 +10,19 @@ PKG_HASH:=		c87366c91475931f75b924119580abd06a7b3cb3f00fef47346552cab1e24863
 PKG_DESCR:=		console-based bittorrent client
 PKG_SECTION:=		app/p2p
 PKG_DEPENDS:=		libstdcxx
-PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=dtorrent/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+PKG_CHOICES_CTORRENT:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CTORRENT,ctorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 4935c51cc..111f9d962 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -9,14 +9,21 @@ PKG_RELEASE:=		2
 PKG_HASH:=		8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
 PKG_DESCR:=		general purpose authentication library
 PKG_SECTION:=		libs/crypto
-PKG_BUILDDEP:=		openssl
-PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://cyrusimap.org/
 PKG_SITES:=		ftp://ftp.cyrusimap.org/cyrus-sasl/
 PKG_NOPARALLEL:=	1
 PKG_LIBNAME:=		libsasl2
 PKG_OPTS:=		dev
 
+PKG_CHOICES_CYRUS_SASL:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index f1926bf60..329472c2f 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -10,11 +10,19 @@ PKG_HASH:=		ed97c48029ad1fe62c8a505f81c6ea127532697374153e652065fc6ced098647
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg-turbo
-PKG_DEPENDS+=		libstdcxx libpthread libopenssl
-PKG_BUILDDEP:=		fltk libXi libjpeg-turbo libpng zlib openssl
+PKG_DEPENDS+=		libstdcxx libpthread
+PKG_BUILDDEP:=		fltk libXi libjpeg-turbo libpng zlib
 PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 
+PKG_CHOICES_DILLO:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 PKG_HOST_DEPENDS:=	!cygwin
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
 
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 9a0710a5c..382465005 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:=		2.2.18
 PKG_RELEASE:=		1
 PKG_HASH:=		b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb
 PKG_DESCR:=		minimal and secure imap server
-PKG_BUILDDEP:=		openssl
-PKG_DEPENDS:=		libopenssl
 PKG_SECTION:=		net/mail
 PKG_URL:=		http://www.dovecot.org/
 PKG_SITES:=		http://www.dovecot.org/releases/2.2/
 
+PKG_CHOICES_DOVECOT:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/easy-rsa/Makefile b/package/easy-rsa/Makefile
index a356c1600..cfd74e4ad 100644
--- a/package/easy-rsa/Makefile
+++ b/package/easy-rsa/Makefile
@@ -7,9 +7,8 @@ PKG_NAME:=		easy-rsa
 PKG_VERSION:=		2.0.2
 PKG_RELEASE:=		1
 PKG_HASH:=		40a1800d8cf4e858d4b3cdc3d3c612747edcd18ecaeb6b8737f452092760e50c
-PKG_DESCR:=		openssl ca scripts
+PKG_DESCR:=		x509 ca scripts
 PKG_SECTION:=		app/crypto
-PKG_DEPENDS:=		openssl-util
 PKG_URL:=		https://github.com/OpenVPN/easy-rsa
 PKG_SITES:=		http://distfiles.openadk.org/
 
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index 75717a2ac..5e7f0b719 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -9,8 +9,6 @@ PKG_RELEASE:=		3
 PKG_HASH:=		94dc254cdecddee51819ae17962d9e606690bee3ec43fb43c635cb40197b4bc7
 PKG_DESCR:=		advanced text web browser
 PKG_SECTION:=		app/browser
-PKG_DEPENDS:=		libopenssl
-PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://elinks.or.cz/
 PKG_SITES:=		http://elinks.or.cz/download/
 PKG_NOPARALLEL:=	1
@@ -20,6 +18,15 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_FLAVOURS_ELINKS:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support
 
+PKG_CHOICES_ELINKS:=	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
 
 $(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -30,7 +37,6 @@ CONFIGURE_ENV+=		$(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=ye
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ARGS+=	--enable-small \
 			--enable-256-colors \
-			--with-openssl='${STAGING_TARGET_DIR}/usr' \
 			--disable-backtrace \
 			--disable-data \
 			--disable-formhist \
@@ -57,6 +63,16 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
+ifeq ($(ADK_PACKAGE_ELINKS_WITH_OPENSSL),y)
+CONFIGURE_ARGS+=	--with-openssl='${STAGING_TARGET_DIR}/usr'
+endif
+ifeq ($(ADK_PACKAGE_ELINKS_WITH_LIBRESSL),y)
+CONFIGURE_ARGS+=	--with-openssl='${STAGING_TARGET_DIR}/usr'
+endif
+ifeq ($(ADK_PACKAGE_ELINKS_WITHOUT_SSL),y)
+CONFIGURE_ARGS+=	--without-openssl
+endif
+
 do-install:
 	${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/src/elinks ${IDIR_ELINKS}/usr/bin/
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
 
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index eb5cdd799..29cfa0ee2 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -9,11 +9,18 @@ PKG_RELEASE:=		2
 PKG_HASH:=		478bfb7ec00789af150acf6a231bc9b0731d06353c7fe36a8fd6d4d83e42a07f
 PKG_DESCR:=		radius client
 PKG_SECTION:=		net/radius
-PKG_DEPENDS:=		libopenssl libfreeradius-client
-PKG_BUILDDEP:=		openssl
+PKG_DEPENDS:=		libfreeradius-client
 PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 
+PKG_CHOICES_FREERADIUS_CLIENT:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		FREERADIUS_CLIENT LIBFREERADIUS_CLIENT
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index b1cf8c6b3..6e34d71a2 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -9,11 +9,19 @@ PKG_RELEASE:=		1
 PKG_HASH:=		c27252d7a86ba252904612d9b1f90e846f3ef1f4afee6a748f5287b730e87e3a
 PKG_DESCR:=		flexible radius server
 PKG_SECTION:=		net/radius
-PKG_DEPENDS:=		libltdl libopenssl libpthread libpcre libtalloc
-PKG_BUILDDEP:=		libtool openssl pcre talloc
+PKG_DEPENDS:=		libltdl libpthread libpcre libtalloc
+PKG_BUILDDEP:=		libtool pcre talloc
 PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 
+PKG_CHOICES_FREERADIUS_SERVER:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		FREERADIUS_SERVER FREERADIUS_DEMOCERTS FREERADIUS_MOD_CHAP FREERADIUS_MOD_DETAIL
diff --git a/package/freeswitch/Makefile b/package/freeswitch/Makefile
index f0eb99c84..e6c645500 100644
--- a/package/freeswitch/Makefile
+++ b/package/freeswitch/Makefile
@@ -8,11 +8,21 @@ PKG_VERSION:=		6762f14140f5bf70647c037c4ef527392796af34
 PKG_RELEASE:=		1
 PKG_DESCR:=		cross-platform telephony platform
 PKG_SECTION:=		net/voip
+PKG_DEPENDS:=		libpcre libcurl zlib libjpeg-turbo libsqlite
 PKG_BUILDDEP:=		util-linux zlib libjpeg-turbo sqlite curl pcre
-PKG_BUILDDEP+=		speex openssl
+PKG_BUILDDEP+=		speex
 PKG_URL:=		http://www.freeswitch.org/
 PKG_SITES:=		https://freeswitch.org/stash/scm/fs/freeswitch.git
 
+PKG_CHOICES_FREESWITCH:=WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FREESWITCH,freeswitch,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
diff --git a/package/git/Makefile b/package/git/Makefile
index f8b347995..40603dcfa 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -9,11 +9,19 @@ PKG_RELEASE:=		1
 PKG_HASH:=		c31a5f5f72e025f8fe26845032a06683c7e5c1a73236c2353b5606ddd22e0494
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		dev/scm
-PKG_BUILDDEP:=		openssl curl expat
-PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread librt
+PKG_BUILDDEP:=		curl expat
+PKG_DEPENDS:=		libcurl libexpat libpthread librt
 PKG_URL:=		http://git-scm.com/
 PKG_SITES:=		https://www.kernel.org/pub/software/scm/git/
 
+PKG_CHOICES_GIT:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,git,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 38e0fb923..74133bbe8 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -17,10 +17,13 @@ PKG_SITES:=		http://hostap.epitest.fi/releases/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		HOSTAPD HOSTAPD_UTILS
-PKG_CHOICES_HOSTAPD:=	WITH_GNUTLS WITH_OPENSSL
+PKG_CHOICES_HOSTAPD:=	WITH_LIBRESSL WITH_GNUTLS WITH_OPENSSL
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl
 PKGCB_WITH_OPENSSL:=	openssl
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCB_WITH_LIBRESSL:=	libressl
 PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls
 PKGCB_WITH_GNUTLS:=	gnutls
diff --git a/package/httping/Makefile b/package/httping/Makefile
index b44f9657a..f33a18582 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -9,12 +9,18 @@ PKG_RELEASE:=		1
 PKG_HASH:=		dab59f02b08bfbbc978c005bb16d2db6fe21e1fc841fde96af3d497ddfc82084
 PKG_DESCR:=		like ping but for http-requests
 PKG_SECTION:=		net/http
-PKG_DEPENDS:=		libopenssl
-PKG_BUILDDEP:=		openssl
 PKG_SITES:=		http://www.vanheusden.com/httping/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
+PKG_CHOICES_HTTPING:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopens