pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2007-01-15 00:00:17 +00:00 committed by Git OBS Bridge
parent 93da6ee7da
commit 903ab05768
5 changed files with 59475 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59203
0018-vnc-support.txt Normal file
View File

File diff suppressed because it is too large Load Diff

21
0018-vnc-support.txt.diff Normal file
View File

@ -0,0 +1,21 @@
diff -x .deps -u -r xcliplist.orig/cliplistmod.c xcliplist/cliplistmod.c
--- xcliplist.orig/cliplistmod.c 2007-01-14 13:45:20.000000000 +0000
+++ xcliplist/cliplistmod.c 2007-01-14 13:46:44.000000000 +0000
@@ -1,5 +1,5 @@
-#include "xorg/xf86Module.h"
+#include "../hw/xfree86/common/xf86Module.h"
extern Bool noTestExtensions;
--- hw/vnc/loginauth.c.orig 2007-01-13 18:00:45.106884000 +0100
+++ hw/vnc/loginauth.c 2007-01-13 18:08:04.104447000 +0100
@@ -37,6 +37,8 @@
#include <sys/types.h>
#include "rfb.h"
+char *crypt(const char *key, const char *salt);
+
void rfbLoginAuthProcessClientMessage(rfbClientPtr cl)
{
int n1 = 0, n2 = 0;

187
0018-vnc-support.txt.mbox Normal file
View File

@ -0,0 +1,187 @@
From xorg-bounces@lists.freedesktop.org Thu Jan 11 18:09:18 2007
Return-Path: <xorg-bounces@lists.freedesktop.org>
X-Original-To: sndirsch@wotan.suse.de
Received: from Relay2.suse.de (relay2.suse.de [149.44.160.89])
by wotan.suse.de (Postfix) with ESMTP id 8F76413E45
for <sndirsch@wotan.suse.de>; Thu, 11 Jan 2007 18:09:18 +0100 (CET)
Received: by Relay2.suse.de (Postfix)
id 8B0DAC03BF; Thu, 11 Jan 2007 18:09:18 +0100 (CET)
Received: from Relay2.suse.de (localhost [127.0.0.1])
by Relay2.suse.de (Postfix) with ESMTP id 6B1D2AE3B2;
Thu, 11 Jan 2007 18:09:18 +0100 (CET)
Received: from Relay2.suse.de ([127.0.0.1])
by Relay2.suse.de (Relay2 [127.0.0.1]) (amavisd-new, port 10026) with ESMTP
id 32754-05; Thu, 11 Jan 2007 18:09:12 +0100 (CET)
Received: from mx2.suse.de (mx2.suse.de [195.135.220.15])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
by Relay2.suse.de (Postfix) with ESMTP id 03A1CC03AF;
Thu, 11 Jan 2007 18:09:12 +0100 (CET)
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.208.82])
by mx2.suse.de (Postfix) with ESMTP id BED2E215E1;
Thu, 11 Jan 2007 18:09:11 +0100 (CET)
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
by gabe.freedesktop.org (Postfix) with ESMTP id 5525D9EB5A;
Thu, 11 Jan 2007 09:09:07 -0800 (PST)
X-Original-To: xorg@freedesktop.org
Delivered-To: xorg@freedesktop.org
Received: from ciao.gmane.org (main.gmane.org [80.91.229.2])
by gabe.freedesktop.org (Postfix) with ESMTP id 6CC819EAF1
for <xorg@freedesktop.org>; Thu, 11 Jan 2007 09:09:03 -0800 (PST)
Received: from list by ciao.gmane.org with local (Exim 4.43)
id 1H53Q4-0002Z1-Np
for xorg@freedesktop.org; Thu, 11 Jan 2007 18:08:52 +0100
Received: from host-84-9-255-116.bulldogdsl.com ([84.9.255.116])
by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
id 1AlnuQ-0007hv-00
for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:08:52 +0100
Received: from gmane by host-84-9-255-116.bulldogdsl.com with local (Gmexim
0.1 (Debian)) id 1AlnuQ-0007hv-00
for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:08:52 +0100
X-Injected-Via-Gmane: http://gmane.org/
To: xorg@freedesktop.org
From: Colin Guthrie <gmane@colin.guthr.ie>
Date: Thu, 11 Jan 2007 17:08:41 +0000
Message-ID: <eo5qup$tgh$1@sea.gmane.org>
References: <45A66ACD.2060605@Sun.COM>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Complaints-To: usenet@sea.gmane.org
X-Gmane-NNTP-Posting-Host: host-84-9-255-116.bulldogdsl.com
User-Agent: Thunderbird 1.5.0.9 (X11/20070105)
In-Reply-To: <45A66ACD.2060605@Sun.COM>
Subject: Re: VNC on Xorg?
X-BeenThere: xorg@lists.freedesktop.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discuss issues related to the xorg tree <xorg.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
<mailto:xorg-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/xorg>
List-Post: <mailto:xorg@lists.freedesktop.org>
List-Help: <mailto:xorg-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
<mailto:xorg-request@lists.freedesktop.org?subject=subscribe>
Sender: xorg-bounces@lists.freedesktop.org
Errors-To: xorg-bounces@lists.freedesktop.org
X-Virus-Scanned: by amavisd-new at Relay2.suse.de
X-Spam-Status: No, hits=-1.7 tagged_above=-20.0 required=5.0 tests=BAYES_20,
IS_MAILMAN_LIST
X-Spam-Level:
Status: RO
Content-Length: 561
Lines: 12
Deron Johnson wrote:
> Does anybody know of a version of VNC which is based on Xorg 6.9 or
> greater? For example, Tight VNC is based on an ancient version (XFree86).
I recently updated the Mandriva VNC patch for Xorg 1.1.99.903, but I've
not tested it at all. It compiles up fine tho'.
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/x11-server/current/SOURCES/0018-vnc-support.txt?view=log
HTH
Col.
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
From xorg-bounces@lists.freedesktop.org Thu Jan 11 18:15:18 2007
Return-Path: <xorg-bounces@lists.freedesktop.org>
X-Original-To: sndirsch@wotan.suse.de
Received: from Relay1.suse.de (relay1.suse.de [149.44.160.87])
by wotan.suse.de (Postfix) with ESMTP id 08DF413E45
for <sndirsch@wotan.suse.de>; Thu, 11 Jan 2007 18:15:18 +0100 (CET)
Received: by Relay1.suse.de (Postfix)
id 054EBB189D; Thu, 11 Jan 2007 18:15:18 +0100 (CET)
Received: from Relay1.suse.de (localhost [127.0.0.1])
by Relay1.suse.de (Postfix) with ESMTP id E8AF9BCC22;
Thu, 11 Jan 2007 18:15:17 +0100 (CET)
Received: from Relay1.suse.de ([127.0.0.1])
by Relay1.suse.de (Relay1 [127.0.0.1]) (amavisd-new, port 10026) with ESMTP
id 22518-16; Thu, 11 Jan 2007 18:15:12 +0100 (CET)
Received: from mx1.suse.de (ns1.suse.de [195.135.220.2])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
by Relay1.suse.de (Postfix) with ESMTP id AACF2BA55A;
Thu, 11 Jan 2007 18:15:12 +0100 (CET)
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.208.82])
by mx1.suse.de (Postfix) with ESMTP id 6D30F12208;
Thu, 11 Jan 2007 18:15:12 +0100 (CET)
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
by gabe.freedesktop.org (Postfix) with ESMTP id E3A279EB68;
Thu, 11 Jan 2007 09:15:08 -0800 (PST)
X-Original-To: xorg@freedesktop.org
Delivered-To: xorg@freedesktop.org
Received: from ciao.gmane.org (main.gmane.org [80.91.229.2])
by gabe.freedesktop.org (Postfix) with ESMTP id 29AC49EB59
for <xorg@freedesktop.org>; Thu, 11 Jan 2007 09:15:03 -0800 (PST)
Received: from root by ciao.gmane.org with local (Exim 4.43)
id 1H53W2-0003Hz-6X
for xorg@freedesktop.org; Thu, 11 Jan 2007 18:15:02 +0100
Received: from host-84-9-255-116.bulldogdsl.com ([84.9.255.116])
by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
id 1AlnuQ-0007hv-00
for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:15:02 +0100
Received: from gmane by host-84-9-255-116.bulldogdsl.com with local (Gmexim
0.1 (Debian)) id 1AlnuQ-0007hv-00
for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:15:02 +0100
X-Injected-Via-Gmane: http://gmane.org/
To: xorg@freedesktop.org
From: Colin Guthrie <gmane@colin.guthr.ie>
Date: Thu, 11 Jan 2007 17:12:37 +0000
Message-ID: <eo5r66$125$1@sea.gmane.org>
References: <45A66ACD.2060605@Sun.COM> <eo5qup$tgh$1@sea.gmane.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Complaints-To: usenet@sea.gmane.org
X-Gmane-NNTP-Posting-Host: host-84-9-255-116.bulldogdsl.com
User-Agent: Thunderbird 1.5.0.9 (X11/20070105)
In-Reply-To: <eo5qup$tgh$1@sea.gmane.org>
Subject: Re: VNC on Xorg?
X-BeenThere: xorg@lists.freedesktop.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discuss issues related to the xorg tree <xorg.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
<mailto:xorg-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/xorg>
List-Post: <mailto:xorg@lists.freedesktop.org>
List-Help: <mailto:xorg-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
<mailto:xorg-request@lists.freedesktop.org?subject=subscribe>
Sender: xorg-bounces@lists.freedesktop.org
Errors-To: xorg-bounces@lists.freedesktop.org
X-Virus-Scanned: by amavisd-new at Relay1.suse.de
X-Spam-Status: No, hits=-1.7 tagged_above=-20.0 required=5.0 tests=BAYES_20,
IS_MAILMAN_LIST
X-Spam-Level:
Status: RO
Content-Length: 657
Lines: 13
Colin Guthrie wrote:
> Deron Johnson wrote:
>> Does anybody know of a version of VNC which is based on Xorg 6.9 or
>> greater? For example, Tight VNC is based on an ancient version (XFree86).
>
> I recently updated the Mandriva VNC patch for Xorg 1.1.99.903, but I've
> not tested it at all. It compiles up fine tho'.
>
> http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/x11-server/current/SOURCES/0018-vnc-support.txt?view=log
I should also state that the previous revision is for Xorg 1.1.1
Col.
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jan 14 15:12:59 CET 2007 - sndirsch@suse.de
- added build of VNC support (0018-vnc-support.txt/
0018-vnc-support.txt.diff); see 0018-vnc-support.txt.mbox for
reference
-------------------------------------------------------------------
Tue Jan 9 17:05:27 CET 2007 - sndirsch@suse.de

