diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2011-06-16 20:02:46 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-08 17:20:16 +0100 |
| commit | 292a45064aa9926868c798341dc72f183c5de076 (patch) | |
| tree | 176d929370e08bf276a7633a69cac602986ef57e /meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch | |
| parent | 0fd46295920c33d8f35bf266f62762f2ef86f17b (diff) | |
| download | openembedded-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/0004-Patch-from-upstream-rev-2514.patch')
| -rw-r--r-- | meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch b/meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch new file mode 100644 index 0000000000..eaa9ad0813 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch @@ -0,0 +1,33 @@ +libarchive: Backport patch from upstream (rev 2514) + +Enable version stripping code in joliet extension support for iso9660. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587316 + +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 fdef3fb..8dcfeb4 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -1755,7 +1755,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + } + *wp = L'\0'; + +-#if 0 /* untested code, is it at all useful on Joliet? */ + /* trim trailing first version and dot from filename. + * + * Remember we where in UTF-16BE land! +@@ -1775,7 +1774,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + /* Chop off trailing '.' from filenames. */ + if (*(wp-1) == '.') + *(--wp) = L'\0'; +-#endif + + /* store the result in the file name field. */ + archive_strappend_w_utf8(&file->name, wbuff); +-- +1.7.1 + |