20817040 html help files in X for RBAC profiles and authorizations must go
20969824 Add "RO" to res1 field of auth_attr.d files in X
--- a/open-src/lib/fontconfig/FontStates.html Mon May 04 13:42:14 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<HTML>
-<HEAD>
-<!--
-
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
- -->
- <TITLE> </TITLE>
-
-
-</HEAD>
-<BODY>
-
-When Font States is in the Authorizations Included column, it grants the
-authorization to manipulate font services via the Service Management Framework.
-<p>
-If Font States is grayed, then you are not entitled to Add or Remove this authorization.
-<p>
-</BODY>
-</HTML>
--- a/open-src/lib/fontconfig/Makefile Mon May 04 13:42:14 2015 -0700
+++ b/open-src/lib/fontconfig/Makefile Tue Apr 28 14:23:56 2015 -0700
@@ -145,8 +145,6 @@
FONTCONFIG_SMF_METHOD=$(FONTCONFIG_SMF_METHOD_dir)/fc-cache
FONTCONFIG_RBAC_AUTH_dir=$(PROTODIR)/etc/security/auth_attr.d
FONTCONFIG_RBAC_AUTH=$(FONTCONFIG_RBAC_AUTH_dir)/fontconfig
-FONTCONFIG_RBAC_HELP_dir=$(PROTODIR)/usr/lib/help/auths/locale/C
-FONTCONFIG_RBAC_HELP=$(FONTCONFIG_RBAC_HELP_dir)/FontStates.html
# Sun specification configuration files to be installed in /etc/fonts/conf.d
FONTCONFIG_CONFDIR = $(PROTODIR)/etc/fonts/conf.avail
@@ -157,7 +155,7 @@
# run just once, not per bitwidth
FONTCONFIG_INSTALL_RULES = fontconfig-sunman-install \
$(FONTCONFIG_SMF_MANIFEST) $(FONTCONFIG_SMF_METHOD) \
- $(FONTCONFIG_RBAC_AUTH) $(FONTCONFIG_RBAC_HELP) \
+ $(FONTCONFIG_RBAC_AUTH) \
$(FONTCONFIG_SUN_CONFFILES)
install: $(FONTCONFIG_INSTALL_RULES)
@@ -175,10 +173,6 @@
mkdir -p $(FONTCONFIG_RBAC_AUTH_dir)
$(INSTALL_SCRIPT) -c -m 0444 auth_attr $@
-$(FONTCONFIG_RBAC_HELP): FontStates.html
- mkdir -p $(FONTCONFIG_RBAC_HELP_dir)
- $(INSTALL_SCRIPT) -c -m 0444 FontStates.html $@
-
$(FONTCONFIG_SUN_CONFFILES): $(SUN_CONFFILES)
mkdir -p $(PROTODIR)/etc/fonts/conf.d $(PROTODIR)/etc/fonts/conf.avail
cp -fp $(@F) $@
--- a/open-src/lib/fontconfig/auth_attr Mon May 04 13:42:14 2015 -0700
+++ b/open-src/lib/fontconfig/auth_attr Tue Apr 28 14:23:56 2015 -0700
@@ -1,1 +1,24 @@
-solaris.smf.manage.font:::Manage Font Service States:::help=FontStates.html
+#
+# Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# Authorization to manipulate font services (xfs & fc-cache) via SMF
+solaris.smf.manage.font:RO::Manage Font Service States::
--- a/open-src/xserver/xserver-common/Makefile Mon May 04 13:42:14 2015 -0700
+++ b/open-src/xserver/xserver-common/Makefile Tue Apr 28 14:23:56 2015 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -71,9 +71,6 @@
check: x11-server.xml
/usr/sbin/svccfg validate x11-server.xml
-RBAC_AUTH_HELP=X11States.html
-RBAC_PROFILE_HELP=RtDesktopConfiguration.html
-
install_common: $(BUILD_TARGETS)
mkdir -p \
$(DESTDIR)$(X11_SMF_MANIFEST_DIR) \
@@ -81,9 +78,7 @@
$(DESTDIR)$(X11_DIR)/bin \
$(DESTDIR)$(X11_DIR)/share/man/man1 \
$(DESTDIR)/etc/security/auth_attr.d \
- $(DESTDIR)/etc/security/prof_attr.d \
- $(DESTDIR)/usr/lib/help/auths/locale/C \
- $(DESTDIR)/usr/lib/help/profiles/locale/C
+ $(DESTDIR)/etc/security/prof_attr.d
$(INSTALL_SCRIPT) -c -m 0444 x11-server.xml \
$(DESTDIR)$(X11_SMF_MANIFEST_DIR)/
$(INSTALL_SCRIPT) -c -m 0755 x11-server $(DESTDIR)$(SMF_METHOD_DIR)/
@@ -92,8 +87,4 @@
$(DESTDIR)/etc/security/auth_attr.d/$(MODULE_NAME)
$(INSTALL_SCRIPT) -c -m 0444 prof_attr \
$(DESTDIR)/etc/security/prof_attr.d/$(MODULE_NAME)
- $(INSTALL_SCRIPT) -c -m 0444 X11States.html \
- $(DESTDIR)/usr/lib/help/auths/locale/C/
- $(INSTALL_SCRIPT) -c -m 0444 RtDesktopConfiguration.html \
- $(DESTDIR)/usr/lib/help/profiles/locale/C/
$(INSTALL_SCRIPT) -c -m 0444 Xnest.1 $(DESTDIR)$(X11_MAN_DIR)/man1/
--- a/open-src/xserver/xserver-common/RtDesktopConfiguration.html Mon May 04 13:42:14 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<HTML>
-<HEAD>
-<!--
-
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
- -->
- <TITLE> </TITLE>
-
-
-</HEAD>
-<BODY>
-
-When Desktop Configuration is in the Rights Included column, it grants the right to manipulate X Window System and Font services via the Service Management Framework, and to configure the X Window System and related graphical desktop software.
-<p>
-If Desktop Configuration is grayed, then you are not entitled to Add or Remove this right.
-<p>
-</BODY>
-</HTML>
--- a/open-src/xserver/xserver-common/X11States.html Mon May 04 13:42:14 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<HTML>
-<HEAD>
-<!--
-
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
- -->
- <TITLE> </TITLE>
-
-
-</HEAD>
-<BODY>
-
-When X11 States is in the Authorizations Included column, it grants the
-authorization to manipulate X Window System services via the Service
-Management Framework.
-<p>
-If X11 States is grayed, then you are not entitled to Add or Remove this authorization.
-<p>
-</BODY>
-</HTML>
--- a/open-src/xserver/xserver-common/auth_attr Mon May 04 13:42:14 2015 -0700
+++ b/open-src/xserver/xserver-common/auth_attr Tue Apr 28 14:23:56 2015 -0700
@@ -1,1 +1,24 @@
-solaris.smf.manage.x11:::Manage X11 Service States:::help=X11States.html
+#
+# Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# Authorization to manipulate X Window System services via SMF.
+solaris.smf.manage.x11:RO::Manage X11 Service States::
--- a/open-src/xserver/xserver-common/prof_attr Mon May 04 13:42:14 2015 -0700
+++ b/open-src/xserver/xserver-common/prof_attr Tue Apr 28 14:23:56 2015 -0700
@@ -1,1 +1,28 @@
-Desktop Configuration:RO::Configure graphical desktop software:auths=solaris.smf.manage.x11,solaris.smf.manage.font,solaris.smf.manage.opengl:help=RtDesktopConfiguration.html
+#
+# Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# Grants the right to manipulate X Window System and Font services via the
+# Service Management Framework, and to configure the X Window System and
+# related graphical desktop software.
+#
+Desktop Configuration:RO::Configure graphical desktop software:\
+auths=solaris.smf.manage.x11,solaris.smf.manage.font,solaris.smf.manage.opengl
--- a/pkg/exceptions-validate_pkg.p5m Mon May 04 13:42:14 2015 -0700
+++ b/pkg/exceptions-validate_pkg.p5m Tue Apr 28 14:23:56 2015 -0700
@@ -67,13 +67,6 @@
dir path=usr/lib/$(ARCH64)
dir path=usr/lib/$(ARCH64)/pkgconfig
$(i386_ONLY)dir path=usr/lib/hal
-dir path=usr/lib/help
-dir path=usr/lib/help/auths
-dir path=usr/lib/help/auths/locale
-dir path=usr/lib/help/auths/locale/C
-dir path=usr/lib/help/profiles
-dir path=usr/lib/help/profiles/locale
-dir path=usr/lib/help/profiles/locale/C
dir path=usr/lib/mdb
$(i386_ONLY)dir path=usr/lib/mdb/kvm
$(i386_ONLY)dir path=usr/lib/mdb/kvm/$(ARCH64)
--- a/pkg/manifests/system-library-fontconfig.p5m Mon May 04 13:42:14 2015 -0700
+++ b/pkg/manifests/system-library-fontconfig.p5m Tue Apr 28 14:23:56 2015 -0700
@@ -112,7 +112,6 @@
link path=usr/lib/$(ARCH64)/libfontconfig.so target=libfontconfig.so.1
file path=usr/lib/$(ARCH64)/libfontconfig.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/fontconfig.pc
-file path=usr/lib/help/auths/locale/C/FontStates.html
link path=usr/lib/libfontconfig.so target=libfontconfig.so.1
file path=usr/lib/libfontconfig.so.1
file path=usr/lib/pkgconfig/fontconfig.pc
--- a/pkg/manifests/x11-server-xserver-common.p5m Mon May 04 13:42:14 2015 -0700
+++ b/pkg/manifests/x11-server-xserver-common.p5m Tue Apr 28 14:23:56 2015 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -48,8 +48,6 @@
file path=usr/demo/Xserver/mdb/list_Xserver_clients mode=0555
file path=usr/demo/Xserver/mdb/list_Xserver_devicegrab_client mode=0555
file path=usr/demo/Xserver/mdb/list_Xserver_servergrab_client mode=0555
-file path=usr/lib/help/auths/locale/C/X11States.html
-file path=usr/lib/help/profiles/locale/C/RtDesktopConfiguration.html
file path=usr/lib/mdb/proc/$(ARCH64)/Xserver.so
dir path=usr/lib/xorg
file path=usr/lib/xorg/TrustedExtensionsPolicy overlay=allow preserve=renamenew