drop support for libressl

- openssl is nowadays in a good shape
- openssl has LTS support
- openssl works on more architectures (m68k, xtensa)

Too much combinations to test with libressl/openssl combinations.

docs/adding-packages-manual.txt

@@ -23,8 +23,8 @@ scripts.
 09: PKG_HASH:=		62333167b79afb0b25a843513288c67b59547acf653e8fbe62ee64e71ebd1587
 10: PKG_DESCR:=		foo library
 11: PKG_SECTION:=	libs
-12: PKG_BUILDDEP:=	libressl
-13: PKG_DEPENDS:=	libressl
+12: PKG_BUILDDEP:=	openssl
+13: PKG_DEPENDS:=	libopenssl
 14: PKG_URL:=		http://www.libfoo.org/
 15: PKG_SITES:=		http://download.libfoo.org/
 16:

package/.template/Makefile

@@ -36,20 +36,20 @@ PKG_SITES:=		add download url without package name
 # flavour description
 #PKGFD_WITH_SSL:=	enable SSL support
 # flavour runtime dependency, package name
-#PKGFS_WITH_SSL:=	libressl
+#PKGFS_WITH_SSL:=	libopenssl
 # flavour build time dependency, package dir
-#PKGFB_WITH_SSL:=	libressl
+#PKGFB_WITH_SSL:=	openssl
 
 # define your choices for your package here, f.e. different SSL implementations
-#PKG_CHOICES_PKGNAME:=	WITH_LIBRESSL WITH_GNUTLS
+#PKG_CHOICES_PKGNAME:=	WITH_OPENSSL WITH_GNUTLS
 # package description for each choice
-#PKGCD_WITH_LIBRESSL:=	ssl support via libressl library
+#PKGCD_WITH_OPENSSL:=	ssl support via libopenssl library
 #PKGCD_WITH_GNUTLS:=	ssl support via gnutls library
 # package build time dependencies
-#PKGCB_WITH_LIBRESSL:=	libressl
+#PKGCB_WITH_OPENSSL:=	openssl
 #PKGCB_WITH_GNUTLS:=	gnutls
 # package runtime dependencies
-#PKGCS_WITH_LIBRESSL:=	libressl
+#PKGCS_WITH_OPENSSL:=	libopenssl
 #PKGCS_WITH_GNUTLS:=	libgnutls
 
 # if downloaded package is not ending with .tar.xz use following

package/aircrack-ng/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net/wifi
-PKG_DEPENDS:=		libpcap libnl libressl zlib
-PKG_BUILDDEP:=		libpcap libnl libressl zlib
+PKG_DEPENDS:=		libpcap libnl libopenssl zlib
+PKG_BUILDDEP:=		libpcap libnl openssl zlib
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.aircrack-ng.org/
 PKG_SITES:=		http://download.aircrack-ng.org/

package/bitlbee/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		9f15de46f29b46bf1e39fc50bdf4515e71b17f551f3955094c5da792d962107e
 PKG_DESCR:=		irc gateway to im chat networks
 PKG_SECTION:=		app/chat
-PKG_DEPENDS:=		glib libressl
-PKG_BUILDDEP:=		glib libressl
+PKG_DEPENDS:=		glib libopenssl
+PKG_BUILDDEP:=		glib openssl
 PKG_URL:=		http://www.bitlbee.org/
 PKG_SITES:=		http://get.bitlbee.org/src/
 

package/cryptodev-linux/Makefile

@@ -9,8 +9,8 @@ PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_DESCR:=		device that allows access to kernel cryptographic drivers
 PKG_SECTION:=		app/crypto
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl
 PKG_KDEPENDS:=		crypto-aead crypto-algapi crypto-manager
 PKG_URL:=		http://home.gna.org/cryptodev-linux/
 PKG_SITES:=		https://github.com/cryptodev-linux/cryptodev-linux.git

package/cryptsetup/Makefile

@@ -37,8 +37,8 @@ PKGCD_WITH_NETTLE:=		use libnettle crypto backend
 PKGCS_WITH_NETTLE:=		libnettle
 PKGCB_WITH_NETTLE:=		libnettle
 PKGCD_WITH_OPENSSL:=		use OpenSSL crypto backend
-PKGCS_WITH_OPENSSL:=		libressl
-PKGCB_WITH_OPENSSL:=		libressl
+PKGCS_WITH_OPENSSL:=		libopenssl
+PKGCB_WITH_OPENSSL:=		openssl
 
 include ${ADK_TOPDIR}/mk/package.mk
 

package/ctorrent/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_HASH:=		c87366c91475931f75b924119580abd06a7b3cb3f00fef47346552cab1e24863
 PKG_DESCR:=		console-based bittorrent client
 PKG_SECTION:=		app/p2p
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl
 PKG_NEEDS:=		c++
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=dtorrent/}

package/curl/Makefile

@@ -28,10 +28,7 @@ PKGSS_CURL:=		zlib libcurl
 PKG_FLAVOURS_LIBCURL:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable ipv6 support
 
-PKG_CHOICES_LIBCURL:=	WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
-PKGCB_WITH_LIBRESSL:=	libressl
+PKG_CHOICES_LIBCURL:=	WITH_OPENSSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL
 PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCB_WITH_OPENSSL:=	openssl
@@ -53,11 +50,6 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 HOST_CONFIGURE_ARGS+=	--with-openssl="$(STAGING_HOST_DIR)/usr" \
 			--without-libpsl
 
-ifeq (${ADK_PACKAGE_LIBCURL_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	--with-openssl="${STAGING_TARGET_DIR}/usr" \
-			--without-gnutls \
-			--without-wolfssl
-endif
 ifeq (${ADK_PACKAGE_LIBCURL_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-openssl="${STAGING_TARGET_DIR}/usr" \
 			--without-gnutls \

package/dovecot/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		e0288f59e326ab87cb3881fdabadafe542f4dc7ab9996db13863a439ebbc1f25
 PKG_DESCR:=		minimal and secure imap server
 PKG_SECTION:=		net/mail
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://www.dovecot.org/
 PKG_SITES:=		http://www.dovecot.org/releases/2.2/
 

package/easy-rsa/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		3e41c0dfebe04332cdc07f13bf48a69e25dfc31d059e94071a9cfb9f3bba6f9a
 PKG_DESCR:=		x509 ca scripts
 PKG_SECTION:=		app/crypto
-PKG_DEPENDS:=		libressl-util
+PKG_DEPENDS:=		openssl-util
 PKG_URL:=		https://github.com/OpenVPN/easy-rsa
 PKG_SITES:=		https://github.com/OpenVPN/easy-rsa/archive/
 

package/fetchmail/Makefile

@@ -12,10 +12,10 @@ PKG_SECTION:=		net/mail
 PKG_URL:=		http://www.fetchmail.info
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fetchmail/}
 
-PKG_CHOICES_FETCHMAIL:=	WITH_LIBRESSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
+PKG_CHOICES_FETCHMAIL:=	WITH_OPENSSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 include ${ADK_TOPDIR}/mk/package.mk
@@ -25,7 +25,7 @@ $(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${P
 CONFIGURE_ENV+=		ac_cv_have_decl_TLS1_3_VERSION=no
 CONFIGURE_ARGS+=	--without-hesiod
 
-ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_LIBRESSL},y)
+ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-ssl='${STAGING_TARGET_DIR}/usr'
 endif
 ifeq (${ADK_PACKAGE_FETCHMAIL_WITHOUT_SSL},y)

package/ffmpeg/Makefile

@@ -10,22 +10,13 @@ PKG_HASH:=		5eb62f529114778333b7eb0381cb16e2b8725ce2ae081d07b1082effe22b12e9
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs/video
 PKG_NEEDS:=		threads
-PKG_DEPENDS:=		libncurses
-PKG_BUILDDEP:=		ncurses
+PKG_DEPENDS:=		libncurses libopenssl
+PKG_BUILDDEP:=		ncurses openssl
 PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 PKG_LIBNAME:=		libffmpeg
 PKG_OPTS:=		dev
 
-PKG_CHOICES_LIBFFMPEG:=	WITH_OPENSSL WITH_LIBRESSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
-PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
-PKGCB_WITH_OPENSSL:=	openssl
-
-
 PKG_SUBPKGS:=		LIBFFMPEG FFPROBE FFMPEG
 PKGSD_FFMPEG:=		video converter
 PKGSC_FFMPEG:=		mm/video

package/freeradius-client/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_HASH:=		478bfb7ec00789af150acf6a231bc9b0731d06353c7fe36a8fd6d4d83e42a07f
 PKG_DESCR:=		radius client
 PKG_SECTION:=		net/radius
-PKG_DEPENDS:=		libfreeradius-client libressl
-PKG_BUILDDEP:=		libressl
+PKG_DEPENDS:=		libfreeradius-client libopenssl
+PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 

package/git/Makefile

@@ -9,20 +9,12 @@ PKG_RELEASE:=		1
 PKG_HASH:=		f689162364c10de79ef89aa8dbf48731eb057e34edbbd20aca510ce0154681a3
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		dev/scm
-PKG_BUILDDEP:=		zlib curl expat
-PKG_DEPENDS:=		zlib curl libexpat
+PKG_BUILDDEP:=		zlib curl expat openssl
+PKG_DEPENDS:=		zlib curl libexpat libopenssl
 PKG_NEEDS:=		threads
 PKG_URL:=		http://git-scm.com/
 PKG_SITES:=		https://www.kernel.org/pub/software/scm/git/
 
-PKG_CHOICES_GIT:=	WITH_OPENSSL WITH_LIBRESSL
-PKGCD_WITH_OPENSSL:=	use openssl for crypto
-PKGCB_WITH_OPENSSL:=	openssl
-PKGCS_WITH_OPENSSL:=	libopenssl
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,git,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/hostapd/Makefile

@@ -16,10 +16,10 @@ PKG_SITES:=		http://w1.fi/releases/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		HOSTAPD HOSTAPD_UTILS
-PKG_CHOICES_HOSTAPD:=	WITH_LIBRESSL WITH_GNUTLS
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCS_WITH_LIBRESSL:=	libressl
-PKGCB_WITH_LIBRESSL:=	libressl
+PKG_CHOICES_HOSTAPD:=	WITH_OPENSSL WITH_GNUTLS
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCB_WITH_OPENSSL:=	openssl
 PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls
 PKGCB_WITH_GNUTLS:=	gnutls

package/httping/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		8c081daae31cad586bce7742bd721c2a741d7ce0687fb3a12cafd389b90bf79c
 PKG_DESCR:=		like ping but for http-requests
 PKG_SECTION:=		net/http
-PKG_DEPENDS:=		libressl ca-certificates
-PKG_BUILDDEP:=		cmake-host libressl
+PKG_DEPENDS:=		libopenssl ca-certificates
+PKG_BUILDDEP:=		cmake-host openssl
 PKG_NEEDS:=		intl
 PKG_SITES:=		https://github.com/folkertvanheusden/HTTPing/archive/refs/tags/
 

package/irssi/Makefile

@@ -9,19 +9,11 @@ PKG_RELEASE:=		1
 PKG_HASH:=		72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062
 PKG_DESCR:=		irc text client
 PKG_SECTION:=		app/chat
-PKG_DEPENDS:=		glib libncurses
-PKG_BUILDDEP:=		glib ncurses
+PKG_DEPENDS:=		glib libncurses libopenssl
+PKG_BUILDDEP:=		glib ncurses openssl
 PKG_URL:=		http://www.irssi.org/
 PKG_SITES:=		https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/
 
-PKG_CHOICES_IRSSI:=	WITH_OPENSSL WITH_LIBRESSL
-PKGCD_WITH_OPENSSL:=	use openssl for crypto
-PKGCB_WITH_OPENSSL:=	openssl
-PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
-
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/lftp/Makefile

@@ -16,13 +16,10 @@ PKG_NEEDS:=		c++
 PKG_URL:=		http://lftp.yar.ru/
 PKG_SITES:=		http://lftp.yar.ru/ftp/
 
-PKG_CHOICES_LFTP:=	WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL
+PKG_CHOICES_LFTP:=	WITH_OPENSSL WITH_GNUTLS WITHOUT_SSL
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
-PKGCB_WITH_LIBRESSL:=	libressl
 PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates
 PKGCB_WITH_GNUTLS:=	gnutls
@@ -48,10 +45,6 @@ ifeq (${ADK_PACKAGE_LFTP_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-openssl="$(STAGING_TARGET_DIR)/usr" \
 			--without-gnutls
 endif
-ifeq (${ADK_PACKAGE_LFTP_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	--with-openssl="$(STAGING_TARGET_DIR)/usr" \
-			--without-gnutls
-endif
 
 lftp-install:
 	$(INSTALL_DIR) $(IDIR_LFTP)/usr/bin

package/libressl/Makefile

@@ -1,54 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		libressl
-PKG_VERSION:=		3.9.2
-PKG_RELEASE:=		1
-PKG_HASH:=		7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97
-PKG_DESCR:=		ssl/tls library
-PKG_SECTION:=		libs/crypto
-PKG_URL:=		http://www.libressl.org
-PKG_SITES:=		http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/
-PKG_OPTS:=		dev
-
-PKG_ARCH_DEPENDS:=	!m68k !xtensa
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_SUBPKGS:=		LIBRESSL LIBRESSL_UTIL
-PKGSD_LIBRESSL_UTIL:=	openssl command line tool
-PKGSC_LIBRESSL_UTIL:=	app/crypto
-PKGSS_LIBRESSL_UTIL:=	libressl
-
-include ${ADK_TOPDIR}/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call HOST_template,LIBRESSL,libressl,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBRESSL,libressl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBRESSL_UTIL,libressl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBRESSL_UTIL},${PKGSD_LIBRESSL_UTIL},${PKGSC_LIBRESSL_UTIL}))
-
-ifeq ($(ADK_TARGET_ARCH_ARM),y)
-CONFIGURE_ARGS+=	--disable-asm
-endif
-
-ifeq ($(ADK_TARGET_USE_SSP),y)
-CONFIGURE_ARGS+=	--enable-hardening
-else
-CONFIGURE_ARGS+=	--disable-hardening
-endif
-
-libressl-install:
-	${INSTALL_DIR} ${IDIR_LIBRESSL}/etc/ssl
-	${CP} ${WRKINST}/etc/ssl/openssl.cnf ${IDIR_LIBRESSL}/etc/ssl
-	$(INSTALL_DIR) $(IDIR_LIBRESSL)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/lib{crypto,ssl,tls}.so* \
-		$(IDIR_LIBRESSL)/usr/lib
-
-libressl-util-install:
-	${INSTALL_DIR} ${IDIR_LIBRESSL_UTIL}/usr/bin
-	${CP} ${WRKINST}/usr/bin/openssl ${IDIR_LIBRESSL_UTIL}/usr/bin
-
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libssh2/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
 PKG_DESCR:=		client-side c library implementing ssh2 protocol
 PKG_SECTION:=		libs/crypto
-PKG_BUILDDEP:=		zlib libressl
-PKG_DEPENDS:=		zlib libressl
+PKG_BUILDDEP:=		zlib openssl
+PKG_DEPENDS:=		zlib libopenssl
 PKG_URL:=		http://www.libssh2.org/
 PKG_SITES:=		http://www.libssh2.org/download/
 PKG_OPTS:=		dev

package/libtorrent/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983
 PKG_DESCR:=		bittorrent library
 PKG_SECTION:=		libs/net
-PKG_DEPENDS:=		libsigc++ zlib libressl
-PKG_BUILDDEP:=		libsigc++ zlib libressl
+PKG_DEPENDS:=		libsigc++ zlib libopenssl
+PKG_BUILDDEP:=		libsigc++ zlib openssl
 PKG_NEEDS:=		intl
 PKG_URL:=		https://rakshasa.github.io/rtorrent/
 PKG_SITES:=		https://github.com/rakshasa/rtorrent/releases/download/v0.9.8/

package/libwebsockets/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90
 PKG_DESCR:=		lightweight network library
 PKG_SECTION:=		libs/net
-PKG_BUILDDEP:=		cmake-host zlib libressl
-PKG_DEPENDS:=		zlib libressl
+PKG_BUILDDEP:=		cmake-host zlib openssl
+PKG_DEPENDS:=		zlib libopenssl
 PKG_URL:=		https://libwebsockets.org/
 PKG_SITES:=		https://github.com/warmcat/libwebsockets/archive/refs/tags/
 PKG_OPTS:=		dev

package/lighttpd/Makefile

@@ -15,10 +15,10 @@ PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/
 PKG_FLAVOURS_LIGHTTPD:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable ipv6 support
 
-PKG_CHOICES_LIGHTTPD:=	WITH_LIBRESSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
+PKG_CHOICES_LIGHTTPD:=	WITH_OPENSSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 PKG_SUBPKGS:=		LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH
@@ -125,7 +125,7 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-ifeq ($(ADK_PACKAGE_LIGHTTPD_WITH_LIBRESSL),y)
+ifeq ($(ADK_PACKAGE_LIGHTTPD_WITH_OPENSSL),y)
 CONFIGURE_ARGS+=	--with-openssl
 endif
 ifeq ($(ADK_PACKAGE_LIGHTTPD_WITHOUT_SSL),y)

package/links/Makefile

@@ -16,10 +16,10 @@ PKG_SITES:=		http://links.twibright.com/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CHOICES_LINKS:=	WITH_LIBRESSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl
+PKG_CHOICES_LINKS:=	WITH_OPENSSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 PKG_FLAVOURS_LINKS:=	WITH_FB WITH_DIRECTFB WITH_X

package/lynx/Makefile

@@ -18,10 +18,7 @@ PKG_NOPARALLEL:=	1
 DISTFILES:=		${PKG_NAME}${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/$(PKG_NAME)$(PKG_VERSION)
 
-PKG_CHOICES_LYNX:=	WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
-PKGCB_WITH_LIBRESSL:=	libressl
+PKG_CHOICES_LYNX:=	WITH_OPENSSL WITH_GNUTLS WITHOUT_SSL
 PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCB_WITH_OPENSSL:=	openssl
@@ -39,10 +36,6 @@ TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/include/openssl
 TARGET_CPPFLAGS+=	-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
 HOST_CFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
 
-ifeq (${ADK_PACKAGE_LYNX_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	--with-ssl="${STAGING_TARGET_DIR}/usr" \
-			--without-gnutls
-endif
 ifeq (${ADK_PACKAGE_LYNX_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-ssl="${STAGING_TARGET_DIR}/usr" \
 			--without-gnutls

package/mini_httpd/Makefile

@@ -7,9 +7,9 @@ PKG_NAME:=		mini-httpd
 PKG_VERSION:=		1.19
 PKG_RELEASE:=		10
 PKG_HASH:=		f7f36533b1338ea16d916ea525ea7006ab38fdd3544ac7df93a4688a8e270241
-PKG_DESCR:=		small webserver with ssl
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl
+PKG_DESCR:=		small webserver with ssl support
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl
 PKG_SECTION:=		net/http
 PKG_URL:=		http://www.acme.com/software/mini_httpd/
 PKG_SITES:=		http://www.acme.com/software/mini_httpd/

package/monit/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5
 PKG_DESCR:=		utility for system services monitoring
 PKG_SECTION:=		sys/misc
-PKG_DEPENDS:=		libressl zlib
-PKG_BUILDDEP:=		libressl zlib
+PKG_DEPENDS:=		libopenssl zlib
+PKG_BUILDDEP:=		openssl zlib
 PKG_NEEDS:=		threads
 PKG_URL:=		http://mmonit.com/monit/
 PKG_SITES:=		https://mmonit.com/monit/dist/

package/mosh/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		ae581fbddf038730af9eee4d319a483288395a0722d0c94c7efb7fdbdbb0dbac
 PKG_DESCR:=		mobile shell
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		zlib libncurses libressl perl protobuf
-PKG_BUILDDEP:=		protobuf-host protobuf zlib ncurses libressl
+PKG_DEPENDS:=		zlib libncurses libopenssl perl protobuf
+PKG_BUILDDEP:=		protobuf-host protobuf zlib ncurses openssl
 PKG_NEEDS:=		c++
 PKG_URL:=		https://mosh.org/
 PKG_SITES:=		https://github.com/mobile-shell/mosh/archive/refs/tags/

package/mosquitto/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a
 PKG_DESCR:=		mqtt broker
 PKG_SECTION:=		net/misc
-PKG_DEPENDS:=		c-ares libressl
-PKG_BUILDDEP:=		cmake-host c-ares libressl
+PKG_DEPENDS:=		c-ares libopenssl
+PKG_BUILDDEP:=		cmake-host c-ares openssl
 PKG_NEEDS:=		threads
 PKG_URL:=		http://mosquitto.org
 PKG_SITES:=		http://mosquitto.org/files/source/
@@ -38,6 +38,4 @@ mosquitto-install:
 	$(CP) $(WRKINST)/usr/lib/*.so* \
 		$(IDIR_MOSQUITTO)/usr/lib
 
-
-
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/mutt/Makefile

@@ -14,13 +14,10 @@ PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.mutt.org/
 PKG_SITES:=		ftp://ftp.mutt.org/pub/mutt/
 
-PKG_CHOICES_MUTT:=	WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL
+PKG_CHOICES_MUTT:=	WITH_OPENSSL WITHOUT_SSL
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCB_WITH_OPENSSL:=	openssl
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -29,7 +26,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfo
+TARGET_LDFLAGS+=	-ltinfow
 CONFIGURE_ARGS+=	--with-homespool="~/Maildir" \
 			--with-curses="$(STAGING_TARGET_DIR)/usr" \
 			--enable-pop \

package/neon/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8
 PKG_DESCR:=		http and webdav library
 PKG_SECTION:=		libs/misc
-PKG_DEPENDS:=		libxml2 zlib libressl
-PKG_BUILDDEP:=		libxml2 zlib libressl
+PKG_DEPENDS:=		libxml2 zlib libopenssl
+PKG_BUILDDEP:=		libxml2 zlib openssl
 PKG_NEEDS:=		threads
 PKG_URL:=		https://notroj.github.io/neon/
 PKG_SITES:=		https://notroj.github.io/neon/

package/nginx/Makefile

@@ -17,13 +17,10 @@ PKG_SITES:=		http://nginx.org/download/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_CHOICES_NGINX:=	WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL
+PKG_CHOICES_NGINX:=	WITH_OPENSSL WITHOUT_SSL
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCB_WITH_OPENSSL:=	openssl
 PKGCS_WITH_OPENSSL:=	openssl ca-certificates
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 include $(ADK_TOPDIR)/mk/package.mk
@@ -53,9 +50,6 @@ CONFIGURE_ARGS:=        --prefix=/srv/www \
 			--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
 			--without-http_upstream_zone_module
 
-ifeq ($(ADK_PACKAGE_NGINX_WITH_LIBRESSL),y)
-CONFIGURE_ARGS+=	--with-http_ssl_module
-endif
 ifeq ($(ADK_PACKAGE_NGINX_WITH_OPENSSL),y)
 CONFIGURE_ARGS+=	--with-http_ssl_module
 endif

package/nut/Makefile

@@ -22,10 +22,10 @@ PKGFD_WITH_USB:=	enable usb support
 PKGFS_WITH_USB:=	libusb libusb-compat
 PKGFB_WITH_USB:=	libusb libusb-compat
 
-PKG_CHOICES_NUT:=	WITH_LIBRESSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
+PKG_CHOICES_NUT:=	WITH_OPENSSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 include ${ADK_TOPDIR}/mk/package.mk
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=	--with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \
 			--with-group=0 \
 			--with-user=0
 
-ifeq (${ADK_PACKAGE_NUT_WITH_LIBRESSL},y)
+ifeq (${ADK_PACKAGE_NUT_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-ssl
 CONFIGURE_ENV+=		CPPFLAGS="${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
 MAKE_FLAGS+=		SSL_CFLAGS="${TARGET_CPPFLAGS}" SSL_LDFLAGS="${TARGET_LDFLAGS} -lssl -lcrypto"

package/open-iscsi/Makefile

@@ -8,8 +8,8 @@ PKG_VERSION:=		2.1.9
 PKG_RELEASE:=		1
 PKG_HASH:=		60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a
 PKG_DESCR:=		iscsi utilities
-PKG_DEPENDS:=		libkmod libressl
-PKG_BUILDDEP:=		cmake-host kmod libressl
+PKG_DEPENDS:=		libkmod libopenssl
+PKG_BUILDDEP:=		cmake-host kmod openssl
 PKG_SECTION:=		sys/fs
 PKG_SITES:=		https://github.com/open-iscsi/open-iscsi/archive/refs/tags/
 

package/opensc/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		24d03c69287291da32a30c4c38a304ad827f56cb85d83619e1f5403ab6480ef8
 PKG_DESCR:=		utilities to access smart cards
 PKG_SECTION:=		app/crypto
-PKG_BUILDDEP:=		openct pcsc-lite readline libressl
-PKG_DEPENDS:=		libopensc libopenct pcsc-lite libreadline libressl
+PKG_BUILDDEP:=		openct pcsc-lite readline openssl
+PKG_DEPENDS:=		libopensc libopenct pcsc-lite libreadline libopenssl
 PKG_URL:=		https://github.com/OpenSC/OpenSC/wiki
 PKG_SITES:=		https://github.com/OpenSC/OpenSC/releases/download/$(PKG_VERSION)/
 PKG_LIBNAME:=		libopensc

package/opensips/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		eab3608a464884fc40f33cc639a5b124dc838799bd4a9701b7a8af49fb937fc7
 PKG_DESCR:=		high-performance, configurable, free sip server
 PKG_SECTION:=		net/voip
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl flex-host bison-host
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl flex-host bison-host
 PKG_URL:=		http://opensips.org/
 PKG_SITES:=		http://opensips.org/pub/opensips/$(PKG_VERSION)/
 

package/openssh/Makefile

@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_HASH:=		ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2
 PKG_DESCR:=		secure shell implementation
 PKG_SECTION:=		net/security
-PKG_BUILDDEP:=		zlib
+PKG_BUILDDEP:=		zlib openssl
 PKG_BUILDDEP_GLIBC:=	libxcrypt
-PKG_DEPENDS:=		zlib
+PKG_DEPENDS:=		zlib libopenssl
 PKG_NEEDS:=		threads
 PKG_URL:=		http://www.openssh.com/
 PKG_SITES:=		http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
@@ -37,15 +37,6 @@ PKGFD_WITH_KRB5:=	enable kerberos 5 support
 PKGFS_WITH_KRB5:=	libkrb5 libcom-err
 PKGFB_WITH_KRB5:=	krb5
 
-PKG_CHOICES_OPENSSH:=	WITH_OPENSSL WITH_LIBRESSL
-PKGCD_WITH_OPENSSL:=	with openssl
-PKGCS_WITH_OPENSSL:=	libopenssl
-PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_LIBRESSL:=	with libressl
-PKGCS_WITH_LIBRESSL:=	libressl
-PKGCB_WITH_LIBRESSL:=	libressl
-
-
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENSSH,openssh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/qtbase/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646
 PKG_DESCR:=		qt5 base
 PKG_SECTION:=		libs/qt
-PKG_DEPENDS:=		zlib libressl
-PKG_BUILDDEP:=		zlib libressl
+PKG_DEPENDS:=		zlib libopenssl
+PKG_BUILDDEP:=		zlib openssl
 PKG_NEEDS:=		c++
 PKG_URL:=		https://www.qt.io/
 PKG_SITES:=		http://download.qt.io/official_releases/qt/5.7/$(PKG_VERSION)/submodules/

package/raddump/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		f2d5c80164a5064d25e112f3ead9952d86200b022da584bddbc4afea948cb970
 PKG_DESCR:=		interprets captured radius packets
 PKG_SECTION:=		net/radius
-PKG_DEPENDS:=		libpcap libressl
-PKG_BUILDDEP:=		libpcap libressl
+PKG_DEPENDS:=		libpcap libopenssl
+PKG_BUILDDEP:=		libpcap openssl
 PKG_URL:=		http://sourceforge.net/projects/raddump
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=raddump/}
 

package/sipsak/Makefile

@@ -13,10 +13,10 @@ PKG_SITES:=		https://github.com/nils-ohlmeier/sipsak/releases/download/$(PKG_VER
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_CHOICES_SIPSAK:=	WITH_LIBRESSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
+PKG_CHOICES_SIPSAK:=	WITH_OPENSSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 include ${ADK_TOPDIR}/mk/package.mk

package/socat/Makefile

@@ -15,10 +15,10 @@ PKG_SITES:=		http://www.dest-unreach.org/socat/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CHOICES_SOCAT:=	WITH_LIBRESSL WITHOUT_SSL
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCS_WITH_LIBRESSL:=	libressl
+PKG_CHOICES_SOCAT:=	WITH_OPENSSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use libopenssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
 PKGCD_WITHOUT_SSL:=	use no ssl
 
 include ${ADK_TOPDIR}/mk/package.mk
@@ -33,7 +33,7 @@ CONFIGURE_ENV+=		sc_cv_termios_ispeed=no \
 CONFIGURE_ARGS+=	--disable-libwrap \
 			--disable-readline
 
-ifeq (${ADK_PACKAGE_SOCAT_WITH_LIBRESSL},y)
+ifeq (${ADK_PACKAGE_SOCAT_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--enable-openssl
 endif
 ifeq (${ADK_PACKAGE_SOCAT_WITHOUT_SSL},y)

package/strongswan/Makefile

@@ -17,16 +17,13 @@ PKG_SITES:=		http://download.strongswan.org/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CHOICES_STRONGSWAN:=WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITH_GMP
+PKG_CHOICES_STRONGSWAN:=WITH_OPENSSL WITH_GNUTLS WITH_GMP
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl
 PKGCB_WITH_OPENSSL:=	openssl
 PKGCD_WITH_GMP:=	use gmp for crypto
 PKGCS_WITH_GMP:=	libgmp
 PKGCB_WITH_GMP:=	gmp
-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
@@ -40,11 +37,6 @@ CONFIGURE_ARGS+=	--enable-openssl \
 			--disable-gcrypt \
 			--disable-gmp
 endif
-ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	--enable-openssl \
-			--disable-gcrypt \
-			--disable-gmp
-endif
 ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_GNUTLS},y)
 CONFIGURE_ARGS+=	--enable-gcrypt \
 			--disable-openssl \

package/tinc/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108
 PKG_DESCR:=		vpn tunnel daemon
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		zlib liblzo libressl
-PKG_BUILDDEP:=		zlib liblzo libressl
+PKG_DEPENDS:=		zlib liblzo libopenssl
+PKG_BUILDDEP:=		zlib liblzo openssl
 PKG_KDEPENDS:=		tun
 PKG_URL:=		http://www.tinc-vpn.org/
 PKG_SITES:=		http://www.tinc-vpn.org/packages/

package/tmsnc/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_HASH:=		7f54ba3974f45c0787b6d62d0d62ce352ddbf95419123b98b4969b97d3dfed23
 PKG_DESCR:=		textbased msn client
 PKG_SECTION:=		app/chat
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://tmsnc.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=tmsnc/}
 
@@ -20,7 +20,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfo
+TARGET_LDFLAGS+=	-ltinfow
 
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-openssl=${STAGING_TARGET_DIR}/usr \

package/transmission/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357
 PKG_DESCR:=		torrent client
 PKG_SECTION:=		app/p2p
-PKG_DEPENDS:=		libressl libevent libcurl
-PKG_BUILDDEP:=		cmake-host libressl libevent curl
+PKG_DEPENDS:=		libopenssl libevent libcurl
+PKG_BUILDDEP:=		cmake-host openssl libevent curl
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.transmissionbt.com
 PKG_SITES:=		https://github.com/transmission/transmission/releases/download/$(PKG_VERSION)/

package/tvheadend/Makefile

@@ -9,8 +9,8 @@ PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_DESCR:=		tv streaming server
 PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		libressl
-PKG_BUILDDEP:=		libressl yasm-host ffmpeg
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		openssl yasm-host ffmpeg
 PKG_URL:=		https://tvheadend.org/projects/tvheadend
 PKG_SITES:=		https://github.com/tvheadend/tvheadend.git
 

package/vtun/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9
 PKG_DESCR:=		vpn tunnel daemon
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		zlib liblzo libressl
-PKG_BUILDDEP:=		zlib liblzo libressl
+PKG_DEPENDS:=		zlib liblzo libopenssl
+PKG_BUILDDEP:=		zlib liblzo openssl
 PKG_KDEPENDS:=		tun
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
 

package/wget/Makefile

@@ -16,13 +16,10 @@ PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CHOICES_WGET:=	WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL
+PKG_CHOICES_WGET:=	WITH_OPENSSL WITH_GNUTLS WITHOUT_SSL
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates libgmp
 PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_LIBRESSL:=	use libressl for crypto
-PKGCS_WITH_LIBRESSL:=	libressl ca-certificates libgmp
-PKGCB_WITH_LIBRESSL:=	libressl
 PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates libgmp
 PKGCB_WITH_GNUTLS:=	gnutls
@@ -44,11 +41,6 @@ CONFIGURE_ARGS+=	--with-ssl=openssl \
 			--with-openssl=yes \
 			--with-libssl-prefix=${STAGING_TARGET_DIR}
 endif
-ifeq (${ADK_PACKAGE_WGET_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	--with-ssl=openssl \
-			--with-openssl=yes \
-			--with-libssl-prefix=${STAGING_TARGET_DIR}
-endif
 ifeq (${ADK_PACKAGE_WGET_WITH_GNUTLS},y)
 CONFIGURE_ARGS+=	--with-ssl=gnutls \
 			--with-libgnutls-prefix="$(STAGING_TARGET_DIR)/usr"

package/wpa_supplicant/Makefile

@@ -21,13 +21,10 @@ PKG_DFLT_WPA_SUPPLICANT:=	y if ADK_TARGET_WITH_WIFI
 
 WRKSRC=			${WRKDIST}/${PKG_NAME}
 
-PKG_CHOICES_WPA_SUPPLICANT:=	WITH_INTERNAL WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS
+PKG_CHOICES_WPA_SUPPLICANT:=	WITH_INTERNAL WITH_OPENSSL WITH_GNUTLS
 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

package/xorg-server/Makefile

@@ -28,13 +28,10 @@ PKG_OPTS:=		dev
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC
 
-PKG_CHOICES_XORG_SERVER:=	WITH_OPENSSL WITH_LIBRESSL WITH_GCRYPT
+PKG_CHOICES_XORG_SERVER:=	WITH_OPENSSL WITH_GCRYPT
 PKGCD_WITH_OPENSSL:=		use openssl crypto for sha1
 PKGCS_WITH_OPENSSL:=		libopenssl
 PKGCB_WITH_OPENSSL:=		openssl
-PKGCD_WITH_LIBRESSL:=		use libressl crypto for sha1
-PKGCS_WITH_LIBRESSL:=		libressl
-PKGCB_WITH_LIBRESSL:=		libressl
 PKGCD_WITH_GCRYPT:=		use libgcrypt for sha1
 PKGCS_WITH_GCRYPT:=		libgcrypt
 PKGCB_WITH_GCRYPT:=		libgcrypt
@@ -56,10 +53,6 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
 CONFIGURE_ARGS+=	 --with-sha1=libgcrypt
 endif
 
-ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	 --with-sha1=libcrypto
-endif
-
 CONFIGURE_ENV+=		V=1
 CONFIGURE_ARGS+=	--enable-dga \
 			--enable-xorg \

tasks/003-kodi

@@ -19,7 +19,7 @@ config ADK_APPLIANCE_KODI
 	select ADK_PACKAGE_PYTHON3_MOD_ZLIB # required for YouTube Addon
 	select ADK_PACKAGE_PYTHON3_MOD_SSL # required for YouTube Addon
 	select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBCURL_WITH_LIBRESSL
+	select ADK_PACKAGE_LIBCURL_WITH_OPENSSL
 	select ADK_PACKAGE_DROPBEAR if ADK_TARGET_LIB_UCLIBC_NG
 	select ADK_PACKAGE_OPENSSH if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_OPENSSH_SERVER if ADK_TARGET_LIB_GLIBC