debian/0000755000000000000000000000000011773624076007203 5ustar debian/copyright0000644000000000000000000000207611426473645011142 0ustar x2vnc was Written by Fredrik Hübinette Based on ideas from x2x and code from vncviewer. It was packaged for use with Debian GNU/Linux by Edward Betts The x2vnc-wheel-patch was applied by the new maintainer Ola Lundqvist . This patch was written by bryan d. berg and found on freshmeat: http://freshmeat.net/projects/x2vnc-wheel-patch/ The latest version of this program should be available from http://fredrik.hubbe.net/x2vnc.html For more info about VNC: http://www.uk.research.att.com/vnc/ For more info about x2x: http://ftp.digital.com/pub/Digital/SRC/x2x/ The code is: Copyright (C) 1997, 1998 Olivetti & Oracle Research Laboratory This is free software; you can 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 of the License, or (at your option) any later version. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. debian/docs0000644000000000000000000000000711426342604010040 0ustar README debian/source/0000755000000000000000000000000011773624076010503 5ustar debian/source/format0000644000000000000000000000001411534752221011676 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000011111426344610010211 0ustar version=3 http://fredrik.hubbe.net/x2vnc.html x2vnc/x2vnc-(.*?)\.tar\.gz debian/patches/0000755000000000000000000000000011773624076010632 5ustar debian/patches/format-security.patch0000644000000000000000000000535111771355100014777 0ustar Description: Fix incorrect use of fprintf() Author: Magnus Holmgren --- a/sockets.c +++ b/sockets.c @@ -50,7 +50,7 @@ ReadExact(int sock, char *buf, int n) j = read(sock, buf + i, (n - i)); if (j <= 0) { if (j < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": read"); } else { if (errorMessageFromReadExact) { @@ -81,7 +81,7 @@ WriteExact(int sock, char *buf, int n) j = write(sock, buf + i, (n - i)); if (j <= 0) { if (j < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": write"); } else { fprintf(stderr,"%s: write failed\n",programName); @@ -126,20 +126,20 @@ ConnectToTcpAddr(unsigned int host, int sock = socket(AF_INET, SOCK_STREAM, 0); if (sock < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ConnectToTcpAddr: socket"); return -1; } if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ConnectToTcpAddr: connect"); close(sock); return -1; } if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one)) < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ConnectToTcpAddr: setsockopt"); close(sock); return -1; @@ -167,28 +167,28 @@ ListenAtTcpPort(int port) sock = socket(AF_INET, SOCK_STREAM, 0); if (sock < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ListenAtTcpPort: socket"); return -1; } if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&one, sizeof(one)) < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ListenAtTcpPort: setsockopt"); close(sock); return -1; } if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ListenAtTcpPort: bind"); close(sock); return -1; } if (listen(sock, 5) < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": ListenAtTcpPort: listen"); close(sock); return -1; @@ -244,14 +244,14 @@ AcceptTcpConnection(int listenSock) sock = accept(listenSock, (struct sockaddr *) &addr, &addrlen); if (sock < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": AcceptTcpConnection: accept"); return -1; } if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one)) < 0) { - fprintf(stderr,programName); + fprintf(stderr,"%s",programName); perror(": AcceptTcpConnection: setsockopt"); close(sock); return -1; debian/patches/series0000644000000000000000000000010611771355100012027 0ustar multiscreen-cursor-stick.patch man-listen.patch format-security.patch debian/patches/multiscreen-cursor-stick.patch0000644000000000000000000000137211534763020016622 0ustar Description: Fix a sticking cursor in a multi-screen configuration When x2vnc is compiled with Xinerama support and runs with a multiscreen setup, the cursor can become stuck on the border between the local and remote screens, not moving further than the border, as it should do. Author: Will Shackleton Bug-Debian: http://bugs.debian.org/616396 Bug-Ubuntu: https://launchpad.net/bugs/726783 Forwarded: yes --- a/x.c 2008-03-25 10:45:34 +0000 +++ b/x.c 2011-03-03 23:34:29 +0000 @@ -848,9 +848,9 @@ { int n,ret=a.x; if(a.y < ret) ret=a.y; - n=displayHeight - a.y; + n=y_offset + displayHeight - a.y; if(n < ret) ret=n; - n=displayWidth - a.x; + n=x_offset + displayWidth - a.x; if(n < ret) ret=n; return ret; } debian/patches/man-listen.patch0000644000000000000000000000157411771355043013722 0ustar Bug-Debian: http://bugs.debian.org/317148 Description: Add listen option to manpage Author: Rob Sims --- x2vnc-1.7.2.orig/x2vnc.man +++ x2vnc-1.7.2/x2vnc.man @@ -5,7 +5,12 @@ x2vnc \- a dual-screen hack .SH SYNOPSIS .B x2vnc .I -.I host:0 +.I : +.br +.B x2vnc +.I +.I -listen +.I [] .br [ .B \-display @@ -126,6 +131,15 @@ be running X-window, and the second comp running which will update the contents on the actual screen. This means \fIXvnc\fR is not suitable, but \fIWinVNC\fR is. +In listen mode ( +.B -listen +option specified ) +.I x2vnc +will wait for a connection from a VNC server on ports 5400 and 5500 (plus +the optional +.I display# +value) instead of connecting to a specified VNC server. + For up-to-date information on x2vnc, see the x2vnc home page: .B http://fredrik.hubbe.net/x2vnc.html debian/control0000644000000000000000000000156011771642545010607 0ustar Source: x2vnc Section: x11 Priority: optional Maintainer: Magnus Holmgren Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 6), libxaw7-dev, xutils-dev, libx11-dev, libxinerama-dev, libxss-dev Homepage: http://fredrik.hubbe.net/x2vnc.html Package: x2vnc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: vnc4server, xvnc4viewer, tightvncserver, xtightvncviewer Description: Link a VNC and an X display together, simulating a multiheaded display This program merges the capabilities of x2x and vncviewer. It will allow a machine with an X display and a machine with a VNC server running on its main screen to act as if they were two displays connected to one machine. When you move your mouse pointer off the screen in a direction of your choosing, the pointer will appear on the other screen instead. debian/changelog0000644000000000000000000002054211771642545011057 0ustar x2vnc (1.7.2-5) unstable; urgency=low * Fix typo in synopsis (Closes: #678823). -- Magnus Holmgren Sun, 24 Jun 2012 18:50:10 +0200 x2vnc (1.7.2-4) unstable; urgency=low * man-listen.patch: Create proper patch of "Added listen option to manpage" from 1.6-4. * format-security.patch (new): Fix incorrect use of fprintf() (it probably wasn't too dangerous as it was only argv[0] that was used as a format string). * debian/rules: Use dpkg-architecture and dpkg-buildflags. * debian/rules: Add build-arch and build-indep targets. * Bump Standards-Version to 3.9.3. -- Magnus Holmgren Sat, 23 Jun 2012 17:07:10 +0200 x2vnc (1.7.2-3) unstable; urgency=low * Switch to source format 3.0 (quilt). * Switch from Imake to configure (enabling Xinerama). * Add patch via Ubuntu that fixes a problem with the cursor not moving to the remote screen when Xinerama support is enabled (Closes: #616396; LP: #726783). Thanks to Will Shackleton. -- Magnus Holmgren Sun, 06 Mar 2011 20:51:00 +0100 x2vnc (1.7.2-2) unstable; urgency=low * New maintainer (Closes: #586422). * Acknowledge NMU. * debian/watch: Fix URL and regexp. * Remove stale and commented-out references to /usr/X11R6 in debian/rules. Delete debian/dirs altogether and drop the call to dh_installdirs. Also clean out irrelevant, commented-out Debhelper commands. * Make the version in the debhelper build dependency match debian/compat. * Bump Standards-Version to 3.9.1 (from 3.6.2). * A few minor style changes in debian/rules. * debian/copyright: Remove outdated info on changes made to the upstream source as well as current version, and update URL to upstream webpage. -- Magnus Holmgren Thu, 05 Aug 2010 10:34:21 +0200 x2vnc (1.7.2-1.1) unstable; urgency=low * Non-maintainer upload. * Correct build dependencies (Closes: #485529, #515411) * Fix and upgrade watch file (Closes: #529147) * Don't set DH_COMPAT in rules * Don't ignore errors by make clean * Bump compat level to six * Convert the copyright file to UTF-8 -- Raphael Geissert Wed, 08 Jul 2009 15:31:37 -0500 x2vnc (1.7.2-1) unstable; urgency=low * New upstream release. Closes: #466290. -- Ola Lundqvist Tue, 25 Mar 2008 10:45:34 +0100 x2vnc (1.7.1-3) unstable; urgency=low * Removed build dependency on libvncauth-dev. * Removed suggests on vnc-common. Instead suggest vncservers and vncviewers. -- Ola Lundqvist Tue, 4 Mar 2008 18:38:58 +0100 x2vnc (1.7.1-2) unstable; urgency=low * Made sure that it can compile even if the install target point it to correct place, closes: #368506. -- Ola Lundqvist Mon, 29 May 2006 22:12:45 +0200 x2vnc (1.7.1-1) unstable; urgency=low * New upstream release. -- Ola Lundqvist Mon, 22 May 2006 20:03:23 +0200 x2vnc (1.6.1-1) unstable; urgency=low * New upstream release. * Applied patch from Martin Dorey to fix an issue on amd64, closes: #343274. -- Ola Lundqvist Sat, 11 Mar 2006 17:30:13 +0100 x2vnc (1.6-4) unstable; urgency=low * Maintainer upload, closes: #349108, #346786. * Fixed typo in description, closes: #300047. * Updated standards version to 3.6.2. * Added listen option to manpage, closes: #317148. Thanks to Rob Sims for the patch. * Moved to debhelper 2 compatibility. -- Ola Lundqvist Sun, 29 Jan 2006 15:06:35 +0100 x2vnc (1.6-3.1) unstable; urgency=low * Non-maintainer upload. * Replace build-dependency on xlibs-dev with an explicit build-dependency on each required package. (Closes: #346786) -- Steinar H. Gunderson Sat, 21 Jan 2006 02:18:10 +0100 x2vnc (1.6-3) unstable; urgency=low * Fixed package description, closes: #268549, #277241. -- Ola Lundqvist Sat, 25 Dec 2004 21:55:57 +0100 x2vnc (1.6-2) unstable; urgency=low * Patched to make cut and paste work in KDE apps, closes: #191697. Thanks to "Martin Dorey" for the patch. * Moved from /usr/X11R6 to /usr. * Fixed manpage section error, 1x != x. -- Ola Lundqvist Thu, 26 Aug 2004 18:32:37 +0200 x2vnc (1.6-1) unstable; urgency=low * New upstream release, closes: #233620. This also fix a cut-and-paste bug, closes: #191697. * Updated standards version to 3.6.1. -- Ola Lundqvist Wed, 28 Jul 2004 19:07:44 +0200 x2vnc (1.5.1-2) unstable; urgency=low * Added build dependency on xlibs-dev, closes: #238618. -- Ola Lundqvist Sat, 20 Mar 2004 15:28:27 +0100 x2vnc (1.5.1-1) unstable; urgency=low * New upstream version, closes: #205131, #160333, #206418. * Updated standards version from 3.5.2 to 2.5.10. -- Ola Lundqvist Sun, 31 Aug 2003 15:59:27 +0200 x2vnc (1.4-2) unstable; urgency=low * Changed from xlib6g-dev to libxaw7-dev, closes: #170180. -- Ola Lundqvist Fri, 22 Nov 2002 08:26:03 +0100 x2vnc (1.4-1) unstable; urgency=low * New upstream version, closes: #148341. -- Ola Lundqvist Thu, 29 Aug 2002 07:27:49 +0200 x2vnc (1.3-1) unstable; urgency=low * New upstream version, closes: #123688, #120473. * Updated standards version. * Removed depricated dh_testversion. -- Ola Lundqvist Wed, 3 Apr 2002 22:37:07 +0200 x2vnc (1.2-2) unstable; urgency=low * The upstream wheel patch scrolled up when scrolling down and vice vera. Fixed with patch by Evan Martin , closes: #90142. -- Ola Lundqvist Mon, 19 Mar 2001 22:13:32 +0100 x2vnc (1.2-1) unstable; urgency=low * New upstream version with mouse wheel support built in. Hope that it works equally good or better than the patches I have applied. -- Ola Lundqvist Wed, 14 Mar 2001 15:45:35 +0100 x2vnc (1.1-6) unstable; urgency=low * Added a patch from Evan Martin that fixes issues with the wheel patch, closes: Bug#88716. -- Ola Lundqvist Thu, 22 Feb 2001 22:44:12 +0100 x2vnc (1.1-5) unstable; urgency=low * Added xutils to build depends, closes: Bug#86586. -- Ola Lundqvist Thu, 22 Feb 2001 22:44:12 +0100 x2vnc (1.1-4) unstable; urgency=low * Added suggestion of vnc-common, closes: Bug#81576. -- Ola Lundqvist Fri, 2 Feb 2001 13:03:46 +0100 x2vnc (1.1-3) unstable; urgency=low * Readded dh_testversion and added a versioned debhelper dependency in the control file as it really should be, closes: Bug#78573. -- Ola Lundqvist Sun, 3 Dec 2000 23:40:34 +0100 x2vnc (1.1-2) unstable; urgency=low * Recompiled to indicate new maintainer and to make sure that it works with the new c library. * Have also applied the x2vnc-wheel-patch (found on freshmeat). * Removed dh_testversion that lintian complains about from the debian/rules file. -- Ola Lundqvist Tue, 21 Nov 2000 23:16:10 +0100 x2vnc (1.1-1) unstable; urgency=low * New upstream release -- Edward Betts Sun, 21 May 2000 13:10:44 +0100 x2vnc (1.0-5) unstable; urgency=low * Imakefile: modified to compile against libvncauth0 * debian/control: updateded Standards-Version to 3.1.1 * debian/control: added Build-Depends. * debian/rules: rewritten. * debian/rules: added xmkmf. -- Edward Betts Thu, 6 Jan 2000 23:59:45 +0000 x2vnc (1.0-4) unstable; urgency=low * Changed to Debhelper 2.0 * Updated Standards-Version: 3.0.1 * Lintian clean * Changed location of GPL to /usr/share/common-licenses/GPL -- Edward Betts Sun, 12 Sep 1999 12:01:26 +0100 x2vnc (1.0-3) unstable; urgency=low * Corrected spelling of maintainers name in control (oops!) * Passes Lintian v0.9.5 -- Edward Betts Sun, 12 Sep 1999 12:01:15 +0100 x2vnc (1.0-2) unstable; urgency=low * Improve man page * Fixed source packaging - now includes pristine source -- Edward Betts Sun, 6 Dec 1998 11:44:48 +0000 x2vnc (1.0-1) unstable; urgency=low * Initial Release * Wrote a man page for x2vnc * Passes Lintian v0.9.4 -- Edward Betts Fri, 4 Dec 1998 14:25:08 +0000 debian/compat0000644000000000000000000000000211426342604010366 0ustar 6 debian/rules0000755000000000000000000000340011771355617010260 0ustar #!/usr/bin/make -f # debian/rules for freesweep # modifications by Edward Betts # Based on: # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) buildflags = --build=$(DEB_BUILD_GNU_TYPE) else buildflags = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif config-stamp: configure dh_testdir ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ $(shell dpkg-buildflags --export=configure) touch config-stamp build: build-arch build-indep: build-arch: build-stamp build-stamp: config-stamp dh_testdir $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp [ ! -f Makefile ] || $(MAKE) clean dh_clean config-stamp Makefile config.status config.log config.cache install: build dh_testdir dh_testroot dh_clean -k install -m 755 -d $(CURDIR)/debian/x2vnc/usr/share $(MAKE) DESTDIR=$(CURDIR)/debian/x2vnc install # Build architecture-independent files here. binary-indep: # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installdocs dh_installexamples dh_installmenu # dh_installmanpages dh_installchangelogs dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build-arch build-indep build clean binary-indep binary-arch binary install