[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2024-05-13 Thread Michał Górny 
commit: fa1e0dba0029ad4866d1e45d0f5ef9e47ec1091b
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 13 12:43:17 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 13 12:53:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1e0dba

app-arch/libarchive: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/libarchive/Manifest   |   2 -
 .../files/libarchive-3.7.2-32bit-test.patch|  29 
 .../files/libarchive-3.7.2-safe-fprintf.patch  |  27 
 app-arch/libarchive/libarchive-3.7.2-r1.ebuild | 158 --
 app-arch/libarchive/libarchive-3.7.2-r3.ebuild | 180 -
 5 files changed, 396 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 2baf43a36402..aa151c417a12 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,5 +1,3 @@
-DIST libarchive-3.7.2.tar.xz 5237056 BLAKE2B 
7221db4811a965ee61d879a2603480363628a19995a351b572d099be9f35576d76f0b0822f9a5a47d9929bc094dfd8eafcb4a073e39bb3aa797d4b926ca5
 SHA512 
a21bebb27b808cb7d2ed13a70739904a1b7b55661d8dea83c9897a0129cf71e20c962f13666c571782ff0f4f753ca885619c2097d9e7691c2dee4e6e4b9a2971
-DIST libarchive-3.7.2.tar.xz.asc 659 BLAKE2B 
7141baf007b89b7ee38ec817b648cef5efb4d694953fcd49f6ed2dc95cf4da2d9259262b9eb4f01ff5d4ecee1257b266a8c6687a8e8ef8790121048229f1ad22
 SHA512 
c2ce850088245d7723720737d74d1cc1819984d01b3f9e4ed96b0757f4c6d6d511b78792181a12400c563632d74edcd0c2c3a4b7527cba40ada7ef74488078fc
 DIST libarchive-3.7.3.tar.xz 5428992 BLAKE2B 
c53672c8cdbe8f406f00bf4fc6b36e4dffcd23a33909dbec6ef06b86dceefc6062840eff629ba3bd19c36121720e16a8ba10dfa1a35ebed186cc92eb144f55d0
 SHA512 
984e7c61010b9555bafe54d5f52ff2d089e28afe5cea3a14615e2aca8539075293789d18f17f8915882ec328bcbdca7b3d1536d6dc19620ca226e8b6d802ef63
 DIST libarchive-3.7.3.tar.xz.asc 659 BLAKE2B 
bfe18e36ef2e96ad46ab2cd1236701b4b80f41ebb840681c1baf7eac72f38444cc0619645fac17d3acdda6553b294483d87f0a92d9575138d117934e838d85d2
 SHA512 
9f340b41fc9db34f1c4e0823d559b666196d3031249e05981cfb43a401aa8a85710f14ba1cc784ab3ca367439e4c485668dffe7020f38f50b3ed35810df504a1
 DIST libarchive-3.7.4.tar.xz 5417660 BLAKE2B 
128f72235da61e112201046c0cfe62a8c580cf73b426c4cfe270ae913356f6ad430ba33a663dcd617b082c7baf45ada8d1c9928c45fea16fd57e8020693a60bc
 SHA512 
84bc346ba15861ab10aa54a3d687de955178e4efbe12bf3a49a467181e7f819673949f131f4c8338de8ed6e319a8565af376e5a540380bda08e60dffbc7c8686

diff --git a/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch 
b/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch
deleted file mode 100644
index 5f43c2626735..
--- a/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001
-From: Martin Matuska 
-Date: Tue, 12 Sep 2023 08:54:47 +0200
-Subject: [PATCH] tests: fix zstd long option test for 32-bit architectures
-
-Fixes #1968

- libarchive/test/test_write_filter_zstd.c | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libarchive/test/test_write_filter_zstd.c 
b/libarchive/test/test_write_filter_zstd.c
-index 3cdbd812a..c9731f1b6 100644
 a/libarchive/test/test_write_filter_zstd.c
-+++ b/libarchive/test/test_write_filter_zstd.c
-@@ -161,8 +161,12 @@ DEFINE_TEST(test_write_filter_zstd)
-   archive_write_set_filter_option(a, NULL, "max-frame-size", 
"1048576"));
- #endif
- #if ZSTD_VERSION_NUMBER >= MINVER_LONG
--  assertEqualIntA(a, ARCHIVE_OK,
--  archive_write_set_filter_option(a, NULL, "long", "27"));
-+  if ((int)(sizeof(size_t) == 4))
-+  assertEqualIntA(a, ARCHIVE_OK,
-+  archive_write_set_filter_option(a, NULL, "long", "26"));
-+  else
-+  assertEqualIntA(a, ARCHIVE_OK,
-+  archive_write_set_filter_option(a, NULL, "long", "27"));
-   assertEqualIntA(a, ARCHIVE_FAILED,
-   archive_write_set_filter_option(a, NULL, "long", "-1")); /* 
negative */
- #endif

