From f68f7a345b7a78dee8adbdb70bdb3b0623389677 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 13 Apr 2016 08:57:46 +0100 Subject: [PATCH] debian/patches: Add 0001_p7zip_checking.patch. Prevent treating p7zip 15.09+ as pre-4.55. (Closes: #820789). --- debian/patches/0001_p7zip_checking.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/0001_p7zip_checking.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001_p7zip_checking.patch b/debian/patches/0001_p7zip_checking.patch new file mode 100644 index 0000000..a4fbe9d --- /dev/null +++ b/debian/patches/0001_p7zip_checking.patch @@ -0,0 +1,16 @@ +Description: Correct checking for p7zip 15.09+ +Author: monsta + +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; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..fb2d4b0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001_p7zip_checking.patch