25071339 partially revert 23333808 for FOSS evaluation builds
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 09 Nov 2016 09:51:14 -0800
changeset 7279 c2b1ddc7e31d
parent 7278 89aa34de7ca6
child 7280 bf2e7fde74d5
25071339 partially revert 23333808 for FOSS evaluation builds
components/bind/Makefile
components/cups/Makefile
components/curl/Makefile
components/fetchmail/Makefile
components/libneon/Makefile
components/squid/Makefile
--- a/components/bind/Makefile	Fri Nov 04 16:24:42 2016 -0700
+++ b/components/bind/Makefile	Wed Nov 09 09:51:14 2016 -0800
@@ -170,5 +170,11 @@
 REQUIRED_PACKAGES += network/dns/bind
 REQUIRED_PACKAGES += runtime/python-34
 REQUIRED_PACKAGES += security/kerberos-5
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += service/security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += system/library/security/gss
+endif
--- a/components/cups/Makefile	Fri Nov 04 16:24:42 2016 -0700
+++ b/components/cups/Makefile	Wed Nov 09 09:51:14 2016 -0800
@@ -104,9 +104,15 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += security/kerberos-5
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += service/security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/libdbus
 REQUIRED_PACKAGES += system/library/math
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += system/library/security/gss
+endif
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/curl/Makefile	Fri Nov 04 16:24:42 2016 -0700
+++ b/components/curl/Makefile	Wed Nov 09 09:51:14 2016 -0800
@@ -107,4 +107,7 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += system/library/security/gss
+endif
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/fetchmail/Makefile	Fri Nov 04 16:24:42 2016 -0700
+++ b/components/fetchmail/Makefile	Wed Nov 09 09:51:14 2016 -0800
@@ -66,4 +66,7 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += security/kerberos-5
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += service/security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/libneon/Makefile	Fri Nov 04 16:24:42 2016 -0700
+++ b/components/libneon/Makefile	Wed Nov 09 09:51:14 2016 -0800
@@ -96,3 +96,6 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += system/library/security/gss
+endif
--- a/components/squid/Makefile	Fri Nov 04 16:24:42 2016 -0700
+++ b/components/squid/Makefile	Wed Nov 09 09:51:14 2016 -0800
@@ -147,12 +147,18 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += security/kerberos-5
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += service/security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
 REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/library/security/crypto
+ifeq ($(OS_VERSION),5.11)
+REQUIRED_PACKAGES += system/library/security/gss
+endif
 REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/library/security/libsasl2
 REQUIRED_PACKAGES += system/network