58
xorg-x11-server.spec
View File

@ -13,11 +13,15 @@
Name: xorg-x11-server
%define dirsuffix 1.1.99.903
%define fglrx_driver_hack 0
%define vnc 1
BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
%if %vnc
BuildRequires: libjpeg-devel
%endif
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 39
Release: 41
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -35,6 +39,9 @@ Source4: xorgcfg.tar.bz2
%if %suse_version > 1010
Source5: modprobe.nvidia
%endif
%if %vnc
Source6: 0018-vnc-support.txt.mbox
%endif
Patch: 64bit.diff
Patch1: fpic.diff
Patch2: p_default-module-path.diff
@ -70,6 +77,10 @@ Patch35: xorg-server-1.1.99.901-GetDrawableAttributes.patch
Patch36: libdrm.diff
Patch37: int10-fix.diff
Patch38: cve-2006-6101_6102_6103.diff
%if %vnc
Patch39: 0018-vnc-support.txt
Patch40: 0018-vnc-support.txt.diff
%endif
Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff
@ -92,6 +103,24 @@ This package contains the X.Org Server SDK.
%endif
%if %vnc
%package -n xorg-x11-Xvnc
Summary: VNC Server for the X Window System
Group: System/X11/Servers/XF86_4
Provides: vnc:/usr/X11R6/bin/Xvnc XFree86-Xvnc
Obsoletes: XFree86-Xvnc
%ifarch ia64
Provides: vnc-x86
Obsoletes: vnc-x86
%endif
Autoreqprov: on
%description -n xorg-x11-Xvnc
An X Window System server for Virtual Network Computing (VNC).
%endif
%prep
%setup -q -n xorg-server-%{dirsuffix} -b1 -a4
@ -140,6 +169,10 @@ popd
%patch36 -p0
%patch37 -p1
%patch38 -p1
%if %vnc
%patch39 -p1
%patch40 -p0
%endif
%build
autoreconf -fi
@ -151,6 +184,14 @@ autoreconf -fi
--with-release-snap=0 \
--with-release-date="%(date)" \
--with-release-version=7.1.0.0 \
%endif
%if %vnc
%ifnarch s390 s390x
--enable-xorg-vnc \
--enable-xcliplist \
%endif
--enable-xdmx-vnc \
--enable-xvnc \
%endif
--prefix=/usr \
--sysconfdir=/etc \
@ -238,6 +279,11 @@ install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nv
%endif
rm $RPM_BUILD_ROOT/etc/X11/Xsession.d/92xprint-xpserverlist
rmdir $RPM_BUILD_ROOT/etc/X11/Xsession.d
%if %vnc
%ifarch s390 s390x
rm $RPM_BUILD_ROOT/mfb.h
%endif
%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@ -442,8 +488,18 @@ exit 0
/usr/%{_lib}/*.a
/usr/share/aclocal/*.m4
%endif
%if %vnc
%files -n xorg-x11-Xvnc
%defattr(-, root, root)
/usr/bin/Xvnc
%endif
%changelog -n xorg-x11-server
* Sun Jan 14 2007 - sndirsch@suse.de
- added build of VNC support (0018-vnc-support.txt/
0018-vnc-support.txt.diff); see 0018-vnc-support.txt.mbox for
reference
* Tue Jan 09 2007 - sndirsch@suse.de
- cve-2006-6101_6102_6103.diff:
* CVE-2006-6101 iDefense X.org ProcRenderAddGlyphs (Bug #225972)