| /ssvnc/tags/1.0.29-1/debian/patches/ultraftp_path.patch |
|---|
| File deleted |
|---|
|
|
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 1.0.29-1/debian/patches/format-security.patch |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian/patches/format-security.patch (revision 36) |
|---|
| +++ 1.0.29-1/debian/patches/format-security.patch (nonexistent) |
|---|
| @@ -1,96 +0,0 @@ |
|---|
| -Author: Magnus Holmgren <holmgren@debian.org> |
|---|
| -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); |
|---|
| Index: 1.0.29-1/debian/patches/nostrip.patch |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian/patches/nostrip.patch (revision 36) |
|---|
| +++ 1.0.29-1/debian/patches/nostrip.patch (nonexistent) |
|---|
| @@ -1,12 +0,0 @@ |
|---|
| -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) |
|---|
| Index: 1.0.29-1/debian/patches/confusing_-h.patch |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian/patches/confusing_-h.patch (revision 36) |
|---|
| +++ 1.0.29-1/debian/patches/confusing_-h.patch (nonexistent) |
|---|
| @@ -1,36 +0,0 @@ |
|---|
| -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 <holmgren@debian.org> |
|---|
| -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. |
|---|
| - |
|---|
| /1.0.29-1/debian/patches/confusing_-h.patch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 1.0.29-1/debian/copyright |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian/copyright (revision 36) |
|---|
| +++ 1.0.29-1/debian/copyright (nonexistent) |
|---|
| @@ -1,109 +0,0 @@ |
|---|
| -This package was debianized by Magnus Holmgren <holmgren@debian.org> on |
|---|
| -Fri, 31 Oct 2008 22:08:16 +0100. |
|---|
| - |
|---|
| -It was downloaded from <http://www.karlrunge.com/x11vnc/ssvnc.html> |
|---|
| - |
|---|
| -Upstream Author: |
|---|
| - |
|---|
| - Karl J. Runge <runge@karlrunge.com> |
|---|
| - |
|---|
| -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 |
|---|
| -<holmgren@debian.org> and is licensed under the GPL, see above. |
|---|
| Index: 1.0.29-1/debian/docs |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian/docs (revision 36) |
|---|
| +++ 1.0.29-1/debian/docs (nonexistent) |
|---|
| @@ -1,2 +0,0 @@ |
|---|
| -README |
|---|
| -README.src |
|---|
| Index: 1.0.29-1/debian/rules |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian/rules (revision 36) |
|---|
| +++ 1.0.29-1/debian/rules (nonexistent) |
|---|
| @@ -1,77 +0,0 @@ |
|---|
| -#!/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 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 |
|---|
| /1.0.29-1/debian/rules |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 1.0.29-1/debian |
|---|
| =================================================================== |
|---|
| --- 1.0.29-1/debian (revision 36) |
|---|
| +++ 1.0.29-1/debian (nonexistent) |
|---|
| /1.0.29-1/debian |
|---|
| Property changes: |
|---|
| Deleted: mergeWithUpstream |
|---|
| ## -1 +0,0 ## |
|---|
| -1 |
|---|
| \ No newline at end of property |
|---|