diff --git a/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch 
b/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch
deleted file mode 100644
index 6a351ba37fea..
--- a/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001
-From: Ed Maste 
-Date: Fri, 29 Mar 2024 18:02:06 -0400
-Subject: [PATCH] tar: make error reporting more robust and use correct errno
- (#2101)
-
-As discussed in #1609.

- tar/read.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tar/read.c b/tar/read.c
-index af3d3f423..a7f14a07b 100644
 a/tar/read.c
-+++ b/tar/read.c
-@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct 
archive *writer)
-   if (r != ARCHIVE_OK) {
-

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2023-09-12 Thread Michał Górny 
commit: 45b40c67c120aadd5474063b1bd2d2cd1833b9d4
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Sep 12 10:25:08 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Sep 12 10:25:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b40c67

app-arch/libarchive: Bump to 3.7.2

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/libarchive/Manifest   |   2 +
 .../files/libarchive-3.7.2-32bit-test.patch|  29 
 app-arch/libarchive/libarchive-3.7.2.ebuild| 147 +
 3 files changed, 178 insertions(+)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 34ff66da5d15..0784c5c3e794 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1,4 @@
 DIST libarchive-3.7.1.tar.xz 5254260 BLAKE2B 
1a6fa4f5027effea3df1cfcd2d99b8b126fe03d727412b0a4529d6b2157c2c29490bcce206d0f771256c5ed6dec9612608c2c54c4861647f4e2892e0f5548adb
 SHA512 
24380b9aa24434dfe39929ec85ede33580291023b20b7cdf03990ce62578eaeb389f5ca5680245a84c7aad51574c85a1fa3fad5254ec5395eadac1cb2130a936
 DIST libarchive-3.7.1.tar.xz.asc 659 BLAKE2B 
5e72732d2e5a4f5f04f3510b3d81a148f23dffa10a3ebe709e816388c5a6e68c08ee2bbe36d81141d5ffa94ed64df3e4ca05994cda651c09589fda69a6a95e90
 SHA512 
6f6f6e5780c609bd9c6c359c210656f26afb585bda46988687e19d1e55f4f3260ea80bf11bfba1213fb3a3e1514c5c096692b4b9e96ffbadf06f85eb1227250a
+DIST libarchive-3.7.2.tar.xz 5237056 BLAKE2B 
7221db4811a965ee61d879a2603480363628a19995a351b572d099be9f35576d76f0b0822f9a5a47d9929bc094dfd8eafcb4a073e39bb3aa797d4b926ca5
 SHA512 
a21bebb27b808cb7d2ed13a70739904a1b7b55661d8dea83c9897a0129cf71e20c962f13666c571782ff0f4f753ca885619c2097d9e7691c2dee4e6e4b9a2971
+DIST libarchive-3.7.2.tar.xz.asc 659 BLAKE2B 
7141baf007b89b7ee38ec817b648cef5efb4d694953fcd49f6ed2dc95cf4da2d9259262b9eb4f01ff5d4ecee1257b266a8c6687a8e8ef8790121048229f1ad22
 SHA512 
c2ce850088245d7723720737d74d1cc1819984d01b3f9e4ed96b0757f4c6d6d511b78792181a12400c563632d74edcd0c2c3a4b7527cba40ada7ef74488078fc

diff --git a/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch 
b/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch
new file mode 100644
index ..5f43c2626735
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch
@@ -0,0 +1,29 @@
+From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001
+From: Martin Matuska 
+Date: Tue, 12 Sep 2023 08:54:47 +0200
+Subject: [PATCH] tests: fix zstd long option test for 32-bit architectures
+
+Fixes #1968
+---
+ libarchive/test/test_write_filter_zstd.c | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/test/test_write_filter_zstd.c 
b/libarchive/test/test_write_filter_zstd.c
+index 3cdbd812a..c9731f1b6 100644
+--- a/libarchive/test/test_write_filter_zstd.c
 b/libarchive/test/test_write_filter_zstd.c
+@@ -161,8 +161,12 @@ DEFINE_TEST(test_write_filter_zstd)
+   archive_write_set_filter_option(a, NULL, "max-frame-size", 
"1048576"));
+ #endif
+ #if ZSTD_VERSION_NUMBER >= MINVER_LONG
+-  assertEqualIntA(a, ARCHIVE_OK,
+-  archive_write_set_filter_option(a, NULL, "long", "27"));
++  if ((int)(sizeof(size_t) == 4))
++  assertEqualIntA(a, ARCHIVE_OK,
++  archive_write_set_filter_option(a, NULL, "long", "26"));
++  else
++  assertEqualIntA(a, ARCHIVE_OK,
++  archive_write_set_filter_option(a, NULL, "long", "27"));
+   assertEqualIntA(a, ARCHIVE_FAILED,
+   archive_write_set_filter_option(a, NULL, "long", "-1")); /* 
negative */
+ #endif

diff --git a/app-arch/libarchive/libarchive-3.7.2.ebuild 
b/app-arch/libarchive/libarchive-3.7.2.ebuild
new file mode 100644
index ..cc8d80504e15
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.7.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="
+   https://www.libarchive.org/
+   https://github.com/libarchive/libarchive/
+"
+SRC_URI="
+   https://www.libarchive.de/downloads/${P}.tar.xz
+   verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
+"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle 
static-libs xattr zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
+
+RDEPEND="
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+   blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+   bzip2? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2023-08-21 Thread Michał Górny 
commit: dcba00efe53ae1a268078153373d3b3d7491d12c
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Aug 21 07:52:53 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Aug 21 08:59:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcba00ef

app-arch/libarchive: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/libarchive/Manifest   |   4 -
 .../files/libarchive-3.7.0-f_namemax-fix.patch |  19 ---
 app-arch/libarchive/libarchive-3.6.2-r1.ebuild | 139 ---
 app-arch/libarchive/libarchive-3.7.0.ebuild| 149 -
 4 files changed, 311 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index d2ed4d61bad1..34ff66da5d15 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,2 @@
-DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 
355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4
 SHA512 
a12bb6839e13a0be1099f42c650fc90fbfe62d32ce38bcbb4794206d29b2c782ae1115124d0e5f6b9716514213af32b05e4a42eb196447674a5f9a2a32bee043
-DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B 
a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887
 SHA512 
403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe
-DIST libarchive-3.7.0.tar.xz 5243356 BLAKE2B 
8fb72a0504038c71584c0416c1d747b7f5c82266518704353e7fdf794bd9f9e2dc22b8fa2538fa8d12a3b9776581077040371d25647fe72c02a4ec5f3bb8d950
 SHA512 
f69ff7fbec7e909b6a03dd5b01c47316f95a277907409c8fba3930bb90d02cd9a329921eada59ca1afc9a19e34de7eb34e9d535bbc8cd98fb586f723bd0fdba8
-DIST libarchive-3.7.0.tar.xz.asc 659 BLAKE2B 
5bbd535ce100fbfb7ed46f8d7a6957ebb590c07124de4192ae0b777ad3b3950e6406f1ccda97dde5b6e792be00a039621de21665df9989073ebd0a905299eda1
 SHA512 
eda3a4347fb8d7f78c8e0a73f621a4a731d46cafc2f46ac59cebe39f3ebd29b1c3db21772c2027b30c5c507f5f732c3876e94f319e62156d2a3146e412cad84d
 DIST libarchive-3.7.1.tar.xz 5254260 BLAKE2B 
1a6fa4f5027effea3df1cfcd2d99b8b126fe03d727412b0a4529d6b2157c2c29490bcce206d0f771256c5ed6dec9612608c2c54c4861647f4e2892e0f5548adb
 SHA512 
24380b9aa24434dfe39929ec85ede33580291023b20b7cdf03990ce62578eaeb389f5ca5680245a84c7aad51574c85a1fa3fad5254ec5395eadac1cb2130a936
 DIST libarchive-3.7.1.tar.xz.asc 659 BLAKE2B 
5e72732d2e5a4f5f04f3510b3d81a148f23dffa10a3ebe709e816388c5a6e68c08ee2bbe36d81141d5ffa94ed64df3e4ca05994cda651c09589fda69a6a95e90
 SHA512 
6f6f6e5780c609bd9c6c359c210656f26afb585bda46988687e19d1e55f4f3260ea80bf11bfba1213fb3a3e1514c5c096692b4b9e96ffbadf06f85eb1227250a

