diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-16 11:50:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-16 11:50:23 +0100 |
| commit | a2844b413d00a2859401e017a0311986151e1594 (patch) | |
| tree | 3758da107fb05d4012a3f4813be2bf13c03d3985 /app-arch/p7zip | |
| parent | 1ac83daac7198a5717483e1cfab669ba4f12debe (diff) | |
gentoo auto-resync : 16:04:2023 - 11:50:23
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/p7zip/files/p7zip-17.05-natspec.patch | 13 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-17.05-r1.ebuild | 5 |
3 files changed, 6 insertions, 16 deletions
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index 059b2c297541..5e21003e2507 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -4,9 +4,9 @@ AUX CVE-2018-10115.patch 8946 BLAKE2B 21fc8367ec1c811119bd43b5ca8ac1399748d4fe0c AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40 AUX WimHandler.cpp.patch 413 BLAKE2B 06e1ef38fbb8ae11f9c28df68c7e15db52060974930f61bdd5a04d970bc71f724a5122b05ad24b0e89d6b2142f54762ce4b6467d25345fca89075d6626abf9b3 SHA512 c246a7d912ec965b5212a510893aa1c9bd47b66b8f0fb47c03d46e5f3f891e2134cb8733594fd84f7e6034ebf07a9aac633230e2a0eebfb476f6429469058a75 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37 -AUX p7zip-17.05-natspec.patch 5485 BLAKE2B 2a84c98b0be0b113151f35ceced7a4140c25cee24b07fdd9de04ee50be0f4538decbb9992b07aec27493bb3a785501fcecd0194696521c7e7def53f34ee17b9d SHA512 76413b491a59783849a20f11acd98c234725c92f6a97bdc41ec1fa90cc805f0d510a1386207304c9fa5a0267c171518b6d55b709e905107ea81548ef3f8c1704 +AUX p7zip-17.05-natspec.patch 5172 BLAKE2B 03a2895b5f30ab373ea8b3a358dcdcdefe0cbde35bd643da088c4142fe0e64dd20b536d1226bebcf63cabab9bcb88a183d6f3c444a426c7289e4729971e13b2d SHA512 c567e503124d23d1656bf02d315f910bce5bf18fce59ef5568e93cd2e6a1d93a0ce9f6af29920b91737223ea2b8c758f082f2b7515eec6a9c8979de487dd0d66 DIST p7zip-17.05.tar.gz 6722154 BLAKE2B 0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd SHA512 97a7cfd15287998eb049c320548477be496c4ddf6b45c833c42adca4ab88719b07a442ae2e71cf2dc3b30a0777a3acab0a1a30f01fd85bacffa3fa9bd22c3f7d DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f EBUILD p7zip-16.02-r8.ebuild 4121 BLAKE2B 4ef2d330b6101f3b7d483063aaf43a11c4bf534a47232964907b36406588636211203cea3677dd5a84033599011cdcba2fdc74a6582eac713678acfda5164025 SHA512 b6ef5b20415ee9c4d458ae973c1b5334de3814268c8edf8ffdc7a9dff81a18cf5a30183e1bdd48a2edaf35123945db39814d2f55073b08fb4c71c067243ee954 -EBUILD p7zip-17.05-r1.ebuild 3156 BLAKE2B 1a5cf6a7d94f30dad2f44c04b33e28b83e70233777787ed8fc293dfc7880baf8f3964b1da5a2b00b1caa4b41595f2e2d12379ce2aef26d9db2aedc06ed33a6fc SHA512 158c208b2a8263720d74741d169ffe2c8da919d261938157fb26d055c9e23c5a1811bf19f8776f72b1bdea34e4b2f1fb777ea7b34a4efa174ab1783338a7c947 +EBUILD p7zip-17.05-r1.ebuild 3226 BLAKE2B b2b5d8e2f9b8d750076abe26704a99532e19af8163e893ca1c648846fa75c10488b685cf3977828d0e5972217fd24b28be15b3d8755b4a1656deb3634873c71b SHA512 a9732e397222736e720500d8dc2896c2be398607b2b05048375fc6a74b3ec634a48eeafa786a371a48e092603e8d44e48de05a3e4a116e35fb8059b16078555d MISC metadata.xml 532 BLAKE2B 9ffdc29d8d8f6a82e7a55f4448870a4dd019468a440ade6df10ad1336617d14c1d975a7db032fce3397358132cee15bb317c9bed554de57e8f3ecbb284931a32 SHA512 807a53919ad3b19c280be0033ae264d89ad438b9d51763c7a27be3576ca496af9966d2f62594a707a1242c0b813298b01da6c2a55469af777e47944a80b00f25 diff --git a/app-arch/p7zip/files/p7zip-17.05-natspec.patch b/app-arch/p7zip/files/p7zip-17.05-natspec.patch index 45f24559a4c8..7487924af306 100644 --- a/app-arch/p7zip/files/p7zip-17.05-natspec.patch +++ b/app-arch/p7zip/files/p7zip-17.05-natspec.patch @@ -115,16 +115,3 @@ index 353e895..44071f3 100644 if (isUtf8) if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors) return; -diff --git a/makefile.machine b/makefile.machine -index a89b568..3e12592 100644 ---- a/makefile.machine -+++ b/makefile.machine -@@ -16,7 +16,7 @@ CC=gcc - CC_SHARED=-fPIC - LINK_SHARED=-fPIC -shared - --LOCAL_LIBS=-lpthread -+LOCAL_LIBS=-lpthread -lnatspec - LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl - - OBJ_CRC32=$(OBJ_CRC32_C) diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild index dbb6ca8a3567..f07d678263c8 100644 --- a/app-arch/p7zip/p7zip-17.05-r1.ebuild +++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild @@ -25,7 +25,10 @@ BDEPEND=" src_prepare() { default - use natspec && eapply "${FILESDIR}"/${P}-natspec.patch + if use natspec; then + eapply "${FILESDIR}"/${P}-natspec.patch + sed -i '/^LOCAL_LIBS/s/$/ -lnatspec/' makefile.* || die + fi if ! use pch; then sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die |