current/SOURCES/evince-3.14.2-CVE-2017-1000083.patch

--- evince-3.14.2/backend/comics/comics-document.c.orig 2017-07-29 17:56:58.842820190 -0400
+++ evince-3.14.2/backend/comics/comics-document.c      2017-07-29 17:59:14.631492432 -0400
@@ -56,8 +56,7 @@ typedef enum
        RARLABS,
        GNAUNRAR,
        UNZIP,
-       P7ZIP,
-       TAR
+       P7ZIP
 } ComicBookDecompressType;
 
 typedef struct _ComicsDocumentClass ComicsDocumentClass;
@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand
 
         /* 7zip */
        {NULL               , "%s l -- %s"     , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
-
-        /* tar */
-       {"%s -xOf"          , "%s -tf %s"      , NULL             , FALSE, NO_OFFSET}
 };
 
 static GSList*    get_supported_image_extensions (void);
@@ -410,15 +406,6 @@ comics_check_decompress_command    (gchar
                        comics_document->command_usage = P7ZIP;
                        return TRUE;
                }
-       } else if (!strcmp (mime_type, "application/x-cbt") ||
-                  !strcmp (mime_type, "application/x-tar")) {
-               /* tar utility (Tape ARchive) */
-               comics_document->selected_command =
-                               g_find_program_in_path ("tar");
-               if (comics_document->selected_command) {
-                       comics_document->command_usage = TAR;
-                       return TRUE;
-               }
        } else {
                g_set_error (error,
                             EV_DOCUMENT_ERROR,
--- evince-3.14.2/configure.ac.orig     2017-07-29 18:00:20.373335226 -0400
+++ evince-3.14.2/configure.ac  2017-07-29 18:01:23.280184799 -0400
@@ -753,7 +753,7 @@ AC_SUBST(TIFF_MIME_TYPES)
 AC_SUBST(APPDATA_TIFF_MIME_TYPES)
 AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
 if test "x$enable_comics" = "xyes"; then
-        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/x-ext-cb7;application/x-ext-cbt"
+        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-ext-cbr;application/x-ext-cbz;application/x-ext-cb7"
         APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
         if test -z "$EVINCE_MIME_TYPES"; then
            EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"
1	--- evince-3.14.2/backend/comics/comics-document.c.orig 2017-07-29 17:56:58.842820190 -0400
2	+++ evince-3.14.2/backend/comics/comics-document.c 2017-07-29 17:59:14.631492432 -0400
3	@@ -56,8 +56,7 @@ typedef enum
4	RARLABS,
5	GNAUNRAR,
6	UNZIP,
7	- P7ZIP,
8	- TAR
9	+ P7ZIP
10	} ComicBookDecompressType;
11
12	typedef struct _ComicsDocumentClass ComicsDocumentClass;
13	@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand
14
15	/* 7zip */
16	{NULL , "%s l -- %s" , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
17	-
18	- /* tar */
19	- {"%s -xOf" , "%s -tf %s" , NULL , FALSE, NO_OFFSET}
20	};
21
22	static GSList* get_supported_image_extensions (void);
23	@@ -410,15 +406,6 @@ comics_check_decompress_command (gchar
24	comics_document->command_usage = P7ZIP;
25	return TRUE;
26	}
27	- } else if (!strcmp (mime_type, "application/x-cbt") \|\|
28	- !strcmp (mime_type, "application/x-tar")) {
29	- /* tar utility (Tape ARchive) */
30	- comics_document->selected_command =
31	- g_find_program_in_path ("tar");
32	- if (comics_document->selected_command) {
33	- comics_document->command_usage = TAR;
34	- return TRUE;
35	- }
36	} else {
37	g_set_error (error,
38	EV_DOCUMENT_ERROR,
39	--- evince-3.14.2/configure.ac.orig 2017-07-29 18:00:20.373335226 -0400
40	+++ evince-3.14.2/configure.ac 2017-07-29 18:01:23.280184799 -0400
41	@@ -753,7 +753,7 @@ AC_SUBST(TIFF_MIME_TYPES)
42	AC_SUBST(APPDATA_TIFF_MIME_TYPES)
43	AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
44	if test "x$enable_comics" = "xyes"; then
45	- COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/x-ext-cb7;application/x-ext-cbt"
46	+ COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-ext-cbr;application/x-ext-cbz;application/x-ext-cb7"
47	APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" \| sed -e 's/;/<\/mimetype>\n <mimetype>/g')
48	if test -z "$EVINCE_MIME_TYPES"; then
49	EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"