diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
| commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
| tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-libs/libzip | |
| parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) | |
gentoo resync : 05.04.2019
Diffstat (limited to 'dev-libs/libzip')
| -rw-r--r-- | dev-libs/libzip/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 | ||||
| -rw-r--r-- | dev-libs/libzip/libzip-1.5.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/libzip/libzip-1.5.2-r1.ebuild (renamed from dev-libs/libzip/libzip-1.5.2.ebuild) | 4 |
4 files changed, 30 insertions, 4 deletions
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index f90139424ba9..9bf8640e7707 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -2,10 +2,11 @@ AUX libzip-1.2.0-fts.patch 393 BLAKE2B 1d158551eceda9f4b6f305ae1c1c253ca85de8f47 AUX libzip-1.2.0-headers.patch 341 BLAKE2B d4a0227da9e3415f4372f6141071f2e070f0b14256dec7933dea9cdbd1d54830ae886a89a7984dd8c66e8d523e18a9070336b1a42b02426e6678ee97f742cf28 SHA512 25a54a4901e45d78263c35ea788c9ae84760c4e2cbb7e09f0dd33b35eefb47165a1788ab33a7f306d112ffdfa35a3f3ab65c1f50463d5a30ffd265a2be6208f9 AUX libzip-1.5.1-bzip2.patch 1861 BLAKE2B fdb4734858512718079af900ab96ba1be9664e2d5def086c44a52eba256759dbf733acf097dfec4e76e1f20aecf60dffbf7e7ef21c2e8a51b634c08678ea765c SHA512 af66da5aa509a3dfc47c0d456d7b462361847f68d5abe3aed7d33f52165a7e0fd0eb2d246e05bde1e47669f56cac5a85eb3b5aecaf8a83196e6297ae2175265d AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c58564dbf715c131874fc4b76649bae909c0a1c5509d9b2d085aabb9c54ace50e3ea65fa2494e584e92a6cfef68ca0b6 SHA512 41a1f8f33e485f0e5b63ca899aa4feb3eab121f7a19fa67821de7aeb5499810ae998dada973dda375e247c978ad1e5769c2080d91394ffc1028921712bc42b63 +AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 EBUILD libzip-1.3.0.ebuild 1035 BLAKE2B ddd93eedf9092234100990f5fa22689819ff1b8d906abd75318b8694816c60bef575788290666ed7d39c028b2c5492e02da42376f43c31ae4255ea58f61032ae SHA512 01795236335f9f2b97f2deda5dc4b2be04efcf58e93c290526e675435b27b530510677e0858b86e3070a299221e94acb394d45095c81b2c8b54fd3174a4ed443 -EBUILD libzip-1.5.1.ebuild 1904 BLAKE2B b92a6dca2cf72218de69a04541943618e80463a2e2be1c55ccb2cd29b6059f3efbfe35393904b7451f05d6ea3a9dafe61ca4c429c5c9f82fbfe73b35de85dc3b SHA512 2cb205652544769e9a69bdd439d6dab79ac4b0bfac4b195052b941666b5f6f01c4fea2e85f2d7c317c776469ebcbbfa25e266c846b47cae4d55200b7e2910471 -EBUILD libzip-1.5.2.ebuild 2220 BLAKE2B ec5db9582b919bae761e3c1cf193be3fe528c5fe79d047f8e74a3a9f745aa3f10e28ebaf88ab48bbd16861568428073af8eb49597365b332f3f4a13876ad3dea SHA512 19c5f86b154db5ec477148999dc93b0a0b2231546cd04cecd333e3e663234fe5521cc9df2c38bcded96a7d447b12b7cbe6ae21994d5716d4e31285dc0828aac3 +EBUILD libzip-1.5.1.ebuild 1903 BLAKE2B 7dcbc94b2e7bd9e2f85c44274052b7ebf28655f681900e92b9de05685b269d6e2b94079799c659f0448c478318397001267ec5712e4481a1cea1d3c59790d608 SHA512 78fe6cdf6d2a001c03d86b2384b9839b848f8c14211b38ad0261da03636f0719b841a845acf6cfb6e63b9c867cf45002c1525dfc6a03ecbc4c55763523d6d33e +EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2 MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch new file mode 100644 index 000000000000..564cc9b79f1d --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch @@ -0,0 +1,23 @@ +From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <tk@giga.or.at> +Date: Tue, 2 Apr 2019 15:26:06 +0200 +Subject: [PATCH] mbedtls: link against the correct library + +Inspired by https://github.com/nih-at/libzip/pull/88 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f252b3f7..f8eb16eeb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,7 +42,7 @@ ELSE() + ENDIF() + IF(ENABLE_MBEDTLS) + FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) +- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) ++ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) + ELSE() + SET(MBEDTLS_LIBRARIES FALSE) + ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index e4441526a7e9..68002b6f0c2d 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND=" diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild index d34cd65a8358..814a668c4300 100644 --- a/dev-libs/libzip/libzip-1.5.2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild @@ -18,7 +18,7 @@ DEPEND=" sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( - gnutls? ( net-libs/gnutls:= ) + gnutls? ( >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( @@ -30,6 +30,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76 |