diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2005-01-03 20:09:30 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-01-03 20:09:30 +0000 |
| commit | d19e7cb3a293719febc719e62192cd95d8df16be (patch) | |
| tree | 84627fa72924cd45a21e29004e32d4d3d7a86baa /x11-base | |
| parent | Move x11-base/xfree to x11-base/xorg-x11 in an attempt to give xfree users a ... (diff) | |
| download | historical-d19e7cb3a293719febc719e62192cd95d8df16be.tar.gz historical-d19e7cb3a293719febc719e62192cd95d8df16be.tar.bz2 historical-d19e7cb3a293719febc719e62192cd95d8df16be.zip | |
Pull xfree, time for everyone to switch to xorg-x11.
Diffstat (limited to 'x11-base')
26 files changed, 0 insertions, 7679 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog deleted file mode 100644 index d19879cd7fc5..000000000000 --- a/x11-base/xfree/ChangeLog +++ /dev/null @@ -1,1798 +0,0 @@ -# ChangeLog for x11-base/xfree -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.370 2004/12/28 21:54:22 ciaranm Exp $ - - 28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.0-r7.ebuild, xfree-4.3.0-r8.ebuild: - Move from custom is_kernel() in x11.eclass to kernel_is() in - linux-info.eclass. It's not maintained by us, and that's a plus in itself. - - 17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; : - Update credits on xpm-secfix-thomas.diff. - - 17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.0-r8.ebuild: - Remove check for CC variable and use tc-getCC() everywhere, so this works - better with new gcc-config. - -*xfree-4.3.0-r8 (17 Nov 2004) - - 17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; - +files/xpm-secfix-thomas.diff, +xfree-4.3.0-r8.ebuild: - Security update: Add xpm-secfix-thomas.diff to fix many issues, including: - integer issues resulting in infinite loops and buffer overflows; a one-byte - buffer overflow; stack-based overflows with sprintf() and string functions; - replaces popen() with s_popen(); path traversal issues; buffer underruns; - and memory leaks (missing free(), found by Egbert Eich). Patch by Thomas - Biege and Matthiew Herrb. Petr Mladek identified the initial vulnerabilities - and provided a patch that was later expanded on. Jacques A. Vidrine aided in - the code audit and patch review. This issue is identified as CAN-2004-0914. - - 10 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.0-r7.ebuild: - Respect new gcc-config that doesn't set CC. - - 20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r7.ebuild: - Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree. - Make one fix related to a hard-coded gcc. Update license syntax so I can - commit. - - 29 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>; -xfree-4.3.0-r5.ebuild, - -xfree-4.3.0-r6.ebuild: - Pull vulnerable versions (#64152). - - 22 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r7.ebuild: - x86 (#64152). - - 18 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> xfree-4.3.0-r7.ebuild: - Stable on alpha, bug 64152. - - 17 Sep 2004; Travis Tilley <lv@gentoo.org> xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild: - marking all amd64 keyworded xfree ebuilds ~amd64 since we no longer support - xfree - - 16 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r7.ebuild: - PATCH_VER 2.1.25.8. This ebuild is *not* the hard-masked enhanced version it - once was. It is now a security bump to 4.3.0-r6, our standard 4.3.0 release. - Add 9925_all_6.7.0-libXpm-CAN-2004-0687-CAN-2004-0688.patch to fix stack and - integer overflows in libXpm (Chris Evans, Alan Coopersmith, Matthiew Herrb) - (#64152). - - 06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> xfree-4.3.0-r7.ebuild: - Switch to use epause and ebeep, bug #62950 - - 02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild, xfree-4.3.0-r7.ebuild: - fc-cache -f breaks the font eclass, according to foser. - - 02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; files/4.3.0/10xfree, - files/4.3.0/xfs.start, xfree-4.3.0-r5.ebuild, xfree-4.3.0-r6.ebuild: - Fix font setup (#53753). Previously we trashed fonts.scale for all scalable - fonts, even though we only regenerated it for TrueType fonts. ttmkfdir can't - regenerate fonts.scale for Type1 or OpenType fonts, so we start using - mkfontscale for that. We trashed any other fonts.scale files that happened to - be around, such as Speedo/CID. We stop doing that. Also fixed the regexps in - the ebuild and the xfs init script to use ttmkfdir for TrueType only and - mkfontscale for Type1 and OpenType. Change INFODIR to INFOPATH also (#54275). - - 01 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild: - When fixing #30698, forgot to set G_FONTDIRS, so nothing was deleted, even the - things that should have been. - - 26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild, xfree-4.3.0-r7.ebuild: - /usr/src/linux needs ${ROOT}. - - 20 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.25.7. No changes from .6, just fixing a corruption issue -- - somehow an old, broken version of .6 got mirrored. - - 16 Jul 2004; Brandon Hale <tseng@gentoo.org> xfree-4.3.0-r6.ebuild: - Revert to patchver 2.1.25.5 for now, see bug #57316. The digest is incorrect - and cyfred says the xbox patches are broken anyway. - - 16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.25.6. Add 9300_all_4.3.0-x86-xbox-nv-driver.patch and - 9305_all_4.3.0-x86-xbox-xf86PciInfo.patch to get things working on xbox - (#51868). - - 01 Jul 2004; Luca Barbato <lu_zero@gentoo.org> xfree-4.3.0-r6.ebuild: - Maked ppc - - 23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild, xfree-4.3.0-r7.ebuild: - QA - fix use invocation - - 22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfree-4.3.0-r6.ebuild: - Keyworded for hppa, bug #53226 - - 13 Jun 2004; Stephen P. Becker <geoman@gentoo.org> xfree-4.3.0-r6.ebuild: - Stable on mips - bug 53226 - - 12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> xfree-4.3.0-r6.ebuild: - alpha keyword, bug #53226. - - 11 Jun 2004; Ferris McCormick <fmccor@gentoo.org> xfree-4.3.0-r6.ebuild: - Add ~sparc keyword. (Bug 53226) - - 11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r7.ebuild: - Make it tough to emerge this, as it's still got a security hole (#53226). - - 11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; - -xfree-4.3.99.902-r2.ebuild: - Pull version vulnerable to #53226. - - 11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.25.5. Security update: - 9920_all_4.3.0-xdm-open-chooserfd-CAN-2004-0419.patch and - 9921_all_4.3.0-xdm-open-chooserfd-CAN-2004-0419-ipv6.patch. They stop xdm from - ignoring its \DisplayManager.requestPort" setting. xdm opens its "chooserFd" - TCP socket on all network interfaces without this patch (xf86 #1376). The two - patches are mutually exclusive; 9921 applies in conjunction with patch 2000. - -*xfree-4.3.0-r7 (11 Jun 2004) - - 11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; +xfree-4.3.0-r7.ebuild: - Move current -r6 to -r7 to make room for security update to -r5. - - 07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> xfree-4.3.0-r5.ebuild: - remove obsolete comment - - 03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Fix typo in xrender.pc generation, includ to include. - - 02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Fix generation of xrender.pc so version is resolved (#52843). - - 29 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Force opengl-update to change to xfree if xorg-x11 is currently selected, else - default to old behavior. - - 28 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: - Add explicit x11-base/xorg-x11 blocker. - - 12 May 2004; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild: - removed hardened-gcc checks - - 05 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Remove our custom SharedLibraryLoadFlags as a workaround until #49038 (fd.o - #600) is fixed. - - 28 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.26.18. Add - 9375_all_4.3.0-keyboard-disable-ioport-access-v3.patch from Mike Harris to fix - a sub-issue reported in #46553 where the kernel log shows errors about - atkbd.c. - - 28 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.26.17. Add - 9350_all_4.3.0-Xserver-dix-xkb-key-repeating-bug-CVS-backport.patch, made by - Mike Harris (#23019). This fixes key repeats under heavy load, which occurs - more often when using XKB. - - 25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Update so gcc-3.4 is respected (#48933). - - 25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Modify TODO. Only thing holding this back from unmasking on our side is adding - the opengl-update with --get-implementation. On the portage side, Jason Stubbs - has a patch waiting to get committed that allows to-be-merged packages to - fulfill dependencies. - - 21 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Add a couple of missing definitions for USE=sse -- HasSSESupport and - MesaUseSSE, from eikke on Freenode. - - 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Add them to IUSE. - - 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Don't autodetect MMX/SSE/3DNOW, it breaks cross-compilation. - - 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: - Fix directory in last commit. - - 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, - xfree-4.3.0-r6.ebuild: - Don't remove fonts.* or encodings.dir in dirs not provided by this package - (#30698). - - 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Add more backwards compatibility things -- symlinks for all former font, doc - and man dirs as well as autogeneration of new config files. Old locations are - deprecated and will be removed in a future release. - - 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: - Revert last fix, it was some one-off error. - - 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: - Prevent 9017 from applying for now, some build breakage reported by jhuebel. - - 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: - PATCH_VER 2.1.25.3. Add 9017_amd64_4.3.0-IncludeSharedObjectInNormalLib.patch - from 4.3.0-r6, fixes 64-bit issues with libraries. - - 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild, - xfree-4.3.99.902-r2.ebuild: - Add explicit xorg-x11 to blockers. - - 13 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.26.16. Drop - 9016_all_4.3.0-libfontenc-IncludeSharedObjectInNormalLib.patch and - 9015_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch, combine into one - larger patch 9015_all_4.3.0-IncludeSharedObjectInNormalLib.patch to force all - libs to PIC (#40646, #44274). solar says there shouldn't be any negative - performance impact on any arch from PIC static libs. Add - 9300_all_4.3.0-ncurses-xf86cfg-bool-conflict.patch to avoid conflict of bool - between ncurses-5.4 and xf86cfg (#43491). Add - 9550_all_4.3.0-nls-cjk-utf8.patch to change fontset order for UTF-8 in - XLC_LOCALE, from Kang-Ho Song <khsongdr@yahoo.com> (#46392). Ported from - upstream patches. Add 9113_all_4.3.0-xterm-make-optional.patch and use - external xterm (Mike Harris). This now depends on x11-terms/xterm. Fix a - doc-building error with BuildLinuxDocText, which actually prevents some docs - from building. Enhance XVendorString to show PATCH_VER and make it compliant - with upstream. - - 13 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; : - Restore ChangeLog. Somehow I managed to erase most of it on version 1.315. - - 12 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Move unpacking of NLS-related things earlier, so patches to them apply - properly. - - 08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Add GccAliasingArgs to the optimized CFLAGS and CXXFLAGS setup, so we get - -fno-strict-aliasing. This avoids broken code, pending a patch from Luca to - fix. - - 08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, - xfree-4.3.99.902-r2.ebuild: - Add blocker on virtual/x11. - - 05 Apr 2004; Travis Tilley <lv@gentoo.org> xfree-4.3.0-r6.ebuild: - masking on amd64 until bug #44274 and related -fPIC issues are resolved - - 04 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Change has_version to best_version for PAM check. - - 01 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Modify TODO. - - 01 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Change fontdir definition to host.def setting. - - 31 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r4.ebuild: - Drop 4.2. It's two years old. - - 29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Adding blocker on virtual/x11. Only one should be installed at a time. - - 27 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r4.ebuild, - xfree-4.3.0-r5.ebuild, xfree-4.3.0-r6.ebuild, xfree-4.3.99.902-r2.ebuild: - Fix descriptions. - - 27 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.902-r2.ebuild: - Add wacom to input devices. - - 22 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Bump libXft to 2.1.6 to fix freedesktop.org bug #308. - - 20 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Get rid of no-pam hack in favor of pam USE. - - 19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Update TODO. - - 19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r4.ebuild, - xfree-4.3.0-r5.ebuild, xfree-4.3.0-r6.ebuild, xfree-4.3.99.902-r2.ebuild: - Updating licenses. - - 17 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Changing build-time FONTDIR in attempt to fix #44854. - - 16 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Change rm to rm -f for external xlib Makefile deletions, got a report on - read-only permissions. - - 16 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; : - Fixing donnie@gentoo.org changelog entry. - - 15 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Add dodir so misc fonts emergency symlink works. - - 14 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - PATCH_VER 2.1.26.15. Drop patch 0181 in favor of ebuild magic. This gets rid - of lib64. - - 14 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Move as much global stuff as possible to pkg_setup(), move inherit to top of - ebuild, add IUSE_INPUT_DEVICES, fix PDEPEND on synaptics, linuxwacom and - glide-v3 so they're x86-only to fix weird configurations on other arches. - - 14 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Removing DONE stuff from TODO, it's just cluttering things up. - - 14 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Cosmetic fix in ebuild warning, update files to 0.1.5 to change license from - GPL v2 or later to GPL v2. - -*xfree-4.3.0-r6 (14 Mar 2004) - - 14 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: - Adding for testing. Critical change for end-users: fonts now install to - /usr/share/fonts. This will require changes in configuration files. Other than - that, minor features: updated libXft/libXrender/render; generates xrender.pc; - works with media-video/ati-gatos, x11-misc/linuxwacom and x11-misc/synaptics; - closes #21417, #21120, #35468, #36923, #42235, #8927, #38232, #23023, #29953, - #23957; branch update patch works with ipv6; patches added for hardened build; - build autodetects SSE/MMX/3DNOW; docs and man pages install to /usr/share; SiS - driver update; FILESDIR stuff moved to tarball so we can get rid of - files/4.3.0/ once 4.3.0-r5 is gone; PDEPEND on media-fonts/ttf-bitstream-vera, - it was added to newer upstream sources. - - 10 Mar 2004; Luca Barbato <lu_zero@gentoo.org> xfree-4.3.99.902-r2.ebuild: - Removed some old warnings - - 07 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfree-4.3.99.902-r2.ebuild: - Added ~mips to KEYWORDS - - 29 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, - xfree-4.3.99.902-r2.ebuild: - Check for existence of CC variable, since some old gcc versions didn't supply - a proper env.d file. - - 23 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: - Add bindist support for binary distribution in GRP sets. - - 18 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r3.ebuild, - xfree-4.3.0-r4.ebuild: - Pulling vulnerable versions. - - 17 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r3.ebuild, - xfree-4.2.1-r4.ebuild, xfree-4.3.0-r4.ebuild, xfree-4.3.0-r5.ebuild, - xfree-4.3.99.902-r2.ebuild: - Updating comment about tahoma font requiring a Windows license to actually - mention the word Tahoma. - - 17 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; xfree-4.3.99.902-r1.ebuild: - Pulling last vunerable version of 4.3.99.902 - -*xfree-4.3.99.902-r2 (17 Feb 2004) - - 17 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; xfree-4.3.99.902-r2.ebuild: - Buffer over flow fix for 4.3.99.902 see the below log entry. - -*xfree-4.2.1-r4 (14 Feb 2004) -*xfree-4.3.0-r5 (14 Feb 2004) - - 14 Feb 2004; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.1-r4.ebuild, - xfree-4.3.0-r5.ebuild: - Buffer overflow fix for 4.3.0 and 4.2.1. See: - http://www.securityfocus.com/archive/1/353692/2004-02-10/2004-02-16/0 Font - Information File Buffer Overflow *PART 2* Thanks to everyone who tested - this. - - 10 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; : - The buffer overflow prompting the last version bump was CAN-2004-0083. - - 10 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Pulling last vulnerable version. - - 09 Feb 2004; Aron Griffis <agriffis@gentoo.org> xfree-4.3.0-r4.ebuild: - stable on alpha - - 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild, - xfree-4.3.0-r2.ebuild, xfree-4.3.99.902.ebuild: - Pulling vulnerable versions. - - 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; : - Fix ChangeLog entries. - - 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r4.ebuild: - Stable on mips, report by psi29a. - -*xfree-4.3.0-r4 (09 Feb 2004) - - 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r3.ebuild, - xfree-4.3.0-r4.ebuild, xfree-4.3.99.902-r1.ebuild: - Security bumps for exploitable buffer overflow in font library. Committed - straight to stable except ~alpha and ~mips on 4.3.0-r4 because no compilations - were reported for those. PATCH_VER 1.5 for 4.2.1, 2.1.25.2 for 4.3.0, 0.4 for - 4.3.99.902. Added 920*_all_4.*.0-libxfont-buffer-overflow.patch. Also for - 4.3.0: Add 9020_all_4.3.0-fix-2.5-headers-rate-period.patch to close bug - #17345. Thanks to Andrew Kirilenko <icedank@gmx.net> on bug #36683 and - jack_mort <mort_jack@yahoo.fr> on bug #36535 for providing backport patches - from XFree86 CVS; Update 0100_all_4.3.0-xf-4_3-branch-01-19.patch -- this - includes security fixes for font library vulnerabilities (CAN-2003-0730) and - PAM authentication (CAN-2003-0690); Update 2000_all_4.3.0-ipv6-server-v3.patch - since 0100 update broke it. To clarify, CAN-2003-0690 and CAN-2003-0730 were - fixed in 4.3.0 PATCH_VER 2.1.15 on 6 Oct. 2003, but 4.3.0-r3 did not receive a - revision bump so early adopters of 4.3.0-r3 may need this update for those - fixes as well. - - 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.16.ebuild, - xfree-4.3.99.901.ebuild: - Pulling old snapshots. - - 07 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; xfree-4.3.0-r3.ebuild, - xfree-4.3.99.16.ebuild, xfree-4.3.99.901.ebuild, xfree-4.3.99.902.ebuild: - Updating to exclude 7500_all_4.0.1-s390-nohardware.patch on any arch except - non-existant s390 - - 31 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.16.ebuild, - xfree-4.3.99.901.ebuild, xfree-4.3.99.902.ebuild: - Removing gatos USE from 4.3.99 until gatos is ported to it. - - 27 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild: - Fix fowners syntax again, it got broken in the last commit. - - 27 Jan 2004; Andrew Bevitt <cyfred@gentoo.org>; xfree-4.2.1-r2.ebuild, - xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild, xfree-4.3.99.16.ebuild, - xfree-4.3.99.901.ebuild, xfree-4.3.99.902.ebuild: - Fixing various ARCH problems with synaptics, and porting to files / patch - tarballs for 4.2.1-r2 to reduce portage tree size - - 13 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild, - xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild: - Fixing obsolete fowners syntax for bug #38043. - - 06 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.902.ebuild: - Marking ~amd64 at Brad House's request. - - 06 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.902.ebuild: - PATCH_VER 0.3. Skipped 0.2. Add 0181_all_4.3.0-amd64-nolib64.patch from - 4.3.0-r3, because upstream 32/64 lib separation appears screwed up (Brad - House). This makes sure it's all 64-bit and gets installed to /usr/X11R6/lib/. - Rename all patches from _arch_ to _all_ to try to prevent possible breakage - with all the combinations. Drop 0280 in favor of using - 0251_all_4.3.0-alpha-hppa-build-zlib-with-fpic.patch for both hppa and alpha. - This required some ebuild modifications to exclude it for other archs. Drop - 0180_amd64_4.2.99.4-glx-nopic.patch, because -fPIC is required on AMD64 for - all shared objects (Brad House). - - 30 Dec 2003; Jason Wever <weeve@gentoo.org> xfree-4.3.99.902.ebuild: - Added ~sparc for those crazed /etc/portage/package.unmask denizens. - - 21 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.902.ebuild: - Deleting encodings that caused ttmkfdir to segfault. - - 20 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.902.ebuild: - Marking ~ppc. - - 20 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; : - Fixing digest for USE=nls. - -*xfree-4.3.99.902 (19 Dec 2003) - - 19 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.902.ebuild: - 4.4 RC2. Added 0124_all_4.3.0-XF86Config-xfs-example.patch, which will also be - in 4.3.0 PATCH_VER 2.1.26 for bug #21417. - - 14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r2.ebuild, - xfree-4.3.0-r3.ebuild, xfree-4.3.99.16.ebuild, xfree-4.3.99.901.ebuild: - Updating patchset locations. - - 14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.1.0-r6.ebuild, - files/4.1.0-r6/10xfree, files/4.1.0-r6/XftConfig, files/4.1.0-r6/Xsession, - files/4.1.0-r6/site.def, files/4.1.0-r6/xdm, files/4.1.0-r6/xdm.start, - files/4.1.0-r6/xfs.config, files/4.1.0-r6/xfs.start, files/4.1.0-r6/xinitrc: - Pulling 4.1.0 -- it's obsolete and should not be used by anyone. - - 14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.0-r12.ebuild, - files/4.2.0/XFree-4.2.0-imake-tmpdir.patch.bz2, - files/4.2.0/XFree86-4.2.0-GeForce2Go.patch.bz2, - files/4.2.0/XFree86-4.2.0-Suse-Updates.patch.bz2, - files/4.2.0/XFree86-4.2.0-agpgart-load.patch.bz2, - files/4.2.0/XFree86-4.2.0-fixkbd.patch.bz2, - files/4.2.0/XFree86-4.2.0-i18n.patch.bz2, - files/4.2.0/XFree86-4.2.0-i810-dri.patch.bz2, - files/4.2.0/XFree86-4.2.0-i810_i845_20020524.patch.bz2, - files/4.2.0/XFree86-4.2.0-r128-lockup.patch.bz2, - files/4.2.0/XFree86-4.2.0-v4l.patch.bz2, - files/4.2.0/XFree86-4.2.0-xft-leak.patch.bz2, files/4.2.0-r12/10xfree, - files/4.2.0-r12/XftConfig, files/4.2.0-r12/Xsession, - files/4.2.0-r12/Xsetup_0, files/4.2.0-r12/chooser.sh, - files/4.2.0-r12/site.def, files/4.2.0-r12/startDM.sh, files/4.2.0-r12/xdm, - files/4.2.0-r12/xdm.start, files/4.2.0-r12/xfs.conf.d, - files/4.2.0-r12/xfs.config, files/4.2.0-r12/xfs.start, - files/4.2.0-r12/xft-quality.diff, files/4.2.0-r12/xinitrc, - files/4.2.0-r12/Sessions/Xsession, files/4.2.0-r12/lib/libGL.la, - files/4.2.0-r12/lib/libGLU.la, files/4.2.0-r12/lib/libOSMesa.la: - Pulling 4.2.0. Anyone wanting to use 4.2.x should use 4.2.1 instead. - - 14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.16.ebuild, - xfree-4.3.99.901.ebuild: - Removing append-flags -fPIC for hppa, which also had a typo, precluded by - 0280_hppa_4.3.0-build-zlib-with-fpic.patch. - - 14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.15.ebuild: - Pulling old snapshot. - - 09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> xfree-4.3.99.15.ebuild, - xfree-4.3.99.16.ebuild, xfree-4.3.99.901.ebuild: - changed app-text/ghostscript to virtual/ghostscript - - 08 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.0-r12.ebuild: - Using keepdir instead of touching .keep to fix bug #35308. - - 06 Dec 2003; Luca Barbato <lu_zero@gentoo.org> xfree-4.3.99.901.ebuild: - Marked ~ppc - - 04 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - PATCH_VER 2.1.25. Adding 0207_all_4.3.0-xman-no-grotty-sgr.patch to close bug - #25324. Thanks to bartron@gmx.net for providing this patch, backported from - 4.3.99 sources. - - 04 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - PATCH_VER 2.1.24. Fixing bug #24445 with 2000_all_4.3.0-ipv6-server-v2.patch. - Small change in 'if (getaddrinfo(hostname,NULL,NULL,&ai) != 0) {' from != to - ==. - - 04 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; files/4.3.0/Xsetup_0, - files/4.3.0/startDM.sh, files/4.3.0/xdm.start: - Fix bugs #21140, #23957 and #26125. - - 03 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; : - Fixing bad digest that slipped through somehow. - - 03 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - PATCH_VER 2.1.23. Rename - 0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch to - 9015_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch. Add - 9016_all_4.3.0-libfontenc-IncludeSharedObjectInNormalLib.patch for amd64 issue - with KDE -- from Mike Harris. Add 0263_ia64_4.3.0-elfloader-dup-case.patch to - close bug #33353. - -*xfree-4.3.99.901 (03 Dec 2003) - - 03 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; - xfree-4.3.99.901.ebuild: - 4.4.0 RC 1. Fix bugs #21140 (Xsetup kdm), #23957 (wdm as *dm) and #26125 (wait - for gdm). Add 9960_all_4.3.0-exec-shield-GNU-stack.patch, - 9961_all_4.3.0-libGL-exec-shield-fixes-v2.patch and - 9962_all_text-relocations-BUSmemcpy.S.patch for hardened team. However, 9960 - and 9961 aren't applied because they need to be ported from 4.3.0. Add - 9840_all_4.3.0-sdk-gatos.patch, 9841_all_4.3.0-gatos-mesa-offset.patch and - 9860_all_4.3.0-synaptics-sdk-includes.patch for building ati-gatos and - synaptics against the SDK. Update to 0119_all_exports-lib-v2.patch and fix - 0127_all_4.3.99-makefile-fastbuild.patch accordingly. - - 02 Dec 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r3.ebuild, - xfree-4.3.99.15.ebuild, xfree-4.3.99.16.ebuild: - removed hardened-gcc disabling of elf module load mechanism - - 25 Nov 2003; Luca Barbato <lu_zero@gentoo.org> xfree-4.3.99.16.ebuild: - Marked ~ppc - - 24 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.16.ebuild: - Stopping PDF docs from building. With X and doc in USE, this creates a - circular dep with ghostscript. - - 23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.14.ebuild: - Pulling old snapshot. - -*xfree-4.3.99.16 (23 Nov 2003) - - 23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.16.ebuild: - New snapshot. I've got PDF docs working now, of course with USE=doc. Reworked - docs setup somewhat. Also trying to use only external zlib. Added - -fomit-frame-pointer to ALLOWED_FLAGS. Fixed an obsolete chown problem that - slipped by because it used fowners. Not adding external SiS driver because it - makes no sense, the internal is just as current. Some changes in the default - host.def: pulled docs-related things and fontconfig, since both are done in - the ebuild. - - 18 Nov 2003; Luca Barbato <lu_zero@gentoo.org> xfree-4.3.99.15.ebuild: - Marked ~ppc - - 11 Nov 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r3.ebuild, - xfree-4.3.99.15.ebuild: - removed sleep statements from hardened-gcc if statements - - 09 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.13.ebuild: - Pulling old dev snapshot. - - 09 Nov 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r3.ebuild: - changed CC -yet_exec for hardened-gcc again to be honoured by the ebuild - - 09 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Reverting matrox change, causes compilation problems for some people. - - 09 Nov 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r3.ebuild: - added CC yet_exec again for hardened-gcc not to fail with the xfree building - - 04 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - PATCH_VER 2.1.22. Most significant changes are fixing the Mesa patch to work - on 2.4 and 2.6 as well as changing ucs2any Perl script to a C program, which - is much faster. Add - 9145_all_4.3.0-RandR-refresh-rate-rounding-error-fix-from-CVSHEAD.patch. Add - 9146_all_4.3.0-vidmode-SEGV-fix-from-CVS-HEAD.patch to fix SEGV in vidmode - extension. Add - 1701_all_4.3.0-rendition-complete-driver-backport-CVS20031031.patch, full - backport of rendition driver. Obsoletes - 5500_all_4.3.0-rendition-disable-cause-of-SEGV.patch. Update to - 9132_all_4.3.0-Mesa-SSE-fixes-from-MesaCVS-v2.patch, which doesn't break 2.6 - kernels. Remove big warning for previous patch #9132. Add - 9142_all_4.3.0-ucs2any-C-implementation.patch and a little bit in ebuild to - compile it. It's faster than the previous Perl script. Thanks Mike Harris for - some wonderful patches. Update ebuild to only build static for USE=static and - not USE=debug. Add incompatibility warning for static and sdk. Update ebuild - to build support for later adding mga HAL lib but not to build or expect the - lib. Also always apply fastbuild patch (0127). - -*xfree-4.3.99.15 (02 Nov 2003) - - 02 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.15.ebuild: - This is the first feature-complete snapshot for 4.4. PDF docs aren't working - yet, but everything else seems great. - - 02 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r1.ebuild: - Pulling 4.3.0-r1, now that gmsoft marked 4.3.0-r3 stable on hppa. - - 02 Nov 2003; Guy Martin <gmsoft@gentoo.org>; xfree-4.3.0-r3.ebuild : - Marked stable on hppa. - - 02 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild, - xfree-4.3.0-r1.ebuild, xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild, - xfree-4.3.99.13.ebuild, xfree-4.3.99.14.ebuild: - Updating SiS driver to 311003-1. - - 31 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild, - xfree-4.3.99.13.ebuild: - Install synclient to the right place. - - 27 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild, - xfree-4.3.99.13.ebuild, xfree-4.3.99.14.ebuild: - New Synaptics driver 0.12.0. Initial support for ALPS touchpads. - - 26 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild, - xfree-4.3.0-r1.ebuild, xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild, - xfree-4.3.99.13.ebuild, xfree-4.3.99.14.ebuild: - Updating SiS driver to 261003-1. - - 26 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.14.ebuild: - PATCH_VER 0.4. I swear I've pulled 5310_ppc_4.3.0-enable-nv.patch a few times - already, but it was still there. Now it's gone (again?). - - 25 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.14.ebuild: - PATCH_VER 0.3. Add 0280_hppa_4.3.0-build-zlib-with-fpic.patch and - 0251_alpha_4.3.0-build-zlib-with-fpic.patch. - - 22 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Since emerge system on install could pull in xfree before a kernel, revised - the kernel checks. When /usr/src/linux doesn't exist, they default to 2.4 in - the case of patch 9132 and to uname in other cases. - - 22 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New PATCH_VER 2.1.21. Fix 0127_all_4.3.0-makefile-fastbuild.patch. It was - broken since cleaning up patch 0119 but got missed since USE=debug is needed - to apply it. Thanks to Geoff Kassel <geoffk@itee.uq.edu.au> on bug #31718. - - 19 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Added warning for patch 9132, since it's compile time. If one switches from - 2.4 to 2.6 kernel after emerging xfree, one must recompile xfree against the - 2.6 kernel or OpenGL applications will segfault. - - 19 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New PATCH_VER 2.1.20 does what should've been done in the first place. It - applies patch 9132 only if kernel is 2.4. Also inherit xfree eclass and change - bad uname things to is_kernel. - - 18 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New PATCH_VER 2.1.19. Pulling 9132_all_4.3.0-Mesa-SSE-fixes-from-MesaCVS.patch - because it broken OpenGL on 2.6 kernels, at least until a 2.6-compatible patch - can be made. This closes bug #30541. - - 18 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New PATCH_VER 2.1.18. Reverting stable branch update patch to 10-06 until ipv6 - patch works properly with the new one. - - 18 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New PATCH_VER 2.1.17. 0803_all_4.3.0-xkb-broken-capslock-fix-CVS11006-v2.patch - to attempt closing bug #30821, and cleaner 0119_all_4.3.0-exports-lib-v2.patch - from splite on bug #23581. - - 17 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r2.ebuild: - Adding dependency on >=sys-devel/patch-2.5.9, as some patches break without it. - - 17 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New PATCH_VER 2.1.16. Added patch 0192_all_4.3.0-missing-lib-sharedreqs.patch - (obsoleted 0191), 5118_all_4.3.0-radeon-autodetect-pci-or-agp-cards.patch, - 5117_all_4.3.0-radeon-support-backport-from-CVS-v2.patch, - 1109_all_4.3.0-ati-driver-message-cleanups.patch, - 1101_all_4.3.0-ati-generic-shared-chip-data.patch (atichip.h unified patch), - 0900_all_4.3.0-Xserver-xf86PciInfo-updates.patch (xf86PciInfo.h unified - patch), updated 5116_all_4.3.0-radeon-rh-forcelegacycrt-alan.patch, - 5100_all_4.3.0-radeon-support-from-ATI-backport-from-CVS-v2.patch, updated a - few others to comply with 0900 and 1101. Updated xf-4_3-branch patch to 10-17 - (obsoleted 5112, 5113, 5775). - - 13 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r2.ebuild, - xfree-4.3.0-r3.ebuild, xfree-4.3.99.14.ebuild: - New SiS driver 131003-1. - - 13 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.14.ebuild: - Pulling patch 5310, which enabled the nv driver on ppc by default, since this - happens without the patch now. - - 13 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.12.ebuild, - files/synaptics-makefile-fixup-0.11.3p11.patch: - Pulling 4.3.99.12 and unused synaptics patch. - - 13 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New synaptics driver 0.11.8. - -*xfree-4.3.99.14 (12 Oct 2003) - - 12 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.14.ebuild: - New snapshot. Last regular snapshot before 4.4, new ones will be released as - necessary. - - 07 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.13.ebuild: - Adding patch #9960 to close bug #29216. Thanks to Marc <gigerstyle@gmx.ch> for - making me do this. - - 07 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.12.ebuild, - xfree-4.3.99.13.ebuild: - Fixing synaptics URLs for CVS snapshots, and bad digest. - - 07 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Fixing location of synaptics driver, thanks to Peter Ruskin. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.13.ebuild: - Adding autoconfiguration patch. Try it out. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Adding support for building SDK with USE flags sdk and gatos. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Marking stable on arm (which is dead right now). - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.12.ebuild, - xfree-4.3.99.13.ebuild: - New synaptics version 0.11.7. Add pam USE flag. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Marking stable on sparc and mips, from `Kumba and todd. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New patchset 2.1.15, with CVS update from xf-4_3-branch including security - fixes. Pulled patch 9131 since it's included in 0100. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Remarking stable on x86...somehow got unmarked? - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Cleaning up SRC_PATH for xfree by moving to mirror://xfree instead of ugly - hack. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Marking stable on x86. - - 06 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Unpacking cleanup. - - 05 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; : - Add missing digest. - - 05 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild, - files/synaptics-makefile-fixup-0.11.3p11.patch: - Cleaning up how synaptics driver is done. - - 05 Oct 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r2.ebuild: - added hardened-gcc exclusion CC, hcc compiles okay but at startup font and lib - errors - - 04 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.10.ebuild, - xfree-4.3.99.11.ebuild, xfree-4.3.99.9.ebuild: - Pulling older CVS snapshots. - - 02 Oct 2003; Martin Holzer <mholzer@gentoo.org> xfree-4.3.0-r1.ebuild, - xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild: - Added pam into IUSE. - - 29 Sep 2003; Aron Griffis <agriffis@gentoo.org> xfree-4.3.0-r3.ebuild: - Stable on alpha - - 26 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> xfree-4.3.0-r3.ebuild: - set ppc in keywords - -*xfree-4.3.99.13 (26 Sep 2003) - - 26 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.13.ebuild, - files/xfree-4.3.0-ia64-elfloader.patch: - Adding 4.3.99.13. Modified patch 0475, which customizes xterm settings. Pulled - ia64 patch since it's in the patchset for 4.3.0. - - 24 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Patchset 2.1.14. Adding patches 0261 and 0262 to fix module loading issues on - ia64. 0261 is from splite, 0262 I got from Mike Harris's patches. Fixing bug - #29430 as well. - - 21 Sep 2003; Jon Portnoy <avenj@gentoo.org> xfree-4.3.0-r3.ebuild, - files/xfree-4.3.0-ia64-elfloader.patch : - Tiny patch from splite for XFree86 on IA64. Added IA-64 keywords. - - 17 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r2.ebuild: - Bumped patchset to 1.1.8. Added Savage memory leak patches from -r3, fixed - imake-tempdir patch 092, added nolisten-tcp patch 129. - - 16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild, - xfree-4.3.99.10.ebuild, xfree-4.3.99.11.ebuild, xfree-4.3.99.12.ebuild: - Making synclient executable to close bug #28857. Thanks to Hanno Boeck - <hanno@gentoo.org>. - - 16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - 2.1.12 was bad. Moving to 2.1.13. - - 16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - New patchset 2.1.12. Patches from Mike Harris: 1214, 2002, 9128, 9131, 9132, - 9133 (I get some credit for 9132 though). Patch 0129 disables our default tcp - listening on startx, which was insecure to begin with, one more step toward - closing bugs #10599 and #23293. Fix patch 0128 thanks to bartron - <bartron@gmx.net> on bug #28554. - -*xfree-4.3.99.12 (15 Sep 2003) - - 15 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.12.ebuild: - Initial commit. Added quite a few patches from 4.3.0 thanks to Jasmin Buchert - <jasmin@atlantica.ch> on bug #27477. Prevent listening on ipv4 by default with - startx to begin closing bugs #10599 and #23293. Add patch 0128 thanks to - bartron <bartron@gmx.net> on bug #28554. - - 14 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - added patch-2.5.9 to the depends list, because lesser versions cause failures. - Closes bug #28618 reported by: Thomas Stein <thomas.stein@ngi.de> - - 09 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Preventing parallel make patch from being applied even if USE=debug. mharris - concurs that it is broken. - - 06 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild: - Fixing broken patches to close bug #24046. - - 07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.3.99.11.ebuild: - Rather use 'unpack' and not tar, as it already handle the invalid uid/gid - issues. Add back explicitly setting LD_LIBRARY_PATH when running bdftopcf etc - in src_install/pkg_postinst, as without it will break if this is the first - time we install X." - - 06 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild, - xfree-4.3.0-r2.ebuild: - Added distcc crosscompiling support to fix bug #17243, thanks to Francois - Guimond <darkpope@hotmail.com>. - - 06 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Adding a bunch of xkb patches and other things. PATCH_VER is 2.1.11. - - 02 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.11.ebuild: - X compiles should now die after an error instead of going forever. - -*xfree-4.3.99.11 (30 Aug 2003) - - 30 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.11.ebuild: - Initial commit. - - 28 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.8.ebuild, - files/4.3.99.8/10xfree, files/4.3.99.8/AuthLib.patch, - files/4.3.99.8/XftConfig, files/4.3.99.8/Xsession, files/4.3.99.8/Xsetup_0, - files/4.3.99.8/acecad.patch, files/4.3.99.8/chooser.sh, - files/4.3.99.8/exports-lib.patch, files/4.3.99.8/site.def, - files/4.3.99.8/startDM.sh, files/4.3.99.8/xdm.pamd, - files/4.3.99.8/xdm.start, files/4.3.99.8/xfs.conf.d, - files/4.3.99.8/xfs.config, files/4.3.99.8/xfs.start, files/4.3.99.8/xinitrc, - files/4.3.99.8/xserver.pamd, files/4.3.99.8/lib/libGL.la, - files/4.3.99.8/lib/libGLU.la, files/4.3.99.8/lib/libOSMesa.la: - Removing 4.3.99.8. - - 25 Aug 2003; Olivier Crete <tester@gentoo.org> xfree-4.3.0-r3.ebuild: - Fix ebuild to use system zlib on amd64 and mark stable on it - - 21 Aug 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - updated patch tarball for some amd64 fixes thanks to Olivier (tester@gentoo.org) - - 18 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Added three Savage memory leak fixes from xfree86 bugs 274, 278 and 279. - PATCH_VER is 2.1.9. - -*xfree-4.3.99.10 (13 Aug 2003) - - 13 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.10.ebuild: - Initial commit. - - 11 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Updated synaptics and sis drivers, made patch 0251 also apply to hppa as patch - 0280 at gmsoft's request. PATCH_VER is 2.1.8. - - 09 Aug 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r3.ebuild: - DoLoadableServer NO enables XFree86 binary to get protected by the PaX etdyn - patches at pageexec.virtualave.net - -*xfree-4.3.99.9 (03 Aug 2003) - - 03 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.9.ebuild: - Bump. Moved filesdir stuff to a downloaded tarball to save the tree. - - 31 Jul 2003; foser <foser@gentoo.org> xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild, xfree-4.3.99.8.ebuild : - Changed virtual/xft block to x11-libs/xft to actually work (#24111) - - 27 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.8.ebuild: - Changed freetype dep to 2.1.4 to close bug #25291. - - 17 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Fixed problem with problem fix. - - 17 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Fixed problem with synaptics-update patch, typo in ebuild. - - 17 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Added Synaptics touchpad driver v0.11.3p7. - - 14 Jul 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - added bindist use support to filter out the ms stuff for grp - - 13 Jul 2003; Donnie Berkholz <spyderous@gentoo.org> xfree-4.3.0-r3.ebuild: - Removed via driver because it broke USE flags static and debug. Users who need - this should use 4.3.99.*. See bugs #22372, #19512. - - 12 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.8.ebuild: - Adding symlink from XFree86 to X; Xwrapper is no longer used. - - 12 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: - Removing silicon motion patches from patchset. PATCH_VER is 2.1.6. - -*xfree-4.3.99.8 (11 Jul 2003) - - 11 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.8.ebuild, - files/4.3.99.8/10xfree, files/4.3.99.8/AuthLib.patch, - files/4.3.99.8/XftConfig, files/4.3.99.8/Xsession, files/4.3.99.8/Xsetup_0, - files/4.3.99.8/acecad.patch, files/4.3.99.8/chooser.sh, - files/4.3.99.8/exports-lib.patch, files/4.3.99.8/site.def, - files/4.3.99.8/startDM.sh, files/4.3.99.8/xdm.pamd, - files/4.3.99.8/xdm.start, files/4.3.99.8/xfs.conf.d, - files/4.3.99.8/xfs.config, files/4.3.99.8/xfs.start, files/4.3.99.8/xinitrc, - files/4.3.99.8/xserver.pamd, files/4.3.99.8/Sessions/Xsession, - files/4.3.99.8/lib/libGL.la, files/4.3.99.8/lib/libGLU.la, - files/4.3.99.8/lib/libOSMesa.la: - Added first development series ebuild; masked in package.mask - Thanks to Andrew Bevitt <andrew@volutin.net>. - - 07 Jul 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - some slight tweaks to have use checks not spawn a subshell -- will add proper - acknowledgements when -r2 is adjusted -- but Wout Mertens came up with this. - Also, patch_ver 2.1.5 has some amd64 fixes (and a rename from x86-64 to amd64 - for the patches in there already) - - 27 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - fixes for -fPIC on all platforms, thanks to Stefan Jones <cretin@gentoo.org> - in bug #23581 - - 21 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - patchball 2.1.4 has a patch to build successfulle on alpha platform -- build - zlib with -fPIC - - 16 Jun 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.3.0-r3.ebuild: - Fix generation of euro fonts when no X is installed by setting - LD_LIBRARY_PATH. - - 14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> files/4.3.0/chooser.sh: - chooser.sh is now POSIX compliant. Thanks to: Bjorn Lindstrom - <bkhl@privat.utfors.se> in bug #20308 - - 06 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - gcc-2 fixes, closing bug #22239 by Tristan Henderson <T.Henderson@cs.ucl.ac.uk> - - 06 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - xml to xml2 USE flag change. Closes that bug - - 05 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - the fastmake patch is not applied for debug in USE. Bumped patch_Ver to 2.1.3 - because 2.1.2 was buggy. Closes bug #22283 by Roger Hawley - <karma911@pacbell.net> - - 05 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - Added via driver from cvs X -- tarballed it onto the mirrors. This should - close bug #19512 by Henrik Treadup <hetr9922@student.su.se>. Also added a - patch for dri corruption with i8x0 chipsets -- should close bug #8927 by - Jan Knipper <jan-gentoo@spline.de>. PATCH_VER is 2.1.2 - - 04 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - oops patch-2.1.1 is new replacement. 2.1.0 was slightly wonky. Also, - activating fast build option - - 04 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - added the savage driver to sparc's list of cards. Should close bug #21406 - by Michael Siebecker <michael.siebecker@lcsys.ch> - - 04 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - Ready for release into ~arch testing. This revision bump adds the radeon - ap10 fix from daenzer, as well as a number of r128 fixes from redhat's - srpm, which includes the chip names touchupk, the ecp divisor and an - updated unresolved symbols patch. The mga unresolved symbols patch was - updated as well. New patches for the nv driver include: new chip ids, - filter-imagerect-pixel-range, dpms for broken monitors, a dualhead patch - for riva cards, and unresolved symbols patch. Additionally, the acecad - debug patch was added back in. Added a patch for the non-exec stack in - linux's elfloader. Also, a null pointer dereference fix in libXfont is - patched, as well as a patch to allow xscreensaver to work in xinerama. - New drivers patched are siliconmotion and rendition and trident. - Additionally a patch for the i8x0 440EX-LX video. New drivers patched are - siliconmotion and rendition and trident. Additionally a patch for the - i8x0 440EX-LX video. Finally, the coup de grace is the ipv6 patches that - latexer managed to pin down. - The patch structure is changed -- now patches not to - be appled are no longer deleted, they are moved into an excluded - subdirectory. The last update is TaD's gentoo cursors with a thinner I - bar. Speaking of cursors -- For system wide defaults, put the - default/index.theme file into /usr/local/share/cursors/xfree to avoid - getting it overwritten at every new emerge. Also, ~/.cursors is added to - the search path for private cursor settings. - - 02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - did similar things for mmx and sse use flag disables, at Tom's suggestion in - the bug - - 02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - 3dnow support disabled if USE flag for it is disabled. Thanks to: Tom - Molesworth <tetrarch@tom.molesworth.name> in bug #20273 - - 02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - Bumped to patch_ver 1.1.7 which contains a patch to fix the crappy displaying - of underlined truetype fonts. The patch was given from the 4.3.99 series in - cvs to me by: Juliusz Chroboczek <jch@xfree86.org> in xfree's bug #330. Closes - our bug #19965 by DC <ddcc@email.com> - - 02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - Added a patch to the patch tarball for Sun Type6 keyboards. Thanks to: Jeremy - Huddleston <jeremyhu@cory.eecs.berkeley.edu> in bug #21120 for the patch. - Note patch level is now 1.1.6 - - 02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild, - xfree-4.3.0-r3.ebuild: - works with debug in USE now. Closes bug #20511, by Cesar Eduardo Barros - <cesarb@nitnet.com.br> - - 31 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild, - xfree-4.3.0-r3.ebuild: - The locale fixes should be in place now. The only change was to the - XFree86-compose.dir.bz2 file on the mirrors. It was changed as suggested in: - http://bugs.xfree86.org//cgi-bin/bugzilla/show_bug.cgi?id=224 by Ivan Pascal - <pascal@tsu.ru> - - 30 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - Updated to patch 1.1.5 which contains a patch for libXi when using - XinitThreads -- thanks to foser@gentoo.org in bug #21336 - - 30 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild: - switch from using xml to xml2 USE flag. Closes bug #19710 by Phil Richards - <gentoo@derived-software.ltd.uk> - -*xfree-4.3.0-r1 (29 May 2003) - - 14 Jul 2003; Guy Martin <gmsoft@gentoo.org> xfree-4.3.0-r1.ebuild : - Forced the -fPIC CFLAGS needed by kde to link against some libs. - - 31 May 2003; Guy Martin <gmsoft@gentoo.org> xfree-4.3.0-r1.ebuild: - Unmasked for hppa. - - 29 May 2003; Grant Goodyear <g2boojum@gentoo.org> xfree-4.3.0-r1.ebuild: - Added 4.3.0-r1 back in, since it's required for hppa (by request of GMsoft). - -*xfree-4.3.0-r3 (28 May 2003) - - 28 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild, - xfree-4.3.0-r3.ebuild: - added patch to fix some i810 issues, to try and solve bug #8927 by Jan Knipper - <jan-gentoo@spline.de> - - 20 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.1-r1.ebuild, - xfree-4.2.1-r1.ebuild, xfree-4.3.0-r1.ebuild, xfree-4.3.0-r1.ebuild, - xfree-4.3.0.ebuild, xfree-4.3.0.ebuild, - files/4.2.1-r1/108_all_4.2.1-xterm-enable-backspace.patch, - files/4.2.1-r1/109_ppc_4.2.1-xterm-eightBitInput-fix.patch, - files/4.2.1-r1/10xfree, - files/4.2.1-r1/110_all_4.2.1-xf86_h-missing-bracket-fix.patch, - files/4.2.1-r1/XftConfig, files/4.2.1-r1/Xsession, files/4.2.1-r1/Xsetup_0, - files/4.2.1-r1/chooser.sh, files/4.2.1-r1/site.def, - files/4.2.1-r1/startDM.sh, files/4.2.1-r1/xdm.pamd, - files/4.2.1-r1/xdm.start, files/4.2.1-r1/xfs.conf.d, - files/4.2.1-r1/xfs.config, files/4.2.1-r1/xfs.start, - files/4.2.1-r1/xft-quality.diff, files/4.2.1-r1/xinitrc, - files/4.2.1-r1/xserver.pamd, files/4.2.1-r1/Sessions/Xsession, - files/4.2.1-r1/lib/libGL.la, files/4.2.1-r1/lib/libGLU.la, - files/4.2.1-r1/lib/libOSMesa.la, - files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch, - files/4.3.0-patches/XFree86-4.3.0-sparc-kb.patch: - removed crusty ebuilds - - 05 May 2003; Daniel Robbins <drobbins@gentoo.org>: xfree-4.3.0*.ebuild: moved - "inherit" line below DEPEND definition, since the "newdepend" lines in the - eclass were causing RDEPEND to get fried. RDEPEND should now be set - correctly. - -*xfree-4.3.0-r2 (08 Apr 2003) - - 23 Apr 2003; Michael Fitzpatrick <leahcim@gentoo.org> xfree-4.3.0-r2.ebuild: - Updated patch tarball to v1.1.3. Adds a tdfx patch to prevent a dri hang bug - #19812. Allow X to auto use vc13(+) bug #19844. - - 20 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - xfree-4.3.0-r2.ebuild: - Added TaD's three gentoo themes, changed the default cursor to core. Also, - i18n fonts are built when "nls" is set in USE. and CJK fonts when both - "nls" and "cjk" are set in USE. - - 19 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - xfree-4.3.0-r2.ebuild: - Updated the patch tarball - this time to 1.1.1 -- this contains two more DRI - patches for radeon -- one is Mesa, the other is a reinit patch - - 15 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild: - changed default to core (black) pointer instead of whiteglass, at vlado's - request. The patch version is updated. The previous patchset caused the - compilation to fail on virgin systems (ie, those without X already - installed). Thanks to Bret Towe (Magnade in #gentoo-dev), the problem is - fixed (the parallel make patch was a little wonky). I want to express my - thanks to lu_zero for helping out with the ATi stuff, the lads in #gentoo - and the forums, and the chix0rs in #linuxchics for testing this - extensively and pointing out my mistakes. Please note that for this - ebuild, Xinerama extensions on DRI enabled Radeon displays is disabled. I - will get to try and fixing this (one of the crucial patches for Radeon - users disables this) for the more advanced users. Everyone else -- enjoy! - Also added newest SiS driver. Note that patch version is now 1.1.0 - - 15 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - xfree-4.3.0-r2.ebuild: - moved fc-cache step to be the last font related stuff in postinst -- thanks to - danarmak@gentoo.org <Dan Armak, king of KDE> for the fix - - 14 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - xfree-4.3.0-r2.ebuild: - upgrade to patch 1.0.8, which includes the fix for radeon/rage cards crashing - with kdm logout. bug 94 on xfree's bugzilla has the oneliner patch from - daenzer. The other option, apparently, is to make kdm actually restart x. - Also, the ebuild now builds xfree with xft2 support -- thanks to - foser@gentoo.org - - 13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - xfree-4.3.0-r2.ebuild: - updated the PATCH to 1.0.7 -- the gb-xtt-enc patch (#063) was including header - files from <X11/....> which indicates a need for a current installation of X. - Ashmodai in #gentoo and Rroet in #gentoo-sparc discovered that it wouldn't - compile on a system without X. Thanks to Ashmodai for testing the fix - - 13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - xfree-4.3.0-r2.ebuild: - Added patch 1.0.6 -- the gb stuff is now separated again, and more radeon - patches from daenzer - - 13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild : - - Removed the generating koi8 fonts section thanks to Azarah :). Also, - added patches for radeon: first one that mharris pointed me to (a patch by - daenzer, which fixes an issue with xcursors and xinerama); and a few more - by daenzer that I found in his directory: http://penguinppc.org/~daenzer. - Hopefully, this takes care of the issue where X crashes after logging out - with kdm (using a radeon with drm/glx) - - 12 Apr 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.3.0-r2.ebuild, - files/4.3.0/xfs.start : - Add 'mkfontdirs' target for users that do not use xfs to be able to - regenerate the font dirs. Some small tweaks to the ebuild for corner - cases. - - 11 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild : - - The patch version is now 1.0.5. Some redhat patches were added (the - trivial and notable one is the die-die-die patch, which gets rid of the - ugly initial checkerboard screen when X starts). Also, the gb0830 patches - were combined. In previous tarball versions I had to add patches to undo - duplicate effects. The duplicate and undo patches are removed. - Additionally, related patches have been combined. Next stop -- xfree-drm - - 08 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild, - xfree-4.3.0.ebuild, xfree-4.3.0.ebuild: - many fixes in this ebuild -- using the old keymaps from 4.2 to sort out the - keymap situation. Added patches from Mandrake. Additionally, this uses - Xwrapper so normal X binaries are not installed SUID. Added additional - european fonts and asien fonts, and freetype encodings for X font server. The - next -r version will have the ability to slim down the compile a little bit, - and only install the drivers needed - - 24 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild, - xfree-4.3.0-r1.ebuild : - Update SiS driver to version 210303-1, bug #18069. - - 20 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Unset MAKE_OPTS here as well, closing bug #17102 - - 10 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.3.0-r1.ebuild : - Add back Drobbins's fix that was dropped by mistake. Move DRI patch - to X_PATCHES as this was what its intended for. Remove fc-{cache,list} - from /usr/X11R6/bin. - -*xfree-4.3.0-r1 (09 Mar 2003) - - 20 Mar 2003; Jason Wever <weeve@gentoo.org> xfree-4.3.0-r1.ebuild: - Removed sparc kb patch as it breaks on xfree upgrades. - - 20 Mar 2003; Jason Wever <weeve@gentoo.org> xfree-4.3.0-r1.ebuild, - files/4.3.0-patches/XFree86-4.3.0-gentoo-sparc-kb.patch: - Added XFree86-4.3.0-gentoo-sparc-kb.patch to fix the Ctrl+Alt+FKeys so that - key sequence now works. Patch is applied after install. - - 12 Mar 2003; Zach Welch <zwelch@gentoo.org> xfree-4.3.0-r1.ebuild: - add arm keyword - - 09 Mar 2003; Guy Martin <gmsoft@gentoo.org> xfree-4.3.0-r1.ebuild : - Added ~hppa to keywords. - - 09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r1.ebuild: - added a patch for sparc keyboards from the xfree86 mailing list: - http://www.mail-archive.com/devel%40xfree86.org/msg01156.html - - 09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r1.ebuild: - Luca Barbato <lu_zero@gentoo.org> added some fixes for radeon issues - - 08 Mar 2003; Daniel Robbins <drobbins@gentoo.org> xfree-4.3.0.ebuild: unset - MAKE_OPTS before "emake World," since MAKE_OPTS is an internal XFree86 - Makefile variable. If a user mistakenly defined MAKE_OPTS in /etc/make.conf - (instead of MAKEOPTS,) then the build will silently die. Since this is hard - to track down, I'm adding a preemptive fix to the ebuild. - - 06 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Fix savage driver unpacking in wrong dir, thanks to - roma1390 <roma1390@uosis.mif.vu.lt>, bug #16794. - -*xfree-4.3.0 (27 Feb 2003) - - 15 Mar 2003; Mark Guertin <gerk@gentoo.org> xfree-4.3.0.ebuild: - set ppc in keywords - - 09 Mar 2003; Guy Martin <gmsoft@gentoo.org> xfree-4.3.0.ebuild : - Patched for hppa (thanks to Stephane Wirtel for his help). - Added hppa to keywords. - - 27 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-4.3.0.ebuild files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch : - updated nv patch for 4.3.0 - - 27 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0.ebuild - files/digest-xfree-4.3.0 files/4.3.0 : - - Version bump to newest release. - -*xfree-4.2.99.902 (24 Feb 2003) - - 24 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.99.902.ebuild - files/digest-xfree-4.2.99.902 : - - Version bump to release candidate 3 for X-4.3 - - 23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - - Do not disable DRI for 3dfx cards if resolution higher than 1024x768, - bug #15001. - - 17 Feb 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - - Add unzip to DEPEND, needed by new savage driver. Closes bug #15831. - - 16 Feb 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild, - xfree-4.2.99.4.ebuild : - - Add a patch for HOME and END keys not working in xterm. Should fix bugs - #15254 and #15608. Update savage driver in xfree-4.2.1-r2, fixing bug - #14534. - - 15 Feb 2003; Hannes Mehnert <hannes@gentoo.org> xfree-4.2.99.4.ebuild : - - bumped savage driver to 1.1.27t (prior versions do not work). also added - dep on app-arch/unzip (because 1.1.27t is a .zip) - - 09 Feb 2003; Luca Barbato <lu_zero@gentoo.org> : - - Added some warnings to avoid reports for already known issues. - - 05 Feb 2003; Martin Schlemmer <azarah@gentoo.org> : - - Fix the /usr/lib/X11 symlink to point to the correct ../X11R6/lib/X11. - Some ebuild had this still wrong. This closes bug #15017. - - 04 Feb 2003; Olivier Reisch <doctomoe@gentoo.org> xfree-4.2.99.4.ebuild : - - Temporarily set to -ppc as we had to mask the fontconfig dependency, which - tends to break fonts on ppc unless you recompile everything depending on it. - Still pondering what to do about it :) - - Later, same day, a bit wiser: set back to ~ppc, tell ppl to recompile qt - and kdelibs. - -*xfree-4.2.99.4 (02 Feb 2003) - - 24 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.99.4.ebuild files/4.2.99.4-patches/4.2.99.4-enable-nv-on-ppc.patch : - moved nv-on-ppc patch to proper location - - 23 Feb 2003; Aron Griffis <agriffis@gentoo.org> xfree-4.2.99.4.ebuild : - Fix minor error in the ebuild where "die" could be called from within - a subshell. - - 15 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-4.2.99.4.ebuild : - added patch to enable nv driver on ppc, thanks DarkSpecter. - - 02 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.99.4.ebuild - files/digest-xfree-4.2.99.4 files/4.2.99.4/* files/4.2.99.4-patches/* : - - Updated to newest cvs frozen branch (4_2_99_4) Same patches are still applying - Also, this will be permanently ~arch masked and removed from package mask. - -*xfree-4.2.99.3-r2 (16 Jan 2003) - - 16 Jan 2002; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.99.3-r2.ebuild - files/digest-xfree-4.2.99.3-r2 files/4.2.99.3-r2/* : - - new ebuild for updated snapshot. this seems to be frozen code for the - X_4_2_99_3 branch. - -*xfree-4.2.99.3-r1 (23 Dec 2002) - - 24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild, - xfree-4.2.99.3-r1.ebuild : - - Do not let portage strip binaries and libraries, as then it stips the - DRI modules, which breaks things. Change 4.2.99.3-r1 to compile fontconfig, - but then we just remove all fontconfig related stuff. This should fix things - for Seemant and others. - - 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild, - xfree-4.2.99.3-r1.ebuild : - - Fix bug #12599 (type o in Xsession). - Update trident patches to fix bug #10624 again. - Fix check for $DEBUGBUILD to test for "yes" and not "true", - fixing bug #12572. - - 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.99.3-r1.ebuild : - Some form fixes. Added some patches back in, although I should verify some - of the left out ones. Fix to not build Xft2.0 and fontconfig .. we rather - depend on fontconfig and PDEPEND on x11-libs/xft. Get it to depend on - fixed ttmkfdir. Fix permissons on modules and drivers. Some other things - I forgot. - - 16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Fix /usr/lib/X11 symlink. - - 13 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Update Xrender to that of fontconfig-2.1. Update fontconfig dep to 2.1. - Add glide-v3 to PDEPEND if '3dfx' in USE. - - 09 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Also do not overwrite Xft headers if Xft2.0 are installed. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : - Changed sparc ~sparc keywords. - -*xfree-4.2.1-r2 (05 Dec 2002) - - 06 Apr 2003; Christian Birchinger <joker@gentoo.org> xfree-4.2.1-r2.ebuild: - Changed replace-flags for sparc - - 09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.1-r2.ebuild: - URL fix for SIS driver, thanks to: Ingo <inku@kangaroo.at> in bug #17144 - - 30 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r*.ebuild - Added replace-flags "-mcpu=ultrasparc" "-mcpu=v8" as per bug #14126 - Changed -sparc to sparc - - 15 Jan 2002; Mark Guertin <gerk@gentoo.org> xfree-4.2.1-r2.ebuild : - Removed patch 082 as it was the one breaking keycodes, set ppc in - keywords. See bug #13073 - - 11 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r2.ebuild : - Changed sparc back to -sparc as it breakes keymaps - - 09 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r2.ebuild : - Changed ~sparc to sparc - - 28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - XFree86 do not like CFLAGS="-Os", filter for this, bug #12775. - - 26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Mark stable for x86. - - 26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> 10xfree : - Add CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb in the hopes to fix bug #6862. - - 25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfs.start, xfs.config, - Xsession : - - Changes to xfs.start of xfree-4.2.1-r2: - - Update to that of xfree-4.2.99.3-r1 where we only run fc-cache if - something changed. - Changes to xfs.start of xfree-4.2.1-r2 and xfree-4.2.99.3-r1: - - Replace some code for xfs.start with awk versions to increase speed. - - Fix a bug where it did not drop duplicate font directories. - - Also consider changes to fonts.scale and encodings.dir as reason to - re-index that font directory. - Changes to xfs.config of xfree-4.2.1-r2 and xfree-4.2.99.3-r1: - - Remove a duplicate font directory entry. - Changes to Xsession of xfree-4.2.1-r2 and xfree-4.2.99.3-r1: - - Change the shell to '/bin/bash --login' to at least for xdm fix - the environment problem. - - 05 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : - Basically cleanup 4.2.1-r1. - - Resolve bug #10624 (Updated trident patch). - - Resolve bug #10407 (XFree86 ebuild should include i830 1mb stolen mem patch). - - Resolve bug #10227 (Xfree requires new SiS driver for Asus P4S533-VM - Motherboard). - - Add xfree-4.2.x.-bison.fixes.patch for future bison-1.50 support, resolving - bug #11595. - - 28 Nov 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r1.ebuild : - Do not apply 35_all_4.2.0-tdfx-fix-compiler-warnings.patch.bz2, bug #10507. - - 20 Nov 2002; Martin Schlemmer <azarah@gentoo.org> files/4.2.1-r1/site.def : - Tweak to compile libs (for x86) and glx with -fPIC. - -*xfree-4.2.99.3 (13 Nov 2002) - - 21 Dec 2002; Seemant Kulleen <seemant@gentoo.org> : - updated snapshot again -- sis fixes. andee and lanalyst in #gentoo were - invaluable for this ebuild, which is a lot better than before. Many many - many many many thanks to them :) - - 11 Dec 2002; Seemant Kulleen <seemant@gentoo.org> : - updated snapshot again -- ibm chipset updates, evidently. - - -7 Dec 2002; Seemant Kulleen <seemant@gentoo.org> : - Updated snapshot and newer ft2 - - 15 Nov 2002; Seemant Kulleen <seemant@gentoo.org> - files/4.2.99.3-patches/XFree86-4.2.99.3-no-optimize.patch.bz2 : - Patches one file to not optimise on a gcc-3 system. Submitted by MrGr1m - in #gentoo - - 13 Nov 2002; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.99.3.ebuild - files/digest-xfree-4.2.9.3 : - New X snapshot from 20021113. Not using the FT2 stuff externally, coz it - crashes. - - 7 Nov 2002; Martin Schlemmer <azarah@gentoo.org> startDM.sh : - Source /etc/profile before starting the DM to fix bug #10190. - - 5 Nov 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r1.ebuild : - Fix backspace in xterm not working. This closes bug #10186. - Added patch 108_all_4.2.1-xterm-enable-backspace.patch. - - Fix xterm exiting immediately on PPC. Closes bug #10245. - Also see http://www.geocrawler.com/archives/3/3/2001/9/100/6633199/ - Added patch 109_ppc_4.2.1-xterm-eightBitInput-fix.patch. - - Fix unterminated bracket in xf86.h, closing bug #10271, thanks Gerk! - Added patch 110_all_4.2.1-xf86_h-missing-bracket-fix.patch. - - 4 Nov 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r1.ebuild : - - Do not apply 107_all_4.2.1-gcc32-internal-compiler-error.patch for - gcc-2.95.3, as it cause compile to fail, closing bug #10146. - -*xfree-4.2.1-r1 (3 Nov 2002) - - 22 Jan 2003; Jason Wever <weeve@gentoo.org> xfree-4.2.1-r1.ebuild - Changed ~sparc keyword to -sparc as it introduces keymapping problems - not present in xfree-4.2.1-r0. - - 3 Nov 2002; Martin Schlemmer <azarah@gentoo.org> : - - New version to address major problems we are having with 4.2.1. - Ripped out Xft-1.2 (with fontconfig support), as it causes crashes - with gcc3 at least. Sync patches with Redhat/Mandrake again. I - will try to get behind the problem, but even with an unpatched - Radeon driver, I cannot get DRI to work for the Radeon :( - - 28 Oct 2002; J Robert Ray <jrray@jrray.org> xfree-4.2.1.ebuild : - - Allow unpriviliged user install, non-root fails to overwrite file - with 0444 perms. - - 28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild, - xfs.start : - - Fix ebuild and xfs.start to only generate fonts.scale files if - truetype fonts are present (bug #9714). Optimize xfs.start a bit - for speed. Make xfree depend on ttmkfdir-2.0 rather. Remove - Tahoma font, as a Windows license is needed (bug #9486). - - Fix typeo in pkg_postinst(). - - 26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Do not install zlib includes, as it conflicts with those of the real - zlib package (bug #9470). - - 25 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Update Savage and SIS drivers. Fix my braindead bork with the savage - driver getting the binary and not the source. - - 21 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Update bit that applies Xft quality hack, and also fix patch to apply - against 4.2.1. This closes bug #9383. - - 20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Remove /usr/X11R6/lib/X11/fonts/encodings from /etc/X11/fs/config. - Get the font stuff in pkg_postinst() sane. This should fix bug #9357. - Should also fix bug #9354 if you specify -e option to ttmkfdir. - - Update /etc/init.d/xfs to scan and index font dirs. - - 13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Add ttmkfdir2 to build. This should close bug #6402. - - Add X-TrueType patches from Redhat. - - 12 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Create /tmp/.{ICE,X11}-unix and fix permissions. Also remove stupid - delay if not correct permissions. This should close bug #8281. - - 11 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Update Xrender and Xft (to 1.1). Also now uses fontconfig. - - 30 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Move all the patches to ibiblio. - - 19 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Reimplement patch scheme. Add patch for Sparc PCI domains, should - close bug #7790 (for sparc at least). - - 14 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Do not install libz.a, as it have missing functions .. thanks Dan ! - (bug #4777). - - 10 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - Gcc3 related fixes. - -*xfree-4.2.1 (8 Sep 2002): - - 8 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild : - - New version. Lots of cleanups. Freetype-2.1.2 added. - - Fix security issue with xterms; bug #2618 and #7630. - - Fix compile issues for the tdfx driver. This should fix bug #3735, thanks - to ideas from Ron Simpkin <ron@doobedoobedo.f2s.com> - - Use buildin zlib to fix segfaults, thanks to Brad Laue <brad@brad-x.com>. - This closes bug #4777. - - Integrate MS corefonts the right way (tm), thanks to great work from - Santiago Tabares <santi___@softhome.net>. This should close bug #6980, - and maybe also bug #6968 and #5722. - - Do not update the Wacom driver if kernel version 2.2 is in use. This - should fix bug #4152. - - Update the Savaga driver to try and fix bug #3531. - - 25 Aug 2002; Dan Armak <danarmak@gentoo.org> files/4.2.0-r12/Xsetup_0 : - - Update the kdmrc location logic: look in /usr/kde/*, i.e. in all the - directories that actually exist under /usr/kde, instead of hardcoding a - list of possible locations. - - 12 Aug 2002; Martin Schlemmer <azarah@gentoo.org> : - Add XFree86-imake-tmpdir.patch, which should resolve bug #5736. - - 11 Aug 2002; Martin Schlemmer <azarah@gentoo.org> : - Add XFree86-4.2.0-r128-lockup.patch, which should resolve bug #4518. - - 10 Aug 2002; Mark Guertin <gerk@gentoo.org> : - Added ARCH check to -mmx/-no-mmx gcc 3.2 fix, not used - on ppc (breaks build) - - 8 aug 2002; Bart Verwilst <verwilst@gentoo.org> : - - Fixed gcc 3.x based compilation error (with -mmmx) - - 29 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : - - Fixes for gcc-3.x and also fixes that should resolve bug #5613. - - Update /etc/X11/xinit/xinitrc ($FILESDIR/4.2.0-r12/xinitrc) to point - to the proper place for system wide resources. Bug #5684. - - 17 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : - - Make sure the standard symlinks (/usr/include/X11, etc) will not be removed. - - 15 Jul 2002; Owen Stampflee <owen@gentoo.org> : - - Added PPC to KEYWORDS. - - 7 Jul 2002; Martin Schlemmer <azarah@gentoo.org> xdm.start : - - Resolve bug #4627. - - 6 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : - - Update the gcc-3.1 fix to also work for gcc-3.1.1. - - 26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : - - Add "-fno-merge-constants" to OptimizedCDebugFlags if the gcc in use is - not version 2.95.3. This should resolve bug #4189. - - 25 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : - - Add XFree86-4.2.0-i810_i845_20020524.patch and XFree86-4.2.0-Suse-Updates.patch, - adding Intel 845, and Neomagic XV support among things. Also a lot of fixes - from Suse. The Suse patch is a bit big, but I rather do not want to - change the ebuild since if the patches are missing, things should still - work fine. This should among things resolve bug #3823. - -*xfree-4.2.0-r12 (8 Jun 2002) - - 8 Jun 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r12.ebuild : - - Basically r11, but just new version to make sure we dont have some - of the weird issues in past because of a masked revision being changed - and then unmasked. - -*xfree-4.2.0-r11 (28 May 2002) - - 7 Jun 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : - - Add Nvidia GeForce2Go support; bug #2732. Fix gcc-3.1 compile problem - thanks to Verwilst. - - 6 Jun 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : - - Update grep expression to determine if the "xfs" user exist in - /etc/init.d/xfs; bug #3314. - - 2 Jun 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : - - Some more symlink cleanups. Dont nuke the host.def, just filter our - hardcoded CFLAGS. - - Fix /etc/X11/xdm/Xsession to first run ~/.xsession, rather then the system - default (bug #2731). - - 30 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild, - xfs.start, xfs.conf.d, - xfs.config : - - Fix the xfs port issue in a sane manner ... btw, what happned to the - idea that changes should be added to the Changelog ? - - 29 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : - - Too much coffee, and too little sleep :P Moved libGLU.* to /usr/lib where - it should be. - - 28 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : - - New ebuild that adds lots of fixes and patches. Should fix the Wacom - issues (bug #1632). Added patch for i810 DRI (bug #1870). Add libGLU.so. - Update Xsession to load resources (bug #2731). Update freetype2 used; - didnt make it use the system freetype2, as this could make things - unstable (bug #3082). Fix problems with PPC and mouse scrolling, thanks - to Mark Guertin. - -*xfree-4.2.0-r10 (10 Apr 2002) - - 20 May 2002; Arcady Genkin <agenkin@thpoon.com> - files/4.2.0-r10/xfs.config files/4.2.0-r10/xfs.start : - - Moved the XFS TCP port specification from the startup file into the - config file. - - 12 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r10.ebuild : - - Move opengl-update to its own ebuild for flexibility. Add some 3dfx fixes. - - 16 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org> - xfree-4.2.0-r9.ebuild, ChangeLog : - - Resolves bug 1833 for LFH2.2 (section 4.4) compliant - symlinks. Thanks goes to pst@ican.at - - 15 Apr 2002; Seemant Kulleen <seeamnt@gentoo.org> xfree-4.2.0-r9.ebuild : - - Changed the glide USE flag to 3dfx USE flag instead. - - 7 Apr 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r9.ebuild : - - Fix a stray symlink in /. Also moved libGL.a to /usr/lib/opengl/xfree/lib, as - it caused compile problems for tuxracer, etc. Fixed opengl-update to generate - the /usr/lib/libGLcore.so symlinks for nvidia implementation. - -*xfree-4.2.0-r9 (7 Apr 2002) - - 20 May 2002; Arcady Genkin <agenkin@thpoon.com> - files/4.2.0-r9/xfs.config files/4.2.0-r9/xfs.start : - - Moved the XFS TCP port specification from the startup file into the - config file. - - 7 Apr 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r9.ebuild, - files/4.2.0-r9/opengl-update : - - Update for dynamic libGL switching with nvidia drivers. - - 4 Apr 2002; Seemant Kulleen <seemant@gentoo.org> files/4.2.0-r8/xdm : - - Update to RedHat's xdm configuration for PAM. - - 4 Apr 2002; Seemant Kulleen <seemant@gentoo.org> files/4.2.0-r8/xdm : - - Update to use safer PAM modules. Update courtesy of Sorcerer. - - 24 Mar 2002; Dan Armak <danarmak@gentoo.org> : - - New Xsetup_0 that runs kdmdesktop when appropriate. This means kdm can now - set the background properly. - - 21 Mar 2002; Martin Schlemmer <azarah@gentoo.org> : - - Add gcc-3.x compile patch. Also resolve the mkfontdir issue in - pkg_postinst(), closing bug #996. - -*xfree-4.2.0-r8 (15 Mar 2002) - - 15 Mar 2002; Martin Schlemmer <azarah@gentoo.org> : New release to fix zlib - security issue. - - 06 Mar 2002; Martin Schlemmer <azarah@gentoo.org> : Updated /etc/init.d/xdm - and /etc/X11/startDM.sh to fix startDM.sh being a respawning process when - no DM is running. - -*xfree-4.2.0-r7 (05 Mar 2002) - - 05 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : New release of xfree. - Incorporated Xft quality fixes from http://www.cs.mcgill.ca/~dchest/xfthack/; - added Azarah's startDM.sh script. - - 28 Feb 2002; M.Schlemmer <azarah@gentoo.org> ${FILESDIR}/chooser.sh : - - Actually source /etc/conf.d/basic and /etc/rc.conf. - -*xfree-4.2.0-r6 (24 Feb 2002) - - 24 Feb 2002; M.Schlemmer <azarah@gentoo.org> xfree-4.2.0-r6.ebuild, and co : - - Lots of updates, started before the ChangeLog, so not sure of them all, but - the major ones is here: Added Voodoo3/4/5 support, and fixed the locale - bug #794. - -*xfree-4.2.0-r5 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest deleted file mode 100644 index b876a36a0f6d..000000000000 --- a/x11-base/xfree/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -MD5 309d44b4a112fc3ed009b5db04411f3d ChangeLog 80862 -MD5 a3ea004de1eb2d1597c57c1c55dca8e4 xfree-4.3.0-r8.ebuild 36054 -MD5 bc665363813bc65bf57676ed46f88784 xfree-4.3.0-r7.ebuild 36010 -MD5 3f5571ecf7696e6901d5999a8473714c metadata.xml 226 -MD5 530cb356359e8c56d0b9bb8801f793e8 files/digest-xfree-4.3.0-r7 2002 -MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 -MD5 530cb356359e8c56d0b9bb8801f793e8 files/digest-xfree-4.3.0-r8 2002 -MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331 -MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918 -MD5 e846eae6ddbcd3bd5e4c426c80a5f687 files/4.3.0/startDM.sh 889 -MD5 02f77d9f6ed85a86f2bed64bd8d9eec4 files/4.3.0/xfs.start 7331 -MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731 -MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880 -MD5 1622d5777f1c7f058bd1f1b753636a18 files/4.3.0/xfs.conf.d 781 -MD5 b2e6c7bec437a8c250fedccf9189f23b files/4.3.0/chooser.sh 1566 -MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750 -MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284 -MD5 e84c45b905dcd89a9f1462a88d15aa12 files/4.3.0/xdm.start 2827 -MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380 -MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521 -MD5 3949f8dacfbee7b89290bfbaf5c1446c files/4.3.0/10xfree 183 -MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187 -MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769 -MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777 -MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788 diff --git a/x11-base/xfree/files/4.3.0/10xfree b/x11-base/xfree/files/4.3.0/10xfree deleted file mode 100644 index b47eda85e4f6..000000000000 --- a/x11-base/xfree/files/4.3.0/10xfree +++ /dev/null @@ -1,7 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFOPATH=/usr/X11R6/info -XINITRC=/etc/X11/xinit/xinitrc -CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb diff --git a/x11-base/xfree/files/4.3.0/Sessions/Xsession b/x11-base/xfree/files/4.3.0/Sessions/Xsession deleted file mode 100644 index c86ccee19ff3..000000000000 --- a/x11-base/xfree/files/4.3.0/Sessions/Xsession +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ - -case $# in -1) - case $1 in - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - esac -esac - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# clean up after xbanner -if which freetemp 2> /dev/null ; then - freetemp -fi - -startup=$HOME/.xsession - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -userxkbmap=$HOME/.Xkbmap - -sysresources=/etc/X11/Xresources -sysmodmap=/etc/X11/Xmodmap -sysxkbmap=/etc/X11/Xkbmap - -rh6sysresources=/etc/X11/xinit/Xresources -rh6sysmodmap=/etc/X11/xinit/Xmodmap - - -# merge in defaults -if [ -f "$rh6sysresources" ]; then - xrdb -merge "$rh6sysresources" -fi - -if [ -f "$sysresources" ]; then - xrdb -merge "$sysresources" -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -# merge in keymaps -if [ -f "$sysxkbmap" ]; then - setxkbmap `cat "$sysxkbmap"` - XKB_IN_USE=yes -fi - -if [ -f "$userxkbmap" ]; then - setxkbmap `cat "$userxkbmap"` - XKB_IN_USE=yes -fi - -# -# Eeek, this seems like too much magic here -# -if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then - if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then - xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` - if [ -n "$xkbsymbols" ]; then - setxkbmap -symbols "$xkbsymbols" - XKB_IN_USE=yes - fi - fi -fi - -# xkb and xmodmap don't play nice together -if [ -z "$XKB_IN_USE" ]; then - if [ -f "$rh6sysmodmap" ]; then - xmodmap "$rh6sysmodmap" - fi - - if [ -f "$sysmodmap" ]; then - xmodmap "$sysmodmap" - fi - - if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" - fi -fi - -unset XKB_IN_USE - -if [ -x "$startup" ]; then - exec "$startup" -elif [ -x "$HOME/.Xclients" ]; then - exec "$HOME/.Xclients" -elif [ -x /etc/X11/xinit/Xclients ]; then - exec /etc/X11/xinit/Xclients -elif [ -x /etc/X11/Xclients ]; then - exec /etc/X11/Xclients -else - exec xsm -fi diff --git a/x11-base/xfree/files/4.3.0/XftConfig b/x11-base/xfree/files/4.3.0/XftConfig deleted file mode 100644 index 352757a1ce64..000000000000 --- a/x11-base/xfree/files/4.3.0/XftConfig +++ /dev/null @@ -1,239 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -# Note that each application scans all these directories -# during startup, so you may want to disable some to -# get better speed. - -# Standard XFree86 Type 1 fonts -dir "/usr/X11R6/lib/X11/fonts/Type1" -# TTF fonts -dir "/usr/X11R6/lib/X11/fonts/truetype" -dir "/usr/X11R6/lib/X11/fonts/TrueType" -dir "/usr/X11R6/lib/X11/fonts/TTF" -# User installed fonts -dir "/opt/ttfonts" -# URW fonts -dir "/usr/share/fonts/default/Type1" -# Localized Truetype fonts -dir "/usr/share/fonts/truetype" -dir "/usr/share/fonts/ttf/western" -dir "/usr/share/fonts/ttf/big5" -dir "/usr/share/fonts/ttf/gb2312" -dir "/usr/share/fonts/ttf/japanese" -dir "/usr/share/fonts/ttf/korean" -dir "/usr/share/fonts/ttf/armenian" -dir "/usr/share/fonts/ttf/decoratives" -dir "/usr/share/fonts/ttf/thai" -# don't yet exist, but i hope to include some day a package for them (Pablo) -dir "/usr/share/fonts/ttf/cyrillic" -dir "/usr/share/fonts/ttf/viet" -dir "/usr/share/fonts/ttf/ethiopic" -dir "/usr/share/fonts/ttf/georgian" -dir "/usr/share/fonts/ttf/arabic" -dir "/usr/share/fonts/ttf/hebrew" -dir "/usr/share/fonts/ttf/unicode" -# AbiSuite comes with URW fonts as well -dir "/usr/share/AbiSuite/fonts" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -# Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family =+ "Times New Roman"; -match any family == "Helvetica" edit family =+ "Verdana"; -match any family == "Courier" edit family =+ "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Arial"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; -match any family == "mono" edit family += "Courier"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; - -# modifications from Laurent Culioli -match - any family == "webdings" - edit antialias = false; - encoding += "glyphs-fontspecific"; -match - any family == "wingdings" - edit antialias = false; - encoding += "glyphs-fontspecific"; - -# extra aliases -- pablo - -# a nice default for sans serif (same as used in yudit) -match any family == "sans" edit family =+ "Arial"; -match any family == "sans" edit family =+ "MS Gothic"; -match any family == "sans" edit family =+ "Gulim"; -match any family == "sans" edit family =+ "Baekmuk unigulir"; -match any family == "sans" edit family =+ "Lucida Sans Unicode"; -match any family == "sans" edit family =+ "Tahoma"; -match any family == "sans" edit family =+ "BPG UTF8 M"; -match any family == "sans" edit family =+ "GF Zemen Unicode"; -match any family == "sans" edit family =+ "MS Mincho"; -match any family == "sans" edit family =+ "Pigiarniq"; -match any family == "sans" edit family =+ "Urdu Naqsh Nastalique"; -match any family == "sans" edit family =+ "Ballymun RO"; -# a nice monospaced one -match any family == "mono" edit family =+ "Lucida Console"; -# korean -match any family == "Gulim" edit family =+ "Baekmuk unigulir"; -match any family == "Batang" edit family =+ "Ubatang"; -match any family == "sans" edit family =+ "Gulim"; -match any family == "serif" edit family =+ "Batang"; -match any family == "mono" edit family =+ "Gulim"; -# chinese gb2312 -match any family == "Kaiti" edit family =+ "AR PL KaitiM GB"; -match any family == "Sungti" edit family =+ "AR PL SungtiL GB"; -match any family == "sans" edit family =+ "Sungti"; -match any family == "serif" edit family =+ "Sungti"; -# chinese big5 -match any family == "Kaiti" edit family =+ "AR PL KaitiM Big5"; -match any family == "Mingti" edit family =+ "AR PL Mingti2L Big5"; -match any family == "sans" edit family =+ "Mingti"; -match any family == "serif" edit family =+ "Mingti"; -# thai -match any family == "sans" edit family =+ "Norasi"; -match any family == "serif" edit family =+ "Norasi"; -# armenian -match any family == "Helvetica" edit family =+ "ArmNet Helvetica"; -match any family == "sans" edit family =+ "ArmNet Helvetica"; -match any family == "serif" edit family =+ "ArmNet Helvetica"; -# indic -match any family == "Raghindi" edit family =+ "Raghu"; -match any family == "sans" edit family =+ "Raghindi"; -match any family == "serif" edit family =+ "Raghindi"; - -# -# If the Microsoft Web Fonts are not installed, we have to find a -# replacement -# - -# these come with Sun JDK 1.3 -match any family == "Verdana" edit family =+ "Lucida Sans"; -match any family == "Times New Roman" edit family =+ "Lucida Bright"; -match any family == "Courier New" edit family =+ "Lucida Sans Typewriter"; - -# OpenOffice 6 -match any family == "Verdana" edit family =+ "Lucida Sans Tur"; -match any family == "Times New Roman" edit family =+ "Lucida Bright Tur"; -match any family == "Courier New" edit family =+ "Lucida Sans Typewriter Tur"; - -# ttfonts from RH7 -match any family == "Verdana" edit family =+ "Helmet"; - -# URW fonts -match any family == "Verdana" edit family =+ "Nimbus Sans L"; -match any family == "Times New Roman" edit family =+ "Nimbus Roman No9 L"; -match any family == "Courier New" edit family =+ "Nimbus Mono L"; - -# western fonts -match any family == "Verdana" edit family =+ "Blue Highway"; - -# XFree86 default fonts -match any family == "Verdana" edit family =+ "LuciduxSans"; -match any family == "Times New Roman" edit family =+ "LuciduxSerif"; - - -# last ressort defaults -match any family == "Courier" edit family =+ "mono"; - -match any family == "Helvetica" edit family =+ "sans"; -match any family == "Arial" edit family =+ "sans"; - -match any family == "serif" edit family =+ "sans"; -match any family == "Times" edit family =+ "serif"; - -# Aditions from Danny Tholen - -match - any family == "symbol" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "Standard Symbols L" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "dingbats" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - - -match - any family == "Cursor" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "StarBats" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "StarMath" -edit - antialias = false; - encoding += "glyphs-fontspecific"; diff --git a/x11-base/xfree/files/4.3.0/Xsession b/x11-base/xfree/files/4.3.0/Xsession deleted file mode 100644 index ffeef4c87420..000000000000 --- a/x11-base/xfree/files/4.3.0/Xsession +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash --login -# -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# handle KDM -if [ -n "$1" ]; then - export XSESSION="$1" -fi - -xinitdir=/usr/X11R6/lib/X11/xinit -startup=$HOME/.xsession -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=$xinitdir/.Xresources -sysmodmap=$xinitdir/.Xmodmap - -# First run the system default. Because KDE uses this -# to switch sessions, we MUST first check the system -# default, and then ~/.xsession. If the user Do not -# want this, he should override XSESSION, or at least -# clear it. -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -# If not defined, try the user's ~/.xsession -elif [ -s "$startup" ]; then - - # merge in defaults and keymaps - - if [ -f $sysresources ]; then - xrdb -merge $sysresources - fi - - if [ -f $sysmodmap ]; then - xmodmap $sysmodmap - fi - - if [ -f $userresources ]; then - xrdb -merge $userresources - fi - - if [ -f $usermodmap ]; then - xmodmap $usermodmap - fi - - if [ -x "$startup" ]; then - exec "$startup" - else - exec /bin/sh "$startup" - fi -# Lastly, xsm as failsafe -else - if [ -r "$userresources" ]; then - xrdb -load "$userresources" - fi - exec xsm -fi - diff --git a/x11-base/xfree/files/4.3.0/Xsetup_0 b/x11-base/xfree/files/4.3.0/Xsetup_0 deleted file mode 100644 index 240fe4ce6efd..000000000000 --- a/x11-base/xfree/files/4.3.0/Xsetup_0 +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail - -# get KDEDIR value (only) and run kdmdesktop from there -eval "`grep KDEDIR /etc/profile.env`" -[ -x $KDEDIR/bin/kdmdesktop ] && ${KDEDIR}/bin/kdmdesktop - -# --- Gentoo --- -# create list of sessions for kdm -sessions="SessionTypes=" -for x in `ls /etc/X11/Sessions` -do - sessions="${sessions}${x}," -done -echo sessions: $sessions - -# update all kdmrcs located; tries some pretty much impossible locations -# to make sure we get 'em all -source /etc/make.conf -for dir in /usr/kde/* /usr $KDEDIR $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR -do - - echo "Changing kdmrc in $dir" - cd ${dir}/share/config/kdm || continue - - cp kdmrc kdmrc.orig - sed -e "/SessionTypes=/c\ -${sessions}" kdmrc.orig > kdmrc - rm kdmrc.orig - -done diff --git a/x11-base/xfree/files/4.3.0/chooser.sh b/x11-base/xfree/files/4.3.0/chooser.sh deleted file mode 100644 index cee676a747a5..000000000000 --- a/x11-base/xfree/files/4.3.0/chooser.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/chooser.sh,v 1.4 2004/07/15 01:03:31 agriffis Exp $ -# Author: Martin Schlemmer <azarah@gentoo.org> - -# If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf -if [ -z "${XSESSION}" ] -then - [ -f /etc/conf.d/basic ] && . /etc/conf.d/basic - [ -f /etc/rc.conf ] && . /etc/rc.conf -fi - -# Find a match for $XSESSION in /etc/X11/Sessions -GENTOO_SESSION="" -for x in /etc/X11/Sessions/* -do - if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \ - = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ] - then - GENTOO_SESSION=${x} - break - fi -done - -GENTOO_EXEC="" - -if [ -n "${XSESSION}" ]; then - if [ -f /etc/X11/Sessions/${XSESSION} ]; then - if [ -x /etc/X11/Sessions/${XSESSION} ]; then - GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" - else - GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" - fi - elif [ -n "${GENTOO_SESSION}" ]; then - if [ -x "${GENTOO_SESSION}" ]; then - GENTOO_EXEC="${GENTOO_SESSION}" - else - GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" - fi - else - x="" - y="" - - for x in "${XSESSION}" \ - "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \ - "`echo ${XSESSION} | awk '{ print tolower($1) }'`" - do - # Fall through ... - if [ -x "`which ${x} 2>/dev/null`" ]; then - GENTOO_EXEC="`which ${x} 2>/dev/null`" - break - fi - done - - # If all else fail, run twm - GENTOO_EXEC="/usr/X11R6/bin/twm" - fi -fi - -echo "${GENTOO_EXEC}" - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.0/lib/libGL.la b/x11-base/xfree/files/4.3.0/lib/libGL.la deleted file mode 100644 index 8566b67d4c3d..000000000000 --- a/x11-base/xfree/files/4.3.0/lib/libGL.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.1.2 libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGL. -current=3 -age=2 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib/opengl/xfree/lib' diff --git a/x11-base/xfree/files/4.3.0/lib/libGLU.la b/x11-base/xfree/files/4.3.0/lib/libGLU.la deleted file mode 100644 index 86b6432cf5db..000000000000 --- a/x11-base/xfree/files/4.3.0/lib/libGLU.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGLU.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGLU.so.1' - -# Names of this library. -library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGLU. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/x11-base/xfree/files/4.3.0/lib/libOSMesa.la b/x11-base/xfree/files/4.3.0/lib/libOSMesa.la deleted file mode 100644 index 56a72ed91f02..000000000000 --- a/x11-base/xfree/files/4.3.0/lib/libOSMesa.la +++ /dev/null @@ -1,32 +0,0 @@ -# libOSMesa.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libOSMesa.so.3' - -# Names of this library. -library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libOSMesa. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/X11R6/lib' diff --git a/x11-base/xfree/files/4.3.0/site.def b/x11-base/xfree/files/4.3.0/site.def deleted file mode 100644 index 19dee765442c..000000000000 --- a/x11-base/xfree/files/4.3.0/site.def +++ /dev/null @@ -1,117 +0,0 @@ -/* Use buildin zlib to try and fix segfaults. Bug #4777 */ -#define HasZlib NO -#define HasNCurses YES -#define HasLibCrypt YES -#define HasTk NO -#define HasTcl NO -#define FSUseSyslog YES -#define HasExpat YES - -#define LocalThreads YES -#define ThreadedX YES -#define HasPosixThreads YES -#define HasThreadSafeAPI YES - -#define HasGcc2ForCplusplus YES - -#define BuildXinerama YES -#define BuildXineramaLibrary YES - -/* Do not change, as it can break things like gdm */ -#define SharedLibXau YES -/* Needed for 104_all_4.2.1-fix-shared-libXau-link.v2.patch.bz2 */ - -#define HasFreetype2 YES -#define UseFreetype2 YES -#define Freetype2LibDir /usr/lib -/* #define BuildFreetype2Library YES */ -#define UseFontconfig YES -/* This is currently broken, so we depend on fontconfig, and then - just do not install any fontconfig related files ... */ -/* #define HasFontconfig YES */ - -/* We PDEPEND on Xft2, and link XFree86 only to the static lib, - so that we will not have conflicting files for Xft2 from - x11-base/xfree and x11-libs/xft ... */ -/* #define SharedLibXft NO */ -#define SharedLibXft1 YES - -#define BuildFonts YES -/* #define BuildCyrillicFonts YES */ -#define DefaultCursorTheme whiteglass -#define BuildXF86MiscExt YES -#define BuildXInputExt YES -#define BuildXKB YES -#define BuildDBE YES -#define BuildScreenSaverExt YES -#define BuildRman YES -#define BuildHtmlManPages NO -#define BuildAllSpecsDocs NO -#define BuildSpecsDocs NO - -#define BuildXF86DRI YES -/* #define BuildXF86DRM YES */ -#define HasAgpGart YES -#define BuildGLXLibrary YES -#define BuildGlxExt YES -/* #define GlxUseSGISI YES */ -#define BuildGLULibrary YES -#define SharedLibGLU YES -#define NormalLibGLU YES -#define BuildXvExt YES -#define BuildXF86DGA YES -#define BuildRender YES - -/* Need this to build libs with -fPIC */ -#undef StaticNeedsPicForShared -#undef BuildLibGlxWithoutPIC -#define StaticNeedsPicForShared YES -#define BuildLibGlxWithoutPIC NO - -/* Broken in 4.x */ -#define JoystickSupport NO - -#define DoLoadableServer YES - -#define BuildRECORD YES - -#define UseXserverWrapper YES -#define UseMatroxHal NO - -#define UseConfDirForXkb NO -/* #define UseConfDirForAppDefaults NO */ - -#undef DefaultUserPath -#define DefaultUserPath /usr/local/bin:/bin:/usr/bin -#undef DefaultSystemPath -#define DefaultSystemPath /usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin - -#define AdmDir /var/log -#define LbxproxyDir /etc/X11/lbxproxy -#define ProxyManagerDir /etc/X11/proxymngr -#define ServerConfigDir /etc/X11/xserver -#define XdmDir /etc/X11/xdm -#define XConfigDir /etc/X11 -#define XinitDir /etc/X11/xinit - -/* BOTH XIE and PEX were deprecated in XFree86 4.1.0 and are now obsolete */ -#define BuildPhigs NO -#define BuildPexExt NO -#define BuildPexLib NO -#define BuildXIE NO -#define BuildXIElib NO - -/* required for Lokis Erics Ultimate Solitaire */ -#define UseInternalMalloc NO -#define ForceNormalLib YES -#define SharedLibXxf86vm YES -#define SharedLibXxf86dga YES -#define SharedLibXxf86misc YES -#define SharedLibXv YES - -/* binutils-2.9 */ -#define LinuxBinUtilsMajorVersion 29 -/* glibc-2.2 (6.2 because glibc is considered libc-6) */ -#define LinuxCLibMajorVersion 6 -#define LinuxClibMinorVersion 2 - diff --git a/x11-base/xfree/files/4.3.0/startDM.sh b/x11-base/xfree/files/4.3.0/startDM.sh deleted file mode 100644 index 4392fe855ee6..000000000000 --- a/x11-base/xfree/files/4.3.0/startDM.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/startDM.sh,v 1.4 2004/07/15 01:03:31 agriffis Exp $ -# Author: Martin Schlemmer <azarah@gentoo.org> - -source /etc/init.d/functions.sh - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -source /etc/profile - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -if [ -e ${svcdir}/options/xdm/service ] -then - retval=0 - EXE="`cat ${svcdir}/options/xdm/service`" - - /sbin/start-stop-daemon --start --quiet --exec ${EXE} - retval=$? - wait; sleep 2 - - if [ "${retval}" -ne 0 ] - then - # there was a error running the DM - einfo "ERROR: could not start the Display Manager..." - # make sure we do not have a misbehaving DM - killall -9 ${EXE##*/} - fi -fi - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.0/xdm.pamd b/x11-base/xfree/files/4.3.0/xdm.pamd deleted file mode 100644 index 1d2e081625f1..000000000000 --- a/x11-base/xfree/files/4.3.0/xdm.pamd +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_stack.so service=system-auth -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_stack.so service=system-auth -password required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth -session optional /lib/security/pam_console.so diff --git a/x11-base/xfree/files/4.3.0/xdm.start b/x11-base/xfree/files/4.3.0/xdm.start deleted file mode 100644 index 3847da08436c..000000000000 --- a/x11-base/xfree/files/4.3.0/xdm.start +++ /dev/null @@ -1,112 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xdm.start,v 1.5 2004/07/15 01:03:31 agriffis Exp $ - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) have the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/etc/X11/startDM.sh -# -# and have /etc/X11/startDM.sh start the DM in daemon mode if -# a lock is present (with the info of what DM should be started), -# else just fall through. -# -# How this basically works, is the "a" runlevel is a additional -# runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM.sh will only be -# run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runleve, as was -# done previously. -# -# This script then just calls "tellinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - - -# Start X Font Server before X -depend() { - use xfs hotplug -} - -setup_dm() { - source /etc/profile.env - export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}" - - case "$(echo ${DISPLAYMANAGER} | awk '{ print toupper($1) }')" in - KDM|KDE|KDE2|KDE3) - EXE="$(which kdm)" - ;; - ENTRANCE*) - EXE="$(which entranced)" - ;; - GDM|GNOME) - EXE=/usr/bin/gdm - ;; - WDM) - EXE=/usr/bin/wdm - ;; - *) - EXE=/usr/X11R6/bin/xdm - ;; - esac - - test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm - - SERVICE="${EXE##*/}" -} - -start() { - setup_dm - - ebegin "Setting up ${SERVICE}" - #save the prefered DM - save_options "service" "${EXE}" - #tell init to run /etc/X11/startDM.sh after current - #runlevel is finished (should *not* be in the "boot" - # runlevel). - /sbin/telinit a &>/dev/null - eend 0 -} - -stop() { - local retval=0 - local curvt="$(fgconsole)" - local myexe="$(get_options "service")" - local myservice="${myexe##*/}" - - ebegin "Stopping ${myservice}" - rm -f ${svcdir}/options/xdm/service - - if [ "$(ps -A | grep -e "${myservice}")" ] - then - start-stop-daemon --stop --quiet \ - --exe ${myexe} &>/dev/null - - retval=$? - else - retval=1 - fi - - #switch back to original vt - chvt "${curvt}" &>/dev/null - eend ${retval} "Error stopping ${myservice}." - - return ${retval} -} - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.0/xfs.conf.d b/x11-base/xfree/files/4.3.0/xfs.conf.d deleted file mode 100644 index 8de601cbe78b..000000000000 --- a/x11-base/xfree/files/4.3.0/xfs.conf.d +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xfs.conf.d,v 1.3 2004/07/15 01:03:31 agriffis Exp $ - -# Config file for /etc/init.d/xfs - -# Port for xfs to listen on. Default is set to "-1", meaning -# it will only listen on unix sockets, and not tcp ports. If -# you however want it to listen on tcp, remember to comment -# "nolisten = tcp" in /etc/X11/fs/config. - -XFS_PORT="-1" - - -# If this is set to "yes", then the xfs rc-script will -# scan all the font directories in /etc/X11/fs/config for -# changes, and if any, will add the required files. This -# may take a while on very old boxes, so set it to "no" -# if it takes too long for you. - -SETUP_FONTDIRS="yes" diff --git a/x11-base/xfree/files/4.3.0/xfs.config b/x11-base/xfree/files/4.3.0/xfs.config deleted file mode 100644 index e594a25183eb..000000000000 --- a/x11-base/xfree/files/4.3.0/xfs.config +++ /dev/null @@ -1,53 +0,0 @@ -# -# X Font Server configuration file -# - -# allow a max of 4 clients to connect to this font server -#client-limit = 4 - -# no tcp, use sockets! -no-listen = tcp - -# when a font server reaches its limit, start up a new one -clone-self = on - -# alternate font servers for clients to use -#alternate-servers = foo:7101,bar:7102 - -# where to look for fonts -# Some of these are commented out, i.e. the TrueType and Type1 -# directories in /usr/share, because they aren't forced to be -# installed alongside X. -# -catalogue = /usr/X11R6/lib/X11/fonts/75dpi, - /usr/X11R6/lib/X11/fonts/100dpi, - /usr/X11R6/lib/X11/fonts/misc, - /usr/X11R6/lib/X11/fonts/Type1, - /usr/X11R6/lib/X11/fonts/Speedo, - /usr/X11R6/lib/X11/fonts/CID, - /usr/X11R6/lib/X11/fonts/util, - /usr/X11R6/lib/X11/fonts/local, - /usr/X11R6/lib/X11/fonts/Speedo, - /usr/X11R6/lib/X11/fonts/truetype, - /usr/X11R6/lib/X11/fonts/TTF, - /usr/X11R6/lib/X11/fonts/cyrillic, - /usr/X11R6/lib/X11/fonts/freefont, - /usr/X11R6/lib/X11/fonts/sharefont, - /usr/share/fonts/default/Type1, - /usr/share/fonts/ttf/decoratives, - /usr/share/fonts/ttf/western - -# in 12 points, decipoints -default-point-size = 120 - -# 100 x 100 and 75 x 75 -default-resolutions = 75,75,100,100 - -# how to log errors -use-syslog = on - -# font cache control, specified in KB -cache-hi-mark = 2048 -cache-low-mark = 1433 -cache-balance = 70 - diff --git a/x11-base/xfree/files/4.3.0/xfs.start b/x11-base/xfree/files/4.3.0/xfs.start deleted file mode 100644 index 5ed1dd4d1336..000000000000 --- a/x11-base/xfree/files/4.3.0/xfs.start +++ /dev/null @@ -1,320 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xfs.start,v 1.5 2004/08/02 08:57:41 spyderous Exp $ - -#NB: Config is in /etc/conf.d/xfs - - -opts="${opts} mkfontdirs" - -depend() { - use logger -} - -check_config() { - if [ -z "${XFS_PORT}" ] - then - eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!" - return 1 - fi - return 0 -} - -# Return 0 on change, or 1 on no change, or if dir do not exist -check_changed() { - local x="" - local fontlist="" - - # If the dir do not exist, e - if [ ! -d $1 ] - then - return 1 - fi - - # Create a list of all non known config files in the font dir - fontlist="$(find $1/ -type f -maxdepth 1 | \ - gawk '$0 !~ /fonts\..*$|^.*\.dir$|XftCache/ {print}')" - - if [ ! -f $1/fonts.list ] - then - if [ -n "${fontlist}" ] - then - # No list file exist, so create it and return 0 to add - # this font dir as a candidate for updating... - echo "${fontlist}" > $1/fonts.list - - return 0 - fi - else - local retval=1 - - # All the fonts was removed, so cleanup - if [ -z "${fontlist}" ] - then - for x in $1/fonts.* $1/encodings.dir $1/XftCache - do - if [ -f ${x} ] - then - rm -f ${x} - fi - done - - return 1 - fi - - # Check that no files was added or removed.... - if [ "$(cat $1/fonts.list | md5sum)" != "$(echo "${fontlist}" | md5sum)" ] - then - retval=0 - fi - - # Check that no files was updated.... - if [ "${retval}" -ne 0 ] - then - local changed_list="" - -# It should be more consistant if we consider a change to fonts.scale, or -# encodings.dir files as a need for an update as well ... -# changed_list="$(find $1/ -type f -cnewer $1/fonts.dir | \ -# gawk '$0 !~ /fonts\..*$|^.*\.dir$|XftCache/ {print}')" - changed_list="$(find $1/ -type f -cnewer $1/fonts.dir | \ - gawk '$0 !~ /fonts\.(list|cache-1)$|XftCache/ {print}')" - - if [ -n "${changed_list}" ] - then - retval=0 - fi - fi - - # OK, something changed, so recreate fonts.list and add as candidate - # for updating... - if [ "${retval}" -eq 0 ] - then - echo "${fontlist}" > $1/fonts.list - - return 0 - fi - fi - - return 1 -} - -# This is a function to extract font dirs from -# the xfs config file (/etc/X11/fs/config). -get_fontdir_list() { - [ ! -r /etc/X11/fs/config ] && return 0 - - gawk ' - BEGIN { - - while((getline xfsconf_data < ("/etc/X11/fs/config")) > 0) { - - # Strip any comments - if (xfsconf_data !~ /^[[:space:]]*#/) { - - # Dont bother if its a blank line - if (xfsconf_data == "") continue - - # If we have a line that contain 'catalogue=', we - # should be where the list of font dirs are - if (xfsconf_data ~ /catalogue[[:space:]]*=/) - DO_WRITE = 1 - - # Ok, we got our que, so start - if (DO_WRITE) { - - # Strip and suffixes from the directory lists - sub(/\:[[:alnum:]]*/, "", xfsconf_data) - - # Strip any leading spaces and tabs - sub(/^[[:space:]]*/, "", xfsconf_data) - # Strip the 'catalogue=' part - sub(/catalogue[[:space:]]*=[[:space:]]*/, "", xfsconf_data) - - # The last font dir will not have a ',', so this will - # be the last line we read ... - if (xfsconf_data !~ /,$/) { - - DO_WRITE = 0 - DONE = 1 - } - - # Strip the ending ',' ... - sub(/,$/, "", xfsconf_data) - - # If we have a valid font path, print it - if (xfsconf_data != "") { - - have_dup = 0 - - # Check for duplicates ... - for (x in DIRLIST) - if (DIRLIST[x] == xfsconf_data) { - - have_dup = 1 - break - } - - if (!have_dup) { - print xfsconf_data - DIRLIST[++i] = xfsconf_data - } - } - } - - # No need to continue reading the file ... - if (DONE) break - } - } - - close("/etc/X11/fs/config") - }' - - return 0 -} - -# This is the main beast for setting up the font dirs -setup_font_dirs() { - local x="" - local pending_fontdirs="" - local changed="no" - - umask 022 - - local NEEDED_BIN - local NEEDED_BINS="/usr/X11R6/bin/mkfontdir - /usr/X11R6/bin/mkfontscale - /usr/X11R6/bin/ttmkfdir" - for NEEDED_BIN in ${NEEDED_BINS} - do - if [ ! -x ${NEEDED_BIN} ] - then - ewarn "Could not find the `basename ${NEEDED_BIN}` binary!" - return 0 - fi - done - - if [ ! -d /usr/X11R6/lib/X11/fonts/encodings ] - then - ewarn "Encodings directory are missing!" - ewarn "Please restore /usr/X11R6/lib/X11/fonts/encodings ..." - return 0 - fi - - # Generate the encodings.dir ... - /usr/X11R6/bin/mkfontdir -n \ - -e /usr/X11R6/lib/X11/fonts/encodings \ - -e /usr/X11R6/lib/X11/fonts/encodings/large \ - -- /usr/X11R6/lib/X11/fonts/encodings - - ebegin "Scanning font directories" - for x in $(get_fontdir_list) - do - if test -d ${x} && check_changed ${x} - then - if [ -z "${pending_fontdirs}" ] - then - pending_fontdirs="${x}" - else - pending_fontdirs="${pending_fontdirs} ${x}" - fi - fi - done - eend 0 - - if [ -n "${pending_fontdirs}" ] - then - ebegin "Indexing font directories" - for x in ${pending_fontdirs} - do - ebegin " ${x}" - - # Only generate .scale files if truetype, opentype or type1 - # fonts are present ... - - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale - # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.tt[cf]' -print)" ] - then - /usr/X11R6/bin/ttmkfdir -x 2 \ - -e /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} > /dev/null - - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ] - then - /usr/X11R6/bin/mkfontscale \ - -a /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -- ${x} - fi - - # Now generate fonts.dir files ... - if [ "${x/encodings}" = "${x}" ] - then - /usr/X11R6/bin/mkfontdir \ - -e /usr/X11R6/lib/X11/fonts/encodings \ - -e /usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${x} > /dev/null - fi - - if [ "${x/encodings}" = "${x}" -a -x /usr/X11R6/bin/xftcache ] && \ - [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - # xftcache is broken, but run it anyhow ... - /usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - eend 0 - - changed="yes" - done - fi - - # While we at it, update fontconfig's cache as well - if [ -x /usr/bin/fc-cache -a "${changed}" = "yes" ] - then - ebegin "Updating FC cache" - HOME="/root" /usr/bin/fc-cache -f - eend 0 - fi -} - -mkfontdirs() { - setup_font_dirs -} - -start() { - check_config || return 1 - - if [ "${SETUP_FONTDIRS}" = "yes" ] - then - setup_font_dirs - fi - - ebegin "Starting X Font Server" - if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then - start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ - -- -daemon -config /etc/X11/fs/config \ - -droppriv -user xfs -port ${XFS_PORT} 1>&2 - else - start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ - -- -daemon -config /etc/X11/fs/config \ - -port ${XFS_PORT} 1>&2 - fi - eend $? -} - -stop() { - ebegin "Stopping X Font Server" - start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2 - rm -rf /tmp/.font-unix - eend $? -} - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.0/xinitrc b/x11-base/xfree/files/4.3.0/xinitrc deleted file mode 100644 index 53cde32559d2..000000000000 --- a/x11-base/xfree/files/4.3.0/xinitrc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -xinitdir=/usr/X11R6/lib/X11/xinit -sysresources=$xinitdir/.Xresources -sysmodmap=$xinitdir/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# First try ~/.xinitrc -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" -# If not present, try the system default -elif [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -# Failsafe -else - # start some nice programs - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -fi diff --git a/x11-base/xfree/files/4.3.0/xserver.pamd b/x11-base/xfree/files/4.3.0/xserver.pamd deleted file mode 100644 index 7ff11c4329e2..000000000000 --- a/x11-base/xfree/files/4.3.0/xserver.pamd +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient /lib/security/pam_rootok.so -# Next line you need console ownership to be able to start X -#auth required /lib/security/pam_console.so -auth required /lib/security/pam_permit.so - -account required /lib/security/pam_permit.so diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r7 b/x11-base/xfree/files/digest-xfree-4.3.0-r7 deleted file mode 100644 index c10b2a352243..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r7 +++ /dev/null @@ -1,32 +0,0 @@ -MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622 -MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239 -MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363 -MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 -MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 -MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 -MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 -MD5 af14137626cfb101dc15cc9556ab1ebe XFree86-4.3.0-patches-2.1.25.8.tar.bz2 533131 -MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 4550c4f28637be556e2000676072de32 sis_drv_src_311003-1.tar.gz 419840 -MD5 f89f285c15d39679b9c403f6bbddedef synaptics-0.12.0.tar.bz2 133551 -MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 -MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 -MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811 -MD5 4c7920d4b9d2ff1213faff4d718946d6 XFree86-compose.dir-0.1.bz2 1877 -MD5 aafd74e26c541382bb382ff338f81f87 XFree86-en_US.UTF-8.old.bz2 7068 -MD5 2e2263bb4adaee6f959fbb6c8df5336a XFree86-locale.alias.bz2 3592 -MD5 d4402be729da91e849aa5b9f506bda06 XFree86-locale.dir.bz2 2094 -MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991 -MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384 -MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208 -MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176 -MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008 -MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368 -MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440 -MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288 -MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728 -MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200 -MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992 -MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072 diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r8 b/x11-base/xfree/files/digest-xfree-4.3.0-r8 deleted file mode 100644 index c10b2a352243..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r8 +++ /dev/null @@ -1,32 +0,0 @@ -MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622 -MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239 -MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363 -MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 -MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 -MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 -MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 -MD5 af14137626cfb101dc15cc9556ab1ebe XFree86-4.3.0-patches-2.1.25.8.tar.bz2 533131 -MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 4550c4f28637be556e2000676072de32 sis_drv_src_311003-1.tar.gz 419840 -MD5 f89f285c15d39679b9c403f6bbddedef synaptics-0.12.0.tar.bz2 133551 -MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 -MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 -MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811 -MD5 4c7920d4b9d2ff1213faff4d718946d6 XFree86-compose.dir-0.1.bz2 1877 -MD5 aafd74e26c541382bb382ff338f81f87 XFree86-en_US.UTF-8.old.bz2 7068 -MD5 2e2263bb4adaee6f959fbb6c8df5336a XFree86-locale.alias.bz2 3592 -MD5 d4402be729da91e849aa5b9f506bda06 XFree86-locale.dir.bz2 2094 -MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991 -MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384 -MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208 -MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176 -MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008 -MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368 -MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440 -MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288 -MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728 -MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200 -MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992 -MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072 diff --git a/x11-base/xfree/files/xpm-secfix-thomas.diff b/x11-base/xfree/files/xpm-secfix-thomas.diff deleted file mode 100644 index 035903dd4fe0..000000000000 --- a/x11-base/xfree/files/xpm-secfix-thomas.diff +++ /dev/null @@ -1,1948 +0,0 @@ -Index: extras/Xpm/lib/Attrib.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/Attrib.c,v -retrieving revision 1.2 -diff -u -r1.2 Attrib.c ---- xc/extras/Xpm/lib/Attrib.c 2004/09/01 21:01:32 1.2 -+++ xc/extras/Xpm/lib/Attrib.c 2004/11/01 15:48:58 -@@ -32,13 +32,15 @@ - * Developed by Arnaud Le Hors * - \*****************************************************************************/ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ - LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - --LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -+LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, unsigned int ncolors)); - - /* - * Create a colortable compatible with the old style colortable -@@ -50,9 +52,9 @@ - XpmColor ***oldct; - { - XpmColor **colorTable, **color; -- int a; -+ unsigned int a; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ if (ncolors >= UINT_MAX / sizeof(XpmColor *)) - return XpmNoMemory; - - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); -@@ -69,9 +71,9 @@ - static void - FreeOldColorTable(colorTable, ncolors) - XpmColor **colorTable; -- int ncolors; -+ unsigned int ncolors; - { -- int a, b; -+ unsigned int a, b; - XpmColor **color; - char **sptr; - -@@ -116,7 +118,7 @@ - void - XpmFreeExtensions(extensions, nextensions) - XpmExtension *extensions; -- int nextensions; -+ unsigned int nextensions; - { - unsigned int i, j, nlines; - XpmExtension *ext; -Index: extras/Xpm/lib/CrBufFrI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/CrBufFrI.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 CrBufFrI.c ---- xc/extras/Xpm/lib/CrBufFrI.c 2002/01/19 11:08:43 1.1.1.2 -+++ xc/extras/Xpm/lib/CrBufFrI.c 2004/11/01 15:49:03 -@@ -39,15 +42,17 @@ - unsigned int *used_size, XpmColor *colors, - unsigned int ncolors, unsigned int cpp)); - --LFUNC(WritePixels, void, (char *dataptr, unsigned int *used_size, -+LFUNC(WritePixels, void, (char *dataptr, unsigned int data_size, -+ unsigned int *used_size, - unsigned int width, unsigned int height, - unsigned int cpp, unsigned int *pixels, - XpmColor *colors)); - --LFUNC(WriteExtensions, void, (char *dataptr, unsigned int *used_size, -+LFUNC(WriteExtensions, void, (char *dataptr, unsigned int data_size, -+ unsigned int *used_size, - XpmExtension *ext, unsigned int num)); - --LFUNC(ExtensionsSize, int, (XpmExtension *ext, unsigned int num)); -+LFUNC(ExtensionsSize, unsigned int, (XpmExtension *ext, unsigned int num)); - LFUNC(CommentsSize, int, (XpmInfo *info)); - - int -@@ -90,10 +95,11 @@ - - #undef RETURN - #define RETURN(status) \ -+do \ - { \ - ErrorStatus = status; \ - goto error; \ --} -+}while(0) - - int - XpmCreateBufferFromXpmImage(buffer_return, image, info) -@@ -107,7 +113,7 @@ - unsigned int cmts, extensions, ext_size = 0; - unsigned int l, cmt_size = 0; - char *ptr = NULL, *p; -- unsigned int ptr_size, used_size; -+ unsigned int ptr_size, used_size, tmp; - - *buffer_return = NULL; - -@@ -129,7 +135,13 @@ - #ifdef VOID_SPRINTF - used_size = strlen(buf); - #endif -- ptr_size = used_size + ext_size + cmt_size + 1; -+ ptr_size = used_size + ext_size + cmt_size + 1; /* ptr_size can't be 0 */ -+ if(ptr_size <= used_size || -+ ptr_size <= ext_size || -+ ptr_size <= cmt_size) -+ { -+ return XpmNoMemory; -+ } - ptr = (char *) XpmMalloc(ptr_size); - if (!ptr) - return XpmNoMemory; -@@ -140,7 +152,7 @@ - #ifndef VOID_SPRINTF - used_size += - #endif -- sprintf(ptr + used_size, "/*%s*/\n", info->hints_cmt); -+ snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->hints_cmt); - #ifdef VOID_SPRINTF - used_size += strlen(info->hints_cmt) + 5; - #endif -@@ -158,7 +170,7 @@ - #ifndef VOID_SPRINTF - l += - #endif -- sprintf(buf + l, " %d %d", info->x_hotspot, info->y_hotspot); -+ snprintf(buf + l, sizeof(buf)-l, " %d %d", info->x_hotspot, info->y_hotspot); - #ifdef VOID_SPRINTF - l = strlen(buf); - #endif -@@ -180,6 +192,8 @@ - l = strlen(buf); - #endif - ptr_size += l; -+ if(ptr_size <= l) -+ RETURN(XpmNoMemory); - p = (char *) XpmRealloc(ptr, ptr_size); - if (!p) - RETURN(XpmNoMemory); -@@ -192,7 +206,7 @@ - #ifndef VOID_SPRINTF - used_size += - #endif -- sprintf(ptr + used_size, "/*%s*/\n", info->colors_cmt); -+ snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->colors_cmt); - #ifdef VOID_SPRINTF - used_size += strlen(info->colors_cmt) + 5; - #endif -@@ -208,7 +222,12 @@ - * 4 = 1 (for '"') + 3 (for '",\n') - * 1 = - 2 (because the last line does not end with ',\n') + 3 (for '};\n') - */ -- ptr_size += image->height * (image->width * image->cpp + 4) + 1; -+ if(image->width > UINT_MAX / image->cpp || -+ (tmp = image->width * image->cpp + 4) <= 4 || -+ image->height > UINT_MAX / tmp || -+ (tmp = image->height * tmp + 1) <= 1 || -+ (ptr_size += tmp) <= tmp) -+ RETURN(XpmNoMemory); - - p = (char *) XpmRealloc(ptr, ptr_size); - if (!p) -@@ -220,17 +239,17 @@ - #ifndef VOID_SPRINTF - used_size += - #endif -- sprintf(ptr + used_size, "/*%s*/\n", info->pixels_cmt); -+ snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->pixels_cmt); - #ifdef VOID_SPRINTF - used_size += strlen(info->pixels_cmt) + 5; - #endif - } -- WritePixels(ptr + used_size, &used_size, image->width, image->height, -+ WritePixels(ptr + used_size, ptr_size - used_size, &used_size, image->width, image->height, - image->cpp, image->data, image->colorTable); - - /* print extensions */ - if (extensions) -- WriteExtensions(ptr + used_size, &used_size, -+ WriteExtensions(ptr + used_size, ptr_size-used_size, &used_size, - info->extensions, info->nextensions); - - /* close the array */ -@@ -247,6 +266,7 @@ - return (ErrorStatus); - } - -+ - static int - WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) - char **dataptr; -@@ -256,7 +276,7 @@ - unsigned int ncolors; - unsigned int cpp; - { -- char buf[BUFSIZ]; -+ char buf[BUFSIZ] = {0}; - unsigned int a, key, l; - char *s, *s2; - char **defaults; -@@ -266,6 +286,8 @@ - - defaults = (char **) colors; - s = buf + 1; -+ if(cpp > (sizeof(buf) - (s-buf))) -+ return(XpmNoMemory); - strncpy(s, *defaults++, cpp); - s += cpp; - -@@ -274,14 +296,24 @@ - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2); -+ /* assume C99 compliance */ -+ snprintf(s, sizeof(buf) - (s-buf), "\t%s %s", xpmColorKeys[key - 1], s2); - #ifdef VOID_SPRINTF - s += strlen(s); - #endif -+ /* now let's check if s points out-of-bounds */ -+ if((s-buf) > sizeof(buf)) -+ return(XpmNoMemory); - } - } -+ if(sizeof(buf) - (s-buf) < 4) -+ return(XpmNoMemory); - strcpy(s, "\",\n"); - l = s + 3 - buf; -+ if( *data_size >= UINT_MAX-l || -+ *data_size + l <= *used_size || -+ (*data_size + l - *used_size) <= sizeof(buf)) -+ return(XpmNoMemory); - s = (char *) XpmRealloc(*dataptr, *data_size + l); - if (!s) - return (XpmNoMemory); -@@ -294,8 +326,9 @@ - } - - static void --WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) -+WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors) - char *dataptr; -+ unsigned int data_size; - unsigned int *used_size; - unsigned int width; - unsigned int height; -@@ -306,27 +339,36 @@ - char *s = dataptr; - unsigned int x, y, h; - -+ if(height <= 1) -+ return; -+ - h = height - 1; - for (y = 0; y < h; y++) { - *s++ = '"'; - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp >= (data_size - (s-dataptr))) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* how can we trust *pixels? :-\ */ - s += cpp; - } -+ if((data_size - (s-dataptr)) < 4) -+ return; - strcpy(s, "\",\n"); - s += 3; - } - /* duplicate some code to avoid a test in the loop */ - *s++ = '"'; - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp >= (data_size - (s-dataptr))) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* how can we trust *pixels? */ - s += cpp; - } - *s++ = '"'; - *used_size += s - dataptr; - } - --static int -+static unsigned int - ExtensionsSize(ext, num) - XpmExtension *ext; - unsigned int num; -@@ -335,21 +377,26 @@ - char **line; - - size = 0; -+ if(num == 0) -+ return(0); /* ok? */ - for (x = 0; x < num; x++, ext++) { - /* 11 = 10 (for ',\n"XPMEXT ') + 1 (for '"') */ - size += strlen(ext->name) + 11; -- a = ext->nlines; -+ a = ext->nlines; /* how can we trust ext->nlines to be not out-of-bounds? */ - for (y = 0, line = ext->lines; y < a; y++, line++) - /* 4 = 3 (for ',\n"') + 1 (for '"') */ - size += strlen(*line) + 4; - } - /* 13 is for ',\n"XPMENDEXT"' */ -+ if(size > UINT_MAX - 13) /* unlikely */ -+ return(0); - return size + 13; - } - - static void --WriteExtensions(dataptr, used_size, ext, num) -+WriteExtensions(dataptr, data_size, used_size, ext, num) - char *dataptr; -+ unsigned int data_size; - unsigned int *used_size; - XpmExtension *ext; - unsigned int num; -@@ -362,7 +409,7 @@ - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, ",\n\"XPMEXT %s\"", ext->name); -+ snprintf(s, data_size - (s-dataptr), ",\n\"XPMEXT %s\"", ext->name); - #ifdef VOID_SPRINTF - s += strlen(ext->name) + 11; - #endif -@@ -371,13 +418,13 @@ - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, ",\n\"%s\"", *line); -+ snprintf(s, data_size - (s-dataptr), ",\n\"%s\"", *line); - #ifdef VOID_SPRINTF - s += strlen(*line) + 4; - #endif - } - } -- strcpy(s, ",\n\"XPMENDEXT\""); -+ strncpy(s, ",\n\"XPMENDEXT\"", data_size - (s-dataptr)-1); - *used_size += s - dataptr + 13; - } - -@@ -388,6 +435,7 @@ - int size = 0; - - /* 5 = 2 (for "/_*") + 3 (for "*_/\n") */ -+ /* wrap possible but *very* unlikely */ - if (info->hints_cmt) - size += 5 + strlen(info->hints_cmt); - -Index: extras/Xpm/lib/CrDatFrI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/CrDatFrI.c,v -retrieving revision 1.2 -diff -u -r1.2 CrDatFrI.c ---- xc/extras/Xpm/lib/CrDatFrI.c 2004/09/01 21:01:32 1.2 -+++ xc/extras/Xpm/lib/CrDatFrI.c 2004/11/01 15:49:11 -@@ -33,13 +33,16 @@ - \*****************************************************************************/ - /* $XFree86: xc/extras/Xpm/lib/CrDatFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size, - XpmColor *colors, unsigned int ncolors, - unsigned int cpp)); - --LFUNC(CreatePixels, void, (char **dataptr, unsigned int width, -+LFUNC(CreatePixels, void, (char **dataptr, unsigned int data_size, -+ unsigned int width, - unsigned int height, unsigned int cpp, - unsigned int *pixels, XpmColor *colors)); - -@@ -47,7 +50,8 @@ - unsigned int *ext_size, - unsigned int *ext_nlines)); - --LFUNC(CreateExtensions, void, (char **dataptr, unsigned int offset, -+LFUNC(CreateExtensions, void, (char **dataptr, unsigned int data_size, -+ unsigned int offset, - XpmExtension *ext, unsigned int num, - unsigned int ext_nlines)); - -@@ -88,10 +92,11 @@ - - #undef RETURN - #define RETURN(status) \ -+do \ - { \ - ErrorStatus = status; \ - goto exit; \ --} -+} while(0) - - int - XpmCreateDataFromXpmImage(data_return, image, info) -@@ -122,11 +127,17 @@ - * alloc a temporary array of char pointer for the header section which - * is the hints line + the color table lines - */ -- header_nlines = 1 + image->ncolors; -+ header_nlines = 1 + image->ncolors; /* this may wrap and/or become 0 */ -+ -+ /* 2nd check superfluous if we do not need header_nlines any further */ -+ if(header_nlines <= image->ncolors || -+ header_nlines >= UINT_MAX / sizeof(char *)) -+ return(XpmNoMemory); -+ - header_size = sizeof(char *) * header_nlines; -- if (header_size >= SIZE_MAX / sizeof(char *)) -+ if (header_size >= UINT_MAX / sizeof(char *)) - return (XpmNoMemory); -- header = (char **) XpmCalloc(header_size, sizeof(char *)); -+ header = (char **) XpmCalloc(header_size, sizeof(char *)); /* can we trust image->ncolors */ - if (!header) - return (XpmNoMemory); - -@@ -170,8 +181,22 @@ - - /* now we know the size needed, alloc the data and copy the header lines */ - offset = image->width * image->cpp + 1; -- data_size = header_size + (image->height + ext_nlines) * sizeof(char *) -- + image->height * offset + ext_size; -+ -+ if(offset <= image->width || offset <= image->cpp) -+ RETURN(XpmNoMemory); -+ -+ if( (image->height + ext_nlines) >= UINT_MAX / sizeof(char *)) -+ RETURN(XpmNoMemory); -+ data_size = (image->height + ext_nlines) * sizeof(char *); -+ -+ if (image->height > UINT_MAX / offset || -+ image->height * offset > UINT_MAX - data_size) -+ RETURN(XpmNoMemory); -+ data_size += image->height * offset; -+ -+ if( (header_size + ext_size) >= (UINT_MAX - data_size) ) -+ RETURN(XpmNoMemory); -+ data_size += header_size + ext_size; - - data = (char **) XpmMalloc(data_size); - if (!data) -@@ -179,8 +204,10 @@ - - data_nlines = header_nlines + image->height + ext_nlines; - *data = (char *) (data + data_nlines); -+ -+ /* can header have less elements then n suggests? */ - n = image->ncolors; -- for (l = 0, sptr = data, sptr2 = header; l <= n; l++, sptr++, sptr2++) { -+ for (l = 0, sptr = data, sptr2 = header; l <= n && sptr && sptr2; l++, sptr++, sptr2++) { - strcpy(*sptr, *sptr2); - *(sptr + 1) = *sptr + strlen(*sptr2) + 1; - } -@@ -189,12 +216,13 @@ - data[header_nlines] = (char *) data + header_size - + (image->height + ext_nlines) * sizeof(char *); - -- CreatePixels(data + header_nlines, image->width, image->height, -+ CreatePixels(data + header_nlines, data_size-header_nlines, image->width, image->height, - image->cpp, image->data, image->colorTable); - - /* print extensions */ - if (extensions) -- CreateExtensions(data + header_nlines + image->height - 1, offset, -+ CreateExtensions(data + header_nlines + image->height - 1, -+ data_size - header_nlines - image->height + 1, offset, - info->extensions, info->nextensions, - ext_nlines); - -@@ -225,23 +253,34 @@ - char *s, *s2; - char **defaults; - -+ /* can ncolors be trusted here? */ - for (a = 0; a < ncolors; a++, colors++, dataptr++) { - - defaults = (char **) colors; -+ if(sizeof(buf) <= cpp) -+ return(XpmNoMemory); - strncpy(buf, *defaults++, cpp); - s = buf + cpp; - -+ if(sizeof(buf) <= (s-buf)) -+ return XpmNoMemory; -+ - for (key = 1; key <= NKEYS; key++, defaults++) { - if ((s2 = *defaults)) { - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2); -+ /* assume C99 compliance */ -+ snprintf(s, sizeof(buf)-(s-buf), "\t%s %s", xpmColorKeys[key - 1], s2); - #ifdef VOID_SPRINTF - s += strlen(s); - #endif -+ /* does s point out-of-bounds? */ -+ if(sizeof(buf) < (s-buf)) -+ return XpmNoMemory; - } - } -+ /* what about using strdup()? */ - l = s - buf + 1; - s = (char *) XpmMalloc(l); - if (!s) -@@ -253,8 +292,9 @@ - } - - static void --CreatePixels(dataptr, width, height, cpp, pixels, colors) -+CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors) - char **dataptr; -+ unsigned int data_size; - unsigned int width; - unsigned int height; - unsigned int cpp; -@@ -264,21 +304,38 @@ - char *s; - unsigned int x, y, h, offset; - -+ if(height <= 1) -+ return; -+ - h = height - 1; -+ - offset = width * cpp + 1; -+ -+ if(offset <= width || offset <= cpp) -+ return; -+ -+ /* why trust h? */ - for (y = 0; y < h; y++, dataptr++) { - s = *dataptr; -+ /* why trust width? */ - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp > (data_size - (s - *dataptr))) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* why trust pixel? */ - s += cpp; - } - *s = '\0'; -+ if(offset > data_size) -+ return; - *(dataptr + 1) = *dataptr + offset; - } - /* duplicate some code to avoid a test in the loop */ - s = *dataptr; -+ /* why trust width? */ - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp > data_size - (s - *dataptr)) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* why should we trust *pixel? */ - s += cpp; - } - *s = '\0'; -@@ -311,8 +368,9 @@ - } - - static void --CreateExtensions(dataptr, offset, ext, num, ext_nlines) -+CreateExtensions(dataptr, data_size, offset, ext, num, ext_nlines) - char **dataptr; -+ unsigned int data_size; - unsigned int offset; - XpmExtension *ext; - unsigned int num; -@@ -325,12 +383,12 @@ - dataptr++; - a = 0; - for (x = 0; x < num; x++, ext++) { -- sprintf(*dataptr, "XPMEXT %s", ext->name); -+ snprintf(*dataptr, data_size, "XPMEXT %s", ext->name); - a++; - if (a < ext_nlines) - *(dataptr + 1) = *dataptr + strlen(ext->name) + 8; - dataptr++; -- b = ext->nlines; -+ b = ext->nlines; /* can we trust these values? */ - for (y = 0, line = ext->lines; y < b; y++, line++) { - strcpy(*dataptr, *line); - a++; -Index: extras/Xpm/lib/Imakefile -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/Imakefile,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 Imakefile ---- xc/extras/Xpm/lib/Imakefile 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/Imakefile 2004/11/01 15:49:11 -@@ -104,13 +104,15 @@ - CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \ - CrBufFrP.c CrIFrBuf.c CrPFrDat.c RdFToP.c WrFFrP.c \ - CrDatFrI.c CrIFrDat.c RdFToDat.c WrFFrDat.c \ -- Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c -+ Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c \ -+ s_popen.c - - OBJS = data.o create.o misc.o rgb.o scan.o parse.o hashtab.o \ - CrBufFrI.o CrDatFrP.o CrPFrBuf.o RdFToI.o WrFFrI.o \ - CrBufFrP.o CrIFrBuf.o CrPFrDat.o RdFToP.o WrFFrP.o \ - CrDatFrI.o CrIFrDat.o RdFToDat.o WrFFrDat.o \ -- Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o -+ Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o \ -+ s_popen.o - - INCLUDES = -I. - LINTLIBS = $(LINTXTOLL) $(LINTXLIB) -Index: extras/Xpm/lib/RdFToBuf.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/RdFToBuf.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 RdFToBuf.c ---- xc/extras/Xpm/lib/RdFToBuf.c 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/RdFToBuf.c 2004/11/01 15:49:16 -@@ -37,6 +37,8 @@ - * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <sys/stat.h> - #if !defined(FOR_MSW) && !defined(WIN32) -@@ -58,7 +60,8 @@ - char *filename; - char **buffer_return; - { -- int fd, fcheck, len; -+ int fd, fcheck; -+ off_t len; - char *ptr; - struct stat stats; - FILE *fp; -@@ -82,7 +85,7 @@ - close(fd); - return XpmOpenFailed; - } -- len = (int) stats.st_size; -+ len = stats.st_size; - ptr = (char *) XpmMalloc(len + 1); - if (!ptr) { - fclose(fp); -Index: extras/Xpm/lib/RdFToI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/RdFToI.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 RdFToI.c ---- xc/extras/Xpm/lib/RdFToI.c 2002/01/19 11:08:43 1.1.1.2 -+++ xc/extras/Xpm/lib/RdFToI.c 2004/11/01 15:49:20 -@@ -33,6 +33,8 @@ - \*****************************************************************************/ - /* $XFree86: xc/extras/Xpm/lib/RdFToI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <sys/stat.h> - #if !defined(NO_ZPIPE) && defined(WIN32) -@@ -123,6 +125,12 @@ - /* - * open the given file to be read as an xpmData which is returned. - */ -+#ifndef NO_ZPIPE -+ FILE *s_popen(char *cmd, const char *type); -+#else -+# define s_popen popen -+#endif -+ - static int - OpenReadFile(filename, mdata) - char *filename; -@@ -141,17 +149,21 @@ - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- int len = strlen(filename); -+ size_t len = strlen(filename); -+ -+ if(len == 0 || -+ filename[len-1] == '/') -+ return(XpmOpenFailed); - if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { - mdata->type = XPMPIPE; -- sprintf(buf, "uncompress -c \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "r"))) -+ snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) - return (XpmOpenFailed); - - } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { - mdata->type = XPMPIPE; -- sprintf(buf, "gunzip -qc \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "r"))) -+ snprintf(buf, sizeof(buf), "gunzip -qc \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) - return (XpmOpenFailed); - - } else { -@@ -159,19 +171,19 @@ - if (!(compressfile = (char *) XpmMalloc(len + 4))) - return (XpmNoMemory); - -- sprintf(compressfile, "%s.Z", filename); -+ snprintf(compressfile, len+4, "%s.Z", filename); - if (!stat(compressfile, &status)) { -- sprintf(buf, "uncompress -c \"%s\"", compressfile); -- if (!(mdata->stream.file = popen(buf, "r"))) { -+ snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", compressfile); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) { - XpmFree(compressfile); - return (XpmOpenFailed); - } - mdata->type = XPMPIPE; - } else { -- sprintf(compressfile, "%s.gz", filename); -+ snprintf(compressfile, len+4, "%s.gz", filename); - if (!stat(compressfile, &status)) { -- sprintf(buf, "gunzip -c \"%s\"", compressfile); -- if (!(mdata->stream.file = popen(buf, "r"))) { -+ snprintf(buf, sizeof(buf), "gunzip -c \"%s\"", compressfile); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) { - XpmFree(compressfile); - return (XpmOpenFailed); - } -@@ -217,7 +229,7 @@ - break; - #ifndef NO_ZPIPE - case XPMPIPE: -- pclose(mdata->stream.file); -+ fclose(mdata->stream.file); - break; - #endif - } -Index: extras/Xpm/lib/WrFFrBuf.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/WrFFrBuf.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 WrFFrBuf.c ---- xc/extras/Xpm/lib/WrFFrBuf.c 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/WrFFrBuf.c 2004/11/01 15:49:20 -@@ -32,6 +32,8 @@ - * Developed by Arnaud Le Hors * - \*****************************************************************************/ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - int -@@ -49,7 +51,7 @@ - fcheck = fwrite(buffer, len, 1, fp); - fclose(fp); - if (fcheck != 1) -- return XpmOpenFailed; -+ return XpmOpenFailed; /* maybe use a better return value */ - - return XpmSuccess; - } -Index: extras/Xpm/lib/WrFFrI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/WrFFrI.c,v -retrieving revision 1.2 -diff -u -r1.2 WrFFrI.c ---- xc/extras/Xpm/lib/WrFFrI.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/WrFFrI.c 2004/11/01 15:49:24 -@@ -38,6 +38,8 @@ - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #if !defined(NO_ZPIPE) && defined(WIN32) - # define popen _popen -@@ -98,7 +100,7 @@ - XpmInfo *info; - { - xpmData mdata; -- char *name, *dot, *s, new_name[BUFSIZ]; -+ char *name, *dot, *s, new_name[BUFSIZ] = {0}; - int ErrorStatus; - - /* open file to write */ -@@ -121,7 +123,8 @@ - #endif - /* let's try to make a valid C syntax name */ - if (index(name, '.')) { -- strcpy(new_name, name); -+ strncpy(new_name, name, sizeof(new_name)); -+ new_name[sizeof(new_name)-1] = 0; - /* change '.' to '_' */ - name = s = new_name; - while ((dot = index(s, '.'))) { -@@ -131,7 +134,8 @@ - } - if (index(name, '-')) { - if (name != new_name) { -- strcpy(new_name, name); -+ strncpy(new_name, name, sizeof(new_name)); -+ new_name[sizeof(new_name)-1] = 0; - name = new_name; - } - /* change '-' to '_' */ -@@ -248,7 +252,7 @@ - unsigned int x, y, h; - - h = height - 1; -- if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) - return XpmNoMemory; - p = buf = (char *) XpmMalloc(width * cpp + 3); - if (!buf) -@@ -300,6 +304,11 @@ - /* - * open the given file to be written as an xpmData which is returned - */ -+#ifndef NO_ZPIPE -+ FILE *s_popen(char *cmd, const char *type); -+#else -+# define s_popen popen -+#endif - static int - OpenWriteFile(filename, mdata) - char *filename; -@@ -315,16 +324,23 @@ - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- int len = strlen(filename); -+ size_t len = strlen(filename); -+ -+ if(len == 0 || -+ filename[0] == '/' || -+ strstr(filename, "../") != NULL || -+ filename[len-1] == '/') -+ return(XpmOpenFailed); -+ - if (len > 2 && !strcmp(".Z", filename + (len - 2))) { -- sprintf(buf, "compress > \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "w"))) -+ snprintf(buf, sizeof(buf), "compress > \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "w"))) - return (XpmOpenFailed); - - mdata->type = XPMPIPE; - } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { -- sprintf(buf, "gzip -q > \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "w"))) -+ snprintf(buf, sizeof(buf), "gzip -q > \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "w"))) - return (XpmOpenFailed); - - mdata->type = XPMPIPE; -@@ -355,7 +371,7 @@ - break; - #ifndef NO_ZPIPE - case XPMPIPE: -- pclose(mdata->stream.file); -+ fclose(mdata->stream.file); - break; - #endif - } -Index: extras/Xpm/lib/XpmI.h -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/XpmI.h,v -retrieving revision 1.7 -diff -u -r1.7 XpmI.h ---- xc/extras/Xpm/lib/XpmI.h 2004/09/01 21:01:33 1.7 -+++ xc/extras/Xpm/lib/XpmI.h 2004/11/01 15:49:28 -@@ -49,8 +49,10 @@ - * lets try to solve include files - */ - -+#include <sys/types.h> - #include <stdio.h> - #include <stdlib.h> -+#include <limits.h> - /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ - #ifdef sequent - extern FILE *popen(); -Index: extras/Xpm/lib/create.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.4 -diff -u -r1.4 create.c ---- xc/extras/Xpm/lib/create.c 2004/09/01 21:01:33 1.4 -+++ xc/extras/Xpm/lib/create.c 2004/11/01 15:50:06 -@@ -45,6 +45,8 @@ - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <ctype.h> - -@@ -586,7 +588,7 @@ - */ - } else { - #endif -- int i; -+ unsigned int i; - - #ifndef AMIGA - ncols = visual->map_entries; -@@ -746,12 +748,14 @@ - - - /* function call in case of error */ -+ - #undef RETURN - #define RETURN(status) \ -+do \ - { \ - ErrorStatus = status; \ - goto error; \ --} -+} while(0) - - int - XpmCreateImageFromXpmImage(display, image, -@@ -817,7 +821,7 @@ - - ErrorStatus = XpmSuccess; - -- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -+ if (image->ncolors >= UINT_MAX / sizeof(Pixel)) - return (XpmNoMemory); - - /* malloc pixels index tables */ -@@ -992,9 +996,13 @@ - return (XpmNoMemory); - - #if !defined(FOR_MSW) && !defined(AMIGA) -- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ if (height != 0 && (*image_return)->bytes_per_line >= INT_MAX / height) { -+ XDestroyImage(*image_return); - return XpmNoMemory; -+ } - /* now that bytes_per_line must have been set properly alloc data */ -+ if((*image_return)->bytes_per_line == 0 || height == 0) -+ return XpmNoMemory; - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); - -@@ -1023,7 +1031,7 @@ - LFUNC(_putbits, void, (register char *src, int dstoffset, - register int numbits, register char *dst)); - --LFUNC(_XReverse_Bytes, int, (register unsigned char *bpt, register int nb)); -+LFUNC(_XReverse_Bytes, int, (register unsigned char *bpt, register unsigned int nb)); - - static unsigned char Const _reverse_byte[0x100] = { - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, -@@ -1063,12 +1071,12 @@ - static int - _XReverse_Bytes(bpt, nb) - register unsigned char *bpt; -- register int nb; -+ register unsigned int nb; - { - do { - *bpt = _reverse_byte[*bpt]; - bpt++; -- } while (--nb > 0); -+ } while (--nb > 0); /* is nb user-controled? */ - return 0; - } - -@@ -1207,7 +1215,7 @@ - register char *src; - register char *dst; - register unsigned int *iptr; -- register int x, y, i; -+ register unsigned int x, y, i; - register char *data; - Pixel pixel, px; - int nbytes, depth, ibu, ibpp; -@@ -1217,8 +1225,8 @@ - depth = image->depth; - if (depth == 1) { - ibu = image->bitmap_unit; -- for (y = 0; y < height; y++) -- for (x = 0; x < width; x++, iptr++) { -+ for (y = 0; y < height; y++) /* how can we trust height */ -+ for (x = 0; x < width; x++, iptr++) { /* how can we trust width */ - pixel = pixels[*iptr]; - for (i = 0, px = pixel; i < sizeof(unsigned long); - i++, px >>= 8) -@@ -1293,12 +1301,12 @@ - { - unsigned char *data; - unsigned int *iptr; -- int y; -+ unsigned int y; - Pixel pixel; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - unsigned char *addr; - - data = (unsigned char *) image->data; -@@ -1335,7 +1343,7 @@ - - #else /* WITHOUT_SPEEDUPS */ - -- int bpl = image->bytes_per_line; -+ unsigned int bpl = image->bytes_per_line; - unsigned char *data_ptr, *max_data; - - data = (unsigned char *) image->data; -@@ -1403,11 +1411,11 @@ - { - unsigned char *data; - unsigned int *iptr; -- int y; -+ unsigned int y; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - unsigned char *addr; - - data = (unsigned char *) image->data; -@@ -1431,7 +1439,7 @@ - - Pixel pixel; - -- int bpl = image->bytes_per_line; -+ unsigned int bpl = image->bytes_per_line; - unsigned char *data_ptr, *max_data; - - data = (unsigned char *) image->data; -@@ -1484,11 +1492,11 @@ - { - char *data; - unsigned int *iptr; -- int y; -+ unsigned int y; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - - data = image->data; - iptr = pixelindex; -@@ -1498,7 +1506,7 @@ - - #else /* WITHOUT_SPEEDUPS */ - -- int bpl = image->bytes_per_line; -+ unsigned int bpl = image->bytes_per_line; - char *data_ptr, *max_data; - - data = image->data; -@@ -1533,12 +1541,12 @@ - PutImagePixels(image, width, height, pixelindex, pixels); - else { - unsigned int *iptr; -- int y; -+ unsigned int y; - char *data; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - - data = image->data; - iptr = pixelindex; -@@ -1761,6 +1769,9 @@ - Pixel px; - int nbytes; - -+ if(x < 0 || y < 0) -+ return 0; -+ - for (i=0, px=pixel; i<sizeof(unsigned long); i++, px>>=8) - ((unsigned char *)&pixel)[i] = px; - src = &ximage->data[XYINDEX(x, y, ximage)]; -@@ -1791,7 +1802,10 @@ - register char *dst; - register int i; - Pixel px; -- int nbytes, ibpp; -+ unsigned int nbytes, ibpp; -+ -+ if(x < 0 || y < 0) -+ return 0; - - ibpp = ximage->bits_per_pixel; - if (ximage->depth == 4) -@@ -1825,6 +1839,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; - *((unsigned long *)addr) = pixel; - return 1; -@@ -1840,6 +1857,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; - addr[0] = pixel >> 24; - addr[1] = pixel >> 16; -@@ -1857,6 +1877,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; - addr[3] = pixel >> 24; - addr[2] = pixel >> 16; -@@ -1874,6 +1897,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX16(x, y, ximage)]; - addr[0] = pixel >> 8; - addr[1] = pixel; -@@ -1889,6 +1915,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX16(x, y, ximage)]; - addr[1] = pixel >> 8; - addr[0] = pixel; -@@ -1902,6 +1931,9 @@ - int y; - unsigned long pixel; - { -+ if(x < 0 || y < 0) -+ return 0; -+ - ximage->data[ZINDEX8(x, y, ximage)] = pixel; - return 1; - } -@@ -1913,6 +1945,9 @@ - int y; - unsigned long pixel; - { -+ if(x < 0 || y < 0) -+ return 0; -+ - if (pixel & 1) - ximage->data[ZINDEX1(x, y, ximage)] |= 0x80 >> (x & 7); - else -@@ -1927,6 +1962,9 @@ - int y; - unsigned long pixel; - { -+ if(x < 0 || y < 0) -+ return 0; -+ - if (pixel & 1) - ximage->data[ZINDEX1(x, y, ximage)] |= 1 << (x & 7); - else -@@ -2061,8 +2099,8 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -- if (ncolors >= SIZE_MAX / sizeof(Pixel)) -- return XpmNoMemory; -+ if (ncolors >= UINT_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); - - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) -@@ -2174,7 +2212,7 @@ - * free the hastable - */ - if (ErrorStatus != XpmSuccess) -- RETURN(ErrorStatus) -+ RETURN(ErrorStatus); - else if (USE_HASHTABLE) - xpmHashTableFree(&hashtable); - -@@ -2366,11 +2404,11 @@ - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -- char1 = colorTable[a].string[0]; -+ char1 = (unsigned char) colorTable[a].string[0]; - if (cidx[char1] == NULL) { /* get new memory */ - cidx[char1] = (unsigned short *) - XpmCalloc(256, sizeof(unsigned short)); -Index: extras/Xpm/lib/data.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/data.c,v -retrieving revision 1.2 -diff -u -r1.2 data.c ---- xc/extras/Xpm/lib/data.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/data.c 2004/11/01 15:50:10 -@@ -33,6 +33,8 @@ - \*****************************************************************************/ - /* $XFree86: xc/extras/Xpm/lib/data.c,v 1.4 2002/01/07 19:40:49 dawes Exp $ */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #ifndef CXPMPROG - #if 0 - /* Official version number */ -@@ -262,7 +264,7 @@ - } - Ungetc(data, c, file); - } -- return (n); -+ return (n); /* this returns bytes read + 1 */ - } - - /* -@@ -375,8 +377,9 @@ - { - if (!data->type) - *cmt = NULL; -- else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { -- *cmt = (char *) XpmMalloc(data->CommentLength + 1); -+ else if (data->CommentLength != 0 && data->CommentLength < UINT_MAX - 1) { -+ if( (*cmt = (char *) XpmMalloc(data->CommentLength + 1)) == NULL) -+ return XpmNoMemory; - strncpy(*cmt, data->Comment, data->CommentLength); - (*cmt)[data->CommentLength] = '\0'; - data->CommentLength = 0; -@@ -400,7 +403,7 @@ - xpmParseHeader(data) - xpmData *data; - { -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1] = {0}; - int l, n = 0; - - if (data->type) { -Index: extras/Xpm/lib/hashtab.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/hashtab.c,v -retrieving revision 1.2 -diff -u -r1.2 hashtab.c ---- xc/extras/Xpm/lib/hashtab.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/hashtab.c 2004/11/01 15:50:14 -@@ -138,13 +138,13 @@ - unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; -- int oldSize = size; -+ unsigned int oldSize = size; - - t = atomTable; - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -- if (size >= SIZE_MAX / sizeof(*atomTable)) -+ if (size >= UINT_MAX / sizeof(*atomTable)) - return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) -@@ -206,7 +206,7 @@ - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -- if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ if (table->size >= UINT_MAX / sizeof(*atomTable)) - return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) -Index: extras/Xpm/lib/misc.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/misc.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 misc.c ---- xc/extras/Xpm/lib/misc.c 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/misc.c 2004/11/01 15:50:14 -@@ -44,7 +44,7 @@ - char *s1; - { - char *s2; -- int l = strlen(s1) + 1; -+ size_t l = strlen(s1) + 1; - - if (s2 = (char *) XpmMalloc(l)) - strcpy(s2, s1); -Index: extras/Xpm/lib/parse.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/parse.c,v -retrieving revision 1.2 -diff -u -r1.2 parse.c ---- xc/extras/Xpm/lib/parse.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/parse.c 2004/11/01 15:50:28 -@@ -41,26 +41,28 @@ - * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <ctype.h> - #include <string.h> - - #ifdef HAS_STRLCAT --# define STRLCAT(dst, src, dstsize) { \ -+# define STRLCAT(dst, src, dstsize) do { \ - if (strlcat(dst, src, dstsize) >= (dstsize)) \ -- return (XpmFileInvalid); } --# define STRLCPY(dst, src, dstsize) { \ -+ return (XpmFileInvalid); } while(0) -+# define STRLCPY(dst, src, dstsize) do { \ - if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -- return (XpmFileInvalid); } -+ return (XpmFileInvalid); } while(0) - #else --# define STRLCAT(dst, src, dstsize) { \ -+# define STRLCAT(dst, src, dstsize) do { \ - if ((strlen(dst) + strlen(src)) < (dstsize)) \ - strcat(dst, src); \ -- else return (XpmFileInvalid); } --# define STRLCPY(dst, src, dstsize) { \ -+ else return (XpmFileInvalid); } while(0) -+# define STRLCPY(dst, src, dstsize) do { \ - if (strlen(src) < (dstsize)) \ - strcpy(dst, src); \ -- else return (XpmFileInvalid); } -+ else return (XpmFileInvalid); } while(0) - #endif - - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, -@@ -205,7 +207,7 @@ - char **defaults; - int ErrorStatus; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ if (ncolors >= UINT_MAX / sizeof(XpmColor)) - return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) -@@ -218,7 +220,7 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -+ if (cpp >= UINT_MAX - 1) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -@@ -277,9 +279,9 @@ - return (XpmFileInvalid); - } - if (!lastwaskey) -- STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - lastwaskey = 0; - } - } -@@ -287,7 +289,7 @@ - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- len = strlen(curbuf) + 1; -+ len = strlen(curbuf) + 1; /* integer overflow just theoretically possible */ - s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); -@@ -306,7 +308,7 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -+ if (cpp >= UINT_MAX - 1) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -@@ -351,7 +353,7 @@ - memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ -- if (a < ncolors - 1) -+ if (a < ncolors - 1) /* can we trust ncolors -> leave data's bounds */ - xpmNextString(data); /* get to the next string */ - } - } -@@ -370,11 +372,11 @@ - xpmHashTable *hashtable; - unsigned int **pixels; - { -- unsigned int *iptr, *iptr2; -+ unsigned int *iptr, *iptr2 = NULL; /* found by Egbert Eich */ - unsigned int a, x, y; - -- if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -+ if ((height > 0 && width >= UINT_MAX / height) || -+ width * height >= UINT_MAX / sizeof(unsigned int)) - return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); -@@ -399,8 +401,10 @@ - { - unsigned short colidx[256]; - -- if (ncolors > 256) -+ if (ncolors > 256) { -+ XpmFree(iptr2); /* found by Egbert Eich */ - return (XpmFileInvalid); -+ } - - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) -@@ -427,16 +431,20 @@ - { - - /* free all allocated pointers at all exits */ --#define FREE_CIDX {int f; for (f = 0; f < 256; f++) \ --if (cidx[f]) XpmFree(cidx[f]);} -+#define FREE_CIDX \ -+do \ -+{ \ -+ int f; for (f = 0; f < 256; f++) \ -+ if (cidx[f]) XpmFree(cidx[f]); \ -+} while(0) - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -- char1 = colorTable[a].string[0]; -+ char1 = (unsigned char) colorTable[a].string[0]; - if (cidx[char1] == NULL) { /* get new memory */ - cidx[char1] = (unsigned short *) - XpmCalloc(256, sizeof(unsigned short)); -@@ -480,8 +488,10 @@ - char *s; - char buf[BUFSIZ]; - -- if (cpp >= sizeof(buf)) -+ if (cpp >= sizeof(buf)) { -+ XpmFree(iptr2); /* found by Egbert Eich */ - return (XpmFileInvalid); -+ } - - buf[cpp] = '\0'; - if (USE_HASHTABLE) { -@@ -491,7 +501,7 @@ - xpmNextString(data); - for (x = 0; x < width; x++, iptr++) { - for (a = 0, s = buf; a < cpp; a++, s++) -- *s = xpmGetC(data); -+ *s = xpmGetC(data); /* int assigned to char, not a problem here */ - slot = xpmHashSlot(hashtable, buf); - if (!*slot) { /* no color matches */ - XpmFree(iptr2); -@@ -505,7 +515,7 @@ - xpmNextString(data); - for (x = 0; x < width; x++, iptr++) { - for (a = 0, s = buf; a < cpp; a++, s++) -- *s = xpmGetC(data); -+ *s = xpmGetC(data); /* int assigned to char, not a problem here */ - for (a = 0; a < ncolors; a++) - if (!strcmp(colorTable[a].string, buf)) - break; -@@ -560,7 +570,7 @@ - while (!notstart && notend) { - /* there starts an extension */ - ext = (XpmExtension *) -- XpmRealloc(exts, (num + 1) * sizeof(XpmExtension)); -+ XpmRealloc(exts, (num + 1) * sizeof(XpmExtension)); /* can the loop be forced to iterate often enough to make "(num + 1) * sizeof(XpmExtension)" wrapping? */ - if (!ext) { - XpmFree(string); - XpmFreeExtensions(exts, num); -@@ -597,7 +607,7 @@ - while ((notstart = strncmp("XPMEXT", string, 6)) - && (notend = strncmp("XPMENDEXT", string, 9))) { - sp = (char **) -- XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *)); -+ XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *)); /* can we iterate enough for a wrapping? */ - if (!sp) { - XpmFree(string); - ext->nlines = nlines; -@@ -637,9 +647,9 @@ - /* function call in case of error */ - #undef RETURN - #define RETURN(status) \ --{ \ -+do { \ - goto error; \ --} -+} while(0) - - /* - * This function parses an Xpm file or data and store the found informations -Index: extras/Xpm/lib/s_popen.c -=================================================================== -RCS file: s_popen.c -diff -N s_popen.c ---- /dev/null Sat Aug 30 18:16:59 1997 -+++ xc/extras/Xpm/lib/s_popen.c Mon Nov 1 15:50:32 2004 -@@ -0,0 +1,181 @@ -+/* -+ * Copyright (C) 2004 The X.Org fundation -+ * -+ * 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 fur- -+ * nished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice 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 X CONSORTIUM 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. -+ * -+ * Except as contained in this notice, the name of the X.Org fundation -+ * shall not be used in advertising or otherwise to promote the sale, -+ * use or other dealings in this Software without prior written -+ * authorization from the X.Org fundation. -+ */ -+ -+/* -+** This is a secure but NOT 100% compatible replacement for popen() -+** Note: - don't use pclose() use fclose() for closing the returned -+** filedesc.!!! -+** -+** Known Bugs: - unable to use i/o-redirection like > or < -+** Author: - Thomas Biege <thomas@suse.de> -+** Credits: - Andreas Pfaller <a.pfaller@pop.gun.de> for fixing a SEGV when -+** calling strtok() -+*/ -+ -+#include <sys/types.h> -+#include <sys/wait.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+ -+#define __SEC_POPEN_TOKEN " " -+ -+FILE *s_popen(char *cmd, const char *type) -+{ -+ pid_t pid; -+ int pfd[2]; -+ int rpipe = 0, wpipe = 0, i; -+ char **argv; -+ char *ptr; -+ char *cmdcpy; -+ -+ -+ if(cmd == NULL || cmd == "") -+ return(NULL); -+ -+ if(type[0] != 'r' && type[0] != 'w') -+ return(NULL); -+ -+ if ((cmdcpy = strdup(cmd)) == NULL) -+ return(NULL); -+ -+ argv = NULL; -+ if( (ptr = strtok(cmdcpy, __SEC_POPEN_TOKEN)) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ for(i = 0;; i++) -+ { -+ if( ( argv = (char **) realloc(argv, (i+1) * sizeof(char *)) ) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ if( (*(argv+i) = (char *) malloc((strlen(ptr)+1) * sizeof(char))) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ strcpy(argv[i], ptr); -+ -+ if( (ptr = strtok(NULL, __SEC_POPEN_TOKEN)) == NULL) -+ { -+ if( ( argv = (char **) realloc(argv, (i+2) * sizeof(char *))) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ argv[i+1] = NULL; -+ break; -+ } -+ } -+ -+ -+ if(type[0] == 'r') -+ rpipe = 1; -+ else -+ wpipe = 1; -+ -+ if (pipe(pfd) < 0) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ if((pid = fork()) < 0) -+ { -+ close(pfd[0]); -+ close(pfd[1]); -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ if(pid == 0) /* child */ -+ { -+ if((pid = fork()) < 0) -+ { -+ close(pfd[0]); -+ close(pfd[1]); -+ free(cmdcpy); -+ return(NULL); -+ } -+ if(pid > 0) -+ { -+ exit(0); /* child nr. 1 exits */ -+ } -+ -+ /* child nr. 2 */ -+ if(rpipe) -+ { -+ close(pfd[0]); /* close reading end, we don't need it */ -+ dup2(STDOUT_FILENO, STDERR_FILENO); -+ if (pfd[1] != STDOUT_FILENO) -+ dup2(pfd[1], STDOUT_FILENO); /* redirect stdout to writing end of pipe */ -+ } -+ else -+ { -+ close(pfd[1]); /* close writing end, we don't need it */ -+ if (pfd[0] != STDIN_FILENO) -+ dup2(pfd[0], STDIN_FILENO); /* redirect stdin to reading end of pipe */ -+ } -+ -+ if(strchr(argv[0], '/') == NULL) -+ execvp(argv[0], argv); /* search in $PATH */ -+ else -+ execv(argv[0], argv); -+ -+ close(pfd[0]); -+ close(pfd[1]); -+ free(cmdcpy); -+ return(NULL); /* exec failed.. ooops! */ -+ } -+ else /* parent */ -+ { -+ waitpid(pid, NULL, 0); /* wait for child nr. 1 */ -+ -+ if(rpipe) -+ { -+ close(pfd[1]); -+ free(cmdcpy); -+ return(fdopen(pfd[0], "r")); -+ } -+ else -+ { -+ close(pfd[0]); -+ free(cmdcpy); -+ return(fdopen(pfd[1], "w")); -+ } -+ -+ } -+} -+ -Index: extras/Xpm/lib/scan.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.2 -diff -u -r1.2 scan.c ---- xc/extras/Xpm/lib/scan.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/scan.c 2004/11/01 15:50:44 -@@ -43,6 +43,8 @@ - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - #define MAXPRINTABLE 92 /* number of printable ascii chars -@@ -172,10 +174,10 @@ - /* function call in case of error */ - #undef RETURN - #define RETURN(status) \ --{ \ -+do { \ - ErrorStatus = status; \ - goto error; \ --} -+} while(0) - - /* - * This function scans the given image and stores the found informations in -@@ -233,15 +235,15 @@ - else - cpp = 0; - -- if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -+ if ((height > 0 && width >= UINT_MAX / height) || -+ width * height >= UINT_MAX / sizeof(unsigned int)) - RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -- if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -+ if (pmap.size >= UINT_MAX / sizeof(Pixel)) - RETURN(XpmNoMemory); - - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); -@@ -308,7 +310,7 @@ - * get rgb values and a string of char, and possibly a name for each - * color - */ -- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor)) - RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) -@@ -368,7 +370,7 @@ - - /* first get a character string */ - a = 0; -- if (cpp >= SIZE_MAX - 1) -+ if (cpp >= UINT_MAX - 1) - return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); -@@ -461,7 +463,7 @@ - } - - /* first get character strings and rgb values */ -- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1) - return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) -@@ -619,7 +621,7 @@ - char *dst; - unsigned int *iptr; - char *data; -- int x, y, i; -+ unsigned int x, y, i; - int bits, depth, ibu, ibpp, offset; - unsigned long lbt; - Pixel pixel, px; -@@ -721,7 +723,7 @@ - unsigned char *addr; - unsigned char *data; - unsigned int *iptr; -- int x, y; -+ unsigned int x, y; - unsigned long lbt; - Pixel pixel; - int depth; -@@ -786,7 +788,7 @@ - unsigned char *addr; - unsigned char *data; - unsigned int *iptr; -- int x, y; -+ unsigned int x, y; - unsigned long lbt; - Pixel pixel; - int depth; -@@ -831,7 +833,7 @@ - { - unsigned int *iptr; - unsigned char *data; -- int x, y; -+ unsigned int x, y; - unsigned long lbt; - Pixel pixel; - int depth; -@@ -864,7 +866,7 @@ - storeFuncPtr storeFunc; - { - unsigned int *iptr; -- int x, y; -+ unsigned int x, y; - char *data; - Pixel pixel; - int xoff, yoff, offset, bpl; -@@ -900,11 +902,11 @@ - # else /* AMIGA */ - - #define CLEAN_UP(status) \ --{\ -+do {\ - if (pixels) XpmFree (pixels);\ - if (tmp_img) FreeXImage (tmp_img);\ - return (status);\ --} -+} while(0) - - static int - AGetImagePixels ( -@@ -925,7 +927,7 @@ - - tmp_img = AllocXImage ((((width+15)>>4)<<4), 1, image->rp->BitMap->Depth); - if (tmp_img == NULL) -- CLEAN_UP (XpmNoMemory) -+ CLEAN_UP (XpmNoMemory); - - iptr = pmap->pixelindex; - for (y = 0; y < height; ++y) -@@ -934,11 +936,11 @@ - for (x = 0; x < width; ++x, ++iptr) - { - if ((*storeFunc) (pixels[x], pmap, iptr)) -- CLEAN_UP (XpmNoMemory) -+ CLEAN_UP (XpmNoMemory); - } - } - -- CLEAN_UP (XpmSuccess) -+ CLEAN_UP (XpmSuccess); - } - - #undef CLEAN_UP -Index: extras/Xpm/lib/xpm.h -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/xpm.h,v -retrieving revision 1.1.1.3 -diff -u -r1.1.1.3 xpm.h ---- xc/extras/Xpm/lib/xpm.h 2004/02/13 21:41:55 1.1.1.3 -+++ xc/extras/Xpm/lib/xpm.h 2004/11/01 15:51:02 -@@ -377,7 +377,7 @@ - FUNC(XpmAttributesSize, int, (void)); - FUNC(XpmFreeAttributes, void, (XpmAttributes *attributes)); - FUNC(XpmFreeExtensions, void, (XpmExtension *extensions, -- int nextensions)); -+ unsigned int nextensions)); - - FUNC(XpmFreeXpmImage, void, (XpmImage *image)); - FUNC(XpmFreeXpmInfo, void, (XpmInfo *info)); -Index: lib/Xpm/Imakefile -=================================================================== -RCS file: /cvs/XF4/xc/lib/Xpm/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- xc/lib/Xpm/Imakefile 2004/09/01 21:01:42 1.2 -+++ xc/lib/Xpm/Imakefile 2004/11/01 15:51:02 -@@ -46,12 +46,20 @@ - STRLCATDEF = -DHAS_STRLCAT - #endif - -+#if HasSnprintf -+SNPRINTFDEF = -DHAS_SNPRINTF -+#else -+SNPRINTFDEF = -Dsnprintf=_XpmSnprintf -+SNPRINTFSRCS = snprintf.c -+SNPRINTFOBJS = snprintf.o -+#endif -+ - #if defined(Win32Architecture) - ZPIPEDEF = -DNO_ZPIPE - #endif - - DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) \ -- $(ZPIPEDEF) $(ZFILEDEF) -+ $(SNPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF) - - HEADERS = xpm.h - -@@ -59,13 +67,15 @@ - CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \ - CrBufFrP.c CrIFrBuf.c CrPFrDat.c RdFToP.c WrFFrP.c \ - CrDatFrI.c CrIFrDat.c RdFToDat.c WrFFrDat.c \ -- Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c -+ Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c \ -+ s_popen.c $(SNPRINTFSRCS) - - OBJS = data.o create.o misc.o rgb.o scan.o parse.o hashtab.o \ - CrBufFrI.o CrDatFrP.o CrPFrBuf.o RdFToI.o WrFFrI.o \ - CrBufFrP.o CrIFrBuf.o CrPFrDat.o RdFToP.o WrFFrP.o \ - CrDatFrI.o CrIFrDat.o RdFToDat.o WrFFrDat.o \ -- Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o -+ Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o \ -+ s_popen.o $(SNPRINTFOBJS) - - XPMDIR = $(TOP)/extras/Xpm - XPMLIBDIR = $(TOP)/extras/Xpm/lib -@@ -104,5 +114,10 @@ - LinkSourceFile(RdFToBuf.c,$(XPMLIBDIR)) - LinkSourceFile(WrFFrBuf.c,$(XPMLIBDIR)) - LinkSourceFile(xpm.h,$(XPMLIBDIR)) -+LinkSourceFile(s_popen.c,$(XPMLIBDIR)) -+ -+#if !HasSnprintf -+LinkSourceFile(snprintf.c,$(LIBSRC)/misc) -+#endif - - DependTarget() diff --git a/x11-base/xfree/metadata.xml b/x11-base/xfree/metadata.xml deleted file mode 100644 index 92f09af57f5e..000000000000 --- a/x11-base/xfree/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>X11</herd> -<longdescription>Xfree86: famous and free X server.</longdescription> -</pkgmetadata> diff --git a/x11-base/xfree/xfree-4.3.0-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild deleted file mode 100644 index b1ceb13322aa..000000000000 --- a/x11-base/xfree/xfree-4.3.0-r7.ebuild +++ /dev/null @@ -1,1250 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.15 2004/12/07 03:59:46 spyderous Exp $ - -inherit eutils flag-o-matic toolchain-funcs x11 linux-info - -# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure -# that only we only strip stuff that are safe to strip ... -RESTRICT="nostrip" - -IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk bindist" - -filter-flags "-funroll-loops" - -ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe" - -# Recently there has been a lot of stability problem in Gentoo-land. Many -# things can be the cause to this, but I believe that it is due to gcc3 -# still having issues with optimizations, or with it not filtering bad -# combinations (protecting the user maybe from themselves) yet. -# -# This can clearly be seen in large builds like glibc, where too aggressive -# CFLAGS cause the tests to fail miserbly. -# -# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion -# knows what he is talking about: -# -# People really shouldn't force code-specific options on... It's a -# bad idea. The -march options aren't just to look pretty. They enable -# options that are sensible (and include sse,mmx,3dnow when apropriate). -# -# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If -# you do not like it, comment it, but do not bugreport if you run into -# problems. -# -# <azarah@gentoo.org> (13 Oct 2002) -strip-flags - -# Configure for SYNAPTICS support -if [ "${ARCH}" = "x86" ] -then - if [ -z "${SYNAPTICS}" ] - then - SYNAPTICS="yes" - fi -else - unset SYNAPTICS -fi - -# Are we using a snapshot ? -USE_SNAPSHOT="no" - -PATCH_VER="2.1.25.8" -FT2_VER="2.1.3" -XCUR_VER="0.3.1" -SISDRV_VER="311003-1" -SAVDRV_VER="1.1.27t" -MGADRV_VER="1_3_0beta" -VIADRV_VER="0.1" -SYNDRV_VER="0.12.0" - -BASE_PV="${PV}" -MY_SV="${BASE_PV//\.}" -S="${WORKDIR}/xc" -SYNDIR="${WORKDIR}/synaptics" -SRC_PATH="mirror://xfree/${BASE_PV}/source" -HOMEPAGE="http://www.xfree.org" - -# Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 - http://www.cpbotha.net/files/dri_resume/xfree86-dri-resume-v8.patch" - -X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz - http://www.probo.com/timr/savage-${SAVDRV_VER}.zip - http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz - http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-${SYNDRV_VER}.tar.bz2" -# mirror://gentoo/XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2" -# ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_1_3_0/mga-${MGADRV_VER}.tgz" -# 3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )" -# Updated Wacom driver: http://people.mandrakesoft.com/~flepied/projects/wacom/ -# Latest Savaga drivers: http://www.probo.com/timr/savage40.html -# Latest SIS drivers: http://www.winischhofer.net/ -# Glide headers for compiling the tdfx modules - -# For the MS Core fonts .. -MS_COREFONTS="./andale32.exe ./arial32.exe - ./arialb32.exe ./comic32.exe - ./courie32.exe ./georgi32.exe - ./impact32.exe ./times32.exe - ./trebuc32.exe ./verdan32.exe - ./webdin32.exe" -# ./IELPKTH.CAB" -# Need windows license to use Tahoma font -MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}" - -SRC_URI="${SRC_PATH}/X${MY_SV}src-1.tgz - ${SRC_PATH}/X${MY_SV}src-2.tgz - ${SRC_PATH}/X${MY_SV}src-3.tgz - ${SRC_PATH}/X${MY_SV}src-4.tgz - ${SRC_PATH}/X${MY_SV}src-5.tgz - doc? ( ${SRC_PATH}/X${MY_SV}src-6.tgz - ${SRC_PATH}/X${MY_SV}src-7.tgz )" - -SRC_URI="${SRC_URI} - ${X_PATCHES} - ${X_DRIVERS} - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - mirror://gentoo/eurofonts-X11.tar.bz2 - mirror://gentoo/xfsft-encodings.tar.bz2 - mirror://gentoo/XFree86-compose.dir-0.1.bz2 - mirror://gentoo/XFree86-en_US.UTF-8.old.bz2 - mirror://gentoo/XFree86-locale.alias.bz2 - mirror://gentoo/XFree86-locale.dir.bz2 - mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - truetype? ( !bindist? ( ${MS_FONT_URLS} ) )" - -# http://www.xfree86.org/4.3.0/LICENSE.html -LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2 - bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor - nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 - MIT SGI-B BSD || ( FTL GPL-2 ) MSttfEULA" -SLOT="0" -KEYWORDS="x86 alpha" - -DEPEND=">=sys-apps/portage-2.0.50_pre9 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-${FT2_VER}-r2 - >=media-libs/fontconfig-2.1-r1 - >=x11-base/opengl-update-1.4 - >=x11-misc/ttmkfdir-3.0.4 - >=sys-apps/sed-4 - >=sys-devel/patch-2.5.9 - sys-apps/util-linux - dev-lang/perl - media-libs/libpng - app-arch/unzip - pam? ( >=sys-libs/pam-0.75 ) - truetype? ( !bindist? ( app-arch/cabextract ) ) - !virtual/x11 - !x11-base/xorg-x11 - !x11-libs/xft" - -#RDEPEND="$DEPEND" -# unzip - needed for savage driver (version 1.1.27t) -# x11-libs/xft -- blocked because of interference with xfree's - -PDEPEND="x86? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )" - -PROVIDE="virtual/x11 - virtual/opengl - virtual/glu - virtual/xft" - -DESCRIPTION="XFree86: free X server" - -PATCH_DIR=${WORKDIR}/patch - -pkg_setup() { - # A static build disallows building the SDK. - # See config/xf86.rules. - if use static - then - if use sdk - then - die "The static USE flag is incompatible with the sdk USE flag." - fi - fi -} - -src_unpack() { - - # Unpack source and patches - unpack X${MY_SV}src-{1,2,3,4,5}.tgz - if use doc - then - unpack X${MY_SV}src-{6,7}.tgz - fi - - unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 - - # Unpack TaD's gentoo cursors - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - - # Unpack extra fonts stuff from Mandrake - if use nls - then - unpack gemini-koi8-u.tar.bz2 - fi - unpack eurofonts-X11.tar.bz2 - unpack xfsft-encodings.tar.bz2 - - # Remove bum encoding - rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc - - # Update the Savage Driver - # savage driver 1.1.27t is a .zip and contains a savage directory - # (that's why we have to be in drivers, not in savage subdir). - # Could be USE flag based - - ebegin "Updating Savage driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers - unpack savage-${SAVDRV_VER}.zip > /dev/null - ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ - ${S}/programs/Xserver/hw/xfree86/drivers/savage - cd ${S} - eend 0 - - ebegin "Updating SiS driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers/sis - unpack sis_drv_src_${SISDRV_VER}.tar.gz > /dev/null - ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ - ${S}/programs/Xserver/hw/xfree86/drivers/sis - cd ${S} - eend 0 - - if [ "${SYNAPTICS}" = "yes" ] - then - ebegin "Adding Synaptics touchpad driver" - cd ${WORKDIR} - unpack synaptics-${SYNDRV_VER}.tar.bz2 > /dev/null - eend 0 - fi - cd ${S} - -# ebegin "Adding VIA driver" -# cd ${WORKDIR} -# unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2 -# cd ${S} -# eend 0 - -# ebegin "Updating Matrox HAL driver" -# unpack mga-${MGADRV_VER}.tgz -# touch ${WORKDIR}/mga/HALlib/mgaHALlib.a -# mv ${WORKDIR}/mga/HALlib/mgaHALlib.a \ -# #{S}/programs/Xserver/hw/xfree86/drivers/mga/HALlib -# eend 0 - - if [ "`gcc-version`" = "2.95" ] - then - # Do not apply this patch for gcc-2.95.3, as it cause compile to fail, - # closing bug #10146. - mv -f ${PATCH_DIR}/0138_all_4.2.1-gcc32-internal-compiler-error.patch \ - ${PATCH_DIR}/excluded - - mv -f ${PATCH_DIR}/0260_ia64_4.2.99.1-gcc3.1.patch \ - ${PATCH_DIR}/excluded - fi - - # We dont have an implementation for S/390's yet... - if [ ! "${ARCH}" = "s390" ] - then - mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded - fi - - # 9017 fixes many 64-bit issues with non-PIC libs - # patch 9017 overlaps 9015 and 9016 and is applied instead - if [ "${ARCH}" = "amd64" ] - then - mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded - mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded - fi - - # This was formerly applied if USE=debug, but it causes builds - # to randomly die (spyderous). - mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded - - # This is splite's ia64 patch. Is it necessary, - # now that 0262 is applied? (spyderous) - mv -f ${PATCH_DIR}/0261* ${PATCH_DIR}/excluded - - if use debug - then - mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded - fi -# FIXME: bug #19812, 075 should be deprecated by 076, left as -# TDFX_RISKY for feedback (put in -r3 if no problems) - if use 3dfx && [ "${TDFX_RISKY}" = "yes" ] - then - mv -f ${PATCH_DIR}/5850* ${PATCH_DIR}/excluded - else - mv -f ${PATCH_DIR}/5851* ${PATCH_DIR}/excluded - fi - - if ! use ipv6 - then - mv -f ${PATCH_DIR}/200* ${PATCH_DIR}/excluded - mv -f ${PATCH_DIR}/9921* ${PATCH_DIR}/excluded - else - mv -f ${PATCH_DIR}/9920* ${PATCH_DIR}/excluded - if ! use doc - then - mv -f ${PATCH_DIR}/2001* ${PATCH_DIR}/excluded - fi - fi - - # Various Patches from all over - EPATCH_SUFFIX="patch" epatch ${PATCH_DIR} - - unset EPATCH_EXCLUDE - - # Fix DRI related problems - cd ${S}/programs/Xserver/hw/xfree86/ - epatch ${DISTDIR}/xfree86-dri-resume-v8.patch - - # Update Wacom Driver, hopefully resolving bug #1632 - # The kernel driver should prob also be updated, this can be - # found at: - # - # http://people.mandrakesoft.com/~flepied/projects/wacom/ - # - if ( [ -e "${ROOT}/usr/src/linux" ] && \ - [ ! `kernel_is "2" "2"` ] ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - ebegin "Updating Wacom USB Driver" - gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \ - ${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die - eend 0 - fi - - # Unpack the MS fonts - if use truetype && use !bindist - then - einfo "Unpacking MS Core Fonts..." - mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype - for x in ${MS_COREFONTS} - do - if [ -f ${DISTDIR}/${x} ] - then - einfo " ${x/\.\/}..." - cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die - fi - done - ebegin "Done unpacking Core Fonts"; eend 0 - fi - - ebegin "Setting up config/cf/host.def" - cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die - echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ - >> config/cf/host.def - - # We're using Xwrapper instead -- so that nothing else needs to be - # set uid any more. - echo "#define InstallXserverSetUID NO" >> config/cf/host.def - echo "#define BuildServersOnly NO" >> config/cf/host.def - - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - - if [ "`gcc-version`" != "2.95" ] - then - # Should fix bug #4189. gcc-3.x have problems with -march=pentium4 - # and -march=athlon-tbird - replace-flags "-march=pentium4" "-march=pentium3" - replace-flags "-march=athlon-tbird" "-march=athlon" - - # Without this, modules breaks with gcc3 - if [ "`gcc-version`" = "3.1" ] - then - append-flags "-fno-merge-constants" - append-flags "-fno-merge-constants" - fi - fi - - if ( [ -e "${ROOT}/usr/src/linux" ] && \ - [ ! `kernel_is "2" "2"` ] ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - echo "#define HasLinuxInput YES" >> config/cf/host.def - fi - - # this is needed for ./configure and runtime linking and building not to fall into falsely believing - # that there are some headers and functions for builtin video drivers or font libraries present - - echo "#define CcCmd $(tc-getCC)" >> config/cf/host.def - echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - - if use static - then - echo "#define DoLoadableServer NO" >>config/cf/host.def - fi - - if use debug - then - echo "#define XFree86Devel YES" >> config/cf/host.def - else - echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def - # use less ram .. got this from Spider's makeedit.eclass :) - echo "#define GccWarningOptions -Wno-return-type -w" \ - >> config/cf/host.def - fi - - if use pam - then - # If you want to have optional pam support, do it properly ... - echo "#define HasPam YES" >> config/cf/host.def - echo "#define HasPamMisc YES" >> config/cf/host.def - else - echo "#define HasPam NO" >> config/cf/host.def - echo "#define HasPamMisc NO" >> config/cf/host.def - fi - - if use nls - then - echo "#define XtermWithI18N YES" >> config/cf/host.def - fi - - if [ "${ARCH}" = "x86" ] - then - # optimize Mesa for architecture - if use mmx - then - echo "#define HasMMXSupport YES" >> config/cf/host.def - echo "#define MesaUseMMX YES" >> config/cf/host.def - else - echo "#define HasMMXSupport NO" >> config/cf/host.def - echo "#define MesaUseMMX NO" >> config/cf/host.def - fi - - if use 3dnow - then - echo "#define Has3DNowSupport YES" >> config/cf/host.def - echo "#define MesaUse3DNow YES" >> config/cf/host.def - else - echo "#define Has3DNowSupport NO" >> config/cf/host.def - echo "#define MesaUse3DNow NO" >> config/cf/host.def - fi - if use sse - then - echo "#define HasKatmaiSupport YES" >> config/cf/host.def - echo "#define MesaUseKatmai YES" >> config/cf/host.def - else - echo "#define HasKatmaiSupport NO" >> config/cf/host.def - echo "#define MesaUseKatmai NO" >> config/cf/host.def - fi - - # build with glide3 support? (build the tdfx_dri.o module) - if use 3dfx - then - echo "#define HasGlide3 YES" >> config/cf/host.def - fi - - # Compile the VIA driver -# echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def - fi - - if [ "${ARCH}" = "hppa" ] - then - echo "#define DoLoadableServer NO" >> config/cf/host.def - fi - - if [ "${ARCH}" = "alpha" ] - then - echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ - i740 tdfx cirrus tseng fbdev \ - ati vga v4l glint" >> config/cf/host.def - fi - - if [ "${ARCH}" = "ppc" ] - then - echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ - chips tdfx fbdev ati DevelDrivers vga nv imstt \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def - fi - - if [ "${ARCH}" = "sparc" ] - then - echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers" >> config/cf/host.def - fi - - if [ "${ARCH}" = "amd64" ] - then - # the built-in zlib doesnt build in amd64 because of -fPIC issues - grep -v HasZlib config/cf/host.def > ${T}/host.def - mv ${T}/host.def config/cf/host.def - echo "#define HasZlib YES" >> config/cf/host.def - fi - - if use xml2 - then - echo "#define HasLibxml2 YES" >> config/cf/host.def - fi - - # The definitions for fontconfig - echo "#define UseFontconfig YES" >> config/cf/host.def - echo "#define HasFontconfig YES" >> config/cf/host.def - - # Use the xfree Xft2 lib - echo "#define SharedLibXft YES" >> config/cf/host.def - - # disable docs if doc not in USE - if ! use doc - then - echo "#define BuildLinuxDocText NO" >> config/cf/host.def - echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def - echo "#define BuildLinuxDocPS NO" >> config/cf/host.def - echo "#define BuildSpecsDocs NO" >> config/cf/host.def - fi - - # enable Japanese docs, optionally - if use cjk && use doc - then - echo "#define InstallJapaneseDocs YES" >> config/cf/host.def - fi - - # Native Language Support Fonts - if ! use nls - then - echo "#define BuildCyrillicFonts NO" >> config/cf/host.def - echo "#define BuildArabicFonts NO" >> config/cf/host.def - echo "#define BuildGreekFonts NO" >> config/cf/host.def - echo "#define BuildHebrewFonts NO" >> config/cf/host.def - echo "#define BuildThaiFonts NO" >> config/cf/host.def - - if ! use cjk - then - echo "#define BuildCIDFonts NO" >> config/cf/host.def - echo "#define BuildJapaneseFonts NO" >> config/cf/host.def - echo "#define BuildKoreanFonts NO" >> config/cf/host.def - echo "#define BuildChineseFonts NO" >> config/cf/host.def - fi - fi - - if use ipv6 - then - echo "#define HasIPv6 YES" >> config/cf/host.def - fi - -# # Build with the binary MatroxHAL driver -# echo "#define HaveMatroxHal YES" >> config/cf/host.def -# echo "#define UseMatroxHal YES" >> config/cf/host.def - -# Will uncomment this after kde, qt, and *box ebuilds are alterered to use -# it -# if use xinerama -# then -# echo "#define BuildXinerama YES" >> config/cf/host.def -# echo "#define BuildXineramaLibrary YES" >> config/cf/host.def -# fi - - # End the host.def definitions here - eend 0 - - cd ${S} - bzcat ${DISTDIR}/XFree86-compose.dir-0.1.bz2 > nls/compose.dir - bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias - bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir - bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8 - - if use doc - then - # These are not included anymore as they are obsolete - rm -rf ${S}/doc/hardcopy/{XIE,PEX5} - for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config} - do - if [ -f ${x} ] - then - cp ${x} ${x}.orig - grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x} - rm -f ${x}.orig - fi - done - fi -} - -src_compile() { - - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - - # Compile ucs2any C implementation (patch #9142) - ebegin "Compiling ucs2any C implementation" - cd ${S}/fonts/util - $(tc-getCC) -Wall -o ucs2any ucs2any.c - [ ! -d ../../exports/bin/ ] && mkdir -p ../../exports/bin/ - mv ucs2any ../../exports/bin/ - ls ${S}/exports/bin/ - cd ${S} - eend 0 - - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the - # xfree build will silently die. This is tricky to track down, so I'm - # adding a preemptive fix for this issue by making sure that MAKE_OPTS is - # unset. (drobbins, 08 Mar 2003) - unset MAKE_OPTS - - einfo "Building XFree86..." - cd ${S} - FAST=1 emake World || die - - if use nls - then - cd ${S}/nls - make || die - cd ${S} - fi - - if [ "${SYNAPTICS}" = "yes" ] - then - ebegin "Building Synaptics driver..." - cd ${SYNDIR} - make - eend 0 - fi - -} - -src_install() { - - unset MAKE_OPTS - - einfo "Installing XFree86..." - # gcc3 related fix. Do this during install, so that our - # whole build will not be compiled without mmx instructions. - if [ "`gcc-version`" != "2.95" ] && [ "${ARCH}" = "x86" ] - then - make install DESTDIR=${D} || \ - make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ - CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install DESTDIR=${D} || die - else - make install DESTDIR=${D} || die - fi - - if use sdk - then - einfo "Installing XFree86 SDK..." - make install.sdk DESTDIR=${D} || die - fi - - # We do not want these, so remove them ... - rm -rf ${D}/usr/X11R6/include/fontconfig - rm -f ${D}/usr/X11R6/lib/libfontconfig.* - rm -f ${D}/usr/X11R6/bin/{fontconfig-config,fc-cache,fc-list} - rm -f ${D}/usr/X11R6/man/man3/fontconfig.3x* - rm -rf ${D}/etc/fonts/ - - # This one needs to be in /usr/lib - insinto /usr/lib/pkgconfig - doins ${D}/usr/X11R6/lib/pkgconfig/{xcursor,xft}.pc - # Now remove the invalid xft.pc, and co ... - rm -rf ${D}/usr/X11R6/lib/pkgconfig - - einfo "Installing man pages..." - make install.man DESTDIR=${D} || die - einfo "Compressing man pages..." - prepman /usr/X11R6 - - if use nls - then - cd ${S}/nls - make DESTDIR=${D} install || die - fi - - # Make sure the user running xterm can only write to utmp. - fowners root:utmp /usr/X11R6/bin/xterm - fperms 2755 /usr/X11R6/bin/xterm - - # Fix permissions on locale/common/*.so - for x in ${D}/usr/X11R6/lib/X11/locale/lib/common/*.so* - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # Fix permissions on modules ... - for x in $(find ${D}/usr/X11R6/lib/modules -name '*.o') \ - $(find ${D}/usr/X11R6/lib/modules -name '*.so') - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can - # mess up other things that use xmkmf - ebegin "Fixing lib/X11/config/host.def" - cp ${D}/usr/X11R6/lib/X11/config/host.def ${T} - awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ - ${T}/host.def > ${D}/usr/X11R6/lib/X11/config/host.def - # theoretically, /usr/X11R6/lib/X11/config is a possible candidate for - # config file management. If we find that people really worry about imake - # stuff, we may add it. But for now, we leave the dir unprotected. - eend 0 - - insinto /etc/X11 - # We still use freetype for now ... - doins ${FILESDIR}/${PV}/XftConfig - newins ${FILESDIR}/${PV}/XftConfig XftConfig.new - # This is if we are using Fontconfig only ... - #newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig - dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig - - # Install example config file - newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example - - # Install MS fonts. - if use truetype && use !bindist - then - ebegin "Installing MS Core Fonts" - dodir /usr/X11R6/lib/X11/fonts/truetype - cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype - eend 0 - fi - - # EURO support - ebegin "Euro Support..." - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz - eend 0 - - # Standard symlinks - dodir /usr/{bin,include,lib} - dosym ../X11R6/bin /usr/bin/X11 - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/DPS /usr/include/DPS - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 - dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb - - # Some critical directories - keepdir /var/lib/xdm - dosym ../../../var/lib/xdm /etc/X11/xdm/authdir - - # Remove invalid symlinks - rm -f ${D}/usr/lib/libGL.* - # Create required symlinks - dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so - dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so.1 - dosym libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so - # We move libGLU to /usr/lib now - dosym libGLU.so.1.3 /usr/lib/libMesaGLU.so - - # .la files for libtool support - insinto /usr/X11R6/lib - doins ${FILESDIR}/${PV}/lib/*.la - - # Remove libz.a, as it causes problems (bug #4777) - rm -f ${D}/usr/X11R6/lib/libz.a - # And do not forget the includes (bug #9470) - rm -f ${D}/usr/X11R6/include/{zconf.h,zlib.h} - - # Use the Xwrapper as the X binary - rm -f ${D}/usr/X11R6/bin/X - dosym Xwrapper /usr/X11R6/bin/X - dosym ../../usr/X11R6/bin/XFree86 /etc/X11/X - - # Fix perms - fperms 755 /usr/X11R6/lib/X11/xkb/geometry/sgi - fperms 755 /usr/X11R6/bin/dga - - # Hack from Mandrake (update ours that just created Compose files for - # all locales) - for x in $(find ${D}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) - do - # make empty Compose files for some locales - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - C|microsoft-*|iso8859-*|koi8-*) - if [ ! -f ${x}/Compose ] - then - touch ${x}/Compose - fi - ;; - ja*|ko*|zh*) - if [ -r ${x}/Compose ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Another hack from Mandrake -- to fix dead + space for the us - # international keyboard - for i in ${D}/usr/X11R6/lib/X11/locale/*/Compose - do - sed -i \ - -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ - -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" \ - ${i} - done - - # Yet more Mandrake - ebegin "Encoding files for xfsft font server..." - dodir /usr/X11R6/lib/X11/fonts/encodings - cp -a ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/* \ - ${D}/usr/X11R6/lib/X11/fonts/encodings - - for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc - do - [ -f "${x}" ] && gzip -9 -f ${x} - done - eend 0 - - if use nls - then - ebegin "gemini-koi8 fonts..." - cd ${WORKDIR}/ukr - gunzip *.Z - gzip -9 *.pcf - cd ${S} - cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts - eend 0 - fi - - exeinto /etc/X11 - # new session management script - doexe ${FILESDIR}/${PV}/chooser.sh - # new display manager script - doexe ${FILESDIR}/${PV}/startDM.sh - exeinto /etc/X11/Sessions - for x in ${FILESDIR}/${PV}/Sessions/* - do - [ -f ${x} ] && doexe ${x} - done - insinto /etc/env.d - doins ${FILESDIR}/${PV}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/${PV}/xinitrc - exeinto /etc/X11/xdm - doexe ${FILESDIR}/${PV}/Xsession ${FILESDIR}/${PV}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILESDIR}/${PV}/xfs.config config - - if use pam - then - insinto /etc/pam.d - newins ${FILESDIR}/${PV}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILESDIR}/${PV}/xserver.pamd xserver - fi - - exeinto /etc/init.d - newexe ${FILESDIR}/${PV}/xdm.start xdm - newexe ${FILESDIR}/${PV}/xfs.start xfs - insinto /etc/conf.d - newins ${FILESDIR}/${PV}/xfs.conf.d xfs - - # we want libGLU.so* in /usr/lib - mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib - - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/lib/opengl/xfree/{lib,extensions,include} - local x="" - for x in ${D}/usr/X11R6/lib/libGL.so* \ - ${D}/usr/X11R6/lib/libGL.la \ - ${D}/usr/X11R6/lib/libGL.a \ - ${D}/usr/X11R6/lib/libMesaGL.so - do - if [ -f ${x} -o -L ${x} ] - then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/lib/opengl/xfree/lib - fi - done - for x in ${D}/usr/X11R6/lib/modules/extensions/libglx* - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/lib/opengl/xfree/extensions - fi - done - for x in ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h} - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/lib/opengl/xfree/include - fi - done - eend 0 - - # Make the core cursor the default. People seem not to like whiteglass - # for some reason. - dosed 's:whiteglass:core:' /usr/share/cursors/xfree/default/index.theme - - einfo "Striping binaries and libraries..." - # This bit I got from Redhat ... strip binaries and drivers .. - # NOTE: We do NOT want to strip the drivers, modules or DRI modules! - for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ - grep -v ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p') - do - if [ -f ${x} ] - then - # Dont do the modules ... - if [ "${x/\/usr\/X11R6\/lib\/modules}" = "${x}" ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip ${x} || : - fi - fi - done - # Now do the libraries ... - for x in ${D}/usr/{lib,lib/opengl/xfree/lib}/*.so.* \ - ${D}/usr/X11R6/{lib,lib/X11/locale/lib/common}/*.so.* - do - if [ -f ${x} ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip --strip-debug ${x} || : - fi - done - - # Install TaD's gentoo cursors - insinto /usr/share/cursors/xfree/gentoo/cursors - doins ${WORKDIR}/cursors/gentoo/cursors/* - insinto /usr/share/cursors/xfree/gentoo-blue/cursors - doins ${WORKDIR}/cursors/gentoo-blue/cursors/* - insinto /usr/share/cursors/xfree/gentoo-silver/cursors - doins ${WORKDIR}/cursors/gentoo-silver/cursors/* - - if [ "${SYNAPTICS}" = "yes" ] - then - # Install Synaptics touchpad driver and docs - insinto /usr/X11R6/lib/modules/input - doins ${SYNDIR}/synaptics_drv.o - exeinto /usr/X11R6/bin - doexe ${SYNDIR}/synclient - docinto synaptics - dodoc ${SYNDIR}/{COMPATIBILITY,FEATURES,FILES,INSTALL,INSTALL.DE,LICENSE,NEWS,PARAMETER,TODO,VERSION} - fi -} - -pkg_preinst() { - - # These changed from a directory/file to a symlink and reverse - if [ ! -L ${ROOT}/usr/X11R6/lib/X11/XftConfig ] && \ - [ -f ${ROOT}/usr/X11R6/lib/X11/XftConfig ] - then - rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig - fi - - if [ -L ${ROOT}/etc/X11/app-defaults ] - then - rm -f ${ROOT}/etc/X11/app-defaults - fi - - if [ ! -L ${ROOT}/usr/X11R6/lib/X11/app-defaults ] && \ - [ -d ${ROOT}/usr/X11R6/lib/X11/app-defaults ] - then - if [ ! -d ${ROOT}/etc/X11/app-defaults ] - then - mkdir -p ${ROOT}/etc/X11/app-defaults - fi - - mv -f ${ROOT}/usr/X11R6/lib/X11/app-defaults ${ROOT}/etc/X11 - fi - - if [ -L ${ROOT}/usr/X11R6/lib/X11/xkb ] - then - rm -f ${ROOT}/usr/X11R6/lib/X11/xkb - fi - - if [ ! -L ${ROOT}/etc/X11/xkb ] && \ - [ -d ${ROOT}/etc/X11/xkb ] - then - if [ ! -d ${ROOT}/usr/X11R6/lib/X11/xkb ] - then - mkdir -p ${ROOT}/usr/X11R6/lib/X11 - fi - - mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11 - fi - - # clean the dinamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d ${ROOT}/usr/lib/opengl/xfree ] - then - rm -rf ${ROOT}/usr/lib/opengl/xfree/* - fi - - # clean out old fonts.* and encodings.dir files, as we - # will regenerate them - local G_FONTDIR - # Not Speedo or CID, as their fonts.scale files are "real" - local G_FONTDIRS="100dpi 75dpi TTF Type1 encodings local misc util" - for G_FONTDIR in ${G_FONTDIRS} - do - find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ - -exec rm -f {} \; - find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \ - -exec rm -f {} \; - done - - # make sure we do not have any stale files lying round - # that could break things. - rm -f ${ROOT}/usr/X11R6/lib/libGL* -} - -update_XftConfig() { - - if [ "${ROOT}" = "/" ] - then - local CHECK1="f901d29ec6e3cbb0a5b0fd5cbdd9ff33" - local CHECK2="$(md5sum ${ROOT}/etc/X11/XftConfig | cut -d ' ' -f1)" - - if [ "${CHECK1}" = "${CHECK2}" ] - then - echo - ewarn "Due to an invalid /etc/X11/XftConfig from x11-base/xfree-4.2.1," - ewarn "/etc/X11/XftConfig is being updated automatically. Your old" - ewarn "version of /etc/X11/XftConfig will be backed up as:" - ewarn - ewarn " ${ROOT}etc/X11/XftConfig.bak" - echo - - cp -a ${ROOT}/etc/X11/XftConfig \ - ${ROOT}/etc/X11/XftConfig.bak - mv -f ${ROOT}/etc/X11/XftConfig.new \ - ${ROOT}/etc/X11/XftConfig - rm -f ${ROOT}/etc/X11/._cfg????_XftConfig - else - rm -f ${ROOT}/etc/X11/XftConfig.new - fi - fi -} - - -pkg_postinst() { - - env-update - - if [ "${ROOT}" = "/" ] - then - local x="" - - umask 022 - - # This one cause ttmkfdir to segfault :/ - #rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz - - # ******************************************************************** - # A note about fonts and needed files: - # - # 1) Create /usr/X11R6/lib/X11/fonts/encodings/encodings.dir - # - # 2) Create font.scale for TrueType fonts (need to do this before - # we create fonts.dir files, else fonts.dir files will be - # invalid for TrueType fonts...) - # - # 3) Now Generate fonts.dir files. - # - # CID fonts is a bit more involved, but as we do not install any, - # thus I am not going to bother. - # - # <azarah@gentoo.org> (20 Oct 2002) - # - # ******************************************************************** - - ebegin "Generating encodings.dir..." - # Create the encodings.dir in /usr/X11R6/lib/X11/fonts/encodings - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir -n \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings - eend 0 - - if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] - then - ebegin "Creating fonts.scale files..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate .scale files if truetype, opentype or type1 - # fonts are present ... - - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale - # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.tt[cf]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontscale \ - -a ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -- ${x} - fi - done - eend 0 - fi - - ebegin "Generating fonts.dir files..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - if [ "${x/encodings}" = "${x}" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating Xft Cache..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate XftCache files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - done - eend 0 - - ebegin "Fixing permissions..." - find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \ - -exec chmod 0644 {} \; - eend 0 - - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [ -x ${ROOT}/usr/bin/fc-cache ] - then - ebegin "Creating FC font cache..." - HOME="/root" ${ROOT}/usr/bin/fc-cache - eend 0 - fi - - # Switch to the xfree implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo; ${ROOT}/usr/sbin/opengl-update --use-old xfree - fi - - for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) - do - # Remove old compose files we might have created incorrectly - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - ja*|ko*|zh*) - if [ -r "${x}/Compose" ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Update /etc/X11/XftConfig if its the one from Xft1.2, as its - # invalid for Xft1.1 .... - # NOTE: This should not be needed for xfree-4.2.99 or later, - # but lets not take chances with people that may downgrade - # at a later stage .... - update_XftConfig - - # These need to be owned by root and the correct permissions - # (bug #8281) - for x in ${ROOT}/tmp/.{ICE,X11}-unix - do - if [ ! -d ${x} ] - then - mkdir -p ${x} - fi - - chown root:root ${x} - chmod 1777 ${x} - done - - if use 3dfx - then - echo - einfo "If using a 3DFX card, and you had \"3dfx\" in your USE flags," - einfo "please merge media-libs/glide-v3 if you have not done so yet" - einfo "by doing:" - einfo - einfo " # emerge media-libs/glide-v3" - echo - fi - echo - ewarn "BEWARE 1:" - ewarn "This version of XFree won't work with ati-drivers-2.5.1-r1" - ewarn "if you are using them please unmerge ati-drivers" - ewarn " and emerge xfree-drm" - echo - ewarn "BEWARE 2:" - ewarn "If you experience font corruption on OpenOffice.org or similar" - ewarn "glitches please remake your XF86Config" - echo - - einfo "Please note that the xcursors are in /usr/share/cursors/xfree" - einfo "Any custom cursor sets should be placed in that directory" - einfo "This is different from the previous versions of 4.3 and" - einfo "the 4.2.99 series." - einfo - ewarn "New in this release: if you wish to set system-wide default" - ewarn "cursors, please set them in /usr/local/share/cursors/xfree" - ewarn "so that future emerges will not overwrite those settings" - einfo - einfo "To use the Synaptics touchpad driver, check the installed" - einfo "documentation in /usr/share/doc/xfree, as well as" - einfo "http://tuxmobil.org/touchpad_driver.html and" - einfo "http://w1.894.telia.com/~u89404340/touchpad/." - einfo - ewarn "Listening on tcp is disabled by default with startx." - ewarn "To enable it, edit /usr/X11R6/bin/startx." -} - -pkg_postrm() { - - # Fix problematic links - if [ -x ${ROOT}/usr/X11R6/bin/XFree86 ] - then - ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11 - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 - fi -} diff --git a/x11-base/xfree/xfree-4.3.0-r8.ebuild b/x11-base/xfree/xfree-4.3.0-r8.ebuild deleted file mode 100644 index 3c723b3bceca..000000000000 --- a/x11-base/xfree/xfree-4.3.0-r8.ebuild +++ /dev/null @@ -1,1253 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r8.ebuild,v 1.3 2004/12/07 03:59:46 spyderous Exp $ - -inherit eutils flag-o-matic toolchain-funcs x11 linux-info - -# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure -# that only we only strip stuff that are safe to strip ... -RESTRICT="nostrip" - -IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk bindist" - -filter-flags "-funroll-loops" - -ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe" - -# Recently there has been a lot of stability problem in Gentoo-land. Many -# things can be the cause to this, but I believe that it is due to gcc3 -# still having issues with optimizations, or with it not filtering bad -# combinations (protecting the user maybe from themselves) yet. -# -# This can clearly be seen in large builds like glibc, where too aggressive -# CFLAGS cause the tests to fail miserbly. -# -# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion -# knows what he is talking about: -# -# People really shouldn't force code-specific options on... It's a -# bad idea. The -march options aren't just to look pretty. They enable -# options that are sensible (and include sse,mmx,3dnow when apropriate). -# -# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If -# you do not like it, comment it, but do not bugreport if you run into -# problems. -# -# <azarah@gentoo.org> (13 Oct 2002) -strip-flags - -# Configure for SYNAPTICS support -if [ "${ARCH}" = "x86" ] -then - if [ -z "${SYNAPTICS}" ] - then - SYNAPTICS="yes" - fi -else - unset SYNAPTICS -fi - -# Are we using a snapshot ? -USE_SNAPSHOT="no" - -PATCH_VER="2.1.25.8" -FT2_VER="2.1.3" -XCUR_VER="0.3.1" -SISDRV_VER="311003-1" -SAVDRV_VER="1.1.27t" -MGADRV_VER="1_3_0beta" -VIADRV_VER="0.1" -SYNDRV_VER="0.12.0" - -BASE_PV="${PV}" -MY_SV="${BASE_PV//\.}" -S="${WORKDIR}/xc" -SYNDIR="${WORKDIR}/synaptics" -SRC_PATH="mirror://xfree/${BASE_PV}/source" -HOMEPAGE="http://www.xfree.org" - -# Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 - http://www.cpbotha.net/files/dri_resume/xfree86-dri-resume-v8.patch" - -X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz - http://www.probo.com/timr/savage-${SAVDRV_VER}.zip - http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz - http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-${SYNDRV_VER}.tar.bz2" -# mirror://gentoo/XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2" -# ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_1_3_0/mga-${MGADRV_VER}.tgz" -# 3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )" -# Updated Wacom driver: http://people.mandrakesoft.com/~flepied/projects/wacom/ -# Latest Savaga drivers: http://www.probo.com/timr/savage40.html -# Latest SIS drivers: http://www.winischhofer.net/ -# Glide headers for compiling the tdfx modules - -# For the MS Core fonts .. -MS_COREFONTS="./andale32.exe ./arial32.exe - ./arialb32.exe ./comic32.exe - ./courie32.exe ./georgi32.exe - ./impact32.exe ./times32.exe - ./trebuc32.exe ./verdan32.exe - ./webdin32.exe" -# ./IELPKTH.CAB" -# Need windows license to use Tahoma font -MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}" - -SRC_URI="${SRC_PATH}/X${MY_SV}src-1.tgz - ${SRC_PATH}/X${MY_SV}src-2.tgz - ${SRC_PATH}/X${MY_SV}src-3.tgz - ${SRC_PATH}/X${MY_SV}src-4.tgz - ${SRC_PATH}/X${MY_SV}src-5.tgz - doc? ( ${SRC_PATH}/X${MY_SV}src-6.tgz - ${SRC_PATH}/X${MY_SV}src-7.tgz )" - -SRC_URI="${SRC_URI} - ${X_PATCHES} - ${X_DRIVERS} - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - mirror://gentoo/eurofonts-X11.tar.bz2 - mirror://gentoo/xfsft-encodings.tar.bz2 - mirror://gentoo/XFree86-compose.dir-0.1.bz2 - mirror://gentoo/XFree86-en_US.UTF-8.old.bz2 - mirror://gentoo/XFree86-locale.alias.bz2 - mirror://gentoo/XFree86-locale.dir.bz2 - mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - truetype? ( !bindist? ( ${MS_FONT_URLS} ) )" - -# http://www.xfree86.org/4.3.0/LICENSE.html -LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2 - bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor - nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 - MIT SGI-B BSD || ( FTL GPL-2 ) MSttfEULA" -SLOT="0" -KEYWORDS="x86 alpha" - -DEPEND=">=sys-apps/portage-2.0.50_pre9 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-${FT2_VER}-r2 - >=media-libs/fontconfig-2.1-r1 - >=x11-base/opengl-update-1.4 - >=x11-misc/ttmkfdir-3.0.4 - >=sys-apps/sed-4 - >=sys-devel/patch-2.5.9 - sys-apps/util-linux - dev-lang/perl - media-libs/libpng - app-arch/unzip - pam? ( >=sys-libs/pam-0.75 ) - truetype? ( !bindist? ( app-arch/cabextract ) ) - !virtual/x11 - !x11-base/xorg-x11 - !x11-libs/xft" - -#RDEPEND="$DEPEND" -# unzip - needed for savage driver (version 1.1.27t) -# x11-libs/xft -- blocked because of interference with xfree's - -PDEPEND="x86? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )" - -PROVIDE="virtual/x11 - virtual/opengl - virtual/glu - virtual/xft" - -DESCRIPTION="XFree86: free X server" - -PATCH_DIR=${WORKDIR}/patch - -pkg_setup() { - # A static build disallows building the SDK. - # See config/xf86.rules. - if use static - then - if use sdk - then - die "The static USE flag is incompatible with the sdk USE flag." - fi - fi - -} - -src_unpack() { - - # Unpack source and patches - unpack X${MY_SV}src-{1,2,3,4,5}.tgz - if use doc - then - unpack X${MY_SV}src-{6,7}.tgz - fi - - unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 - - # Unpack TaD's gentoo cursors - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - - # Unpack extra fonts stuff from Mandrake - if use nls - then - unpack gemini-koi8-u.tar.bz2 - fi - unpack eurofonts-X11.tar.bz2 - unpack xfsft-encodings.tar.bz2 - - # Remove bum encoding - rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc - - # Update the Savage Driver - # savage driver 1.1.27t is a .zip and contains a savage directory - # (that's why we have to be in drivers, not in savage subdir). - # Could be USE flag based - - ebegin "Updating Savage driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers - unpack savage-${SAVDRV_VER}.zip > /dev/null - ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ - ${S}/programs/Xserver/hw/xfree86/drivers/savage - cd ${S} - eend 0 - - ebegin "Updating SiS driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers/sis - unpack sis_drv_src_${SISDRV_VER}.tar.gz > /dev/null - ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ - ${S}/programs/Xserver/hw/xfree86/drivers/sis - cd ${S} - eend 0 - - if [ "${SYNAPTICS}" = "yes" ] - then - ebegin "Adding Synaptics touchpad driver" - cd ${WORKDIR} - unpack synaptics-${SYNDRV_VER}.tar.bz2 > /dev/null - eend 0 - fi - cd ${S} - -# ebegin "Adding VIA driver" -# cd ${WORKDIR} -# unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2 -# cd ${S} -# eend 0 - -# ebegin "Updating Matrox HAL driver" -# unpack mga-${MGADRV_VER}.tgz -# touch ${WORKDIR}/mga/HALlib/mgaHALlib.a -# mv ${WORKDIR}/mga/HALlib/mgaHALlib.a \ -# #{S}/programs/Xserver/hw/xfree86/drivers/mga/HALlib -# eend 0 - - if [ "`gcc-version`" = "2.95" ] - then - # Do not apply this patch for gcc-2.95.3, as it cause compile to fail, - # closing bug #10146. - mv -f ${PATCH_DIR}/0138_all_4.2.1-gcc32-internal-compiler-error.patch \ - ${PATCH_DIR}/excluded - - mv -f ${PATCH_DIR}/0260_ia64_4.2.99.1-gcc3.1.patch \ - ${PATCH_DIR}/excluded - fi - - # We dont have an implementation for S/390's yet... - if [ ! "${ARCH}" = "s390" ] - then - mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded - fi - - # 9017 fixes many 64-bit issues with non-PIC libs - # patch 9017 overlaps 9015 and 9016 and is applied instead - if [ "${ARCH}" = "amd64" ] - then - mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded - mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded - fi - - # This was formerly applied if USE=debug, but it causes builds - # to randomly die (spyderous). - mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded - - # This is splite's ia64 patch. Is it necessary, - # now that 0262 is applied? (spyderous) - mv -f ${PATCH_DIR}/0261* ${PATCH_DIR}/excluded - - if use debug - then - mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded - fi -# FIXME: bug #19812, 075 should be deprecated by 076, left as -# TDFX_RISKY for feedback (put in -r3 if no problems) - if use 3dfx && [ "${TDFX_RISKY}" = "yes" ] - then - mv -f ${PATCH_DIR}/5850* ${PATCH_DIR}/excluded - else - mv -f ${PATCH_DIR}/5851* ${PATCH_DIR}/excluded - fi - - if ! use ipv6 - then - mv -f ${PATCH_DIR}/200* ${PATCH_DIR}/excluded - mv -f ${PATCH_DIR}/9921* ${PATCH_DIR}/excluded - else - mv -f ${PATCH_DIR}/9920* ${PATCH_DIR}/excluded - if ! use doc - then - mv -f ${PATCH_DIR}/2001* ${PATCH_DIR}/excluded - fi - fi - - # Various Patches from all over - EPATCH_SUFFIX="patch" epatch ${PATCH_DIR} - - unset EPATCH_EXCLUDE - - epatch ${FILESDIR}/xpm-secfix-thomas.diff - - # Fix DRI related problems - cd ${S}/programs/Xserver/hw/xfree86/ - epatch ${DISTDIR}/xfree86-dri-resume-v8.patch - - # Update Wacom Driver, hopefully resolving bug #1632 - # The kernel driver should prob also be updated, this can be - # found at: - # - # http://people.mandrakesoft.com/~flepied/projects/wacom/ - # - if ( [ -e "${ROOT}/usr/src/linux" ] && \ - [ ! `kernel_is "2" "2"` ] ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - ebegin "Updating Wacom USB Driver" - gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \ - ${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die - eend 0 - fi - - # Unpack the MS fonts - if use truetype && use !bindist - then - einfo "Unpacking MS Core Fonts..." - mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype - for x in ${MS_COREFONTS} - do - if [ -f ${DISTDIR}/${x} ] - then - einfo " ${x/\.\/}..." - cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die - fi - done - ebegin "Done unpacking Core Fonts"; eend 0 - fi - - ebegin "Setting up config/cf/host.def" - cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die - echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ - >> config/cf/host.def - - # We're using Xwrapper instead -- so that nothing else needs to be - # set uid any more. - echo "#define InstallXserverSetUID NO" >> config/cf/host.def - echo "#define BuildServersOnly NO" >> config/cf/host.def - - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - - if [ "`gcc-version`" != "2.95" ] - then - # Should fix bug #4189. gcc-3.x have problems with -march=pentium4 - # and -march=athlon-tbird - replace-flags "-march=pentium4" "-march=pentium3" - replace-flags "-march=athlon-tbird" "-march=athlon" - - # Without this, modules breaks with gcc3 - if [ "`gcc-version`" = "3.1" ] - then - append-flags "-fno-merge-constants" - append-flags "-fno-merge-constants" - fi - fi - - if ( [ -e "${ROOT}/usr/src/linux" ] && \ - [ ! `kernel_is "2" "2"` ] ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - echo "#define HasLinuxInput YES" >> config/cf/host.def - fi - - # this is needed for ./configure and runtime linking and building not to fall into falsely believing - # that there are some headers and functions for builtin video drivers or font libraries present - - echo "#define CcCmd $(tc-getCC)" >> config/cf/host.def - echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - - if use static - then - echo "#define DoLoadableServer NO" >>config/cf/host.def - fi - - if use debug - then - echo "#define XFree86Devel YES" >> config/cf/host.def - else - echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def - # use less ram .. got this from Spider's makeedit.eclass :) - echo "#define GccWarningOptions -Wno-return-type -w" \ - >> config/cf/host.def - fi - - if use pam - then - # If you want to have optional pam support, do it properly ... - echo "#define HasPam YES" >> config/cf/host.def - echo "#define HasPamMisc YES" >> config/cf/host.def - else - echo "#define HasPam NO" >> config/cf/host.def - echo "#define HasPamMisc NO" >> config/cf/host.def - fi - - if use nls - then - echo "#define XtermWithI18N YES" >> config/cf/host.def - fi - - if [ "${ARCH}" = "x86" ] - then - # optimize Mesa for architecture - if use mmx - then - echo "#define HasMMXSupport YES" >> config/cf/host.def - echo "#define MesaUseMMX YES" >> config/cf/host.def - else - echo "#define HasMMXSupport NO" >> config/cf/host.def - echo "#define MesaUseMMX NO" >> config/cf/host.def - fi - - if use 3dnow - then - echo "#define Has3DNowSupport YES" >> config/cf/host.def - echo "#define MesaUse3DNow YES" >> config/cf/host.def - else - echo "#define Has3DNowSupport NO" >> config/cf/host.def - echo "#define MesaUse3DNow NO" >> config/cf/host.def - fi - if use sse - then - echo "#define HasKatmaiSupport YES" >> config/cf/host.def - echo "#define MesaUseKatmai YES" >> config/cf/host.def - else - echo "#define HasKatmaiSupport NO" >> config/cf/host.def - echo "#define MesaUseKatmai NO" >> config/cf/host.def - fi - - # build with glide3 support? (build the tdfx_dri.o module) - if use 3dfx - then - echo "#define HasGlide3 YES" >> config/cf/host.def - fi - - # Compile the VIA driver -# echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def - fi - - if [ "${ARCH}" = "hppa" ] - then - echo "#define DoLoadableServer NO" >> config/cf/host.def - fi - - if [ "${ARCH}" = "alpha" ] - then - echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ - i740 tdfx cirrus tseng fbdev \ - ati vga v4l glint" >> config/cf/host.def - fi - - if [ "${ARCH}" = "ppc" ] - then - echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ - chips tdfx fbdev ati DevelDrivers vga nv imstt \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def - fi - - if [ "${ARCH}" = "sparc" ] - then - echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers" >> config/cf/host.def - fi - - if [ "${ARCH}" = "amd64" ] - then - # the built-in zlib doesnt build in amd64 because of -fPIC issues - grep -v HasZlib config/cf/host.def > ${T}/host.def - mv ${T}/host.def config/cf/host.def - echo "#define HasZlib YES" >> config/cf/host.def - fi - - if use xml2 - then - echo "#define HasLibxml2 YES" >> config/cf/host.def - fi - - # The definitions for fontconfig - echo "#define UseFontconfig YES" >> config/cf/host.def - echo "#define HasFontconfig YES" >> config/cf/host.def - - # Use the xfree Xft2 lib - echo "#define SharedLibXft YES" >> config/cf/host.def - - # disable docs if doc not in USE - if ! use doc - then - echo "#define BuildLinuxDocText NO" >> config/cf/host.def - echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def - echo "#define BuildLinuxDocPS NO" >> config/cf/host.def - echo "#define BuildSpecsDocs NO" >> config/cf/host.def - fi - - # enable Japanese docs, optionally - if use cjk && use doc - then - echo "#define InstallJapaneseDocs YES" >> config/cf/host.def - fi - - # Native Language Support Fonts - if ! use nls - then - echo "#define BuildCyrillicFonts NO" >> config/cf/host.def - echo "#define BuildArabicFonts NO" >> config/cf/host.def - echo "#define BuildGreekFonts NO" >> config/cf/host.def - echo "#define BuildHebrewFonts NO" >> config/cf/host.def - echo "#define BuildThaiFonts NO" >> config/cf/host.def - - if ! use cjk - then - echo "#define BuildCIDFonts NO" >> config/cf/host.def - echo "#define BuildJapaneseFonts NO" >> config/cf/host.def - echo "#define BuildKoreanFonts NO" >> config/cf/host.def - echo "#define BuildChineseFonts NO" >> config/cf/host.def - fi - fi - - if use ipv6 - then - echo "#define HasIPv6 YES" >> config/cf/host.def - fi - -# # Build with the binary MatroxHAL driver -# echo "#define HaveMatroxHal YES" >> config/cf/host.def -# echo "#define UseMatroxHal YES" >> config/cf/host.def - -# Will uncomment this after kde, qt, and *box ebuilds are alterered to use -# it -# if use xinerama -# then -# echo "#define BuildXinerama YES" >> config/cf/host.def -# echo "#define BuildXineramaLibrary YES" >> config/cf/host.def -# fi - - # End the host.def definitions here - eend 0 - - cd ${S} - bzcat ${DISTDIR}/XFree86-compose.dir-0.1.bz2 > nls/compose.dir - bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias - bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir - bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8 - - if use doc - then - # These are not included anymore as they are obsolete - rm -rf ${S}/doc/hardcopy/{XIE,PEX5} - for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config} - do - if [ -f ${x} ] - then - cp ${x} ${x}.orig - grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x} - rm -f ${x}.orig - fi - done - fi -} - -src_compile() { - - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - - # Compile ucs2any C implementation (patch #9142) - ebegin "Compiling ucs2any C implementation" - cd ${S}/fonts/util - $(tc-getCC) -Wall -o ucs2any ucs2any.c - [ ! -d ../../exports/bin/ ] && mkdir -p ../../exports/bin/ - mv ucs2any ../../exports/bin/ - ls ${S}/exports/bin/ - cd ${S} - eend 0 - - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the - # xfree build will silently die. This is tricky to track down, so I'm - # adding a preemptive fix for this issue by making sure that MAKE_OPTS is - # unset. (drobbins, 08 Mar 2003) - unset MAKE_OPTS - - einfo "Building XFree86..." - cd ${S} - FAST=1 emake World || die - - if use nls - then - cd ${S}/nls - make || die - cd ${S} - fi - - if [ "${SYNAPTICS}" = "yes" ] - then - ebegin "Building Synaptics driver..." - cd ${SYNDIR} - make - eend 0 - fi - -} - -src_install() { - - unset MAKE_OPTS - - einfo "Installing XFree86..." - # gcc3 related fix. Do this during install, so that our - # whole build will not be compiled without mmx instructions. - if [ "`gcc-version`" != "2.95" ] && [ "${ARCH}" = "x86" ] - then - make install DESTDIR=${D} || \ - make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ - CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install DESTDIR=${D} || die - else - make install DESTDIR=${D} || die - fi - - if use sdk - then - einfo "Installing XFree86 SDK..." - make install.sdk DESTDIR=${D} || die - fi - - # We do not want these, so remove them ... - rm -rf ${D}/usr/X11R6/include/fontconfig - rm -f ${D}/usr/X11R6/lib/libfontconfig.* - rm -f ${D}/usr/X11R6/bin/{fontconfig-config,fc-cache,fc-list} - rm -f ${D}/usr/X11R6/man/man3/fontconfig.3x* - rm -rf ${D}/etc/fonts/ - - # This one needs to be in /usr/lib - insinto /usr/lib/pkgconfig - doins ${D}/usr/X11R6/lib/pkgconfig/{xcursor,xft}.pc - # Now remove the invalid xft.pc, and co ... - rm -rf ${D}/usr/X11R6/lib/pkgconfig - - einfo "Installing man pages..." - make install.man DESTDIR=${D} || die - einfo "Compressing man pages..." - prepman /usr/X11R6 - - if use nls - then - cd ${S}/nls - make DESTDIR=${D} install || die - fi - - # Make sure the user running xterm can only write to utmp. - fowners root:utmp /usr/X11R6/bin/xterm - fperms 2755 /usr/X11R6/bin/xterm - - # Fix permissions on locale/common/*.so - for x in ${D}/usr/X11R6/lib/X11/locale/lib/common/*.so* - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # Fix permissions on modules ... - for x in $(find ${D}/usr/X11R6/lib/modules -name '*.o') \ - $(find ${D}/usr/X11R6/lib/modules -name '*.so') - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can - # mess up other things that use xmkmf - ebegin "Fixing lib/X11/config/host.def" - cp ${D}/usr/X11R6/lib/X11/config/host.def ${T} - awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ - ${T}/host.def > ${D}/usr/X11R6/lib/X11/config/host.def - # theoretically, /usr/X11R6/lib/X11/config is a possible candidate for - # config file management. If we find that people really worry about imake - # stuff, we may add it. But for now, we leave the dir unprotected. - eend 0 - - insinto /etc/X11 - # We still use freetype for now ... - doins ${FILESDIR}/${PV}/XftConfig - newins ${FILESDIR}/${PV}/XftConfig XftConfig.new - # This is if we are using Fontconfig only ... - #newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig - dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig - - # Install example config file - newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example - - # Install MS fonts. - if use truetype && use !bindist - then - ebegin "Installing MS Core Fonts" - dodir /usr/X11R6/lib/X11/fonts/truetype - cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype - eend 0 - fi - - # EURO support - ebegin "Euro Support..." - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz - eend 0 - - # Standard symlinks - dodir /usr/{bin,include,lib} - dosym ../X11R6/bin /usr/bin/X11 - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/DPS /usr/include/DPS - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 - dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb - - # Some critical directories - keepdir /var/lib/xdm - dosym ../../../var/lib/xdm /etc/X11/xdm/authdir - - # Remove invalid symlinks - rm -f ${D}/usr/lib/libGL.* - # Create required symlinks - dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so - dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so.1 - dosym libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so - # We move libGLU to /usr/lib now - dosym libGLU.so.1.3 /usr/lib/libMesaGLU.so - - # .la files for libtool support - insinto /usr/X11R6/lib - doins ${FILESDIR}/${PV}/lib/*.la - - # Remove libz.a, as it causes problems (bug #4777) - rm -f ${D}/usr/X11R6/lib/libz.a - # And do not forget the includes (bug #9470) - rm -f ${D}/usr/X11R6/include/{zconf.h,zlib.h} - - # Use the Xwrapper as the X binary - rm -f ${D}/usr/X11R6/bin/X - dosym Xwrapper /usr/X11R6/bin/X - dosym ../../usr/X11R6/bin/XFree86 /etc/X11/X - - # Fix perms - fperms 755 /usr/X11R6/lib/X11/xkb/geometry/sgi - fperms 755 /usr/X11R6/bin/dga - - # Hack from Mandrake (update ours that just created Compose files for - # all locales) - for x in $(find ${D}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) - do - # make empty Compose files for some locales - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - C|microsoft-*|iso8859-*|koi8-*) - if [ ! -f ${x}/Compose ] - then - touch ${x}/Compose - fi - ;; - ja*|ko*|zh*) - if [ -r ${x}/Compose ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Another hack from Mandrake -- to fix dead + space for the us - # international keyboard - for i in ${D}/usr/X11R6/lib/X11/locale/*/Compose - do - sed -i \ - -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ - -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" \ - ${i} - done - - # Yet more Mandrake - ebegin "Encoding files for xfsft font server..." - dodir /usr/X11R6/lib/X11/fonts/encodings - cp -a ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/* \ - ${D}/usr/X11R6/lib/X11/fonts/encodings - - for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc - do - [ -f "${x}" ] && gzip -9 -f ${x} - done - eend 0 - - if use nls - then - ebegin "gemini-koi8 fonts..." - cd ${WORKDIR}/ukr - gunzip *.Z - gzip -9 *.pcf - cd ${S} - cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts - eend 0 - fi - - exeinto /etc/X11 - # new session management script - doexe ${FILESDIR}/${PV}/chooser.sh - # new display manager script - doexe ${FILESDIR}/${PV}/startDM.sh - exeinto /etc/X11/Sessions - for x in ${FILESDIR}/${PV}/Sessions/* - do - [ -f ${x} ] && doexe ${x} - done - insinto /etc/env.d - doins ${FILESDIR}/${PV}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/${PV}/xinitrc - exeinto /etc/X11/xdm - doexe ${FILESDIR}/${PV}/Xsession ${FILESDIR}/${PV}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILESDIR}/${PV}/xfs.config config - - if use pam - then - insinto /etc/pam.d - newins ${FILESDIR}/${PV}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILESDIR}/${PV}/xserver.pamd xserver - fi - - exeinto /etc/init.d - newexe ${FILESDIR}/${PV}/xdm.start xdm - newexe ${FILESDIR}/${PV}/xfs.start xfs - insinto /etc/conf.d - newins ${FILESDIR}/${PV}/xfs.conf.d xfs - - # we want libGLU.so* in /usr/lib - mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib - - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/lib/opengl/xfree/{lib,extensions,include} - local x="" - for x in ${D}/usr/X11R6/lib/libGL.so* \ - ${D}/usr/X11R6/lib/libGL.la \ - ${D}/usr/X11R6/lib/libGL.a \ - ${D}/usr/X11R6/lib/libMesaGL.so - do - if [ -f ${x} -o -L ${x} ] - then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/lib/opengl/xfree/lib - fi - done - for x in ${D}/usr/X11R6/lib/modules/extensions/libglx* - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/lib/opengl/xfree/extensions - fi - done - for x in ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h} - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/lib/opengl/xfree/include - fi - done - eend 0 - - # Make the core cursor the default. People seem not to like whiteglass - # for some reason. - dosed 's:whiteglass:core:' /usr/share/cursors/xfree/default/index.theme - - einfo "Striping binaries and libraries..." - # This bit I got from Redhat ... strip binaries and drivers .. - # NOTE: We do NOT want to strip the drivers, modules or DRI modules! - for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ - grep -v ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p') - do - if [ -f ${x} ] - then - # Dont do the modules ... - if [ "${x/\/usr\/X11R6\/lib\/modules}" = "${x}" ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip ${x} || : - fi - fi - done - # Now do the libraries ... - for x in ${D}/usr/{lib,lib/opengl/xfree/lib}/*.so.* \ - ${D}/usr/X11R6/{lib,lib/X11/locale/lib/common}/*.so.* - do - if [ -f ${x} ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip --strip-debug ${x} || : - fi - done - - # Install TaD's gentoo cursors - insinto /usr/share/cursors/xfree/gentoo/cursors - doins ${WORKDIR}/cursors/gentoo/cursors/* - insinto /usr/share/cursors/xfree/gentoo-blue/cursors - doins ${WORKDIR}/cursors/gentoo-blue/cursors/* - insinto /usr/share/cursors/xfree/gentoo-silver/cursors - doins ${WORKDIR}/cursors/gentoo-silver/cursors/* - - if [ "${SYNAPTICS}" = "yes" ] - then - # Install Synaptics touchpad driver and docs - insinto /usr/X11R6/lib/modules/input - doins ${SYNDIR}/synaptics_drv.o - exeinto /usr/X11R6/bin - doexe ${SYNDIR}/synclient - docinto synaptics - dodoc ${SYNDIR}/{COMPATIBILITY,FEATURES,FILES,INSTALL,INSTALL.DE,LICENSE,NEWS,PARAMETER,TODO,VERSION} - fi -} - -pkg_preinst() { - - # These changed from a directory/file to a symlink and reverse - if [ ! -L ${ROOT}/usr/X11R6/lib/X11/XftConfig ] && \ - [ -f ${ROOT}/usr/X11R6/lib/X11/XftConfig ] - then - rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig - fi - - if [ -L ${ROOT}/etc/X11/app-defaults ] - then - rm -f ${ROOT}/etc/X11/app-defaults - fi - - if [ ! -L ${ROOT}/usr/X11R6/lib/X11/app-defaults ] && \ - [ -d ${ROOT}/usr/X11R6/lib/X11/app-defaults ] - then - if [ ! -d ${ROOT}/etc/X11/app-defaults ] - then - mkdir -p ${ROOT}/etc/X11/app-defaults - fi - - mv -f ${ROOT}/usr/X11R6/lib/X11/app-defaults ${ROOT}/etc/X11 - fi - - if [ -L ${ROOT}/usr/X11R6/lib/X11/xkb ] - then - rm -f ${ROOT}/usr/X11R6/lib/X11/xkb - fi - - if [ ! -L ${ROOT}/etc/X11/xkb ] && \ - [ -d ${ROOT}/etc/X11/xkb ] - then - if [ ! -d ${ROOT}/usr/X11R6/lib/X11/xkb ] - then - mkdir -p ${ROOT}/usr/X11R6/lib/X11 - fi - - mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11 - fi - - # clean the dinamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d ${ROOT}/usr/lib/opengl/xfree ] - then - rm -rf ${ROOT}/usr/lib/opengl/xfree/* - fi - - # clean out old fonts.* and encodings.dir files, as we - # will regenerate them - local G_FONTDIR - # Not Speedo or CID, as their fonts.scale files are "real" - local G_FONTDIRS="100dpi 75dpi TTF Type1 encodings local misc util" - for G_FONTDIR in ${G_FONTDIRS} - do - find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ - -exec rm -f {} \; - find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \ - -exec rm -f {} \; - done - - # make sure we do not have any stale files lying round - # that could break things. - rm -f ${ROOT}/usr/X11R6/lib/libGL* -} - -update_XftConfig() { - - if [ "${ROOT}" = "/" ] - then - local CHECK1="f901d29ec6e3cbb0a5b0fd5cbdd9ff33" - local CHECK2="$(md5sum ${ROOT}/etc/X11/XftConfig | cut -d ' ' -f1)" - - if [ "${CHECK1}" = "${CHECK2}" ] - then - echo - ewarn "Due to an invalid /etc/X11/XftConfig from x11-base/xfree-4.2.1," - ewarn "/etc/X11/XftConfig is being updated automatically. Your old" - ewarn "version of /etc/X11/XftConfig will be backed up as:" - ewarn - ewarn " ${ROOT}etc/X11/XftConfig.bak" - echo - - cp -a ${ROOT}/etc/X11/XftConfig \ - ${ROOT}/etc/X11/XftConfig.bak - mv -f ${ROOT}/etc/X11/XftConfig.new \ - ${ROOT}/etc/X11/XftConfig - rm -f ${ROOT}/etc/X11/._cfg????_XftConfig - else - rm -f ${ROOT}/etc/X11/XftConfig.new - fi - fi -} - - -pkg_postinst() { - - env-update - - if [ "${ROOT}" = "/" ] - then - local x="" - - umask 022 - - # This one cause ttmkfdir to segfault :/ - #rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz - - # ******************************************************************** - # A note about fonts and needed files: - # - # 1) Create /usr/X11R6/lib/X11/fonts/encodings/encodings.dir - # - # 2) Create font.scale for TrueType fonts (need to do this before - # we create fonts.dir files, else fonts.dir files will be - # invalid for TrueType fonts...) - # - # 3) Now Generate fonts.dir files. - # - # CID fonts is a bit more involved, but as we do not install any, - # thus I am not going to bother. - # - # <azarah@gentoo.org> (20 Oct 2002) - # - # ******************************************************************** - - ebegin "Generating encodings.dir..." - # Create the encodings.dir in /usr/X11R6/lib/X11/fonts/encodings - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir -n \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings - eend 0 - - if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] - then - ebegin "Creating fonts.scale files..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate .scale files if truetype, opentype or type1 - # fonts are present ... - - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale - # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.tt[cf]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontscale \ - -a ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -- ${x} - fi - done - eend 0 - fi - - ebegin "Generating fonts.dir files..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - if [ "${x/encodings}" = "${x}" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating Xft Cache..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate XftCache files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - done - eend 0 - - ebegin "Fixing permissions..." - find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \ - -exec chmod 0644 {} \; - eend 0 - - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [ -x ${ROOT}/usr/bin/fc-cache ] - then - ebegin "Creating FC font cache..." - HOME="/root" ${ROOT}/usr/bin/fc-cache - eend 0 - fi - - # Switch to the xfree implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo; ${ROOT}/usr/sbin/opengl-update --use-old xfree - fi - - for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) - do - # Remove old compose files we might have created incorrectly - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - ja*|ko*|zh*) - if [ -r "${x}/Compose" ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Update /etc/X11/XftConfig if its the one from Xft1.2, as its - # invalid for Xft1.1 .... - # NOTE: This should not be needed for xfree-4.2.99 or later, - # but lets not take chances with people that may downgrade - # at a later stage .... - update_XftConfig - - # These need to be owned by root and the correct permissions - # (bug #8281) - for x in ${ROOT}/tmp/.{ICE,X11}-unix - do - if [ ! -d ${x} ] - then - mkdir -p ${x} - fi - - chown root:root ${x} - chmod 1777 ${x} - done - - if use 3dfx - then - echo - einfo "If using a 3DFX card, and you had \"3dfx\" in your USE flags," - einfo "please merge media-libs/glide-v3 if you have not done so yet" - einfo "by doing:" - einfo - einfo " # emerge media-libs/glide-v3" - echo - fi - echo - ewarn "BEWARE 1:" - ewarn "This version of XFree won't work with ati-drivers-2.5.1-r1" - ewarn "if you are using them please unmerge ati-drivers" - ewarn " and emerge xfree-drm" - echo - ewarn "BEWARE 2:" - ewarn "If you experience font corruption on OpenOffice.org or similar" - ewarn "glitches please remake your XF86Config" - echo - - einfo "Please note that the xcursors are in /usr/share/cursors/xfree" - einfo "Any custom cursor sets should be placed in that directory" - einfo "This is different from the previous versions of 4.3 and" - einfo "the 4.2.99 series." - einfo - ewarn "New in this release: if you wish to set system-wide default" - ewarn "cursors, please set them in /usr/local/share/cursors/xfree" - ewarn "so that future emerges will not overwrite those settings" - einfo - einfo "To use the Synaptics touchpad driver, check the installed" - einfo "documentation in /usr/share/doc/xfree, as well as" - einfo "http://tuxmobil.org/touchpad_driver.html and" - einfo "http://w1.894.telia.com/~u89404340/touchpad/." - einfo - ewarn "Listening on tcp is disabled by default with startx." - ewarn "To enable it, edit /usr/X11R6/bin/startx." -} - -pkg_postrm() { - - # Fix problematic links - if [ -x ${ROOT}/usr/X11R6/bin/XFree86 ] - then - ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11 - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 - fi -} |