diff options
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, 0 insertions, 33 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 deleted file mode 100644 index eaa9ad0813..0000000000 --- a/meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | libarchive: Backport patch from upstream (rev 2514) | ||
2 | |||
3 | Enable version stripping code in joliet extension support for iso9660. | ||
4 | |||
5 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587316 | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | |||
11 | diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c | ||
12 | index fdef3fb..8dcfeb4 100644 | ||
13 | --- a/libarchive/archive_read_support_format_iso9660.c | ||
14 | +++ b/libarchive/archive_read_support_format_iso9660.c | ||
15 | @@ -1755,7 +1755,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent, | ||
16 | } | ||
17 | *wp = L'\0'; | ||
18 | |||
19 | -#if 0 /* untested code, is it at all useful on Joliet? */ | ||
20 | /* trim trailing first version and dot from filename. | ||
21 | * | ||
22 | * Remember we where in UTF-16BE land! | ||
23 | @@ -1775,7 +1774,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent, | ||
24 | /* Chop off trailing '.' from filenames. */ | ||
25 | if (*(wp-1) == '.') | ||
26 | *(--wp) = L'\0'; | ||
27 | -#endif | ||
28 | |||
29 | /* store the result in the file name field. */ | ||
30 | archive_strappend_w_utf8(&file->name, wbuff); | ||
31 | -- | ||
32 | 1.7.1 | ||
33 | |||