Update java and scripts in classes/ssl. x11vnc: declare crypt() on all platforms. more wishes.

pull/1/head
runge 15 years ago
parent 00a9a0ea4d
commit 6153bd6983

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

@ -2644,8 +2644,8 @@ diff -Naur JavaViewer.orig/RfbProto.java JavaViewer/RfbProto.java
// } // }
diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
--- JavaViewer.orig/SSLSocketToMe.java 1969-12-31 19:00:00.000000000 -0500 --- JavaViewer.orig/SSLSocketToMe.java 1969-12-31 19:00:00.000000000 -0500
+++ JavaViewer/SSLSocketToMe.java 2009-06-19 10:23:50.000000000 -0400 +++ JavaViewer/SSLSocketToMe.java 2009-08-13 09:16:42.000000000 -0400
@@ -0,0 +1,1726 @@ @@ -0,0 +1,1727 @@
+/* +/*
+ * SSLSocketToMe.java: add SSL encryption to Java VNC Viewer. + * SSLSocketToMe.java: add SSL encryption to Java VNC Viewer.
+ * + *
@ -2654,7 +2654,8 @@ diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
+ * + *
+ * This is free software; you can redistribute it and/or modify + * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; version 2 of the License, or
+ * (at your option) any later version.
+ * + *
+ * This software is distributed in the hope that it will be useful, + * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY; without even the implied warranty of

@ -1,12 +1,17 @@
2009-12-04 Karl Runge <runge@karlrunge.com>
* classes/ssl: update binaries; new signing key; ss_vncviewer.
* x11vnc: add more wish possibilities for -gui. Declare crypt()
on all platforms (disable with -DDO_NOT_DECLARE_CRYPT.)
2009-12-02 Karl Runge <runge@karlrunge.com> 2009-12-02 Karl Runge <runge@karlrunge.com>
* x11vnc: -appshare mode for sharing an application windows intead * x11vnc: -appshare mode for sharing an application windows of the
of the entire desktop. map port + 5500 in reverse connect. entire desktop. map port + 5500 in reverse connect. Add id_cmd
Add id_cmd remote control functions for id (and other) windows. remote control functions for id (and other) windows. Allow zero
Allow zero port in SSL reverse connections. Adjust delays port in SSL reverse connections. Adjust delays between multiple
between multiple reverse connections; X11VNC_REVERSE_SLEEP_MAX reverse connections; X11VNC_REVERSE_SLEEP_MAX env var. Add some
env var. Add some missing mutex locks; add INPUT_LOCK and missing mutex locks; add INPUT_LOCK and threads_drop_input.
threads_drop_input. More safety in -threads mode for new More safety in -threads mode for new framebuffer change. Fix
framebuffer change. Fix some stderr leaking in -inetd mode. some stderr leaking in -inetd mode.
2009-11-18 Karl Runge <runge@karlrunge.com> 2009-11-18 Karl Runge <runge@karlrunge.com>
* x11vnc: use -timeout setting for reverse connections too. * x11vnc: use -timeout setting for reverse connections too.

@ -2,7 +2,7 @@
Copyright (C) 2002-2009 Karl J. Runge <runge@karlrunge.com> Copyright (C) 2002-2009 Karl J. Runge <runge@karlrunge.com>
All rights reserved. All rights reserved.
x11vnc README file Date: Wed Dec 2 22:03:06 EST 2009 x11vnc README file Date: Fri Dec 4 20:44:56 EST 2009
The following information is taken from these URLs: The following information is taken from these URLs:
@ -12894,7 +12894,7 @@ x11vnc: a VNC server for real X displays
Here are all of x11vnc command line options: Here are all of x11vnc command line options:
% x11vnc -opts (see below for -help long descriptions) % x11vnc -opts (see below for -help long descriptions)
x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-02 x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-04
x11vnc options: x11vnc options:
-display disp -auth file -N -display disp -auth file -N
@ -13021,7 +13021,7 @@ libvncserver-tight-extension options:
% x11vnc -help % x11vnc -help
x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-02 x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-04
(type "x11vnc -opts" to just list the options.) (type "x11vnc -opts" to just list the options.)

@ -473,7 +473,7 @@ static void launch(Window win) {
char *q = strstr(cmd, "-connect_or_exit"); char *q = strstr(cmd, "-connect_or_exit");
if (q) q = strstr(q, "_or_exit"); if (q) q = strstr(q, "_or_exit");
if (q) { if (q) {
int i; unsigned int i;
for (i=0; i < strlen("_or_exit"); i++) { for (i=0; i < strlen("_or_exit"); i++) {
*q = ' '; *q = ' ';
q++; q++;
@ -907,7 +907,7 @@ static void recurse_search(int level, int level_max, Window top, Window app, int
ok = XQueryTree(dpy, top, &r, &parent, &list, &nchild); ok = XQueryTree(dpy, top, &r, &parent, &list, &nchild);
if (ok) { if (ok) {
int i; int i;
for (i=0; i < nchild; i++) { for (i=0; i < (int) nchild; i++) {
w = list[i]; w = list[i];
if (w == None || find_win(w) >= 0) { if (w == None || find_win(w) >= 0) {
continue; continue;
@ -919,7 +919,7 @@ static void recurse_search(int level, int level_max, Window top, Window app, int
(*nw)++; (*nw)++;
} }
} }
for (i=0; i < nchild; i++) { for (i=0; i < (int) nchild; i++) {
w = list[i]; w = list[i];
if (w == None || ours(w)) { if (w == None || ours(w)) {
continue; continue;

@ -261,9 +261,11 @@ static void sigusr1 (int sig) {
if (0) sig = 0; if (0) sig = 0;
} }
/* Most of the following mess is for wish on Solaris: */
static char *extra_path = ":/usr/local/bin:/usr/bin/X11:/usr/sfw/bin" static char *extra_path = ":/usr/local/bin:/usr/bin/X11:/usr/sfw/bin"
":/usr/X11R6/bin:/usr/openwin/bin:/usr/dt/bin"; ":/usr/X11R6/bin:/usr/openwin/bin:/usr/dt/bin:/opt/sfw/bin";
static char *wishes[] = {"wish8.4", "wish", "wish8.3", "wish8.5", "wish8.0", NULL}; static char *wishes[] = {"wish8.4", "wish", "wish8.3", "wish8.5", "wish8.6", "wish8.7", "wishx", "wish8.0", NULL};
static void run_gui(char *gui_xdisplay, int connect_to_x11vnc, int start_x11vnc, static void run_gui(char *gui_xdisplay, int connect_to_x11vnc, int start_x11vnc,
int simple_gui, pid_t parent, char *gui_opts) { int simple_gui, pid_t parent, char *gui_opts) {
@ -440,6 +442,15 @@ if (0) fprintf(stderr, "run_gui: %s -- %d %d\n", gui_xdisplay, connect_to_x11vnc
if (!wish) { if (!wish) {
wish = strdup("wish"); wish = strdup("wish");
} }
if (getenv("WISH")) {
char *w = getenv("WISH");
if (strcmp(w, "")) {
wish = strdup(w);
}
}
if (getenv("DEBUG_WISH")) {
fprintf(stderr, "wish: %s\n", wish);
}
set_env("PATH", full_path); set_env("PATH", full_path);
set_env("DISPLAY", gui_xdisplay); set_env("DISPLAY", gui_xdisplay);
set_env("X11VNC_PROG", program_name); set_env("X11VNC_PROG", program_name);

@ -37,7 +37,9 @@ so, delete this exception statement from your version.
extern int grantpt(int); extern int grantpt(int);
extern int unlockpt(int); extern int unlockpt(int);
extern char *ptsname(int); extern char *ptsname(int);
/* XXX remove need for this */ #endif
#ifndef DO_NOT_DECLARE_CRYPT
extern char *crypt(const char*, const char *); extern char *crypt(const char*, const char *);
#endif #endif
@ -800,7 +802,7 @@ int crypt_verify(char *user, char *pass) {
fprintf(stderr, "user='%s' pass='%s' realpw='%s' cr='%s'\n", fprintf(stderr, "user='%s' pass='%s' realpw='%s' cr='%s'\n",
user, pass, realpw, cr ? cr : "(null)"); user, pass, realpw, cr ? cr : "(null)");
} }
if (cr == NULL) { if (cr == NULL || cr[0] == '\0') {
return 0; return 0;
} }
if (!strcmp(cr, realpw)) { if (!strcmp(cr, realpw)) {

@ -2,7 +2,7 @@
.TH X11VNC "1" "December 2009" "x11vnc " "User Commands" .TH X11VNC "1" "December 2009" "x11vnc " "User Commands"
.SH NAME .SH NAME
x11vnc - allow VNC connections to real X11 displays x11vnc - allow VNC connections to real X11 displays
version: 0.9.9, lastmod: 2009-12-02 version: 0.9.9, lastmod: 2009-12-04
.SH SYNOPSIS .SH SYNOPSIS
.B x11vnc .B x11vnc
[OPTION]... [OPTION]...

@ -47,7 +47,7 @@ int xtrap_base_event_type = 0;
int xdamage_base_event_type = 0; int xdamage_base_event_type = 0;
/* date +'lastmod: %Y-%m-%d' */ /* date +'lastmod: %Y-%m-%d' */
char lastmod[] = "0.9.9 lastmod: 2009-12-02"; char lastmod[] = "0.9.9 lastmod: 2009-12-04";
/* X display info */ /* X display info */

Loading…
Cancel
Save