Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gd2/patches/003-default_fontpath.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 17 Nov 2011 14:40:44 -0800
changeset 587 9cc973a7ad62
parent 130 5e67396e42dc
permissions -rw-r--r--
7060335 several components contain version in their legacy actions' descriptions
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
130
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- gd.h 2007-05-06 13:38:20.000000000 -0800
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ gd.h 2010-04-15 12:13:00.000000000 -0800
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -71,7 +71,28 @@
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 /* 2.0.23: more Type 1 fonts */
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 #ifndef DEFAULT_FONTPATH
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
 /* default fontpath for unix systems  - whatever happened to standards ! */
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
-#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1"
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+#define DEFAULT_FONTPATH \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+"/usr/share/fonts/TrueType/arphic:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+"/usr/share/fonts/TrueType/baekmuk:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+"/usr/share/fonts/TrueType/bh-luxi:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+"/usr/share/fonts/TrueType/bitstream-vera:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+"/usr/share/fonts/TrueType/bpg-georgian:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
+"/usr/share/fonts/TrueType/core:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
+"/usr/share/fonts/TrueType/dejavu:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
+"/usr/share/fonts/TrueType/freefont:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+"/usr/share/fonts/TrueType/gentium:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
+"/usr/share/fonts/TrueType/google-droid:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+"/usr/share/fonts/TrueType/hanyang:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
+"/usr/share/fonts/TrueType/indic-fonts-core:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
+"/usr/share/fonts/TrueType/ipafont:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
+"/usr/share/fonts/TrueType/kacst:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
+"/usr/share/fonts/TrueType/liberation:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
+"/usr/share/fonts/TrueType/mgopen:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
+"/usr/share/fonts/TrueType/sil:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
+"/usr/share/fonts/TrueType/unifont:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
+"/usr/share/fonts/X11/Type1:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+"/usr/share/fonts/sun/TrueType:" \
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
+"/usr/share/fonts/sun/Type1"
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 #endif
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
 #ifndef PATHSEPARATOR
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
 #define PATHSEPARATOR ":"
upstream/oracle/userland-gate