23333808 Userland Makefiles need updating once Userland bld systems all have Userland krb
authorNeng Xue <neng.xue@oracle.com>
Tue, 08 Nov 2016 14:26:34 -0800
changeset 7270 2a82983df5d6
parent 7269 727c4eb5cc2e
child 7271 7490936075a6
23333808 Userland Makefiles need updating once Userland bld systems all have Userland krb
components/apache24/Makefile
components/bind/Makefile
components/cups/Makefile
components/curl/Makefile
components/cyrus-sasl/Makefile
components/fetchmail/Makefile
components/libneon/Makefile
components/openssh/Makefile
components/proftpd/Makefile
components/squid/Makefile
components/subversion/Makefile
components/wireshark/Makefile
--- a/components/apache24/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/apache24/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -103,6 +103,5 @@
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/math
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/bind/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/bind/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -170,7 +170,5 @@
 REQUIRED_PACKAGES += network/dns/bind
 REQUIRED_PACKAGES += runtime/python-34
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library/security/gss
--- a/components/cups/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/cups/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -104,11 +104,9 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 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
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/curl/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/curl/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -107,5 +107,4 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/cyrus-sasl/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/cyrus-sasl/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -75,18 +75,11 @@
 CPPFLAGS += -I$(USRINCDIR)/openldap
 LDFLAGS += $(CC_BITS)  -lscf -lresolv
 
-# if there is no mediator, use MIT
-KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
-
 CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
 CONFIGURE_OPTIONS += --enable-auth-sasldb
 CONFIGURE_OPTIONS += --with-saslauthd=/var/run/saslauthd
 CONFIGURE_OPTIONS += --with-dblib=berkeley
-ifeq ($(KRB5_API), solaris)
-CONFIGURE_OPTIONS += --with-gss_impl=seam
-else
 CONFIGURE_OPTIONS += --with-gss_impl=mit
-endif
 CONFIGURE_OPTIONS += --without-gnu-ld
 CONFIGURE_OPTIONS.32 += --with-plugindir=$(SASL2.32)
 CONFIGURE_OPTIONS.64 += --with-plugindir=$(SASL2.64)
@@ -198,5 +191,4 @@
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/fetchmail/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/fetchmail/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -66,5 +66,4 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/libneon/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/libneon/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -96,4 +96,3 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library/security/gss
--- a/components/openssh/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/openssh/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -117,9 +117,7 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network
 REQUIRED_PACKAGES += text/groff/groff-core
--- a/components/proftpd/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/proftpd/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -121,8 +121,6 @@
 
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network
--- a/components/squid/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/squid/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -147,14 +147,12 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 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
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/library/security/libsasl2
 REQUIRED_PACKAGES += system/network
--- a/components/subversion/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/subversion/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -219,8 +219,8 @@
 REQUIRED_PACKAGES += library/libserf
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += system/library/c++-runtime
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/library/security/libsasl2
 
--- a/components/wireshark/Makefile	Tue Nov 08 13:32:39 2016 -0800
+++ b/components/wireshark/Makefile	Tue Nov 08 14:26:34 2016 -0800
@@ -105,7 +105,6 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += security/kerberos-5
-REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += system/library/libpcap
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/library/security/libgcrypt