Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22840197 new krb5 package will upset a lot of things in 94
authorWill Fiveash <will.fiveash@oracle.com>
Fri, 13 May 2016 15:40:39 -0500
changeset 6049 d4f828709d1c
parent 6048 4e1ce37e13b7
child 6050 7adf81b65d0d
22840197 new krb5 package will upset a lot of things in 94
components/apache24/Makefile file | annotate | diff | comparison | revisions
components/cups/Makefile file | annotate | diff | comparison | revisions
components/curl/Makefile file | annotate | diff | comparison | revisions
components/cyrus-sasl/Makefile file | annotate | diff | comparison | revisions
components/fetchmail/Makefile file | annotate | diff | comparison | revisions
components/libneon/Makefile file | annotate | diff | comparison | revisions
components/openssh/Makefile file | annotate | diff | comparison | revisions
components/proftpd/Makefile file | annotate | diff | comparison | revisions
components/rsyslog/Makefile file | annotate | diff | comparison | revisions
components/squid/Makefile file | annotate | diff | comparison | revisions
components/wireshark/Makefile file | annotate | diff | comparison | revisions 
--- a/components/apache24/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/apache24/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -76,6 +76,10 @@
 
 COMPONENT_POST_INSTALL_ACTION += ($(KSH93) Solaris/customization.sh $(PROTO_DIR))
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/apr-15
 REQUIRED_PACKAGES += library/apr-util-15
 REQUIRED_PACKAGES += library/apr-util-15/apr-ldap
@@ -90,9 +94,15 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += $(PERL_PKG)
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of GSS
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 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/cups/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/cups/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -95,6 +95,10 @@
 	$(TOUCH) $(PROTOETCDIR)/cups/command.types ; \
 	$(MV) $(PROTOUSRLIBDIR)/64 $(PROTOUSRLIBDIR)/$(MACH64)
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += driver/parallel/ecpp
 REQUIRED_PACKAGES += image/library/libjpeg
 REQUIRED_PACKAGES += image/library/libpng
@@ -103,10 +107,16 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += $(PERL_PKG)
-REQUIRED_PACKAGES += service/security/kerberos-5
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += 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
-REQUIRED_PACKAGES += system/library/security/gss
--- a/components/curl/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/curl/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -97,11 +97,21 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/libssh2
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of GSS
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/cyrus-sasl/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/cyrus-sasl/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -71,7 +71,7 @@
 studio_MT=
 
 CPPFLAGS += -I$(USRINCDIR)/openldap
-LDFLAGS += $(CC_BITS)  -lscf -lresolv 
+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;}')
@@ -169,10 +169,10 @@
         $(CP) $(BUILD_DIR_64)/sample/.libs/sample-server $(TESTS_DIR) ; \
         $(CP) $(BUILD_DIR_64)/sample/.libs/sample-client $(TESTS_DIR) ;
 
-$(PROTOUSRLIBDIR)/libsasl.so.1:	$(BUILD_DIR)/$(MACH32)/lib/.libs/libsasl.so.1	
+$(PROTOUSRLIBDIR)/libsasl.so.1:	$(BUILD_DIR)/$(MACH32)/lib/.libs/libsasl.so.1
 	$(CP) $< $@
 
-$(PROTOUSRLIBDIR64)/libsasl.so.1:	$(BUILD_DIR)/$(MACH64)/lib/.libs/libsasl.so.1	
+$(PROTOUSRLIBDIR64)/libsasl.so.1:	$(BUILD_DIR)/$(MACH64)/lib/.libs/libsasl.so.1
 	$(CP) $< $@
 
 TARBALL_DIR=sasltest
@@ -199,6 +199,7 @@
 REQUIRED_PACKAGES += library/security/openssl
 ifneq ($(KRB5_API), solaris)
     REQUIRED_PACKAGES += security/kerberos-5
+else
+    REQUIRED_PACKAGES += system/library/security/gss
 endif
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/fetchmail/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/fetchmail/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -53,8 +53,18 @@
 	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|"' \
 	'-e "/^XXX_CC_XXX$$/d"'
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/python/tkinter-27
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/python-27
-REQUIRED_PACKAGES += service/security/kerberos-5
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/libneon/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/libneon/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -70,7 +70,7 @@
      '-e "s/copied,/copied/g"'  \
      '-e "s/ \{1,\}copied/ copied/g"'  \
      '-e "s/copied $$/copied/g"'  \
-     '-e "s/copied [0-9]\{1,\}\./copied/g"' 
+     '-e "s/copied [0-9]\{1,\}\./copied/g"'
 
 CONFIGURE_OPTIONS += --localstatedir=$(VARDIR)
 CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
@@ -90,10 +90,19 @@
 
 COMPONENT_TEST_ENV +=	PATH="$(GNUBIN):$(PATH)"
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/libproxy
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library/security/gss
-REQUIRED_PACKAGES += library/libproxy
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of GSS
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
--- a/components/openssh/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/openssh/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -108,13 +108,22 @@
       cd $(@D); autoconf; \
     )
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
 
 REQUIRED_PACKAGES += library/libedit
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += service/security/kerberos-5
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 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	Sat May 21 09:59:28 2016 -0700
+++ b/components/proftpd/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -115,9 +115,19 @@
 # attributes.
 LICENSE_TRANSFORMS =
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += service/security/kerberos-5
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network
--- a/components/rsyslog/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/rsyslog/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -43,7 +43,7 @@
 
 UNPACK_ARGS_DOC=		-r $(COMPONENT_SRC_DOC)
 
-# There are tests, but gmake test is currently broken. 
+# There are tests, but gmake test is currently broken.
 # It was working in the previous version, but not sure why
 # it breaks now. Leaving it at no tests for now.
 TEST_TARGET= $(NO_TESTS)
@@ -109,4 +109,5 @@
 REQUIRED_PACKAGES += library/libestr
 REQUIRED_PACKAGES += library/liblogging
 REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/squid/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/squid/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -139,17 +139,27 @@
 	'-e "/Can not open file/d" ' \
 	'-e "/ERROR/p" '
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/libtool/libltdl
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += $(PERL_PKG)
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += 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
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/library/security/libsasl2
 REQUIRED_PACKAGES += system/network
-REQUIRED_PACKAGES += service/security/kerberos-5 
--- a/components/wireshark/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/wireshark/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -83,6 +83,10 @@
 	chmod 755 config.status; \
 	./config.status)
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += developer/lexer/flex
 REQUIRED_PACKAGES += developer/parser/bison
 REQUIRED_PACKAGES += diagnostic/wireshark/wireshark-common
@@ -95,7 +99,13 @@
 REQUIRED_PACKAGES += library/security/libgpg-error
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/lua
-REQUIRED_PACKAGES += service/security/kerberos-5
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 REQUIRED_PACKAGES += system/library/libpcap
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/library/security/libgcrypt
upstream/oracle/userland-gate