debian/0000775000000000000000000000000011666322151007173 5ustar debian/patches/0000775000000000000000000000000011657145261010627 5ustar debian/patches/format-security.patch0000664000000000000000000000514511657036770015016 0ustar Author: Magnus Holmgren Description: Fix format-security warnings/errors Replaces fprintf(stderr, str) with fputs(str, stderr) (where str in most cases is argv[0]) and also one instance of sprintf (without format string) with snprintf (with format string). --- a/vnc_unixsrc/vncviewer/sockets.c +++ b/vnc_unixsrc/vncviewer/sockets.c @@ -482,7 +482,7 @@ fprintf(stderr, "R0: %06d\n", (int) dn); ProcessXtEvents(); i = 0; } else { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": read"); return False; } @@ -514,7 +514,7 @@ fprintf(stderr, "R1: %06d %06d %10.2f KB ProcessXtEvents(); i = 0; } else { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": read"); return False; } @@ -569,13 +569,13 @@ WriteExact(int sock, char *buf, int n) FD_SET(rfbsock,&fds); if (select(rfbsock+1, NULL, &fds, NULL, NULL) <= 0) { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": select"); return False; } j = 0; } else { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": write"); return False; } @@ -608,13 +608,13 @@ ConnectToUnixSocket(char *file) { sock = socket(AF_UNIX, SOCK_STREAM, 0); if (sock < 0) { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": ConnectToUnixSocket: socket"); return -1; } if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, programName); + fputs(programName,stderr); perror(": ConnectToUnixSocket: connect"); close(sock); return -1; @@ -880,7 +880,7 @@ FindFreeTcpPort(void) sock = socket(AF_INET, SOCK_STREAM, 0); if (sock < 0) { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": FindFreeTcpPort: socket"); return 0; } @@ -1084,7 +1084,7 @@ Bool SetNonBlocking(int sock) { if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { - fprintf(stderr,programName); + fputs(programName,stderr); perror(": AcceptTcpConnection: fcntl"); return False; } --- a/vnc_unixsrc/vncviewer/vncviewer.c +++ b/vnc_unixsrc/vncviewer/vncviewer.c @@ -130,7 +130,7 @@ void unixpw(char *instr, int vencrypt_pl if (strlen(u) >= 100) { exit(1); } - sprintf(username, u); + snprintf(username, sizeof(username), "%s", u); p = DoPasswordDialog(); } else { raiseme(1); @@ -1133,7 +1133,7 @@ void printChat(char *str, Bool raise) { if (raise) { raiseme(0); } - fprintf(stderr, str); + fputs(str, stderr); } else { if (raise) { ShowChat(0, 0, 0, 0); debian/patches/buildflags.patch0000664000000000000000000000125611657145232013766 0ustar Author: Magnus Holmgren Description: Pass CFLAGS and LDFLAGS to xmkmf-generated Makefiles Pass CFLAGS and LDFLAGS through via ./Makefile as CDEBUGFLAGS and LOCAL_LDFLAGS to vnc_unixsrc/*/Makefile --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ config: @echo Now run: "'make all'" all: - cd $(VSRC)/libvncauth; $(MAKE) - cd $(VSRC)/vncviewer; $(MAKE) + cd $(VSRC)/libvncauth; $(MAKE) EXTRA_DEFINES="$(CPPFLAGS)" CDEBUGFLAGS="$(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" + cd $(VSRC)/vncviewer; $(MAKE) EXTRA_DEFINES="$(CPPFLAGS)" CDEBUGFLAGS="$(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" if [ "X$(JSRC)" != "X" ]; then cd $(JSRC); $(MAKE); fi cd $(PSRC); $(MAKE) debian/patches/ultraftp_path.patch0000775000000000000000000000247111644376752014543 0ustar Author: Magnus Holmgren Description: Use hardcoded (and correct for the Debian package) path to ultraftp.jar if SSVNC_ULTRA_FTP_JAR is unset. --- a/vnc_unixsrc/vncviewer/argsresources.c +++ b/vnc_unixsrc/vncviewer/argsresources.c @@ -1702,35 +1702,8 @@ GetArgsAndResources(int argc, char **arg appData.useBGR233 = 0; } - if (getenv("SSVNC_ULTRA_FTP_JAR") == NULL && programName != NULL) { - int len = strlen(programName) + 200; - char *q, *jar = (char *) malloc(len); - - sprintf(jar, "%s", programName); - q = strrchr(jar, '/'); - if (q) { - struct stat sb; - *(q+1) = '\0'; - strcat(jar, "../lib/ssvnc/util/ultraftp.jar"); - if (stat(jar, &sb) == 0) { - char *put = (char *) malloc(len); - sprintf(put, "SSVNC_ULTRA_FTP_JAR=%s", jar); - fprintf(stderr, "Setting: %s\n\n", put); - putenv(put); - } else { - sprintf(jar, "%s", programName); - q = strrchr(jar, '/'); - *(q+1) = '\0'; - strcat(jar, "util/ultraftp.jar"); - if (stat(jar, &sb) == 0) { - char *put = (char *) malloc(len); - sprintf(put, "SSVNC_ULTRA_FTP_JAR=%s", jar); - fprintf(stderr, "Setting: %s\n\n", put); - putenv(put); - } - } - } - free(jar); + if (getenv("SSVNC_ULTRA_FTP_JAR") == NULL) { + putenv("SSVNC_ULTRA_FTP_JAR=/usr/lib/ssvnc/util/ultraftp.jar"); } debian/patches/series0000664000000000000000000000013411657036770012046 0ustar confusing_-h.patch ultraftp_path.patch buildflags.patch nostrip.patch format-security.patch debian/patches/nostrip.patch0000664000000000000000000000062711650105111013332 0ustar Description: Don't strip ssvncviewer; let dh_strip handle that (or not, depending on build options) --- a/Makefile +++ b/Makefile @@ -66,7 +66,6 @@ clean: install: all mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1 - strip $(VIEWER) cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB) cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB) cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB) debian/patches/confusing_-h.patch0000775000000000000000000000205511644376752014243 0ustar Description: Improve handling of -h[e[l[p]]] Catches -he and -hel as well, instead of letting wish print its usage message (that sounds like an error message). Author: Magnus Holmgren Bug-Debian: http://bugs.debian.org/544250 --- a/scripts/ssvnc +++ b/scripts/ssvnc @@ -8,7 +8,8 @@ # # See ssvnc_cmd for details. # -if [ "X$1" = "X-help" -o "X$1" = "X-h" ]; then +helpflag="-help" +if [ ${#1} -gt 1 -a "$1${helpflag##$1}" = $helpflag ]; then cat << END ssvnc - a GUI wrapper for SSL and SSH VNC connections. @@ -111,7 +112,7 @@ END exit 0 fi if [ "X$1" = "X-ssh" ]; then - if [ "X$2" = "X-help" -o "X$2" = "X-h" ]; then + if [ ${#2} -gt 1 -a "$2${helpflag##$2}" = $helpflag ]; then cat << END sshvnc - a GUI wrapper for SSH VNC connections. @@ -129,7 +130,7 @@ END fi if [ "X$1" = "X-ts" -o "X$1" = "X-tso" ]; then - if [ "X$2" = "X-help" -o "X$2" = "X-h" ]; then + if [ ${#2} -gt 1 -a "$2${helpflag##$2}" = $helpflag ]; then cat << END tsvnc - a GUI wrapper for SSH VNC connections using x11vnc Terminal Services. debian/README.source0000664000000000000000000000042611273113216011346 0ustar This package uses dpatch to manage all modifications to the upstream source. Changes are stored in the source package as diffs in debian/patches and applied during the build. For basic usage information, see /usr/share/doc/dpatch/README.source.gz (after installing dpatch). debian/copyright0000664000000000000000000001073411523602406011127 0ustar This package was debianized by Magnus Holmgren on Fri, 31 Oct 2008 22:08:16 +0100. It was downloaded from Upstream Author: Karl J. Runge Copyright: Copyright © 2006-2010 Karl J. Runge TightVNC Copyright © 2001-2003 Constantin Kaplinsky VNC Copyright © AT&T Laboratories Cambridge, © 1994-2000 Olivetti Research Ltd/AT&T Laboratories Cambridge. License: This package is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. This package 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 along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Special GPL exception for ultravnc_dsm_helper: In addition, as a special exception, Karl J. Runge gives permission to link the code of its release of ultravnc_dsm_helper with the OpenSSL project's "OpenSSL" library (or with modified versions of it that use the same license as the "OpenSSL" library), and distribute the linked executables. You must obey the GNU General Public License in all respects for all of the code used other than "OpenSSL". If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. ZYWRLE VNC codec © 2006 Hitachi Systems & Services, Ltd. (Noriaki Yamazaki, Research & Development Center) License: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 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. - Neither the name of the Hitachi Systems & Services, Ltd. 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 COPYRIGHT HOLDERS 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 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. SSVNC includes the Ultr@VNC 1.0.0 RC19 Java Viewer. Copyright: © 2002-2005 Ultr@VNC Team. All Rights Reserved. © 2004 Kenn Min Chong, John Witchel. All Rights Reserved. © 2004 Alban Chazot. All Rights Reserved. © 2001,2002 HorizonLive.com, Inc. All Rights Reserved. © 2001,2002 Constantin Kaplinsky. All Rights Reserved. © 1999 AT&T Laboratories Cambridge. All Rights Reserved. License: This software is distributed under the GNU General Public Licence as published by the Free Software Foundation. See the file LICENCE.TXT for the conditions under which this software is made available. VNC also contains code from other sources. See the Acknowledgements section below, and the individual files for details of the conditions under which they are made available. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2' instead. The Debian packaging is © 2008-2011, Magnus Holmgren and is licensed under the GPL, see above. debian/compat0000664000000000000000000000000211273033414010364 0ustar 7 debian/control0000664000000000000000000000244611657040316010604 0ustar Source: ssvnc Section: net Priority: extra Maintainer: Magnus Holmgren Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), xutils-dev, libxaw7-dev, libxmu-dev, libxext-dev, libxt-dev, libsm-dev, libice-dev, libjpeg-dev, zlib1g-dev | libz-dev, default-jdk, libssl-dev Standards-Version: 3.9.2 Homepage: http://www.karlrunge.com/x11vnc/ssvnc.html Package: ssvnc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, tk, openssh-client, bind9-host | host, procps, psmisc, xterm, stunnel4, openssl Recommends: default-jre | java5-runtime Description: Enhanced TightVNC viewer with SSL/SSH tunnel helper VNC stands for Virtual Network Computing. It is, in essence, a remote display system which allows you to view a computing `desktop' environment not only on the machine where it is running, but from anywhere on the Internet and from a wide variety of machine architectures. . SSVNC is two things: . * An enhanced version of the TightVNC client with support for more encodings and color modes, support for x11vnc and UltraVNC extensions, dynamic screen resizing, an improved popup menu, etc. . * A GUI that helps set up an SSL (using stunnel) or SSH tunnel to connect to the VNC server through, as well as forwarding of ports for audio (esound/aRts), SMB, CUPS etc. debian/watch0000664000000000000000000000006711273033414010222 0ustar version=3 http://sf.net/ssvnc/ssvnc-(.*)\.src\.tar\.gz debian/links0000664000000000000000000000024511645111374010237 0ustar usr/share/man/man1/ssvnc.1.gz usr/share/man/man1/sshvnc.1.gz usr/share/man/man1/ssvnc.1.gz usr/share/man/man1/tsvnc.1.gz usr/lib/ssvnc/vncviewer usr/bin/ssvncviewer debian/changelog0000664000000000000000000000711011666322150011043 0ustar ssvnc (1.0.29-2build1) precise; urgency=low * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. -- Adam Conrad Fri, 02 Dec 2011 21:24:08 -0700 ssvnc (1.0.29-2) unstable; urgency=low * Also get CPPFLAGS from dpkg-buildflags. Pass it as EXTRA_DEFINES to vnc_unixsrc/*/Makefile. -- Magnus Holmgren Fri, 11 Nov 2011 08:11:09 +0100 ssvnc (1.0.29-1) unstable; urgency=low * New upstream release. * Install ReleaseNotes as upstream changelog file. * Simply build-depend on libjpeg-dev instead of libjpeg62-dev | libjpeg-dev (Closes: #644808). * Install a symlink in /usr/bin instead of including the main vncviewer binary twice in the package. * Add build-arch and build-indep targets to debian/rules. * nostrip.patch: Remove strip command from the Makefile, allowing DEB_BUILD_OPTONS=nostrip to work. * Get CFLAGS and LDFLAGS from dpkg-buildflags. * buildflags.patch: Pass CFLAGS and LDFLAGS through via ./Makefile as CDEBUGFLAGS and LOCAL_LDFLAGS to vnc_unixsrc/*/Makefile. This results in -fno-strict-aliasing (added by xmkmf by default) being dropped, but that doesn't seem to cause any problems. * format-security.patch: Fix some flaws uncovered by -Wformat-security. * Bump Standards-Version to 3.9.2. -- Magnus Holmgren Thu, 10 Nov 2011 22:23:15 +0100 ssvnc (1.0.28-1) unstable; urgency=low * New upstream release (Closes: #592873, "Connection from UVNC Single-Click does not start vncviewer when -acceptpopups is set"). * Convert to source format 3.0 (quilt), changing /bin/sh into /bin/bash (see below) in the install target instead. * debian/copyright: Update years of copyright; remove notice that the UltraVNC DSM helper module is not included (which it is since 1.0.24-1). * Remove redundant bash dependency; bash isn't going to be non-essential any time soon. * Up Standards-Version to 3.9.1. -- Magnus Holmgren Sun, 06 Feb 2011 23:06:25 +0100 ssvnc (1.0.27-1) unstable; urgency=low * New upstream release. * bashisms.dpatch: Don't try to fix all bashisms; instead change /bin/sh to /bin/bash and depend on bash, which is small in this context. -- Magnus Holmgren Sun, 23 May 2010 19:07:52 +0200 ssvnc (1.0.25-1) unstable; urgency=low * New upstream release. * confusing_-h.dpatch and bashisms.dpatch: adjusted. -- Magnus Holmgren Sat, 06 Feb 2010 20:45:04 +0100 ssvnc (1.0.24-1) unstable; urgency=low * New upstream release. * ssvnc -help now prints a help message instead of passing -help to the tcl interpreter. * confusing_-h.dpatch (new): Improve upstream's handling of -help a bit (Closes: 544250). * ultraftp_path.dpach (new): Use hardcoded (and correct for this package) path to ultraftp.jar if SSVNC_ULTRA_FTP_JAR is unset, so that file transfers work even if ssvncviewer is executed directly. * bashisms.dpatch (new): Fix most bashisms (all that matter). * Drop no_openssl.dpatch and build ultravnc_dsm_helper; OpenSSL exception has been granted. Build-depend on libssl-dev. * Promote stunnel4 from Recommends to Depends (Closes: #553411), depend directly on openssl, depend on tk instead of tk8.4, and tweak java recommendations. * Add README.source. * Bump Standards-Version to 3.8.3. -- Magnus Holmgren Sat, 31 Oct 2009 21:02:42 +0100 ssvnc (1.0.23-1) unstable; urgency=low * Initial release (Closes: #504134). -- Magnus Holmgren Sat, 01 Aug 2009 19:31:25 +0200 debian/rules0000775000000000000000000000335011657145232010257 0ustar #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DESTDIR=$(CURDIR)/debian/ssvnc export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) configure: configure-stamp configure-stamp: dh_testdir $(MAKE) config touch configure-stamp build-indep: build-arch: build-stamp build-stamp: configure-stamp dh_testdir $(MAKE) all touch $@ build: build-arch build-indep clean: configure-stamp dh_testdir dh_testroot rm -f build-stamp configure-stamp $(MAKE) clean rm vnc_unixsrc/*/Makefile dh_clean install: build dh_testdir dh_testroot dh_prep $(MAKE) ROOT=$(DESTDIR) PREFIX=/usr MANDIR=share/man install sed -ri -e 's#/bin/sh#/bin/bash#g' \ $(addprefix $(DESTDIR)/usr/lib/ssvnc/,ssvnc ssvnc_cmd util/ss_vncviewer util/ssvnc.tcl) # 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_installchangelogs -k ReleaseNotes dh_installdocs dh_installexamples dh_installman 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-indep build-arch build clean binary-indep binary-arch binary install configure debian/source/0000775000000000000000000000000011657145261010500 5ustar debian/source/format0000664000000000000000000000001411523601601011671 0ustar 3.0 (quilt) debian/docs0000664000000000000000000000002211273033414010033 0ustar README README.src