# HG changeset patch
# User Esha Wang <esha.wang@oracle.com>
# Date 1479256479 28800
# Node ID 6b323adaf9e7bfb4e548efb2b805b7e73b2c8840
# Parent  88d40c6177a19d0a97ec6bfdba8b285ed3ca55fc
24938162 squid is 64-bit but enables a 32-bit build environment
21488344 squid needs nettle

diff -r 88d40c6177a1 -r 6b323adaf9e7 components/squid/Makefile
--- a/components/squid/Makefile	Tue Nov 15 08:47:03 2016 -0800
+++ b/components/squid/Makefile	Tue Nov 15 16:34:39 2016 -0800
@@ -45,6 +45,10 @@
 TEST_TARGET= $(TEST_64)
 include $(WS_MAKE_RULES)/common.mk
 
+# Look for gnutls-3 pkg-config & libraries before the defaults
+PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
+LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
+
 CFLAGS += -I$(USRINCDIR)/kerberosv5
 CFLAGS += $(CPP_LARGEFILES)
 # <getopt.h> changed between 11 & 12.
@@ -83,14 +87,17 @@
 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-build-environment=POSIX_V6_ILP32_OFFBIG
+CONFIGURE_OPTIONS += --with-build-environment=POSIX_V6_LP64_OFF64
+# 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 += --with-gnutls
+CONFIGURE_OPTIONS += --with-nettle
 CONFIGURE_OPTIONS += --with-pthreads
-CONFIGURE_OPTIONS += --without-nettle
 CONFIGURE_OPTIONS += --disable-arch-native
 CONFIGURE_OPTIONS += PERL=$(PERL)
 
@@ -143,8 +150,9 @@
 	'-e "/Can not open file/d" ' \
 	'-e "/ERROR/p" '
 
+REQUIRED_PACKAGES += library/gnutls-3
 REQUIRED_PACKAGES += library/libtool/libltdl
-REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/nettle
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += security/kerberos-5
 ifeq ($(OS_VERSION),5.11)
diff -r 88d40c6177a1 -r 6b323adaf9e7 components/squid/test/results-64.master
--- a/components/squid/test/results-64.master	Tue Nov 15 08:47:03 2016 -0800
+++ b/components/squid/test/results-64.master	Tue Nov 15 16:34:39 2016 -0800
@@ -673,6 +673,11 @@
 PASS: MemPoolTest
 PASS: mem_node_test
 PASS: mem_hdr_test
+PASS: squid.conf test: squid.conf.default
+PASS: squid.conf test: regressions-3.5.0.2
+PASS: squid.conf test: regressions-3.4.0.1
+PASS: squid.conf test: regressions-3.3
+PASS: squid.conf test: empty
 PASS: squid-conf-tests
 ============================================================================
 ============================================================================