diff options
Diffstat (limited to 'sys-fs')
28 files changed, 716 insertions, 282 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex e9128e8f91c1..19e11a9e0fa2 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest index be961e68857c..2b2824d0ea77 100644 --- a/sys-fs/avfs/Manifest +++ b/sys-fs/avfs/Manifest @@ -1,5 +1,7 @@ DIST avfs-1.0.4.tar.bz2 719761 BLAKE2B 6bbe47136a6aedd399800ea3ee16f82c367e11f723785ebacf4ef7bd12319ad2f8fe528580e20f368934423ee41afc75b9a73ce7389a100f70e42180e2fb2dcc SHA512 3cfda7a471b5e696984acf9101312e898bc68fe16196bfee8e6a255bd182c279a6ad53fee09c0d6554a968f837e97652e95d794fa46f0d384dd41ae426d49516 DIST avfs-1.0.5.tar.bz2 723937 BLAKE2B 49a7ba0f88e126804c8ae12d1ad9a2924311198baee85f56a17c1e9dd810bdac8d519f0fc8a8cf23b5e4d7319460108e3e27cb28a1dc7320760c42f7257460d0 SHA512 d50d8fc31a56a0dac17a14c19de3f1bae2519feb965768810d19192eba6dbe24ab181c4574ff8982883d9b76f77241a1e27f3ef12d05ab8112f3caf14e59bd3c +DIST avfs-1.0.6.tar.bz2 729592 BLAKE2B 41c703e92921ba9393d95455f7d3dd18587b2d7f2ff46de02d290515cf6c8182d19ff117a7ce040ccaab491240b4f27a3ebd58026045ae9b0d69f47a8beeabc7 SHA512 6b9c070896c5d5abbb6a8c14a7dfd39d9b58d13a6db122b5bf1756b2da7435dfbc00a1fd04bedf99b94b76d9ec7f8c05fccc21de6b9e713fc60cfe0ec88064b4 EBUILD avfs-1.0.4.ebuild 1491 BLAKE2B 44b686e4f157e63704afe64ceee6d000b81665e2e66263eaefb104baa63906dae2471b54e4b18514dbbf90658eb25ad8f8e5cf45e23f19c97143ca6ff0fd98aa SHA512 1428602ce6a1770e82b1a958e35f9fcb51dc244cafc6bd9dbecff1d5f4b8a0748fb23dc517c2703e19096c1a48f2ad8e671d33ed217ed41415ffb9b352da2f5c EBUILD avfs-1.0.5.ebuild 1495 BLAKE2B 6e3ba071c4ff9722a71fd3886798565145b62fbbb298a7199153814eac56ae2c13536032e260c8733dccf585d40442e5d50c8d82854ac674e67d22c612378a87 SHA512 59fc962e1989ad8759dbe8c93511c738dd4fdc276a462348249a7dfee8b6a93adc9a3f4978ddc317dc6e424888d2ea95299d052fd1bd4c3d4cf10c506b97bebc +EBUILD avfs-1.0.6.ebuild 1497 BLAKE2B 46a81f8eb168cc4c6159abc74531bb36312fb3f59f6d66bb3c2c19f62981091bfbc421ffc97d3f666c0f1623c42fa8ad8d994afb8a931065f7e7f4aa6c6d8b4e SHA512 a8ecf6895c6676d4adb0006ad81433c4262de014d266b44a2afc6eb67c849baee447c068d78ee5e44e67682397db8a2ca2e28a198b84f62f7d741976a9a9cb4d MISC metadata.xml 319 BLAKE2B d0597cca90871778d014601140806702319a3a34784c9864d4e70a5b72fd04ec566622d8be8ba1fa3363ca5964ba63822af72ef524767c86b2f9f5535ed846b3 SHA512 805edf3205c69e9bb435c3b86d259e08044da746dfa6205343ccf4e2c2f802c8b51324d140e567a32019f79b5dc63203222221ddc9bc881683d8c9d511a38540 diff --git a/sys-fs/avfs/avfs-1.0.6.ebuild b/sys-fs/avfs/avfs-1.0.6.ebuild new file mode 100644 index 000000000000..155b11e19c13 --- /dev/null +++ b/sys-fs/avfs/avfs-1.0.6.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files" +HOMEPAGE="https://sourceforge.net/projects/avf" +SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="static-libs +lzma" + +RDEPEND=">=sys-fs/fuse-2.4:0 + sys-libs/zlib + app-arch/bzip2 + lzma? ( app-arch/xz-utils )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + econf \ + --enable-fuse \ + --enable-library \ + --enable-shared \ + --with-system-zlib \ + --with-system-bzlib \ + $(use_enable static-libs static) \ + $(use_with lzma xz) +} + +src_install() { + default + + # remove cruft + rm "${D}"/usr/bin/{davpass,ftppass} || die + + # install docs + dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse} + dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs + + docinto scripts + dodoc scripts/{avfscoda*,*pass} + + find "${ED}" -name "*.la" -delete || die +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + einfo "This version of AVFS includes FUSE support. It is user-based." + einfo "To execute:" + einfo "1) as user, mkdir ~/.avfs" + einfo "2) make sure fuse is either compiled into the kernel OR" + einfo " modprobe fuse or add to startup." + einfo "3) run mountavfs" + einfo "To unload daemon, type umountavfs" + einfo + einfo "READ the documentation! Enjoy :)" + fi +} diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 0992909dbfa8..8bcf8f164e2d 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -22,7 +22,7 @@ EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d52704 EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c EBUILD btrfs-progs-4.17.1.ebuild 2912 BLAKE2B cd9161dd0c7fa433d03020dc951e1bd0a6974fc02bbbf48353f6fea4d2724ced5c5187e6ab050d46dae41027338a9a55a8f97d65eb9899c282c0dcaf488bb426 SHA512 4b27b69c325883fd5728a6efd4fd9110dfa6e013dfd6ad56a447049097108247e62adcceae768980afd15f3a433eed5c041f70331d55495fd52875281019bbd5 EBUILD btrfs-progs-4.19.1.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb -EBUILD btrfs-progs-4.19.ebuild 2898 BLAKE2B 8c37fac4c31cd51d719e5e910918f7d0109e7ca81867073c87093939e35a81dba469c036600179953e8fbee44c6de9b9639bf661fdcfe831f4f6fcbea34e20a1 SHA512 328918da11cd28a89383f16929407b0ce5c43e2be9950594ccf73befff78aa6ee24e13517664dd6823f7ef02c237bcf91116e2dc9416efc4f049300a4851ab50 +EBUILD btrfs-progs-4.19.ebuild 2897 BLAKE2B 98a269aee1b1781b2dcd9be3dc4d6da8c82d2b5474e08f79937498d055766b738acc0e349321d6899c9ed2c5ad42c3db8126fa48041deec695cc2e78f7dfe801 SHA512 9dcd83e8f22b19b44a974ec809c8e1847f44dd33e85dc4adc3d47b26f90464f08247b195efa4ce3bb6effd5f68544f1cb1a08699220d658235ea73858be81ad2 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 EBUILD btrfs-progs-9999.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild index 5e47a83e3f3a..17e1a09b4c24 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild @@ -12,7 +12,7 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" + KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" S="${WORKDIR}"/${PN}-${MY_PV} else diff --git a/sys-fs/dmg2img/Manifest b/sys-fs/dmg2img/Manifest index 5dee5c9a81a2..0d3125023411 100644 --- a/sys-fs/dmg2img/Manifest +++ b/sys-fs/dmg2img/Manifest @@ -1,7 +1,5 @@ -DIST dmg2img-1.6.5.tar.gz 23442 BLAKE2B d5504436ae95b0b6122924e6e950d8ca6c851912449c1f47307b34c50eae8446613ddfba2b046aa4b0638301d19809ebae33aa651ead4308dadd644a48a2c2f1 SHA512 31528a23986848a8ab319768a8254db6b0035324cbac8328ef865b98ab2cddfd606da19a27202c4ef53cdc5dda75aca489859f82115a5dde6fe9b1f20cd6bd46 -DIST dmg2img-1.6.6.tar.gz 23115 BLAKE2B ba942c2d5f12af901520acf60c8925cc38762dce60b250580d63efdc26ddb381619322a4c7ae92ebbb95783cfac9babca43d83c58e1af60dd07669f842df7715 SHA512 3bfea079f2bec24a56146314fe9135f92dae934e01edbc8435b0aff88d17ff8c3626e533435fad41ccee5d75a6262230ae87c75147744a1bf6625b656fc75713 +AUX dmg2img-1.6.7-openssl11.patch 7080 BLAKE2B 9815c1c0b3c23f2dae7da65e380ee4a2f2c460ddfa1c5e8e153c2b5b1213139d2052957b40f9c15042b750ed2c7318c36acc6de470b9da66a93550eb913964f4 SHA512 1addd0d349ad21c0fae423fe558583d9457aa2bcdf4f8fe16d408e703437faaa5b1324f38dfb66e9f3d811e89181fc0378978ffc852e87675fde0e416fccb136 DIST dmg2img-1.6.7.tar.gz 23238 BLAKE2B d4dc8da2974bc296e8aba21de816413df797322c6194e4ece3d0900d64fcd33084b29be6172a45bdc3f515c2e10544f107be2c7f0e6b7d247cf5d6bc5ad03e2f SHA512 4c42841c5cdbf868b6038648a6c83e78d4b7f2010f7065d7b3f4c2c04d13af9489716c1dfa867aff5f3c3b3eef96dc3fc0610eff13fec139265f37f468e339e6 -EBUILD dmg2img-1.6.5.ebuild 660 BLAKE2B 59d03d4196c800e7ec3289c68445c776036a94c797b04dcfb4b43de65328bd3e6903c3f34f2d9a9de2ec4c205b990ce3df32bb8ce3a0cbd35cecb730a22e6166 SHA512 24b8a380d574417196b895c264d51f2806666911e1ccb20cf3a773e216935ac5e93f0615eaf5864213439c1f480b855cc3c714c83d6c47e876402451b321b75a -EBUILD dmg2img-1.6.6.ebuild 663 BLAKE2B 27da57b4e2e2c63c00352e665853af8fb8def684229348d9492c8bb32e57b52f14df37983737ff65e0b120061509baba3fe8d5eac6a5042501e77d29cce81c1e SHA512 ed1bff42a9b43b941685e88d03144743a20ce5ef00720eff5d0ee2159185dda5101ef40b1755e8ee9c7bb0c0ab727b00ca14eb95290fc3b5ea25856c97895f8d +EBUILD dmg2img-1.6.7-r1.ebuild 712 BLAKE2B b44b7eb1499da8afdf2b7d5126a2799832a3820bf2ef7d7cbcc308f9e870509434478baccc3a0a48d5d77ced47523ac6b7e5659109aabecb8d5797d416532bcc SHA512 fc6f938e199c2d85a268958197b751c9cd86cc3cfe4bd46ab966ab8928eb6cf1b2738b11e6000656c0db67b15507774448caeed7b5e0bb8e7a58b233f463a862 EBUILD dmg2img-1.6.7.ebuild 663 BLAKE2B 27da57b4e2e2c63c00352e665853af8fb8def684229348d9492c8bb32e57b52f14df37983737ff65e0b120061509baba3fe8d5eac6a5042501e77d29cce81c1e SHA512 ed1bff42a9b43b941685e88d03144743a20ce5ef00720eff5d0ee2159185dda5101ef40b1755e8ee9c7bb0c0ab727b00ca14eb95290fc3b5ea25856c97895f8d MISC metadata.xml 446 BLAKE2B 3600c0ef451adcf401547ce76a13372182ea3c40c8670ace741f8a342dfc9cc3be3a6910a5e93883e3d77b55709ac996d8a1380724fae8da5f02efbdea637da0 SHA512 412c28e15abe2581fa29247d58b239a140171b018bcdfd5b437cb1991239eff33ce4bee9ecb14dada6bf74105f13ae230dc6dc46e1906952b81cb7491d3e9449 diff --git a/sys-fs/dmg2img/dmg2img-1.6.5.ebuild b/sys-fs/dmg2img/dmg2img-1.6.5.ebuild deleted file mode 100644 index 914a2e834b4b..000000000000 --- a/sys-fs/dmg2img/dmg2img-1.6.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit toolchain-funcs - -DESCRIPTION="Converts Apple DMG files to standard HFS+ images" -HOMEPAGE="http://vu1tur.eu.org/tools" -SRC_URI="http://vu1tur.eu.org/tools/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl - app-arch/bzip2 - sys-libs/zlib" -DEPEND="${RDEPEND} - sys-apps/sed" - -src_prepare() { - sed -i -e 's:-s:$(LDFLAGS):g' Makefile || die "sed failed" -} - -src_compile() { - tc-export CC - emake CFLAGS="${CFLAGS}" -} - -src_install() { - dobin dmg2img vfdecrypt - dodoc README - doman vfdecrypt.1 -} diff --git a/sys-fs/dmg2img/dmg2img-1.6.6.ebuild b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild index a212ddf78d63..bf3ba7ee1f50 100644 --- a/sys-fs/dmg2img/dmg2img-1.6.6.ebuild +++ b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit toolchain-funcs DESCRIPTION="Converts Apple DMG files to standard HFS+ images" @@ -16,10 +16,14 @@ IUSE="" RDEPEND="dev-libs/openssl:0= app-arch/bzip2 sys-libs/zlib" -DEPEND="${RDEPEND} - sys-apps/sed" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-openssl11.patch #674168 +) src_prepare() { + default sed -i -e 's:-s:$(LDFLAGS):g' Makefile || die "sed failed" } diff --git a/sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch b/sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch new file mode 100644 index 000000000000..53b73038ade1 --- /dev/null +++ b/sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch @@ -0,0 +1,202 @@ +diff --git a/old/vfdecrypt.c b/vfdecrypt.c +index 56d3530..b1a36d3 100644 +--- a/old/vfdecrypt.c ++++ b/vfdecrypt.c +@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) { + pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size); + } + +-HMAC_CTX hmacsha1_ctx; ++HMAC_CTX *hmacsha1_ctx; + AES_KEY aes_decrypt_key; + int CHUNK_SIZE=4096; // default + +@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) { + unsigned int mdLen; + + chunk_no = OSSwapHostToBigInt32(chunk_no); +- HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL); +- HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); +- HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen); ++ HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL); ++ HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); ++ HMAC_Final(hmacsha1_ctx, mdResult, &mdLen); + memcpy(iv, mdResult, CIPHER_BLOCKSIZE); + } + +@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) { + /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6 + * wrapped_key has to be 40 bytes in length. */ + int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) { +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + uint8_t *TEMP1, *TEMP2, *CEKICV; + uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 }; + int outlen, tmplen, i; + +- EVP_CIPHER_CTX_init(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ ctx = EVP_CIPHER_CTX_new(); ++#else ++ ctx = malloc(sizeof(*ctx)); ++#endif ++ if (!ctx) { ++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); ++ return(-1); ++ } ++ ++ EVP_CIPHER_CTX_init(ctx); + /* result of the decryption operation shouldn't be bigger than ciphertext */ + TEMP1 = malloc(wrapped_key_len); + TEMP2 = malloc(wrapped_key_len); + CEKICV = malloc(wrapped_key_len); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); + +- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { ++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { + fprintf(stderr, "internal error (1) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { + fprintf(stderr, "internal error (2) during key unwrap operation!\n"); + return(-1); + } + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_reset(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + /* reverse order of TEMP3 */ + for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1]; + +- EVP_CIPHER_CTX_init(&ctx); ++ EVP_CIPHER_CTX_init(ctx); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); +- if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); ++ if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { + fprintf(stderr, "internal error (3) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) { + fprintf(stderr, "internal error (4) during key unwrap operation!\n"); + return(-1); + } + + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_reset(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + memcpy(unwrapped_key, CEKICV+4, outlen-4); + free(TEMP1); + free(TEMP2); + free(CEKICV); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ free(ctx); ++#endif + return(0); + } + +@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae + int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) { + /* derived key is a 3DES-EDE key */ + uint8_t derived_key[192/8]; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + uint8_t *TEMP1; + int outlen, tmplen; + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ ctx = EVP_CIPHER_CTX_new(); ++#else ++ ctx = malloc(sizeof(*ctx)); ++#endif ++ if (!ctx) { ++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); ++ return(-1); ++ } ++ + PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20, + PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key); + + print_hex(derived_key, 192/8); + +- EVP_CIPHER_CTX_init(&ctx); ++ EVP_CIPHER_CTX_init(ctx); + /* result of the decryption operation shouldn't be bigger than ciphertext */ + TEMP1 = malloc(header->encrypted_keyblob_size); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); + +- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { ++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { + fprintf(stderr, "internal error (1) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { + fprintf(stderr, "internal error (2) during key unwrap operation!\n"); + return(-1); + } + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++ free(ctx); ++#endif + memcpy(aes_key, TEMP1, 16); + memcpy(hmacsha1_key, TEMP1, 20); + +@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) { + CHUNK_SIZE = v2header.blocksize; + } + +- HMAC_CTX_init(&hmacsha1_ctx); +- HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ hmacsha1_ctx = HMAC_CTX_new(); ++#else ++ hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx)); ++#endif ++ if (!hmacsha1_ctx) { ++ fprintf(stderr, "Out of memory: HMAC CTX!\n"); ++ exit(1); ++ } ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ HMAC_CTX_reset(hmacsha1_ctx); ++#else ++ HMAC_CTX_init(hmacsha1_ctx); ++#endif ++ HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); + AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key); + + if (verbose >= 1) { +@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) { + } + + if (verbose) fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ HMAC_CTX_free(hmacsha1_ctx); ++#else ++ HMAC_CTX_cleanup(hmacsha1_ctx); ++ free(hmacsha1_ctx); ++#endif + return(0); + } diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index 72d047b6f29e..2dba6fcfe416 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -4,7 +4,7 @@ AUX f2fs-tools-1.6.1-sysmacros.patch 1555 BLAKE2B a7cf99912c969492ae6d7d6f2db6bd DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853 DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7 DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad -EBUILD f2fs-tools-1.10.0.ebuild 789 BLAKE2B 0680b935d90f332dc60206b041008379cd9b16afcd6c8abb69ad2b66cd715ad4cc72e72fbdf8a19e570aa1851a5ca69338f38de7ae51eea0d6becc6a4b2e5b77 SHA512 8c5f8da38251d75da53783dd47b904c53e5dd0fd054089c7338859e71ebacba47894b2d597ed171a000e33675975e1b23bac20a78f8c88de40fbe5904f24ecd4 -EBUILD f2fs-tools-1.11.0-r1.ebuild 779 BLAKE2B 98b962936657814d59a229304d966362efde637a62e879adecf35acdce778d22fe0eb6059985cc31db9087d8e879e72d4ac33a7d1e3daf6a8ee83eb714ae4d64 SHA512 09849f743eb3db3eb1bc8ffa8cee82708d44a5d78ca1845c59b88a9bbd8ef8c3c20ee0beb91b4be498088d82b80dba9cd98f296eeca383b5ca8fc8259e6b8b6b -EBUILD f2fs-tools-1.12.0-r1.ebuild 822 BLAKE2B 7aa72f84312b51fad9a24930ebbc11ed8b7873948b9df97a83d5335620ed562f7f14627d84a58293ca304a0901966ad1522f0e74f9705692818ae057f9823345 SHA512 325afb1c2b4af9782e04a76e586e96b04fc6113e91f31084ad7924bd6c8f0cd607a88b32a2c77274d8ab7b24aafb265ac660e7554556c3bac9dea42a878109f8 +EBUILD f2fs-tools-1.10.0.ebuild 829 BLAKE2B 33cb5076ad952162afc2b53506aa09370b28fd6c7942d7d800fc2f48506cb4fcf2db44f9e68ae58f70d95178a53c73b27cfe70aed1c5dc954d3e31e512aab70b SHA512 3319a0480393572701b4728268437cbc6490e84ee8f215425d663d2c314c42588b594869b6bf6ba87eb3a44947ef5d10ae9e0605942f1ed4f46d797769140a9f +EBUILD f2fs-tools-1.11.0-r1.ebuild 824 BLAKE2B 888b9092f9f8b402ce3d549cc6c896877dd1b7b0c6fdea785092d3160929175bb26aee5e05def9c07a3edf3c39ce0b6670a08f7d2a50cd7dc87e71d7f73ea5c6 SHA512 0771171e56491746fb9703ac2c0d454d7bb35bf62fc4b7f031c2d7ed7c2fa207227950cd35741bd1967531f2dbb08d64bc00535441c67cb11decb875b5784912 +EBUILD f2fs-tools-1.12.0-r1.ebuild 867 BLAKE2B af13be138ba8b337ed71f4a6846d246a721abd2249d4483c04b704906221f93a6ee7fb19fa57e8eca51d99fcbe191139ee6826443e27815391afe1ccb4770165 SHA512 0d354c1e000a05a995327ee897ebe331b52347db4403eea340700584757aef63a61fbd713b6a84c71e0b4c236f61ac4ba8c8320e5eef8948a545109765f01aa1 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild index 011eaebc3a5b..ce7d7f0fa630 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,8 @@ IUSE="selinux" RDEPEND=" sys-apps/util-linux - selinux? ( sys-libs/libselinux )" + selinux? ( sys-libs/libselinux ) + elibc_musl? ( sys-libs/queue-standalone )" DEPEND="$RDEPEND" PATCHES=( "${FILESDIR}"/${P}-fibmap-include-config_h.patch ) diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild index 7d9f76759f8b..8bbde577cad3 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild @@ -14,7 +14,9 @@ SLOT="0/5" KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" IUSE="selinux" -RDEPEND="selinux? ( sys-libs/libselinux )" +RDEPEND=" + selinux? ( sys-libs/libselinux ) + elibc_musl? ( sys-libs/queue-standalone )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild index 523fddda1779..52fc597dc549 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild @@ -14,7 +14,9 @@ SLOT="0/6" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" IUSE="selinux" -RDEPEND="selinux? ( sys-libs/libselinux )" +RDEPEND=" + selinux? ( sys-libs/libselinux ) + elibc_musl? ( sys-libs/queue-standalone )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest index 2afb1f55fb0a..c4c738629036 100644 --- a/sys-fs/reiserfsprogs/Manifest +++ b/sys-fs/reiserfsprogs/Manifest @@ -3,5 +3,5 @@ AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc2 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c EBUILD reiserfsprogs-3.6.25.ebuild 1161 BLAKE2B 10e8fc09d0f8892e29d135438dbbe0e75ba6410e3d534c543ec6eb3f2d7536bca47089d443ed4f989a187742ebe5d34ed8c4f781c1d97b7b08aa4b52a2974942 SHA512 0f119c895f87c32d09d722dfbe1a8dd27fbece3ff6991ea83d01ac039a1450b981e017fe66225f7b545764d7fc2d69915079528ec6ac6d61dcfebeaf35a4a492 -EBUILD reiserfsprogs-3.6.27.ebuild 1206 BLAKE2B f64548827d731d264ba1d6fc90bec864428c5ad188b51132864d6ce1a71486dc61b036439e55111c9ca19e88a652e9fe7a6bbf8dcaed146b4749878a1621d8cf SHA512 a99b0f6149aa38a22941a64aa6d5ed391381a38c4e33a19372fa2974ba7a89ad0f337eed80173349818b3ac1202453c83a017806b9728d4dd43ba21b41c6fd92 +EBUILD reiserfsprogs-3.6.27.ebuild 1205 BLAKE2B 7538e5663dc61a328e6a73ed72b2f8b0d39d38f2184c06a8021ddf08c904437a28778508202649cd7f0db737e0eb511ea4864f47babdc97f1c6abf9695349c0d SHA512 bcf0c50e3fab02dbbeb4ba84b8740558900b78ffc9b504d0be261c7dafeaa44bd4915f438db3577882f464aba10ac3cea3df6e5125338e2bf90c691a4cf6262a MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild index a5d28011df58..4417d14ba088 100644 --- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild +++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" PATCHES=( diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index f35db4947a82..c605900bc576 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -8,6 +8,7 @@ AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae DIST squashfs-tools_4.3-6.debian.tar.xz 19060 BLAKE2B 4fc28fae1da2bd1bfbf774acd4f4b29e382760078efd16c655a9178633a58e1ab15fb0203a626dc6353df8ff6860f7da5f9369fd920cf773dd53f8b90cffe13c SHA512 e2f64cdcfe01696980a45d4d6ec50e82626cb3e25e8c98d63b68c9754f519171fcfc4586b4ef88104e28275e1daf94a23f5b7dd08d37fe6e8417b054954de1e7 +DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf DIST squashfs3.2-r2.tar.gz 314764 BLAKE2B 55d2f38572263c4b1ec704ed7a07794400e904e260e316e399511851d35ab0f7e1834eba605e8739d1b8f6b5a56512570d36196d21743d05842e958b3d80e368 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f DIST squashfs3.4.tar.gz 352660 BLAKE2B f48b1f0399d3fde75b8f625fa4130d04772ed9e6d8dc179e7105a7770a5bd211a7aa5c7d5d621efedc54707b37a622351efa65291c03cd84d049ec4a1094773a SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 @@ -15,5 +16,6 @@ EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e9647 EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec EBUILD squashfs-tools-4.3_p6.ebuild 2102 BLAKE2B aff4d868da046f29a32d4a8c3b741bb4a6a443d1c8778e1ea3f0d2f35cd29f47d9f86060d51c8be1b0a34ef386338e958eeb9cd55328c7022559cb50539f755e SHA512 5bbe36316133880a5f4ef71f5edf6b0aa90a61e87f71f227de655a5c261996c6a9760e8672d3a39168a8b9e8f8f95b0fbd127ff30de43c7aad29ebb403fbc586 +EBUILD squashfs-tools-4.3_p7.ebuild 2099 BLAKE2B f98c290c15f2518b9abe9dfac1dec648cee73d3fa307115a3c77d843cbab4b54de73e462eee2bc53c6966d72bc9e904191ffac7630fb4d8b0ba23368822f7b2a SHA512 af8ac9742e7cec475c1b9ab6576785279798650864bfbd0e952efa44b6ebd02f8f6a61f8f5fdbd9782a7b03fbea87e2fe9795747426588a5a0a31e2fdf289ca1 EBUILD squashfs-tools-9999.ebuild 1662 BLAKE2B 07e5705480853692733b18b433b5d08fa302cc24143c7ae4703efba82c8a563979e57528487e5326d2fb6d61bd864e6f8eccc978f62228124139d53103ccee38 SHA512 f5c9e3c4c4082bd6fbcb53c5ea7caccee5ebb3f86c393e883aa2d2fde1e1673b56e88b0e84781b298dcba9a58ff477d3cd50306cab968d2d456dd8102878d973 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9 diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild new file mode 100644 index 000000000000..117cc4a8978d --- /dev/null +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Tool for creating compressed filesystem type squashfs" +HOMEPAGE="http://squashfs.sourceforge.net" +SRC_URI=" + mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="debug lz4 lzma lzo static xattr +xz" + +LIB_DEPEND=" + sys-libs/zlib[static-libs(+)] + !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) + lz4? ( app-arch/lz4[static-libs(+)] ) + lzma? ( app-arch/xz-utils[static-libs(+)] ) + lzo? ( dev-libs/lzo[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xz? ( app-arch/xz-utils[static-libs(+)] ) +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +PATCHES=( + "${FILESDIR}"/${P/_p*}-sysmacros.patch + "${FILESDIR}"/${P/_p*}-aligned-data.patch + "${FILESDIR}"/${P/_p*}-local-cve-fix.patch + "${FILESDIR}"/${P/_p*}-mem-overflow.patch + "${FILESDIR}"/${P/_p*}-extmatch.patch + "${FILESDIR}"/${P/_p*}-musl.patch +) + +S="${WORKDIR}/squashfs${PV/_p*}/${PN}" + +src_prepare() { + eapply -p2 "${WORKDIR}"/debian/patches/*.patch + eapply -p2 ${PATCHES[@]} + eapply_user +} + +use10() { usex $1 1 0 ; } + +src_configure() { + # restore GNU89 inline semantics to + # emit function symbols, bug 595290 + append-cflags -std=gnu89 + + # set up make command line variables in EMAKE_SQUASHFS_CONF + EMAKE_SQUASHFS_CONF=( + LZMA_XZ_SUPPORT=$(use10 lzma) + LZO_SUPPORT=$(use10 lzo) + LZ4_SUPPORT=$(use10 lz4) + XATTR_SUPPORT=$(use10 xattr) + XZ_SUPPORT=$(use10 xz) + ) + + tc-export CC + use debug && append-cppflags -DSQUASHFS_TRACE + use static && append-ldflags -static +} + +src_compile() { + emake "${EMAKE_SQUASHFS_CONF[@]}" +} + +src_install() { + dobin mksquashfs unsquashfs + cd .. + dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* + doman "${WORKDIR}"/debian/manpages/*.[0-9] +} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 6a3fa66326ae..b2babfa1a057 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -6,8 +6,11 @@ AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b23 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f +DIST systemd-240-patches-0.tar.gz 2925 BLAKE2B 167ddaddfbe0726b9a64a95ec601495599d7aff052cbad96b80ac16ddfed72f320ba3c5c602e2f79b0cd9aea1d58ea256249a080e0999787a2c183e0bcc0869d SHA512 6b948d17f3a037ef1a291f5df766dc095c4498d5742374e08daa9b534b9b979a07876e41bb7db2ce257ff12b3b97fe1927a11d0f1a79c57f96300a5a8413d2eb +DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5 EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93 -EBUILD udev-239.ebuild 9771 BLAKE2B 490c267c2c60be3f9d46b07cc51b0e89954302aa216538a7895bbb5cbb827afc1993f7307bce18adb884e8b8f77611878def839915500beca52176813205935b SHA512 7778f4a224de81737bc9b1d4457c97a10edf1a6eb8d9eb17907033dfdf2d736cbcc60a809f8509f46c8e64922de8909bafe33d362d13e41d21485ce1c5eb80a1 -EBUILD udev-9999.ebuild 9592 BLAKE2B 71faa738512525219644d2fa238abe5630c0bfc236369d5fdd7d8a83f1a7faf01a3e26cf78b8ac30681fe9591d1545ffc7f173d43e91f9823c588d1c3300bd72 SHA512 17db537471bc3befd55f5cd6a70c7279cfe46634cf59ea3dfc4e44aac38c14465a59e1550a590959c0cabed976fc6b74aa33b2237aac9c1e753eea14884e50f0 +EBUILD udev-239.ebuild 9770 BLAKE2B 7c58f0fefb4a7dd307021b2ead41c904ea71d5ed4726501cf70a41344314a3386ef77c61b4872dd4d56db403b929e8f45cf5c11091ec90584994d761e5f971cf SHA512 6822cdb23d07180f62f5b11968ef4a7f994efa423471ead978d4a64606bebd94685df63e1c26b6c865960cd7da2575d505893c94e824e753507fb6c11fffab7e +EBUILD udev-240-r1.ebuild 9664 BLAKE2B a934f7c0ffb8c21414655bf86d2c98a9387a767abdca09fb813580e2347bd2db890d51ba887a41ed6b84df28dbba37131559c06a1de6b2fd62ef1cf2e6b7d695 SHA512 44e79d8941eecea8cf3ff1f1c2b4ae742f87a23cfc3906ebeca99ccd40e7e965076f41b451b3a2126df5d6e91dab2ed49742d9f93511332a2446d3f70203bd5d +EBUILD udev-9999.ebuild 9564 BLAKE2B e372c292973ac0b83f1fef60199d7ab31ef80cb0208f3ef34c52b3357fc684d9afd3fdf5e1cc69a3296ef65781a90e55f4e9fbba579d55cef7be2db8058288a0 SHA512 9e02e243bdd6bf01349bc21619cd4033be65c9c2bb22449cee83cfb0966c930df1a6f5dcc74a610e27006f81eb0483a976cd6d1e9cdb21174cc02e3beb3f2436 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild index cef4501124b7..18da534c0daf 100644 --- a/sys-fs/udev/udev-239.ebuild +++ b/sys-fs/udev/udev-239.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" diff --git a/sys-fs/udev/udev-240-r1.ebuild b/sys-fs/udev/udev-240-r1.ebuild new file mode 100644 index 000000000000..3cf58bff5dee --- /dev/null +++ b/sys-fs/udev/udev-240-r1.ebuild @@ -0,0 +1,325 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz + https://dev.gentoo.org/~floppym/dist/systemd-${PV}-patches-0.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + !<sys-libs/glibc-2.11 + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd" +DEPEND="${COMMON_DEPEND} + dev-util/gperf + >=dev-util/intltool-0.50 + >=dev-util/meson-0.40.0 + dev-util/ninja + >=sys-apps/coreutils-8.16 + virtual/os-headers + virtual/pkgconfig + >=sys-kernel/linux-headers-3.9 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt" +RDEPEND="${COMMON_DEPEND} + !<sys-fs/lvm2-2.02.103 + !<sec-policy/selinux-base-2.20120725-r10" +PDEPEND=">=sys-apps/hwids-20140304[udev] + >=sys-fs/udev-init-scripts-26" + +S=${WORKDIR}/systemd-${PV} +EGIT_CHECKOUT_DIR=${S} + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ }; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + cat <<-EOF > "${T}"/40-gentoo.rules + # Gentoo specific floppy and usb groups + ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" + ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + EOF + + eapply "${WORKDIR}/patches" + + local PATCHES=( + "${FILESDIR}/236-uucp-group.patch" + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if multilib_is_native_abi; then + targets+=( + systemd-udevd + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + into / + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + exeinto /lib/systemd + doexe systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} + + rm rules/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doins "${S}"/rules/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_postinst() { + mkdir -p "${ROOT%/}"/run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT%/}"/dev/loop 2>/dev/null + if [[ -d ${ROOT%/}/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + local fstab="${ROOT%/}"/etc/fstab dev path fstype rest + while read -r dev path fstype rest; do + if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then + ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" + ewarn "filesystem. Otherwise udev won't be able to boot." + ewarn "See, https://bugs.gentoo.org/453186" + fi + done < "${fstab}" + + if [[ -d ${ROOT%/}/usr/lib/udev ]]; then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules + local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules + for old_rules in "${old_cd_rules}" "${old_net_rules}"; do + if [[ -f ${old_rules} ]]; then + ewarn + ewarn "File ${old_rules} is from old udev installation but if you still use it," + ewarn "rename it to something else starting with 70- to silence this deprecation" + ewarn "warning." + fi + done + + elog + elog "Starting from version >= 197 the new predictable network interface names are" + elog "used by default, see:" + elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" + elog + elog "Example command to get the information for the new interface name before booting" + elog "(replace <ifname> with, for example, eth0):" + elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null" + elog + elog "You can use either kernel parameter \"net.ifnames=0\", create empty" + elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" + elog "to disable the feature." + + if has_version 'sys-apps/biosdevname'; then + ewarn + ewarn "You can replace the functionality of sys-apps/biosdevname which has been" + ewarn "detected to be installed with the new predictable network interface names." + fi + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + if has_version 'sys-apps/openrc'; then + ewarn "For sys-apps/openrc users it is:" + ewarn "# /etc/init.d/udev --nodeps restart" + fi + + elog + elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" + elog "fixing known issues visit:" + elog "https://wiki.gentoo.org/wiki/Udev" + elog "https://wiki.gentoo.org/wiki/Udev/upgrade" + + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${ROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ ! -e ${net_setup_link} ]]; then + [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes + if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://bugs.gentoo.org/514174 + enewgroup input + + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 64b447627d3c..7934423439b0 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -136,7 +136,6 @@ multilib_src_compile() { udevadm src/udev/ata_id src/udev/cdrom_id - src/udev/collect src/udev/mtd_probe src/udev/scsi_id src/udev/v4l_id @@ -168,7 +167,7 @@ multilib_src_install() { doexe systemd-udevd exeinto /lib/udev - doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} + doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} rm rules/99-systemd.rules || die insinto /lib/udev/rules.d diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest index 5308fba7eeae..6913a56afda1 100644 --- a/sys-fs/udftools/Manifest +++ b/sys-fs/udftools/Manifest @@ -1,9 +1,9 @@ AUX pktcdvd.init 1360 BLAKE2B 16d01b722b98340a8a858c4f5e80881d41b010b9c6af6e4fdd489e1d000129b2d2793f6be6cfd4673851c26919bb310a6a8cf9f495360d0f24624bd5784f0116 SHA512 22522ff6bf19b08ef928ff87e0e3ffdf476f08c0c8b318770e522ad5187f323b94b26a3153bb56488618e8adff66b5585401e63ddae34068c4b2de472b1f5755 AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742 -DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5 +DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64 EBUILD udftools-1.1-r1.ebuild 655 BLAKE2B e3b1da90e431f8fde13bd0c87cb4dc7300ddccfb8b0e4f5720931116a6881fbbda1a754b39a6a39f75ce923f42c59275997b315380d4200959a7c265200e017f SHA512 c2a4bfdc4345fdc5ffb2d6518a0ab102283ffefb6c32d7d9947ca635b63bc50fa23f8365cdd7c2bc0d94512f8f370f99ebea0f757f0cfe8062a81e1934385b88 -EBUILD udftools-1.3-r1.ebuild 659 BLAKE2B b7ac25243acc868613c66f6b20071fb982221f809ee6a3c4e8ab43bf2b4d2c7d24d5249f2953ca7f71c1d04cbcf7efd7e0ff2e68b71ea6cb06cc35e391a9699e SHA512 c9f33ab798e8b72a67a4515de13489c5bb1d273886beeab3838c16fc2fe3eeaaed6a8b7d42a7916fcf4171561d329dc0d2adbf81b46bf8935fe7265e5ecf7183 -EBUILD udftools-2.0-r2.ebuild 584 BLAKE2B 97fd76c5655a4d162cc47c5a120f2ad0023d986b3de46d1cbc2f0d78999d5adff00b68286f529c0a65a6aed1c74f15ff73158c92f12a0df03346738c6444a5a7 SHA512 7ad4667af7fcba3b52fca36242c06a3397f4f912f8aa7a306d3154f1025722e9c5583dca149ff2db3375a3d95d48613c9cb9a7f361cda941a07e161aa2fcf472 +EBUILD udftools-2.0-r2.ebuild 583 BLAKE2B d941efdc325a8fd42121cd1bf0fd3b76f874d61cc193bdf1c288a9a8f6e2dba4182953da897b5dd280fc78125adf311a276a70531cfae5caf439b4dcd915c7d2 SHA512 c36fb61b17ed862af721d4d52c35dfc73a32675435e5af41589f652c113b238e4a68dea924a1c03bbfd44e0e820a5a6551bdef3ff6638dce8aebbd43d4a5a990 +EBUILD udftools-2.1.ebuild 555 BLAKE2B ba79acd831ea5ce3be33f46b877c62ce91f529fcfe937fb00a7f8445929b2a9241ec12a478184caeb1e55d137367bd6886e2664b8ab35f7f4987ccfe90a6bb17 SHA512 3152fc94416e6be5076f031a1ef61f41c3d1c7e4b02041eb506722b01cc64c4cd84be73009405ba4ff9d9c1acc3604a525ecda363242e1c6c616120150e23fca MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.0-r2.ebuild index 61a0e51bb57f..e9f92a56d2be 100644 --- a/sys-fs/udftools/udftools-2.0-r2.ebuild +++ b/sys-fs/udftools/udftools-2.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="sys-libs/readline:0=" diff --git a/sys-fs/udftools/udftools-1.3-r1.ebuild b/sys-fs/udftools/udftools-2.1.ebuild index 63fe2ced38fb..0bf9b6cb48cc 100644 --- a/sys-fs/udftools/udftools-1.3-r1.ebuild +++ b/sys-fs/udftools/udftools-2.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils flag-o-matic +inherit flag-o-matic DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem" HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/" @@ -11,14 +11,9 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="sys-libs/readline:0=" -DEPEND="${RDEPEND}" - -src_install() { - default - newinitd "${FILESDIR}"/pktcdvd.init pktcdvd - dosym mkudffs.8 /usr/share/man/man8/mkfs.udf.8 -} +DEPEND="${RDEPEND} + virtual/pkgconfig" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index b3e81c428a02..07a1afd30d79 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,13 +1,9 @@ -AUX xfsprogs-4.12.0-sharedlibs.patch 2361 BLAKE2B 3e487d35a858aa4adfdd41a853dab75ca62042710a82432e2dc1a0d23bd6121c2056d201a0e28e3ce538baf5eb1dcf2f72f38086c52955abeb7cc3709c903a62 SHA512 bbf802c54d2c8a2a524a9d4ae0ca66a18bf6b099a00fcc248abee04f84371bd35fc07a2dcc0c1d99c297b474c1f98d92927aa5ca16df5e6caef3abe386f31eba AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0 -AUX xfsprogs-4.7.0-libxcmd-link.patch 880 BLAKE2B 5c9911aed7bd1579d17aac75f74ff41221e9e7c1d1c2139af4785d570ac612bb338cdcfa246ba690a60a2244ad14d7aa4885bf3d1306cecbf9326c2ff048604f SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7 -DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58 -EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22 EBUILD xfsprogs-4.17.0-r1.ebuild 2302 BLAKE2B e63276181002c8484a7c5deedb6ec9da508cb20e1bf54e1f38301ef7c8125e74ee668be57b79af8f715713bea65bae97c49e074063236ca29dd4a2a0dec4a4ca SHA512 698cd6d21e9bf0c05c7d6c7d372e7ccc3f4f924f90f97baa668dc458c3576ac49efe78ed6e1298a3ccca8b6b53b35979e93f646b11608c2d138e213597452e21 EBUILD xfsprogs-4.18.0.ebuild 2314 BLAKE2B b2a8dd0f0a36b5461bdc34b5ec061e261f24040c29b49989977927e05bd66a3716cf275f5ae7d2d3ce54e64f78b919f3fc9e939539482294ce7d17067c03824d SHA512 01ccc49541ff057324b706fb2a8474492422e5b32ada74844494ca53a010920eeafde7e321e2a94c9c2b9c25823bae86db5b50597c87407202147f94ef92e4ad EBUILD xfsprogs-4.19.0.ebuild 2433 BLAKE2B d9ed6c1ecb450423971ec6e144098860ac835c81dede1dc6d1933941460ecb7e3167a979c26e33a468d5a786352d7d57af27af98e746f40cbe6e172144fa8d3d SHA512 0f18de87e5db27e269a247c60939f67c7583f3349acae954eede1a5ad54d7f96d6077f45dd4091c8bffa286e822a25f023d11401342c27ce745d0911ef87369d diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch deleted file mode 100644 index cb59d44a46b7..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- xfsprogs-4.12.0/include/buildmacros -+++ xfsprogs-4.12.0/include/buildmacros -@@ -70,18 +70,9 @@ - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -- cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ -- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ -- fi -+ set -e; cd $(TOPDIR)/$(LIBNAME); \ -+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) - endif ---- xfsprogs-4.12.0/libhandle/Makefile -+++ xfsprogs-4.12.0/libhandle/Makefile -@@ -24,7 +24,6 @@ - include $(BUILDRULES) - - install: default -- $(INSTALL_LTLIB) - - install-dev: default - $(INSTALL_LTLIB_DEV) ---- xfsprogs-4.12.0/libxcmd/Makefile -+++ xfsprogs-4.12.0/libxcmd/Makefile -@@ -34,6 +34,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.12.0/libxfs/Makefile -+++ xfsprogs-4.12.0/libxfs/Makefile -@@ -151,6 +151,7 @@ - - install-dev: install - $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) -+ $(INSTALL_LTLIB_DEV) - - # We need to install the headers before building the dependencies. If we - # include the .ltdep file, the makefile decides that it needs to build the ---- xfsprogs-4.12.0/libxlog/Makefile -+++ xfsprogs-4.12.0/libxlog/Makefile -@@ -19,6 +19,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.12.0/Makefile -+++ xfsprogs-4.12.0/Makefile -@@ -89,6 +89,8 @@ - copy: libxlog - mkfs: libxcmd - spaceman: libxcmd -+libxlog: libxfs -+libxlog-install-dev: libxfs-install-dev - - ifeq ($(HAVE_BUILDDEFS), yes) - include $(BUILDRULES) diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch deleted file mode 100644 index 77ded5393d52..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d01d3689fd512811b9d860598ddf26089bb5955c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 9 Aug 2016 22:37:45 +0800 -Subject: [PATCH xfsprogs] libxcmd: link against used libs - -Since this lib uses symbols from libxfs (platform_findsizes) and many -symbols from libblkid, link against both. Otherwise, the resulting -shared lib has missing symbols which makes linking against annoying. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libxcmd/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libxcmd/Makefile b/libxcmd/Makefile -index aab8d6d63624..46ba138a37e2 100644 ---- a/libxcmd/Makefile -+++ b/libxcmd/Makefile -@@ -12,6 +12,8 @@ LT_AGE = 0 - - CFILES = command.c input.c paths.c projects.c help.c quit.c topology.c - -+LTLIBS = $(LIBXFS) $(LIBBLKID) -+ - ifeq ($(HAVE_GETMNTENT),yes) - LCFLAGS += -DHAVE_GETMNTENT - endif --- -2.9.0 - diff --git a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild deleted file mode 100644 index 28a66180cfd1..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND} - static? ( - ${LIB_DEPEND} - readline? ( sys-libs/ncurses:0=[static-libs] ) - ) - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch - "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch - "${FILESDIR}"/${PN}-4.9.0-underlinking.patch -) - -pkg_setup() { - if use readline && use libedit ; then - ewarn "You have USE='readline libedit' but these are exclusive." - ewarn "Defaulting to readline; please disable this USE flag if you want libedit." - fi -} - -src_prepare() { - default - - # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled. - # Clear out -static from all flags since we want to link against dynamic xfs libs. - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e "1iLLDFLAGS += $(usex static '-all-static' '')" \ - include/builddefs.in || die - find -name Makefile -exec \ - sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + - - # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part. - if use static && use readline ; then - sed -i \ - -e 's|-lreadline|& -lncurses|' \ - -e 's|-lblkid|& -luuid|' \ - configure || die - fi -} - -src_configure() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - - local myconf=( - $(use_enable nls gettext) - $(use_enable readline) - $(usex readline --disable-editline $(use_enable libedit editline)) - ) - if use static || use static-libs ; then - myconf+=( --enable-static ) - else - myconf+=( --disable-static ) - fi - - econf "${myconf[@]}" - - MAKEOPTS+=" V=1" -} - -src_install() { - emake DIST_ROOT="${ED}" install - # parallel install fails on this target for >=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a handle xcmd xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} |