summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.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:57 +0100
commite5fef6bc21c1046a8f08c27f8fcb27322d56008b (patch)
tree55ef509bdab736527436a369510f0938c1f82914 /meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch
parentb626de02f78af6189a115d2f3eb94a24fbd5bc16 (diff)
downloadpoky-e5fef6bc21c1046a8f08c27f8fcb27322d56008b.tar.gz
libarchive: add 2.8.4 version
This recipe has been imported from OpenEmbedded (rev 6db4b9050e0e8b963e2a6b63790e48e3042ea99e). (From OE-Core rev: 292a45064aa9926868c798341dc72f183c5de076) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch b/meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch
new file mode 100644
index 0000000000..dd8ac6a876
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch
@@ -0,0 +1,31 @@
1libarchive: Backport patch from upstream (rev 2520)
2
3Fix version/dot stripping code in joliet extension of iso9660.
4
5Upstream-Status: Backport
6
7Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
8
9diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
10index 8dcfeb4..2d3a855 100644
11--- a/libarchive/archive_read_support_format_iso9660.c
12+++ b/libarchive/archive_read_support_format_iso9660.c
13@@ -1766,13 +1766,13 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
14 * *, /, :, ;, ? and \.
15 */
16 /* Chop off trailing ';1' from files. */
17- if (*(wp-2) == ';' && *(wp-1) == '1') {
18+ if (*(wp-2) == L';' && *(wp-1) == L'1') {
19 wp-=2;
20 *wp = L'\0';
21 }
22
23 /* Chop off trailing '.' from filenames. */
24- if (*(wp-1) == '.')
25+ if (*(wp-1) == L'.')
26 *(--wp) = L'\0';
27
28 /* store the result in the file name field. */
29--
301.7.1
31