Fix handling of file's --parameter option. Closes: #798410

debian/patches/cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch

@@ -0,0 +1,16 @@
+Subject: --parameter takes a parameter
+Origin: FILE5_24-22-g27b4e34
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Tue Sep 8 13:46:01 2015 +0000
+
+--- a/src/file_opts.h
++++ b/src/file_opts.h
+@@ -45,7 +45,7 @@
+ #if defined(HAVE_UTIME) || defined(HAVE_UTIMES)
+ OPT('p', "preserve-date", 0, "        preserve access times on files\n")
+ #endif
+-OPT('P', "parameter", 0, "            set file engine parameter limits\n"
++OPT('P', "parameter", 1, "            set file engine parameter limits\n"
+     "                               indir        15 recursion limit for indirection\n"
+     "                               name         30 use limit for name/use magic\n"
+     "                               elf_notes   256 max ELF notes processed\n"

debian/patches/cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch

@@ -0,0 +1,15 @@
+Subject: apply parameters before unwrapping() the list of files
+Origin: FILE5_24-23-g4ddb783
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Tue Sep 8 13:46:49 2015 +0000
+
+--- a/src/file.c
++++ b/src/file.c
+@@ -237,6 +237,7 @@
+ 			if (magic == NULL)
+ 				if ((magic = load(magicfile, flags)) == NULL)
+ 					return 1;
++			applyparam(magic);
+ 			e |= unwrap(magic, optarg);
+ 			++didsomefiles;
+ 			break;

debian/patches/series

@@ -9,3 +9,5 @@
 0010-mdadm.patch
 0011-btrfs.patch
 0012-lxt.patch
+cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch
+cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch