Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Hello release team,
for the next jessie point relase, I'd like to upload a new version
of the file package, in order to fix the bug described in
https://bugs.debian.org/798410
http://mx.gw.com/pipermail/file/2015/001777.html
Short version: The handling of file's --parameter command line option
is broken, the program segfaults upon every usage. Additionally,
--parameter has no effect when used with --files-from.
Triggering the first issue is as simple as running "file --parameter";
for the second one I have a no public reproducer so far but can provide
a file in private upon request.
Both issues have been fixed upstream recently, my proposed upload adds
the cherry-picked commits, two one-liners. The debdiff is attached.
Regards,
Christoph
-- System Information:
Debian Release: 8.1
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.1.6 (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
diff -Nru file-5.22+15/debian/changelog file-5.22+15/debian/changelog
--- file-5.22+15/debian/changelog 2015-03-10 22:13:50.000000000 +0100
+++ file-5.22+15/debian/changelog 2015-09-13 18:33:51.000000000 +0200
@@ -1,3 +1,13 @@
+file (1:5.22+15-2+deb8u1) stable; urgency=medium
+
+ * Fix handling of file's --parameter option. Closes: #798410
+ - The file program segfaults after processing the --parameter
+ parameter. [commit FILE5_24-22-g27b4e34]
+ - Any --parameter values have no effect if used with
+ --files-from. [commit FILE5_24-23-g4ddb783]
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Sun, 13 Sep 2015 18:27:47 +0200
+
file (1:5.22+15-2) unstable; urgency=medium
* Restore detection of some jpeg files. Closes: #780095
diff -Nru file-5.22+15/debian/patches/cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch file-5.22+15/debian/patches/cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch
--- file-5.22+15/debian/patches/cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch 1970-01-01 01:00:00.000000000 +0100
+++ file-5.22+15/debian/patches/cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch 2015-09-13 18:25:31.000000000 +0200
@@ -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
+@@ -43,7 +43,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"
diff -Nru file-5.22+15/debian/patches/cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch file-5.22+15/debian/patches/cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch
--- file-5.22+15/debian/patches/cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch 1970-01-01 01:00:00.000000000 +0100
+++ file-5.22+15/debian/patches/cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch 2015-09-13 18:25:32.000000000 +0200
@@ -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
+@@ -233,6 +233,7 @@
+ if (magic == NULL)
+ if ((magic = load(magicfile, flags)) == NULL)
+ return 1;
++ applyparam(magic);
+ e |= unwrap(magic, optarg);
+ ++didsomefiles;
+ break;
diff -Nru file-5.22+15/debian/patches/series file-5.22+15/debian/patches/series
--- file-5.22+15/debian/patches/series 2015-03-10 20:56:19.000000000 +0100
+++ file-5.22+15/debian/patches/series 2015-09-13 18:25:10.000000000 +0200
@@ -10,3 +10,5 @@
0011-btrfs.patch
0012-lxt.patch
0013-jpeg.c5d7f4d.patch
+cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch
+cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch
Attachment:
signature.asc
Description: Digital signature