633 case-folding collision in illumos-gate

Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com>
Approved by: Dan McDonald <danmcd@omniti.com>

11 files changed, 64 insertions, 6 deletions

diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hb b/usr/src/cmd/lp/filter/postscript/font/devpost/JB
index ad7b7636c0..ad7b7636c0 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hb
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JB
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hb.name b/usr/src/cmd/lp/filter/postscript/font/devpost/JB.name
index c13a099737..c13a099737 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hb.name
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JB.name
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hi b/usr/src/cmd/lp/filter/postscript/font/devpost/JI
index f8261bd80f..f8261bd80f 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hi
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JI
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hi.name b/usr/src/cmd/lp/filter/postscript/font/devpost/JI.name
index 5702536b08..5702536b08 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hi.name
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JI.name
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hr b/usr/src/cmd/lp/filter/postscript/font/devpost/JR
index a67afe0f41..a67afe0f41 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hr
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JR
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hr.name b/usr/src/cmd/lp/filter/postscript/font/devpost/JR.name
index 73a487bb4a..73a487bb4a 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hr.name
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JR.name
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hx b/usr/src/cmd/lp/filter/postscript/font/devpost/JX
index daf3bbde92..daf3bbde92 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hx
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JX
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Hx.name b/usr/src/cmd/lp/filter/postscript/font/devpost/JX.name
index bcb1cd265f..bcb1cd265f 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Hx.name
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/JX.name
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/Makefile b/usr/src/cmd/lp/filter/postscript/font/devpost/Makefile
index fffb603bf0..8f9c16fe21 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/Makefile
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/Makefile
@@ -20,9 +20,8 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2014 Garrett D'Amore
 #
 # cmd/lp/filter/postscript/font/devpost/Makefile
 #
@@ -30,8 +29,8 @@
 include			../../../../Makefile.lp
 
 FONTFILES =		AB AI AR AX BI CB CI CO	\
-			CW CX GR HB HI HX Hb Hi	\
-			Hr Hx KB KI KR KX NB NI	\
+			CW CX GR HB HI HX JB JI	\
+			JR JX KB KI KR KX NB NI	\
 			NR NX PA PB PI PX S1 VB	\
 			VI VR VX ZD ZI B  H  I	\
 			R  S	
@@ -45,7 +44,7 @@ FONTLNK1OUTS =		$(FONTLNK1:%=%.out)
 FONTLNK2OUTS =		$(FONTLNK2:%=%.out)
 FONTOUTS =		$(FONTFILES:%=%.out) $(DESCFILE:%=%.out)
 
-SUBDIRS =		charlib
+SUBDIRS =		charlib fontmaps
 
 NATIVEMAKEDEV =		../native/makedev
 
@@ -84,7 +83,7 @@ $(FONTLNK1OUTS) :	H.out
 $(FONTLNK2OUTS) :	HI.out
 			@$(RM) $@; $(LN) HI.out $@
 
-$(ROOTDEVPOST)/% :	%
+$(ROOTDEVPOST)/% :	% $(ROOTDEVPOST)
 			$(INS.file)
 
 clean strip lint :	$(SUBDIRS)
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/fontmaps/Makefile b/usr/src/cmd/lp/filter/postscript/font/devpost/fontmaps/Makefile
new file mode 100644
index 0000000000..55e28a22dc
--- /dev/null
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/fontmaps/Makefile
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+# Copyright 2014 Garrett D'Amore
+#
+# cmd/lp/filter/postscript/font/devpost/fontmaps/Makefile
+#
+
+include			../../../../../Makefile.lp
+
+FONTMAPS =		post
+FILES =			$(FONTMAPS)
+
+ROOTFONTMAPS =		$(ROOT)/usr/lib/font/devpost/fontmaps
+
+ROOTFILES =		$(FILES:%=$(ROOTFONTMAPS)/%)
+
+FILEMODE =		0444
+
+.KEEP_STATE:
+
+all:			$(FILES)
+
+# because of its name, the file ~= is a special case
+#
+install:		all $(ROOTFONTMAPS) $(ROOTFILES)
+
+$(ROOTFONTMAPS):
+			$(INS.dir)
+
+$(ROOTFONTMAPS)/% :	% $(ROOTFONTMAPS)
+			$(INS.file)
+
+clean clobber strip lint :
+
+FRC:
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/fontmaps/post b/usr/src/cmd/lp/filter/postscript/font/devpost/fontmaps/post
new file mode 100644
index 0000000000..af94b42f85
--- /dev/null
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/fontmaps/post
@@ -0,0 +1,4 @@
+Hb JB
+Hi JI
+Hr JR
+Hx JX