--- xorg-server-1.0.2.orig/Xext/Makefile.in +++ xorg-server-1.0.2/Xext/Makefile.in @@ -611,7 +611,7 @@ # Security extension: multi-level security to protect clients from each other XCSECURITY_SRCS = security.c -@XCSECURITY_TRUE@SERVERCONFIGdir = $(libdir)/xserver +@XCSECURITY_TRUE@SERVERCONFIGdir = $(sysconfdir)/xserver @XCSECURITY_TRUE@SERVERCONFIG_DATA = SecurityPolicy # X EVent Interception Extension: allows accessibility helpers & composite --- xorg-server-1.0.2.orig/Xext/Makefile.am +++ xorg-server-1.0.2/Xext/Makefile.am @@ -70,7 +70,7 @@ if XCSECURITY BUILTIN_SRCS += $(XCSECURITY_SRCS) -SERVERCONFIGdir = $(libdir)/xserver +SERVERCONFIGdir = $(sysconfdir)/xserver SERVERCONFIG_DATA = SecurityPolicy AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" endif --- xorg-server-1.0.2.orig/debian/xdmx-tools.install +++ xorg-server-1.0.2/debian/xdmx-tools.install @@ -0,0 +1,4 @@ +usr/bin/dmx* +usr/bin/vdltodmx +usr/share/man/man1/dmxtodmx.1x +usr/share/man/man1/vdltodmx.1x --- xorg-server-1.0.2.orig/debian/copyright +++ xorg-server-1.0.2/debian/copyright @@ -0,0 +1,826 @@ + Licenses + + The X.Org Foundation + + March 2004 + +1. Introduction + +The X.org Foundation X Window System distribution is a compilation of code +and documentation from many sources. This document is intended primarily as +a guide to the licenses used in the distribution: you must check each file +and/or package for precise redistribution terms. None-the-less, this summary +may be useful to many users. No software incorporating the XFree86 1.1 +license has been incorporated. + +This document is based on the compilation from XFree86. + +2. XFree86 License + +XFree86 code without an explicit copyright is covered by the following copy- +right/license: + +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is 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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +3. Other Licenses + +Portions of code are covered by the following licenses/copyrights. See indi- +vidual files for the copyright dates. + +3.1 X/MIT Copyrights + +3.1.1 X Consortium + +Copyright (C) X Consortium + +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, FIT- +NESS 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 Consortium 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 Consortium. + +X Window System is a trademark of X Consortium, Inc. + +3.1.2 The Open Group + +Copyright The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation. + +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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP 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 Open Group 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 Open Group. + +3.2 Berkeley-based copyrights: + +o + +3.2.1 General + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.2 UCB/LBL + +Copyright (c) 1993 The Regents of the University of California. All rights +reserved. + +This software was developed by the Computer Systems Engineering group at +Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to +Berkeley. + +All advertising materials mentioning features or use of this software must +display the following acknowledgement: This product includes software devel- +oped by the University of California, Lawrence Berkeley Laboratory. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: This product includes soft- + ware developed by the University of California, Berkeley and its con- + tributors. + + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS- +CLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.3 The NetBSD Foundation, Inc. + +Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved. + +This code is derived from software contributed to The NetBSD Foundation by +Ben Collver + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: This product includes soft- + ware developed by the NetBSD Foundation, Inc. and its contributors. + + 4. Neither the name of The NetBSD Foundation nor the names of its con- + tributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE- +QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM- +AGE. + +3.2.4 Theodore Ts'o. + +Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights +reserved. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + and the entire permission notice in its entirety, including the dis- + claimer of warranties. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. he name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.5 Theo de Raadt and Damien Miller + +Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c) +2001-2002 Damien Miller. All rights reserved. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.6 Todd C. Miller + +Copyright (c) 1998 Todd C. Miller + +Permission to use, copy, modify, and distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON- +TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +3.2.7 Thomas Winischhofer + +Copyright (C) 2001-2004 Thomas Winischhofer + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +3.3 NVIDIA Corp + +Copyright (c) 1996 NVIDIA, Corp. All rights reserved. + +NOTICE TO USER: The source code is copyrighted under U.S. and international +laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as +design patents pending on the design and interface of the NV chips. Users +and possessors of this source code are hereby granted a nonexclusive, roy- +alty-free copyright and design patent license to use this code in individual +and commercial software. + +Any use of this source code must include, in the user documentation and +internal comments to the code, notices to the end user as follows: + +Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. +and foreign countries. + +NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE +CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR- +RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE +FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM- +AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. + +3.4 GLX Public License + +GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") + +Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby +grants permission to Recipient (defined below), under Recipient's copyrights +in the Original Software (defined below), to use, copy, modify, merge, pub- +lish, distribute, sublicense and/or sell copies of Subject Software (defined +below), and to permit persons to whom the Subject Software is furnished in +accordance with this License to do the same, subject to all of the following +terms and conditions, which Recipient accepts by engaging in any such use, +copying, modifying, merging, publishing, distributing, sublicensing or sell- +ing: + +1. Definitions. + + (a) "Original Software" means source code of computer software code + which is described in Exhibit A as Original Software. + + (b) "Modifications" means any addition to or deletion from the sub- + stance or structure of either the Original Software or any previous + Modifications. When Subject Software is released as a series of + files, a Modification means (i) any addition to or deletion from + the contents of a file containing Original Software or previous + Modifications and (ii) any new file that contains any part of the + Original Code or previous Modifications. + + (c) "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + + (d) "Recipient" means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. + For legal entities, "Recipient" includes any entity which controls, + is controlled by, or is under common control with Recipient. For + purposes of this definition, "control" of an entity means (a) the + power, direct or indirect, to direct or manage such entity, or (b) + ownership of fifty percent (50%) or more of the outstanding shares + or beneficial ownership of such entity. + +2. Redistribution of Source Code Subject to These Terms. Redistributions of +Subject Software in source code form must retain the notice set forth in +Exhibit A, below, in every file. A copy of this License must be included in +any documentation for such Subject Software where the recipients' rights +relating to Subject Software are described. Recipient may distribute the +source code version of Subject Software under a license of Recipient's +choice, which may contain terms different from this License, provided that +(i) Recipient is in compliance with the terms of this License, and (ii) the +license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 +of this License, which terms may not be modified or superseded by any other +terms of such license. If Recipient distributes the source code version under +a different license Recipient must make it absolutely clear that any terms +which differ from this License are offered by Recipient alone, not by SGI. +Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as +a result of any such terms Recipient offers. + +3. Redistribution in Executable Form. The notice set forth in Exhibit A must +be conspicuously included in any notice in an executable version of Subject +Software, related documentation or collateral in which Recipient describes +the user's rights relating to the Subject Software. Recipient may distribute +the executable version of Subject Software under a license of Recipient's +choice, which may contain terms different from this License, provided that +(i) Recipient is in compliance with the terms of this License, and (ii) the +license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of +this License, which terms may not be modified or superseded by any other +terms of such license. If Recipient distributes the executable version under +a different license Recipient must make it absolutely clear that any terms +which differ from this License are offered by Recipient alone, not by SGI. +Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as +a result of any such terms Recipient offers. + +4. Termination. This License and the rights granted hereunder will terminate +automatically if Recipient fails to comply with terms herein and fails to +cure such breach within 30 days of the breach. Any sublicense to the Subject +Software which is properly granted shall survive any termination of this +License absent termination by the terms of such sublicense. Provisions which, +by their nature, must remain in effect beyond the termination of this License +shall survive. + +5. No Trademark Rights. This License does not grant any rights to use any +trade name, trademark or service mark whatsoever. No trade name, trademark or +service mark of SGI may be used to endorse or promote products derived from +the Subject Software without prior written permission of SGI. + +6. No Other Rights. This License does not grant any rights with respect to +the OpenGL API or to any software or hardware implementation thereof or to +any other software whatsoever, nor shall any other rights or licenses not +expressly granted hereunder arise by implication, estoppel or otherwise with +respect to the Subject Software. Title to and ownership of the Original Soft- +ware at all times remains with SGI. All rights in the Original Software not +expressly granted under this License are reserved. + +7. Compliance with Laws; Non-Infringement. Recipient shall comply with all +applicable laws and regulations in connection with use and distribution of +the Subject Software, including but not limited to, all export and import +control laws and regulations of the U.S. government and other countries. +Recipient may not distribute Subject Software that (i) in any way infringes +(directly or contributorily) the rights (including patent, copyright, trade +secret, trademark or other intellectual property rights of any kind) of any +other person or entity or (ii) breaches any representation or warranty, +express, implied or statutory, which under any applicable law it might be +deemed to have been distributed. + +8. Claims of Infringement. If Recipient at any time has knowledge of any one +or more third party claims that reproduction, modification, use, distribu- +tion, import or sale of Subject Software (including particular functionality +or code incorporated in Subject Software) infringes the third party's intel- +lectual property rights, Recipient must place in a well-identified web page +bearing the title "LEGAL" a description of each such claim and a description +of the party making each such claim in sufficient detail that a user of the +Subject Software will know whom to contact regarding the claim. Also, upon +gaining such knowledge of any such claim, Recipient must conspicuously +include the URL for such web page in the Exhibit A notice required under Sec- +tions 2 and 3, above, and in the text of any related documentation, license +agreement or collateral in which Recipient describes end user's rights relat- +ing to the Subject Software. If Recipient obtains such knowledge after it +makes Subject Software available to any other person or entity, Recipient +shall take other steps (such as notifying appropriate mailing lists or news- +groups) reasonably calculated to inform those who received the Subject Soft- +ware that new knowledge has been obtained. + +9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT +LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- +CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO +RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- +VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED +HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE- +ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA- +BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY +CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF +THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY +TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO +THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, +SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. + +11. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this License. +Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. +from and against any loss, liability, damages, costs or expenses (including +the payment of reasonable attorneys fees) arising out of Recipient's use, +modification, reproduction and distribution of the Subject Software or out of +any representation or warranty made by Recipient. + +12. U.S. Government End Users. The Subject Software is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End +Users acquire only the rights set forth in this License and are subject to +the terms of this License. + +13. Miscellaneous. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be unen- +forceable, such provision shall be reformed so as to achieve as nearly as +possible the same economic effect as the original provision and the remainder +of this License will remain in effect. This License shall be governed by and +construed in accordance with the laws of the United States and the State of +California as applied to agreements entered into and to be performed entirely +within California between California residents. Any litigation relating to +this License shall be subject to the exclusive jurisdiction of the Federal +Courts of the Northern District of California (or, absent subject matter +jurisdiction in such courts, the courts of the State of California), with +venue lying exclusively in Santa Clara County, California, with the losing +party responsible for costs, including without limitation, court costs and +reasonable attorneys fees and expenses. The application of the United Nations +Convention on Contracts for the International Sale of Goods is expressly +excluded. Any law or regulation which provides that the language of a con- +tract shall be construed against the drafter shall not apply to this License. + +Exhibit A + +The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and +13 of the GLX Public License Version 1.0 (the "License"). You may not use +this file except in compliance with those sections of the License. You may +obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, +2011 N. Shoreline Blvd., Mountain View, CA 94043 or at +http://www.sgi.com/software/opensource/glx/license.html. + +Software distributed under the License is distributed on an "AS IS" basis. +ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- +INFRINGEMENT. See the License for the specific language governing rights and +limitations under the License. + +The Original Software is GLX version 1.2 source code, released February, +1999. The developer of the Original Software is Silicon Graphics, Inc. Those +portions of the Subject Software created by Silicon Graphics, Inc. are Copy- +right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. + +3.5 CID Font Code Public License + +CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License") + +Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI") +hereby grants permission to Recipient (defined below), under SGI's copyrights +in the Original Software (defined below), to use, copy, modify, merge, pub- +lish, distribute, sublicense and/or sell copies of Subject Software (defined +below) in both source code and executable form, and to permit persons to whom +the Subject Software is furnished in accordance with this License to do the +same, subject to all of the following terms and conditions, which Recipient +accepts by engaging in any such use, copying, modifying, merging, publica- +tion, distributing, sublicensing or selling: + +1. Definitions. + + a. "Original Software" means source code of computer software code + that is described in Exhibit A as Original Software. + + b. "Modifications" means any addition to or deletion from the sub- + stance or structure of either the Original Software or any previous + Modifications. When Subject Software is released as a series of + files, a Modification means (i) any addition to or deletion from + the contents of a file containing Original Software or previous + Modifications and (ii) any new file that contains any part of the + Original Code or previous Modifications. + + c. "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + + d. "Recipient" means an individual or a legal entity exercising + rights under the terms of this License. For legal entities, "Recip- + ient" includes any entity that controls, is controlled by, or is + under common control with Recipient. For purposes of this defini- + tion, "control" of an entity means (i) the power, direct or indi- + rect, to direct or manage such entity, or (ii) ownership of fifty + percent (50%) or more of the outstanding shares or beneficial own- + ership of such entity. + + e. "Required Notice" means the notice set forth in Exhibit A to + this License. + + f. "Accompanying Technology" means any software or other technology + that is not a Modification and that is distributed or made publicly + available by Recipient with the Subject Software. Separate soft- + ware files that do not contain any Original Software or any previ- + ous Modification shall not be deemed a Modification, even if such + software files are aggregated as part of a product, or in any + medium of storage, with any file that does contain Original Soft- + ware or any previous Modification. + +2. License Terms. All distribution of the Subject Software must be made sub- +ject to the terms of this License. A copy of this License and the Required +Notice must be included in any documentation for Subject Software where +Recipient's rights relating to Subject Software and/or any Accompanying Tech- +nology are described. Distributions of Subject Software in source code form +must also include the Required Notice in every file distributed. In addition, +a ReadMe file entitled "Important Legal Notice" must be distributed with each +distribution of one or more files that incorporate Subject Software. That +file must be included with distributions made in both source code and exe- +cutable form. A copy of the License and the Required Notice must be included +in that file. Recipient may distribute Accompanying Technology under a +license of Recipient's choice, which may contain terms different from this +License, provided that (i) Recipient is in compliance with the terms of this +License, (ii) such other license terms do not modify or supersede the terms +of this License as applicable to the Subject Software, (iii) Recipient hereby +indemnifies SGI for any liability incurred by SGI as a result of the distri- +bution of Accompanying Technology or the use of other license terms. + +3. Termination. This License and the rights granted hereunder will terminate +automatically if Recipient fails to comply with terms herein and fails to +cure such breach within 30 days of the breach. Any sublicense to the Subject +Software that is properly granted shall survive any termination of this +License absent termination by the terms of such sublicense. Provisions which, +by their nature, must remain in effect beyond the termination of this License +shall survive. + +4. Trademark Rights. This License does not grant any rights to use any trade +name, trademark or service mark whatsoever. No trade name, trademark or ser- +vice mark of SGI may be used to endorse or promote products derived from or +incorporating any Subject Software without prior written permission of SGI. + +5. No Other Rights. No rights or licenses not expressly granted hereunder +shall arise by implication, estoppel or otherwise. Title to and ownership of +the Original Software at all times remains with SGI. All rights in the Origi- +nal Software not expressly granted under this License are reserved. + +6. Compliance with Laws; Non-Infringement. Recipient shall comply with all +applicable laws and regulations in connection with use and distribution of +the Subject Software, including but not limited to, all export and import +control laws and regulations of the U.S. government and other countries. +Recipient may not distribute Subject Software that (i) in any way infringes +(directly or contributorily) the rights (including patent, copyright, trade +secret, trademark or other intellectual property rights of any kind) of any +other person or entity, or (ii) breaches any representation or warranty, +express, implied or statutory, which under any applicable law it might be +deemed to have been distributed. + +7. Claims of Infringement. If Recipient at any time has knowledge of any one +or more third party claims that reproduction, modification, use, distribu- +tion, import or sale of Subject Software (including particular functionality +or code incorporated in Subject Software) infringes the third party's intel- +lectual property rights, Recipient must place in a well-identified web page +bearing the title "LEGAL" a description of each such claim and a description +of the party making each such claim in sufficient detail that a user of the +Subject Software will know whom to contact regarding the claim. Also, upon +gaining such knowledge of any such claim, Recipient must conspicuously +include the URL for such web page in the Required Notice, and in the text of +any related documentation, license agreement or collateral in which Recipient +describes end user's rights relating to the Subject Software. If Recipient +obtains such knowledge after it makes Subject Software available to any other +person or entity, Recipient shall take other steps (such as notifying appro- +priate mailing lists or newsgroups) reasonably calculated to provide such +knowledge to those who received the Subject Software. + +8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT +LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- +CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO +RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- +VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED +HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, +WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), +CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR 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 SUBJECT SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT +ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND +LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED. + +10. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this License. +Recipient will defend, indemnify and hold SGI and its successors and assigns +harmless from and against any loss, liability, damages, costs or expenses +(including the payment of reasonable attorneys fees) arising out of (Recipi- +ent's use, modification, reproduction and distribution of the Subject Soft- +ware or out of any representation or warranty made by Recipient. + +11. U.S. Government End Users. The Subject Software is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End Users +acquire only the rights set forth in this License and are subject to the +terms of this License. + +12. Miscellaneous. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be unen- +forceable by any judicial or administrative authority having proper jurisdic- +tion with respect thereto, such provision shall be reformed so as to achieve +as nearly as possible the same economic effect as the original provision and +the remainder of this License will remain in effect. This License shall be +governed by and construed in accordance with the laws of the United States +and the State of California as applied to agreements entered into and to be +performed entirely within California between California residents. Any liti- +gation relating to this License shall be subject to the exclusive jurisdic- +tion of the Federal Courts of the Northern District of California (or, absent +subject matter jurisdiction in such courts, the courts of the State of Cali- +fornia), with venue lying exclusively in Santa Clara County, California, with +the losing party responsible for costs, including without limitation, court +costs and reasonable attorneys fees and expenses. The application of the +United Nations Convention on Contracts for the International Sale of Goods is +expressly excluded. Any law or regulation that provides that the language of +a contract shall be construed against the drafter shall not apply to this +License. + +Exhibit A + +Copyright (c) 1994-1999 Silicon Graphics, Inc. + +The contents of this file are subject to the CID Font Code Public License +Version 1.0 (the "License"). You may not use this file except in compliance +with the License. You may obtain a copy of the License at Silicon Graphics, +Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 +or at http://www.sgi.com/software/opensource/cid/license.html + +Software distributed under the License is distributed on an "AS IS" basis. +ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- +INFRINGEMENT. See the License for the specific language governing rights and +limitations under the License. + +The Original Software (as defined in the License) is CID font code that was +developed by Silicon Graphics, Inc. Those portions of the Subject Software +(as defined in the License) that were created by Silicon Graphics, Inc. are +Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved. + +[NOTE: When using this text in connection with Subject Software delivered +solely in object code form, Recipient may replace the words "this file" with +"this software" in both the first and second sentences.] + +3.6 Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as long as +"Bitstream" or "Vera" are not in the names), and full redistribution (so long +as they are not *sold* by themselves). They can be be bundled, redistributed +and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated documentation +files (the "Font Software"), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, dis- +tribute, and/or sell copies of the Font Software, and to permit persons to +whom the Font Software is furnished to do so, subject to the following condi- +tions: + +The above copyright and trademark notices and this permission notice shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and addi- +tional glyphs or characters may be added to the Fonts, only if the fonts are +renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream Vera" +names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA- +TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- +ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- +WARE. + +Except as contained in this notice, the names of Gnome, the Gnome Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the Gnome Foundation or Bitstream Inc., respectively. For +further information, contact: fonts at gnome dot org. + +3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license + +Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction +code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis- +tered trademark of Bigelow & Holmes Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of these Fonts and associated documentation files (the "Font Software"), to +deal in the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, sublicense, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished to do +so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice shall be +included in all copies of one or more of the Font Software. + +The Font Software may not be modified, altered, or added to, and in particu- +lar the designs of glyphs or characters in the Fonts may not be modified nor +may additional glyphs or characters be added to the Fonts. This License +becomes null and void when the Fonts or Font Software have been modified. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ +GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- +ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- +WARE. + +Except as contained in this notice, the names of Bigelow & Holmes Inc. and +URW++ GmbH. shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Font Software without prior written +authorization from Bigelow & Holmes Inc. and URW++ GmbH. + +For further information, contact: + +info@urwpp.de or design@bigelowandholmes.com + + $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $ + + +$XdotOrg$ --- xorg-server-1.0.2.orig/debian/rules +++ xorg-server-1.0.2/debian/rules @@ -0,0 +1,125 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xorg-server package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +NEED_FUNCTIONSECTIONS := hppa mips mipsel +ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(NEED_FUNCTIONSECTIONS))) + CFLAGS += -ffunction-sections +endif + +# disable-static is so we don't get libfoo.a for modules. now if only we could +# kill the .las. +confflags += --disable-static \ + --enable-xorg \ + --enable-dri --with-mesa-source=/usr/share/mesa-source \ + --enable-xtrap \ + --enable-dmx \ + --enable-vfb \ + --disable-xprint \ + --disable-xorgconfig \ + --disable-xorgcfg \ + --with-xkb-path=/etc/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --disable-lbx \ + --with-fontdir=/usr/share/X11/fonts \ + --with-rgb-path=/etc/X11/rgb + +include /usr/share/dpatch/dpatch.make + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + + mkdir -p obj-$(DEB_BUILD_GNU_TYPE)/GL + cd obj-$(DEB_BUILD_GNU_TYPE) && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info --sysconfdir=/etc \ + --localstatedir=/var $(confflags) CFLAGS="$(CFLAGS)" + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf obj-* + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + + # oh, yuck. + find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \ + xargs rm -f + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs + dh_install --sourcedir=debian/tmp + install -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg + install $(CURDIR)/debian/serverabiver \ + $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverabiver + install -m755 $(CURDIR)/debian/xvfb-run $(CURDIR)/debian/xvfb/usr/bin/ + install -d $(CURDIR)/debian/xserver-xorg-core/usr/share/doc/examples/ + install -m644 $(CURDIR)/Xext/SecurityPolicy \ + $(CURDIR)/debian/xserver-xorg-core/usr/share/doc/examples/SecurityPolicy + dh_installman + dh_link + dh_strip --exclude=usr/lib/xorg/modules + find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so" | \ + xargs --no-run-if-empty \ + strip --strip-debug --remove-section=.note --remove-section=.comment + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xorg-server-1.0.2.orig/debian/changelog +++ xorg-server-1.0.2/debian/changelog @@ -0,0 +1,255 @@ +xorg-server (1:1.0.2-0ubuntu10.3) dapper-updates; urgency=low + + * Added 992_linux_bios_bug_6751.dpatch (Closes Malone #36461) + + -- Rodrigo Parra Novo Fri, 11 Aug 2006 14:00:07 -0300 + +xorg-server (1:1.0.2-0ubuntu10.2) dapper-updates; urgency=low + + * Added 004_xf86dri_byte_swapped_clients.dpatch (Closes Malone #27459) + * Added 005_pci_domain.dpatch (Closes Malone #54880) + + -- Rodrigo Parra Novo Thu, 10 Aug 2006 16:31:53 -0300 + +xorg-server (1:1.0.2-0ubuntu10.1) dapper-updates; urgency=low + + * Do actually ship xdmx-tools instead of an empty package. + + * Apply setuid fix: + - Add patch 003_fix_setuid_handling.dpatch. + + -- Fabio M. Di Nitto Mon, 10 Jul 2006 12:26:29 +0200 + +xorg-server (1:1.0.2-0ubuntu10) dapper; urgency=low + + * Backport a fix for Intel bridge handling: + debian/patches/002_fix_for_certain_intel_chipsets.patch + (Closes Ubuntu: #29880) + + -- Paul Sladen Sun, 14 May 2006 19:01:32 +0100 + +xorg-server (1:1.0.2-0ubuntu9) dapper; urgency=low + + * Add 1680x1050 60 and 85Hz Modelines. Thanks to Bart Verwilst for the data. + (Closes Ubuntu: #6096) + + -- Fabio M. Di Nitto Fri, 05 May 2006 12:38:22 +0200 + +xorg-server (1:1.0.2-0ubuntu8) dapper; urgency=low + + * Fix "XCB rendertest crashes server": + - Add patch 001-CVE-2006-1526.patch.dpatch. + (CVE-2006-1526) + + -- Fabio M. Di Nitto Wed, 03 May 2006 09:01:09 +0200 + +xorg-server (1:1.0.2-0ubuntu7) dapper; urgency=low + + * Ship again xorg.conf(5) + (Closes Ubuntu: #33703) + + -- Fabio M. Di Nitto Mon, 01 May 2006 13:37:40 +0200 + +xorg-server (1:1.0.2-0ubuntu6) dapper; urgency=low + + * Fix severe internal memory corruption: + - Add patch: 000-fix-read-kernel-mapping.patch.dpatch. + (freedesktop bugzilla: #6472) + + -- Fabio M. Di Nitto Fri, 21 Apr 2006 08:07:33 +0200 + +xorg-server (1:1.0.2-0ubuntu5) dapper; urgency=low + + * Fix CPU load when using -sharevts: + - Add patch: 991_sharevts-load-cpu.patch + (Thanks for the initial patch to Michael Witrant) + (Closes Ubuntu: #33611) + + -- Fabio M. Di Nitto Mon, 10 Apr 2006 13:30:26 +0200 + +xorg-server (1:1.0.2-0ubuntu4) dapper; urgency=low + + * Fix SecurityPolicy path to /etc/X11/xserver/SecurityPolicy + and ship an example. NOTE: this file is NOT installed by default, + the WARNING you see in Xorg.0.log is an harmless WARNING. + Add patch: 990_ubuntu_fix_security_policy_path.patch. + (Close Ubuntu: #31608) + + * Readd manpages to the different packages. + + * Ship again ioport, gtf, pcitweak and scanpci. + (Closes Ubuntu: #37720) + + -- Fabio M. Di Nitto Tue, 04 Apr 2006 16:33:00 +0200 + +xorg-server (1:1.0.2-0ubuntu3) dapper; urgency=low + + * What about shipping xorg-server.m4 to make developer life easier? + + -- Fabio M. Di Nitto Thu, 23 Mar 2006 10:32:55 +0100 + +xorg-server (1:1.0.2-0ubuntu2) dapper; urgency=low + + * xserver-xorg-dev Depends: x11proto-randr-dev. + (Closes Ubuntu: #35594) + + -- Fabio M. Di Nitto Wed, 22 Mar 2006 08:09:46 +0100 + +xorg-server (1:1.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Drop patches: + + CVE-2006-0745 + + add-missing-sparc-include + + fix-backtrace + + fix-crash-on-null-addr + + * UVF execption granted by mdz. + + -- Fabio M. Di Nitto Tue, 21 Mar 2006 05:39:01 +0100 + +xorg-server (1:1.0.1-0ubuntu8) dapper; urgency=low + + * [SECURITY] Fix CVE-2006-0745. + + -- Fabio M. Di Nitto Tue, 21 Mar 2006 05:33:50 +0100 + +xorg-server (1:1.0.1-0ubuntu7) dapper; urgency=low + + * debian/control: + - xvfb Depends on xfonts-base too, fix pointed by fabbione + + -- Sebastien Bacher Fri, 3 Mar 2006 22:21:56 +0100 + +xorg-server (1:1.0.1-0ubuntu6) dapper; urgency=low + + * debian/control: + - xvfb Depends on xauth instead of Recommends it + + -- Sebastien Bacher Fri, 17 Feb 2006 16:39:49 +0100 + +xorg-server (1:1.0.1-0ubuntu5) dapper; urgency=low + + * Add missing include on sparc. Fix FTBFS. + + -- Fabio M. Di Nitto Wed, 01 Feb 2006 13:45:41 +0100 + +xorg-server (1:1.0.1-0ubuntu4) dapper; urgency=low + + * Backport from upstream HEAD at Daniel's request: + - Add forgotten HAVE_BACKTRACE define, so that we actually get + backtraces when Xorg segfaults. + + -- Colin Watson Fri, 27 Jan 2006 13:47:56 +0000 + +xorg-server (1:1.0.1-0ubuntu3) dapper; urgency=low + + * Depend on x11-common rather than xorg-common and xserver-common + + -- Tollef Fog Heen Wed, 18 Jan 2006 17:13:12 +0100 + +xorg-server (1:1.0.1-0ubuntu2) dapper; urgency=low + + * Add flex to build-deps, fixing FTBFS. + + -- Tollef Fog Heen Wed, 18 Jan 2006 12:34:03 +0100 + +xorg-server (1:1.0.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Fri, 6 Jan 2006 08:00:52 +1100 + +xorg-server (1:1.0.0-0ubuntu1) dapper; urgency=low + + * New upstream release. + + fbCompositeGeneral is now around 97.3% less stuffed (closes: + Ubuntu#20286). + + 'Fix' mouse issues in the DIX by adding XFree86Server defines (sigh; + closes: Ubuntu#20200). + + Fix Emulate3Buttons mouse posting (closes: Ubuntu#11308). + * Bump Build-Depends on libxt-dev (appdefaultdir), libdrm-dev (libdrm2), and + mesa-swrast-source (new files). + * Add --with-fontdir and scotch --with-default-font-path to fix font paths + for non-Xorg servers (closes: Ubuntu#20157). + * Fix path to SecurityPolicy and RGB_DB. + * Move update-linux-hardened-support call to xserver-xorg-core postinst + (from xserver-xorg postinst). + * Add patch to os/access.c so we don't crash on a null-addressed interface + (closes: Ubuntu#20414). + + -- Daniel Stone Tue, 13 Dec 2005 07:27:13 +1100 + +xorg-server (1:0.99.3-0ubuntu6) dapper; urgency=low + + * Fix xserver-xorg-dev Depends field to only depend on the headers this + this package actually uses. + * Re-add xvfb-run to xfvb (closes: Ubuntu#20157). + + -- Daniel Stone Mon, 5 Dec 2005 15:04:14 +1100 + +xorg-server (1:0.99.3-0ubuntu5) dapper; urgency=low + + * Add -ffunction-sections where needed + * Depend: xserver-common: needed for dexconf and /usr/X11R6/bin/X + + -- LaMont Jones Sat, 26 Nov 2005 05:15:36 +0000 + +xorg-server (1:0.99.3-0ubuntu4) dapper; urgency=low + + * Add two more dependencies to build the other half of the video drivers: + - x11proto-xext-dev, x11proto-video-dev + + -- Adam Conrad Fri, 25 Nov 2005 02:36:44 +1100 + +xorg-server (1:0.99.3-0ubuntu3) dapper; urgency=low + + * Add a few dependencies to xorg-server-dev as the path of least resistance + to get all the various input and video drivers to build again: + - For the video drivers: x11proto-randr-dev, x11proto-render-dev, + x11proto-fonts-dev, x11proto-xf86dri-dev, libdrm-dev + - For the input drivers: x11proto-core-dev, x11proto-input-dev, + x11proto-randr-dev (why do input drivers want randr?) + + -- Adam Conrad Thu, 24 Nov 2005 18:51:25 +1100 + +xorg-server (1:0.99.3-0ubuntu2) dapper; urgency=low + + * Add missing libfreetype6-dev build-depends. + + -- Daniel Stone Thu, 24 Nov 2005 10:26:44 +1100 + +xorg-server (1:0.99.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 21 Nov 2005 14:13:41 +1100 + +xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low + + * Version mesa-swrast-source Build-Dep to 6.4.0 or higher, so GLcore is a + little less crash-happy (e.g. when moving your glxgears window). + * Export /usr/share/xserver-xorg/serverabiver to xserver-xorg-dev, which + describes the relationship needed from a driver on xserver-xorg-core. + + -- Daniel Stone Fri, 28 Oct 2005 13:00:26 +1000 + +xorg-server (1:0.99.2+cvs.20051025-2) dapper; urgency=low + + * Add Build-Deps on libxaw7-dev, libxmu-dev, libxt-dev, libxpm-dev, + libx11-dev, libxtst-dev, and libxres-dev for DMX utils. + + -- Daniel Stone Wed, 26 Oct 2005 14:34:40 +1000 + +xorg-server (1:0.99.2+cvs.20051025-1) dapper; urgency=low + + * Update to new upstream version. + * All applicable patches have been committed upstream, bar #989 and #990. + + -- Daniel Stone Thu, 20 Oct 2005 10:26:33 +1000 + +xorg-server (1:0.99.0+cvs.20050901-1) breezy; urgency=low + + * First xorg-server release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xorg-server-1.0.2.orig/debian/control +++ xorg-server-1.0.2/debian/control @@ -0,0 +1,128 @@ +Source: xorg-server +Section: x11 +Priority: optional +Maintainer: Fabio M. Di Nitto +# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg +# server, and common dependencies for the DIX. +# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server. +# everything on is for the DMX and Xnest servers. +Build-Depends: debhelper (>= 4.0.0), pkg-config, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-evie-dev, x11proto-fixes-dev, x11proto-kb-dev (>= 1.0.1-1), x11proto-xinerama-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1), x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.1.2-1), libxdmcp-dev (>= 1:0.1.3-2), libxfont-dev, libfontenc-dev, libxkbfile-dev (>= 7.0.0-1), x11proto-xf86dri-dev, libdrm-dev (>> 2.0), mesa-swrast-source (>> 6.4.1), x11proto-gl-dev (>= 1.4.1-1), libgl1-mesa-dev, libxmuu-dev (>= 1:6.2.3-1), libxext-dev (>= 1:6.4.3-1), libx11-dev (>= 1:6.2.1+cvs.20050722-1), libxrender-dev (>= 1:0.9.0-1), libxi-dev (>= 1:1.3.0-2), x11proto-dmx-dev, dpatch, libdmx-dev, libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 2:0.99.1-1), libxt-dev (>> 1:0.99.3+cvs.20051212), libxmu-dev (>= 2:0.99.1-1), libxtst-dev (>= 2:0.99.1-1), libxres-dev (>= 1:1.0.2+0.99.1-1), libfreetype6-dev, flex +Standards-Version: 3.6.1.0 + +Package: xserver-xorg-core +Architecture: any +Depends: x11-common, ${shlibs:Depends}, ${misc:Depends} +Recommends: xkeyboard-config +Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 +Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 +Description: X.Org X server -- core server + The X.Org X server is an X server for several architectures and operating + systems, which is derived from the XFree86 4.x series of X servers. + . + The X.Org server supports most modern graphics hardware from most vendors, + and supersedes all XFree86 X servers. + . + More information about X.Org can be found at: + + + . + This module can be found as the module 'xserver/xorg' at + :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg + +Package: xserver-xorg-dev +Architecture: any +Depends: ${misc:Depends}, x11proto-core-dev, x11proto-input-dev, x11proto-xext-dev, x11proto-video-dev, x11proto-render-dev, x11proto-fonts-dev, libdrm-dev, linux-kernel-headers, x11proto-xf86dri-dev, x11proto-randr-dev +Description: X.Org X server -- development files + This package provides development files for the X.Org ('Xorg') X server. + This is not quite the same as the DDK (Driver Development Kit) from the + XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides + headers and a pkg-config file for drivers using autotools to build + against. + . + Unless you are developing or building a driver, you probably want + xserver-xorg and/or xserver-xorg-core instead. + . + More information about X.Org can be found at: + + + . + This module can be found as the module 'xserver/xorg' at + :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg + +Package: xdmx +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Distributed Multihead X server + Xdmx is a proxy X server that uses one or more other X servers as its + display device(s). It provides multi-head X functionality for displays that + might be located on different machines. Xdmx functions as a front-end X server + that acts as a proxy to a set of back-end X servers. All of the visible + rendering is passed to the back-end X servers. Clients connect to the Xdmx + front-end, and everything appears as it would in a regular multi-head + configuration. If Xinerama is enabled (e.g., with +xinerama on the command + line), the clients see a single large screen. + . + More information about X.Org can be found at: + + + . + This module can be found as the module 'xserver/xorg' at + :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg + +Package: xdmx-tools +Architecture: any +Depends: xdmx, ${shlibs:Depends}, ${misc:Depends} +Description: Distributed Multihead X tools + This package provides a collection of tools used for administration of + the Xdmx server; see the xdmx package for more information. + . + More information about X.Org can be found at: + + + . + This module can be found as the module 'xserver/xorg' at + :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg + +Package: xnest +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Nested X server + Xnest is a nested X server that simply relays all its requests to another + X server, where it runs as a client. This means that it appears as another + window in your current X session. Xnest relies upon its parent X server + for font services. + . + Use of the Xephyr X server instead of Xnest is recommended. + . + More information about X.Org can be found at: + + + . + This module can be found as the module 'xserver/xorg' at + :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg + +Package: xvfb +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, xauth, xfonts-base +Description: Virtual Framebuffer 'fake' X server + Xvfb provides an X server that can run on machines with no display hardware + and no physical input devices. It emulates a dumb framebuffer using virtual + memory. The primary use of this server was intended to be server testing, + but other novel uses for it have been found, including testing clients + against unusual depths and screen configurations, doing batch processing with + Xvfb as a background rendering engine, load testing, as an aid to porting the + X server to a new platform, and providing an unobtrusive way to run + applications that don't really need an X server but insist on having one + anyway. + . + This package also contains a convenience script called xvfb-run which + simplifies the automated execution of X clients in a virtual server + environment. This convenience script requires the use of the xauth + program. + . + More information about X.Org can be found at: + + + . + This module can be found as the module 'xserver/xorg' at + :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg --- xorg-server-1.0.2.orig/debian/substvars +++ xorg-server-1.0.2/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.4-1) --- xorg-server-1.0.2.orig/debian/xvfb.install +++ xorg-server-1.0.2/debian/xvfb.install @@ -0,0 +1,2 @@ +usr/bin/Xvfb +usr/share/man/man1/Xvfb.1x --- xorg-server-1.0.2.orig/debian/xserver-xorg-core.postinst +++ xorg-server-1.0.2/debian/xserver-xorg-core.postinst @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ -x /sbin/update-linux-hardened-support ]; then + /sbin/update-linux-hardened-support || true +fi --- xorg-server-1.0.2.orig/debian/xvfb-run.1 +++ xorg-server-1.0.2/debian/xvfb-run.1 @@ -0,0 +1,282 @@ +.\" Copyright 1998--2004 Branden Robinson . +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.\" +.\" We need the URL macro from groff's www macro package, but also want +.\" things to work all right for people who don't have it. So we define +.\" our own URL macro and let the www macro package override it if it's +.\" available. +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" +.SH NAME +xvfb\-run \- run specified X client or command in a virtual X server environment +.SH SYNOPSIS +.B xvfb\-run +[ +.I options +] +.I command +.SH DESCRIPTION +.B xvfb\-run +is a wrapper for the +.BR Xvfb (1x) +command which simplifies the task of running commands (typically an X +client, or a script containing a list of clients to be run) within a virtual +X server environment. +.PP +.B xvfb\-run +sets up an X authority file (or uses an existing user\-specified one), +writes a cookie to it (see +.BR xauth (1x)) +and then starts the +.B Xvfb +X server as a background process. +The process ID of +.B Xvfb +is stored for later use. +The specified +.I command +is then run using the X display corresponding to the +.B Xvfb +server +just started and the X authority file created earlier. +.PP +When the +.I command +exits, its status is saved, the +.B Xvfb +server is killed (using the process ID stored earlier), the X authority +cookie removed, and the authority file deleted (if the user did not specify +one to use). +.B xvfb\-run +then exits with the exit status of +.IR command . +.PP +.B xvfb\-run +requires the +.B xauth +command to function. +.SH OPTIONS +.TP +.B \-a\fR,\fB \-\-auto\-servernum +Try to get a free server number, starting at 99, or the argument to +.BR \-\-server\-num . +.TP +.BI \-e\ file \fR,\fB\ \-\-error\-file= file +Store output from +.B xauth +and +.B Xvfb +in +.IR file . +The default is +.IR /dev/null . +.TP +.BI \-f\ file \fR,\fB\ \-\-auth\-file= file +Store X authentication data in +.IR file . +By default, a temporary directory called +.IR xvfb\-run. PID +(where PID is the process ID of +.B xvfb\-run +itself) is created in the directory specified by the environment variable +.B TMPDIR +(or +.I /tmp +if that variable is null or unset), and the +.BR tempfile (1) +command is used to create a file in that temporary directory called +.IR Xauthority . +.TP +.B \-h\fR,\fB \-\-help +Display a usage message and exit. +.TP +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +Use +.I servernumber +as the server number (but see the +.B \-a\fR,\fB \-\-auto\-servernum +option above). +The default is 99. +.TP +.B \-l\fR,\fB \-\-listen\-tcp +Enable TCP port listening in the X server. +For security reasons (to avoid denial\-of\-service attacks or exploits), +TCP port listening is disabled by default. +.TP +.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname +Use +.I protocolname +as the X authority protocol to use. +The default is \(oq.\(cq, which +.B xauth +interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. +.TP +.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments +Pass +.I arguments +to the +.B Xvfb +server. +Be careful to quote any whitespace characters that may occur within +.I arguments +to prevent them from regarded as separators for +.BR xvfb\-run 's +own arguments. +Also, note that specification of \(oq\-nolisten tcp\(cq in +.I arguments +may override the function of +.BR xvfb\-run 's +own +.B \-l\fR,\fB \-\-listen\-tcp +option, and that specification of the server number (e.g., \(oq:1\(cq) may +be ignored because of the way the X server parses its argument list. +Use the +.B xvfb\-run +option +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +to achieve the latter function. +The default is \(oq\-screen 0 640x480x8\(cq. +.TP +.BI \-w\ delay \fR,\fB\ \-\-wait= delay +Wait +.I delay +seconds after launching +.B Xvfb +before attempting to start the specified command. +The default is 3. +.SH ENVIRONMENT +.TP +.B COLUMNS +indicates the width of the terminal device in character cells. +This value is used for formatting diagnostic messages. +If not set, the terminal is queried using +.BR stty (1) +to determine its width. +If that fails, a value of \(oq80\(cq is assumed. +.TP +.B TMPDIR +specifies the directory in which to place +.BR xvfb\-run 's +temporary directory for storage of the X authority file; only used if the +.B \-f +or +.B \-\-auth\-file +options are not specified. +.SH "OUTPUT FILES" +.PP +Unless the +.B \-f +or +.B \-\-auth\-file +options are specified, a temporary +directory and file within it are created (and deleted) to store the X +authority cookies used by the +.B Xvfb +server and client(s) run under it. +See +.BR tempfile (1). +If \-f or \-\-auth\-file are used, then the specified X authority file is +only written to, not created or deleted (though +.B xauth +creates an authority file itself if told to use use that does not already +exist). +.PP +An error file with a user\-specified name is also created if the +.B \-e +or +.B \-\-error\-file +options are specifed; see above. +.SH "EXIT STATUS" +.B xvfb\-run +uses its exit status as well as output to standard error to communicate +diagnostics. +The exit status of \(oq1\(cq is not used, and should be interpreted as failure +of the specified command. +.TP +0 +.B xvfb\-run +only uses this exit status if the +.B \-h\fR,\fB \-\-help +option is given. +In all other situations, this may be interpreted as success of the specified +command. +.TP +2 +No command to run was specified. +.TP +3 +The +.B xauth +command is not available. +.TP +4 +The temporary directory that was going to be used already exists; since +.B xvfb\-run +produces a uniquely named directory, this may indicate an attempt by another +process on the system to exploit a temporary file race condition. +.TP +5 +A problem was encountered while cleaning up the temporary directory. +.TP +6 +A problem was encountered while using +.BR getopt (1) +to parse the command\-line arguments. +.SH EXAMPLES +.TP +.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo +runs the +.BR xlogo (1x) +demonstration client inside the +.B Xvfb +X server on the first available server number greater than or equal to 1. +.TP +.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces +runs the +.BR ico (1x) +demonstration client (and passes it the +.B \-faces +argument) inside the +.B Xvfb +X server, configured with a root window of 1024 by 768 pixels and a color +depth of 24 bits. +.PP +Note that the demo X clients used in the above examples will not exit on +their own, so they will have to be killed before +.B xvfb\-run +will exit. +.SH BUGS +See +.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . +If you wish to report a bug in +.BR xvfb\-run , +please see +.I /usr/share/doc/debian/bug\-reporting.txt +or the +.BR reportbug (1) +command. +.SH AUTHOR +.B xfvb\-run +was written by Branden Robinson and Jeff Licquia with sponsorship from +Progeny Linux Systems. +.SH "SEE ALSO" +.BR Xvfb (1x), +.BR xauth (1x) +.\" vim:set et tw=80: --- xorg-server-1.0.2.orig/debian/xvfb-run +++ xorg-server-1.0.2/debian/xvfb-run @@ -0,0 +1,172 @@ +#!/bin/sh + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +PATH=$PATH:/usr/bin/X11:/usr/X11R6/bin + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="${TMPDIR:-/tmp}/$PROGNAME.$$" + if ! mkdir -p -m 700 "$XVFB_RUN_TMPDIR"; then + error "temporary directory $XVFB_RUN_TMPDIR already exists" + exit 4 + fi + AUTHFILE=$(tempfile -n "$XVFB_RUN_TMPDIR/Xauthority") +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \ + >"$ERRORFILE" 2>&1 +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Clean up. +XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1 +if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi +fi + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: --- xorg-server-1.0.2.orig/debian/xnest.install +++ xorg-server-1.0.2/debian/xnest.install @@ -0,0 +1,2 @@ +usr/bin/Xnest +usr/share/man/man1/Xnest.1x --- xorg-server-1.0.2.orig/debian/xserver-xorg-dev.install +++ xorg-server-1.0.2/debian/xserver-xorg-dev.install @@ -0,0 +1,3 @@ +usr/include/xorg/* +usr/lib/pkgconfig/xorg-server.pc +usr/share/aclocal/xorg-server.m4 --- xorg-server-1.0.2.orig/debian/serverabiver +++ xorg-server-1.0.2/debian/serverabiver @@ -0,0 +1 @@ +1:0.99.2+cvs.20051025-1 --- xorg-server-1.0.2.orig/debian/xvfb.manpages +++ xorg-server-1.0.2/debian/xvfb.manpages @@ -0,0 +1 @@ +debian/xvfb-run.1 --- xorg-server-1.0.2.orig/debian/xserver-xorg-core.install +++ xorg-server-1.0.2/debian/xserver-xorg-core.install @@ -0,0 +1,16 @@ +usr/bin/Xorg +usr/bin/ioport +usr/bin/gtf +usr/bin/pcitweak +usr/bin/scanpci +usr/lib/xorg/modules/*.so +usr/lib/xorg/modules/extensions/*.so +usr/lib/xorg/modules/linux/*.so +usr/lib/xorg/modules/fonts/*.so +usr/lib/xorg/modules/multimedia/*.so +usr/share/man/man1/Xorg.1x +usr/share/man/man1/Xserver.1x +usr/share/man/man1/gtf.1x +usr/share/man/man1/pcitweak.1x +usr/share/man/man1/scanpci.1x +usr/share/man/man5/xorg.conf.5x --- xorg-server-1.0.2.orig/debian/compat +++ xorg-server-1.0.2/debian/compat @@ -0,0 +1 @@ +4 --- xorg-server-1.0.2.orig/debian/xdmx.install +++ xorg-server-1.0.2/debian/xdmx.install @@ -0,0 +1,3 @@ +usr/bin/Xdmx +usr/bin/xdmx +usr/share/man/man1/Xdmx.1x --- xorg-server-1.0.2.orig/debian/patches/00list +++ xorg-server-1.0.2/debian/patches/00list @@ -0,0 +1,10 @@ +000-fix-read-kernel-mapping.patch +001-CVE-2006-1526.patch +002_fix_for_certain_intel_chipsets.patch +003_fix_setuid_handling +004_xf86dri_byte_swapped_clients.dpatch +005_pci_domain.dpatch +989_ubuntu_add_extra_modelines_from_xorg.patch +990_ubuntu_fix_security_policy_path.patch +991_sharevts-load-cpu.patch +992_linux_bios_bug_6751.dpatch --- xorg-server-1.0.2.orig/debian/patches/992_linux_bios_bug_6751.dpatch +++ xorg-server-1.0.2/debian/patches/992_linux_bios_bug_6751.dpatch @@ -0,0 +1,269 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 992_linux_bios_bug_6751.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: X.org breaks on newer Linux kernels as it re-writes BARs behind the kernels back +## DP: when attempting to read the ROMs, this causes crashes and hangs on dual-card +## DP: systems. https://bugs.freedesktop.org/show_bug.cgi?id=6751 +## DP: Adjusted for X.Org 6.9/7.0 by Stefan Dirsch +## DP: https://bugzilla.novell.com/show_bug.cgi?id=171453&x=0&y=0 + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/bus/Pci.c xorg-server-1.0.2/hw/xfree86/os-support/bus/Pci.c +--- xorg-server-1.0.2~/hw/xfree86/os-support/bus/Pci.c 2005-11-08 17:04:56.000000000 -0200 ++++ xorg-server-1.0.2/hw/xfree86/os-support/bus/Pci.c 2006-07-09 05:23:11.000000000 -0300 +@@ -233,6 +233,8 @@ + + static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, }; + ++static int (*pciOSHandleBIOS)(PCITAG Tag, ADDRESS offset, int len, unsigned char *buf); ++ + /* + * Platform specific PCI function pointers. + * +@@ -266,6 +268,13 @@ + #endif + } + ++void ++pciSetOSBIOSPtr(int (*bios_fn) ++ (PCITAG Tag, ADDRESS offset, int len, unsigned char * buf)) ++{ ++ pciOSHandleBIOS = bios_fn; ++} ++ + PCITAG + pciFindFirst(CARD32 id, CARD32 mask) + { +@@ -1113,14 +1122,13 @@ + + static int + handlePciBIOS(PCITAG Tag, int basereg, +- int (*func)(PCITAG, CARD8*, ADDRESS, pointer), ++ int (*func)(PCITAG, ADDRESS, pointer), + pointer args) + { + CARD32 romsave = 0; + int i; + romBaseSource b_reg; + ADDRESS hostbase; +- CARD8 tmp[64]; + int ret = 0; + + romsave = pciReadLong(Tag, PCI_MAP_ROM_REG); +@@ -1174,19 +1182,15 @@ + + hostbase = pciBusAddrToHostAddr(Tag, PCI_MEM, PCIGETROM(romaddr)); + +- if ((xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) != +- sizeof(tmp)) || +- (tmp[0] != 0x55) || (tmp[1] != 0xaa) || !tmp[2] ) { ++ ret = (*func)(Tag, hostbase, args); + /* Restore the base registers if they were changed. */ +- pciWriteLong(Tag, PCI_MAP_ROM_REG, romsave); +- if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), +- (CARD32) savebase); ++ pciWriteLong(Tag, PCI_MAP_ROM_REG, romsave); ++ if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), ++ (CARD32) savebase); + +- /* No BIOS found: try another address */ +- continue; +- } ++ /* No BIOS found: try another address */ ++ if (ret < 0) continue; + +- ret = (*func)(Tag, tmp, hostbase, args); + + /* Restore the base register if it was changed. */ + if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), +@@ -1208,20 +1212,28 @@ + PciBiosType BiosType; + } readBios, *readBiosPtr; + ++typedef int(*ReadBIOSFunc)(PCITAG Tag, ADDRESS base, int len, unsigned char *buf); ++ + static int +-readPciBios(PCITAG Tag, CARD8* tmp, ADDRESS hostbase, pointer args) ++readPciBios(PCITAG Tag, ReadBIOSFunc func, ADDRESS base, pointer args) + { + unsigned int image_length = 0; + readBiosPtr rd = args; + int ret; ++ CARD8 tmp[64]; + ++ if ((func(Tag, base, sizeof(tmp), tmp) != ++ sizeof(tmp)) || ++ (tmp[0] != 0x55) || (tmp[1] != 0xaa) || !tmp[2] ) ++ return -1; ++ + /* We found a PCI BIOS Image. Now we look for the correct type */ + while ((tmp[0] == 0x55) && (tmp[1] == 0xAA)) { + unsigned short data_off = tmp[0x18] | (tmp[0x19] << 8); + unsigned char data[0x18]; + unsigned char type; + +- if ((xf86ReadDomainMemory(Tag, hostbase + data_off, sizeof(data), data) ++ if ((func(Tag, base + data_off, sizeof(data), data) + != sizeof(data)) || + (data[0] != 'P') || + (data[1] != 'C') || +@@ -1242,8 +1254,8 @@ + ErrorF("data image length: 0x%x, ind: 0x%x\n", + image_length, indicator); + #endif +- hostbase += i_length; +- if (xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) ++ base += i_length; ++ if (func(Tag, base, sizeof(tmp), tmp) + != sizeof(tmp)) + break; + continue; +@@ -1283,19 +1295,47 @@ + } + + /* Read BIOS */ +- ret = xf86ReadDomainMemory(Tag, hostbase + rd->Offset, rd->Len, rd->Buf); ++ ret = func(Tag, base + rd->Offset, rd->Len, rd->Buf); + } + + return ret; + } + + static int +-getPciBIOSTypes(PCITAG Tag, CARD8* tmp, ADDRESS hostbase, pointer arg) ++readPciBiosFromDomainMem(PCITAG Tag, ADDRESS hostbase, ++ pointer args) ++{ ++#ifdef PRINT_PCI ++ ErrorF("readPciBiosFromDomainMem\n"); ++#endif ++ return readPciBios(Tag, xf86ReadDomainMemory, hostbase, args); ++} ++ ++static int ++readPciBiosFromOS(PCITAG Tag, pointer args) ++{ ++#ifdef PRINT_PCI ++ ErrorF("readPciBiosFromOS\n"); ++#endif ++ if (pciOSHandleBIOS) ++ return readPciBios(Tag, pciOSHandleBIOS, 0, args); ++ else ++ return 0; ++} ++ ++static int ++getPciBIOSTypes(PCITAG Tag, ADDRESS hostbase, pointer arg) + { + int n = 0; + PciBiosType *Buf = arg; ++ CARD8 tmp[64]; + +- /* We found a PCI BIOS Image. Now we collect the types type */ ++ if ((xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) != ++ sizeof(tmp)) || ++ (tmp[0] != 0x55) || (tmp[1] != 0xaa) || !tmp[2] ) ++ return -1; ++ ++ /* We found a PCI BIOS Image. Now we collect the types type */ + do { + unsigned short data_off = tmp[0x18] | (tmp[0x19] << 8); + unsigned char data[0x16]; +@@ -1339,7 +1379,7 @@ + + static int + HandlePciBios(PCITAG Tag, int basereg, +- int (*func)(PCITAG, CARD8*, ADDRESS, pointer), ++ int (*func)(PCITAG, ADDRESS, pointer), + pointer ptr) + { + int n, num; +@@ -1393,7 +1433,10 @@ + rb.Buf = Buf; + rb.BiosType = Type; + +- return HandlePciBios(Tag, basereg, readPciBios, &rb); ++ if (pciOSHandleBIOS) ++ return readPciBiosFromOS(Tag, &rb); ++ ++ return HandlePciBios(Tag, basereg, readPciBiosFromDomainMem, &rb); + } + + int +diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/bus/Pci.h xorg-server-1.0.2/hw/xfree86/os-support/bus/Pci.h +--- xorg-server-1.0.2~/hw/xfree86/os-support/bus/Pci.h 2005-11-08 17:04:56.000000000 -0200 ++++ xorg-server-1.0.2/hw/xfree86/os-support/bus/Pci.h 2006-07-09 05:23:11.000000000 -0300 +@@ -430,7 +430,9 @@ + CARD32 pciByteSwap(CARD32); + Bool pciMfDev(int, int); + ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS); +- ++extern void pciSetOSBIOSPtr(int (*bios_fn) ++ (PCITAG Tag, ADDRESS offset, int len, unsigned char * buf)); ++ + extern PCITAG (*pciFindFirstFP)(void); + extern PCITAG (*pciFindNextFP)(void); + +diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/bus/linuxPci.c xorg-server-1.0.2/hw/xfree86/os-support/bus/linuxPci.c +--- xorg-server-1.0.2~/hw/xfree86/os-support/bus/linuxPci.c 2005-11-08 17:04:56.000000000 -0200 ++++ xorg-server-1.0.2/hw/xfree86/os-support/bus/linuxPci.c 2006-07-09 05:33:47.000000000 -0300 +@@ -73,6 +73,7 @@ + static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val); + static CARD16 linuxPciCfgReadWord(PCITAG tag, int off); + static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val); ++static int linuxPciHandleBIOS(PCITAG Tag, ADDRESS offset, int len, unsigned char *buf); + + static pciBusFuncs_t linuxFuncs0 = { + /* pciReadLong */ linuxPciCfgRead, +@@ -125,6 +126,7 @@ + pciBusInfo[0] = &linuxPci0; + pciFindFirstFP = pciGenFindFirst; + pciFindNextFP = pciGenFindNext; ++ pciSetOSBIOSPtr(linuxPciHandleBIOS); + } + + static int +@@ -892,3 +894,42 @@ + } + + #endif /* !INCLUDE_XF86_NO_DOMAIN */ ++ ++int ++linuxPciHandleBIOS(PCITAG Tag, ADDRESS offset, int len, unsigned char *buf) ++{ ++ unsigned int dom, bus, dev, func; ++ unsigned int fd; ++ char file[256]; ++ struct stat st; ++ int ret; ++ int sofar = 0; ++ ++ dom = PCI_DOM_FROM_TAG(Tag); ++ bus = PCI_BUS_FROM_TAG(Tag); ++ dev = PCI_DEV_FROM_TAG(Tag); ++ func = PCI_FUNC_FROM_TAG(Tag); ++ sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom", ++ dom, bus, dev, func); ++ ++ if (stat(file, &st) == 0 && (fd = open(file, O_RDWR))) { ++ ++ /* enable the ROM first */ ++ write(fd, "1", 2); ++ lseek(fd, offset, SEEK_SET); ++ do { ++ /* copy the ROM until we hit Len, EOF or read error */ ++ ret = read(fd, buf+sofar, len-sofar); ++ if (ret <= 0) ++ break; ++ sofar += ret; ++ } while (sofar < len); ++ ++ write(fd, "0", 2); ++ close(fd); ++ if (sofar < len) ++ xf86MsgVerb(X_INFO, 3, "Attempted to read BIOS %dKB from %s: got %dKB\n", len/1024, file, sofar/1024); ++ return sofar; ++ } ++ return 0; ++} --- xorg-server-1.0.2.orig/debian/patches/004_xf86dri_byte_swapped_clients.dpatch +++ xorg-server-1.0.2/debian/patches/004_xf86dri_byte_swapped_clients.dpatch @@ -0,0 +1,104 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 004_xf86dri-byte-swapped-clients.patch by Rodrigo Parra Novo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: From: Michel Dänzer +## DP: Date: Sat, 24 Jun 2006 13:02:56 +0000 (+0200) +## DP: Subject: Bug #7213: Fix the XFree86-DRI extension for byte-swapped clients. +## DP: X-Git-Tag: xorg-server-1.1.99.3 +## DP: X-Git-Url: http://gitweb.freedesktop.org/?p=xorg-xserver;a=commitdiff;h=4426215a6e99f84550aaac23ac9c2018668bfbc1 +## DP: +## DP: Bug #7213: Fix the XFree86-DRI extension for byte-swapped clients. +## DP: +## DP: These clients are by definition non-local and thus not direct rendering +## DP: capable, but they still need the QueryVersion and QueryDirectRenderingCapable +## DP: requests to find out cleanly. +## DP: --- + +@DPATCH@ +--- a/hw/xfree86/dri/xf86dri.c ++++ b/hw/xfree86/dri/xf86dri.c +@@ -81,6 +81,7 @@ static DISPATCH_PROC(ProcXF86DRIDispatch + static DISPATCH_PROC(ProcXF86DRIAuthConnection); + + static DISPATCH_PROC(SProcXF86DRIQueryVersion); ++static DISPATCH_PROC(SProcXF86DRIQueryDirectRenderingCapable); + static DISPATCH_PROC(SProcXF86DRIDispatch); + + static void XF86DRIResetProc(ExtensionEntry* extEntry); +@@ -142,6 +143,9 @@ ProcXF86DRIQueryVersion( + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); ++ swaps(&rep.majorVersion, n); ++ swaps(&rep.minorVersion, n); ++ swapl(&rep.patchVersion, n); + } + WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep); + return (client->noClientException); +@@ -154,6 +158,7 @@ ProcXF86DRIQueryDirectRenderingCapable( + { + xXF86DRIQueryDirectRenderingCapableReply rep; + Bool isCapable; ++ register int n; + + REQUEST(xXF86DRIQueryDirectRenderingCapableReq); + REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq); +@@ -172,9 +177,14 @@ ProcXF86DRIQueryDirectRenderingCapable( + } + rep.isCapable = isCapable; + +- if (!LocalClient(client)) ++ if (!LocalClient(client) || client->swapped) + rep.isCapable = 0; + ++ if (client->swapped) { ++ swaps(&rep.sequenceNumber, n); ++ swapl(&rep.length, n); ++ } ++ + WriteToClient(client, + sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep); + return (client->noClientException); +@@ -627,22 +637,35 @@ SProcXF86DRIQueryVersion( + } + + static int ++SProcXF86DRIQueryDirectRenderingCapable( ++ register ClientPtr client ++) ++{ ++ register int n; ++ REQUEST(xXF86DRIQueryDirectRenderingCapableReq); ++ swaps(&stuff->length, n); ++ swapl(&stuff->screen, n); ++ return ProcXF86DRIQueryDirectRenderingCapable(client); ++} ++ ++static int + SProcXF86DRIDispatch ( + register ClientPtr client + ) + { + REQUEST(xReq); + +- /* It is bound to be non-local when there is byte swapping */ +- if (!LocalClient(client)) +- return DRIErrorBase + XF86DRIClientNotLocal; +- +- /* only local clients are allowed DRI access */ ++ /* ++ * Only local clients are allowed DRI access, but remote clients still need ++ * these requests to find out cleanly. ++ */ + switch (stuff->data) + { + case X_XF86DRIQueryVersion: + return SProcXF86DRIQueryVersion(client); ++ case X_XF86DRIQueryDirectRenderingCapable: ++ return SProcXF86DRIQueryDirectRenderingCapable(client); + default: +- return BadRequest; ++ return DRIErrorBase + XF86DRIClientNotLocal; + } + } --- xorg-server-1.0.2.orig/debian/patches/005_pci_domain.dpatch +++ xorg-server-1.0.2/debian/patches/005_pci_domain.dpatch @@ -0,0 +1,192 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 005_pci_domain.dpatch by Rodrigo Parra Novo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: I've been plagued with having a sparc64 machine which is multi-domain +## DP: PCI and my video card is on domain 1. Instead of going off and +## DP: forking the linuxPci.c code like was done for Alpha I tried to do +## DP: something that would work on PPC and other non-sparc64 platforms. +## DP: +## DP: One thing of note is that it might be a good idea to dynamically +## DP: allocate the pciBusInfo[] array after ARCH_PCI_INIT() has run +## DP: and pciMaxBusNum has it's final stable value. With even moderate +## DP: domain values like 128 or 256, this static table gets a bit +## DP: large. +## DP: +## DP: Anyways, the general idea is to run over the dirents under +## DP: /proc/bus/pci/ and if we find colon encoded directory names +## DP: of the form "%x:%x" we use that to determine which domains +## DP: exist on the machine. This is implemented in the function +## DP: linuxPci.c:probe_domains(). +## DP: +## DP: For each domain found, we allocate a pciBusInfo_t and stick that into +## DP: the pciBusInfo[] entry for bus zero on the found domain. +## DP: +## DP: If we don't find any domains, that's ok, we just revert to existing +## DP: behavior which is to assign &linuxPci0 to pciBusInfo[0] and set +## DP: pciNumBuses to 1. +## DP: +## DP: I then set pciMaxBusNum to whatever we calculated pciNumBuses to +## DP: be, otherwise Pci.c goes absolutely bananas probing domains that +## DP: don't exist and results in an enormous number of PCI config space +## DP: accesses to every possible bus on every non-existent domain, which +## DP: makes the X server sit for a few seconds chugging and doing +## DP: nothing but stat() and open() calls. :-) +## DP: +## DP: The final part of this change is to make linuxPciOpenFile() open +## DP: domain'd files correctly. Instead of "0000" we put the actual +## DP: domain number there in the file path string, and we track the +## DP: domain of the cached file descriptor so that still works correctly +## DP: as well. +## DP: +## DP: With this I have X11R7 CVS working on my sparc64 Radeon card, which +## DP: sits on domain 1. +## DP: +## DP: Comments? + +@DPATCH@ +--- ./hw/xfree86/os-support/bus/Pci.h.~1~ 2005-12-24 17:55:56.000000000 -0800 ++++ ./hw/xfree86/os-support/bus/Pci.h 2005-12-24 18:01:06.000000000 -0800 +@@ -124,6 +124,10 @@ + # define MAX_PCI_DOMAINS 512 + # define PCI_DOM_MASK 0x01fful + # define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ ++#elif defined(linux) ++# define MAX_PCI_DOMAINS 256 ++# define PCI_DOM_MASK 0x00fful ++# define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ + #else + # define MAX_PCI_BUSES 256 /* Max number of PCI buses */ + #endif +--- ./hw/xfree86/os-support/bus/linuxPci.c.~1~ 2005-11-08 11:04:56.000000000 -0800 ++++ ./hw/xfree86/os-support/bus/linuxPci.c 2005-12-27 21:57:56.000000000 -0800 +@@ -50,6 +50,8 @@ + #endif + + #include ++#include ++#include + #include "compiler.h" + #include "xf86.h" + #include "xf86Priv.h" +@@ -111,18 +113,68 @@ static pciBusInfo_t linuxPci0 = { + /* bridge */ NULL + }; + ++static int ++probe_domains(void) ++{ ++ struct dirent *dent; ++ int found, max_bus; ++ DIR *dir; ++ ++ dir = opendir("/proc/bus/pci"); ++ if (!dir) ++ return -1; ++ ++ found = 0; ++ max_bus = -1; ++ while ((dent = readdir(dir)) != NULL) { ++ int domain, bus, ret; ++ ++ ret = sscanf(dent->d_name, "%x:%x", &domain, &bus); ++ if (ret != 2) ++ continue; ++ ++ bus = PCI_MAKE_BUS(domain, bus); ++ if (bus + 1 > pciNumBuses) ++ pciNumBuses = bus + 1; ++ ++ bus = PCI_MAKE_BUS(domain, 0); ++ if (pciBusInfo[bus] != NULL) ++ continue; ++ ++ found++; ++ ++ pciBusInfo[bus] = xnfalloc(sizeof(pciBusInfo_t)); ++ memcpy(pciBusInfo[bus], &linuxPci0, sizeof(pciBusInfo_t)); ++ } ++ ++ xf86MsgVerb(X_INFO, 2, "PCI: Found %d domains.\n", found); ++ ++ if (!found) { ++ pciNumBuses = 1; ++ pciBusInfo[0] = &linuxPci0; ++ } ++ ++ pciMaxBusNum = pciNumBuses; ++ ++ return 0; ++} ++ + void +-linuxPciInit() ++linuxPciInit(void) + { + struct stat st; ++ int num_domains; ++ + if ((xf86Info.pciFlags == PCIForceNone) || + (-1 == stat("/proc/bus/pci", &st))) { + /* when using this as default for all linux architectures, + we'll need a fallback for 2.0 kernels here */ + return; + } +- pciNumBuses = 1; +- pciBusInfo[0] = &linuxPci0; ++ num_domains = probe_domains(); ++ if (num_domains < 0) ++ return; ++ + pciFindFirstFP = pciGenFindFirst; + pciFindNextFP = pciGenFindNext; + } +@@ -130,31 +182,33 @@ linuxPciInit() + static int + linuxPciOpenFile(PCITAG tag, Bool write) + { +- static int lbus,ldev,lfunc,fd = -1,is_write = 0; +- int bus, dev, func; ++ static int ldom,lbus,ldev,lfunc,fd = -1,is_write = 0; ++ int dom, bus, dev, func; + char file[32]; + struct stat ignored; + + bus = PCI_BUS_FROM_TAG(tag); ++ dom = PCI_DOM_FROM_BUS(bus); ++ bus = PCI_BUS_NO_DOMAIN(bus); + dev = PCI_DEV_FROM_TAG(tag); + func = PCI_FUNC_FROM_TAG(tag); + if (fd == -1 || (write && (!is_write)) +- || bus != lbus || dev != ldev || func != lfunc) { ++ || ldom != dom || bus != lbus || dev != ldev || func != lfunc) { + if (fd != -1) + close(fd); + if (bus < 256) { + sprintf(file,"/proc/bus/pci/%02x",bus); + if (stat(file, &ignored) < 0) +- sprintf(file, "/proc/bus/pci/0000:%02x/%02x.%1x", +- bus, dev, func); ++ sprintf(file, "/proc/bus/pci/%04x:%02x/%02x.%1x", ++ dom, bus, dev, func); + else + sprintf(file, "/proc/bus/pci/%02x/%02x.%1x", + bus, dev, func); + } else { + sprintf(file,"/proc/bus/pci/%04x",bus); + if (stat(file, &ignored) < 0) +- sprintf(file, "/proc/bus/pci/0000:%04x/%02x.%1x", +- bus, dev, func); ++ sprintf(file, "/proc/bus/pci/%04x:%04x/%02x.%1x", ++ dom, bus, dev, func); + else + sprintf(file, "/proc/bus/pci/%04x/%02x.%1x", + bus, dev, func); +@@ -172,6 +226,7 @@ linuxPciOpenFile(PCITAG tag, Bool write) + is_write = FALSE; + } + ++ ldom = dom; + lbus = bus; + ldev = dev; + lfunc = func; --- xorg-server-1.0.2.orig/debian/patches/003_fix_setuid_handling.dpatch +++ xorg-server-1.0.2/debian/patches/003_fix_setuid_handling.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 003_fix_setuid_handling.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/hw/xfree86/common/xf86Init.c xorg-server-1.0.2/hw/xfree86/common/xf86Init.c +--- xorg-server-1.0.2~/hw/xfree86/common/xf86Init.c 2006-03-16 22:41:32.000000000 +0100 ++++ xorg-server-1.0.2/hw/xfree86/common/xf86Init.c 2006-07-10 12:28:45.000000000 +0200 +@@ -1905,7 +1905,11 @@ + FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno)); + break; + case 0: /* child */ +- setuid(getuid()); ++ if (setuid(getuid()) == -1) { ++ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n", ++ strerror(errno)); ++ exit(255); ++ } + /* set stdin, stdout to the consoleFd */ + for (i = 0; i < 2; i++) { + if (xf86Info.consoleFd != i) { +diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/shared/libc_wrapper.c xorg-server-1.0.2/hw/xfree86/os-support/shared/libc_wrapper.c +--- xorg-server-1.0.2~/hw/xfree86/os-support/shared/libc_wrapper.c 2005-07-03 10:53:48.000000000 +0200 ++++ xorg-server-1.0.2/hw/xfree86/os-support/shared/libc_wrapper.c 2006-07-10 12:28:45.000000000 +0200 +@@ -1270,7 +1270,10 @@ + #ifndef SELF_CONTAINED_WRAPPER + xf86DisableIO(); + #endif +- setuid(getuid()); ++ if (setuid(getuid()) == -1) { ++ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno)); ++ exit(255); ++ } + #if !defined(SELF_CONTAINED_WRAPPER) + /* set stdin, stdout to the consoleFD, and leave stderr alone */ + for (i = 0; i < 2; i++) +diff -urNad xorg-server-1.0.2~/hw/xfree86/parser/write.c xorg-server-1.0.2/hw/xfree86/parser/write.c +--- xorg-server-1.0.2~/hw/xfree86/parser/write.c 2005-07-03 09:01:37.000000000 +0200 ++++ xorg-server-1.0.2/hw/xfree86/parser/write.c 2006-07-10 12:28:45.000000000 +0200 +@@ -170,7 +170,10 @@ + strerror(errno)); + return 0; + case 0: /* child */ +- setuid(getuid()); ++ if (setuid(getuid() == -1) ++ FatalError("xf86writeConfigFile(): " ++ "setuid failed(%s)\n", ++ strerror(errno)); + ret = doWriteConfigFile(filename, cptr); + exit(ret); + break; +diff -urNad xorg-server-1.0.2~/os/utils.c xorg-server-1.0.2/os/utils.c +--- xorg-server-1.0.2~/os/utils.c 2005-11-08 07:33:30.000000000 +0100 ++++ xorg-server-1.0.2/os/utils.c 2006-07-10 12:28:45.000000000 +0200 +@@ -1718,8 +1718,10 @@ + case -1: /* error */ + p = -1; + case 0: /* child */ +- setgid(getgid()); +- setuid(getuid()); ++ if (setgid(getgid()) == -1) ++ _exit(127); ++ if (setuid(getuid()) == -1) ++ _exit(127); + execl("/bin/sh", "sh", "-c", command, (char *)NULL); + _exit(127); + default: /* parent */ +@@ -1770,8 +1772,10 @@ + xfree(cur); + return NULL; + case 0: /* child */ +- setgid(getgid()); +- setuid(getuid()); ++ if (setgid(getgid()) == -1) ++ _exit(127); ++ if (setuid(getuid()) == -1) ++ _exit(127); + if (*type == 'r') { + if (pdes[1] != 1) { + /* stdout */ +@@ -1845,8 +1849,10 @@ + xfree(cur); + return NULL; + case 0: /* child */ +- setgid(getgid()); +- setuid(getuid()); ++ if (setgid(getgid()) == -1) ++ _exit(127); ++ if (setuid(getuid()) == -1) ++ _exit(127); + if (*type == 'r') { + if (pdes[1] != 1) { + /* stdout */ --- xorg-server-1.0.2.orig/debian/patches/002_fix_for_certain_intel_chipsets.patch +++ xorg-server-1.0.2/debian/patches/002_fix_for_certain_intel_chipsets.patch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_fix_for_certain_intel_chipsets.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./hw/xfree86/common/xf86pciBus.c /tmp/dpep-work.sYNMum/xorg-server-1.0.2/hw/xfree86/common/xf86pciBus.c +--- ./hw/xfree86/common/xf86pciBus.c 2005-07-04 20:41:02.000000000 +0200 ++++ /tmp/dpep-work.sYNMum/xorg-server-1.0.2/hw/xfree86/common/xf86pciBus.c 2006-05-04 00:57:05.831956042 +0200 +@@ -1800,7 +1800,16 @@ + PciBus->brfunc = pcrp->funcnum; + + PciBus->subclass = sub_class; +- PciBus->interface = pcrp->pci_prog_if; ++ ++ /* The Intel bridges don't report as transparent ++ but guess what they are - from Linux kernel - airlied */ ++ if ((pcrp->pci_vendor == PCI_VENDOR_INTEL) && ++ ((pcrp->pci_device & 0xff00) == 0x2400)) { ++ xf86MsgVerb(X_INFO, 3, "Intel Bridge workaround enabled\n"); ++ PciBus->interface = PCI_IF_BRIDGE_PCI_SUBTRACTIVE; ++ } else { ++ PciBus->interface = pcrp->pci_prog_if; ++ } + + if (pBusInfo && pBusInfo->funcs->pciControlBridge) + PciBus->brcontrol = +diff -urNad --exclude=CVS --exclude=.svn ./hw/xfree86/os-support/shared/stdResource.c /tmp/dpep-work.sYNMum/xorg-server-1.0.2/hw/xfree86/os-support/shared/stdResource.c +--- ./hw/xfree86/os-support/shared/stdResource.c 2005-07-03 09:01:35.000000000 +0200 ++++ /tmp/dpep-work.sYNMum/xorg-server-1.0.2/hw/xfree86/os-support/shared/stdResource.c 2006-05-04 00:57:05.833955345 +0200 +@@ -150,10 +150,11 @@ + ret = xf86AddResToList(ret, &range, -1); + RANGE(range, 0xfee00000, 0xfeefffff, ResExcMemBlock | ResBios); + ret = xf86AddResToList(ret, &range, -1); +-#endif ++ /* airlied - remove BIOS range it shouldn't be here ++ this should use E820 - or THE OS */ + RANGE(range, 0xffe00000, 0xffffffff, ResExcMemBlock | ResBios); + ret = xf86AddResToList(ret, &range, -1); +- ++#endif + /* + * Fallback would be to claim well known ports in the 0x0 - 0x3ff range + * along with their sparse I/O aliases, but that's too imprecise. Instead --- xorg-server-1.0.2.orig/debian/patches/001-CVE-2006-1526.patch.dpatch +++ xorg-server-1.0.2/debian/patches/001-CVE-2006-1526.patch.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 001-CVE-2006-1526.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/render/mitri.c xorg-server-1.0.2/render/mitri.c +--- xorg-server-1.0.2~/render/mitri.c 2006-05-03 09:28:50.000000000 +0200 ++++ xorg-server-1.0.2/render/mitri.c 2006-05-03 09:55:04.000000000 +0200 +@@ -145,7 +145,9 @@ + if (npoint < 3) + return; + ntri = npoint - 2; +- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); ++ if (ntri >= INT_MAX/sizeof (xTriangle)) ++ return; ++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); + if (!tris) + return; + for (tri = tris; npoint >= 3; npoint--, points++, tri++) +@@ -173,11 +175,12 @@ + xTriangle *tris, *tri; + xPointFixed *first; + int ntri; +- + if (npoint < 3) + return; + ntri = npoint - 2; +- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); ++ if (ntri >= INT_MAX/sizeof (xTriangle)) ++ return; ++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); + if (!tris) + return; + first = points++; --- xorg-server-1.0.2.orig/debian/patches/991_sharevts-load-cpu.patch.dpatch +++ xorg-server-1.0.2/debian/patches/991_sharevts-load-cpu.patch.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 991_sharevts-load-cpu.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/linux/lnx_init.c xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_init.c +--- xorg-server-1.0.2~/hw/xfree86/os-support/linux/lnx_init.c 2006-04-10 14:47:04.000000000 +0200 ++++ xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_init.c 2006-04-10 14:48:01.000000000 +0200 +@@ -286,9 +286,7 @@ + FatalError("Unable to set screen info\n"); + close(fbfd); + #endif +- } else { /* ShareVTs */ +- close(xf86Info.consoleFd); +- } ++ } + signal(SIGUSR2, xf86ReloadInputDevs); + } else { /* serverGeneration != 1 */ + if (!ShareVTs && VTSwitch) +@@ -317,7 +315,11 @@ + int vtno = -1; + #endif + +- if (ShareVTs) return; ++ if (ShareVTs) ++ { ++ close(xf86Info.consoleFd); ++ return; ++ } + + #if defined(DO_OS_FONTRESTORE) + if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0) --- xorg-server-1.0.2.orig/debian/patches/989_ubuntu_add_extra_modelines_from_xorg.patch +++ xorg-server-1.0.2/debian/patches/989_ubuntu_add_extra_modelines_from_xorg.patch @@ -0,0 +1,77 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 989_ubuntu_add_extra_modelines_from_xorg.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/hw/xfree86/common/extramodes xorg-server-1.0.2/hw/xfree86/common/extramodes +--- xorg-server-1.0.2~/hw/xfree86/common/extramodes 2006-05-05 11:54:06.000000000 +0200 ++++ xorg-server-1.0.2/hw/xfree86/common/extramodes 2006-05-05 12:04:38.000000000 +0200 +@@ -7,27 +7,59 @@ + # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz + ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync + ++# 1280x768 @ 60Hz (LCD native res) hsync: 47.70kHz ++ModeLine "1280x768" 80.14 1280 1344 1480 1680 768 769 772 795 ++ ++# 1280x800 @ 60Hz (LCD native res) hsync: 49.68kHz ++ModeLine "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828 ++ + # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz +-ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync ++ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync ++ ++# 1152x864 @ 85Hz (Red Hat custom modeline) ++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync + + # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz + ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync + ++# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz ++ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync ++ + # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz + ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync + ++# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz ++ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync ++ ++# 1440x900 @ 100Hz (17" iMac LCD) hsync: 67 kHz ++ModeLine "1440x900" 108.84 1440 1472 1880 1912 900 918 927 946 +hsync +vsync ++ + # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz +-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync ++ModeLine "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync ++ ++# 1680x1050 @ 60Hz (LCD native res) hsync: 64.22kHz ++ModeLine "1680x1050" 147.14 1680 1784 1968 2256 1050 1051 1054 1087 ++ ++# 1680x1050 @ 60Hz (CVT) hsync: 65.29 kHz ++Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -HSync +Vsync ++ ++# 1680x1050 @ 85Hz (CVT) hsync: ++Modeline "1680x1050" 214.51 1680 1800 1984 2288 1050 1051 1054 1103 -HSync +Vsync ++ ++# 1920x1200 @ 60Hz (LCD native res) hsync: 74.52kHz ++ModeLine "1920x1200" 193.16 1920 2048 2256 2592 1200 1201 1204 1242 ++ ++# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz ++ModeLine "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync + + # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz +-Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync ++ModeLine "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync + + # 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz +-Modeline "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync ++ModeLine "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync + + # 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz +-Modeline "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync ++ModeLine "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync + + # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz +-Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync +- ++ModeLine "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync --- xorg-server-1.0.2.orig/debian/patches/000-fix-read-kernel-mapping.patch.dpatch +++ xorg-server-1.0.2/debian/patches/000-fix-read-kernel-mapping.patch.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 000-fix-read-kernel-mapping.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/linux/lnx_KbdMap.c xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_KbdMap.c +--- xorg-server-1.0.2~/hw/xfree86/os-support/linux/lnx_KbdMap.c 2005-07-03 12:51:16.000000000 +0200 ++++ xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_KbdMap.c 2006-04-21 08:04:56.000000000 +0200 +@@ -180,7 +180,7 @@ + /* + * Maps the AT keycodes to Linux keycodes + */ +-static unsigned char at2lnx[NUM_KEYCODES] = ++static unsigned char at2lnx[] = + { + 0x01, /* KEY_Escape */ 0x02, /* KEY_1 */ + 0x03, /* KEY_2 */ 0x04, /* KEY_3 */ --- xorg-server-1.0.2.orig/debian/patches/990_ubuntu_fix_security_policy_path.patch +++ xorg-server-1.0.2/debian/patches/990_ubuntu_fix_security_policy_path.patch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 990_ubuntu_fix_security_policy_path.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xorg-server-1.0.2~/Xext/Makefile.am xorg-server-1.0.2/Xext/Makefile.am +--- xorg-server-1.0.2~/Xext/Makefile.am 2006-04-04 15:25:51.000000000 +0200 ++++ xorg-server-1.0.2/Xext/Makefile.am 2006-04-04 15:52:58.000000000 +0200 +@@ -70,7 +70,7 @@ + if XCSECURITY + BUILTIN_SRCS += $(XCSECURITY_SRCS) + +-SERVERCONFIGdir = $(sysconfdir)/xserver ++SERVERCONFIGdir = $(sysconfdir)/X11/xserver + SERVERCONFIG_DATA = SecurityPolicy + AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" + endif +diff -urNad xorg-server-1.0.2~/Xext/Makefile.in xorg-server-1.0.2/Xext/Makefile.in +--- xorg-server-1.0.2~/Xext/Makefile.in 2006-04-04 15:25:51.000000000 +0200 ++++ xorg-server-1.0.2/Xext/Makefile.in 2006-04-04 15:52:58.000000000 +0200 +@@ -611,7 +611,7 @@ + + # Security extension: multi-level security to protect clients from each other + XCSECURITY_SRCS = security.c +-@XCSECURITY_TRUE@SERVERCONFIGdir = $(sysconfdir)/xserver ++@XCSECURITY_TRUE@SERVERCONFIGdir = $(sysconfdir)/X11/xserver + @XCSECURITY_TRUE@SERVERCONFIG_DATA = SecurityPolicy + + # X EVent Interception Extension: allows accessibility helpers & composite