debian/patches: Add 0001_p7zip_checking.patch. Prevent treating p7zip 15.09+ as pre-4.55. (Closes: #820789).

2016-04-13 08:57:46 +01:00
parent 343c2ea169
commit f68f7a345b
2 changed files with 17 additions and 0 deletions
--- a/debian/patches/0001_p7zip_checking.patch
+++ b/debian/patches/0001_p7zip_checking.patch
@ -0,0 +1,16 @@
+Description: Correct checking for p7zip 15.09+
+Author: monsta <monsta@inbox.ru>
+
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index 297ba1b..0b784f7 100644
+--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
+@@ -106,7 +106,7 @@ list__process_line (char     *line,
+ 			strncpy (version, ver_start, ver_len);
+ 			version[ver_len] = 0;
+ 
+-			if (strcmp (version, "4.55") < 0)
+			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
+ 				p7z_comm->old_style = TRUE;
+ 			else
+ 				p7z_comm->old_style = FALSE;
--- a/debian/patches/series
+++ b/debian/patches/series
@ -0,0 +1 @@
+0001_p7zip_checking.patch