/ssvnc/tags/1.0.29-1/debian/control |
---|
2,11 → 2,11 |
Section: net |
Priority: extra |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Build-Depends: debhelper (>= 7), xutils-dev, libxaw7-dev, |
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), xutils-dev, libxaw7-dev, |
libxmu-dev, libxext-dev, libxt-dev, libsm-dev, libice-dev, |
libjpeg62-dev | libjpeg-dev, zlib1g-dev | libz-dev, |
libjpeg-dev, zlib1g-dev | libz-dev, |
default-jdk, libssl-dev |
Standards-Version: 3.9.1 |
Standards-Version: 3.9.2 |
Homepage: http://www.karlrunge.com/x11vnc/ssvnc.html |
Package: ssvnc |
/ssvnc/tags/1.0.29-1/debian/links |
---|
1,2 → 1,3 |
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 |
/ssvnc/tags/1.0.29-1/debian/changelog |
---|
1,3 → 1,24 |
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 |
/ssvnc/tags/1.0.29-1/debian/patches/series |
---|
1,2 → 1,5 |
confusing_-h.patch |
ultraftp_path.patch |
buildflags.patch |
nostrip.patch |
format-security.patch |
/ssvnc/tags/1.0.29-1/debian/patches/buildflags.patch |
---|
0,0 → 1,18 |
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) CDEBUGFLAGS="$(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" |
+ cd $(VSRC)/vncviewer; $(MAKE) CDEBUGFLAGS="$(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" |
if [ "X$(JSRC)" != "X" ]; then cd $(JSRC); $(MAKE); fi |
cd $(PSRC); $(MAKE) |
/ssvnc/tags/1.0.29-1/debian/patches/ultraftp_path.patch |
---|
2,10 → 2,9 |
Description: Use hardcoded (and correct for the Debian package) path to ultraftp.jar |
if SSVNC_ULTRA_FTP_JAR is unset. |
diff -urNad trunk~/vnc_unixsrc/vncviewer/argsresources.c trunk/vnc_unixsrc/vncviewer/argsresources.c |
--- trunk~/vnc_unixsrc/vncviewer/argsresources.c 2009-10-27 04:26:12.000000000 +0100 |
+++ trunk/vnc_unixsrc/vncviewer/argsresources.c 2009-10-31 15:22:46.000000000 +0100 |
@@ -1624,35 +1624,8 @@ |
--- a/vnc_unixsrc/vncviewer/argsresources.c |
+++ b/vnc_unixsrc/vncviewer/argsresources.c |
@@ -1702,35 +1702,8 @@ GetArgsAndResources(int argc, char **arg |
appData.useBGR233 = 0; |
} |
/ssvnc/tags/1.0.29-1/debian/patches/format-security.patch |
---|
0,0 → 1,96 |
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); |
/ssvnc/tags/1.0.29-1/debian/patches/nostrip.patch |
---|
0,0 → 1,12 |
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) |
/ssvnc/tags/1.0.29-1/debian/patches/confusing_-h.patch |
---|
4,9 → 4,8 |
Author: Magnus Holmgren <holmgren@debian.org> |
Bug-Debian: http://bugs.debian.org/544250 |
diff -urNad trunk~/scripts/ssvnc trunk/scripts/ssvnc |
--- trunk~/scripts/ssvnc 2009-12-27 21:38:58.000000000 +0100 |
+++ trunk/scripts/ssvnc 2010-02-06 20:38:41.000000000 +0100 |
--- a/scripts/ssvnc |
+++ b/scripts/ssvnc |
@@ -8,7 +8,8 @@ |
# |
# See ssvnc_cmd for details. |
17,7 → 16,7 |
cat << END |
ssvnc - a GUI wrapper for SSL and SSH VNC connections. |
@@ -106,7 +107,7 @@ |
@@ -111,7 +112,7 @@ END |
exit 0 |
fi |
if [ "X$1" = "X-ssh" ]; then |
26,7 → 25,7 |
cat << END |
sshvnc - a GUI wrapper for SSH VNC connections. |
@@ -124,7 +125,7 @@ |
@@ -129,7 +130,7 @@ END |
fi |
if [ "X$1" = "X-ts" -o "X$1" = "X-tso" ]; then |
/ssvnc/tags/1.0.29-1/debian/rules |
---|
11,6 → 11,9 |
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 |
17,7 → 20,9 |
$(MAKE) config |
touch configure-stamp |
build: build-stamp |
build-indep: |
build-arch: build-stamp |
build-stamp: configure-stamp |
dh_testdir |
25,6 → 30,8 |
touch $@ |
build: build-arch build-indep |
clean: configure-stamp |
dh_testdir |
dh_testroot |
52,7 → 59,7 |
binary-arch: build install |
dh_testdir |
dh_testroot |
dh_installchangelogs |
dh_installchangelogs -k ReleaseNotes |
dh_installdocs |
dh_installexamples |
dh_installman |
67,4 → 74,4 |
dh_builddeb |
binary: binary-indep binary-arch |
.PHONY: build clean binary-indep binary-arch binary install configure |
.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install configure |