--- a/components/squid/Makefile Tue Nov 15 05:20:35 2016 -0800
+++ b/components/squid/Makefile Fri Nov 18 19:13:03 2016 -0800
@@ -81,15 +81,18 @@
CONFIGURE_OPTIONS += --enable-ntlm-fail-open
CONFIGURE_OPTIONS += --enable-removal-policies='heap,lru'
CONFIGURE_OPTIONS += --enable-snmp
-CONFIGURE_OPTIONS += --enable-ssl
CONFIGURE_OPTIONS += --enable-storeio='aufs,diskd,ufs'
CONFIGURE_OPTIONS += --enable-x-accelerator-vary
CONFIGURE_OPTIONS += --with-aio
CONFIGURE_OPTIONS += --with-aufs-threads=8
CONFIGURE_OPTIONS += --with-large-files
CONFIGURE_OPTIONS += --with-build-environment=POSIX_V6_ILP32_OFFBIG
+# Due to the current licensing of squid and openssl, gnutls/nettle
+# must be enabled and used instead of openssl for tls and/or other
+# crypto support.
+CONFIGURE_OPTIONS += --enable-gnutls
+CONFIGURE_OPTIONS += --with-nettle
CONFIGURE_OPTIONS += --with-pthreads
-CONFIGURE_OPTIONS += --without-nettle
COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
@@ -141,9 +144,11 @@
test: $(NO_TESTS)
+REQUIRED_PACKAGES += library/gnutls-3
REQUIRED_PACKAGES += library/libtool/libltdl
-REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/nettle
REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += service/security/kerberos-5
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/library
@@ -154,4 +159,3 @@
REQUIRED_PACKAGES += system/library/security/gss
REQUIRED_PACKAGES += system/library/security/libsasl
REQUIRED_PACKAGES += system/network
-REQUIRED_PACKAGES += service/security/kerberos-5