diff --git a/app-arch/libarchive/files/libarchive-3.7.0-f_namemax-fix.patch 
b/app-arch/libarchive/files/libarchive-3.7.0-f_namemax-fix.patch
deleted file mode 100644
index 36ed70fca44b..
--- a/app-arch/libarchive/files/libarchive-3.7.0-f_namemax-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: 
https://github.com/libarchive/libarchive/commit/bd074c2531e867078788fe8539376c31119e4e55.patch
-From: Wong Hoi Sing Edison 
-Date: Wed, 19 Jul 2023 16:59:32 +0800
-Subject: [PATCH] Replace `svfs.f_namelen` with `svfs.f_namemax` (#1924)
-
-The equivalent for `f_namelen` in struct statvfs is `f_namemax`.
-
-Signed-off-by: Wong Hoi Sing Edison 
 a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -1866,7 +1866,7 @@ setup_current_filesystem(struct archive_read_disk *a)
- #if defined(USE_READDIR_R)
-   /* Set maximum filename length. */
- #if defined(HAVE_STATVFS)
--  t->current_filesystem->name_max = svfs.f_namelen;
-+  t->current_filesystem->name_max = svfs.f_namemax;
- #else
-   t->current_filesystem->name_max = sfs.f_namelen;
- #endif

diff --git a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild 
b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
deleted file mode 100644
index dc59aa24463c..
--- a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="
-   https://www.libarchive.org/
-   https://github.com/libarchive/libarchive/
-"
-SRC_URI="
-   https://www.libarchive.de/downloads/${P}.tar.xz
-   verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle 
static-libs xattr zstd"

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2023-07-19 Thread Michał Górny 
commit: 436a86c6ba463931212876d2ed96d067f20d378e
Author: Ian Jordan  gmail  com>
AuthorDate: Wed Jul 19 15:26:58 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jul 19 18:30:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436a86c6

app-arch/libarchive: fix build on musl

Cherrypicked patch from master repo to fix compiling 3.7.0
under musl. Tested with both GCC and LLVM.

Also added BDEP for sys-libs/queue-standalone for this version.

Closes: https://bugs.gentoo.org/910552
Signed-off-by: Ian Jordan  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31959
Signed-off-by: Michał Górny  gentoo.org>

 .../files/libarchive-3.7.0-f_namemax-fix.patch| 19 +++
 app-arch/libarchive/libarchive-3.7.0.ebuild   |  6 ++
 2 files changed, 25 insertions(+)

diff --git a/app-arch/libarchive/files/libarchive-3.7.0-f_namemax-fix.patch 
b/app-arch/libarchive/files/libarchive-3.7.0-f_namemax-fix.patch
new file mode 100644
index ..36ed70fca44b
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.7.0-f_namemax-fix.patch
@@ -0,0 +1,19 @@
+From: 
https://github.com/libarchive/libarchive/commit/bd074c2531e867078788fe8539376c31119e4e55.patch
+From: Wong Hoi Sing Edison 
+Date: Wed, 19 Jul 2023 16:59:32 +0800
+Subject: [PATCH] Replace `svfs.f_namelen` with `svfs.f_namemax` (#1924)
+
+The equivalent for `f_namelen` in struct statvfs is `f_namemax`.
+
+Signed-off-by: Wong Hoi Sing Edison 
+--- a/libarchive/archive_read_disk_posix.c
 b/libarchive/archive_read_disk_posix.c
+@@ -1866,7 +1866,7 @@ setup_current_filesystem(struct archive_read_disk *a)
+ #if defined(USE_READDIR_R)
+   /* Set maximum filename length. */
+ #if defined(HAVE_STATVFS)
+-  t->current_filesystem->name_max = svfs.f_namelen;
++  t->current_filesystem->name_max = svfs.f_namemax;
+ #else
+   t->current_filesystem->name_max = sfs.f_namelen;
+ #endif

diff --git a/app-arch/libarchive/libarchive-3.7.0.ebuild 
b/app-arch/libarchive/libarchive-3.7.0.ebuild
index d6d88d91c98f..0346154a7172 100644
--- a/app-arch/libarchive/libarchive-3.7.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.0.ebuild
@@ -46,8 +46,14 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
+   elibc_musl? ( sys-libs/queue-standalone )
 "
 
+# Bug #910552 Only required for version 3.7.0
+PATCHES=(
+   "${FILESDIR}/${P}-f_namemax-fix.patch"
+)
+
 # false positives (checks for libc-defined hash functions)
 QA_CONFIG_IMPL_DECL_SKIP=(
SHA256_Init SHA256_Update SHA256_Final

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2022-12-05 Thread Michał Górny 
commit: b618d6ec93c66f91c071c99c65775aaef2471bdf
Author: Meena Shanmugam  google  com>
AuthorDate: Tue Dec  6 00:32:30 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec  6 06:02:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b618d6ec

app-arch/libarchive: Add patch to fix CVE-2022-36227.

New version is not released in libarchive with the CVE-2022-36227 fix.

Closes: https://bugs.gentoo.org/882521
Signed-off-by: Meena Shanmugam  google.com>
Closes: https://github.com/gentoo/gentoo/pull/28560
Signed-off-by: Michał Górny  gentoo.org>

 .../files/libarchive-3.6.1-CVE-2022-36227.patch| 35 ++
 ...ive-3.6.1.ebuild => libarchive-3.6.1-r1.ebuild} |  2 ++
 2 files changed, 37 insertions(+)

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
new file mode 100644
index ..da71a196b875
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch
@@ -0,0 +1,35 @@
+From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
+From: obiwac 
+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/libarchive-3.6.1.ebuild 
b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
similarity index 97%
rename from app-arch/libarchive/libarchive-3.6.1.ebuild
rename to app-arch/libarchive/libarchive-3.6.1-r1.ebuild
index 2c65539abe4b..886252808767 100644
--- a/app-arch/libarchive/libarchive-3.6.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
@@ -47,6 +47,8 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${P}-glibc-2.36.patch
+   # https://github.com/libarchive/libarchive/pull/1759
+   "${FILESDIR}"/${P}-CVE-2022-36227.patch
 )
 
 multilib_src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2022-08-02 Thread Sam James 
commit: f1c864205d96d4c513341ab7b21f48fe3fa19a81
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  3 02:22:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  3 02:25:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c86420

app-arch/libarchive: fix build w/ glibc 2.36

Closes: https://bugs.gentoo.org/863227
Signed-off-by: Sam James  gentoo.org>

 .../files/libarchive-3.6.1-glibc-2.36.patch| 39 ++
 app-arch/libarchive/libarchive-3.6.1.ebuild|  4 +++
 2 files changed, 43 insertions(+)

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 ..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 
+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 
+ #endif
+-#ifdef HAVE_SYS_MOUNT_H
+-#include 
+-#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include 
+ #endif
+@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
+ #endif
+ #ifdef HAVE_LINUX_FS_H
+ #include 
++#elif HAVE_SYS_MOUNT_H
++#include 
+ #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

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2020-03-10 Thread Michał Górny 
commit: 8b9c90857e04acd24efb8339c634dfd99b92
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Mar 10 16:04:16 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar 10 16:05:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9c

app-arch/libarchive: Remove vulnerable version

Bug: https://bugs.gentoo.org/710358
Signed-off-by: Michał Górny  gentoo.org>

 app-arch/libarchive/Manifest   |   1 -
 .../libarchive-3.4.0-without_zlib_build_fix.patch  | 160 -
 app-arch/libarchive/libarchive-3.4.0.ebuild| 135 -
 3 files changed, 296 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index b9aec85d512..dc4b48a9a98 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1 @@
-DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 
6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462
 SHA512 
2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B 
eea90e4751ae487cd1a9b0eecd16598d1b81665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d
 SHA512 
a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021

diff --git 
a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch 
b/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
deleted file mode 100644
index e0a3167390f..000
--- a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 64333cef68d7bcc67bef6ecf177fbeaa549b9139 Mon Sep 17 00:00:00 2001
-From: Martin Matuska 
-Date: Sat, 29 Jun 2019 00:20:58 +0200
-Subject: [PATCH] Unbreak compilation without zlib
-
-Fixes #1214

- libarchive/archive_read_support_filter_gzip.c | 54 ---
- libarchive/test/test_read_format_raw.c|  4 ++
- 2 files changed, 39 insertions(+), 19 deletions(-)
-
-diff --git a/libarchive/archive_read_support_filter_gzip.c 
b/libarchive/archive_read_support_filter_gzip.c
-index 458b6f729..9fa9e2b0d 100644
 a/libarchive/archive_read_support_filter_gzip.c
-+++ b/libarchive/archive_read_support_filter_gzip.c
-@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a)
-  */
- static ssize_t
- peek_at_header(struct archive_read_filter *filter, int *pbits,
-- struct private_data *state)
-+#ifdef HAVE_ZLIB_H
-+ struct private_data *state
-+#else
-+ void *state
-+#endif
-+)
- {
-   const unsigned char *p;
-   ssize_t avail, len;
-   int bits = 0;
-   int header_flags;
-+#ifndef HAVE_ZLIB_H
-+  (void)state; /* UNUSED */
-+#endif
- 
-   /* Start by looking at the first ten bytes of the header, which
-* is all fixed layout. */
-@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int 
*pbits,
-   bits += 3;
-   header_flags = p[3];
-   /* Bytes 4-7 are mod time in little endian. */
-+#ifdef HAVE_ZLIB_H
-   if (state)
-   state->mtime = archive_le32dec(p + 4);
-+#endif
-   /* Byte 8 is deflate flags. */
-   /*  TODO: return deflate flags back to consume_header for use
-  in initializing the decompressor. */
-@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int 
*pbits,
- 
-   /* Null-terminated optional filename. */
-   if (header_flags & 8) {
-+#ifdef HAVE_ZLIB_H
-   ssize_t file_start = len;
-+#endif
-   do {
-   ++len;
-   if (avail < len)
-@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int 
*pbits,
-   return (0);
-   } while (p[len - 1] != 0);
- 
-+#ifdef HAVE_ZLIB_H
-   if (state) {
-   /* Reset the name in case of repeat header reads. */
-   free(state->name);
-   state->name = strdup((const char *)[file_start]);
-   }
-+#endif
-   }
- 
-   /* Null-terminated optional comment. */
-@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self,
-   return (0);
- }
- 
--static int
--gzip_read_header(struct archive_read_filter *self, struct archive_entry 
*entry)
--{
--  struct private_data *state;
--
--  state = (struct private_data *)self->data;
--
--  /* A mtime of 0 is considered invalid/missing. */
--  if (state->mtime != 0)
--  archive_entry_set_mtime(entry, state->mtime, 0);
--
--  /* If the name is available, extract it. */
--  if (state->name)
--  archive_entry_set_pathname(entry, state->name);
--
--  return

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2019-08-15 Thread Michał Górny 
commit: af203bc0ea910fb4d2603af4b0d7b8e9cbaf6916
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 15 16:03:23 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 15 16:07:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af203bc0

app-arch/libarchive: Clean old up

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/libarchive/Manifest   |   2 -
 .../files/libarchive-3.3.1-libressl.patch  |  25 
 .../files/libarchive-3.3.2-libressl.patch  |  25 
 app-arch/libarchive/libarchive-3.3.1.ebuild| 122 
 app-arch/libarchive/libarchive-3.3.2.ebuild| 128 -
 5 files changed, 302 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index a4e6b879695..3037624f545 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1 @@
-DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B 
fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1
 SHA512 
90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
-DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B 
da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb
 SHA512 
1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 
627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22
 SHA512 
9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7

diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch 
b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
deleted file mode 100644
index 7ee48d4e5f5..000
--- a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
 a/libarchive/archive_openssl_evp_private.h   2017-01-29 
05:06:27.0 +
-+++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 
+
-@@ -28,7 +28,8 @@
- #include 
- #include 
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
- #include  /* malloc, free */
- #include  /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
-
 a/libarchive/archive_openssl_hmac_private.h2017-01-29 
05:06:27.0 +
-+++ b/libarchive/archive_openssl_hmac_private.h2018-04-19 
04:02:18.309167446 +
-@@ -28,7 +28,8 @@
- #include 
- #include 
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
- #include  /* malloc, free */
- #include  /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)

diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch 
b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
deleted file mode 100644
index e053a539fae..000
--- a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
 a/libarchive/archive_openssl_evp_private.h   2017-01-29 
05:06:27.0 +
-+++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 
+
-@@ -28,7 +28,8 @@
- #include 
- #include 
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
- #include  /* malloc, free */
- #include  /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
-
 a/libarchive/archive_openssl_hmac_private.h2017-01-29 
05:06:27.0 +
-+++ b/libarchive/archive_openssl_hmac_private.h2018-04-19 
04:02:18.309167446 +
-@@ -28,7 +28,8 @@
- #include 
- #include 
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
- #include  /* malloc, free */
- #include  /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)

diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild 
b/app-arch/libarchive/libarchive-3.3.1.ebuild
deleted file mode 100644
index 5ccced536ae..000
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2018-09-10 Thread Lars Wendler 
commit: 69b9261c44146262bd51c7de277e0f3cd98a10f2
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Sep 10 09:13:42 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Sep 10 09:40:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b9261c

app-arch/libarchive: Bump to version 3.3.3

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-arch/libarchive/Manifest   |   1 +
 .../files/libarchive-3.3.3-libressl.patch  |  12 ++
 app-arch/libarchive/libarchive-3.3.3.ebuild| 128 +
 3 files changed, 141 insertions(+)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 1570763e6a1..a4e6b879695 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1,3 @@
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B 
fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1
 SHA512 
90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B 
da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb
 SHA512 
1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
+DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 
627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22
 SHA512 
9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7

diff --git a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch 
b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
new file mode 100644
index 000..4d7c0ec7cf3
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
@@ -0,0 +1,12 @@
+--- a/libarchive/archive_openssl_evp_private.h
 b/libarchive/archive_openssl_evp_private.h
+@@ -28,7 +28,8 @@
+ #include 
+ #include 
+
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #include  /* malloc, free */
+ #include  /* memset */
+ static inline EVP_MD_CTX *EVP_MD_CTX_new(void)

diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild 
b/app-arch/libarchive/libarchive-3.3.3.ebuild
new file mode 100644
index 000..18f015656af
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/;
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz;
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo 
nettle static-libs +threads xattr +zlib"
+
+RDEPEND="
+   acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+   bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+   expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+   !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+   iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+   kernel_linux? (
+   xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+   )
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+   lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+   lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+   nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+   zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   kernel_linux? (
+   virtual/os-headers
+   e2fsprogs? ( sys-fs/e2fsprogs )
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.3.3-libressl.patch
+)
+
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
+src_prepare() {
+   default
+   elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+   export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+   local myconf=()
+   myconf=(
+   $(use_enable acl)
+   $(use_enable static-libs static)
+   $(use_enable xattr)
+   $(use_with bzip2 bz2lib)
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2017-02-11 Thread NP Hardass 
commit: dc5768207ff73ee56333736676ca256e578fd0c8
Author: NP-Hardass  gentoo  org>
AuthorDate: Sat Feb 11 17:14:24 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sat Feb 11 17:14:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc576820

app-arch/libarchive: Backport fix for CVE-2017-5601, #607794

https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9

Package-Manager: portage-2.3.0

 app-arch/libarchive/files/CVE-2017-5601.patch  |  24 +
 app-arch/libarchive/libarchive-3.2.2-r1.ebuild | 125 +
 2 files changed, 149 insertions(+)

diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch 
b/app-arch/libarchive/files/CVE-2017-5601.patch
new file mode 100644
index 00..4ba85ff907
--- /dev/null
+++ b/app-arch/libarchive/files/CVE-2017-5601.patch
@@ -0,0 +1,24 @@
+From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
+From: Martin Matuska 
+Date: Thu, 19 Jan 2017 22:00:18 +0100
+Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
+ Fixes a heap buffer overflow reported in Secunia SA74169
+
+---
+ libarchive/archive_read_support_format_lha.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libarchive/archive_read_support_format_lha.c 
b/libarchive/archive_read_support_format_lha.c
+index 52a5531..d77a7c2 100644
+--- a/libarchive/archive_read_support_format_lha.c
 b/libarchive/archive_read_support_format_lha.c
+@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha 
*lha)
+   /* Get a real compressed file size. */
+   lha->compsize -= extdsize - 2;
+ 
++  if (lha->compsize < 0)
++  goto invalid;   /* Invalid compressed file size */
++
+   if (sum_calculated != headersum) {
+   archive_set_error(>archive, ARCHIVE_ERRNO_MISC,
+   "LHa header sum error");

diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild 
b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
new file mode 100644
index 00..e33c0b78cb
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/;
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz;
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo 
nettle static-libs +threads xattr +zlib"
+
+RDEPEND="
+   acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+   bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+   expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+   !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+   iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+   kernel_linux? (
+   xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+   )
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+   lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+   lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+   nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+   zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   kernel_linux? (
+   virtual/os-headers
+   e2fsprogs? ( sys-fs/e2fsprogs )
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/CVE-2017-5601.patch
+)
+
+src_prepare() {
+   default
+   elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+   export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+   local myconf=()
+   myconf=(
+   $(use_enable acl)
+   $(use_enable static-libs static)
+   $(use_enable xattr)
+   $(use_with bzip2 bz2lib)
+   $(use_with expat)
+   $(use_with !expat xml2)
+   $(use_with iconv)
+   $(use_with lz4)
+   $(use_with lzma)
+   $(use_with lzo lzo2)
+   $(use_with nettle)
+   $(use_with zlib)
+   )
+   if multilib_is_native_abi ; then myconf+=(
+   --enable-bsdcat=$(tc-is-static-only && echo static || echo 
shared)
+   --enable-bsdcpio=$(tc-is-static-only && echo static || echo 
shared)
+   --enable-bsdtar=$(tc-is-static-only && echo static || echo 
shared)
+   ); else myconf+=(
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2016-10-31 Thread Lars Wendler 
commit: 6709a4dd32310b2280e4e90e37c4000fa9c13e27
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Oct 31 21:28:26 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Oct 31 22:38:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6709a4dd

app-arch/libarchive: Removed old.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/libarchive/Manifest   |   1 -
 .../files/libarchive-3.1.2-CVE-2013-0211.patch |  32 --
 .../files/libarchive-3.1.2-CVE-2016-1541.patch |  67 ---
 .../files/libarchive-3.1.2-outofsource.patch   |  29 -
 app-arch/libarchive/libarchive-3.1.2-r1.ebuild |  91 ---
 app-arch/libarchive/libarchive-3.1.2-r2.ebuild |  93 ---
 app-arch/libarchive/libarchive-3.1.2-r3.ebuild | 121 
 app-arch/libarchive/libarchive-3.1.2-r4.ebuild | 121 
 app-arch/libarchive/libarchive-3.1.2-r5.ebuild | 125 -
 9 files changed, 680 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 258b3dc..778eae3 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1,2 @@
-DIST libarchive-3.1.2.tar.gz 4527540 SHA256 
eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e SHA512 
1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114
 WHIRLPOOL 
b90f336afb5264be91fb17d7dae3d5697e3f84e24d276af1d5ac076fe15ef6f5756488f09506fabe470473becb5449cd1f34865309dcf8a914e6e83506e8695f
 DIST libarchive-3.2.1.tar.gz 544 SHA256 
72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 SHA512 
a5d43cb0bf36b687fabfbc874e7adc1fa94c563e7f073e107db8d4e79e8d0d8146cb985809f8115fbb882fc2d8a2a477d0a7364e93e6df62f292bb5e9865ec5c
 WHIRLPOOL 
1dd79ec3d7cf53be237d6730476c6a47c0722a5a7d0f2adc347aa491ba95ba7c77342a39a9e3d0fbff64111b552bb558cb571aa74dd6c18e6c60987bf0f41d7c
 DIST libarchive-3.2.2.tar.gz 5458241 SHA256 
691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 
a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7
 WHIRLPOOL 
8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef

diff --git a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch 
b/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch
deleted file mode 100644
index 78427ce..
--- a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001
-From: Tim Kientzle 
-Date: Fri, 22 Mar 2013 23:48:41 -0700
-Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a
- certain common programming error (passing -1 to write) from leading to other
- problems deeper in the library.
-

- libarchive/archive_write.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
-index eede5e0..be85621 100644
 a/libarchive/archive_write.c
-+++ b/libarchive/archive_write.c
-@@ -673,8 +673,13 @@ static ssize_t
- _archive_write_data(struct archive *_a, const void *buff, size_t s)
- {
-   struct archive_write *a = (struct archive_write *)_a;
-+  const size_t max_write = INT_MAX;
-+
-   archive_check_magic(>archive, ARCHIVE_WRITE_MAGIC,
-   ARCHIVE_STATE_DATA, "archive_write_data");
-+  /* In particular, this catches attempts to pass negative values. */
-+  if (s > max_write)
-+  s = max_write;
-   archive_clear_error(>archive);
-   return ((a->format_write_data)(a, buff, s));
- }
--- 
-1.8.1
-

diff --git a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch 
b/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch
deleted file mode 100644
index 63c6a74..
--- a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d0331e8e5b05b475f20b1f3101fe1ad772d7e7e7 Mon Sep 17 00:00:00 2001
-From: Tim Kientzle 
-Date: Sun, 24 Apr 2016 17:13:45 -0700
-Subject: [PATCH] Issue #656:  Fix CVE-2016-1541, VU#862384
-
-When reading OS X metadata entries in Zip archives that were stored
-without compression, libarchive would use the uncompressed entry size
-to allocate a buffer but would use the compressed entry size to limit
-the amount of data copied into that buffer.  Since the compressed
-and uncompressed sizes are provided by data in the archive itself,
-an attacker could manipulate these values to write data beyond
-the end of the allocated buffer.
-
-This fix provides three new checks to guard against such
-manipulation and to make libarchive generally more robust when
-handling this type of entry:
-

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2016-07-05 Thread NP Hardass 
commit: eb38d016eda247952828b7c3de6d1fd4cb558cf5
Author: NP-Hardass  gentoo  org>
AuthorDate: Mon Jul  4 19:54:48 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Tue Jul  5 19:26:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb38d016

app-arch/libarchive: Add src_prepare w/ eautoreconf, fix OSX acl #587890

Package-Manager: portage-2.2.28

 .../files/libarchive-3.2.1-osx-fix-acl.patch   | 32 ++
 ...-3.2.1-r2.ebuild => libarchive-3.2.1-r3.ebuild} | 10 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app-arch/libarchive/files/libarchive-3.2.1-osx-fix-acl.patch 
b/app-arch/libarchive/files/libarchive-3.2.1-osx-fix-acl.patch
new file mode 100644
index 000..f3d1363
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.2.1-osx-fix-acl.patch
@@ -0,0 +1,32 @@
+From 3e66829717c8fde611b2b611497f08a46da40ce7 Mon Sep 17 00:00:00 2001
+From: Joerg Sonnenberger 
+Date: Tue, 21 Jun 2016 18:29:07 +0200
+Subject: [PATCH] Dummy out copy_acls if sys/acl.h is missing or ACL support is
+ disabled.
+
+---
+ libarchive/archive_write_disk_posix.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libarchive/archive_write_disk_posix.c 
b/libarchive/archive_write_disk_posix.c
+index 6737cd7..67aacf1 100644
+--- a/libarchive/archive_write_disk_posix.c
 b/libarchive/archive_write_disk_posix.c
+@@ -3487,6 +3487,9 @@ copy_xattrs(struct archive_write_disk *a, int tmpfd, int 
dffd)
+ static int
+ copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
+ {
++#ifndef HAVE_SYS_ACL_H
++  return 0;
++#else
+   acl_t acl, dfacl = NULL;
+   int acl_r, ret = ARCHIVE_OK;
+ 
+@@ -3514,6 +3517,7 @@ copy_acls(struct archive_write_disk *a, int tmpfd, int 
dffd)
+   if (dfacl)
+   acl_free(dfacl);
+   return (ret);
++#endif
+ }
+ 
+ static int

diff --git a/app-arch/libarchive/libarchive-3.2.1-r2.ebuild 
b/app-arch/libarchive/libarchive-3.2.1-r3.ebuild
similarity index 95%
rename from app-arch/libarchive/libarchive-3.2.1-r2.ebuild
rename to app-arch/libarchive/libarchive-3.2.1-r3.ebuild
index 3b514eb..362bf63 100644
--- a/app-arch/libarchive/libarchive-3.2.1-r2.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.1-r3.ebuild
@@ -36,7 +36,15 @@ DEPEND="${RDEPEND}
e2fsprogs? ( sys-fs/e2fsprogs )
)"
 
-PATCHES=( "${FILESDIR}/${P}-fix-tests-gnu99.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-fix-tests-gnu99.patch"
+   "${FILESDIR}/${P}-osx-fix-acl.patch" #587890
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
 
 multilib_src_configure() {
export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2016-07-03 Thread NP Hardass 
commit: 6c9193ee55e0603fde627238a82acd02fa7010a5
Author: NP-Hardass  gentoo  org>
AuthorDate: Sun Jul  3 07:04:30 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sun Jul  3 07:05:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9193ee

app-arch/libarchive: Add lz4, fix up EAPI6, fix test, minor formatting

3.2.1-r2 makes bsdcat and bsdcpio the default for BSD must like bsdtar
already is.

Package-Manager: portage-2.2.28

 .../files/libarchive-3.2.1-fix-tests-gnu99.patch   | 47 ++
 ...ive-3.2.1.ebuild => libarchive-3.2.1-r1.ebuild} | 39 +++
 ...ive-3.2.1.ebuild => libarchive-3.2.1-r2.ebuild} | 55 ++
 app-arch/libarchive/metadata.xml   | 21 +
 4 files changed, 105 insertions(+), 57 deletions(-)

diff --git a/app-arch/libarchive/files/libarchive-3.2.1-fix-tests-gnu99.patch 
b/app-arch/libarchive/files/libarchive-3.2.1-fix-tests-gnu99.patch
new file mode 100644
index 000..ec249c3
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.2.1-fix-tests-gnu99.patch
@@ -0,0 +1,47 @@
+From 11f5b75c9ba12ba73b5fa34dc9d285983d99c01b Mon Sep 17 00:00:00 2001
+From: Joerg Sonnenberger 
+Date: Wed, 22 Jun 2016 23:09:27 +0200
+Subject: [PATCH] Avoid use of C99 for-scope declarations to fix issue #729.
+
+---
+ libarchive/test/test_write_format_gnutar_filenames.c | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/test/test_write_format_gnutar_filenames.c 
b/libarchive/test/test_write_format_gnutar_filenames.c
+index 38b4ca9..26457d3 100644
+--- a/libarchive/test/test_write_format_gnutar_filenames.c
 b/libarchive/test/test_write_format_gnutar_filenames.c
+@@ -42,6 +42,7 @@ DEFINE_TEST(test_write_format_gnutar_filenames)
+   struct archive_entry *ae, *template;
+   struct archive *a;
+   size_t used;
++  int i;
+ 
+   buff = malloc(buffsize); /* million bytes of work area */
+   assert(buff != NULL);
+@@ -55,7 +56,7 @@ DEFINE_TEST(test_write_format_gnutar_filenames)
+   archive_entry_set_mode(template, S_IFREG | 0755);
+   archive_entry_set_size(template, 8);
+ 
+-  for (int i = 0; i < 2000; ++i) {
++  for (i = 0; i < 2000; ++i) {
+   filename[i] = 'a';
+   filename[i + 1] = '\0';
+   archive_entry_copy_pathname(template, filename);
+@@ -97,6 +98,7 @@ DEFINE_TEST(test_write_format_gnutar_linknames)
+   struct archive_entry *ae, *template;
+   struct archive *a;
+   size_t used;
++  int i;
+ 
+   buff = malloc(buffsize); /* million bytes of work area */
+   assert(buff != NULL);
+@@ -110,7 +112,7 @@ DEFINE_TEST(test_write_format_gnutar_linknames)
+   archive_entry_set_mode(template, S_IFLNK | 0755);
+   archive_entry_copy_pathname(template, "link");
+ 
+-  for (int i = 0; i < 2000; ++i) {
++  for (i = 0; i < 2000; ++i) {
+   filename[i] = 'a';
+   filename[i + 1] = '\0';
+   archive_entry_copy_symlink(template, filename);

diff --git a/app-arch/libarchive/libarchive-3.2.1.ebuild 
b/app-arch/libarchive/libarchive-3.2.1-r1.ebuild
similarity index 87%
copy from app-arch/libarchive/libarchive-3.2.1.ebuild
copy to app-arch/libarchive/libarchive-3.2.1-r1.ebuild
index 9566991..ccdafb6 100644
--- a/app-arch/libarchive/libarchive-3.2.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.1-r1.ebuild
@@ -12,11 +12,9 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz;
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo 
nettle static-libs xattr +zlib"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo 
nettle static-libs xattr +zlib"
 
 RDEPEND="
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
acl? ( virtual/acl[${MULTILIB_USEDEP}] )
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
@@ -24,7 +22,10 @@ RDEPEND="
iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
kernel_linux? (
xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-   )
+   )
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
@@ -33,9 +34,9 @@ DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/

2016-01-11 Thread Ian Stakenvicius 
commit: 1236680f7cce8054172c79943d7493d859410556
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Sat Jan  9 14:48:50 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Mon Jan 11 16:53:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1236680f

app-arch/libarchive: convert to multilib

multilib is needed to support samba-4 (new rdep)

Package-Manager: portage-2.2.26

 .../files/libarchive-3.1.2-outofsource.patch   |  29 +
 app-arch/libarchive/libarchive-3.1.2-r3.ebuild | 121 +
 2 files changed, 150 insertions(+)

diff --git a/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch 
b/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch
new file mode 100644
index 000..6545c61
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.am  2013-02-09 12:23:03.0 -0500
 b/Makefile.am  2016-01-08 16:43:00.868186895 -0500
+@@ -508,7 +508,7 @@
+ # Building it automatically provides a sanity-check on libarchive_test_SOURCES
+ # above.
+ libarchive/test/list.h: Makefile
+-  cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > 
libarchive/test/list.h
++  mkdir -p libarchive/test && cat $(top_srcdir)/libarchive/test/test_*.c 
| grep DEFINE_TEST > libarchive/test/list.h
+ 
+ libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd 
$(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
+ 
+@@ -835,7 +835,7 @@
+   $(PLATFORMCPPFLAGS)
+ 
+ tar/test/list.h: Makefile
+-  cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h
++  mkdir -p tar/test && cat $(top_srcdir)/tar/test/test_*.c | grep 
DEFINE_TEST > tar/test/list.h
+ 
+ if BUILD_BSDTAR
+ bsdtar_test_programs= bsdtar_test
+@@ -975,7 +975,7 @@
+ bsdcpio_test_LDADD=libarchive_fe.la
+ 
+ cpio/test/list.h: Makefile
+-  cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > 
cpio/test/list.h
++  mkdir -p cpio/test && cat $(top_srcdir)/cpio/test/test_*.c | grep 
DEFINE_TEST > cpio/test/list.h
+ 
+ if BUILD_BSDCPIO
+ bsdcpio_test_programs= bsdcpio_test

diff --git a/app-arch/libarchive/libarchive-3.1.2-r3.ebuild 
b/app-arch/libarchive/libarchive-3.1.2-r3.ebuild
new file mode 100644
index 000..8153c43
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.1.2-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/;
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz;
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo 
nettle static-libs xattr +zlib"
+
+RDEPEND="
+   !libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+   bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+   expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+   !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+   iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+   kernel_linux? (
+   xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+   )
+   lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+   lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+   nettle? ( dev-libs/nettle[${MULTILIB_USEDEP}] )
+   zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   kernel_linux? (
+   virtual/os-headers
+   e2fsprogs? ( sys-fs/e2fsprogs )
+   )"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch
+   epatch "${FILESDIR}"/${P}-outofsource.patch
+   eautoreconf
+}
+
+multilib_src_configure() {
+   export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+   local myconf=()
+   myconf=(
+   $(use_enable static-libs static)
+   $(use_enable xattr)
+   $(use_enable acl)
+   $(use_with zlib)
+   $(use_with bzip2 bz2lib)
+   $(use_with iconv)
+   $(use_with lzma)
+   $(use_with lzo lzo2)
+   $(use_with nettle)
+   $(use_with !expat xml2)
+   $(use_with expat)
+   )
+   if multilib_is_native_abi ; then myconf+=(
+   --enable-bsdtar=$(tc-is-static-only && echo static || echo 
shared)
+   --enable-bsdcpio=$(tc-is-static-only && echo static || echo 
shared)
+   );