diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-03 13:53:01 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-03 13:53:01 +0100 |
| commit | 4b4d352fc9761396c68812d8eccc63b7b14d6558 (patch) | |
| tree | 4f290d635d831599222130ba8ddbf1a726129426 /app-arch | |
| parent | a2c1a301b2ea85c230b30ef69ff667f230a1bf88 (diff) | |
gentoo auto-resync : 03.08.2022 - 13:42:43
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/Manifest.gz | bin | 16737 -> 16737 bytes | |||
| -rw-r--r-- | app-arch/libarchive/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch | 39 | ||||
| -rw-r--r-- | app-arch/libarchive/libarchive-3.6.1.ebuild | 4 |
4 files changed, 45 insertions, 1 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz Binary files differindex db6b65c7439f..3e9eb1a9acf9 100644 --- a/app-arch/Manifest.gz +++ b/app-arch/Manifest.gz diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index a5cf16e9944f..f741a2e08017 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,4 +1,5 @@ +AUX libarchive-3.6.1-glibc-2.36.patch 1145 BLAKE2B 41d1d8cd22baf02810e9b405562a1d6ae696cea58352d35c5dc09f5691d6b9e0ad422477049cb3c7c18048fb92e83020100595a848ee0b56ee8fb5a26e96c822 SHA512 fd6060c67ae2ed509fb96218bb828c75065c8d8571bfce4e1c4ccd349eb58c6e38ccc3cee5ba7a8560f967d302113b2b8b7787e1bcc6d966c98162596c140c4c DIST libarchive-3.6.1.tar.gz 7431598 BLAKE2B 1f060edb3d7579e406db1e757af8193d6b23c56a07dd7392cacfc37d6634de1a732a4845a38e4c7a539a634475e54f202689c4a46f1c27655e91211783a6364f SHA512 58f7ac0c52116f73326a07dec10ff232be33b318862078785dc39f1fb2f8773b5194eabfa14764bb51ce6a5a1aa8820526e7f4c76087a6f4fcbe7789a22275b4 DIST libarchive-3.6.1.tar.gz.asc 833 BLAKE2B 6b8ebcfbffdc51b693ba51d1c24bc89b9f8da81257535427ccae7791f7849197685e450b62fdb0972c4313244bf89b659662f678c68e73467bd256873b1ca83c SHA512 4120b21113a21c0afce16be72ac3bd41e744e99c713a2cf005d128c4b2382e9dcac638d4615771b9deceee0e1c99806499aaea35227fd4e435d15e672b4d6624 -EBUILD libarchive-3.6.1.ebuild 3461 BLAKE2B 5243b1a8b5c6acdd78b019ff2256ecc57da8eb040d1e68f7b8bddce54025cd49f03a24d7d9a56a1f723e3163f27018e0c653a1c7595b942ceb31529c0022ea35 SHA512 8ee19c1183f781b8d8c1c930d9f1738176fdd90102877a25a5c0d85d7271b0825160c92c6e18259fb7d56015b8950379bf3b3d6f8860057147d5e5e806a64a8b +EBUILD libarchive-3.6.1.ebuild 3511 BLAKE2B 54bb3ebe0d2b8d5a57ed2ba6b4e811abf09294a4c153b841847adaf9365db4286dde0405977d8ecc664c8e4b1079ce0b60a9f4b1057c6d6a5dd16a691e61c61d SHA512 e693371444c352b7c579b60381ef7e2317deaee859a028abd949093ce74d04f1b8e983d2f77dd5ffadeaa400680826002612298b71b6d81dc03a42b93198be3d MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b 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 new file mode 100644 index 000000000000..e45d891e2a17 --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch @@ -0,0 +1,39 @@ +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. + diff --git a/app-arch/libarchive/libarchive-3.6.1.ebuild b/app-arch/libarchive/libarchive-3.6.1.ebuild index 41cfc71f5a04..dbe62127a118 100644 --- a/app-arch/libarchive/libarchive-3.6.1.ebuild +++ b/app-arch/libarchive/libarchive-3.6.1.ebuild @@ -45,6 +45,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-libarchive ) " +PATCHES=( + "${FILESDIR}"/${P}-glibc-2.36.patch +) + multilib_src_configure() { export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |