diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-10-20 07:58:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-10-22 22:31:26 +0200 |
| commit | 26e2aca4359bc7cff080c8446a67b838a5026d15 (patch) | |
| tree | 404eafc8d39d46286fc41118e9d511f873b6ce8d | |
| parent | 75114af47a5f090b59b80d511472493b93c2e2c6 (diff) | |
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:= libopenssl + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,HTTPING,httping,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/iperf/Makefile b/package/iperf/Makefile index a71a1ef21..a733e73e2 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y) TARGET_CXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ TARGET_LDFLAGS+= -nodefaultlibs -CONFIGURE_ENV+= LIBS="-luClibc++ -lc -lm -lpthread" +CONFIGURE_ENV+= LIBS="-luClibc++ -lc -lm -lpthread -lgcc" else CONFIGURE_ENV+= LIBS="-lc -lm -lpthread" endif diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index e7d93e5b6..e21c271b6 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -9,13 +9,20 @@ PKG_RELEASE:= 1 PKG_HASH:= 8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d PKG_DESCR:= ipsec management tools PKG_SECTION:= net/security -PKG_BUILDDEP:= openssl flex -PKG_DEPENDS:= libopenssl +PKG_BUILDDEP:= flex PKG_URL:= http://ipsec-tools.sourceforge.net/ PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=ipsec-tools/) DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_CHOICES_IPSEC_TOOLS:= 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_FLAVOURS_IPSEC_TOOLS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support diff --git a/package/irssi/Makefile b/package/irssi/Makefile index fefbbda05..5d5afe76a 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -14,14 +14,20 @@ PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.irssi.org/ PKG_SITES:= http://distfiles.openadk.org/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -PKG_FLAVOURS_IRSSI:= WITH_SSL WITH_IPV6 -PKGFD_WITH_SSL:= enable ssl/tls support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl +PKG_CHOICES_IRSSI:= 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 +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl + +PKG_FLAVOURS_IRSSI:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -40,10 +46,10 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -ifneq (${ADK_PACKAGE_IRSSI_WITH_SSL},) -CONFIGURE_ARGS+= --enable-ssl -else +ifeq (${ADK_PACKAGE_IRSSI_WITHOUT_SSL},y) CONFIGURE_ARGS+= --disable-ssl +else +CONFIGURE_ARGS+= --enable-ssl endif irssi-install: diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 6bf32d875..02681c76e 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= ncurses gettext-tiny bison-host PKG_URL:= http://web.mit.edu/kerberos/ PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.13/ PKG_LIBNAME:= libkrb5 -PKG_OPTS:= dev +PKG_OPTS:= dev noscripts PKG_NOPARALLEL:= 1 PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT LIBKRB5 diff --git a/package/lftp/Makefile b/package/lftp/Makefile index 467a923ab..d36b6f1c0 100644 --- a/package/lftp/Makefile +++ b/package/lftp/Makefile @@ -15,11 +15,14 @@ PKG_BUILDDEP:= ncurses expat readline zlib PKG_URL:= http://lftp.yar.ru/ PKG_SITES:= http://lftp.yar.ru/ftp/ -PKG_CHOICES_LFTP:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL +PKG_CHOICES_LFTP:= WITHOUT_SSL WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL PKGCD_WITHOUT_SSL:= use no 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 @@ -40,6 +43,10 @@ ifeq (${ADK_PACKAGE_LFTP_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-openssl \ --without-gnutls endif +ifeq (${ADK_PACKAGE_LFTP_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-openssl \ + --without-gnutls +endif lftp-install: $(INSTALL_DIR) $(IDIR_LFTP)/usr/bin diff --git a/package/libesmtp/Makefile b/package/libesmtp/Makefile index 5a32c90ea..0b1129bdc 100644 --- a/package/libesmtp/Makefile +++ b/package/libesmtp/Makefile @@ -15,10 +15,14 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_FLAVOURS_LIBESMTP:= WITH_SSL -PKGFD_WITH_SSL:= enable ssl support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl +PKG_CHOICES_LIBESMTP:= 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 @@ -26,9 +30,13 @@ $(eval $(call PKG_template,LIBESMTP,libesmtp,$(PKG_VERSION)-${PKG_RELEASE},${PKG AUTOTOOL_STYLE:= autoreconf -ifneq (${ADK_PACKAGE_LIBESMTP_WITH_SSL},) +ifeq (${ADK_PACKAGE_LIBESMTP_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-openssl -else +endif +ifeq (${ADK_PACKAGE_LIBESMTP_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-openssl +endif +ifeq (${ADK_PACKAGE_LIBESMTP_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-openssl endif diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 7d43f9517..937cad5cc 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -9,14 +9,22 @@ PKG_RELEASE:= 1 PKG_HASH:= a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691 PKG_DESCR:= library implementing a small layer on top of pkcs11 api PKG_SECTION:= libs/crypto -PKG_DEPENDS:= libopenssl libltdl -PKG_BUILDDEP:= openssl libtool +PKG_DEPENDS:= libltdl +PKG_BUILDDEP:= libtool PKG_URL:= https://github.com/OpenSC/libp11/wiki PKG_SITES:= http://sourceforge.net/projects/opensc/files/libp11/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_LIBP11:= 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,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libssh2/Makefile b/package/libssh2/Makefile index 9a678eac8..14b1dcf48 100644 --- a/package/libssh2/Makefile +++ b/package/libssh2/Makefile @@ -9,14 +9,22 @@ PKG_RELEASE:= 1 PKG_HASH:= eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d PKG_DESCR:= client-side c library implementing ssh2 protocol PKG_SECTION:= libs/net -PKG_BUILDDEP:= openssl zlib -PKG_DEPENDS:= libopenssl zlib +PKG_BUILDDEP:= zlib +PKG_DEPENDS:= zlib PKG_URL:= http://www.libssh2.org/ PKG_SITES:= http://www.libssh2.org/download/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_LIBSSH2:= 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,LIBSSH2,libssh2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 2db389ff8..fa001a04f 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -9,14 +9,22 @@ PKG_RELEASE:= 2 PKG_HASH:= 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955 PKG_DESCR:= bittorrent library PKG_SECTION:= libs/net -PKG_DEPENDS:= libopenssl libsigc++ -PKG_BUILDDEP:= openssl libsigc++ gettext-tiny +PKG_DEPENDS:= libsigc++ +PKG_BUILDDEP:= libsigc++ gettext-tiny PKG_URL:= http://libtorrent.rakshasa.no/ PKG_SITES:= http://distfiles.openadk.org/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_LIBTORRENT:= 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,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 9de638a02..80a8e27bd 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -12,11 +12,17 @@ PKG_SECTION:= net/http PKG_URL:= http://www.lighttpd.net/ PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ -PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 WITH_SSL +PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support -PKGFD_WITH_SSL:= enable ssl support -PKGFB_WITH_SSL:= openssl -PKGFS_WITH_SSL:= libopenssl + +PKG_CHOICES_LIGHTTPD:= 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 PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI @@ -140,9 +146,14 @@ CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 endif -ifneq ($(ADK_PACKAGE_LIGHTTPD_WITH_SSL),) + +ifeq ($(ADK_PACKAGE_LIGHTTPD_WITH_OPENSSL),y) CONFIGURE_ARGS+= --with-openssl -else +endif +ifeq ($(ADK_PACKAGE_LIGHTTPD_WITH_LIBRESSL),y) +CONFIGURE_ARGS+= --with-openssl +endif +ifeq ($(ADK_PACKAGE_LIGHTTPD_WITHOUT_SSL),y) CONFIGURE_ARGS+= --without-openssl endif diff --git a/package/links/Makefile b/package/links/Makefile index 6b3ef3c03..682ae7a90 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -9,13 +9,22 @@ PKG_RELEASE:= 1 PKG_HASH:= 2ff4f4bfa5ee1d11d5e2eed39311824d65aa0610da63b22bf4b14793c8f48aa5 PKG_DESCR:= web browser with graphic support PKG_SECTION:= app/browser -PKG_DEPENDS:= libpng libjpeg-turbo libtiff gpm libopenssl -PKG_BUILDDEP:= openssl libpng libjpeg-turbo gpm +PKG_DEPENDS:= libpng libjpeg-turbo libtiff gpm +PKG_BUILDDEP:= libpng libjpeg-turbo gpm PKG_URL:= http://links.twibright.com/ PKG_SITES:= http://links.twibright.com/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_LINKS:= 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 +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl + PKG_FLAVOURS_LINKS:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support PKGFS_WITH_DIRECTFB:= directfb @@ -27,13 +36,18 @@ $(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN CONFIGURE_ARGS+= --enable-graphics \ --with-fb \ - --with-ssl \ --without-svgalib \ --without-libtiff \ --without-x \ --without-pmshell \ --without-atheos +ifeq (${ADK_PACKAGE_LINKS_WITHOUT_SSL},y) +CONFIGURE_ARGS+= --without-ssl +else +CONFIGURE_ARGS+= --with-ssl +endif + ifeq (${ADK_PACKAGE_LINKS_WITH_DIRECTFB},y) CONFIGURE_ARGS+= --with-directfb else diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 46716edf1..9a547e20e 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_HASH:= 234c9dc77d4c4594ad6216d7df4d49eae3019a3880e602f39721b35b97fbc408 PKG_DESCR:= text browser PKG_SECTION:= app/browser -PKG_DEPENDS:= libncurses libopenssl zlib -PKG_BUILDDEP:= ncurses openssl zlib +PKG_DEPENDS:= libncurses zlib +PKG_BUILDDEP:= ncurses zlib PKG_URL:= http://lynx.isc.org/ PKG_SITES:= http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/ PKG_NOPARALLEL:= 1 @@ -18,6 +18,14 @@ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/lynx2-8-8 +PKG_CHOICES_LYNX:= 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,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index e462cd4f5..e82d568d1 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -9,14 +9,20 @@ PKG_RELEASE:= 10 PKG_HASH:= f7f36533b1338ea16d916ea525ea7006ab38fdd3544ac7df93a4688a8e270241 PKG_DESCR:= small webserver with ssl PKG_SECTION:= net/http -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP:= openssl PKG_URL:= http://www.acme.com/software/mini_httpd/ PKG_SITES:= http://www.acme.com/software/mini_httpd/ DISTFILES:= mini_httpd-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION} +PKG_CHOICES_MINI_HTTPD:=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,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) diff --git a/package/monit/Makefile b/package/monit/Makefile index cf3113159..1bbfe7bd6 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -9,13 +9,20 @@ PKG_RELEASE:= 2 PKG_HASH:= 38e09bd8b39abc59e6b9a9bb7a78f7eac2b02a92f4de1f3a6dc24e84dfedae0d PKG_DESCR:= utility for system services monitoring PKG_SECTION:= sys/misc -PKG_DEPENDS:= libpthread libopenssl -PKG_BUILDDEP:= openssl +PKG_DEPENDS:= libpthread PKG_URL:= http://mmonit.com/monit/ PKG_SITES:= http://www.tildeslash.com/monit/dist/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_MONIT:= 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,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/mosquitto/Makefile b/package/mosquitto/Makefile index ba0e86787..282f0be72 100644 --- a/package/mosquitto/Makefile +++ b/package/mosquitto/Makefile @@ -9,13 +9,21 @@ PKG_RELEASE:= 1 PKG_HASH:= 16eb3dbef183827665feee9288362c7352cd016ba04ca0402a0ccf857d1c2ab2 PKG_DESCR:= mqtt broker PKG_SECTION:= net/misc -PKG_DEPENDS:= c-ares libopenssl librt libpthreads -PKG_BUILDDEP:= cmake-host c-ares openssl +PKG_DEPENDS:= c-ares librt libpthreads +PKG_BUILDDEP:= cmake-host c-ares PKG_URL:= http://mosquitto.org PKG_SITES:= http://mosquitto.org/files/source/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_MOSQUITTO:= 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,MOSQUITTO,mosquitto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 95fce9cf9..9d21efceb 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -9,11 +9,20 @@ PKG_RELEASE:= 1 PKG_HASH:= 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 PKG_DESCR:= mail text client PKG_SECTION:= net/mail -PKG_DEPENDS:= libncurses libopenssl -PKG_BUILDDEP:= ncurses openssl +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses PKG_URL:= http://www.mutt.org/ PKG_SITES:= http://distfiles.openadk.org/ +PKG_CHOICES_MUTT:= 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 @@ -25,8 +34,13 @@ CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \ --oldincludedir=${WRKBUILD}/. \ --with-homespool="~/Maildir" \ --enable-pop \ - --enable-imap \ - --with-ssl + --enable-imap + +ifeq ($(ADK_PACKAGE_MUTT_WITHOUT_SSL),y) +CONFIGURE_ARGS+= --without-ssl +else +CONFIGURE_ARGS+= --with-ssl +endif mutt-install: ${INSTALL_DIR} ${IDIR_MUTT}/usr/bin diff --git a/package/nut/Makefile b/package/nut/Makefile index 20139d653..fa9152eba 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -14,16 +14,22 @@ PKG_SITES:= http://www.networkupstools.org/source/2.7/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_FLAVOURS_NUT:= WITH_SSL WITH_SNMP WITH_USB +PKG_FLAVOURS_NUT:= WITH_SNMP WITH_USB PKGFD_WITH_SNMP:= enable snmp support PKGFS_WITH_SNMP:= libnetsnmp PKGFB_WITH_SNMP:= net-snmp PKGFD_WITH_USB:= enable usb support PKGFS_WITH_USB:= libusb libusb-compat PKGFB_WITH_USB:= libusb libusb-compat -PKGFD_WITH_SSL:= enable ssl support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl + +PKG_CHOICES_NUT:= 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 @@ -81,7 +87,12 @@ CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \ --with-group=0 \ --with-user=0 -ifneq (${ADK_PACKAGE_NUT_WITH_SSL},) +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" +endif +ifeq (${ADK_PACKAGE_NUT_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl CONFIGURE_ENV+= CPPFLAGS="${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" MAKE_FLAGS+= SSL_CFLAGS="${TARGET_CPPFLAGS}" SSL_LDFLAGS="${TARGET_LDFLAGS} -lssl -lcrypto" diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 824c0b77d..411aeeb62 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -9,13 +9,23 @@ PKG_RELEASE:= 1 PKG_HASH:= 27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e PKG_DESCR:= ldap client libraries PKG_SECTION:= libs/misc -PKG_DEPENDS:= libopenssl libsasl2 libdb libpthread libuuid libstdcxx libncurses -PKG_BUILDDEP:= cyrus-sasl openssl db util-linux +PKG_DEPENDS:= libsasl2 libdb libpthread libuuid libstdcxx libncurses +PKG_BUILDDEP:= cyrus-sasl db util-linux PKG_URL:= http://www.openldap.org/ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ PKG_LIBNAME:= libopenldap PKG_OPTS:= dev +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz + +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 + PKG_SUBPKGS:= LIBOPENLDAP OPENLDAP_UTILS OPENLDAP_SLAPD PKGSD_OPENLDAP_UTILS:= ldap utilities PKGSS_OPENLDAP_UTILS:= libopenldap @@ -24,8 +34,6 @@ PKGSD_OPENLDAP_SLAPD:= ldap server daemon PKGSS_OPENLDAP_SLAPD:= libopenldap PKGSC_OPENLDAP_SLAPD:= net/misc -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz - PKG_FLAVOURS_OPENLDAP_SLAPD:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 289f732f8..2df1a56df 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 399b2107a69e3f67e4e76dc2dbd951dbced8e534b1e0f919e176aea9b85970d7 PKG_DESCR:= utilities to access smart cards PKG_SECTION:= app/crypto -PKG_BUILDDEP:= openct pcsc-lite openssl readline -PKG_DEPENDS:= libopensc libopenct pcsc-lite libopenssl libreadline +PKG_BUILDDEP:= openct pcsc-lite readline +PKG_DEPENDS:= libopensc libopenct pcsc-lite libreadline PKG_URL:= https://github.com/OpenSC/OpenSC/wiki PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=opensc/} PKG_LIBNAME:= libopensc @@ -18,6 +18,14 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_OPENSC:= 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_SUBPKGS:= OPENSC LIBOPENSC PKGSD_LIBOPENSC:= opensc library PKGSC_LIBOPENSC:= libs/crypto diff --git a/package/opensips/Makefile b/package/opensips/Makefile index 2ea4a6c64..8cee902ad 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -9,11 +9,20 @@ PKG_RELEASE:= 1 PKG_HASH:= bcacc9bc273fd2002c16a5cb846fe2478dacded9ea7b52a04afb1f54bb2aa3f4 PKG_DESCR:= high-performance, configurable, free sip server PKG_SECTION:= net/voip -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP:= openssl PKG_URL:= http://opensips.org/ PKG_SITES:= http://opensips.org/pub/opensips/$(PKG_VERSION)/src/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)_src.tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-tls + +PKG_CHOICES_OPENSIPS:= 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_SUBPKGS:= OPENSIPS OPENSIPS_MOD_ACCOUNTING OPENSIPS_MOD_AUTH PKG_SUBPKGS+= OPENSIPS_MOD_AUTH_DB OPENSIPS_MOD_AVPOPS OPENSIPS_MOD_DISPATCHER PKG_SUBPKGS+= OPENSIPS_MOD_DIVERSION OPENSIPS_MOD_FLATSTORE OPENSIPS_MOD_GFLAGS @@ -63,9 +72,6 @@ PKGSN_OPENSIPS_MOD_UAC_REDIRECT:= opensips PKGSD_OPENSIPS_MOD_URI:= uri support PKGSN_OPENSIPS_MOD_URI:= opensips -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)_src.tar.gz -WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-tls - include $(ADK_TOPDIR)/mk/package.mk define PKG_mod_template diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 629000a06..4bf1a290f 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -9,12 +9,18 @@ PKG_RELEASE:= 1 PKG_HASH:= 4062ce972500f98988e9c6e9dd1040be25582f0d49aa7e69f3f4cff96e9aebee PKG_DESCR:= vpn solution using ssl/tls PKG_SECTION:= net/security -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP:= openssl PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ PKG_CFLINE_OPENVPN:= select ADK_KERNEL_TUN m +PKG_CHOICES_OPENVPN:= 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_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS WITH_SMALL PKGFD_WITH_LZO:= enable lzo compression support PKGFS_WITH_LZO:= liblzo diff --git a/package/php/Makefile b/package/php/Makefile index 78472fce0..8d480c93b 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -22,7 +22,7 @@ PKGSD_PHP_CLI:= php cli PKGSN_PHP_CLI:= php PKG_FLAVOURS_PHP:= MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MYSQL -PKG_FLAVOURS_PHP+= MOD_OPENSSL MOD_SESSION MOD_SNMP MOD_SQLITE +PKG_FLAVOURS_PHP+= MOD_SSL MOD_SESSION MOD_SNMP MOD_SQLITE PKG_FLAVOURS_PHP+= MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB MOD_JSON PKG_FLAVOURS_PHP+= MOD_LDAP MOD_PCNTL @@ -46,9 +46,9 @@ PKGFS_MOD_LDAP:= libopenldap PKGFD_MOD_MYSQL:= mysql support PKGFS_MOD_MYSQL:= libmysqlclient PKGFB_MOD_MYSQL:= mysql -PKGFD_MOD_OPENSSL:= openssl support -PKGFB_MOD_OPENSSL:= openssl -PKGFS_MOD_OPENSSL:= libopenssl +PKGFD_MOD_SSL:= ssl support +PKGFB_MOD_SSL:= libressl +PKGFS_MOD_SSL:= libressl PKGFD_MOD_PCNTL:= process control support PKGFD_MOD_SESSION:= session support PKGFD_MOD_SNMP:= snmp support diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 7840defb5..1afe4c888 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= postgresql -PKG_VERSION:= 9.4.3 +PKG_VERSION:= 9.4.5 PKG_RELEASE:= 1 -PKG_HASH:= b6a2e21e6e3f3b600ed122bddc969133db124a4f59913e93121bbf2d509f6848 +PKG_HASH:= aa1d7918ae782a0fc5e1886fd463fc8903e5ffc3eb6d3b51500065aec988a210 PKG_DESCR:= sql database library PKG_SECTION:= libs/db PKG_URL:= http://www.postgresql.org/ diff --git a/package/python3/Makefile b/package/python3/Makefile index 6ff76ba94..76e7a27b5 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -41,9 +41,9 @@ PKGFS_MOD_NCURSES:= libncurses PKGFD_MOD_READLINE:= readline support PKGFB_MOD_READLINE:= readline PKGFS_MOD_READLINE:= libreadline -PKGFD_MOD_SSL:= openssl support -PKGFB_MOD_SSL:= openssl -PKGFS_MOD_SSL:= libopenssl +PKGFD_MOD_SSL:= ssl support +PKGFB_MOD_SSL:= libressl +PKGFS_MOD_SSL:= libressl DISTFILES:= Python-${PKG_VERSION}.tar.xz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} diff --git a/package/raddump/Makefile b/package/raddump/Makefile index a1e689eb9..3f83b3d2b 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -9,13 +9,21 @@ PKG_RELEASE:= 1 PKG_HASH:= f2d5c80164a5064d25e112f3ead9952d86200b022da584bddbc4afea948cb970 PKG_DESCR:= interprets captured radius packets PKG_SECTION:= net/radius -PKG_DEPENDS:= libpcap libopenssl -PKG_BUILDDEP:= openssl libpcap +PKG_DEPENDS:= libpcap +PKG_BUILDDEP:= libpcap PKG_URL:= http://sourceforge.net/projects/raddump PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=raddump/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_RADDUMP:= 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,RADDUMP,raddump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile index 8cbc9f872..af81be343 100644 --- a/package/rdesktop/Makefile +++ b/package/rdesktop/Makefile @@ -9,13 +9,21 @@ PKG_RELEASE:= 1 PKG_HASH:= 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 PKG_DESCR:= client for windows terminal services PKG_SECTION:= x11/apps -PKG_DEPENDS:= libsamplerate libopenssl alsa-lib libao -PKG_BUILDDEP:= openssl libsamplerate alsa-lib libao +PKG_DEPENDS:= libsamplerate alsa-lib libao +PKG_BUILDDEP:= libsamplerate alsa-lib libao PKG_URL:= http://www.rdesktop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rdesktop/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_RDESKTOP:= 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,RDESKTOP,rdesktop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 7bbca29c3..7a0e50d53 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -9,13 +9,20 @@ PKG_RELEASE:= 2 PKG_HASH:= 5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 PKG_DESCR:= sip stress and diagnostics utility PKG_SECTION:= net/voip -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP:= openssl PKG_URL:= http://sourceforge.net/projects/sipsak.berlios/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sipsak.berlios/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-1.tar.gz +PKG_CHOICES_SIPSAK:= 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,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/socat/Makefile b/package/socat/Makefile index 0f73b4673..55f32f8c6 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -15,10 +15,14 @@ PKG_SITES:= http://www.dest-unreach.org/socat/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_FLAVOURS_SOCAT:= WITH_SSL -PKGFD_WITH_SSL:= enable SSL support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl +PKG_CHOICES_SOCAT:= 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 +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl include ${ADK_TOPDIR}/mk/package.mk @@ -32,9 +36,13 @@ CONFIGURE_ENV+= sc_cv_termios_ispeed=no \ CONFIGURE_ARGS+= --disable-libwrap \ --disable-readline -ifneq (${ADK_PACKAGE_SOCAT_WITH_SSL},) +ifeq (${ADK_PACKAGE_SOCAT_WITH_OPENSSL},y) CONFIGURE_ARGS+= --enable-openssl -else +endif +ifeq (${ADK_PACKAGE_SOCAT_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --enable-openssl +endif +ifeq (${ADK_PACKAGE_SOCAT_WITHOUT_SSL},y) CONFIGURE_ARGS+= --disable-openssl endif diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index 27a81da2a..cd82e37e0 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -9,10 +9,18 @@ PKG_RELEASE:= 1 PKG_HASH:= e801ab170f364ba2997fb276d16eba1f75bffcc0fc5a1e97ff0b247bf63b0570 PKG_DESCR:= ppp over ssl vpn tool PKG_SECTION:= net/security -PKG_DEPENDS:= libopenssl ppp -PKG_BUILDDEP:= openssl ppp +PKG_DEPENDS:= ppp +PKG_BUILDDEP:= ppp PKG_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/ +PKG_CHOICES_SSLTUNNEL:= 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_LIBC_DEPENDS:= uclibc-ng glibc diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 4085b7581..2551f524b 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -15,13 +15,16 @@ PKG_SITES:= http://download.strongswan.org/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_STRONGSWAN:=WITH_GNUTLS WITH_OPENSSL WITH_GMP +PKG_CHOICES_STRONGSWAN:=WITH_LIBRESSL WITH_GNUTLS WITH_OPENSSL WITH_GMP PKGCD_WITH_GMP:= use gmp for crypto PKGCS_WITH_GMP:= libgmp PKGCB_WITH_GMP:= gmp 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 @@ -39,6 +42,11 @@ 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 \ diff --git a/package/stunnel/Makefile b/package/stunnel/Makefile index 80cf2721a..9169cfc64 100644 --- a/package/stunnel/Makefile +++ b/package/stunnel/Makefile @@ -9,11 +9,17 @@ PKG_RELEASE:= 1 PKG_HASH:= 0532c0a2f8de3da1ab625e384146501ce5936fac63d01561c3a9bf652b692317 PKG_DESCR:= encryption wrapper PKG_SECTION:= net/security -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP:= openssl PKG_URL:= https://www.stunnel.org PKG_SITES:= https://www.stunnel.org/downloads/ +PKG_CHOICES_STUNNEL:= 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/supl/Makefile b/package/supl/Makefile index 13e58560f..2fd08a1e2 100644 --- a/package/supl/Makefile +++ b/package/supl/Makefile @@ -9,14 +9,20 @@ PKG_RELEASE:= 1 PKG_HASH:= 068dc47ce818ce5634f09a88159df85a6ce3456e2467b11b8c5f8543a99bb347 PKG_DESCR:= tools for accessing sup/rrlp server PKG_SECTION:= net/misc -PKG_BUILDDEP:= openssl -PKG_DEPENDS:= libopenssl PKG_URL:= http://www.tajuma.com/supl/ PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=supl/) DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz WRKDIST= $(WRKDIR)/trunk +PKG_CHOICES_SUPL:= 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,SUPL,supl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) diff --git a/package/tinc/Makefile b/package/tinc/Makefile index c562ed5e1..eb2ec673d 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -9,14 +9,22 @@ PKG_RELEASE:= 1 PKG_HASH:= bcf06bdf16ff903821e33fc1ce6219d6429971aa5acd70f4e8a35b4332442812 PKG_DESCR:= vpn tunnel daemon PKG_SECTION:= net/security -PKG_DEPENDS:= zlib liblzo libopenssl -PKG_BUILDDEP:= zlib liblzo openssl +PKG_DEPENDS:= zlib liblzo +PKG_BUILDDEP:= zlib liblzo PKG_URL:= http://www.tinc-vpn.org/ PKG_SITES:= http://www.tinc-vpn.org/packages/ PKG_CFLINE_TINC:= select ADK_KERNEL_TUN m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_TINC:= 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,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index 81575566f..83b4ea3d0 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -12,6 +12,14 @@ PKG_SECTION:= app/chat PKG_URL:= http://tmsnc.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/} +PKG_CHOICES_TMSNC:= 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/tntnet/Makefile b/package/tntnet/Makefile index 40b2f993b..8ab264a62 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -16,12 +16,15 @@ PKG_SITES:= http://www.tntnet.org/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_TNTNET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL -PKGCD_WITHOUT_SSL:= use no SSL -PKGCD_WITH_OPENSSL:= use OpenSSL for crypto +PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_LIBRESSL +PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_GNUTLS:= use GnuTLS for crypto +PKGCD_WITH_OPENSSL:= use libressl for crypto +PKGCS_WITH_OPENSSL:= libressl +PKGCB_WITH_OPENSSL:= libressl +PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls PKGCB_WITH_GNUTLS:= gnutls @@ -35,6 +38,9 @@ endif ifeq (${ADK_PACKAGE_TNTNET_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-ssl=openssl endif +ifeq (${ADK_PACKAGE_TNTNET_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-ssl=openssl +endif ifeq (${ADK_PACKAGE_TNTNET_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-ssl=gnutls endif diff --git a/package/tor/Makefile b/package/tor/Makefile index 356100b56..62f29b3aa 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -9,11 +9,19 @@ PKG_RELEASE:= 1 PKG_HASH:= 4a6c29ad89a98d7832c599d9480d6d8e55355fb3b8f4b506c5df557f15942f9c PKG_DESCR:= anonymous internet communication system PKG_SECTION:= net/proxy -PKG_DEPENDS:= libevent libopenssl zlib libpthread -PKG_BUILDDEP:= libevent openssl zlib +PKG_DEPENDS:= libevent zlib libpthread +PKG_BUILDDEP:= libevent zlib PKG_URL:= https://www.torproject.org/ PKG_SITES:= https://www.torproject.org/dist/ +PKG_CHOICES_TOR:= 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/tvheadend/Makefile b/package/tvheadend/Makefile index 519617aeb..a8b18a1cc 100644 --- a/package/tvheadend/Makefile +++ b/package/tvheadend/Makefile @@ -8,7 +8,6 @@ PKG_VERSION:= 679b7797128b8979145dc2a0a3c54ea513a0466b PKG_RELEASE:= 3 PKG_DESCR:= tv streaming server PKG_SECTION:= mm/video -PKG_BUILDDEP:= openssl PKG_URL:= https://tvheadend.org/projects/tvheadend PKG_SITES:= https://github.com/tvheadend/tvheadend.git diff --git a/package/vtun/Makefile b/package/vtun/Makefile index c79f344c7..0dfc30d34 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -9,11 +9,19 @@ PKG_RELEASE:= 1 PKG_HASH:= 22507499a8f650ef97157977e62fa632d5b0034070629a2d0fd0512e304eaeeb PKG_DESCR:= vpn tunnel daemon PKG_SECTION:= net/security -PKG_DEPENDS:= zlib libopenssl liblzo -PKG_BUILDDEP:= zlib openssl liblzo +PKG_DEPENDS:= zlib liblzo +PKG_BUILDDEP:= zlib liblzo PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/} PKG_CFLINE_VTUN:= select ADK_KERNEL_TUN m +PKG_CHOICES_VTUN:= 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_HOST_DEPENDS:= !freebsd diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 4369bd87e..13205717e 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 6 PKG_HASH:= fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5 PKG_DESCR:= webdav filesystem PKG_SECTION:= net/fs -PKG_DEPENDS:= libopenssl fuse-utils neon glib -PKG_BUILDDEP:= openssl fuse neon glib +PKG_DEPENDS:= fuse-utils neon glib +PKG_BUILDDEP:= fuse neon glib PKG_SITES:= http://noedler.de/projekte/wdfs/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/wget/Makefile b/package/wget/Makefile index 17eac1cb5..07edf440f 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -16,8 +16,11 @@ PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_WGET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL +PKG_CHOICES_WGET:= WITHOUT_SSL WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl ca-certificates libgmp +PKGCB_WITH_LIBRESSL:= libressl PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp PKGCB_WITH_OPENSSL:= openssl @@ -39,6 +42,11 @@ 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" diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 7b6be4c1c..8d0ef4564 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -20,7 +20,7 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_WITH_WIFI WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES_WPA_SUPPLICANT:= WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL WITH_INTERNAL +PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 1d82e72b1..d775eed7f 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 293d6a73a560f9f7f5cc8a05d84445a3aabfdf43683925d0f93c8f8502536c84 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile +PKG_DEPENDS:= libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb librt @@ -17,7 +17,7 @@ PKG_DEPENDS+= libxshmfence libfreetype libfontenc libstdcxx libpciaccess PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman -PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto +PKG_BUILDDEP+= libpciaccess xf86dgaproto recordproto PKG_BUILDDEP+= xineramaproto presentproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} @@ -33,13 +33,16 @@ PKGFD_WITH_DRI:= enable dri support PKGFB_WITH_DRI:= xf86driproto glproto mesa PKGFD_WITH_KDRIVE:= build kdrive xfbdev server -PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO +PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_GCRYPT:= use libgcrypt for sha1 PKGCS_WITH_GCRYPT:= libgcrypt PKGCB_WITH_GCRYPT:= libgcrypt -PKGCD_WITH_CRYPTO:= use openssl libcrypto for sha1 -PKGCS_WITH_CRYPTO:= libopenssl -PKGCB_WITH_CRYPTO:= openssl +PKGCD_WITH_LIBRESSL:= use libressl crypto for sha1 +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use openssl crypto for sha1 +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl include $(ADK_TOPDIR)/mk/package.mk |