backout 22840197 - not yet time
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 16 Mar 2016 09:48:50 -0700
changeset 5616 44893e18e88a
parent 5615 44d8b21d95e4
child 5617 58e4e2a36e77
backout 22840197 - not yet time
components/apache24/Makefile
components/cups/Makefile
components/curl/Makefile
components/cyrus-sasl/Makefile
components/fetchmail/Makefile
components/libneon/Makefile
components/openssh/Makefile
components/proftpd/Makefile
components/rsyslog/Makefile
components/samba/Makefile
components/squid/Makefile
components/wireshark/Makefile
components/wxwidgets/Makefile
--- a/components/apache24/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/apache24/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -98,10 +98,10 @@
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network
+
--- a/components/cups/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/cups/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -110,7 +110,6 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += service/network/slp
 REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/curl/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/curl/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -120,7 +120,6 @@
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/security/gss
--- a/components/cyrus-sasl/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/cyrus-sasl/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -171,6 +171,5 @@
 REQUIRED_PACKAGES += developer/build/automake-115
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/security/gss
--- a/components/fetchmail/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/fetchmail/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -73,7 +73,6 @@
 REQUIRED_PACKAGES += library/python/tkinter-27
 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
 REQUIRED_PACKAGES += system/library
--- a/components/libneon/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/libneon/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -108,7 +108,6 @@
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/security/gss
--- a/components/openssh/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/openssh/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -131,7 +131,6 @@
 REQUIRED_PACKAGES += library/libedit
 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
--- a/components/proftpd/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/proftpd/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -117,7 +117,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
--- a/components/rsyslog/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/rsyslog/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -123,6 +123,5 @@
 REQUIRED_PACKAGES += library/libestr
 REQUIRED_PACKAGES += library/liblogging
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- a/components/samba/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/samba/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -298,7 +298,6 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/python-27
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
--- a/components/squid/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/squid/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -154,7 +154,6 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/components/wireshark/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/wireshark/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -96,7 +96,6 @@
 REQUIRED_PACKAGES += library/security/libgpg-error
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/lua
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/libpcap
--- a/components/wxwidgets/Makefile	Wed Mar 16 03:43:00 2016 -0700
+++ b/components/wxwidgets/Makefile	Wed Mar 16 09:48:50 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -98,7 +98,6 @@
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/sdl
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/c++-runtime