summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch42
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch31
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch33
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch31
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch28
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch31
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.1.2.bb (renamed from meta/recipes-extended/libarchive/libarchive_2.8.5.bb)14
7 files changed, 4 insertions, 206 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch b/meta/recipes-extended/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch
deleted file mode 100644
index f65f89f46b..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1libarchive: Backport patch from upstream (revision 1990)
2
3Upstream-Status: Backport
4
5Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
6
7diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
8index 7473c50..27671df 100644
9--- a/libarchive/archive_read_disk_entry_from_file.c
10+++ b/libarchive/archive_read_disk_entry_from_file.c
11@@ -163,15 +163,26 @@ archive_read_disk_entry_from_file(struct archive *_a,
12
13 #ifdef HAVE_READLINK
14 if (S_ISLNK(st->st_mode)) {
15- char linkbuffer[PATH_MAX + 1];
16- int lnklen = readlink(path, linkbuffer, PATH_MAX);
17+ size_t linkbuffer_len = st->st_size + 1;
18+ char *linkbuffer;
19+ int lnklen;
20+
21+ linkbuffer = malloc(linkbuffer_len);
22+ if (linkbuffer == NULL) {
23+ archive_set_error(&a->archive, ENOMEM,
24+ "Couldn't read link data");
25+ return (ARCHIVE_FAILED);
26+ }
27+ lnklen = readlink(path, linkbuffer, linkbuffer_len);
28 if (lnklen < 0) {
29 archive_set_error(&a->archive, errno,
30 "Couldn't read link data");
31+ free(linkbuffer);
32 return (ARCHIVE_FAILED);
33 }
34 linkbuffer[lnklen] = 0;
35 archive_entry_set_symlink(entry, linkbuffer);
36+ free(linkbuffer);
37 }
38 #endif
39
40--
411.7.1
42
diff --git a/meta/recipes-extended/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch b/meta/recipes-extended/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch
deleted file mode 100644
index 6ece7f3899..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1libarchive: Backport patch from upstream (revision 1991)
2
3Upstream-Status: Backport
4
5Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
6
7diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
8index caf958e..60699e0 100644
9--- a/libarchive/archive_write_disk.c
10+++ b/libarchive/archive_write_disk.c
11@@ -434,7 +434,7 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry)
12 if (ret != ARCHIVE_OK)
13 goto done;
14 }
15-#ifdef HAVE_FCHDIR
16+#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
17 /* If path exceeds PATH_MAX, shorten the path. */
18 edit_deep_directories(a);
19 #endif
20@@ -866,7 +866,7 @@ archive_write_disk_new(void)
21 * object creation is likely to fail, but any error will get handled
22 * at that time.
23 */
24-#ifdef HAVE_FCHDIR
25+#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
26 static void
27 edit_deep_directories(struct archive_write_disk *a)
28 {
29--
301.7.1
31
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 @@
1libarchive: Backport patch from upstream (rev 2514)
2
3Enable version stripping code in joliet extension support for iso9660.
4
5http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587316
6
7Upstream-Status: Backport
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10
11diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
12index 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--
321.7.1
33
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 @@
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
diff --git a/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch b/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
deleted file mode 100644
index b55ae1701a..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1libarchive: Backport patch from upstream (rev 2521).
2
3Disable dot stripping code since it's still broken
4and noone has been able to figure it out (yet).
5
6Upstream-Status: Backport
7
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9
10diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
11index 2d3a855..8661532 100644
12--- a/libarchive/archive_read_support_format_iso9660.c
13+++ b/libarchive/archive_read_support_format_iso9660.c
14@@ -1771,9 +1771,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
15 *wp = L'\0';
16 }
17
18+#if 0 /* XXX: this somehow manages to strip of single-character file extensions, like '.c'. */
19 /* Chop off trailing '.' from filenames. */
20 if (*(wp-1) == L'.')
21 *(--wp) = L'\0';
22+#endif
23
24 /* store the result in the file name field. */
25 archive_strappend_w_utf8(&file->name, wbuff);
26--
271.7.1
28
diff --git a/meta/recipes-extended/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch b/meta/recipes-extended/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch
deleted file mode 100644
index b5465a3385..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1libarchive: Ignore ENOSYS error when setting up xattrs. (Closes: #588925)
2
3Modestas Vainius found out that HPPA returns errno ENOSYS
4on listxattrs. Currently, ENOTSUP is ignored so we'll do the
5same for ENOSYS as well.
6
7For full debug info about this see Modestas Vainius awesome
8report at:
9
10http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588925#10
11
12Upstream-Status: Pending
13
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15
16diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
17index 27671df..c49e755 100644
18--- a/libarchive/archive_read_disk_entry_from_file.c
19+++ b/libarchive/archive_read_disk_entry_from_file.c
20@@ -398,7 +398,7 @@ setup_xattrs(struct archive_read_disk *a,
21 list_size = listxattr(path, NULL, 0);
22
23 if (list_size == -1) {
24- if (errno == ENOTSUP)
25+ if (errno == ENOTSUP || errno == ENOSYS)
26 return (ARCHIVE_OK);
27 archive_set_error(&a->archive, errno,
28 "Couldn't list extended attributes");
29--
301.7.1
31
diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
index 5ba9a5285f..ffe0b2e673 100644
--- a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi
3HOMEPAGE = "http://www.libarchive.org/" 3HOMEPAGE = "http://www.libarchive.org/"
4SECTION = "devel" 4SECTION = "devel"
5LICENSE = "BSD" 5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4255e2e6f0349a4ac8fbd68459296e46" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b4e3ffd607d6686c6cb2f63394370841"
7 7
8PACKAGECONFIG ?= "libxml2 zlib bz2" 8PACKAGECONFIG ?= "libxml2 zlib bz2"
9 9
@@ -25,17 +25,11 @@ PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
25PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," 25PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2,"
26PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," 26PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat,"
27 27
28SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ 28SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
29 file://0001-Patch-from-upstream-revision-1990.patch \
30 file://0002-Patch-from-upstream-revision-1991.patch \
31 file://0004-Patch-from-upstream-rev-2514.patch \
32 file://0005-Patch-from-upstream-rev-2520.patch \
33 file://0006-Patch-from-upstream-rev-2521.patch \
34 file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \
35 " 29 "
36 30
37SRC_URI[md5sum] = "9caf51dcf6213e9c9f5a1c27448b9c90" 31SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a"
38SRC_URI[sha256sum] = "13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d" 32SRC_URI[sha256sum] = "eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
39 33
40inherit autotools lib_package 34inherit autotools lib_package
41 35
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 06:50:08 +0000