From 4bae9e4128bd37e09fd9eacc6d21991477f90c02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= Date: Mon, 30 Mar 2015 10:28:18 +0000 Subject: [PATCH] Remove vulnerable versions, bug #543620. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x2324E7B566DF2611! --- x11-libs/libXfont/ChangeLog | 8 +- x11-libs/libXfont/Manifest | 39 +- ...-1.4.8-fontsproto-2.1.3-configure_ac.patch | 35 -- ...ont-1.4.8-fontsproto-2.1.3-constchar.patch | 555 ------------------ x11-libs/libXfont/libXfont-1.4.8-r1.ebuild | 39 -- x11-libs/libXfont/libXfont-1.4.8.ebuild | 33 -- x11-libs/libXfont/libXfont-1.5.0.ebuild | 34 -- 7 files changed, 24 insertions(+), 719 deletions(-) delete mode 100644 x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-configure_ac.patch delete mode 100644 x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-constchar.patch delete mode 100644 x11-libs/libXfont/libXfont-1.4.8-r1.ebuild delete mode 100644 x11-libs/libXfont/libXfont-1.4.8.ebuild delete mode 100644 x11-libs/libXfont/libXfont-1.5.0.ebuild diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog index c1de51aa14ee..81c3c690c83e 100644 --- a/x11-libs/libXfont/ChangeLog +++ b/x11-libs/libXfont/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/libXfont # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.235 2015/03/30 10:06:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.236 2015/03/30 10:27:51 chithanh Exp $ + + 30 Mar 2015; Chí-Thanh Christopher Nguyễn + -files/libXfont-1.4.8-fontsproto-2.1.3-configure_ac.patch, + -files/libXfont-1.4.8-fontsproto-2.1.3-constchar.patch, + -libXfont-1.4.8-r1.ebuild, -libXfont-1.4.8.ebuild, -libXfont-1.5.0.ebuild: + Remove vulnerable versions, bug #543620. 30 Mar 2015; Agostino Sarubbo libXfont-1.4.9.ebuild, libXfont-1.5.1.ebuild: diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest index a20bad429489..039ad02c6a9b 100644 --- a/x11-libs/libXfont/Manifest +++ b/x11-libs/libXfont/Manifest @@ -1,33 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libXfont-1.4.8-fontsproto-2.1.3-configure_ac.patch 1188 SHA256 0024ac9a8c1bc003fd4ebef4c0d75d6bdab37ffc1dffc368ff5d85f23ae790e8 SHA512 2d37cdcfd496ad845184030e824538d12779a7b19f18dde78f0764d8ae9e07827099edd2f030367823c305ca3ad583084c290f7af1a569d46e7719b0c399746a WHIRLPOOL 0497cacac43227b6ad9a0f586eab420bf27d7d5041c10a06704f7b33b5dedb7cac662e21e35ab270015567e658cfc03c69eaae158074e9ba674844c2bf03d2ac -AUX libXfont-1.4.8-fontsproto-2.1.3-constchar.patch 19258 SHA256 881cb897d8aaac22de5ae82734649fbc3d5691095591af80ed3dbec622dd8171 SHA512 d65eae54b4e6ca8f9f5c2d15568b184060bca700fcd842d01f2b6bfa5600b2053913b5dffff2e4104b126b8b6df6a6334be7b35515841ff058df71ce72b4e0a2 WHIRLPOOL 58cb75af9d137ec5154b321be5bc4815132eb8a8de9393e2e7472e7fb4d1f6d1433ad2b37e432712ad8c30d20623894384e499eee0a49bc54efd69e6dd06caca -DIST libXfont-1.4.8.tar.bz2 490641 SHA256 5568d4febf790fb250fb8d4ecf1f389a428eb545a79fb2abe9c82f652d14d005 SHA512 1ddf6582e9b833a7bba5cdb086f2cae4c639307e39eeffcddcce86963ccecee72b281addad41afb046e14f8ac0b4d971aae33dfdf99e804ad7bfb47badd970f3 WHIRLPOOL a2e2e8d5a462e6577f98c33d1c0e9f21a0fd920d39c842674f1e0908b54b6eb3087e27da2632f6cd2728a3e4ef2919840f17cb9237f5c7a579c4a709518d6336 DIST libXfont-1.4.9.tar.bz2 495464 SHA256 6c6b061a3aa44f0ac95785f9579f6427080c60ae6948b49bcc8d44f63942ad89 SHA512 d541dac1c8639578a122eaa61c3df1cd180f820609a02897baf1f1e45f49109b3a755a7f3b5f284716f5e6f494a829aa86be1c730156eb82db11b1551a320654 WHIRLPOOL 4c3e71025da5688ab594569557abcff714f423406409800e419a3d1b7898135ce36f6f9aa31f17613f82fe5cee9fe8e36da5b5a46529ff7203eeb5dfc07a25df -DIST libXfont-1.5.0.tar.bz2 491483 SHA256 3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f SHA512 466ecebe27ef4b8dbe2ff1cae0e111d4c449cb29a240477ac53ccb415ee74bb5d51cfd5f41d9f84e9e444b9eca91853306978a3094b279033bf7dedfafba9f3e WHIRLPOOL 635f828f09f9cba64df736975999c88166319cdad34af733ffc41db223e32546fb60249d7eb7ca6317a99c12e39bc1d7fda8cd52e523dc08e83e3072d56129db DIST libXfont-1.5.1.tar.bz2 502903 SHA256 b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098 SHA512 3ca8f7c1c642072c9bf9a755b45857f77753111ce6f1f99bd804e0f1b90cf61259fbde609a5342cce9c1ac5431b093bf75febb68baff2f2688e0a5fe5864a666 WHIRLPOOL dda0749a147591a70d6aacb4f8b5412a63cd40cb10ae2a6e2445b4763978f0d88f4fd805b18ddfd1ed36a6ef56ec2f5e657326ce969070c2b6461367f849a7d6 -EBUILD libXfont-1.4.8-r1.ebuild 1108 SHA256 f44eb658ba20a184450dea02f1f538bed0baa2e41966f91c8887e76439107443 SHA512 23f73ab7a0dc377c6eef914c75cc9f3c8c97a3f709adbda06aeb8ded0255adaab24713f28a071a7995e89df89a2bc32beecca144123eff085ef45eeb78c6c3e0 WHIRLPOOL 0eda4efa44cbf01bab30774707f5c176e84fdfdcbe958529bfd81c8b5572224d613abf4d1e844d2c56201e52bff5bdc30335303dab36b9dca9f7052c7fa7d793 -EBUILD libXfont-1.4.8.ebuild 948 SHA256 3c0d8c51ffda2169252e8192438108ea7ec6f946027ff52577c1d8fb0f1d1824 SHA512 166c32214ffd450785e8f04db79240bcf068a4791000a5c6718d6449cb9d910a0d61340530a6fe0ddbf7d60bb0705280a0e154837f6c992bc8bea7906cfcb0d1 WHIRLPOOL 894b92ea0544c6fe696141b9e2e00a2c82f082baf904c878e06b7d0193041ab1e9e91f1e7cf5af189ff581d428e4bb8f77a9fe6eaa92b5a3d2e8d7c0d1fea7d5 EBUILD libXfont-1.4.9.ebuild 948 SHA256 e1920491a6070a97a5d2289738f7f6b151c9167a06c8a6e5538a2cf6414b37a6 SHA512 e1267fbedee363db0736561655afb305caedaa21f63eeb03a28bba011f049d521aea000e901152484b351303607e07365bb631e0d65bc6891c5ba119abcbb868 WHIRLPOOL 43e80b0f6923a8ecb25e43c6845386d1d07342ff2ddf2d97da20a05da029572b1994c551c6492cb69b4eeb777d68ff4f0f99f62defc5d7dc728148d2c202aae5 -EBUILD libXfont-1.5.0.ebuild 994 SHA256 3b8430cacb6ea9b85403cd1c17d14e35413470b0e7df8ab6af725e5c6893329f SHA512 e31e635ebfcda5498b36275033f2ded37a0e8e222d8a75bebf455bb71ca017cb3dbad3fb5f50a8cf7aabee2cac7610eb2d762117934a991c189fa12e14df1753 WHIRLPOOL 8285ac18835b5666e4bc01164a8ee42d19529c48a765218983e0bf92dfe5893fcdd7e00d2e4dfb25fce6d5c926752d6f375ef3dfb3606fb96204360f2b499391 EBUILD libXfont-1.5.1.ebuild 991 SHA256 e76c1c4a5187a1212a66b69c13aacf24ee6b45840a7d0b22b94164f606645bb1 SHA512 1fe95ca15ac933ebc7f67e83135651f8b8f1bfd8ca26ebbadf4a27cac09c28022e6757b4190f9bc5a2327d002d02d56335d4b9f01ae2113915b0b57174d5d41d WHIRLPOOL c171c225f391cb060a6ef1bf68f618b3baec3296a490c2b58791de2238bc1102911a63bbb5cdddd41ce772b3cc092dd6f7a0051c7275ab8b6ef1bdbabe60da25 -MISC ChangeLog 30265 SHA256 ed1a6d137e55b472b2b47256e6c3594dd7b93d23ac30fbd25145974a7709fe13 SHA512 d7670c277e004f1c9fc0f9abb29aa60915355066de838d041f9209ad564ae3c00e038b4ac4546ad640ce676d06c2a2688ce98452e7a5dc3a7c70198611f05b41 WHIRLPOOL 4ed4e33e22cc12c7cc572b4002f1b7e289f7db54cfc8cdd7e8caa9633560e195bea969cea5f90a34987d9a8f216617caefbbc2592aed810af3caca9a2c02659e +MISC ChangeLog 30579 SHA256 79130e72d7d8d9d09b93e0bac7a7c13312b36bdc978ac00020c6c10c181fe223 SHA512 3558560f9a19d1ee228569baa41990709fb5230f9bb60ebf8709a1e344df8263d8274cd516e23ae3e62aa713cb341798bcaa36d33f99de2a6c3e11674248da4c WHIRLPOOL f2669a53caa00ada7cecbb7d64b15e0e5f50952cd812e93d03e24af49786db318935a768112472b6af37eac094899cf44b1d5eeb6e60c7f0c57e7e030391c606 MISC metadata.xml 398 SHA256 b662d73a5fa5a0b131621132a274e3d4ca23661404d91cd04b40dd57942d48d6 SHA512 0b670722854b45b90aea4d9937549743b63f7ab2ed4d7a12b7991bc1273210fee832717c4d2bfd12bf8abfdac0bbd94166202192cad7caa9865c184a915a8ddc WHIRLPOOL f9db002e6fc4c7001ae3da4dcddf82b94610ae4fcaa7830f7e93ca7b0add63cb8229389904927b3c2c47700b6d1f7276bfdeb4bd828fb4b98d62b7b5fcb3a60a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJVGSA0AAoJELp701BxlEWfvnsP/2Wl9iYzJ8WcwRiGBd9nvR2H -jY0VNYGPS7JtwJ5Y+Va5SMesGlLPFx339a6qW3Y8JaDGsdv1q6N67yQMUdr8jenI -dTPeQSpbtws4RQAh+5OwToOxh5YOODDoC96Mw7+7DFUF7S4FrOYjI2V0rfpztAOo -+SJkOvrp4GpSAbCIBZhKYMJWEZg3P4Cmq2aJPP57RQ7qXkWb5bYSFhWKMwmqeVwb -z9r/x6WHvD4spd+RVYGZJD5lJ8Nr05WgiYFx2s2kyA6+O9/vDrJvkSzLWkZEZs2n -BLt4gjbkzUdXcsryFgNzQp2BVwmLIj4gTYLP/jah4UIKxcZfeNNwcK1zAni85fhg -hDrLGBafAJwnQsMuRaGnw3EZD+6oIAnsP3hLaF712+LgdHbffONsKPLYzB1okIrQ -1KEs5gv20LBMyTtDSW19oQ7wdYf8WdrZG6PlhPOtor2DBRolY0hA3F+Sb/USBRMr -M+mLhBsy9gomuIbtRoxCrF1w0Zw3ph6hbFukEH70ktNVhjzh8BUY3kog0Y6D8tZr -jVzP4Ann3HtUR/OXeyXv88Bk8ioLPvS304r9F+7fIZG8ARLoc7nR/amNgEqpkHMR -9uWdgw9FSHXCzFbUUxXYF2ngQfWGtFRWi/yWqNY4jZ63G1o3/i6d4B7XRX6cSkf6 -r9UDVWERkEG6edEe93CZ -=Atix +iQJ8BAEBCABmBQJVGSVhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy +MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRbKQQAIxZzPsVl+GJcFHq4fsd1R4d +6ibZoRS4FGNEphlbPiVTCUlJmxKfHg2Jmg4yQoOXC08+9DhJ3fNAwUKsKmUbcTZ+ +ivKOmS6Dfij6Hogmc4QqwEae55LgQl2aRZYWMvL9+0ZGwlbhE16p1NegPnlnQKiZ +xAjtwH1tC1Uh0urnTP4+9aiBxdMFWwXsB13pwZIOGaDUDz94ggyigtRcaLtHsTmD +FjFoqN06ijPvpOs7qggjISRcRUlxZJb5hwofvxqsouff9YgJfTmBPzT7SniIiOAe +h//G0WUIa4vhzFwnirlyE7UZTtUrVj592lU+4/V5/03mInHH+sKtm+X0fEr6vYdV +jawCXU5TIrrBdDpK5qdkLuWqLIl55zys3ouN4alRmKrYXjaQK91E50PbYUBKnUQG +ssHHUG7peZUdMrT/dGI4abqMDyvzY9fnV78XG9wOUb35exS/VSwilSiVVT5JvXfU +w6XEFoGCxdMDjw0klsW2+DW2AkY6AEBdp0MMqY5Isv8PDXTE2HbjF0tucyO9yNNy +YmZiMJOySonsJTPnUorjpXtRm/KW1glaxoyicgy5biInFAwcNsaFQPO6RKSmHxkZ +YPREjSPceLLrccdAVqXsgwuz7QCieSf3/7nljkCQtaEoYw5MzFzfOyLvk8gIGpMf +IIBprsODCxv7jwv0UL2D +=x+Zg -----END PGP SIGNATURE----- diff --git a/x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-configure_ac.patch b/x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-configure_ac.patch deleted file mode 100644 index 4d06ef8d1a35..000000000000 --- a/x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-configure_ac.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5a398a55ccdd92d0ff05793692ef8e57f3a50198 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Mon, 21 Apr 2014 01:10:07 +0000 -Subject: Require fontsproto 2.1.3 for matching function prototypes - -Building current libXfont git against fontsproto 2.1.2 causes clang -complaints of: - -patcache.c:130:1: error: conflicting types for 'CacheFontPattern' -CacheFontPattern (FontPatternCachePtr cache, -^ -patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern' -FindCachedFontPattern (FontPatternCachePtr cache, -^ - -due to the constification of arguments not matching. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Thomas Klausner ---- -diff --git a/configure.ac b/configure.ac -index cbb540a..e78e56a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -180,7 +180,7 @@ fi - AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm - AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required])) - --PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto < 2.1.3 fontenc]) -+PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto >= 2.1.3 fontenc]) - - # Transport selection macro from xtrans.m4 - XTRANS_CONNECTION_FLAGS --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-constchar.patch b/x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-constchar.patch deleted file mode 100644 index cdbb28dc1821..000000000000 --- a/x11-libs/libXfont/files/libXfont-1.4.8-fontsproto-2.1.3-constchar.patch +++ /dev/null @@ -1,555 +0,0 @@ -From a96cc1f032a059da89319ceccb6659c8edd446fb Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Fri, 15 Nov 2013 12:46:15 +0000 -Subject: Warning fixes. - -Many const char issues. - -One extra 'i' declared in ScaleFont; we can just use the same 'i' as -exists at the top level scope. - -Also ignore bad-function-cast in ftfuncs.c and bitscale.c because -we're casting the return value from floor or ceil from double to -int. As floor and ceil are kinda designed to generate integer results, -it's pretty clear that we're doing what we want and that the compiler -is generating noise. I'm not sure why bad-function-cast is ever a good -warning to turn on, but I'll leave that for another day. - -Signed-off-by: Keith Packard -Reviewed-by: Gaetan Nadon ---- -diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h -index a32df63..24be79a 100644 ---- a/include/X11/fonts/fntfil.h -+++ b/include/X11/fonts/fntfil.h -@@ -72,12 +72,12 @@ typedef struct _FontRenderer *FontRendererPtr; - #define FontAliasFile "fonts.alias" - #define FontScalableFile "fonts.scale" - --extern int FontFileNameCheck ( char *name ); -+extern int FontFileNameCheck ( const char *name ); - extern int FontFileInitFPE ( FontPathElementPtr fpe ); - extern int FontFileResetFPE ( FontPathElementPtr fpe ); - extern int FontFileFreeFPE ( FontPathElementPtr fpe ); - extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe, -- Mask flags, char *name, int namelen, -+ Mask flags, const char *name, int namelen, - fsBitmapFormat format, fsBitmapFormatMask fmask, - XID id, FontPtr *pFont, char **aliasName, - FontPtr non_cachable_font ); -@@ -87,14 +87,14 @@ extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont, - fsBitmapFormat format, - fsBitmapFormatMask fmask ); - extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - FontNamesPtr names ); - extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep, int mark_aliases ); - extern int FontFileStartListFontsWithInfo ( pointer client, - FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep ); - extern int FontFileListNextFontWithInfo ( pointer client, - FontPathElementPtr fpe, -@@ -103,7 +103,7 @@ extern int FontFileListNextFontWithInfo ( pointer client, - int *numFonts, pointer private ); - extern int FontFileStartListFontsAndAliases ( pointer client, - FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep ); - extern int FontFileListNextFontOrAlias ( pointer client, - FontPathElementPtr fpe, -@@ -173,7 +173,7 @@ extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe, - fsBitmapFormatMask fmask, - Bool noSpecificSize ); - --extern int FontFileReadDirectory ( char *directory, FontDirectoryPtr *pdir ); -+extern int FontFileReadDirectory ( const char *directory, FontDirectoryPtr *pdir ); - extern Bool FontFileDirectoryChanged ( FontDirectoryPtr dir ); - - #endif /* _FONTFILE_H_ */ -diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h -index 73a8247..d3926a7 100644 ---- a/include/X11/fonts/fontmisc.h -+++ b/include/X11/fonts/fontmisc.h -@@ -91,7 +91,7 @@ RepadBitmap ( - - extern void CopyISOLatin1Lowered( - char * /*dest*/, -- char * /*source*/, -+ const char * /*source*/, - int /*length*/ - ); - -diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c -index 44e5e02..65efefc 100644 ---- a/src/FreeType/ftfuncs.c -+++ b/src/FreeType/ftfuncs.c -@@ -1069,6 +1069,8 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index, - #endif - } - -+#pragma GCC diagnostic ignored "-Wbad-function-cast" -+ - int - FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, - FTInstancePtr instance, int hasMetrics) -diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c -index e89ba7c..b864a28 100644 ---- a/src/bitmap/bitscale.c -+++ b/src/bitmap/bitscale.c -@@ -751,6 +751,8 @@ compute_xform_matrix(FontScalablePtr vals, double dx, double dy, - * ScaleFont - * returns a pointer to the new scaled font, or NULL (due to AllocError). - */ -+#pragma GCC diagnostic ignored "-Wbad-function-cast" -+ - static FontPtr - ScaleFont(FontPtr opf, /* originating font */ - double widthMult, /* glyphs width scale factor */ -@@ -811,8 +813,6 @@ ScaleFont(FontPtr opf, /* originating font */ - needs to be for the output font */ - if (vals->nranges) - { -- int i; -- - pfi->allExist = 0; - firstCol = 255; - lastCol = 0; -diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h -index 75dff8d..f9a4cea 100644 ---- a/src/builtins/builtin.h -+++ b/src/builtins/builtin.h -@@ -54,9 +54,9 @@ extern const int builtin_dir_count; - extern const BuiltinAliasRec builtin_alias[]; - extern const int builtin_alias_count; - --extern FontFilePtr BuiltinFileOpen (char *); -+extern FontFilePtr BuiltinFileOpen (const char *); - extern int BuiltinFileClose (BufFilePtr, int); --extern int BuiltinReadDirectory (char *, FontDirectoryPtr *); -+extern int BuiltinReadDirectory (const char *, FontDirectoryPtr *); - extern void BuiltinRegisterFontFileFunctions (void); - - extern void BuiltinRegisterFpeFunctions (void); -diff --git a/src/builtins/dir.c b/src/builtins/dir.c -index 490e7e3..0225bfc 100644 ---- a/src/builtins/dir.c -+++ b/src/builtins/dir.c -@@ -148,7 +148,7 @@ BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab, - } - - int --BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir) -+BuiltinReadDirectory (const char *directory, FontDirectoryPtr *pdir) - { - FontDirectoryPtr dir; - int i; -diff --git a/src/builtins/file.c b/src/builtins/file.c -index 3f657d9..93527c1 100644 ---- a/src/builtins/file.c -+++ b/src/builtins/file.c -@@ -90,7 +90,7 @@ BuiltinClose (BufFilePtr f, int unused) - - - FontFilePtr --BuiltinFileOpen (char *name) -+BuiltinFileOpen (const char *name) - { - int i; - BuiltinIOPtr io; -diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c -index 689f22a..4f5d4cf 100644 ---- a/src/builtins/fpe.c -+++ b/src/builtins/fpe.c -@@ -32,7 +32,7 @@ static int font_file_type; - static const char builtin_fonts[] = "built-ins"; - - static int --BuiltinNameCheck (char *name) -+BuiltinNameCheck (const char *name) - { - return (strcmp (name, builtin_fonts) == 0); - } -diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c -index faf2e5d..75b5372 100644 ---- a/src/fc/fsconvert.c -+++ b/src/fc/fsconvert.c -@@ -634,7 +634,7 @@ _fs_unload_font(FontPtr pfont) - - FontPtr - fs_create_font (FontPathElementPtr fpe, -- char *name, -+ const char *name, - int namelen, - fsBitmapFormat format, - fsBitmapFormatMask fmask) -diff --git a/src/fc/fserve.c b/src/fc/fserve.c -index fc44d19..be1c89f 100644 ---- a/src/fc/fserve.c -+++ b/src/fc/fserve.c -@@ -137,7 +137,7 @@ static void - _fs_close_server (FSFpePtr conn); - - static FSFpePtr --_fs_init_conn (char *servername); -+_fs_init_conn (const char *servername); - - static int - _fs_wait_connect (FSFpePtr conn); -@@ -212,7 +212,7 @@ _fs_add_rep_log (FSFpePtr conn, fsGenericReply *rep) - #endif - - static Bool --fs_name_check(char *name) -+fs_name_check(const char *name) - { - /* Just make sure there is a protocol/ prefix */ - return (name && *name != '/' && strchr(name, '/')); -@@ -270,7 +270,7 @@ static int - fs_init_fpe(FontPathElementPtr fpe) - { - FSFpePtr conn; -- char *name; -+ const char *name; - int err; - int ret; - -@@ -1517,7 +1517,7 @@ _fs_do_blocked (FSFpePtr conn) - /* ARGSUSED */ - static int - fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags, -- char *name, int namelen, -+ const char *name, int namelen, - fsBitmapFormat format, fsBitmapFormatMask fmask, - XID id, FontPtr *ppfont) - { -@@ -1709,7 +1709,7 @@ fs_send_query_bitmaps(FontPathElementPtr fpe, FSBlockDataPtr blockrec) - /* ARGSUSED */ - static int - fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags, -- char *name, int namelen, -+ const char *name, int namelen, - fsBitmapFormat format, fsBitmapFormatMask fmask, - XID id, FontPtr *ppfont, - char **alias, FontPtr non_cachable_font) -@@ -2259,7 +2259,7 @@ fs_read_list(FontPathElementPtr fpe, FSBlockDataPtr blockrec) - } - - static int --fs_send_list_fonts(pointer client, FontPathElementPtr fpe, char *pattern, -+fs_send_list_fonts(pointer client, FontPathElementPtr fpe, const char *pattern, - int patlen, int maxnames, FontNamesPtr newnames) - { - FSFpePtr conn = (FSFpePtr) fpe->private; -@@ -2315,7 +2315,7 @@ fs_send_list_fonts(pointer client, FontPathElementPtr fpe, char *pattern, - - static int - fs_list_fonts(pointer client, FontPathElementPtr fpe, -- char *pattern, int patlen, int maxnames, FontNamesPtr newnames) -+ const char *pattern, int patlen, int maxnames, FontNamesPtr newnames) - { - FSFpePtr conn = (FSFpePtr) fpe->private; - FSBlockDataPtr blockrec; -@@ -2429,7 +2429,7 @@ done: - /* ARGSUSED */ - static int - fs_start_list_with_info(pointer client, FontPathElementPtr fpe, -- char *pattern, int len, int maxnames, pointer *pdata) -+ const char *pattern, int len, int maxnames, pointer *pdata) - { - FSFpePtr conn = (FSFpePtr) fpe->private; - FSBlockDataPtr blockrec; -@@ -3145,7 +3145,7 @@ _fs_start_reconnect (FSFpePtr conn) - - - static FSFpePtr --_fs_init_conn (char *servername) -+_fs_init_conn (const char *servername) - { - FSFpePtr conn; - -diff --git a/src/fc/fserve.h b/src/fc/fserve.h -index 5999861..502e201 100644 ---- a/src/fc/fserve.h -+++ b/src/fc/fserve.h -@@ -72,7 +72,7 @@ typedef struct _fs_blocked_extents *FSBlockedExtentPtr; - extern void _fs_convert_char_info ( fsXCharInfo *src, xCharInfo *dst ); - extern void _fs_free_props (FontInfoPtr pfi); - extern FontPtr fs_create_font (FontPathElementPtr fpe, -- char *name, -+ const char *name, - int namelen, - fsBitmapFormat format, - fsBitmapFormatMask fmask); -diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c -index 6230930..81a1e13 100644 ---- a/src/fontfile/catalogue.c -+++ b/src/fontfile/catalogue.c -@@ -40,7 +40,7 @@ static const char CataloguePrefix[] = "catalogue:"; - static int CatalogueFreeFPE (FontPathElementPtr fpe); - - static int --CatalogueNameCheck (char *name) -+CatalogueNameCheck (const char *name) - { - return strncmp(name, CataloguePrefix, sizeof(CataloguePrefix) - 1) == 0; - } -@@ -116,7 +116,7 @@ CatalogueUnrefFPEs (FontPathElementPtr fpe) - if (subfpe->refcount == 0) - { - FontFileFreeFPE (subfpe); -- free(subfpe->name); -+ free((void *) subfpe->name); - free(subfpe); - } - } -@@ -158,6 +158,7 @@ CatalogueRescan (FontPathElementPtr fpe, Bool forceScan) - CatalogueUnrefFPEs (fpe); - while (entry = readdir(dir), entry != NULL) - { -+ char *name; - snprintf(link, sizeof link, "%s/%s", path, entry->d_name); - len = readlink(link, dest, sizeof dest - 1); - if (len < 0) -@@ -191,15 +192,16 @@ CatalogueRescan (FontPathElementPtr fpe, Bool forceScan) - * (which uses font->fpe->type) goes to CatalogueCloseFont. */ - subfpe->type = fpe->type; - subfpe->name_length = len; -- subfpe->name = malloc (len + 1); -- if (subfpe->name == NULL) -+ name = malloc (len + 1); -+ if (name == NULL) - { - free(subfpe); - continue; - } - -- memcpy(subfpe->name, dest, len); -- subfpe->name[len] = '\0'; -+ memcpy(name, dest, len); -+ name[len] = '\0'; -+ subfpe->name = name; - - /* The X server will manipulate the subfpe ref counts - * associated with the font in OpenFont and CloseFont, so we -@@ -208,7 +210,7 @@ CatalogueRescan (FontPathElementPtr fpe, Bool forceScan) - - if (FontFileInitFPE (subfpe) != Successful) - { -- free(subfpe->name); -+ free((void *) subfpe->name); - free(subfpe); - continue; - } -@@ -280,7 +282,7 @@ CatalogueFreeFPE (FontPathElementPtr fpe) - - static int - CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, -- char *name, int namelen, -+ const char *name, int namelen, - fsBitmapFormat format, fsBitmapFormatMask fmask, - XID id, FontPtr *pFont, char **aliasName, - FontPtr non_cachable_font) -@@ -314,7 +316,7 @@ CatalogueCloseFont (FontPathElementPtr fpe, FontPtr pFont) - } - - static int --CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat, -+CatalogueListFonts (pointer client, FontPathElementPtr fpe, const char *pat, - int len, int max, FontNamesPtr names) - { - CataloguePtr cat = fpe->private; -@@ -339,7 +341,7 @@ typedef struct _LFWIData { - - static int - CatalogueStartListFonts(pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, pointer *privatep, -+ const char *pat, int len, int max, pointer *privatep, - int mark_aliases) - { - CataloguePtr cat = fpe->private; -@@ -375,7 +377,7 @@ CatalogueStartListFonts(pointer client, FontPathElementPtr fpe, - - static int - CatalogueStartListFontsWithInfo(pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep) - { - return CatalogueStartListFonts(client, fpe, pat, len, max, privatep, 0); -@@ -413,7 +415,7 @@ CatalogueListNextFontWithInfo(pointer client, FontPathElementPtr fpe, - - static int - CatalogueStartListFontsAndAliases(pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep) - { - return CatalogueStartListFonts(client, fpe, pat, len, max, privatep, 1); -diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c -index 0d34db9..cb28333 100644 ---- a/src/fontfile/dirfile.c -+++ b/src/fontfile/dirfile.c -@@ -49,8 +49,10 @@ static int ReadFontAlias ( char *directory, Bool isFile, - static int lexAlias ( FILE *file, char **lexToken ); - static int lexc ( FILE *file ); - -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ - int --FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir) -+FontFileReadDirectory (const char *directory, FontDirectoryPtr *pdir) - { - char file_name[MAXFONTFILENAMELEN]; - char font_name[MAXFONTNAMELEN]; -diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c -index c55282b..05a9610 100644 ---- a/src/fontfile/fontfile.c -+++ b/src/fontfile/fontfile.c -@@ -50,7 +50,7 @@ ISOLatin1ToLower(unsigned char source) - } - - _X_HIDDEN void --CopyISOLatin1Lowered(char *dest, char *source, int length) -+CopyISOLatin1Lowered(char *dest, const char *source, int length) - { - int i; - for (i = 0; i < length; i++, source++, dest++) -@@ -69,7 +69,7 @@ static int FontFileOpenBitmapNCF (FontPathElementPtr fpe, FontPtr *pFont, - FontPtr non_cachable_font); - - int --FontFileNameCheck (char *name) -+FontFileNameCheck (const char *name) - { - #ifndef NCD - #if defined(WIN32) -@@ -254,7 +254,7 @@ transfer_values_to_alias(char *entryname, int entrynamelength, - /* ARGSUSED */ - int - FontFileOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, -- char *name, int namelen, -+ const char *name, int namelen, - fsBitmapFormat format, fsBitmapFormatMask fmask, - XID id, FontPtr *pFont, char **aliasName, - FontPtr non_cachable_font) -@@ -688,7 +688,7 @@ _FontFileAddScalableNames(FontNamesPtr names, FontNamesPtr scaleNames, - /* ARGSUSED */ - static int - _FontFileListFonts (pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, FontNamesPtr names, -+ const char *pat, int len, int max, FontNamesPtr names, - int mark_aliases) - { - FontDirectoryPtr dir; -@@ -794,7 +794,7 @@ typedef struct _LFWIData { - } LFWIDataRec, *LFWIDataPtr; - - int --FontFileListFonts (pointer client, FontPathElementPtr fpe, char *pat, -+FontFileListFonts (pointer client, FontPathElementPtr fpe, const char *pat, - int len, int max, FontNamesPtr names) - { - return _FontFileListFonts (client, fpe, pat, len, max, names, 0); -@@ -802,7 +802,7 @@ FontFileListFonts (pointer client, FontPathElementPtr fpe, char *pat, - - int - FontFileStartListFonts(pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep, int mark_aliases) - { - LFWIDataPtr data; -@@ -833,7 +833,7 @@ FontFileStartListFonts(pointer client, FontPathElementPtr fpe, - - int - FontFileStartListFontsWithInfo(pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep) - { - return FontFileStartListFonts(client, fpe, pat, len, max, privatep, 0); -@@ -1067,7 +1067,7 @@ FontFileListNextFontWithInfo(pointer client, FontPathElementPtr fpe, - - int - FontFileStartListFontsAndAliases(pointer client, FontPathElementPtr fpe, -- char *pat, int len, int max, -+ const char *pat, int len, int max, - pointer *privatep) - { - return FontFileStartListFonts(client, fpe, pat, len, max, privatep, 1); -diff --git a/src/util/patcache.c b/src/util/patcache.c -index 9c05fa1..2101015 100644 ---- a/src/util/patcache.c -+++ b/src/util/patcache.c -@@ -50,7 +50,7 @@ typedef unsigned char EntryPtr; - typedef struct _FontPatternCacheEntry { - struct _FontPatternCacheEntry *next, **prev; - short patlen; -- char *pattern; -+ const char *pattern; - int hash; - FontPtr pFont; /* associated font */ - } FontPatternCacheEntryRec, *FontPatternCacheEntryPtr; -@@ -74,7 +74,7 @@ EmptyFontPatternCache (FontPatternCachePtr cache) - cache->entries[i].next = &cache->entries[i+1]; - cache->entries[i].prev = 0; - cache->entries[i].pFont = 0; -- free (cache->entries[i].pattern); -+ free ((void *) cache->entries[i].pattern); - cache->entries[i].pattern = 0; - cache->entries[i].patlen = 0; - } -@@ -107,7 +107,7 @@ FreeFontPatternCache (FontPatternCachePtr cache) - int i; - - for (i = 0; i < NENTRIES; i++) -- free (cache->entries[i].pattern); -+ free ((void *) cache->entries[i].pattern); - free (cache); - } - -@@ -128,7 +128,7 @@ Hash (const char *string, int len) - /* add entry */ - void - CacheFontPattern (FontPatternCachePtr cache, -- char *pattern, -+ const char *pattern, - int patlen, - FontPtr pFont) - { -@@ -154,7 +154,7 @@ CacheFontPattern (FontPatternCachePtr cache, - if (e->next) - e->next->prev = e->prev; - *e->prev = e->next; -- free (e->pattern); -+ free ((void *) e->pattern); - } - /* set pattern */ - memcpy (newpat, pattern, patlen); -@@ -174,7 +174,7 @@ CacheFontPattern (FontPatternCachePtr cache, - /* find matching entry */ - FontPtr - FindCachedFontPattern (FontPatternCachePtr cache, -- char *pattern, -+ const char *pattern, - int patlen) - { - int hash; -@@ -211,7 +211,7 @@ RemoveCachedFontPattern (FontPatternCachePtr cache, - *e->prev = e->next; - e->next = cache->free; - cache->free = e; -- free (e->pattern); -+ free ((void *) e->pattern); - e->pattern = 0; - } - } --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/libXfont/libXfont-1.4.8-r1.ebuild b/x11-libs/libXfont/libXfont-1.4.8-r1.ebuild deleted file mode 100644 index b98c81dff579..000000000000 --- a/x11-libs/libXfont/libXfont-1.4.8-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.8-r1.ebuild,v 1.1 2014/05/21 16:17:37 chithanh Exp $ - -EAPI=5 - -XORG_DOC=doc -XORG_EAUTORECONF=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xfont library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 ipv6 truetype" - -RDEPEND="x11-libs/xtrans - x11-libs/libfontenc - truetype? ( >=media-libs/freetype-2 ) - bzip2? ( app-arch/bzip2 ) - x11-proto/xproto - >=x11-proto/fontsproto-2.1.3" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fontsproto-2.1.3-configure_ac.patch - "${FILESDIR}"/${P}-fontsproto-2.1.3-constchar.patch -) - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable doc devel-docs) - $(use_with doc xmlto) - $(use_with bzip2) - $(use_enable truetype freetype) - --without-fop - ) - xorg-2_src_configure -} diff --git a/x11-libs/libXfont/libXfont-1.4.8.ebuild b/x11-libs/libXfont/libXfont-1.4.8.ebuild deleted file mode 100644 index 8a228a3889f2..000000000000 --- a/x11-libs/libXfont/libXfont-1.4.8.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.8.ebuild,v 1.10 2014/06/08 10:55:33 ago Exp $ - -EAPI=5 - -XORG_DOC=doc -inherit xorg-2 - -DESCRIPTION="X.Org Xfont library" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 ipv6 truetype" - -RDEPEND="x11-libs/xtrans - x11-libs/libfontenc - truetype? ( >=media-libs/freetype-2 ) - bzip2? ( app-arch/bzip2 ) - x11-proto/xproto -