Subversion Repositories ssvnc

Compare Revisions

Ignore whitespace Rev 38 → Rev 37

/ssvnc/tags/1.0.29-2/debian/copyright
File deleted
/ssvnc/tags/1.0.29-2/debian/docs
File deleted
/ssvnc/tags/1.0.29-2/debian/rules
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tags/1.0.29-2/debian/README.source
===================================================================
--- tags/1.0.29-2/debian/README.source (revision 38)
+++ tags/1.0.29-2/debian/README.source (nonexistent)
@@ -1,8 +0,0 @@
-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).
Index: tags/1.0.29-2/debian/source/format
===================================================================
--- tags/1.0.29-2/debian/source/format (revision 38)
+++ tags/1.0.29-2/debian/source/format (nonexistent)
@@ -1 +0,0 @@
-3.0 (quilt)
Index: tags/1.0.29-2/debian/links
===================================================================
--- tags/1.0.29-2/debian/links (revision 38)
+++ tags/1.0.29-2/debian/links (nonexistent)
@@ -1,3 +0,0 @@
-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
Index: tags/1.0.29-2/debian/control
===================================================================
--- tags/1.0.29-2/debian/control (revision 38)
+++ tags/1.0.29-2/debian/control (nonexistent)
@@ -1,33 +0,0 @@
-Source: ssvnc
-Section: net
-Priority: extra
-Maintainer: Magnus Holmgren <holmgren@debian.org>
-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.
Index: tags/1.0.29-2/debian/compat
===================================================================
--- tags/1.0.29-2/debian/compat (revision 38)
+++ tags/1.0.29-2/debian/compat (nonexistent)
@@ -1 +0,0 @@
-7
Index: tags/1.0.29-2/debian/watch
===================================================================
--- tags/1.0.29-2/debian/watch (revision 38)
+++ tags/1.0.29-2/debian/watch (nonexistent)
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/ssvnc/ssvnc-(.*)\.src\.tar\.gz
Index: tags/1.0.29-2/debian/changelog
===================================================================
--- tags/1.0.29-2/debian/changelog (revision 38)
+++ tags/1.0.29-2/debian/changelog (nonexistent)
@@ -1,84 +0,0 @@
-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 <holmgren@debian.org> 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 <holmgren@debian.org> 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 <holmgren@debian.org> 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 <holmgren@debian.org> 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 <holmgren@debian.org> 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 <holmgren@debian.org> Sat, 31 Oct 2009 21:02:42 +0100
-
-ssvnc (1.0.23-1) unstable; urgency=low
-
- * Initial release (Closes: #504134).
-
- -- Magnus Holmgren <holmgren@debian.org> Sat, 01 Aug 2009 19:31:25 +0200
Index: tags/1.0.29-2/debian/patches/buildflags.patch
===================================================================
--- tags/1.0.29-2/debian/patches/buildflags.patch (revision 38)
+++ tags/1.0.29-2/debian/patches/buildflags.patch (nonexistent)
@@ -1,18 +0,0 @@
-Author: Magnus Holmgren <holmgren@debian.org>
-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)
-
Index: tags/1.0.29-2/debian/patches/series
===================================================================
--- tags/1.0.29-2/debian/patches/series (revision 38)
+++ tags/1.0.29-2/debian/patches/series (nonexistent)
@@ -1,5 +0,0 @@
-confusing_-h.patch
-ultraftp_path.patch
-buildflags.patch
-nostrip.patch
-format-security.patch
Index: tags/1.0.29-2/debian/patches/ultraftp_path.patch
===================================================================
--- tags/1.0.29-2/debian/patches/ultraftp_path.patch (revision 38)
+++ tags/1.0.29-2/debian/patches/ultraftp_path.patch (nonexistent)
@@ -1,44 +0,0 @@
-Author: Magnus Holmgren <holmgren@debian.org>
-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");
- }
-
-
/tags/1.0.29-2/debian/patches/ultraftp_path.patch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tags/1.0.29-2/debian/patches/format-security.patch
===================================================================
--- tags/1.0.29-2/debian/patches/format-security.patch (revision 38)
+++ tags/1.0.29-2/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: tags/1.0.29-2/debian/patches/nostrip.patch
===================================================================
--- tags/1.0.29-2/debian/patches/nostrip.patch (revision 38)
+++ tags/1.0.29-2/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: tags/1.0.29-2/debian/patches/confusing_-h.patch
===================================================================
--- tags/1.0.29-2/debian/patches/confusing_-h.patch (revision 38)
+++ tags/1.0.29-2/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.
-
/tags/1.0.29-2/debian/patches/confusing_-h.patch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tags/1.0.29-2/debian
===================================================================
--- tags/1.0.29-2/debian (revision 38)
+++ tags/1.0.29-2/debian (nonexistent)
/tags/1.0.29-2/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property