summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-01-06 11:55:14 +0000
committerSaul Wold <sgw@linux.intel.com>2014-01-08 22:54:54 -0800
commitf3fd24badd189bbb083dba9397598e1566d1e4be (patch)
treedabc3794575f5274837ce6d8d72023b41449089a /meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch
parent7c79e70d3a803f2ccb9b9c6ed2134019631672fd (diff)
downloadopenembedded-core-contrib-f3fd24badd189bbb083dba9397598e1566d1e4be.tar.gz
libarchive: Upgrade to v3.1.2
All patches against libarchive in oe-core appear to be merged into the latest release. The license checksum has changed because a couple of referenced files have been renamed but there is no change to the license terms themselves. Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Saul Wold <sgw@linux.intel.com>
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.patch33
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 @@
-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
-