x11-misc/x11vnc: rm old, clean up for sec bug #515268

Package-Manager: portage-2.2.20.1

2 files changed, 0 insertions, 77 deletions

diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
deleted file mode 100644
index 0d5d78bdae0d..000000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-fix that is already in upstream x11vnc-0.9.14 dev
-
-from ChromiumOS:
-
-x11vnc: Fix shm close on early shutdown.
-
-Global structures {scanline,fullscreen,scanrect}_shm are initialized to
-zero, including the .shmid field. This creates problems when shutdown /
-clean_shm is called before these structures are properly initialized in
-initialize_polling_images. shm_delete will be called on the structure,
-and since the shmid isn't -1, shmctl(id, IPC_RMID...) will be called for
-id=0. id=0 is in fact a valid shmid, and it might belong to some other
-shared memory for some other processes, creating many potential problems.
-
-Fix is to initialize shmid to -1 to indicate that it is in fact
-uninitialized.
-
-https://chromium-review.googlesource.com/37971
-
---- a/x11vnc/x11vnc_defs.c
-+++ b/x11vnc/x11vnc_defs.c
-@@ -82,10 +82,10 @@
- XImage *raw_fb_image = NULL;	/* the raw fb */
-
- /* corresponding shm structures */
--XShmSegmentInfo scanline_shm;
--XShmSegmentInfo fullscreen_shm;
-+XShmSegmentInfo scanline_shm = {.shmid = -1};
-+XShmSegmentInfo fullscreen_shm = {.shmid = -1};
- XShmSegmentInfo *tile_row_shm;	/* for all possible row runs */
--XShmSegmentInfo snaprect_shm;
-+XShmSegmentInfo snaprect_shm = {.shmid = -1};
-
- /* rfb screen info */
- rfbScreenInfoPtr screen = NULL;
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
deleted file mode 100644
index f80e83f196bc..000000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- x11vnc-0.9.13.orig/x11vnc/remote.c
-+++ x11vnc-0.9.13/x11vnc/remote.c
-@@ -5860,7 +5860,7 @@
- 		}
- 		if (!strcmp(p, "vncdisplay")) {
- 			snprintf(buf, bufn, "aro=%s:%s", p,
--			    NONUL(vnc_desktop_name));
-+			    vnc_desktop_name);
- 			goto qry;
- 		}
- 		if (!strcmp(p, "icon_mode")) {
-@@ -6062,7 +6062,7 @@
- 		if (!strcmp(p, "h") || !strcmp(p, "help") ||
- 		    !strcmp(p, "V") || !strcmp(p, "version") ||
- 		    !strcmp(p, "lastmod")) {
--			snprintf(buf, bufn, "aro=%s:%s", p, NONUL(lastmod));
-+			snprintf(buf, bufn, "aro=%s:%s", p, lastmod);
- 			goto qry;
- 		}
- 		if (!strcmp(p, "bg")) {
---- x11vnc-0.9.13.orig/x11vnc/sslhelper.c
-+++ x11vnc-0.9.13/x11vnc/sslhelper.c
-@@ -4041,7 +4041,7 @@
- 				strncpy(last_get, rcookie, 100);
- 				if (db) fprintf(stderr, "last_get: '%s'\n", last_get);
- 			}
--			if (rcookie && strstr(rcookie, "VncViewer.class")) {
-+			if (strstr(rcookie, "VncViewer.class")) {
- 				rfbLog("\n");
- 				rfbLog("helper[%d]:\n", pid);
- 				rfbLog("***********************************************************\n");
---- x11vnc-0.9.13.orig/x11vnc/userinput.c
-+++ x11vnc-0.9.13/x11vnc/userinput.c
-@@ -1305,7 +1305,7 @@
- 	int font_size = 15;
- 	int win_y, scr_y, loc_cut = 4*font_size, y_cut = 10*font_size;
- 	
--	if (!xrecord_set_by_keys || !xrecord_name_info) {
-+	if (!xrecord_set_by_keys) {
- 		return 0;
- 	}
- 	if (xrecord_name_info[0] == '\0') {