summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-06-16 20:02:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-08 17:20:16 +0100
commit292a45064aa9926868c798341dc72f183c5de076 (patch)
tree176d929370e08bf276a7633a69cac602986ef57e /meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
parent0fd46295920c33d8f35bf266f62762f2ef86f17b (diff)
downloadopenembedded-core-contrib-292a45064aa9926868c798341dc72f183c5de076.tar.gz
libarchive: add 2.8.4 version
This recipe has been imported from OpenEmbedded (rev 6db4b9050e0e8b963e2a6b63790e48e3042ea99e). Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch b/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
new file mode 100644
index 0000000000..b55ae1701a
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
@@ -0,0 +1,28 @@
+libarchive: Backport patch from upstream (rev 2521).
+
+Disable dot stripping code since it's still broken
+and noone has been able to figure it out (yet).
+
+Upstream-Status: Backport
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index 2d3a855..8661532 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -1771,9 +1771,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ *wp = L'\0';
+ }
+
++#if 0 /* XXX: this somehow manages to strip of single-character file extensions, like '.c'. */
+ /* Chop off trailing '.' from filenames. */
+ if (*(wp-1) == L'.')
+ *(--wp) = L'\0';
++#endif
+
+ /* store the result in the file name field. */
+ archive_strappend_w_utf8(&file->name, wbuff);
+--
+1.7.1
+