From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- app-arch/libarchive/Manifest | 3 +-- app-arch/libarchive/files/libarchive-3.3.3-libressl.patch | 12 ------------ app-arch/libarchive/libarchive-3.5.1.ebuild | 6 ++---- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 app-arch/libarchive/files/libarchive-3.3.3-libressl.patch (limited to 'app-arch/libarchive') diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index c3f9c3dbe804..d20c9e6360d7 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,5 +1,4 @@ -AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996 -EBUILD libarchive-3.5.1.ebuild 3890 BLAKE2B ba23ff4c95a0a4022f7175fb30f626ba3fea138220ad3c9075849001e30ac101739ade752458fe48753ea3eb5501ed84e9048464a7a7f4fd4f7e5dd54135e414 SHA512 c8062458251fad902c29b39a57284631a2d3babe7ca4ecc4a2b1b46ea1b5b8babf05a174be2ea4910f5768bf1db32b88dffa7c6b272bbfc7b63e31b78f2a8a37 +EBUILD libarchive-3.5.1.ebuild 3768 BLAKE2B c2d8d0cfe99fedfa134f22d9f7147fe443270a9bc1ea31c1277459b52bb2ec6bd2db0b9c2e3b9962fd7b0516d20231abbf2efeecd30ec4bad204ebf945813c49 SHA512 275df5dfeef66002bf0005049f3d82eff1f7b59ed9bcc42b14b026492962b842c67b3ba342259cecfca5d2dab1cd4668e86cee8e177dab2c1669d378b8d74d15 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7 diff --git a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch deleted file mode 100644 index 4d7c0ec7cf37..000000000000 --- a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/libarchive/archive_openssl_evp_private.h -+++ b/libarchive/archive_openssl_evp_private.h -@@ -28,7 +28,8 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include /* malloc, free */ - #include /* memset */ - static inline EVP_MD_CTX *EVP_MD_CTX_new(void) diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild index 2db8781cfd2a..1319a7f8b960 100644 --- a/app-arch/libarchive/libarchive-3.5.1.ebuild +++ b/app-arch/libarchive/libarchive-3.5.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" +IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" RDEPEND=" acl? ( virtual/acl[${MULTILIB_USEDEP}] ) @@ -23,8 +23,7 @@ RDEPEND=" kernel_linux? ( xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl: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}] ) @@ -38,7 +37,6 @@ DEPEND="${RDEPEND} )" PATCHES=( - "${FILESDIR}"/${PN}-3.3.3-libressl.patch "${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch # drop on next release ) -- cgit v1.2.3