diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2014-01-06 11:55:14 +0000 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2014-01-08 22:54:54 -0800 |
commit | f3fd24badd189bbb083dba9397598e1566d1e4be (patch) | |
tree | dabc3794575f5274837ce6d8d72023b41449089a /meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch | |
parent | 7c79e70d3a803f2ccb9b9c6ed2134019631672fd (diff) | |
download | openembedded-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/0005-Patch-from-upstream-rev-2520.patch')
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch | 31 |
1 files changed, 0 insertions, 31 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 deleted file mode 100644 index dd8ac6a876..0000000000 --- a/meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch +++ /dev/null @@ -1,31 +0,0 @@ -libarchive: Backport patch from upstream (rev 2520) - -Fix version/dot stripping code in joliet extension of iso9660. - -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 8dcfeb4..2d3a855 100644 ---- a/libarchive/archive_read_support_format_iso9660.c -+++ b/libarchive/archive_read_support_format_iso9660.c -@@ -1766,13 +1766,13 @@ parse_file_info(struct archive_read *a, struct file_info *parent, - * *, /, :, ;, ? and \. - */ - /* Chop off trailing ';1' from files. */ -- if (*(wp-2) == ';' && *(wp-1) == '1') { -+ if (*(wp-2) == L';' && *(wp-1) == L'1') { - wp-=2; - *wp = L'\0'; - } - - /* Chop off trailing '.' from filenames. */ -- if (*(wp-1) == '.') -+ if (*(wp-1) == L'.') - *(--wp) = L'\0'; - - /* store the result in the file name field. */ --- -1.7.1 - |