diff options
author | Michał Górny <mgorny@gentoo.org> | 2023-04-08 20:42:56 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2023-04-08 20:45:16 +0200 |
commit | 627770d73219a3e28d806b1bf9996f65a3c60c87 (patch) | |
tree | 8d634cde1c7aa3dbd35bdb190b45f972c6aaa19d /app-arch/libarchive/files | |
parent | app-portage/pycargoebuild: Remove old (diff) | |
download | gentoo-627770d73219a3e28d806b1bf9996f65a3c60c87.tar.gz gentoo-627770d73219a3e28d806b1bf9996f65a3c60c87.tar.bz2 gentoo-627770d73219a3e28d806b1bf9996f65a3c60c87.zip |
app-arch/libarchive: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'app-arch/libarchive/files')
-rw-r--r-- | app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch | 35 | ||||
-rw-r--r-- | app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch | 39 |
2 files changed, 0 insertions, 74 deletions
diff --git a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch b/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch deleted file mode 100644 index da71a196b875..000000000000 --- a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 -From: obiwac <obiwac@gmail.com> -Date: Fri, 22 Jul 2022 22:41:10 +0200 -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) - ---- - libarchive/archive_write.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index 66592e826..27626b541 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) - struct archive_write_filter *f; - - f = calloc(1, sizeof(*f)); -+ -+ if (f == NULL) -+ return (NULL); -+ - f->archive = _a; - f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; - if (a->filter_first == NULL) -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, - a->client_data = client_data; - - client_filter = __archive_write_allocate_filter(_a); -+ -+ if (client_filter == NULL) -+ return (ARCHIVE_FATAL); -+ - client_filter->open = archive_write_client_open; - client_filter->write = archive_write_client_write; - client_filter->close = archive_write_client_close; diff --git a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch b/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch deleted file mode 100644 index e45d891e2a17..000000000000 --- a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/libarchive/libarchive/pull/1761 -https://bugs.gentoo.org/863227 - -From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 25 Jul 2022 10:56:53 -0700 -Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is - present - -These headers are in conflict and only one is needed by -archive_read_disk_posix.c therefore include linux/fs.h if it exists -otherwise include sys/mount.h - -It also helps compiling with glibc 2.36 -where sys/mount.h conflicts with linux/mount.h see [1] - -[1] https://sourceware.org/glibc/wiki/Release/2.36 ---- a/libarchive/archive_read_disk_posix.c -+++ b/libarchive/archive_read_disk_posix.c -@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); - #ifdef HAVE_SYS_PARAM_H - #include <sys/param.h> - #endif --#ifdef HAVE_SYS_MOUNT_H --#include <sys/mount.h> --#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); - #endif - #ifdef HAVE_LINUX_FS_H - #include <linux/fs.h> -+#elif HAVE_SYS_MOUNT_H -+#include <sys/mount.h> - #endif - /* - * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. - |