diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest deleted file mode 100644 index b847340..0000000 --- a/app-emulation/xen-tools/Manifest +++ /dev/null @@ -1,26 +0,0 @@ -AUX gentoo-patches.conf 3599 BLAKE2B bde110cce9707136b4c0ab4ffa51115a01557945b37d943115460b243aa6b9627411ea8498fec71479b8aaa12e0d6a830b097ed3b5a2275b9e581e7022ecd878 SHA512 d06853b6bd602e7e313e2433526898b316c7d138e81fb9bbbf175e275b59114e544305fec130d462fb99288a5b998eb6ed376830786e6b807743566982b47839 -AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 -AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 -AUX xen-tools-4.14.3-brotli.patch 3956 BLAKE2B d7ed1d251720d45f5125fb4cf3a618b6e2877d8fc46b972649d9b647eb899058c4334f211837f946c6fb6641747a8eeb2a9bff550483d226d09b655e2bbb4c69 SHA512 ad320e1e69b2e715e610447efbc88b1a7c8848bd472b3798dd793f5408a9a439aa11129a3ebe14c72b7187e961d76d02200de1032d40039b44c7cbd7976b2426 -AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b -AUX xencommons.confd 109 BLAKE2B 6a2023a95cd1e411abe57c321e1c5f13096b51299817ce547e8ff042cbdbf859a5c1f50135e946fe650e0ec9221db3389ff50bc23f6d88d0c0fd1805b64786be SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 -AUX xencommons.initd 1451 BLAKE2B ef0cfa4fc7c4071b7a5822f4ad8983b9f7c386505e8b6967139c8921b002ff03a0a2be235060160d00d3890cffd15300b588c2b06a67a839df110c3737bbaee5 SHA512 1d25ae65ff073a5fc00aed2011af9e38f53d179dfadd06f791a4599c070a5ddbbf75d80b37e219b6de5d09e3466510c241311cbb018ef22cd3c97ce3b7c15b3c -AUX xenconsoled.confd 44 BLAKE2B 865edf537c1a935cb78b682be805a8284c05e6c53e4a779bdabb4f43fcb1cfd5224b03f8c1febf8e5d49181ee08099c33970e39ff01028478a038feb7a061522 SHA512 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d -AUX xenconsoled.initd 783 BLAKE2B 1903532f7e6cea87e0154e752d8263d1d6df29e4722dccca330185012de7f443950fe165d009466b138be378ec19c80c45c0b0a5cde7add94707aac5e67c23d3 SHA512 90f3bdb9d670c039d34fcd082769cb2cf90d4b0f6a46e409bd098795839e63fef11ef856bec99cd712ab36ecf7f2a43db2ca8454daa1a19feddf2e18b92e7824 -AUX xendomains-screen.confd 890 BLAKE2B 91eb128682e7d81436cc3c82e7ae873bac4fbcc5d5f70e70c0ed16eb5af3f4cb61799f39ab275bc30b3d5686f5cbfac8c09aba6937f827ab6afdfe7ed995f352 SHA512 fb7bfc1806608c6e30bb7db367afe9cf75d44e809556c3ba2794cb3ce0c9f35bcfd7f2bfc4a15a8d805f3d57ff082fe9a525cbac3306e64cbbd0ee5cef554505 -AUX xendomains.confd 291 BLAKE2B 8784abad4db4b4b649c4e57a3a1f818cb431e5eaa2277da65e6272f36e421230bfe7feb52b9cade50050c73eac379acd1684d5307fb89ced073345a213b4c56e SHA512 8ad255d39fc0b390c854a64ed82333b6a3041e1247b7a3934cd8274710c168c0017ef2dddbe32c120268d7ea946f8c1b148d7d06a3a4bf415a77eeec36dce2da -AUX xendomains.initd-r2 2805 BLAKE2B 6f5e0cd4a9e3e0e2b4f6ad9b9f9fd9e399f04462e120bb1bf68f63d2afe73689522f3dd127867751e8055a735a2764393aaa6ea5aa10f8191fd5c503f01cee04 SHA512 cbfb37302b0930f608def30dad8942a0c52e1ad8c3f9068a1b125428777e9b8f4d2f41b0cbb1f26cd78d569a196946ff58e21cc8a87f8e955dc1a485f4769185 -AUX xenqemudev.confd 156 BLAKE2B 566dbe6e3a3d3bbbfd1b3cded7b0677b8b94ee3382226f4e8bf30e9e60771bfdca68c5448c63abf94be41c28082f2cbab6f9ea21335b41d24ba7b7e0347769af SHA512 d3cdeaed625e65e60fb22128baf24dceb45143ddf494d7db26464497abc42dbba0c0c9878f1e3908e2910557f4c4d600939824e944938aa251609ec5a1a86ee4 -AUX xenqemudev.initd 1828 BLAKE2B 695090fca31cff426c8434fe7a766c491725bcc91975b8338a8bd7d69bd51409bc8b586597866f7dc570e93693c87961e327c720cf44e7e941e1b83a157076e3 SHA512 d9ef6c0446cd2510f79d2117f0ad9ea3605854d1f5f601526706d9563abc72b71b4777c773e39ea1a9a77772e6ac70f6111109696a2621bc4b98c4518c7b589f -AUX xenstored.confd 42 BLAKE2B 61153f1bb17c78614e215f25f59642f35185f7f7a2e911e04285a7f589c6a69856f914096621eded787b0c23a3f8994076ee15d2dd3e2a36589a65cd585c7946 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4 -AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10 -DIST OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4 -DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567 -DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812 -DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3 SHA512 a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c -DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33 -DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146 -DIST xen-4.14.3.tar.gz 39982036 BLAKE2B 927fd2937f451567238702430cea3a6e5d2db70d5eef10f029bb1d6d030681573c851eb8076c8bad89c97c115f81a19ac8e46e78ca3f0e642565f7300c264ca1 SHA512 b462fcc1549f6e57f7f2a4fd10ce1e957a25a6a7c0319672b62699468f6c4330b9cd0cf2b0231b5cce94f4bb142a957eb8aa58aa0ffb5c85b37211d6b34ccf16 -DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49 -EBUILD xen-tools-4.14.3.ebuild 17138 BLAKE2B db6e9c9a9665fc26b9db3aa1973ae74d33619398aaddde7c483fe3238f451742b9205421aa89fcd074865392394814021aed3ba7b87c17df4c6188bbf5fa6544 SHA512 c403226563fbd2886e15a03d77827f544ba3f93fe37d2442841f464eba3a9cd922c32e0537d40b5c94faa6c63825f402d581b1d8aa5b3c46ce9acb73021d2ef9 -MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7 diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf deleted file mode 100644 index fc52db6..0000000 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ /dev/null @@ -1,120 +0,0 @@ -# Bug 496708 -_gx045=" xen-tools-4.10.1-unbundle-ipxe.patch" -_gx054=" xen-tools-4.12.0-unbundle-ipxe.patch" - -# Bug 379537 -_gx017=" fix-gold-ld.patch" - -# Bug 477676 -_gx038=" xen-tools-4.8-ar-cc.patch" -_gx039=" xen-tools-4.14-ar-cc.patch" - -# Prevent file collision with qemu package Bug 478064 -_gx043=" xen-4.10-qemu-bridge.patch" -_gx051=" xen-4.12-qemu-bridge.patch" -_gx052=" xen-tools-4.14-qemu-bridge.patch" -#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - -# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302 -_gx027=" xen-tools-4-qemu-fix-po-collision.patch" - -# Fix build failure with ncurses[tinfo], bug 526526 -_gx028=" xen-tools-4.4.1-tinfo.patch" - -# Don't download ovmf, use pre-released -_gx029=" xen-tools-4-anti-ovmf-download.patch" - -# increase stack to fix xenqemu err -# https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html -_gx037=" xen-tools-4.6-increase-stack-size.patch" - -#Fix missing makedev(), major(), minor() -_gx042=" xen-tools-4.8.2-makedev.patch" - -# Disable failing shim -_gx046=" xen-tools-4.10.1-shim.patch" -_gx050=" xen-tools-4.12.0-shim.patch" - -# Fix building with gcc 8, bug #657388 -_gx048=" xen-tools-4.11.1-gcc8.patch" -_gx053=" xen-tools-4.12.0-gcc8.patch" - -# Fix building with gcc 9, bug #689082 -_gx055=" xen-tools-4.11.2-gcc9.patch" - -# Fix pdf document generation, bug #650396 -_gx049=" xen-tools-4.10.1-pdfdoc.patch" - -# Add xenstat python-binding, Gento Bug #711066 -_gx056=" xen-tools-4.12.2-libxenstat-makefile.patch" - -# Fix building with gcc 10, bug #722930 -_gx060=" xen-tools-4.13.0-gcc10.patch" - -# xen-tools-4.14.2 patches set -_gpv_xen_tools_4142_0=" - xen-tools-4.12.0-gcc8.patch - xen-tools-4.12.0-shim.patch - xen-tools-4.12.0-unbundle-ipxe.patch - xen-tools-4.12.2-libxenstat-makefile.patch - xen-tools-4.14-ar-cc.patch - xen-tools-4.14-qemu-bridge.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-gcc11.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4.6-increase-stack-size.patch - xen-tools-4-anti-ovmf-download.patch - xen-tools-4-qemu-fix-po-collision.patch -" - -# xen-tools-4.14.3 patches set -_gpv_xen_tools_4143_0=" - xen-tools-4.12.0-gcc8.patch - xen-tools-4.12.0-shim.patch - xen-tools-4.12.0-unbundle-ipxe.patch - xen-tools-4.12.2-libxenstat-makefile.patch - xen-tools-4.14-ar-cc.patch - xen-tools-4.14-qemu-bridge.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4.6-increase-stack-size.patch - xen-tools-4-anti-ovmf-download.patch - xen-tools-4-qemu-fix-po-collision.patch -" - -# xen-tools-4.15.0 patches set -_gpv_xen_tools_4150_0=" - xen-tools-4.14-ar-cc.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-gcc11.patch - xen-tools-4.15.0-libxenstat-makefile.patch - xen-tools-4.15.0-no-ld-no-pie.patch - xen-tools-4.15.0-qemu-bridge.patch - xen-tools-4.15.0-unbundle-ipxe.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4-anti-ovmf-download.patch - xen-tools-4-qemu-fix-po-collision.patch -" - -# xen-tools-4.15.1 patches set -_gpv_xen_tools_4151_0=" - xen-tools-4.14-ar-cc.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-libxenstat-makefile.patch - xen-tools-4.15.0-qemu-bridge.patch - xen-tools-4.15.0-unbundle-ipxe.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4-anti-ovmf-download.patch - xen-tools-4-qemu-fix-po-collision.patch -" - -# xen-tools-4.16.0 patches set -_gpv_xen_tools_4160_0=" - xen-tools-4.14-ar-cc.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-unbundle-ipxe.patch - xen-tools-4.16.0-qemu-bridge.patch - xen-tools-4.16.0-xenstat.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4-anti-ovmf-download.patch -" diff --git a/app-emulation/xen-tools/files/stubs-32.h b/app-emulation/xen-tools/files/stubs-32.h deleted file mode 100644 index a421528..0000000 --- a/app-emulation/xen-tools/files/stubs-32.h +++ /dev/null @@ -1,20 +0,0 @@ -/* This file is automatically generated. - It defines a symbol `__stub_FUNCTION' for each function - in the C library which is a stub, meaning it will fail - every time called, usually setting errno to ENOSYS. */ - -#ifdef _LIBC - #error Applications may not define the macro _LIBC -#endif - -#define __stub_chflags -#define __stub_fattach -#define __stub_fchflags -#define __stub_fdetach -#define __stub_gtty -#define __stub_lchmod -#define __stub_revoke -#define __stub_setlogin -#define __stub_sigreturn -#define __stub_sstk -#define __stub_stty diff --git a/app-emulation/xen-tools/files/xen-consoles.logrotate b/app-emulation/xen-tools/files/xen-consoles.logrotate deleted file mode 100644 index c644523..0000000 --- a/app-emulation/xen-tools/files/xen-consoles.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xen-consoles/*.log { - rotate 7 - missingok - compress -} diff --git a/app-emulation/xen-tools/files/xen-tools-4.14.3-brotli.patch b/app-emulation/xen-tools/files/xen-tools-4.14.3-brotli.patch deleted file mode 100644 index 4dd394d..0000000 --- a/app-emulation/xen-tools/files/xen-tools-4.14.3-brotli.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c xen-4.14.3/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c ---- xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c 2021-12-31 14:45:31.309585049 +0100 -+++ xen-4.14.3/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c 2021-12-31 14:47:10.678532132 +0100 -@@ -2030,8 +2030,10 @@ - } - - BrotliDecoderResult BrotliDecoderDecompress( -- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, -- uint8_t* decoded_buffer) { -+ size_t encoded_size, -+ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], -+ size_t* decoded_size, -+ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { - BrotliDecoderState s; - BrotliDecoderResult result; - size_t total_out = 0; -diff -Naur xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c xen-4.14.3/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c ---- xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c 2021-12-31 14:45:31.309585049 +0100 -+++ xen-4.14.3/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c 2021-12-31 14:47:10.678532132 +0100 -@@ -1470,8 +1470,9 @@ - - BROTLI_BOOL BrotliEncoderCompress( - int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, -- const uint8_t* input_buffer, size_t* encoded_size, -- uint8_t* encoded_buffer) { -+ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], -+ size_t* encoded_size, -+ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { - BrotliEncoderState* s; - size_t out_size = *encoded_size; - const uint8_t* input_start = input_buffer; -diff -Naur xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c xen-4.14.3/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c ---- xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c 2021-12-31 14:45:09.670249908 +0100 -+++ xen-4.14.3/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c 2021-12-31 14:46:51.199130581 +0100 -@@ -2030,8 +2030,10 @@ - } - - BrotliDecoderResult BrotliDecoderDecompress( -- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, -- uint8_t* decoded_buffer) { -+ size_t encoded_size, -+ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], -+ size_t* decoded_size, -+ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { - BrotliDecoderState s; - BrotliDecoderResult result; - size_t total_out = 0; -diff -Naur xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c xen-4.14.3/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c ---- xen-4.14.3.orig/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c 2021-12-31 14:45:09.670249908 +0100 -+++ xen-4.14.3/tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c 2021-12-31 14:46:51.199130581 +0100 -@@ -1470,8 +1470,9 @@ - - BROTLI_BOOL BrotliEncoderCompress( - int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, -- const uint8_t* input_buffer, size_t* encoded_size, -- uint8_t* encoded_buffer) { -+ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], -+ size_t* encoded_size, -+ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { - BrotliEncoderState* s; - size_t out_size = *encoded_size; - const uint8_t* input_start = input_buffer; diff --git a/app-emulation/xen-tools/files/xen-watchdog.initd b/app-emulation/xen-tools/files/xen-watchdog.initd deleted file mode 100644 index 6fbc54d..0000000 --- a/app-emulation/xen-tools/files/xen-watchdog.initd +++ /dev/null @@ -1,6 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/sbin/xenwatchdogd" -command_args="30 15" diff --git a/app-emulation/xen-tools/files/xencommons.confd b/app-emulation/xen-tools/files/xencommons.confd deleted file mode 100644 index b9e2248..0000000 --- a/app-emulation/xen-tools/files/xencommons.confd +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/xencommons - -# Load xen's kernel modules, and this will override defaults -XEN_KERNEL_MODULES="" diff --git a/app-emulation/xen-tools/files/xencommons.initd b/app-emulation/xen-tools/files/xencommons.initd deleted file mode 100644 index a7c1efe..0000000 --- a/app-emulation/xen-tools/files/xencommons.initd +++ /dev/null @@ -1,79 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before xenstored -} - -is_privileged_domain() { - grep -qsE '^control_d$' /proc/xen/capabilities - return $? -} - -handle_kernel_modules() { - local XEN_DEFAULT_KERNEL_MODULES=" - xen-evtchn - xen-gntdev - xen-gntalloc - xen-blkback - xen-netback - xen-pciback - gntdev - netbk - blkbk - xen-scsibk - usbbk - pciback - xen-acpi-processor - blktap2 - blktap - " - - [ "$1" = "remove" ] && OPTS="-r" - - XEN_KERNEL_MODULES="${XEN_KERNEL_MODULES:-${XEN_DEFAULT_KERNEL_MODULES}}" - for i in ${XEN_KERNEL_MODULES}; do - modprobe ${OPTS} $i 2>/dev/null - done - return 0 -} - -start() { - ebegin "Starting xencommons daemon" - - # not running in Xen dom0 or domU - if [ ! -d /proc/xen ]; then - eend 1 "Not running in Xen mode" - return 1 - fi - - # mount xenfs in dom0 or domU with a pv_ops kernel - if ! test -f /proc/xen/capabilities && \ - ! grep '^xenfs ' /proc/mounts >/dev/null; - then - mount -t xenfs xenfs /proc/xen - fi - - if ! is_privileged_domain; then - eend 1 "Not running on a privileged domain. xencommons not started" - return 1 - fi - - handle_kernel_modules - - eend $? "Failed to start xencommons" -} - -stop () { - ebegin "Stopping xencommons" - if ! is_privileged_domain; then - eend 1 "Not running on a privileged domain. xencommons not started" - return 1 - fi - - handle_kernel_modules remove - - eend $? "Failed to stop xencommons" -} - diff --git a/app-emulation/xen-tools/files/xenconsoled.confd b/app-emulation/xen-tools/files/xenconsoled.confd deleted file mode 100644 index b2e194b..0000000 --- a/app-emulation/xen-tools/files/xenconsoled.confd +++ /dev/null @@ -1,2 +0,0 @@ -# /etc/conf.d/xenstored -XENCONSOLED_OPTS="" diff --git a/app-emulation/xen-tools/files/xenconsoled.initd b/app-emulation/xen-tools/files/xenconsoled.initd deleted file mode 100644 index 094871c..0000000 --- a/app-emulation/xen-tools/files/xenconsoled.initd +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need xenstored - after lvm -} - -# bug #498720 -shutdown_all_domU() { - # Note: shutdown all domU, including manually started ones - local V=$(xl info| awk "/xen_minor/ { print \$3 }") - # 4.2.2 do not support "-a" option - [ $V -gt 2 ] && xl shutdown -a -w >/dev/null -} - -start() { - ebegin "Starting xenconsoled daemon" - start-stop-daemon --start --exec /usr/sbin/xenconsoled \ - --pidfile /run/xenconsoled.pid \ - -- --pid-file=/run/xenconsoled.pid \ - ${XENCONSOLED_OPTS} - eend $* -} - -stop() { - ebegin "Stopping xenconsoled daemon" - shutdown_all_domU - start-stop-daemon --stop --exec /usr/sbin/xenconsoled \ - --pidfile /run/xenconsoled.pid - eend $* -} diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd deleted file mode 100644 index e75e19d..0000000 --- a/app-emulation/xen-tools/files/xendomains-screen.confd +++ /dev/null @@ -1,25 +0,0 @@ -# /etc/conf.d/xendomains - -# Directory of domains to boot. AUTODIR should contain one or more symlinks -# to domain config files in /etc/xen -# AUTODIR=/etc/xen/auto - -# Send shutdown commands to all domains in parallel instead of waiting for -# each to shutdown individually -# PARALLEL_SHUTDOWN=yes - -# When SCREEN="yes", domains in AUTODIR have their consoles connected to a -# screen session named SCREEN_NAME, with output logged to individual files -# named after each domain and written to /var/log/xen-consoles/ . These files -# are rotated (using app-admin/logrotate) every time xendomains is started. - -SCREEN="yes" -SCREEN_NAME="xen" - -# Number of seconds between writes to screen's logfiles. -# -# Lower values mean more disk activity and hence a possible performance -# impact, but higher values mean a greater chance of loosing some output -# in the event of a crash. - -SCREEN_LOG_INTERVAL="1" diff --git a/app-emulation/xen-tools/files/xendomains.confd b/app-emulation/xen-tools/files/xendomains.confd deleted file mode 100644 index 90c1f52..0000000 --- a/app-emulation/xen-tools/files/xendomains.confd +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/conf.d/xendomains - -# Directory of domains to boot. AUTODIR should contain one or more symlinks -# to domain config files in /etc/xen -AUTODIR=/etc/xen/auto - -# Send shutdown commands to all domains in parallel instead of waiting for -# each to shutdown individually -PARALLEL_SHUTDOWN=yes diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2 deleted file mode 100644 index 0926498..0000000 --- a/app-emulation/xen-tools/files/xendomains.initd-r2 +++ /dev/null @@ -1,117 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="status" - -depend() { - need xenstored - after dhcp xend xenconsoled -} - -get_domname() { - local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1) - - if [ -z ${name_from_file} ] ; then - basename "${1}" - else - echo ${name_from_file} - fi -} - -is_running() { - /usr/sbin/xl list "${1}" >/dev/null 2>&1 -} - -using_screen() { - [ "${SCREEN}" = "yes" -o "${SCREEN}" = "YES" ] -} - -set_screen_cmd() { - screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X" -} - -start() { - set_screen_cmd - - einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}" - if using_screen ; then - ebegin "Creating screen session to hold domain consoles" - ( screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 \ - && sleep 5 \ - && ${screen_cmd} zombie dr \ - && logrotate -f /etc/xen/xen-consoles.logrotate \ - && ${screen_cmd} logfile /var/log/xen-consoles/%t.log \ - && ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \ - && ${screen_cmd} log on \ - && ${screen_cmd} deflog on ) >/dev/null - if [ $? -ne 0 ] ; then - eend 1 - return 1 - else - eend - fi - fi - # Create all domains with config files in AUTODIR. - for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do - name=$(get_domname ${dom}) - if ! is_running ${name} ; then - ebegin " Starting domain ${name}" - if using_screen ; then - ${screen_cmd} screen -t ${name} xl create ${dom} -c - else - xl create --quiet ${dom} - fi - eend $? - else - einfo " Not starting domain ${name} - already running" - fi - done -} - -stop() { - set_screen_cmd - - einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}" - # Stop all domains with config files in AUTODIR. - DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)" - - if [ "$PARALLEL_SHUTDOWN" = "yes" ] ; then - for dom in $DOMAINS ; do - name=$(get_domname ${dom}) - if is_running ${name} ; then - ebegin " Asking domain ${name} to shutdown in the background..." - xl shutdown -w ${name} >/dev/null & - else - einfo " Not stopping domain ${name} - not running" - fi - done - einfo " Waiting for shutdown of domains that are still running" - wait - eend $? - else - for dom in $DOMAINS ; do - name=$(get_domname ${dom}) - if is_running ${name} ; then - ebegin " Waiting for domain ${name} to shutdown" - xl shutdown -w ${name} >/dev/null - eend $? - else - einfo " Not stopping domain ${name} - not running" - fi - done - fi - if using_screen ; then - if ${screen_cmd} sleep 0 >/dev/null 2>&1 ; then - ebegin "Closing screen session ${SCREEN_NAME}" - ${screen_cmd} quit - eend $? - else - eend 0 - fi - fi -} - -status() { - /usr/sbin/xl list -} diff --git a/app-emulation/xen-tools/files/xenqemudev.confd b/app-emulation/xen-tools/files/xenqemudev.confd deleted file mode 100644 index 5b49520..0000000 --- a/app-emulation/xen-tools/files/xenqemudev.confd +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/xenqemudev - -# To enable QEMU file backend, set to 'yes' -XENQEMUDEV_FILE_BACKEND_ENABLE="" - -# Common options for xenqemudev -XENQEMUDEV_OPTS="" diff --git a/app-emulation/xen-tools/files/xenqemudev.initd b/app-emulation/xen-tools/files/xenqemudev.initd deleted file mode 100644 index 9dcbb3f..0000000 --- a/app-emulation/xen-tools/files/xenqemudev.initd +++ /dev/null @@ -1,84 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need xencommons xenstored xenconsoled -} - -is_privileged_domain() { - grep -qsE '^control_d$' /proc/xen/capabilities - return $? -} - -xen_setvars() { - . /etc/xen/scripts/hotplugpath.sh - - XENQEMUDEV_PIDFILE=/run/xenqemudev.pid - - # xen-4.5 change the path - XEN_QEMU="${LIBEXEC}/qemu-system-i386" - [ -e ${XEN_QEMU} ] && return - XEN_QEMU="${LIBEXEC_BIN}/qemu-system-i386" -} - -xen_qemu_start() { - if [ -z "${XENQEMUDEV_FILE_BACKEND_ENABLE}" ]; then - ewarn " QEMU disk backend not enabled" - ewarn " enable XENQEMUDEV_FILE_BACKEND_ENABLE in /etc/conf.d/xenqemudev" - return 1 - fi - - xen_setvars - - if [ ! -c /dev/xen/gntdev ]; then - einfo " Xen gntdev driver not loaded" - return 1 - fi - - if [ -e "${XEN_QEMU}" ]; then - einfo " Starting QEMU as disk backend for dom0" - - XENQEMUDEV_DEFAULT_OPTS="-xen-domid 0 -xen-attach -name dom0 \ - -nographic -M xenpv -daemonize \ - -monitor /dev/null -serial /dev/null -parallel /dev/null" - - XENQEMUDEV_OPTS=${XENQEMUDEV_OPTS:-${XENQEMUDEV_DEFAULT_OPTS}} - - start-stop-daemon --start --exec ${XEN_QEMU} \ - --pidfile ${XENQEMUDEV_PIDFILE} \ - -- -pidfile ${XENQEMUDEV_PIDFILE} \ - ${XENQEMUDEV_OPTS} - return $? - fi -} - -start() { - ebegin "Starting xenqemudev daemon" - - # not running in Xen dom0 or domU - if [ ! -d /proc/xen ]; then - eend 1 "Not running in Xen mode" - return 1 - fi - - if ! is_privileged_domain; then - eend 1 "Not running on a privileged domain. xenqemudev not started" - return 1 - fi - - xen_qemu_start - - eend $? "Failed to start xenqemudev" -} - -stop () { - ebegin "Stopping xenqemudev" - - xen_setvars - - start-stop-daemon --stop --exec ${XEN_QEMU} \ - --pidfile ${XENQEMUDEV_PIDFILE} - - eend $? "Stopping xenqemudev, as it cannot be restarted." -} diff --git a/app-emulation/xen-tools/files/xenstored.confd b/app-emulation/xen-tools/files/xenstored.confd deleted file mode 100644 index 31b9293..0000000 --- a/app-emulation/xen-tools/files/xenstored.confd +++ /dev/null @@ -1,2 +0,0 @@ -# /etc/conf.d/xenstored -XENSTORED_OPTS="" diff --git a/app-emulation/xen-tools/files/xenstored.initd-r1 b/app-emulation/xen-tools/files/xenstored.initd-r1 deleted file mode 100644 index 88d3ad7..0000000 --- a/app-emulation/xen-tools/files/xenstored.initd-r1 +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp - need xencommons -} - -xenstored_dir_check() { - # create dir dynamically - local i - for i in /var/lock/subsys /run/xen /run/xend/boot /run/xenstored; do - [ -x $i ] || mkdir -p $i - done -} - -start() { - ebegin "Starting xenstored daemon" - xenstored_dir_check - start-stop-daemon --start --exec /usr/sbin/xenstored \ - --pidfile /run/xenstored.pid \ - -- --pid-file=/run/xenstored.pid \ - $XENSTORED_OPTS - until xenstore-exists / || $((15 < ++i)) - do - printf "." - sleep 1 - done - einfo "Setting domain0 name record" - /usr/libexec/xen/bin/xen-init-dom0 - - eend $* -} - -stop() { - ebegin "Stopping xenstored daemon" - start-stop-daemon --stop --exec /usr/sbin/xenstored \ - --pidfile /run/xenstored.pid - eend $? -} - diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml deleted file mode 100644 index fb98e4a..0000000 --- a/app-emulation/xen-tools/metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - hydrapolic@gmail.com - Tomáš Mózes - - - proxy-maint@gentoo.org - Proxy Maintainers - - - xen@gentoo.org - Gentoo Xen Project - - - Build the C libxenapi bindings - Enable support for hardware based virtualization (VT-x,AMD-v) - Enable ipxe support - Enable support to boot UEFI guest vm, needed by hvm - Install the pygrub boot loader - Enable IOEMU support via the use of qemu-dm - Build the old qemu traditional device model (useful only if you cannot change to the new device model e.g. Windows VMs) - Enable rombios support, needed by ipxe - Enable support for running domain U console in an app-misc/screen session - Using sys-firmware/ipxe instead of the bundled one - Using app-emulation/qemu instead of the bundled one - Using sys-firmware/seabios instead of the bundled one - - diff --git a/app-emulation/xen-tools/xen-tools-4.14.3.ebuild b/app-emulation/xen-tools/xen-tools-4.14.3.ebuild deleted file mode 100644 index da0169a..0000000 --- a/app-emulation/xen-tools/xen-tools-4.14.3.ebuild +++ /dev/null @@ -1,534 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE='ncurses,xml,threads(+)' - -inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs - -MY_PV=${PV/_/-} - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="amd64 ~arm ~arm64 x86" - UPSTREAM_VER= - SECURITY_VER= - # xen-tools's gentoo patches tarball - GENTOO_VER=23 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - # xen-tools ovmf's patches - OVMF_VER= - - SEABIOS_VER="1.14.0" - EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" - EDK2_OPENSSL_VERSION="1_1_1g" - EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c" - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz - ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) - ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz - https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz - https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz - https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="https://www.xenproject.org" -DOCS=( README ) - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api debug doc +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ipxe? ( rombios ) - ovmf? ( hvm ) - pygrub? ( python ) - rombios? ( hvm ) - system-ipxe? ( rombios ) - ?? ( ipxe system-ipxe ) - ?? ( qemu system-qemu )" - -COMMON_DEPEND=" - sys-apps/pciutils - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib - ${PYTHON_DEPS} -" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - selinux? ( sec-policy/selinux-xen )" - -DEPEND="${COMMON_DEPEND} - app-misc/pax-utils - >=sys-kernel/linux-headers-4.11 - x11-libs/pixman - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - ') - x86? ( sys-devel/dev86 - system-ipxe? ( sys-firmware/ipxe[qemu] ) - sys-power/iasl ) - api? ( dev-libs/libxml2 - net-misc/curl ) - - ovmf? ( - !arm? ( !arm64? ( dev-lang/nasm ) ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - system-ipxe? ( sys-firmware/ipxe[qemu] ) - rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - doc? ( - app-text/ghostscript-gpl - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/markdown[${PYTHON_USEDEP}] - ') - dev-texlive/texlive-latexextra - media-gfx/transfig - ) - hvm? ( x11-base/xorg-proto ) - qemu? ( - app-arch/snappy:= - sdl? ( - media-libs/libsdl[X] - media-libs/libsdl2[X] - ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - dev-lang/ocaml[ocamlopt] ) - python? ( >=dev-lang/swig-4.0.0 )" - -BDEPEND="dev-lang/perl - sys-devel/bison - sys-devel/gettext" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD=" - usr/libexec/xen/boot/hvmloader - usr/share/qemu-xen/qemu/hppa-firmware.img - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -QA_PREBUILT=" - usr/libexec/xen/bin/elf2dmp - usr/libexec/xen/bin/ivshmem-client - usr/libexec/xen/bin/ivshmem-server - usr/libexec/xen/bin/qemu-edid - usr/libexec/xen/bin/qemu-img - usr/libexec/xen/bin/qemu-io - usr/libexec/xen/bin/qemu-keymap - usr/libexec/xen/bin/qemu-nbd - usr/libexec/xen/bin/qemu-pr-helper - usr/libexec/xen/bin/qemu-system-i386 - usr/libexec/xen/bin/virtfs-proxy-helper - usr/libexec/xen/libexec/xen-bridge-helper - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/s390-netboot.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - local i - - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf || die - - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - eapply "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - eapply "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf || die - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - eapply "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/edk2-*/ > /dev/null - eapply "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die - rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - eapply "${FILESDIR}"/xen-tools-4.14.3-brotli.patch - fi - - # ipxe - if use ipxe; then - cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - - # gcc 11 - cp "${WORKDIR}/patches-gentoo/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die - echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # drop flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # fix bashishm - sed -e '/Usage/s/\$//g' \ - -i tools/hotplug/Linux/init.d/xendriverdomain.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # disable capstone (Bug #673474) - sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ - -i tools/Makefile || die - - # disable glusterfs - sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ - -i tools/Makefile || die - - # disable jpeg automagic - sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \ - -i tools/Makefile || die - - # disable png automagic - sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \ - -i tools/Makefile || die - - # disable docker (Bug #732970) - sed -e "s:\$\$source/configure:\0 --disable-containers:" \ - -i tools/Makefile || die - - # disable abi-dumper (Bug #791172) - sed -e 's/$(ABI_DUMPER) /echo /g' \ - -i tools/libs/libs.mk || die - - default -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --localstatedir=${EPREFIX}/var \ - --disable-golang \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable api xenapi) \ - $(use_enable ipxe) \ - $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ - $(use_enable ocaml ocamltools) \ - $(use_enable ovmf) \ - $(use_enable pam) \ - $(use_enable rombios) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - tc-ld-disable-gold # Bug 669570 - econf ${myconf} -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} - - if use doc; then - emake -C docs build - else - emake -C docs man-pages - fi -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Created at runtime - rm -rv "${ED}/var/run" || die - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"/tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - dodoc -r docs/{pdf,txt} - else - emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 - fi - dodoc ${DOCS[@]} - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die - - keepdir /var/lib/xen/dump - keepdir /var/lib/xen/xenpaging - keepdir /var/lib/xenstored - keepdir /var/log/xen - - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi - - python_optimize -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "https://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config system at boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest deleted file mode 100644 index 904c0d6..0000000 --- a/dev-java/oracle-jdk-bin/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX fontconfig.Gentoo.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 -AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 -AUX oracle-jdk-bin-1.7.env 880 BLAKE2B c5cc5d09534e9ada0c05f9eda0a0609ae81d39d985ba21610955af8b532381030ed6231e0f129fe1648fe4a711c49896afc6797ba31f540bb6db38d269b6f117 SHA512 f230fd95f07638690b1ce64bf25b366b6fb11828735e7bb75fa30152435485e4f529f73e88a50f623db348c0ed68ea5617b7691f4c1c3be56b37216d0a7fa59a -AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8 -DIST UnlimitedJCEPolicyJDK7.zip 7426 BLAKE2B 1cd63919e35248e25e4e104c8f87deed84db70280c7a4262c999d02edc8f9757c8ac6a369ac326686f61da7391f1788ec1da65d253e0bc6ff674c4e0c7dc3fb7 SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 -DIST jdk-7u80-linux-i586.tar.gz 154850445 BLAKE2B a94426088fa12456b74b24938279e9415d73cdb45857fa9b6234a9b5de24962690a28cf00097103f1cd94b3b9a7fd3eabb137edcca9572e035d6f27dca8a7608 SHA512 69e2ee7964b18e9e8b57db917b303eb9ea629c432300fe4749177118d2f5c365e72b976649e21354643fe4957120a2b23de025bab4dc45977837d4847a61ffb6 -DIST jdk-7u80-linux-x64.tar.gz 153530841 BLAKE2B 9ff05c97b65b3b49f4d5088fa4b021aaa58806a1d9937b3c65db8e25bd44465880e66f60b75483bed12b9f562d3bf6430480516a86724a16262776231044a95e SHA512 a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9 -DIST jdk-8u241-linux-i586.tar.gz 195143852 BLAKE2B 595e614fb34122a72fca5ce70a4ed4702e725a2f3a3084c7f6a86be8901799f9b4eb11b04b9b054d59d011a285276922532dbc52a04e33a5c49b9a22fe9bdcb4 SHA512 66edeb10d4ab38e05f74a17f8bdfe681069e2ca14a42b2c0f6159cefed6ccba69581086d0d6209476cb731913451b58a3a503bc28456ac6c5ef68722d124a04d -DIST jdk-8u241-linux-x64.tar.gz 194545143 BLAKE2B 13369d68bc0c328c4efbba90697080fe4d65fb8167bc9b20b92b6d4d6845c48486c53f2371e362fdb6195e8ffdb3ad8f4b486115ffbcf3e2f8e2966b6ad46d4c SHA512 1123fb82926ac207fdbfc1dd3efd588832feed15cac755d1ca604e321816c2fb3c695b9ce3f99b5a14f6c45973cc8dadae87d5c79c49d67336f8a5cb50c56050 -EBUILD oracle-jdk-bin-1.7.0.80.ebuild 7525 BLAKE2B cf5997f8872494b1334653c7637a72472326f04be56460c5cdce7b318b96867fbd921c2d1a124f29e78d1e0a0c1e5bf9c1841af8e22a8daac22ba55ccb41975b SHA512 5526de842d446d6e78ab783cb905c11733b951e61f2f4b6d0bd2a0bdc5776e6c83b10612d1889dcef139e352fa6f187facb60633ab80496da30bcd8cd70f3508 -EBUILD oracle-jdk-bin-1.8.0.241.ebuild 8238 BLAKE2B 39a8ef091be7f6195367ae50fb18d7d12f0e9255ce9d04012eb2da8f6be067c096f8f3d17b266c16409391ff6b64236434b273a2c4b36b8aad640af86100aca1 SHA512 e5877fc6bcf3498300e516384434ff423fb7920de365278a1aa104c1147398af1e7b263d2dff94e0321d84d0dfacc0b04b0e337cbcb32339e504a9d44f4fe563 diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties deleted file mode 100644 index 43cb5ee..0000000 --- a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties +++ /dev/null @@ -1,161 +0,0 @@ -# Version - -version=1 - -# Component Font Mappings - -allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1 -allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0 -allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0 -allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - -serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1 - -serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1 - -serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1 - -serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 - -monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 - -monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 - -monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 - -monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 - -dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 - -dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 - -dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 - -dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 - -dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 - -dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 - -dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 - -dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 - -# Search Sequences - -sequence.allfonts=latin-1 -sequence.allfonts.Big5=latin-1,chinese-big5 -sequence.allfonts.GB2312=latin-1,chinese-gb18030 -sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208 -sequence.allfonts.EUC-KR=latin-1,korean -sequence.allfonts.GB18030=latin-1,chinese-gb18030 -sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean - -# Exclusion Ranges - -exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be - -# Font File Names - -filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf -filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf -filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf -filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf -filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf -filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf - -# AWT X11 font paths -awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1 -awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts -awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts -awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute -awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties deleted file mode 100644 index 43cb5ee..0000000 --- a/dev-java/oracle-jdk-bin/files/fontconfig.properties +++ /dev/null @@ -1,161 +0,0 @@ -# Version - -version=1 - -# Component Font Mappings - -allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1 -allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0 -allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0 -allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - -serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1 - -serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1 - -serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1 - -serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 - -sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 - -monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 - -monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 - -monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 - -monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 - -dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 - -dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 - -dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 - -dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 - -dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 - -dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 - -dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 - -dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 -dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 -dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 - -# Search Sequences - -sequence.allfonts=latin-1 -sequence.allfonts.Big5=latin-1,chinese-big5 -sequence.allfonts.GB2312=latin-1,chinese-gb18030 -sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208 -sequence.allfonts.EUC-KR=latin-1,korean -sequence.allfonts.GB18030=latin-1,chinese-gb18030 -sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean - -# Exclusion Ranges - -exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be - -# Font File Names - -filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf -filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf -filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf -filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf -filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf -filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf - -# AWT X11 font paths -awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1 -awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts -awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts -awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute -awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env deleted file mode 100644 index cc6305d..0000000 --- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="Oracle JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.7" -BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/classes" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh deleted file mode 100644 index 508a5c6..0000000 --- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VERSION="Oracle JDK ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/" -MANPATH="${EPREFIX}/opt/${P}/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild deleted file mode 100644 index 602fac8..0000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit eutils java-vm-2 prefix versionator - -MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" -S_PV="$(replace_version_separator 3 '_')" - -# This URIs need to be updated when bumping! -JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html#jdk-${MY_PV}-oth-JPR" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" -# This is a list of archs supported by this update. -# Currently arm comes and goes. -AT_AVAILABLE=( amd64 x86 ) -# Sometimes some or all of the demos are missing, this is to not have to rewrite half -# the ebuild when it happens. -DEMOS_AVAILABLE=( ) -#amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) -FX_VERSION="2_2_$(get_version_component_range 4)" - -AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" -AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" - -FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip" - -DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz" -DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz" - -JCE_DIR="UnlimitedJCEPolicy" -JCE_FILE="${JCE_DIR}JDK7.zip" - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -for d in "${AT_AVAILABLE[@]}"; do - SRC_URI+=" ${d}? (" - SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")" - if has ${d} "${DEMOS_AVAILABLE[@]}"; then - SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" - fi - SRC_URI+=" )" -done -unset d -SRC_URI+=" jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" -SLOT="1.7" -KEYWORDS="amd64 x86" -IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source" - -RESTRICT="fetch strip" -QA_PREBUILT="*" - -COMMON_DEP="" -RDEPEND="${COMMON_DEP} - X? ( !aqua? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) ) - alsa? ( media-libs/alsa-lib ) - doc? ( dev-java/java-sdk-docs:1.7 ) - fontconfig? ( media-libs/fontconfig ) - !prefix? ( sys-libs/glibc ) - selinux? ( sec-policy/selinux-java )" -# scanelf won't create a PaX header, so depend on paxctl to avoid fallback -# marking. #427642 -DEPEND="${COMMON_DEP} - jce? ( app-arch/unzip ) - examples? ( kernel_linux? ( app-arch/unzip ) ) - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}"/jdk${S_PV} - -check_tarballs_available() { - local uri=$1; shift - local dl= unavailable= - for dl in "${@}"; do - [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" - done - - if [[ -n "${unavailable}" ]]; then - if [[ -z ${_check_tarballs_available_once} ]]; then - einfo - einfo "Oracle requires you to download the needed files manually after" - einfo "accepting their license through a javascript capable web browser." - einfo - _check_tarballs_available_once=1 - fi - einfo "Download the following files:" - for dl in ${unavailable}; do - einfo " ${dl}" - done - einfo "at '${uri}'" - einfo "and move them to '${DISTDIR}'" - einfo - einfo "If the above mentioned urls do not point to the correct version anymore," - einfo "please download the files from Oracle's java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-${MY_PV}-oth-JPR" - einfo - fi -} - -pkg_nofetch() { - local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then - distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) - fi - check_tarballs_available "${JDK_URI}" "${distfiles[@]}" - - use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" -} - -src_prepare() { - if use jce; then - mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die - fi - eapply_user -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # Create files used as storage for system preferences. - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - if use x86; then - rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ - {,jre/}lib/i386/libjavaplugin_nscp*.so - rm -vrf jre/plugin/i386 - fi - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin; then - rm -vf {,jre/}lib/${arch}/libnpjp2.so \ - {,jre/}lib/${arch}/libjavaplugin_jni.so - fi - - dodoc COPYRIGHT - docinto html - dodoc README.html - - dodir "${dest}" - cp -pPR bin include jre lib man "${ddest}" || die - - if use derby; then - cp -pPR db "${ddest}" || die - fi - - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then - cp -pPR demo sample "${ddest}" || die - if use kernel_linux; then - cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \ - "${ddest}"/javafx-samples || die - fi - fi - - if use jce; then - dodir "${dest}"/jre/lib/security/strong-jce - mv "${ddest}"/jre/lib/security/US_export_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - mv "${ddest}"/jre/lib/security/local_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/jre/lib/security/US_export_policy.jar - dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/jre/lib/security/local_policy.jar - fi - -# if use nsplugin; then -# install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so -# fi - - if use source; then - cp -p src.zip "${ddest}" || die - fi - - if use !arm ; then - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or - # other slots. make_desktop_entry can't be used as ${P} would - # end up in filename. - newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - jre/lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - fi - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/jre/lib/fontconfig.* - if ! use fontconfig; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/jre/lib/ - doins "${T}"/fontconfig.properties - fi - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir -v {} + || die - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.241.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.241.ebuild deleted file mode 100644 index de06dc7..0000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.241.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils java-vm-2 prefix versionator - -KEYWORDS="-* amd64 x86" - -if [[ "$(get_version_component_range 4)" == 0 ]] ; then - S_PV="$(get_version_component_range 1-3)" -else - MY_PV_EXT="u$(get_version_component_range 4)" - S_PV="$(get_version_component_range 1-4)" -fi - -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" - -declare -A ARCH_FILES -ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz" -ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz" -ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz" -ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz" -ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg" -ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz" -ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz" - -for keyword in ${KEYWORDS//-\*} ; do - case "${keyword#\~}" in - *-linux) continue ;; - x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;; - *) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;; - esac - - SRC_URI+=" - ${keyword#\~}? ( - ${ARCH_FILES[${keyword#\~}]} - )" -done - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -LICENSE="Oracle-BCLA-JavaSE" -SLOT="1.8" -IUSE="alsa commercial cups doc +fontconfig headless-awt javafx jce nsplugin selinux source visualvm" -REQUIRED_USE="javafx? ( alsa fontconfig )" -RESTRICT="bindist fetch preserve-libs strip" -QA_PREBUILT="*" - -# NOTES: -# -# * cups is dlopened. -# -# * libpng is also dlopened but only by libsplashscreen, which isn't -# important, so we can exclude that. -# -# * We still need to work out the exact AWT and JavaFX dependencies -# under MacOS. It doesn't appear to use many, if any, of the -# dependencies below. -# -RDEPEND="!x64-macos? ( - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - javafx? ( - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/opengl - ) - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) - fontconfig? ( media-libs/fontconfig:1.0 ) - !prefix? ( sys-libs/glibc:* ) - selinux? ( sec-policy/selinux-java )" - -DEPEND="app-arch/zip" - -S="${WORKDIR}/jdk$(replace_version_separator 3 _ ${S_PV})" - -pkg_nofetch() { - local a - einfo "Please download these files and move them to your distfiles directory:" - einfo - for a in ${A} ; do - [[ ! -f ${DISTDIR}/${a} ]] && einfo " ${a}" - done - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html" - einfo - einfo "If the above mentioned URL does not point to the correct version anymore," - einfo "please download the file from Oracle's Java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html" - einfo -} - -src_unpack() { - if use x64-macos ; then - mkdir -p "${T}"/dmgmount || die - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ - -mountpoint "${T}"/dmgmount || die - local jdkgen=$(get_version_component_range 2) - local uver=$(get_version_component_range 4) - ( cd "${T}" && - xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \ - jdk${PV//.}.pkg/Payload ) || die - zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die - hdiutil detach "${T}"/dmgmount || die - mv Contents/Home "${S}" || die - fi - - default -} - -src_prepare() { - default - - if [[ -n ${JAVA_PKG_STRICT} ]] ; then - # Mark this binary early to run it now. - pax-mark m ./bin/javap - - eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936." - eqawarn - eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)" - fi - - # Remove the hook that calls Oracle's evil usage tracker. Not just - # because it's evil but because it breaks the sandbox during builds - # and we can't find any other feasible way to disable it or make it - # write somewhere else. See bug #559936 for details. - zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest#/}" - - # Create files used as storage for system preferences. - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - if ! use alsa ; then - rm -vf jre/lib/*/libjsoundalsa.* || die - fi - - if ! use commercial ; then - rm -vfr lib/missioncontrol jre/lib/jfr* || die - fi - - if use headless-awt ; then - rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/{javaws,policytool} \ - bin/appletviewer || die - fi - - if ! use javafx ; then - rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \ - jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \ - bin/*javafx* bin/javapackager || die - fi - - if ! use nsplugin ; then - rm -vf jre/lib/*/libnpjp2.* || die - else - local nsplugin=$(echo jre/lib/*/libnpjp2.*) - local nsplugin_link=${nsplugin##*/} - nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} - dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" - fi - - # Even though plugins linked against multiple ffmpeg versions are - # provided, they generally lag behind what Gentoo has available. - rm -vf jre/lib/*/libavplugin* || die - - # Prune all fontconfig files so that libfontconfig will be used. - rm -v jre/lib/fontconfig.* || die - - # Packaged as dev-util/visualvm but some users prefer this version. - use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die - - # Install desktop file for the Java Control Panel. Using - # ${PN}-${SLOT} to prevent file collision with JRE and other slots. - if [[ -d jre/lib/desktop/icons ]] ; then - local icon - pushd jre/lib/desktop/icons >/dev/null || die - for icon in */*/apps/sun-jcontrol.png ; do - insinto /usr/share/icons/"${icon%/*}" - newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png - done - popd >/dev/null || die - make_desktop_entry \ - "${dest}"/bin/jcontrol \ - "Java Control Panel for Oracle JDK ${SLOT}" \ - sun-jcontrol-${PN}-${SLOT} \ - "Settings;Java;" - fi - - dodoc COPYRIGHT - dodir "${dest}" - cp -pPR bin include jre lib man "${ddest}" || die - - ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \ - "${ddest}"/jre/lib/security/ || die - - if use source ; then - cp -v src.zip "${ddest}" || die - - if use javafx ; then - cp -v javafx-src.zip "${ddest}" || die - fi - fi - - # Only install Gentoo-specific fontconfig if flag is disabled. - # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html - if ! use fontconfig ; then - insinto "${dest}"/jre/lib/ - doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)" - fi - - # Needs to be done before CDS, bug #215225. - java-vm_set-pax-markings "${ddest}" - - # See bug #207282. - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied. - find "${D}" -type d -empty -exec rmdir -v {} + || die - - if use x64-macos ; then - local lib - for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do - ebegin "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}"/jre/lib/${lib} \ - "${ddest}"/jre/lib/${lib} || die - eend $? - done - fi - - java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - java-vm-2_pkg_postinst - - if ! use headless-awt && ! use javafx ; then - ewarn "You have disabled the javafx flag. Some modern desktop Java applications" - ewarn "require this and they may fail with a confusing error message." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update - java-vm-2_pkg_postrm -} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest deleted file mode 100644 index 963e601..0000000 --- a/dev-lang/php/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce -AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd -AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 -AUX php-icu-fix.patch 404 BLAKE2B 9ddd108f1817f54eb1c3d20dfe7eda1f3a618f56bb44d89a174fec36c576363bc3e80b9b348fae67dbbd897ba18ce2f97b8b70b46a7b80382f8a68f5be40d84d SHA512 57aa49c580c489497bc54f2824c1f99fd104e7b1b7c524b7a0626ddcd28ed1c1867d1ada171ae381905c872b1ae564c0515e574c05e6d468f263b038b2f4597a -DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329 -DIST php-patches-7.1.33bp.tar.bz2 39945 BLAKE2B 9f7137f61b7ea07cc263b054401a319042f5a40d6cdaf3561a45778ae009e3279c72f2a6a0f9c97805bc39acef1c8c9d72d290c2ce873f44209fb2d65d620810 SHA512 8e36fb57bdadfcc4e976ecb7dc8f44290dc3b507eb27f4445aa2c8eba528e7cb53286e7fd9b1b9141f12fd6e29278282e4f0eb6445ed06046dd48a1d5d1bc789 -EBUILD php-5.6.40-r7.ebuild 23020 BLAKE2B 15fbb3ad3fd1460d6985ba5f022fee6dad05fd1df6de2d9bc6c84922d52dee5f933bb1c798aa5bcba9baf73eaeca605cfdf8aa6cd408e264260a31fc62fae3c9 SHA512 a67068f5434a9eefc2e63ca69cd89a0a82d4bc3bd37657110c5b3b7494d228c4dcd3a86b8f36719fa150c0e3b5e252ed91c7234b67167a514d549e0fd1ea0140 -MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86 diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd deleted file mode 100644 index f6033ae..0000000 --- a/dev-lang/php/files/20php5-envd +++ /dev/null @@ -1,2 +0,0 @@ -MANPATH="/usr/lib/php5/man/" -CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/" diff --git a/dev-lang/php/files/php-fpm_at-simple.service b/dev-lang/php/files/php-fpm_at-simple.service deleted file mode 100644 index 5f0482e..0000000 --- a/dev-lang/php/files/php-fpm_at-simple.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=The PHP FastCGI Process Manager -After=network.target - -[Service] -Type=simple -PIDFile=/run/php-fpm/php-fpm-%I.pid -ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize -ExecReload=/bin/kill -USR2 $MAINPID -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/dev-lang/php/files/php-fpm_at.service b/dev-lang/php/files/php-fpm_at.service deleted file mode 100644 index 152c1ab..0000000 --- a/dev-lang/php/files/php-fpm_at.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=The PHP FastCGI Process Manager -After=network.target - -[Service] -Type=notify -PIDFile=/run/php-fpm/php-fpm-%I.pid -ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize -ExecReload=/bin/kill -USR2 $MAINPID -PrivateTmp=true - -[Install] -WantedBy=multi-user.target - diff --git a/dev-lang/php/files/php-icu-fix.patch b/dev-lang/php/files/php-icu-fix.patch deleted file mode 100644 index 1566fdf..0000000 --- a/dev-lang/php/files/php-icu-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- php-5.6.40/acinclude.m4 2021-01-31 11:00:18.549678215 +0100 -+++ php-5.6.40/acinclude.m4 2021-01-31 11:01:50.030900044 +0100 -@@ -2212,6 +2212,9 @@ - if test "$PKG_CONFIG icu-io --atleast-version=60"; then - ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" - fi -+ -+ ICU_CFLAGS="$ICU_CFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" -+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" - ]) - - dnl diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml deleted file mode 100644 index 47de79c..0000000 --- a/dev-lang/php/metadata.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - php-bugs@gentoo.org - PHP - - - Enable password hashing algorithm from app-crypt/argon2 - Add support for libbcmath - Enable CLI SAPI - - Include gcov symbols for test coverage and lcov reports. Only - useful for extension developers, and requires GCC. - - Enable ctype functions - Enable embed SAPI - Add supports Enchant spelling library. - Add foreign function interface (ffi extension) support - Add fileinfo extension support - Add filter extension support - Add dbm support for flat files - Enable the FastCGI Process Manager SAPI - Adds support for gd (bundled with PHP) - Enable the hash extension - Add dbm support for .ini files - Enable JSON support - Add SASL support for the PHP LDAP extension - - Use libmyslclient driver for mysql, mysqli, PDO_Mysql (not recommended) - - Enable support for dev-db/lmdb db backend - - Enables the intl extension for extended internalization support - - - Enables built-in opcode cache, replacing pecl-apc et al. - - Add support for process creation functions - Enable the bundled PDO extensions - - Enables the phar extension to provide phar archive support - - - Enable the PHP Debug Command Line SAPI (like gdb for php) - - - Include dev-libs/mm support for session storage - - Add support for shared memory use - Support for SimpleXML - - Enable support for crypto through dev-libs/libsodium - - Add support for Sybase-CT - - Support for System V-compatible inter-process communication - - Add support for the PHP file parser - - Enable support for dev-db/tokyocabinet db backend - Enable XMLReader support - Enable XMLWriter support - Enable the XSL extension - Enable webp support for GD in php-5.x - Add support for Web Distributed Data eXchange - Enable webp support for GD in php-7.x - Enable ZIP file encryption from dev-libs/libzip - - diff --git a/dev-lang/php/php-5.6.40-r7.ebuild b/dev-lang/php/php-5.6.40-r7.ebuild deleted file mode 100644 index 94d5151..0000000 --- a/dev-lang/php/php-5.6.40-r7.ebuild +++ /dev/null @@ -1,794 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools flag-o-matic systemd - -PATCH_V="7.1.33bp" - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://secure.php.net/" -SRC_URI="https://php.net/distributions/${P}.tar.xz - https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk - coverage crypt +ctype curl debug - enchant exif +fileinfo +filter firebird - +flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl - mhash mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) - berkdb? ( || ( sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) - coverage? ( dev-util/lcov ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( =dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) - ) - unicode? ( dev-libs/oniguruma:= ) - vpx? ( media-libs/libvpx:0= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib:0= - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib:0= ) - zlib? ( sys-libs/zlib:0= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1 - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd zlib ) - vpx? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - recode? ( !imap !mysql !mysqli !libmysqlclient ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - sharedmem? ( !threads ) -" - -PHP_MV="$(ver_cut 1)" - -PATCHES=( - "${FILESDIR}"/php-icu-fix.patch -) - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - local patchdir="${WORKDIR}/php-patches-${PATCH_V}" - - eapply "${patchdir}/" - - eapply "${PATCHES[@]}" - - # Copy test binaries from patches - local ext_src - for ext_src in exif iconv ; do - cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die - done - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ - || die - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - eapply_user - - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" - - mv configure.in configure.ac || die - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with mssql mssql "${EPREFIX}/usr") - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_with truetype t1lib "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - $(use_with vpx vpx-dir "${EPREFIX}/usr") - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - our_conf+=( $(use_with mysql mysql "${mysqllib}") ) - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib) - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index #nowarn - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest deleted file mode 100644 index 0cebe66..0000000 --- a/dev-php/pecl-apcu/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899 -EBUILD pecl-apcu-4.0.11.ebuild 1537 BLAKE2B 36711117b55ff29299313a30dc336805330e38d263f2b1028639c7303293e424147e3bbdbb9be41c8f694ec720901d93367fb5743ee27ecd894835976b0ce8f7 SHA512 82cd877571c42a85a2e5bc31c68bc5ff3521ed77d968984942ecb95ff103e18d3796f32a222a1285e6630f020e4da732ef874a16f49e06d4da75909719e694c3 -MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56 diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml deleted file mode 100644 index 6344b62..0000000 --- a/dev-php/pecl-apcu/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - php-bugs@gentoo.org - PHP - - - Enable semaphore locks instead of fcntl - Enable pthread mutex locking - Enable pthread read/write locking - Enable spin locks (EXPERIMENTAL) - - diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild deleted file mode 100644 index c808e24..0000000 --- a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="apcu" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( NOTICE README.md TECHNOTES.txt TODO ) - -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -USE_PHP="php5-6" - -KEYWORDS="amd64 ~arm64 x86" - -DESCRIPTION="Stripped down version of APC supporting only user cache" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="+mmap" - -DEPEND="" -PDEPEND=" -php_targets_php7-1? ( dev-php/pecl-apcu:7[php_targets_php7-1] ) -php_targets_php7-2? ( dev-php/pecl-apcu:7[php_targets_php7-2] ) -php_targets_php7-3? ( dev-php/pecl-apcu:7[php_targets_php7-3] ) -" - -LOCKS="pthreadmutex pthreadrw spinlock semaphore" - -LUSE="" -for l in ${LOCKS}; do - LUSE+="lock-${l} " -done - -IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}" - -REQUIRED_USE="^^ ( $LUSE )" - -src_prepare() { - if use php_targets_php5-6 ; then - php-ext-source-r3_src_prepare - else - eapply_user - fi -} - -src_configure() { - if use php_targets_php5-6 ; then - local PHP_EXT_ECONF_ARGS=( - --enable-apcu - $(use_enable mmap apcu-mmap) - $(use_enable lock-pthreadrw apcu-rwlocks) - $(use_enable lock-spinlock apcu-spinlocks) - ) - - php-ext-source-r3_src_configure - fi -} - -src_install() { - if use php_targets_php5-6 ; then - php-ext-pecl-r3_src_install - - insinto "${PHP_EXT_SHARED_DIR#$EPREFIX}" - doins apc.php - fi -} - -pkg_postinst() { - if use php_targets_php5-6 ; then - elog "The apc.php file shipped with this release of pecl-apcu was" - elog "installed into ${PHP_EXT_SHARED_DIR}." - fi -} diff --git a/dev-python/j2cli/Manifest b/dev-python/j2cli/Manifest deleted file mode 100644 index cbc6477..0000000 --- a/dev-python/j2cli/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST j2cli-0.3.12b.tar.gz 16797 BLAKE2B 08b434596021576dcecbaa8e700479c103f5d93c3d42880f8f5062fb0db78d4bd0bcc43c068e56b950a654b383a27b5aaff3b58ef22382c6fd6da8d9135ede98 SHA512 6c64aee49091969650214c7e581435d61a32211da14be3b80504af192e30d0de545e698426c3b68deb71e4ac8e422036a8202f0ea4d29f1cc3598872c4299b90 -EBUILD j2cli-0.3.12b.ebuild 810 BLAKE2B f9f678a713aae9224c2a513bc13be1fb4a8e5c0320b8d78359d78e7f8fbd735584720cda334f19dc02cc0c071021c86ca597390429c9985b6a69e42782b4a6d4 SHA512 ef651fdf3d01cab2182bfa589921a42e6a69c258ee0aa9e1fece97fe42f47134078e44d516fd849215e83c72e8258bf9689742b3590bec11e091aac8290a5f58 -MISC metadata.xml 217 BLAKE2B 2ff165b31e242337c0eb4ec7fc67dcf0ed3a5eb2962197600231e2b80bf9dabbabe485678d9a2cf4bdf26b23ae4b55f3101aa15e6b92010cab20953a1d513686 SHA512 a0130ab6cf8d4cc029ff0768bd12265b81b47bdfa6d815cbb70368ac79535cf4777d3113e77b877e9f7a222bdc36321672c42db40b2a8f603421adb40d6eb50e diff --git a/dev-python/j2cli/j2cli-0.3.12b.ebuild b/dev-python/j2cli/j2cli-0.3.12b.ebuild deleted file mode 100644 index cc48f67..0000000 --- a/dev-python/j2cli/j2cli-0.3.12b.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Jinja2 Command-Line Tool, reworked." -HOMEPAGE="http://pypi.python.org/pypi/j2cli" -SRC_URI="https://github.com/kolypto/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="+yaml test" - -CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( - dev-python/wheel[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - ${CDEPEND} - >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] - yaml? ( - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - ) -" - -python_test() { - nosetests j2cli/tests || die "tests failed under ${EPYTHON}" -} diff --git a/dev-python/j2cli/metadata.xml b/dev-python/j2cli/metadata.xml deleted file mode 100644 index 03e67fd..0000000 --- a/dev-python/j2cli/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - kolypto/j2cli - - diff --git a/dev-python/onetimepass/Manifest b/dev-python/onetimepass/Manifest deleted file mode 100644 index fc6b738..0000000 --- a/dev-python/onetimepass/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST onetimepass-1.0.1.tar.gz 6046 BLAKE2B 5d469fe571f7b15bdca62e415bb746a9ef0928b271d4d99d1ebd64ae4073ddbab5bf0b9c237ef44fe7cbb3460803aee9b0218ea106619b5389b2b58f0427109f SHA512 380a5f61eff2c0f781ea9559f23d51b06625735494be20e857c2508c79c14bd1d2d314d9e86dfb043571a01ab52a96f1afefc7b440c9ab374d7a69017c6dee72 -EBUILD onetimepass-1.0.1.ebuild 409 BLAKE2B 059d05678c731130122f8226731fe48b8bf65488a27af7ecd3576a0f9e82893efefdf3b256df35ce01164573b693207edbdeda49c52976b43b6c9c70a157ba3e SHA512 be9eec8ab165f5c1f96bdd2b23d1c0e66e183a3bf7edd288a679f502a3472ad094baea85ae49f22d5711c9f6b5c3c686e3f1c32d413cfb0dd6cd9ad10861f60c -MISC metadata.xml 270 BLAKE2B f4c9d727b664f735d21d3bae552046a1245a3be56332a23228c970d1f0e625c4907a2fb9b8aa28a53d7e1cad8af39e0950d9f647826615cc284ada8d30a72b99 SHA512 f127c0b84809aabeef24cf9a4bd58f62027793a0111b481a4ac0f1cee361fd8762f210357c9da65827f42b2c50f3dff3bbedb0cddf87c5fbb1904e6c05c022ea diff --git a/dev-python/onetimepass/metadata.xml b/dev-python/onetimepass/metadata.xml deleted file mode 100644 index d4c2414..0000000 --- a/dev-python/onetimepass/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - adeck/onetimepass - onetimepass - - diff --git a/dev-python/onetimepass/onetimepass-1.0.1.ebuild b/dev-python/onetimepass/onetimepass-1.0.1.ebuild deleted file mode 100644 index 08927ee..0000000 --- a/dev-python/onetimepass/onetimepass-1.0.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -EAPI=6 - -PYTHON_COMPAT=( python3_{8,9} ) -inherit distutils-r1 - -DESCRIPTION="OneTimePass module" -HOMEPAGE="https://github.com/adeck/onetimepass https://pypi.org/project/onetimepass/" -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -python_test() { - "${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/totp/Manifest b/dev-python/totp/Manifest deleted file mode 100644 index 1816998..0000000 --- a/dev-python/totp/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST totp-1.3.0.tar.gz 7507 BLAKE2B 7d50ea611ed1a6bb571438bd9442136dc2ceb7e85d2756ced6ea711aa9084f21b0311ca30ba69c60c05c708e4d24b8515e284c1e409b0cc80ced6f5b55ff0718 SHA512 c465078356c858403d19a12d497e861eae28bda55bb895ecbf66d4bf933bf3ffbd96aa81ce1d6c1813134a2f61624faaf577c1384cbd6b35dc41201376c7e7a3 -EBUILD totp-1.3.0.ebuild 447 BLAKE2B c20f688ad3501b28070705fc9c4746f562adc855c45fe8e8731e284ead04b4694eb0babfe9e31472e7c883497eb153c50a25380a279a76a495861e5cda7ea337 SHA512 a9165e1bc19f445df622b9ef65c71f3e8adb1305d7042e056ee59953892c474b8a3d944a397ab83fa60ea43f661f5fb6dfc3b9e4f559f3d0cdb617805526e522 -MISC metadata.xml 265 BLAKE2B a591e693e3aba386101689db1b845e78c4ff8857d505b883bfb7b35fd24a668c1cb14fa2095df87a97c2e06a5d3fb5abd6c90893acd40ffab66a449b997c786b SHA512 78faefae13df7c4357dc7173e114e8314bb0bd1d678ca24d66590a45769e2a0a4b40a020dd45380980561cd4512cac7567a025bf1579ae7da6fd09901aa75f4c diff --git a/dev-python/totp/metadata.xml b/dev-python/totp/metadata.xml deleted file mode 100644 index 2ebe4d0..0000000 --- a/dev-python/totp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - WhyNotHugo/totp-cli - totp - - diff --git a/dev-python/totp/totp-1.3.0.ebuild b/dev-python/totp/totp-1.3.0.ebuild deleted file mode 100644 index a229482..0000000 --- a/dev-python/totp/totp-1.3.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -EAPI=6 - -PYTHON_COMPAT=( python3_{8,9} ) -inherit distutils-r1 - -DESCRIPTION="OTP module" -HOMEPAGE="https://github.com/WhyNotHugo/totp-cli https://pypi.org/project/totp/" -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/onetimepass[${PYTHON_USEDEP}]" - -python_test() { - "${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}" -} diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass deleted file mode 100644 index 19a1de8..0000000 --- a/eclass/autotools-utils.eclass +++ /dev/null @@ -1,386 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @DEAD -# @ECLASS: autotools-utils.eclass -# @MAINTAINER: -# Maciej Mrozowski -# Michał Górny -# @SUPPORTED_EAPIS: 4 5 -# @BLURB: common ebuild functions for autotools-based packages -# @DEPRECATED: out-of-source -# @DESCRIPTION: -# autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper -# providing all inherited features along with econf arguments as Bash array, -# out of source build with overridable build dir location, static archives -# handling, libtool files removal. -# -# Please note that autotools-utils does not support mixing of its phase -# functions with regular econf/emake calls. If necessary, please call -# autotools-utils_src_compile instead of the latter. -# -# @EXAMPLE: -# Typical ebuild using autotools-utils.eclass: -# -# @CODE -# EAPI="2" -# -# inherit autotools-utils -# -# DESCRIPTION="Foo bar application" -# HOMEPAGE="http://example.org/foo/" -# SRC_URI="mirror://sourceforge/foo/${P}.tar.bz2" -# -# LICENSE="LGPL-2.1" -# KEYWORDS="" -# SLOT="0" -# IUSE="debug doc examples qt4 static-libs tiff" -# -# CDEPEND=" -# media-libs/libpng:0 -# qt4? ( -# dev-qt/qtcore:4 -# dev-qt/qtgui:4 -# ) -# tiff? ( media-libs/tiff:0 ) -# " -# RDEPEND="${CDEPEND} -# !media-gfx/bar -# " -# DEPEND="${CDEPEND} -# doc? ( app-doc/doxygen ) -# " -# -# # bug 123456 -# AUTOTOOLS_IN_SOURCE_BUILD=1 -# -# DOCS=(AUTHORS ChangeLog README "Read me.txt" TODO) -# -# PATCHES=( -# "${FILESDIR}/${P}-gcc44.patch" # bug 123458 -# "${FILESDIR}/${P}-as-needed.patch" -# "${FILESDIR}/${P}-unbundle_libpng.patch" -# ) -# -# src_configure() { -# local myeconfargs=( -# $(use_enable debug) -# $(use_with qt4) -# $(use_enable threads multithreading) -# $(use_with tiff) -# ) -# autotools-utils_src_configure -# } -# -# src_compile() { -# autotools-utils_src_compile -# use doc && autotools-utils_src_compile docs -# } -# -# src_install() { -# use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/") -# autotools-utils_src_install -# if use examples; then -# dobin "${BUILD_DIR}"/foo_example{1,2,3} \\ -# || die 'dobin examples failed' -# fi -# } -# -# @CODE - -# Keep variable names synced with cmake-utils and the other way around! - -case ${EAPI:-0} in - 6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";; - 4|5) ;; - *) die "EAPI=${EAPI} is not supported" ;; -esac - -# @ECLASS-VARIABLE: AUTOTOOLS_AUTORECONF -# @DEFAULT_UNSET -# @DESCRIPTION: -# Set to a non-empty value before calling inherit to enable running autoreconf -# in src_prepare() and adding autotools dependencies. -# -# This is usually necessary when using live sources or applying patches -# modifying configure.ac or Makefile.am files. Note that in the latter case -# setting this variable is obligatory even though the eclass will work without -# it (to add the necessary dependencies). -# -# The eclass will try to determine the correct autotools to run including a few -# external tools: gettext, glib-gettext, intltool, gtk-doc, gnome-doc-prepare. -# If your tool is not supported, please open a bug and we'll add support for it. -# -# Note that dependencies are added for autoconf, automake and libtool only. -# If your package needs one of the external tools listed above, you need to add -# appropriate packages to DEPEND yourself. -[[ ${AUTOTOOLS_AUTORECONF} ]] || : ${AUTOTOOLS_AUTO_DEPEND:=no} - -# eutils for eqawarn, path_exists -inherit autotools epatch eutils libtool ltprune - -EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test - -# @ECLASS-VARIABLE: BUILD_DIR -# @DEFAULT_UNSET -# @DESCRIPTION: -# Build directory, location where all autotools generated files should be -# placed. For out of source builds it defaults to ${WORKDIR}/${P}_build. -# -# This variable has been called AUTOTOOLS_BUILD_DIR formerly. -# It is set under that name for compatibility. - -# @ECLASS-VARIABLE: AUTOTOOLS_IN_SOURCE_BUILD -# @DEFAULT_UNSET -# @DESCRIPTION: -# Set to enable in-source build. - -# @ECLASS-VARIABLE: ECONF_SOURCE -# @DEFAULT_UNSET -# @DESCRIPTION: -# Specify location of autotools' configure script. By default it uses ${S}. - -# @ECLASS-VARIABLE: DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Array containing documents passed to dodoc command. -# -# In EAPIs 4+, can list directories as well. -# -# Example: -# @CODE -# DOCS=( NEWS README ) -# @CODE - -# @ECLASS-VARIABLE: HTML_DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Array containing documents passed to dohtml command. -# -# Example: -# @CODE -# HTML_DOCS=( doc/html/ ) -# @CODE - -# @ECLASS-VARIABLE: PATCHES -# @DEFAULT_UNSET -# @DESCRIPTION: -# PATCHES array variable containing all various patches to be applied. -# -# Example: -# @CODE -# PATCHES=( "${FILESDIR}"/${P}-mypatch.patch ) -# @CODE - -# @ECLASS-VARIABLE: AUTOTOOLS_PRUNE_LIBTOOL_FILES -# @DEFAULT_UNSET -# @DESCRIPTION: -# Sets the mode of pruning libtool files. The values correspond to -# prune_libtool_files parameters, with leading dashes stripped. -# -# Defaults to pruning the libtool files when static libraries are not -# installed or can be linked properly without them. Libtool files -# for modules (plugins) will be kept in case plugin loader needs them. -# -# If set to 'modules', the .la files for modules will be removed -# as well. This is often the preferred option. -# -# If set to 'all', all .la files will be removed unconditionally. This -# option is discouraged and shall be used only if 'modules' does not -# remove the files. -# -# If set to 'none', no .la files will be pruned ever. Use in corner -# cases only. - -# Determine using IN or OUT source build -_check_build_dir() { - : ${ECONF_SOURCE:=${S}} - # Respect both the old variable and the new one, depending - # on which one was set by the ebuild. - if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then - eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR." - eqawarn "Please migrate the ebuild to use the new one." - - # In the next call, both variables will be set already - # and we'd have to know which one takes precedence. - _RESPECT_AUTOTOOLS_BUILD_DIR=1 - fi - - if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then - BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build} - else - if [[ -n ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then - : ${BUILD_DIR:=${ECONF_SOURCE}} - else - : ${BUILD_DIR:=${WORKDIR}/${P}_build} - fi - fi - - # Backwards compatibility for getting the value. - AUTOTOOLS_BUILD_DIR=${BUILD_DIR} - echo ">>> Working in BUILD_DIR: \"${BUILD_DIR}\"" -} - -# @FUNCTION: autotools-utils_src_prepare -# @DESCRIPTION: -# The src_prepare function. -# -# Supporting PATCHES array and user patches. See base.eclass(5) for reference. -autotools-utils_src_prepare() { - debug-print-function ${FUNCNAME} "$@" - - local want_autoreconf=${AUTOTOOLS_AUTORECONF} - - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" - - at_checksum() { - find '(' -name 'Makefile.am' \ - -o -name 'configure.ac' \ - -o -name 'configure.in' ')' \ - -exec cksum {} + | sort -k2 - } - - [[ ! ${want_autoreconf} ]] && local checksum=$(at_checksum) - epatch_user - if [[ ! ${want_autoreconf} ]]; then - if [[ ${checksum} != $(at_checksum) ]]; then - einfo 'Will autoreconfigure due to user patches applied.' - want_autoreconf=yep - fi - fi - - [[ ${want_autoreconf} ]] && eautoreconf - elibtoolize --patch-only -} - -# @FUNCTION: autotools-utils_src_configure -# @DESCRIPTION: -# The src_configure function. For out of source build it creates build -# directory and runs econf there. Configuration parameters defined -# in myeconfargs are passed here to econf. Additionally following USE -# flags are known: -# -# IUSE="static-libs" passes --enable-shared and either --disable-static/--enable-static -# to econf respectively. - -# @VARIABLE: myeconfargs -# @DEFAULT_UNSET -# @DESCRIPTION: -# Optional econf arguments as Bash array. Should be defined before calling src_configure. -# @CODE -# src_configure() { -# local myeconfargs=( -# --disable-readline -# --with-confdir="/etc/nasty foo confdir/" -# $(use_enable debug cnddebug) -# $(use_enable threads multithreading) -# ) -# autotools-utils_src_configure -# } -# @CODE -autotools-utils_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - [[ -z ${myeconfargs+1} || $(declare -p myeconfargs) == 'declare -a'* ]] \ - || die 'autotools-utils.eclass: myeconfargs has to be an array.' - - # Common args - local econfargs=() - - _check_build_dir - if "${ECONF_SOURCE}"/configure --help 2>&1 | grep -q '^ *--docdir='; then - econfargs+=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - ) - fi - - # Handle static-libs found in IUSE, disable them by default - if in_iuse static-libs; then - econfargs+=( - --enable-shared - $(use_enable static-libs static) - ) - fi - - # Append user args - econfargs+=("${myeconfargs[@]}") - - mkdir -p "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" > /dev/null || die - econf "${econfargs[@]}" "$@" - popd > /dev/null || die -} - -# @FUNCTION: autotools-utils_src_compile -# @DESCRIPTION: -# The autotools src_compile function, invokes emake in specified BUILD_DIR. -autotools-utils_src_compile() { - debug-print-function ${FUNCNAME} "$@" - - _check_build_dir - pushd "${BUILD_DIR}" > /dev/null || die - emake "$@" || die 'emake failed' - popd > /dev/null || die -} - -# @FUNCTION: autotools-utils_src_install -# @DESCRIPTION: -# The autotools src_install function. Runs emake install, unconditionally -# removes unnecessary static libs (based on shouldnotlink libtool property) -# and removes unnecessary libtool files when static-libs USE flag is defined -# and unset. -# -# DOCS and HTML_DOCS arrays are supported. See base.eclass(5) for reference. -autotools-utils_src_install() { - debug-print-function ${FUNCNAME} "$@" - - _check_build_dir - pushd "${BUILD_DIR}" > /dev/null || die - emake DESTDIR="${D}" "$@" install || die "emake install failed" - popd > /dev/null || die - - # XXX: support installing them from builddir as well? - if declare -p DOCS &>/dev/null; then - # an empty list == don't install anything - if [[ ${DOCS[@]} ]]; then - # dies by itself - dodoc -r "${DOCS[@]}" - fi - else - local f - # same list as in PMS - for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \ - THANKS BUGS FAQ CREDITS CHANGELOG; do - if [[ -s ${f} ]]; then - dodoc "${f}" || die "(default) dodoc ${f} failed" - fi - done - fi - if [[ ${HTML_DOCS} ]]; then - dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" - fi - - # Remove libtool files and unnecessary static libs - local prune_ltfiles=${AUTOTOOLS_PRUNE_LIBTOOL_FILES} - if [[ ${prune_ltfiles} != none ]]; then - prune_libtool_files ${prune_ltfiles:+--${prune_ltfiles}} - fi -} - -# @FUNCTION: autotools-utils_src_test -# @DESCRIPTION: -# The autotools src_test function. Runs emake check in build directory. -autotools-utils_src_test() { - debug-print-function ${FUNCNAME} "$@" - - _check_build_dir - pushd "${BUILD_DIR}" > /dev/null || die - - if make -ni check "${@}" &>/dev/null; then - emake check "${@}" || die 'emake check failed.' - elif make -ni test "${@}" &>/dev/null; then - emake test "${@}" || die 'emake test failed.' - fi - - popd > /dev/null || die -} diff --git a/eclass/font-custom.eclass b/eclass/font-custom.eclass deleted file mode 100644 index 76366fe..0000000 --- a/eclass/font-custom.eclass +++ /dev/null @@ -1,25 +0,0 @@ -# @ECLASS: font-custom.eclass - -inherit font - -IUSE="" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" -RESTRICT="mirror strip binchecks" -SLOT="0" - -# Google provides TrueType fonts only. -FONT_SUFFIX="ttf" - -# Working directory containing the fonts. -S="${WORKDIR}/${PN}" -FONT_S="${S}" - -# No unpacking needed. -font-custom_src_unpack() { - mkdir -p "${FONT_S}" - for file in ${A}; do - cp "${DISTDIR}/$file" "${FONT_S}/$file" - done -} - -EXPORT_FUNCTIONS src_unpack diff --git a/eclass/kernel-2a.eclass b/eclass/kernel-2a.eclass deleted file mode 100644 index ab4fe4e..0000000 --- a/eclass/kernel-2a.eclass +++ /dev/null @@ -1,1258 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.284 2013/04/29 22:14:23 tomwij Exp $ - -# Description: kernel.eclass rewrite for a clean base regarding the 2.6 -# series of kernel with back-compatibility for 2.4 -# -# Original author: John Mylchreest -# Maintainer: kernel-misc@gentoo.org -# -# Please direct your bugs to the current eclass maintainer :) - -# added functionality: -# unipatch - a flexible, singular method to extract, add and remove patches. - -# A Couple of env vars are available to effect usage of this eclass -# These are as follows: -# -# K_USEPV - When setting the EXTRAVERSION variable, it should -# add PV to the end. -# this is useful for thigns like wolk. IE: -# EXTRAVERSION would be something like : -wolk-4.19-r1 -# K_NOSETEXTRAVERSION - if this is set then EXTRAVERSION will not be -# automatically set within the kernel Makefile -# K_NOUSENAME - if this is set then EXTRAVERSION will not include the -# first part of ${PN} in EXTRAVERSION -# K_NOUSEPR - if this is set then EXTRAVERSION will not include the -# anything based on ${PR}. -# K_PREPATCHED - if the patchset is prepatched (ie: mm-sources, -# ck-sources, ac-sources) it will use PR (ie: -r5) as -# the patchset version for -# and not use it as a true package revision -# K_EXTRAEINFO - this is a new-line seperated list of einfo displays in -# postinst and can be used to carry additional postinst -# messages -# K_EXTRAELOG - same as K_EXTRAEINFO except using elog instead of einfo -# K_EXTRAEWARN - same as K_EXTRAEINFO except using ewarn instead of einfo -# K_SYMLINK - if this is set, then forcably create symlink anyway -# -# K_DEFCONFIG - Allow specifying a different defconfig target. -# If length zero, defaults to "defconfig". -# K_WANT_GENPATCHES - Apply genpatches to kernel source. Provide any -# combination of "base" and "extras" -# K_GENPATCHES_VER - The version of the genpatches tarball(s) to apply. -# A value of "5" would apply genpatches-2.6.12-5 to -# my-sources-2.6.12.ebuild -# K_SECURITY_UNSUPPORTED- If set, this kernel is unsupported by Gentoo Security -# K_DEBLOB_AVAILABLE - A value of "0" will disable all of the optional deblob -# code. If empty, will be set to "1" if deblobbing is -# possible. Test ONLY for "1". -# K_PREDEBLOBBED - This kernel was already deblobbed elsewhere. -# If false, either optional deblobbing will be available -# or the license will note the inclusion of freedist -# code. -# K_LONGTERM - If set, the eclass will search for the kernel source -# in the long term directories on the upstream servers -# as the location has been changed by upstream -# H_SUPPORTEDARCH - this should be a space separated list of ARCH's which -# can be supported by the headers ebuild - -# UNIPATCH_LIST - space delimetered list of patches to be applied to the -# kernel -# UNIPATCH_EXCLUDE - an addition var to support exlusion based completely -# on "*" and not "_*" -# - this should _NOT_ be used from the ebuild as this is -# reserved for end users passing excludes from the cli -# UNIPATCH_DOCS - space delimemeted list of docs to be installed to -# the doc dir -# UNIPATCH_STRICTORDER - if this is set places patches into directories of -# order, so they are applied in the order passed - -# Changing any other variable in this eclass is not supported; you can request -# for additional variables to be added by contacting the current maintainer. -# If you do change them, there is a chance that we will not fix resulting bugs; -# that of course does not mean we're not willing to help. - -inherit eutils toolchain-funcs versionator multilib -EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm - -# Added by Daniel Ostrow -# This is an ugly hack to get around an issue with a 32-bit userland on ppc64. -# I will remove it when I come up with something more reasonable. -[[ ${PROFILE_ARCH} == "ppc64" ]] && CHOST="powerpc64-${CHOST#*-}" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then - export CTARGET=${CATEGORY/cross-} -fi - -HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}" -: ${LICENSE:="GPL-2"} - -# This is the latest KV_PATCH of the deblob tool available from the -# libre-sources upstream. If you bump this, you MUST regenerate the Manifests -# for ALL kernel-2 consumer packages where deblob is available. -: ${DEBLOB_MAX_VERSION:=38} - -# No need to run scanelf/strip on kernel sources/headers (bug #134453). -RESTRICT="binchecks strip" - -# set LINUX_HOSTCFLAGS if not already set -: ${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"} - -# debugging functions -#============================================================== -# this function exists only to help debug kernel-2.eclass -# if you are adding new functionality in, put a call to it -# at the start of src_unpack, or during SRC_URI/dep generation. -debug-print-kernel2-variables() { - for v in PVR CKV OKV KV KV_FULL KV_MAJOR KV_MINOR KV_PATCH RELEASETYPE \ - RELEASE UNIPATCH_LIST_DEFAULT UNIPATCH_LIST_GENPATCHES \ - UNIPATCH_LIST S KERNEL_URI K_WANT_GENPATCHES ; do - debug-print "${v}: ${!v}" - done -} - -#Eclass functions only from here onwards ... -#============================================================== -handle_genpatches() { - local tarball - [[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1 - - debug-print "Inside handle_genpatches" - local OKV_ARRAY - IFS="." read -r -a OKV_ARRAY <<<"${OKV}" - - # for > 3.0 kernels, handle genpatches tarball name - # genpatches for 3.0 and 3.0.1 might be named - # genpatches-3.0-1.base.tar.xz and genpatches-3.0-2.base.tar.xz - # respectively. Handle this. - - for i in ${K_WANT_GENPATCHES} ; do - if [[ ${KV_MAJOR} -ge 3 ]]; then - if [[ ${KV_MINOR} -ge 5 ]]; then - if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then - tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz" - else - tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.xz" - fi - else - if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then - tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.bz2" - else - tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.bz2" - fi - fi - else - tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.bz2" - fi - debug-print "genpatches tarball: $tarball" - GENPATCHES_URI="${GENPATCHES_URI} https://apps.karinthy.hu/gentoo/patches/${tarball}" - UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}" - done -} - -detect_version() { - # this function will detect and set - # - OKV: Original Kernel Version (2.6.0/2.6.0-test11) - # - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1) - # - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1) - - # We've already run, so nothing to do here. - [[ -n ${KV_FULL} ]] && return 0 - - # CKV is used as a comparison kernel version, which is used when - # PV doesnt reflect the genuine kernel version. - # this gets set to the portage style versioning. ie: - # CKV=2.6.11_rc4 - CKV=${CKV:-${PV}} - OKV=${OKV:-${CKV}} - OKV=${OKV/_beta/-test} - OKV=${OKV/_rc/-rc} - OKV=${OKV/-r*} - OKV=${OKV/_p*} - - KV_MAJOR=$(get_version_component_range 1 ${OKV}) - # handle if OKV is X.Y or X.Y.Z (e.g. 3.0 or 3.0.1) - local OKV_ARRAY - IFS="." read -r -a OKV_ARRAY <<<"${OKV}" - - # if KV_MAJOR >= 3, then we have no more KV_MINOR - #if [[ ${KV_MAJOR} -lt 3 ]]; then - if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then - KV_MINOR=$(get_version_component_range 2 ${OKV}) - KV_PATCH=$(get_version_component_range 3 ${OKV}) - if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then - KV_EXTRA=$(get_version_component_range 4- ${OKV}) - KV_EXTRA=${KV_EXTRA/[-_]*} - else - KV_PATCH=$(get_version_component_range 3- ${OKV}) - fi - else - KV_PATCH=$(get_version_component_range 2 ${OKV}) - KV_EXTRA=$(get_version_component_range 3- ${OKV}) - KV_EXTRA=${KV_EXTRA/[-_]*} - fi - - debug-print "KV_EXTRA is ${KV_EXTRA}" - - KV_PATCH=${KV_PATCH/[-_]*} - - local v n=0 missing - #if [[ ${KV_MAJOR} -lt 3 ]]; then - if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then - for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do - [[ -z ${!v} ]] && n=1 && missing="${missing}${v} "; - done - else - for v in CKV OKV KV_{MAJOR,PATCH} ; do - [[ -z ${!v} ]] && n=1 && missing="${missing}${v} "; - done - fi - - [[ $n -eq 1 ]] && \ - eerror "Missing variables: ${missing}" && \ - die "Failed to extract kernel version (try explicit CKV in ebuild)!" - unset v n missing - -# if [[ ${KV_MAJOR} -ge 3 ]]; then - if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then - KV_PATCH_ARR=(${KV_PATCH//\./ }) - - # at this point 031412, Linus is putting all 3.x kernels in a - # 3.x directory, may need to revisit when 4.x is released - KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" - - [[ -n "${K_LONGTERM}" ]] && - KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}" - else - #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0" - #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}" - if [[ ${KV_MAJOR} -ge 3 ]]; then - KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" - else - KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}" - fi - - [[ -n "${K_LONGTERM}" ]] && - #KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm" - KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - fi - - debug-print "KERNEL_BASE_URI is ${KERNEL_BASE_URI}" - - if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then - # handle non genpatch using sources correctly - if [[ -z ${K_WANT_GENPATCHES} && -z ${K_GENPATCHES_VER} && ${KV_PATCH} -gt 0 ]]; then - KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz" - fi - KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz" - else - KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - fi - - RELEASE=${CKV/${OKV}} - RELEASE=${RELEASE/_beta} - RELEASE=${RELEASE/_rc/-rc} - RELEASE=${RELEASE/_pre/-pre} - # We cannot trivally call kernel_is here, because it calls us to detect the - # version - #kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git} - [ $(($KV_MAJOR * 1000 + ${KV_MINOR:-0})) -ge 2006 ] && RELEASE=${RELEASE/-pre/-git} - RELEASETYPE=${RELEASE//[0-9]} - - # Now we know that RELEASE is the -rc/-git - # and RELEASETYPE is the same but with its numerics stripped - # we can work on better sorting EXTRAVERSION. - # first of all, we add the release - EXTRAVERSION="${RELEASE}" - debug-print "0 EXTRAVERSION:${EXTRAVERSION}" - [[ -n ${KV_EXTRA} ]] && [[ ${KV_MAJOR} -lt 3 ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}" - - debug-print "1 EXTRAVERSION:${EXTRAVERSION}" - if [[ -n "${K_NOUSEPR}" ]]; then - # Don't add anything based on PR to EXTRAVERSION - debug-print "1.0 EXTRAVERSION:${EXTRAVERSION}" - elif [[ -n ${K_PREPATCHED} ]]; then - debug-print "1.1 EXTRAVERSION:${EXTRAVERSION}" - EXTRAVERSION="${EXTRAVERSION}-${PN/-*}${PR/r}" - elif [[ "${ETYPE}" = "sources" ]]; then - debug-print "1.2 EXTRAVERSION:${EXTRAVERSION}" - # For some sources we want to use the PV in the extra version - # This is because upstream releases with a completely different - # versioning scheme. - case ${PN/-*} in - wolk) K_USEPV=1;; - vserver) K_USEPV=1;; - esac - - [[ -z "${K_NOUSENAME}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*}" - [[ -n "${K_USEPV}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PV//_/-}" - [[ -n "${PR//r0}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PR}" - fi - debug-print "2 EXTRAVERSION:${EXTRAVERSION}" - - # The only messing around which should actually effect this is for KV_EXTRA - # since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else - # KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION - - if [[ -n ${KV_EXTRA} ]]; then - if [[ -n ${KV_MINOR} ]]; then - OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - else - OKV="${KV_MAJOR}.${KV_PATCH}" - fi - KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz" - fi - - # We need to set this using OKV, but we need to set it before we do any - # messing around with OKV based on RELEASETYPE - KV_FULL=${OKV}${EXTRAVERSION} - - # we will set this for backwards compatibility. - S=${WORKDIR}/linux-${KV_FULL} - KV=${KV_FULL} - - # -rc-git pulls can be achieved by specifying CKV - # for example: - # CKV="2.6.11_rc3_pre2" - # will pull: - # linux-2.6.10.tar.xz & patch-2.6.11-rc3.xz & patch-2.6.11-rc3-git2.xz - - if [[ ${KV_MAJOR}${KV_MINOR} -eq 26 ]]; then - - if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then - OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" - KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" - fi - - if [[ ${RELEASETYPE} == -git ]]; then - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz" - fi - - if [[ ${RELEASETYPE} == -rc-git ]]; then - OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz - ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz" - fi - else - if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then - if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then - OKV="2.6.39" - else - KV_PATCH_ARR=(${KV_PATCH//\./ }) - OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" - fi - KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" - fi - - if [[ ${RELEASETYPE} == -git ]]; then - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz" - fi - - if [[ ${RELEASETYPE} == -rc-git ]]; then - if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then - OKV="2.6.39" - else - KV_PATCH_ARR=(${KV_PATCH//\./ }) - OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" - fi - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz - ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz - ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz" - fi - - - fi - - - debug-print-kernel2-variables - - handle_genpatches -} - -# Note: duplicated in linux-info.eclass -kernel_is() { - # ALL of these should be set before we can safely continue this function. - # some of the sources have in the past had only one set. - local v n=0 - for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done - [[ $n -eq 1 ]] && detect_version - unset v n - - # Now we can continue - local operator test value - - case ${1#-} in - lt) operator="-lt"; shift;; - gt) operator="-gt"; shift;; - le) operator="-le"; shift;; - ge) operator="-ge"; shift;; - eq) operator="-eq"; shift;; - *) operator="-eq";; - esac - [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters" - - : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH )) - : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} )) - [ ${test} ${operator} ${value} ] -} - -kernel_is_2_4() { - kernel_is 2 4 -} - -kernel_is_2_6() { - kernel_is 2 6 || kernel_is 2 5 -} - -# Capture the sources type and set DEPENDs -if [[ ${ETYPE} == sources ]]; then - DEPEND="!build? ( sys-apps/sed - >=sys-devel/binutils-2.11.90.0.31 )" - RDEPEND="!build? ( >=sys-libs/ncurses-5.2 - sys-devel/make - dev-lang/perl - sys-devel/bc )" - PDEPEND="!build? ( virtual/dev-manager )" - - SLOT="${PVR}" - DESCRIPTION="Sources based on the Linux Kernel." - IUSE="symlink build" - - # Bug #266157, deblob for libre support - if [[ -z ${K_PREDEBLOBBED} ]] ; then - # Bug #359865, force a call to detect_version if needed - kernel_is ge 2 6 27 && \ - [[ -z "${K_DEBLOB_AVAILABLE}" ]] && \ - kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ - K_DEBLOB_AVAILABLE=1 - if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then - IUSE="${IUSE} deblob" - # Reflect that kernels contain firmware blobs unless otherwise - # stripped - LICENSE="${LICENSE} !deblob? ( freedist )" - - if [[ -n KV_MINOR ]]; then - DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - else - DEBLOB_PV="${KV_MAJOR}.${KV_PATCH}" - fi - - if [[ ${KV_MAJOR} -ge 3 ]]; then - DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}" - fi - - DEBLOB_A="deblob-${DEBLOB_PV}" - DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}" - DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/" - DEBLOB_URI_PATH="download/releases/LATEST-${DEBLOB_PV}.N" - if ! has "${EAPI:-0}" 0 1 ; then - DEBLOB_CHECK_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-check -> ${DEBLOB_CHECK_A}" - else - DEBLOB_CHECK_URI="mirror://gentoo/${DEBLOB_CHECK_A}" - fi - DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}" - HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}" - - DEPEND+=" deblob? ( =dev-lang/python-2* )" - KERNEL_URI="${KERNEL_URI} - deblob? ( - ${DEBLOB_URI} - ${DEBLOB_CHECK_URI} - )" - else - # We have no way to deblob older kernels, so just mark them as - # tainted with non-libre materials. - LICENSE="${LICENSE} freedist" - fi - fi - -elif [[ ${ETYPE} == headers ]]; then - DESCRIPTION="Linux system headers" - - # Since we should NOT honour KBUILD_OUTPUT in headers - # lets unset it here. - unset KBUILD_OUTPUT - - SLOT="0" -else - eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" - die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" -fi - -# Cross-compile support functions -#============================================================== -kernel_header_destdir() { - [[ ${CTARGET} == ${CHOST} ]] \ - && echo /usr/include \ - || echo /usr/${CTARGET}/usr/include -} - -cross_pre_c_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] -} - -env_setup_xmakeopts() { - # Kernel ARCH != portage ARCH - export KARCH=$(tc-arch-kernel) - - # When cross-compiling, we need to set the ARCH/CROSS_COMPILE - # variables properly or bad things happen ! - xmakeopts="ARCH=${KARCH}" - if [[ ${CTARGET} != ${CHOST} ]] && ! cross_pre_c_headers ; then - xmakeopts="${xmakeopts} CROSS_COMPILE=${CTARGET}-" - elif type -p ${CHOST}-ar > /dev/null ; then - xmakeopts="${xmakeopts} CROSS_COMPILE=${CHOST}-" - fi - export xmakeopts -} - -# Unpack functions -#============================================================== -unpack_2_4() { - # this file is required for other things to build properly, - # so we autogenerate it - make -s mrproper ${xmakeopts} || die "make mrproper failed" - make -s symlinks ${xmakeopts} || die "make symlinks failed" - make -s include/linux/version.h ${xmakeopts} || die "make include/linux/version.h failed" - echo ">>> version.h compiled successfully." -} - -unpack_2_6() { - # this file is required for other things to build properly, so we - # autogenerate it ... generate a .config to keep version.h build from - # spitting out an annoying warning - make -s mrproper ${xmakeopts} 2>/dev/null \ - || die "make mrproper failed" - - # quick fix for bug #132152 which triggers when it cannot include linux - # headers (ie, we have not installed it yet) - if ! make -s defconfig ${xmakeopts} &>/dev/null 2>&1 ; then - touch .config - eerror "make defconfig failed." - eerror "assuming you dont have any headers installed yet and continuing" - epause 5 - fi - - make -s include/linux/version.h ${xmakeopts} 2>/dev/null \ - || die "make include/linux/version.h failed" - rm -f .config >/dev/null -} - -universal_unpack() { - debug-print "Inside universal_unpack" - - local OKV_ARRAY - IFS="." read -r -a OKV_ARRAY <<<"${OKV}" - - cd "${WORKDIR}" - if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then - unpack linux-${KV_MAJOR}.${KV_MINOR}.tar.xz - else - unpack linux-${OKV}.tar.xz - fi - - if [[ -d "linux" ]]; then - debug-print "Moving linux to linux-${KV_FULL}" - mv linux linux-${KV_FULL} \ - || die "Unable to move source tree to ${KV_FULL}." - elif [[ "${OKV}" != "${KV_FULL}" ]]; then - if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]] && - [[ "${ETYPE}" = "sources" ]]; then - debug-print "moving linux-${KV_MAJOR}.${KV_MINOR} to linux-${KV_FULL} " - mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \ - || die "Unable to move source tree to ${KV_FULL}." - else - debug-print "moving linux-${OKV} to linux-${KV_FULL} " - mv linux-${OKV} linux-${KV_FULL} \ - || die "Unable to move source tree to ${KV_FULL}." - fi - elif [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then - mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \ - || die "Unable to move source tree to ${KV_FULL}." - fi - cd "${S}" - - # remove all backup files - find . -iname "*~" -exec rm {} \; 2> /dev/null - -} - -unpack_set_extraversion() { - cd "${S}" - sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile - cd "${OLDPWD}" -} - -# Should be done after patches have been applied -# Otherwise patches that modify the same area of Makefile will fail -unpack_fix_install_path() { - cd "${S}" - sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile -} - -# Compile Functions -#============================================================== -compile_headers() { - env_setup_xmakeopts - - # if we couldnt obtain HOSTCFLAGS from the Makefile, - # then set it to something sane - local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile) - HOSTCFLAGS=${HOSTCFLAGS:--Wall -Wstrict-prototypes -O2 -fomit-frame-pointer} - - if kernel_is 2 4; then - yes "" | make oldconfig ${xmakeopts} - echo ">>> make oldconfig complete" - make dep ${xmakeopts} - elif kernel_is 2 6; then - # 2.6.18 introduces headers_install which means we dont need any - # of this crap anymore :D - kernel_is ge 2 6 18 && return 0 - - # autoconf.h isnt generated unless it already exists. plus, we have - # no guarantee that any headers are installed on the system... - [[ -f ${ROOT}/usr/include/linux/autoconf.h ]] \ - || touch include/linux/autoconf.h - - # if K_DEFCONFIG isn't set, force to "defconfig" - # needed by mips - if [[ -z ${K_DEFCONFIG} ]]; then - if [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.16) ]]; then - case ${CTARGET} in - powerpc64*) K_DEFCONFIG="ppc64_defconfig";; - powerpc*) K_DEFCONFIG="pmac32_defconfig";; - *) K_DEFCONFIG="defconfig";; - esac - else - K_DEFCONFIG="defconfig" - fi - fi - - # if there arent any installed headers, then there also isnt an asm - # symlink in /usr/include/, and make defconfig will fail, so we have - # to force an include path with $S. - HOSTCFLAGS="${HOSTCFLAGS} -I${S}/include/" - ln -sf asm-${KARCH} "${S}"/include/asm - cross_pre_c_headers && return 0 - - make ${K_DEFCONFIG} HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "defconfig failed (${K_DEFCONFIG})" - if compile_headers_tweak_config ; then - yes "" | make oldconfig HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "2nd oldconfig failed" - fi - make prepare HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed" - make prepare-all HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed" - fi -} - -compile_headers_tweak_config() { - # some targets can be very very picky, so let's finesse the - # .config based upon any info we may have - case ${CTARGET} in - sh*) - sed -i '/CONFIG_CPU_SH/d' .config - echo "CONFIG_CPU_SH${CTARGET:2:1}=y" >> .config - return 0;; - esac - - # no changes, so lets do nothing - return 1 -} - -# install functions -#============================================================== -install_universal() { - # Fix silly permissions in tarball - cd "${WORKDIR}" - chown -R 0:0 * >& /dev/null - chmod -R a+r-w+X,u+w * - cd ${OLDPWD} -} - -install_headers() { - local ddir=$(kernel_header_destdir) - - # 2.6.18 introduces headers_install which means we dont need any - # of this crap anymore :D - if kernel_is ge 2 6 18 ; then - env_setup_xmakeopts - emake headers_install INSTALL_HDR_PATH="${D}"/${ddir}/.. ${xmakeopts} || die - - # let other packages install some of these headers - rm -rf "${D}"/${ddir}/sound #alsa-headers - rm -rf "${D}"/${ddir}/scsi #glibc/uclibc/etc... - return 0 - fi - - # Do not use "linux/*" as that can cause problems with very long - # $S values where the cmdline to cp is too long - pushd "${S}" >/dev/null - dodir ${ddir}/linux - cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die - rm -rf "${D}"/${ddir}/linux/modules - - dodir ${ddir}/asm - cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm - - if kernel_is 2 6 ; then - dodir ${ddir}/asm-generic - cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic - fi - - # clean up - find "${D}" -name '*.orig' -exec rm -f {} \; - - popd >/dev/null -} - -install_sources() { - local file - - cd "${S}" - dodir /usr/src - echo ">>> Copying sources ..." - - file="$(find ${WORKDIR} -iname "docs" -type d)" - if [[ -n ${file} ]]; then - for file in $(find ${file} -type f); do - echo "${file//*docs\/}" >> "${S}"/patches.txt - echo "===================================================" >> "${S}"/patches.txt - cat ${file} >> "${S}"/patches.txt - echo "===================================================" >> "${S}"/patches.txt - echo "" >> "${S}"/patches.txt - done - fi - - if [[ ! -f ${S}/patches.txt ]]; then - # patches.txt is empty so lets use our ChangeLog - [[ -f ${FILESDIR}/../ChangeLog ]] && \ - echo "Please check the ebuild ChangeLog for more details." \ - > "${S}"/patches.txt - fi - - mv ${WORKDIR}/linux* "${D}"/usr/src - - if [[ -n "${UNIPATCH_DOCS}" ]] ; then - for i in ${UNIPATCH_DOCS}; do - dodoc "${T}"/${i} - done - fi -} - -# pkg_preinst functions -#============================================================== -preinst_headers() { - local ddir=$(kernel_header_destdir) - [[ -L ${ddir}/linux ]] && rm ${ddir}/linux - [[ -L ${ddir}/asm ]] && rm ${ddir}/asm -} - -# pkg_postinst functions -#============================================================== -postinst_sources() { - local MAKELINK=0 - - # if we have USE=symlink, then force K_SYMLINK=1 - use symlink && K_SYMLINK=1 - - # if we're using a deblobbed kernel, it's not supported - [[ $K_DEBLOB_AVAILABLE == 1 ]] && \ - use deblob && \ - K_SECURITY_UNSUPPORTED=deblob - - # if we are to forcably symlink, delete it if it already exists first. - if [[ ${K_SYMLINK} > 0 ]]; then - [[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux - MAKELINK=1 - fi - - # if the link doesnt exist, lets create it - [[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1 - - if [[ ${MAKELINK} == 1 ]]; then - cd "${ROOT}"usr/src - ln -sf linux-${KV_FULL} linux - cd ${OLDPWD} - fi - - # Don't forget to make directory for sysfs - [[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys - - echo - elog "If you are upgrading from a previous kernel, you may be interested" - elog "in the following document:" - elog " - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml" - echo - - # if K_EXTRAEINFO is set then lets display it now - if [[ -n ${K_EXTRAEINFO} ]]; then - echo ${K_EXTRAEINFO} | fmt | - while read -s ELINE; do einfo "${ELINE}"; done - fi - - # if K_EXTRAELOG is set then lets display it now - if [[ -n ${K_EXTRAELOG} ]]; then - echo ${K_EXTRAELOG} | fmt | - while read -s ELINE; do elog "${ELINE}"; done - fi - - # if K_EXTRAEWARN is set then lets display it now - if [[ -n ${K_EXTRAEWARN} ]]; then - echo ${K_EXTRAEWARN} | fmt | - while read -s ELINE; do ewarn "${ELINE}"; done - fi - - # optionally display security unsupported message - # Start with why - if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then - ewarn "Deblobbed kernels are UNSUPPORTED by Gentoo Security." - elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then - ewarn "${PN} is UNSUPPORTED by Gentoo Security." - fi - # And now the general message. - if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then - ewarn "This means that it is likely to be vulnerable to recent security issues." - ewarn "For specific information on why this kernel is unsupported, please read:" - ewarn "http://www.gentoo.org/proj/en/security/kernel.xml" - fi - - # warn sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765) - KV_MAJOR=$(get_version_component_range 1 ${OKV}) - KV_MINOR=$(get_version_component_range 2 ${OKV}) - KV_PATCH=$(get_version_component_range 3 ${OKV}) - if [[ "$(tc-arch)" = "sparc" ]]; then - if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] - then - echo - elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" - elog "you now need to do" - elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-" - elog "instead of just" - elog " make" - elog "to compile the kernel. For more information please browse to" - elog "https://bugs.gentoo.org/show_bug.cgi?id=214765" - echo - fi - fi -} - -# pkg_setup functions -#============================================================== -setup_headers() { - [[ -z ${H_SUPPORTEDARCH} ]] && H_SUPPORTEDARCH=${PN/-*/} - for i in ${H_SUPPORTEDARCH}; do - [[ $(tc-arch) == "${i}" ]] && H_ACCEPT_ARCH="yes" - done - - if [[ ${H_ACCEPT_ARCH} != "yes" ]]; then - echo - eerror "This version of ${PN} does not support $(tc-arch)." - eerror "Please merge the appropriate sources, in most cases" - eerror "(but not all) this will be called $(tc-arch)-headers." - die "Package unsupported for $(tc-arch)" - fi -} - -# unipatch -#============================================================== -unipatch() { - local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE - local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG - - # set to a standard locale to ensure sorts are ordered properly. - myLC_ALL="${LC_ALL}" - myLANG="${LANG}" - LC_ALL="C" - LANG="" - - [ -z "${KPATCH_DIR}" ] && KPATCH_DIR="${WORKDIR}/patches/" - [ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR} - - # We're gonna need it when doing patches with a predefined patchlevel - eshopts_push -s extglob - - # This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers - # usage can be either via an env var or by params - # although due to the nature we pass this within this eclass - # it shall be by param only. - # -z "${UNIPATCH_LIST}" ] && UNIPATCH_LIST="${@}" - UNIPATCH_LIST="${@}" - - #unpack any passed tarballs - for i in ${UNIPATCH_LIST}; do - if echo ${i} | grep -qs -e "\.tar" -e "\.tbz" -e "\.tgz" ; then - if [ -n "${UNIPATCH_STRICTORDER}" ]; then - unset z - STRICT_COUNT=$((10#${STRICT_COUNT} + 1)) - for((y=0; y<$((6 - ${#STRICT_COUNT})); y++)); - do z="${z}0"; - done - PATCH_ORDER="${z}${STRICT_COUNT}" - - mkdir -p "${KPATCH_DIR}/${PATCH_ORDER}" - pushd "${KPATCH_DIR}/${PATCH_ORDER}" >/dev/null - unpack ${i##*/} - popd >/dev/null - else - pushd "${KPATCH_DIR}" >/dev/null - unpack ${i##*/} - popd >/dev/null - fi - - [[ ${i} == *:* ]] && echo ">>> Strict patch levels not currently supported for tarballed patchsets" - else - extention=${i/*./} - extention=${extention/:*/} - PIPE_CMD="" - case ${extention} in - xz) PIPE_CMD="xz -dc";; - lzma) PIPE_CMD="lzma -dc";; - bz2) PIPE_CMD="bzip2 -dc";; - patch) PIPE_CMD="cat";; - diff) PIPE_CMD="cat";; - gz|Z|z) PIPE_CMD="gzip -dc";; - ZIP|zip) PIPE_CMD="unzip -p";; - *) UNIPATCH_DROP="${UNIPATCH_DROP} ${i/:*/}";; - esac - - PATCH_LEVEL=${i/*([^:])?(:)} - i=${i/:*/} - x=${i/*\//} - x=${x/\.${extention}/} - - if [ -n "${PIPE_CMD}" ]; then - if [ ! -r "${i}" ]; then - echo - eerror "FATAL: unable to locate:" - eerror "${i}" - eerror "for read-only. The file either has incorrect permissions" - eerror "or does not exist." - die Unable to locate ${i} - fi - - if [ -n "${UNIPATCH_STRICTORDER}" ]; then - unset z - STRICT_COUNT=$((10#${STRICT_COUNT} + 1)) - for((y=0; y<$((6 - ${#STRICT_COUNT})); y++)); - do z="${z}0"; - done - PATCH_ORDER="${z}${STRICT_COUNT}" - - mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/ - $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed" - else - $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed" - fi - fi - fi - done - - #populate KPATCH_DIRS so we know where to look to remove the excludes - x=${KPATCH_DIR} - KPATCH_DIR="" - for i in $(find ${x} -type d | sort -n); do - KPATCH_DIR="${KPATCH_DIR} ${i}" - done - - # do not apply fbcondecor patch to sparc/sparc64 as it breaks boot - # bug #272676 - if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then - if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then - UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch" - echo - ewarn "fbcondecor currently prevents sparc/sparc64 from booting" - ewarn "for kernel versions >= 2.6.29. Removing fbcondecor patch." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=272676 for details" - echo - fi - fi - - #so now lets get rid of the patchno's we want to exclude - UNIPATCH_DROP="${UNIPATCH_EXCLUDE} ${UNIPATCH_DROP}" - for i in ${UNIPATCH_DROP}; do - ebegin "Excluding Patch #${i}" - for x in ${KPATCH_DIR}; do rm -f ${x}/${i}* 2>/dev/null; done - eend $? - done - - # and now, finally, we patch it :) - for x in ${KPATCH_DIR}; do - for i in $(find ${x} -maxdepth 1 -iname "*.patch*" -or -iname "*.diff*" | sort -n); do - STDERR_T="${T}/${i/*\//}" - STDERR_T="${STDERR_T/.patch*/.err}" - - [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/} - #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/} - - if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi - - while [ ${PATCH_DEPTH} -lt 5 ]; do - echo "Attempting Dry-run:" >> ${STDERR_T} - echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T} - echo "=======================================================" >> ${STDERR_T} - if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then - ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH})" - echo "Attempting patch:" > ${STDERR_T} - echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T} - echo "=======================================================" >> ${STDERR_T} - if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then - eend 0 - rm ${STDERR_T} - break - else - eend 1 - eerror "Failed to apply patch ${i/*\//}" - eerror "Please attach ${STDERR_T} to any bug you may post." - eshopts_pop - die "Failed to apply ${i/*\//} on patch depth ${PATCH_DEPTH}." - fi - else - PATCH_DEPTH=$((${PATCH_DEPTH} + 1)) - fi - done - if [ ${PATCH_DEPTH} -eq 5 ]; then - eerror "Failed to dry-run patch ${i/*\//}" - eerror "Please attach ${STDERR_T} to any bug you may post." - eshopts_pop - die "Unable to dry-run patch on any patch depth lower than 5." - fi - done - done - - # When genpatches is used, we want to install 0000_README which documents - # the patches that were used; such that the user can see them, bug #301478. - if [[ ! -z ${K_WANT_GENPATCHES} ]] ; then - UNIPATCH_DOCS="${UNIPATCH_DOCS} 0000_README" - fi - - # When files listed in UNIPATCH_DOCS are found in KPATCH_DIR's, we copy it - # to the temporary directory and remember them in UNIPATCH_DOCS to install - # them during the install phase. - local tmp - for x in ${KPATCH_DIR}; do - for i in ${UNIPATCH_DOCS}; do - if [[ -f "${x}/${i}" ]] ; then - tmp="${tmp} ${i}" - cp -f "${x}/${i}" "${T}"/ - fi - done - done - UNIPATCH_DOCS="${tmp}" - - # clean up KPATCH_DIR's - fixes bug #53610 - for x in ${KPATCH_DIR}; do rm -Rf ${x}; done - - LC_ALL="${myLC_ALL}" - LANG="${myLANG}" - eshopts_pop -} - -# getfilevar accepts 2 vars as follows: -# getfilevar -# pulled from linux-info - -getfilevar() { - local workingdir basefname basedname xarch=$(tc-arch-kernel) - - if [[ -z ${1} ]] && [[ ! -f ${2} ]]; then - echo -e "\n" - eerror "getfilevar requires 2 variables, with the second a valid file." - eerror " getfilevar " - else - workingdir=${PWD} - basefname=$(basename ${2}) - basedname=$(dirname ${2}) - unset ARCH - - cd ${basedname} - echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \ - make ${BUILD_FIXES} -s -f - e 2>/dev/null - cd ${workingdir} - - ARCH=${xarch} - fi -} - -detect_arch() { - # This function sets ARCH_URI and ARCH_PATCH - # with the neccessary info for the arch sepecific compatibility - # patchsets. - - local ALL_ARCH LOOP_ARCH COMPAT_URI i - - # COMPAT_URI is the contents of ${ARCH}_URI - # ARCH_URI is the URI for all the ${ARCH}_URI patches - # ARCH_PATCH is ARCH_URI broken into files for UNIPATCH - - ARCH_URI="" - ARCH_PATCH="" - ALL_ARCH="ALPHA AMD64 ARM HPPA IA64 M68K MIPS PPC PPC64 S390 SH SPARC X86" - - for LOOP_ARCH in ${ALL_ARCH}; do - COMPAT_URI="${LOOP_ARCH}_URI" - COMPAT_URI="${!COMPAT_URI}" - - [[ -n ${COMPAT_URI} ]] && \ - ARCH_URI="${ARCH_URI} $(echo ${LOOP_ARCH} | tr '[:upper:]' '[:lower:]')? ( ${COMPAT_URI} )" - - if [[ ${LOOP_ARCH} == "$(echo $(tc-arch-kernel) | tr '[:lower:]' '[:upper:]')" ]]; then - for i in ${COMPAT_URI}; do - ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}" - done - fi - done -} - -headers___fix() { - # Voodoo to partially fix broken upstream headers. - # note: do not put inline/asm/volatile together (breaks "inline asm volatile") - sed -i \ - -e '/^\#define.*_TYPES_H/{:loop n; bloop}' \ - -e 's:\<\([us]\(8\|16\|32\|64\)\)\>:__\1:g' \ - -e "s/\([[:space:]]\)inline\([[:space:](]\)/\1__inline__\2/g" \ - -e "s/\([[:space:]]\)asm\([[:space:](]\)/\1__asm__\2/g" \ - -e "s/\([[:space:]]\)volatile\([[:space:](]\)/\1__volatile__\2/g" \ - "$@" -} - -# common functions -#============================================================== -kernel-2a_src_unpack() { - universal_unpack - debug-print "Doing unipatch" - - [[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \ - unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" - - debug-print "Doing premake" - - # allow ebuilds to massage the source tree after patching but before - # we run misc `make` functions below - [[ $(type -t kernel-2a_hook_premake) == "function" ]] && kernel-2a_hook_premake - - debug-print "Doing epatch_user" - epatch_user - - debug-print "Doing unpack_set_extraversion" - - [[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion - unpack_fix_install_path - - # Setup xmakeopts and cd into sourcetree. - env_setup_xmakeopts - cd "${S}" - - # We dont need a version.h for anything other than headers - # at least, I should hope we dont. If this causes problems - # take out the if/fi block and inform me please. - # unpack_2_6 should now be 2.6.17 safe anyways - if [[ ${ETYPE} == headers ]]; then - kernel_is 2 4 && unpack_2_4 - kernel_is 2 6 && unpack_2_6 - fi - - if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then - cp "${DISTDIR}/${DEBLOB_A}" "${T}" || die "cp ${DEBLOB_A} failed" - cp "${DISTDIR}/${DEBLOB_CHECK_A}" "${T}/deblob-check" || die "cp ${DEBLOB_CHECK_A} failed" - chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob scripts failed" - fi - - # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox - # only do this for kernel < 2.6.27 since this file does not exist in later - # kernels - if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] - then - sed -i \ - -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ - "${S}"/arch/ppc/Makefile - else - sed -i \ - -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ - "${S}"/arch/powerpc/Makefile - fi -} - -kernel-2a_src_compile() { - cd "${S}" - [[ ${ETYPE} == headers ]] && compile_headers - - if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then - echo ">>> Running deblob script ..." - EPYTHON="python2" sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" - fi -} - -# if you leave it to the default src_test, it will run make to -# find whether test/check targets are present; since "make test" -# actually produces a few support files, they are installed even -# though the package is binchecks-restricted. -# -# Avoid this altogether by making the function moot. -kernel-2a_src_test() { :; } - -kernel-2a_pkg_preinst() { - [[ ${ETYPE} == headers ]] && preinst_headers -} - -kernel-2a_src_install() { - install_universal - [[ ${ETYPE} == headers ]] && install_headers - [[ ${ETYPE} == sources ]] && install_sources -} - -kernel-2a_pkg_postinst() { - [[ ${ETYPE} == sources ]] && postinst_sources -} - -kernel-2a_pkg_setup() { - if kernel_is 2 4; then - if [[ $(gcc-major-version) -ge 4 ]] ; then - echo - ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!" - ewarn "Either switch to another gcc-version (via gcc-config) or use a" - ewarn "newer kernel that supports gcc-4." - echo - ewarn "Also be aware that bugreports about gcc-4 not working" - ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" - echo - epause 10 - fi - fi - - ABI="${KERNEL_ABI}" - [[ ${ETYPE} == headers ]] && setup_headers - [[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..." -} - -kernel-2a_pkg_postrm() { - # This warning only makes sense for kernel sources. - [[ ${ETYPE} == headers ]] && return 0 - - # If there isn't anything left behind, then don't complain. - [[ -e ${ROOT}usr/src/linux-${KV_FULL} ]] || return 0 - echo - ewarn "Note: Even though you have successfully unmerged " - ewarn "your kernel package, directories in kernel source location: " - ewarn "${ROOT}usr/src/linux-${KV_FULL}" - ewarn "with modified files will remain behind. By design, package managers" - ewarn "will not remove these modified files and the directories they reside in." - echo -} diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass deleted file mode 100644 index b4dd39e..0000000 --- a/eclass/nsplugins.eclass +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# @DEAD -# @ECLASS: nsplugins.eclass -# @MAINTAINER: -# Mozilla Team -# @AUTHOR: -# Original Author: Martin Schlemmer -# @BLURB: reusable functions for netscape/moz plugin sharing -# @DESCRIPTION: -# Reusable functions that promote sharing of netscape/moz plugins, also provides -# share_plugins_dir function for mozilla applications. - -inherit eutils multilib versionator mozextension - -PLUGINS_DIR="nsbrowser/plugins" - -# This function move the plugin dir in src_install() to -# ${D}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be -# the full path (without $D) to old plugin dir. -src_mv_plugins() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - - # Move plugins dir. We use keepdir so that it might not be unmerged - # by mistake ... - keepdir /usr/$(get_libdir)/${PLUGINS_DIR} - cp -a "${ED}"/$1/* "${ED}"/usr/$(get_libdir)/${PLUGINS_DIR} - rm -rf "${ED}"/$1 - dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1 -} - -# This function move plugins in pkg_preinst() in old dir to -# ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be -# the full path (without $ROOT) to old plugin dir. -pkg_mv_plugins() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${ROOT}" - - # Move old plugins dir - if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ] - then - mkdir -p "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} - cp -a "${EROOT}"/$1/* "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} - rm -rf "${EROOT}"/$1 - fi -} - -# This function installs a plugin with dosym to PLUGINS_DIR. -# First argument should be the plugin file. -inst_plugin() { - if [[ -z "${1}" ]]; then - eerror "The plugin file \"${1}\" does not exist." - die "No such file or directory." - fi - - dodir /usr/$(get_libdir)/${PLUGINS_DIR} - dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}/$(basename ${1}) -} - -# This function ensures we use proper plugin path for Gentoo. -# This should only be used by mozilla packages. -# ${MOZILLA_FIVE_HOME} must be defined in src_install to support -share_plugins_dir() { - if [[ ${PN} == seamonkey ]] ; then - rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \ - || die "failed to remove existing plugins dir" - fi - - if [[ ${PN} == *-bin ]] ; then - PLUGIN_BASE_PATH="/usr/$(get_libdir)" - else - PLUGIN_BASE_PATH=".." - fi - - if $(mozversion_extension_location) ; then - dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/browser/plugins" - else - dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" - fi -} diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index e061220..f531828 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -32,6 +32,7 @@ fi if [[ ! ${_PYTHON_UTILS_R1} ]]; then [[ ${EAPI} == 5 ]] && inherit eutils multilib +[[ ${EAPI} == [67] ]] && inherit eapi8-dosym inherit toolchain-funcs # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS @@ -1279,6 +1280,16 @@ build_sphinx() { HTML_DOCS+=( "${dir}/_build/html/." ) } +# @FUNCTION: _python_check_EPYTHON +# @INTERNAL +# @DESCRIPTION: +# Check if EPYTHON is set, die if not. +_python_check_EPYTHON() { + if [[ -z ${EPYTHON} ]]; then + die "EPYTHON unset, invalid call context" + fi +} + # -- python.eclass functions -- _python_check_dead_variables() { diff --git a/eclass/xpython-utils-r1.eclass b/eclass/xpython-utils-r1.eclass index e061220..f531828 100644 --- a/eclass/xpython-utils-r1.eclass +++ b/eclass/xpython-utils-r1.eclass @@ -32,6 +32,7 @@ fi if [[ ! ${_PYTHON_UTILS_R1} ]]; then [[ ${EAPI} == 5 ]] && inherit eutils multilib +[[ ${EAPI} == [67] ]] && inherit eapi8-dosym inherit toolchain-funcs # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS @@ -1279,6 +1280,16 @@ build_sphinx() { HTML_DOCS+=( "${dir}/_build/html/." ) } +# @FUNCTION: _python_check_EPYTHON +# @INTERNAL +# @DESCRIPTION: +# Check if EPYTHON is set, die if not. +_python_check_EPYTHON() { + if [[ -z ${EPYTHON} ]]; then + die "EPYTHON unset, invalid call context" + fi +} + # -- python.eclass functions -- _python_check_dead_variables() { diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest deleted file mode 100644 index e1d7920..0000000 --- a/mail-filter/libspf2/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX libspf2-1.2.10-varargs.patch 1385 BLAKE2B 0fcf2c91cc8b01f8d20ec1d7e1896f59c01115de45b505c7cf81e68d0850456a08b87c1e2f59a5e37824298bee969650f9dd391ec25addf5186478e07a07d182 SHA512 886a347c6526c4e81bc035d7e0069f72aaa5ad2103f0e035e46dbd7e1e5f328ebbbc81842fd32397d195a5b18cf841784455a4142291276c1be8942a1c753b4d -DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130 -EBUILD libspf2-1.2.10.ebuild 1235 BLAKE2B adcc1f456a4342e364c39e603365906bc48d63a7759573e3f7597832746e82ca84da664fa0e74ecc678affd968de39ac772a41ea8f0fc10da7908dc0a534081f SHA512 1aafa7786af9e8b74a0d241a2b0f2a1faaf7f3bb2fdbe97904c08f12e715c427ab62fa55fc3be6a0c92f313a57ad7ef1984270ca32e3d2e14807c3f09961d035 -MISC metadata.xml 662 BLAKE2B 93065bf12cb61aa27cb99767141dfef8b60a98b7c69da698ba0080bd5f25bce4df3c9a4284bfdf1d94a3be808876c20cdcb39bbd1536a3231ced1a86a0f49afe SHA512 255a23e45243c57a00be6d18c487a0574c92b16110d31352f83529bbb7fa5386354a4e5b7f5a3575596fa7cb701ddfb4408077393576e60537b6b70c9bda89a3 diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-varargs.patch b/mail-filter/libspf2/files/libspf2-1.2.10-varargs.patch deleted file mode 100644 index 0230856..0000000 --- a/mail-filter/libspf2/files/libspf2-1.2.10-varargs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5852828582f556e73751076ad092f72acf7fc8b6 Mon Sep 17 00:00:00 2001 -From: Shevek -Date: Tue, 23 Sep 2014 01:03:00 -0700 -Subject: [PATCH] Fix #4: Use gcc trick for variadic macros. Does this break - anyone else? - ---- - src/include/spf_log.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/include/spf_log.h b/src/include/spf_log.h -index 0d2adeb..9b09714 100644 ---- a/src/include/spf_log.h -+++ b/src/include/spf_log.h -@@ -60,10 +60,10 @@ void SPF_debugv( const char *file, int line, const char *format, va_list ap ) __ - - #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L - --#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ ) --#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ ) --#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ ) --#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ ) -+#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, ##__VA_ARGS__ ) -+#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, ##__VA_ARGS__ ) -+#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, ##__VA_ARGS__ ) -+#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, ##__VA_ARGS__ ) - - #elif defined( __GNUC__ ) - diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild deleted file mode 100644 index d7b1626..0000000 --- a/mail-filter/libspf2/libspf2-1.2.10.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools - -DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair" -HOMEPAGE="http://www.libspf2.org" -SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz" - -LICENSE="|| ( LGPL-2.1 BSD-2 )" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="static static-libs" - -DEPEND="" -RDEPEND="!dev-perl/Mail-SPF-Query" -REQUIRED_USE="static? ( static-libs )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.2.10-varargs.patch" - - if ! use static; then - sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ - -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ - -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ - -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \ - || die - #eautoreconf - fi - - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README TODO INSTALL - - use static-libs || rm -f "${D}"/usr/lib*/libspf2.la -} diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml deleted file mode 100644 index 47e3c49..0000000 --- a/mail-filter/libspf2/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - net-mail@gentoo.org - Net-Mail - -libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair. libspf2 is a library which allows email systems such as Sendmail, Postfix, Exim, Zmailer and MS Exchange to check SPF records and make sure that the email is authorized by the domain name that it is coming from. This prevents email forgery, commonly used by spammers, scammers and email viruses/worms. - diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest deleted file mode 100644 index a962682..0000000 --- a/mail-filter/razor/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX razor-2.85-cosmetic-pv-fix.patch 616 BLAKE2B 58def0277c1142b664f65ae9f6e7f312f51ae5a926379616818fda3f0c450b7d157b12fb1777603ac70731d55ca9059708c3c70100c930bdb0371ef60d5b23aa SHA512 c7e7985e779185d704d88ff4c39d106df46ba20daee92c4a4410e8a1af7d4c31bdca0646018fb5d1f7d58e106036c8442a0fa2635b39a5e1df2a259f79eced91 -AUX razor-2.85-fix-makefile.patch 442 BLAKE2B 70158f913fff2313d08ef8067758a38466f690df2756b0e59d6f615a56e3898d30966d0e3055841365d1659a23e0cc36d9b7b71eb64992cea66f349404a85559 SHA512 5e0f9f9a4e59d0e0f243dd70dda14c780abb8b3451dfc35c36dfb3c79ab8911b4657d871c25017bab8d18bbd20d204f35be3beff9b7cd3caf74dbf2cff025811 -AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289 -DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db -EBUILD razor-2.85-r2.ebuild 2757 BLAKE2B f112237a2c381f1e1f740a2e30792fce5fa0c2dc1a316a8073f208460b33849cd5ffc858d32db357da6c506a5d12949bcefdc6524b29b34c5bbfd1d89b72083e SHA512 cc5fa4467597de39bc2c9f626eb6297284e144f06ff9cee4fde551f918bf9231f2c63e54fd1944bf0388d0c5083f52d43ba35a5ee56b1fb5c7d2d011db4c81e3 -MISC metadata.xml 705 BLAKE2B d0672ed0f1b55a34b285b706ed221673caf3bdba562c4f981f0e9a711f15a55213058568ff853e0469578bf569c8ae3a8095a27f3791ec3b015482d4ca570d03 SHA512 7634caefc54a09f7c83ae77103110e4f48641b1d6f1a091951a9e969c934303bdb4227120eec35cf46c1000f414782436c7eb8248f59b8bd4dcd4dbcce1047b7 diff --git a/mail-filter/razor/files/razor-2.85-cosmetic-pv-fix.patch b/mail-filter/razor/files/razor-2.85-cosmetic-pv-fix.patch deleted file mode 100644 index c391d48..0000000 --- a/mail-filter/razor/files/razor-2.85-cosmetic-pv-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/lib/Razor2/Client/Version.pm 2007-05-10 22:32:10.000000000 +0200 -+++ b/lib/Razor2/Client/Version.pm 2010-03-25 11:11:36.911409707 +0100 -@@ -14,7 +14,7 @@ - - $PROTOCOL = 3; - --$VERSION = '2.84'; -+$VERSION = '2.85'; - - 1; - ---- a/META.yml 2007-05-23 20:29:34.000000000 +0200 -+++ b/META.yml 2010-03-25 11:11:43.691408628 +0100 -@@ -1,7 +1,7 @@ - # http://module-build.sourceforge.net/META-spec.html - #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# - name: razor-agents --version: 2.84 -+version: 2.85 - version_from: lib/Razor2/Client/Version.pm - installdirs: site - requires: diff --git a/mail-filter/razor/files/razor-2.85-fix-makefile.patch b/mail-filter/razor/files/razor-2.85-fix-makefile.patch deleted file mode 100644 index d6d1e42..0000000 --- a/mail-filter/razor/files/razor-2.85-fix-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.PL.orig 2007-05-09 00:47:53.000000000 +0200 -+++ Makefile.PL 2017-04-25 19:38:38.082079219 +0200 -@@ -140,9 +140,9 @@ - my $inherited = $self->SUPER::install(@_); - - my $man5 = q{ \\ -- $(INST_MAN5DIR) $(INSTALLMAN5DIR)}; -+ "$(INST_MAN5DIR)" "$(INSTALLMAN5DIR)"}; - -- $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm; -+ $inherited =~ s/("\$\((?:DEST)?INSTALL\w*MAN1DIR\)")/$1$man5/gm; - - return $inherited; - } diff --git a/mail-filter/razor/files/razor-2.85-use-sha-not-sha1.patch b/mail-filter/razor/files/razor-2.85-use-sha-not-sha1.patch deleted file mode 100644 index 8e90ce2..0000000 --- a/mail-filter/razor/files/razor-2.85-use-sha-not-sha1.patch +++ /dev/null @@ -1,119 +0,0 @@ -Patch-URL: http://cvs.fedoraproject.org/viewvc/devel/perl-Razor-Agent/razor-agents-2.85-use-sha-not-sha1.patch?view=log - -diff -urN razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm razor-agents-2.85/lib/Razor2/Client/Engine.pm ---- razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm 2005-06-13 19:42:25.000000000 -0400 -+++ razor-agents-2.85/lib/Razor2/Client/Engine.pm 2009-11-01 13:45:08.125369192 -0500 -@@ -1,7 +1,6 @@ - package Razor2::Client::Engine; - - use strict; --use Digest::SHA1 qw(sha1_hex); - use Data::Dumper; - use Razor2::Signature::Ephemeral; - use Razor2::Engine::VR8; -diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm ---- razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm 2003-03-03 18:09:50.000000000 -0500 -+++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm 2009-11-01 13:45:08.125369192 -0500 -@@ -2,9 +2,13 @@ - - package Razor2::Signature::Ephemeral; - use strict; --use Digest::SHA1; - use Data::Dumper; - -+BEGIN { -+ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } -+ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -+} -+ - sub new { - - my ($class, %args) = @_; -@@ -86,16 +90,12 @@ - } - - my $digest; -- my $ctx = Digest::SHA1->new; - - if ($seclength > 128) { -- $ctx->add($section1); -- $ctx->add($section2); -- $digest = $ctx->hexdigest; -+ $digest = sha1_hex($section1, $section2); - } else { - debug("Sections too small... reverting back to orginal content."); -- $ctx->add($content); -- $digest = $ctx->hexdigest; -+ $digest = sha1_hex($content); - } - - debug("Computed e-hash is $digest"); -diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm ---- razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm 2007-05-08 18:22:36.000000000 -0400 -+++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm 2009-11-01 13:45:08.124368017 -0500 -@@ -7,7 +7,10 @@ - - package Razor2::Signature::Whiplash; - --use Digest::SHA1; -+BEGIN { -+ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } -+ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -+} - - sub new { - -@@ -683,13 +686,8 @@ - # the value of length to the nearest multiple of ``length_error''. - # Take the first 20 hex chars from SHA1 and call it the signature. - -- my $sha1 = Digest::SHA1->new(); -- -- $sha1->add($host); -- $sig = substr $sha1->hexdigest, 0, 12; -- -- $sha1->add($corrected_length); -- $sig .= substr $sha1->hexdigest, 0, 4; -+ $sig = substr sha1_hex($host), 0, 12; -+ $sig .= substr sha1_hex($corrected_length), 0, 4; - - push @sigs, $sig; - $sig_meta{$sig} = [$host, $corrected_length]; -diff -urN razor-agents-2.85.orig/lib/Razor2/String.pm razor-agents-2.85/lib/Razor2/String.pm ---- razor-agents-2.85.orig/lib/Razor2/String.pm 2005-06-13 17:09:59.000000000 -0400 -+++ razor-agents-2.85/lib/Razor2/String.pm 2009-11-01 13:45:08.123368518 -0500 -@@ -1,11 +1,15 @@ - # $Id$ - package Razor2::String; - --use Digest::SHA1 qw(sha1_hex); - use URI::Escape; - use Razor2::Preproc::enBase64; - use Data::Dumper; - -+BEGIN { -+ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } -+ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -+} -+ - #use MIME::Parser; - - require Exporter; -@@ -69,15 +73,8 @@ - return unless $text && $iv1 && $iv2; - die "no ref's allowed" if ref($text); - -- my $ctx = Digest::SHA1->new; -- $ctx->add($iv2); -- $ctx->add($text); -- my $digest = $ctx->hexdigest; -- -- $ctx = Digest::SHA1->new; -- $ctx->add($iv1); -- $ctx->add($digest); -- $digest = $ctx->hexdigest; -+ my $digest = sha1_hex($iv2, $text); -+ $digest = sha1_hex($iv1, $digest); - - return (hextobase64($digest), $digest); - } diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml deleted file mode 100644 index db02698..0000000 --- a/mail-filter/razor/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - proxy-maint@gentoo.org - Proxy Maintainers - - - net-mail@gentoo.org - Net-Mail - - - razor-admin@cloudmark.com - - A contact designated by upstream developers. This email address - should always be added to CC list of any Razor bug that needs - upstream care. - - - - razor - - diff --git a/mail-filter/razor/razor-2.85-r2.ebuild b/mail-filter/razor/razor-2.85-r2.ebuild deleted file mode 100644 index 3d670a3..0000000 --- a/mail-filter/razor/razor-2.85-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module - -MY_PN="razor-agents" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Vipul's Razor is a distributed, collaborative spam detection and filtering network" -HOMEPAGE="http://razor.sourceforge.net/" -SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -# This package warrants IUSE doc -IUSE="" - -DEPEND="" - -RDEPEND="dev-perl/Net-DNS - virtual/perl-Net-Ping - virtual/perl-Time-HiRes - || ( virtual/perl-Digest-SHA dev-perl/Digest-SHA1 ) - dev-perl/URI - dev-perl/Digest-Nilsimsa" - -PATCHES=( - "${FILESDIR}/${PN}-2.85-use-sha-not-sha1.patch" - "${FILESDIR}/${PN}-2.85-cosmetic-pv-fix.patch" - "${FILESDIR}/${PN}-2.85-fix-makefile.patch" - ) - -S=${WORKDIR}/${MY_P} -# Install docs/ content -mydoc="docs/*" -SRC_TEST="do parallel" - -pkg_postinst() { - elog - elog "Run 'razor-admin -create' to create a default config file in your" - elog "home directory under /home/user/.razor. (Remember to change user to" - elog "your username from root before running razor-admin)" - elog - elog "Razor v2 requires reporters to be registered so their reputations can" - elog "be computed over time and they can participate in the revocation" - elog "mechanism. Registration is done with razor-admin -register. It has to be" - elog "manually invoked in either of the following ways:" - elog - elog "To register user foo with 's1kr3t' as password: " - elog - elog "razor-admin -register -user=foo -pass=s1kr3t" - elog - elog "To register with an email address and have the password assigned:" - elog - elog "razor-admin -register -user=foo@bar.com " - elog - elog "To have both (random) username and password assgined: " - elog - elog "razor-admin -register " - elog - elog "razor-admin -register negotiates a registration with the Nomination Server" - elog "and writes the identity information in" - elog "/home/user/.razor/identity-username, or /etc/razor/identity-username" - elog "when invoked as root." - elog - elog "You can edit razor-agent.conf to change the defaults. Config options" - elog "and their values are defined in the razor-agent.conf(5) manpage." - elog - elog "The next step is to integrate razor-check, razor-report and" - elog "razor-revoke in your mail system. If you are running Razor v1, the" - elog "change will be transparent, new versions of razor agents will overwrite" - elog "the old ones. You would still need to plugin razor-revoke in your MUA," - elog "since it's a new addition in Razor v2. If you are not running Razor v1," - elog "refer to manpages of razor-check(1), razor-report(1), and" - elog "razor-revoke(1) for integration instructions." - elog -} diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest deleted file mode 100644 index b6c0f27..0000000 --- a/mail-mta/exim/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -AUX auth_conf.sub 790 BLAKE2B 28ad6e3b494396c0bd42e7ac13de9e8e3cbd553f3e78e787925e0c08b6896e479da495b94b511e739cbe31fc3ab3e6948373b566db5c9aeb3cd46cb52109ba31 SHA512 c0799a44e0fabdd4eb33c9c4a009c7abed80d5b2ab773206b11d644e54bb79004c5741fc510df77fe9856bdff979a14f1cf9a58da19fb00aaae05c623da287b3 -AUX exim-4.14-tail.patch 446 BLAKE2B 62e46f052c6d958246570c40ed67819f67c4a4ee74fbfe3c82c6f8494ef98ab65089845dd89ffc01516a0c861d9003ade5e4d67476cb34185d27b99cf233dd86 SHA512 a0365b15f0a48076f9660ebc424d48f68995ac21bbf77f407bdca5103ca65758d7f2241d0151eb5c78476557e240b24a95c23d3b12cfffc1b34ab6f89f2c2110 -AUX exim-4.20-maildir.patch 478 BLAKE2B 60feb354143a35631c3a71e46410e069d67cb7eab6643e6b2d4f4cfc15b497b96bb8f69a02ec67c3a6294f4d3c1da9e0787ca996f140713a19ecbcacc8ce0d4d SHA512 2c6f68e3c162a51e62ce6e391db8e79733f11bba20cc8778737650158203b88f9a77b7bbbd2a32b2cf8ae50f039b794fb0996f198acec6a50b94cad6a111f432 -AUX exim-4.69-r1.27021.patch 1447 BLAKE2B d1f40f68b056ae49cd78408d3dc54a1f4fb1584fec003c68645c8a7245499ef96c1bc3af8aac57d31ee10cb0d4ff2808a50bf35bb36f17df929b2c24abed90e2 SHA512 45a5b833c698da4690485716c7c45d762a9194d5ae41514028bbad548bbd44373cf7a3a3c6a1c4f635f3f50d1695ac7ead098bf8be15cd1f691c7cc6c7f8d715 -AUX exim-4.74-localscan_dlopen.patch 9280 BLAKE2B 11e1e9bd4700ba4d897cd585b751cfecbc3a9f2058961ed2ef876e42ff43d98357c35ced65e1866927e11a3d4ae2de5012456aab17f1a66ed20d10ff4054ece5 SHA512 bfd35b8fcc7b8bd50a28b2bb7865d358ed1af3978b057da1c83a0be38ba30a737d983b6b5cf829559ba8c490709d28bdb7d679eb825fe7e24798ec223bedc94e -AUX exim-4.74-radius-db-ENV-clash.patch 667 BLAKE2B 3cc03dd925333774c08484efbb5daadcebc819cc49283205960146f176d225c8952dacb891e1a1be13046bb68e6d6571a732dbbb7d78c6b1758d93f256e41509 SHA512 040bbdb2259df882569a428b7fef03f89c3685428654ac29e93360a4791bdabe66e52d33d14f0822461fac119295bd31aad5998f63d59d4af057bd26b310a568 -AUX exim-4.76-crosscompile.patch 462 BLAKE2B de78322f93760cef0d5a768b8be6c723f00d5c7557da6189ffa6ee34215c41ebe8896a2457b2e6a704d05a1730eab09c8cc73e3ba3140954f9ac32423210b612 SHA512 d4fd4417c1ce727f139999c399795312cdbbb9735d0793d68f8e3150240bc53b31277cb26f9946ba549b34c661fc0a61147d376bda09aa6763cab55d80d62343 -AUX exim-4.80-spool-mail-group.patch 946 BLAKE2B a3b6783b77823c5a8373623d16b85e2ba209b419b6724f307c46bf961bc5195690453208cdd40e45bc36e5a070892414c7737a97fa04e653e78050c153c59079 SHA512 24f30e9a9d90dc0f1fe8b3db26f8bc2649182b4e78110dc28a9c0f3a3feb7589f923144a4f1c54a1c46ff8cfe40826a1f2212787753be752f4d15a72d54a143b -AUX exim-4.82-makefile-freebsd.patch 1252 BLAKE2B 29c58b487850e28e0b2dfd5bbaa7e8ac341ebc00093a46a9d6b44c8d1c508629f78f646ccd3d022b2acee20d0572320f79acc21c519727f007e11e08623f4fec SHA512 fb440ad3e46b90d4c2e4826841944f4006390ccebee08154a39e46f6854be15edd7d0b028333b41451a0511f886ad3a30cb4b86e7ba8be99f12616a137f09d56 -AUX exim-4.89-as-needed-ldflags.patch 6048 BLAKE2B 229dbc384c64a30f620c2965b030f6e6773efca5390ccd67a6a69b5565b0d2d536f0385d8095f92e43e1bc45ab43822efd10cb8aafe2d3cee7d21c0b330e08d1 SHA512 a0ac891c2708afdf8be339a15e6c74d27a19ac87ab63e97de71b5b5d4fab63b898018f7f0ad1dc2e22a86d71c05c1a1b250d598d7622e6172f187ac36e5c3adf -AUX exim-4.92-fix-eval-expansion-32bit.patch 1792 BLAKE2B 81ac3cc505e62c95624b8f55771d7cdce39c882cbcdd553e9cd6263417f31fe7a800dec4386cc4534609fa9b20fc493d2ae6393c8de0d09dd3b3056f3b7da501 SHA512 108e782f1483dcb2d1a34ba226d1829da78fbfb18eddd68def8e693091cf05c8e448c1bcd197fe893dc51996c434f8d9168c131e5ca67125e6362491c5aeeb77 -AUX exim-4.92-localscan_dlopen.patch 9483 BLAKE2B 8fe480bbdccfa7388428fcb9aad876bcdcfc33220a529aebfca64e90c62f5a3b5ccf3477586349204f3c0be9ee3bb4d753e18cc24e759f26cf1a427d4f3e77da SHA512 7226ae2ef3d29537241f8c392dcc7522978861f8ad32ca280ec2da2f465f6dad0561ea3ad6a7606f8f6b2e7328704d464c892cd2ddaf0e132bc51f29f8003f4c -AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d -AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f -AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998 -AUX exim.logrotate 116 BLAKE2B c3689e95e31ccaaaca70e43ff8dbe3e69105da2266e701b57673fa90ee1cdf8c55be0fa2010ad9c10b2fba5443d6303584411bfe56198695995b5491efcfd8de SHA512 24bb8dcfadb1204c2ab0316d57de287b5092754731949390cfb3c88fa6827d45acfe1048cf9e26f615ca0449e8d780d0c98ea55ed61be9d1558755d3e53b9ec8 -AUX exim.rc10 1135 BLAKE2B abc7247ee8171069f30f954d9e4275fa85f09f5488a372f9c4f7fd6cf16247dce6bd306d0a8631185cd1afb92ca8919301bf5f21aa3fcac5929a715b9abec510 SHA512 5c7cee6139145983c62df8f5ef6c401d34d2eb7eae3146c28045129ba40868ca4d3d10d4b7056887cf4d4d8a83271592f7fa0a527663f727fa8694b621eb5624 -AUX exim.service 229 BLAKE2B 6d6396ef98b8e7c4fcfa28e24223bd58393387abedfb960284dfd1a297d1612deea6b77e2affeca8c5ff6f7db3eb32717893ed0dc1eaf3525e6969520e8589a3 SHA512 a071e9fb74b5fc2fdf0c73ad64ddfbc3954d8f7095d6a363dacf8c75d72a479fbf6821822ec5c8f3846d7687342e1bd447b97f91ca7b0582e5c98008aac30cca -AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa857d0d32285abf6db23c3d717992c43443ab4bcd97a19ec3811f182200a2d99a48ced6cfb6bc SHA512 db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae -AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a -DIST exim-4.92.tar.xz 1767136 BLAKE2B 6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca SHA512 62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31 -DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547 SHA512 3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15 -DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 -EBUILD exim-4.92-r2.ebuild 13511 BLAKE2B 53836e205475bc3b2d22afb9d09d9a17a76a7308d6c2ac85d048c28b068f01a530d198f634b30b50f0d455db92bfab5982f4ae6cfeeec38dd85d1f1f202438fd SHA512 258d728ca84c1a0dc62428a6354af50bf5249e3a9299f33fe625a3345361a34d3bac6a7ff72f135a66712b805781ef994858ec0a80069d92c6af30d4504941ee -MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f diff --git a/mail-mta/exim/exim-4.92-r2.ebuild b/mail-mta/exim/exim-4.92-r2.ebuild deleted file mode 100644 index c3fce67..0000000 --- a/mail-mta/exim/exim-4.92-r2.ebuild +++ /dev/null @@ -1,577 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit db-use eutils toolchain-funcs multilib pam systemd - -IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X" -REQUIRED_USE=" - arc? ( dkim spf ) - dane? ( ssl !gnutls ) - dmarc? ( dkim spf ) - gnutls? ( ssl ) - pkcs11? ( ssl ) - spf? ( exiscan-acl ) - srs? ( exiscan-acl ) -" -# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked -# for x86 and amd64 only, due to this, repoman won't allow depending on -# gnutls[dane] for all else. Because we cannot express USE=dane when -# USE=gnutls is in effect only in package.use.mask, the only option we -# have left is to a) ignore the dependency (but that results in bug -# #661164) or b) mask the usage of USE=dane with USE=gnutls. Both are -# incorrect, but b) is the only "correct" view from repoman. - -COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)" - -DESCRIPTION="A highly configurable, drop-in replacement for sendmail" -SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz - mirror://gentoo/system_filter.exim.gz - doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )" -HOMEPAGE="http://www.exim.org/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris" - -COMMON_DEPEND=">=sys-apps/sed-4.0.5 - ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 ) - nis? ( - elibc_glibc? ( - net-libs/libtirpc - >=net-libs/libnsl-1:= - ) - ) - mysql? ( virtual/libmysqlclient ) - postgres? ( dev-db/postgresql:= ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) - redis? ( dev-libs/hiredis ) - spf? ( >=mail-filter/libspf2-1.2.5-r1 ) - dmarc? ( mail-filter/opendmarc ) - srs? ( mail-filter/libsrs_alt ) - X? ( - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXaw - ) - sqlite? ( dev-db/sqlite ) - radius? ( net-dialup/freeradius-client ) - virtual/libiconv - elibc_glibc? ( net-libs/libnsl ) - " - # added X check for #57206 -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/mini-qmail - !=mail-mta/msmtp-1.4.19-r1[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/opensmtpd - !=mail-mta/ssmtp-2.64-r2[mta] - !net-mail/mailwrapper - >=net-mail/mailbase-0.00-r5 - virtual/logger - dcc? ( mail-filter/dcc ) - selinux? ( sec-policy/selinux-exim ) - " - -S=${WORKDIR}/${P//rc/RC} - -src_prepare() { - epatch "${FILESDIR}"/exim-4.14-tail.patch - epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch - epatch "${FILESDIR}"/exim-4.69-r1.27021.patch - epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426 - epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785 - epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279 - epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 - epatch "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554 - - if use maildir ; then - epatch "${FILESDIR}"/exim-4.20-maildir.patch - else - epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 - fi - - eapply_user - - # user Exim believes it should be - MAILUSER=mail - MAILGROUP=mail - if use prefix && [[ ${EUID} != 0 ]] ; then - MAILUSER=$(id -un) - MAILGROUP=$(id -gn) - fi -} - -src_configure() { - # general config and paths - - local aliases="${EPREFIX}/etc/mail/aliases" - sed -i \ - -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \ - src/configure.default || die - - sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die - - if use elibc_musl; then - sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die - fi - - local conffile="${EPREFIX}/etc/exim/exim.conf" - sed -e "48i\CFLAGS=${CFLAGS}" \ - -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \ - -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \ - -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \ - -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ - -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \ - src/EDITME > Local/Makefile || die - - # work on Local/Makefile from now on - cd Local - - cat >> Makefile <<- EOC - INFO_DIRECTORY=${EPREFIX}/usr/share/info - PID_FILE_PATH=${EPREFIX}/run/exim.pid - SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim - HAVE_ICONV=yes - EOC - - # if we use libiconv, now is the time to tell so - use !elibc_glibc && use !elibc_musl && \ - echo "EXTRALIBS_EXIM=-liconv" >> Makefile - - # support for IPv6 - if use ipv6; then - cat >> Makefile <<- EOC - HAVE_IPV6=YES - EOC - fi - - # support i18n/IDNA - if use idn; then - cat >> Makefile <<- EOC - SUPPORT_I18N=yes - SUPPORT_I18N_2008=yes - EXTRALIBS_EXIM += -lidn -lidn2 - EOC - fi - - # - # mail storage formats - # - - # mailstore is Exim's traditional storage format - cat >> Makefile <<- EOC - SUPPORT_MAILSTORE=yes - EOC - - # mbox - if use mbx; then - cat >> Makefile <<- EOC - SUPPORT_MBX=yes - EOC - fi - - # maildir - if use maildir; then - cat >> Makefile <<- EOC - SUPPORT_MAILDIR=yes - EOC - fi - - # - # lookup methods - - # use the "native" interfaces to the DBM and CDB libraries, support - # passwd and directory lookups by default - local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2" - cat >> Makefile <<- EOC - USE_DB=yes - CFLAGS+=-I$(db_includedir ${DB_VERS}) - DBMLIB=-l$(db_libname ${DB_VERS}) - LOOKUP_CDB=yes - LOOKUP_PASSWD=yes - LOOKUP_DSEARCH=yes - EOC - - if ! use dnsdb; then - # DNSDB lookup is enabled by default - sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die - fi - - if use ldap; then - cat >> Makefile <<- EOC - LOOKUP_LDAP=yes - LDAP_LIB_TYPE=OPENLDAP2 - LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap - LOOKUP_LIBS += -lldap -llber - EOC - fi - - if use mysql; then - cat >> Makefile <<- EOC - LOOKUP_MYSQL=yes - LOOKUP_INCLUDE += $(mysql_config --include) - LOOKUP_LIBS += $(mysql_config --libs) - EOC - fi - - if use nis; then - cat >> Makefile <<- EOC - LOOKUP_NIS=yes - LOOKUP_NISPLUS=yes - EOC - if use elibc_glibc ; then - cat >> Makefile <<- EOC - CFLAGS += -I"${EPREFIX}"/usr/include/tirpc - EOC - fi - fi - - if use postgres; then - cat >> Makefile <<- EOC - LOOKUP_PGSQL=yes - LOOKUP_INCLUDE += -I$(pg_config --includedir) - LOOKUP_LIBS += -L$(pg_config --libdir) -lpq - EOC - fi - - if use sqlite; then - cat >> Makefile <<- EOC - LOOKUP_SQLITE=yes - LOOKUP_SQLITE_PC=sqlite3 - EOC - fi - - if use redis; then - cat >> Makefile <<- EOC - LOOKUP_REDIS=yes - LOOKUP_LIBS += -lhiredis - EOC - fi - - # Exim monitor, enabled by default, controlled via X USE-flag, - # disable if not requested, bug #46778 - if use X; then - cp ../exim_monitor/EDITME eximon.conf || die - else - sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die - fi - - # - # features - # - - # content scanning support - if use exiscan-acl; then - cat >> Makefile <<- EOC - WITH_CONTENT_SCAN=yes - EOC - fi - - # DomainKeys Identified Mail, RFC4871 - if ! use dkim; then - # DKIM is enabled by default - cat >> Makefile <<- EOC - DISABLE_DKIM=yes - EOC - fi - - # Per-Recipient-Data-Response - if ! use prdr; then - # PRDR is enabled by default - cat >> Makefile <<- EOC - DISABLE_PRDR=yes - EOC - fi - - # Transport post-delivery actions - if use !tpda && use !dane; then - # EVENT is enabled by default - cat >> Makefile <<- EOC - DISABLE_EVENT=yes - EOC - fi - - # log to syslog - if use syslog; then - local eximlog="${EPREFIX}/var/log/exim/exim_%s.log" - sed -i \ - -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \ - Makefile || die - cat >> Makefile <<- EOC - LOG_FILE_PATH=syslog - EOC - else - cat >> Makefile <<- EOC - LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log - EOC - fi - - # starttls support (ssl) - if use ssl; then - echo "SUPPORT_TLS=yes" >> Makefile - if use gnutls; then - echo "USE_GNUTLS=yes" >> Makefile - echo "USE_GNUTLS_PC=gnutls" >> Makefile - use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile - else - echo "USE_OPENSSL_PC=openssl" >> Makefile - fi - fi - - # TCP wrappers - if use tcpd; then - cat >> Makefile <<- EOC - USE_TCP_WRAPPERS=yes - EXTRALIBS_EXIM += -lwrap - EOC - fi - - # Light Mail Transport Protocol - if use lmtp; then - cat >> Makefile <<- EOC - TRANSPORT_LMTP=yes - EOC - fi - - # embedded Perl - if use perl; then - cat >> Makefile <<- EOC - EXIM_PERL=perl.o - EOC - fi - - # dlfunc - if use dlfunc; then - cat >> Makefile <<- EOC - EXPAND_DLFUNC=yes - HAVE_LOCAL_SCAN=yes - DLOPEN_LOCAL_SCAN=yes - EOC - fi - - # Proxy Protocol - if use proxy; then - cat >> Makefile <<- EOC - SUPPORT_PROXY=yes - EOC - fi - - # DANE - if use dane; then - cat >> Makefile <<- EOC - SUPPORT_DANE=yes - EOC - fi - - # Sender Policy Framework - if use spf; then - cat >> Makefile <<- EOC - SUPPORT_SPF=yes - EXTRALIBS_EXIM += -lspf2 - EOC - fi - - # - # experimental features - # - - # Authenticated Receive Chain - if use arc; then - echo "EXPERIMENTAL_ARC=yes">> Makefile - fi - - # Distributed Checksum Clearinghouse - if use dcc; then - echo "EXPERIMENTAL_DCC=yes">> Makefile - fi - - # Sender Rewriting Scheme - if use srs; then - cat >> Makefile <<- EOC - EXPERIMENTAL_SRS=yes - EXTRALIBS_EXIM += -lsrs_alt - EOC - fi - - # DMARC - if use dmarc; then - cat >> Makefile <<- EOC - EXPERIMENTAL_DMARC=yes - EXTRALIBS_EXIM += -lopendmarc - EOC - fi - - # Delivery Sender Notifications extra information in fail message - if use dsn; then - cat >> Makefile <<- EOC - EXPERIMENTAL_DSN_INFO=yes - EOC - fi - - # - # authentication (SMTP AUTH) - # - - # standard bits - cat >> Makefile <<- EOC - AUTH_SPA=yes - AUTH_CRAM_MD5=yes - AUTH_PLAINTEXT=yes - EOC - - # Cyrus SASL - if use sasl; then - cat >> Makefile <<- EOC - CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux - AUTH_CYRUS_SASL=yes - AUTH_LIBS += -lsasl2 - EOC - fi - - # Dovecot - if use dovecot-sasl; then - cat >> Makefile <<- EOC - AUTH_DOVECOT=yes - EOC - fi - - # Pluggable Authentication Modules - if use pam; then - cat >> Makefile <<- EOC - SUPPORT_PAM=yes - AUTH_LIBS += -lpam - EOC - fi - - # Radius - if use radius; then - cat >> Makefile <<- EOC - RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf - RADIUS_LIB_TYPE=RADIUSCLIENTNEW - AUTH_LIBS += -lfreeradius-client - EOC - fi -} - -src_compile() { - emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \ - AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \ - || die "make failed" -} - -src_install () { - cd "${S}"/build-exim-gentoo || die - dosbin exim - if use X; then - dosbin eximon.bin - dosbin eximon - fi - fperms 4755 /usr/sbin/exim - - dosym exim /usr/sbin/sendmail - dosym exim /usr/sbin/rsmtp - dosym exim /usr/sbin/rmail - dosym ../sbin/exim /usr/bin/mailq - dosym ../sbin/exim /usr/bin/newaliases - dosym ../sbin/sendmail /usr/lib/sendmail - - for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \ - exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \ - convert4r3 convert4r4 exipick - do - dosbin $i - done - - dodoc "${S}"/doc/* - doman "${S}"/doc/exim.8 - use dsn && dodoc "${S}"/README.DSN - use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf - - # conf files - insinto /etc/exim - newins "${S}"/src/configure.default exim.conf.dist - if use exiscan-acl; then - newins "${S}"/src/configure.default exim.conf.exiscan-acl - fi - doins "${WORKDIR}"/system_filter.exim - doins "${FILESDIR}"/auth_conf.sub - - pamd_mimic system-auth exim auth account - - # headers, #436406 - if use dlfunc ; then - # fixup includes so they actually can be found when including - sed -i \ - -e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)"::' \ - local_scan.h || die - insinto /usr/include/exim - doins {config,local_scan}.h ../src/{mytypes,store}.h - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/exim.logrotate" exim - - newinitd "${FILESDIR}"/exim.rc10 exim - newconfd "${FILESDIR}"/exim.confd exim - - systemd_dounit \ - "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket} - systemd_newunit \ - "${FILESDIR}"/exim_at.service 'exim@.service' - systemd_newunit \ - "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service' - - diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP} - keepdir /var/log/${PN} -} - -pkg_postinst() { - if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then - einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter." - einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub" - einfo "for using smtp auth." - einfo "Please create ${EROOT}etc/exim/exim.conf from" - einfo " ${EROOT}etc/exim/exim.conf.dist." - fi - if use dcc ; then - einfo "DCC support is experimental, you can find some limited" - einfo "documentation at the bottom of this prerelease message:" - einfo "http://article.gmane.org/gmane.mail.exim.devel/3579" - fi - use srs && einfo "SRS support is experimental" - if use dmarc ; then - einfo "DMARC support is experimental. See global settings to" - einfo "configure DMARC, for usage see the documentation at " - einfo "experimental-spec.txt." - fi - use dsn && einfo "extra information in fail DSN message is experimental" - elog "The obsolete acl condition 'demime' is removed, the replacements" - elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime" -} diff --git a/mail-mta/exim/files/auth_conf.sub b/mail-mta/exim/files/auth_conf.sub deleted file mode 100644 index 24434a7..0000000 --- a/mail-mta/exim/files/auth_conf.sub +++ /dev/null @@ -1,25 +0,0 @@ -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -# If you're using PAM to authenticate, lifes real simple. -# This plain directive works for nearly everything except windows MUA's the -# login directive will allow you to authenticate your Outlook 2000 and -# outlook express clients. - - - -plain: - driver = plaintext - public_name = PLAIN - server_condition = "${if pam{$2:$3}{1}{0}}" - server_set_id = $2 - -login: - driver = plaintext - public_name = LOGIN - server_prompts = "Username:: : Password::" - server_condition = "${if pam{$1:${sg{$2}{:}{::}}}{1}{0}}" - server_set_id = $1 -# -# FIXME -# Need to add authenticator for SPA!! diff --git a/mail-mta/exim/files/exim-4.14-tail.patch b/mail-mta/exim/files/exim-4.14-tail.patch deleted file mode 100644 index 481dca9..0000000 --- a/mail-mta/exim/files/exim-4.14-tail.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/Configure-config.h.orig 2003-07-17 18:01:19.000000000 -0400 -+++ scripts/Configure-config.h 2003-07-17 18:01:25.000000000 -0400 -@@ -41,7 +41,7 @@ - - # Double-check that config.h is complete. - --if [ "`tail -1 config.h`" != "/* End of config.h */" ] ; then -+if [ "`tail -n 1 config.h`" != "/* End of config.h */" ] ; then - echo "*** config.h appears to be incomplete" - echo "*** unexpected failure in buildconfig program" - exit 1 diff --git a/mail-mta/exim/files/exim-4.20-maildir.patch b/mail-mta/exim/files/exim-4.20-maildir.patch deleted file mode 100644 index 3cb198d..0000000 --- a/mail-mta/exim/files/exim-4.20-maildir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN ./exim-4.20.orig/src/configure.default exim-4.20/src/configure.default ---- ./exim-4.20.orig/src/configure.default 2003-06-27 16:48:22.000000000 -0700 -+++ exim-4.20/src/configure.default 2003-06-27 16:52:20.000000000 -0700 -@@ -451,7 +451,9 @@ - - local_delivery: - driver = appendfile -- file = /var/mail/$local_part -+# file = /var/mail/$local_part -+ directory = /home/$local_part/.maildir -+ maildir_format - delivery_date_add - envelope_to_add - return_path_add diff --git a/mail-mta/exim/files/exim-4.69-r1.27021.patch b/mail-mta/exim/files/exim-4.69-r1.27021.patch deleted file mode 100644 index 804e16d..0000000 --- a/mail-mta/exim/files/exim-4.69-r1.27021.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN exim-4.69.orig/src/configure.default exim-4.69/src/configure.default ---- exim-4.69.orig/src/configure.default 2008-05-05 10:17:44.000000000 +0100 -+++ exim-4.69/src/configure.default 2008-05-05 10:18:26.000000000 +0100 -@@ -592,6 +592,22 @@ - pipe_transport = address_pipe - reply_transport = address_reply - -+# This router runs procmail if users have a .procmailrc file -+procmail: -+ check_local_user -+ driver = accept -+ transport = procmail_pipe -+ require_files = ${local_part}:+${home}:+${home}/.procmailrc:+/usr/bin/procmail -+ no_verify -+ -+# This router runs maildrop if users have a .mailfilter file -+maildrop: -+ check_local_user -+ driver = accept -+ transport = maildrop_pipe -+ require_files = ${local_part}:+${home}:+${home}/.mailfilter:+/usr/bin/maildrop -+ no_verify -+ - - # This router matches local user mailboxes. If the router fails, the error - # message is "Unknown user". -@@ -676,6 +692,21 @@ - address_reply: - driver = autoreply - -+# This transport is used for procmail -+procmail_pipe: -+ driver = pipe -+ command = "/usr/bin/procmail -d ${local_part}" -+ return_path_add -+ delivery_date_add -+ envelope_to_add -+ -+# This transport is used for courier-maildrop filtering (Maildir filter system) -+maildrop_pipe: -+ driver = pipe -+ command = "/usr/bin/maildrop -d ${local_part}" -+ return_path_add -+ delivery_date_add -+ envelope_to_add - - - ###################################################################### diff --git a/mail-mta/exim/files/exim-4.74-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.74-localscan_dlopen.patch deleted file mode 100644 index 3bb57c1..0000000 --- a/mail-mta/exim/files/exim-4.74-localscan_dlopen.patch +++ /dev/null @@ -1,262 +0,0 @@ -diff -Naur exim-4.32/src/EDITME exim-4.32-dlopen/src/EDITME ---- src/EDITME 2004-04-15 08:27:01.000000000 +0000 -+++ src/EDITME 2004-05-06 16:15:47.000000000 +0000 -@@ -505,6 +505,24 @@ - - - #------------------------------------------------------------------------------ -+# On systems which support dynamic loading of shared libraries, Exim can -+# load a local_scan function specified in its config file instead of having -+# to be recompiled with the desired local_scan function. For a full -+# description of the API to this function, see the Exim specification. -+ -+DLOPEN_LOCAL_SCAN=yes -+ -+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the -+# linker flags. Without it, the loaded .so won't be able to access any -+# functions from exim. -+ -+LFLAGS = -rdynamic -+ifeq ($(OSTYPE),Linux) -+LFLAGS += -ldl -+endif -+ -+ -+#------------------------------------------------------------------------------ - # The default distribution of Exim contains only the plain text form of the - # documentation. Other forms are available separately. If you want to install - # the documentation in "info" format, first fetch the Texinfo documentation -diff -Naur exim-4.32/src/config.h.defaults exim-4.32-dlopen/src/config.h.defaults ---- src/config.h.defaults 2004-04-15 08:27:01.000000000 +0000 -+++ src/config.h.defaults 2004-05-06 16:16:30.000000000 +0000 -@@ -20,6 +20,8 @@ - #define AUTH_PLAINTEXT - #define AUTH_SPA - -+#define DLOPEN_LOCAL_SCAN -+ - #define BIN_DIRECTORY - - #define CONFIGURE_FILE -diff -Naur exim-4.32/src/globals.c exim-4.32-dlopen/src/globals.c ---- src/globals.c 2004-04-15 08:27:01.000000000 +0000 -+++ src/globals.c 2004-05-06 16:17:07.000000000 +0000 -@@ -109,6 +109,10 @@ - uschar *tls_verify_hosts = NULL; - #endif - -+#ifdef DLOPEN_LOCAL_SCAN -+uschar *local_scan_path = NULL; -+#endif -+ - - /* Input-reading functions for messages, so we can use special ones for - incoming TCP/IP. The defaults use stdin. We never need these for any -diff -Naur exim-4.32/src/globals.h exim-4.32-dlopen/src/globals.h ---- src/globals.h 2004-04-15 08:27:01.000000000 +0000 -+++ src/globals.h 2004-05-06 16:17:50.000000000 +0000 -@@ -73,6 +73,9 @@ - extern uschar *tls_verify_hosts; /* Mandatory client verification */ - #endif - -+#ifdef DLOPEN_LOCAL_SCAN -+extern uschar *local_scan_path; /* Path to local_scan() library */ -+#endif - - /* Input-reading functions for messages, so we can use special ones for - incoming TCP/IP. */ -diff -Naur exim-4.32/src/local_scan.c exim-4.32-dlopen/src/local_scan.c ---- src/local_scan.c 2004-04-15 08:27:01.000000000 +0000 -+++ src/local_scan.c 2004-05-06 16:21:57.000000000 +0000 -@@ -5,60 +5,131 @@ - /* Copyright (c) University of Cambridge 1995 - 2004 */ - /* See the file NOTICE for conditions of use and distribution. */ - -+#include "exim.h" - --/****************************************************************************** --This file contains a template local_scan() function that just returns ACCEPT. --If you want to implement your own version, you should copy this file to, say --Local/local_scan.c, and edit the copy. To use your version instead of the --default, you must set -- --LOCAL_SCAN_SOURCE=Local/local_scan.c -- --in your Local/Makefile. This makes it easy to copy your version for use with --subsequent Exim releases. -- --For a full description of the API to this function, see the Exim specification. --******************************************************************************/ -- -- --/* This is the only Exim header that you should include. The effect of --including any other Exim header is not defined, and may change from release to --release. Use only the documented interface! */ -- --#include "local_scan.h" -- -- --/* This is a "do-nothing" version of a local_scan() function. The arguments --are: -- -- fd The file descriptor of the open -D file, which contains the -- body of the message. The file is open for reading and -- writing, but modifying it is dangerous and not recommended. -- -- return_text A pointer to an unsigned char* variable which you can set in -- order to return a text string. It is initialized to NULL. -- --The return values of this function are: -- -- LOCAL_SCAN_ACCEPT -- The message is to be accepted. The return_text argument is -- saved in $local_scan_data. -- -- LOCAL_SCAN_REJECT -- The message is to be rejected. The returned text is used -- in the rejection message. -- -- LOCAL_SCAN_TEMPREJECT -- This specifies a temporary rejection. The returned text -- is used in the rejection message. --*/ -+#ifdef DLOPEN_LOCAL_SCAN -+#include -+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; -+static int load_local_scan_library(void); -+#endif - - int - local_scan(int fd, uschar **return_text) - { - fd = fd; /* Keep picky compilers happy */ - return_text = return_text; --return LOCAL_SCAN_ACCEPT; -+#ifdef DLOPEN_LOCAL_SCAN -+/* local_scan_path is defined AND not the empty string */ -+if (local_scan_path && *local_scan_path) -+ { -+ if (!local_scan_fn) -+ { -+ if (!load_local_scan_library()) -+ { -+ char *base_msg , *error_msg , *final_msg ; -+ int final_length = -1 ; -+ -+ base_msg=US"Local configuration error - local_scan() library failure\n"; -+ error_msg = dlerror() ; -+ -+ final_length = strlen(base_msg) + strlen(error_msg) + 1 ; -+ final_msg = (char*)malloc( final_length*sizeof(char) ) ; -+ *final_msg = '\0' ; -+ -+ strcat( final_msg , base_msg ) ; -+ strcat( final_msg , error_msg ) ; -+ -+ *return_text = final_msg ; -+ return LOCAL_SCAN_TEMPREJECT; -+ } -+ } -+ return local_scan_fn(fd, return_text); -+ } -+else -+#endif -+ return LOCAL_SCAN_ACCEPT; -+} -+ -+#ifdef DLOPEN_LOCAL_SCAN -+ -+static int load_local_scan_library(void) -+{ -+/* No point in keeping local_scan_lib since we'll never dlclose() anyway */ -+void *local_scan_lib = NULL; -+int (*local_scan_version_fn)(void); -+int vers_maj; -+int vers_min; -+ -+local_scan_lib = dlopen(local_scan_path, RTLD_NOW); -+if (!local_scan_lib) -+ { -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - " -+ "message temporarily rejected"); -+ return FALSE; -+ } -+ -+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major"); -+if (!local_scan_version_fn) -+ { -+ dlclose(local_scan_lib); -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " -+ "local_scan_version_major() function - message temporarily rejected"); -+ return FALSE; -+ } -+ -+/* The major number is increased when the ABI is changed in a non -+ backward compatible way. */ -+vers_maj = local_scan_version_fn(); -+ -+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor"); -+if (!local_scan_version_fn) -+ { -+ dlclose(local_scan_lib); -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " -+ "local_scan_version_minor() function - message temporarily rejected"); -+ return FALSE; -+ } -+ -+/* The minor number is increased each time a new feature is added (in a -+ way that doesn't break backward compatibility) -- Marc */ -+vers_min = local_scan_version_fn(); -+ -+ -+if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR) -+ { -+ dlclose(local_scan_lib); -+ local_scan_lib = NULL; -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major" -+ "version number, you need to recompile your module for this version" -+ "of exim (The module was compiled for version %d.%d and this exim provides" -+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, -+ LOCAL_SCAN_ABI_VERSION_MINOR); -+ return FALSE; -+ } -+else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR) -+ { -+ dlclose(local_scan_lib); -+ local_scan_lib = NULL; -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor" -+ "version number, you need to recompile your module for this version" -+ "of exim (The module was compiled for version %d.%d and this exim provides" -+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, -+ LOCAL_SCAN_ABI_VERSION_MINOR); -+ return FALSE; -+ } -+ -+local_scan_fn = dlsym(local_scan_lib, "local_scan"); -+if (!local_scan_fn) -+ { -+ dlclose(local_scan_lib); -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " -+ "local_scan() function - message temporarily rejected"); -+ return FALSE; -+ } -+ -+return TRUE; - } - -+#endif /* DLOPEN_LOCAL_SCAN */ -+ - /* End of local_scan.c */ -diff -Naur exim-4.32/src/readconf.c exim-4.32-dlopen/src/readconf.c ---- src/readconf.c 2004-04-15 08:27:01.000000000 +0000 -+++ src/readconf.c 2004-05-06 16:23:12.000000000 +0000 -@@ -223,6 +223,9 @@ - { "local_from_prefix", opt_stringptr, &local_from_prefix }, - { "local_from_suffix", opt_stringptr, &local_from_suffix }, - { "local_interfaces", opt_stringptr, &local_interfaces }, -+#ifdef DLOPEN_LOCAL_SCAN -+ { "local_scan_path", opt_stringptr, &local_scan_path }, -+#endif - { "local_scan_timeout", opt_time, &local_scan_timeout }, - { "local_sender_retain", opt_bool, &local_sender_retain }, - { "localhost_number", opt_stringptr, &host_number_string }, diff --git a/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch b/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch deleted file mode 100644 index 247668e..0000000 --- a/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch +++ /dev/null @@ -1,22 +0,0 @@ -Nasty workaround for -http://bugs.gentoo.org/show_bug.cgi?id=287426 - ---- src/auths/call_radius.c -+++ src/auths/call_radius.c -@@ -10,6 +10,16 @@ - /* This file was originally supplied by Ian Kirk. The libradius support came - from Alex Kiernan. */ - -+/* ugly hack to work around redefinition of ENV by radiusclient.h and -+ * db.h: define _DB_H_ so the db.h include thinks it's already included, -+ * we can get away with it like this, since this file doesn't use any db -+ * functions. */ -+#ifndef _DB_H_ -+#define _DB_H_ 1 -+#define _DB_EXT_PROT_IN_ 1 -+#define DB void -+#endif -+ - #include "../exim.h" - - /* This module contains functions that call the Radius authentication diff --git a/mail-mta/exim/files/exim-4.76-crosscompile.patch b/mail-mta/exim/files/exim-4.76-crosscompile.patch deleted file mode 100644 index cf47ade..0000000 --- a/mail-mta/exim/files/exim-4.76-crosscompile.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=266591 - ---- OS/Makefile-Base -+++ OS/Makefile-Base -@@ -114,8 +114,8 @@ - - # Targets for special-purpose configuration header builders - buildconfig: buildconfig.c -- @echo "$(CC) buildconfig.c" -- $(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS) -+ @echo "$(HOSTCC) buildconfig.c" -+ $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS) - - - # Target for the exicyclog utility script diff --git a/mail-mta/exim/files/exim-4.80-spool-mail-group.patch b/mail-mta/exim/files/exim-4.80-spool-mail-group.patch deleted file mode 100644 index 6f88d85..0000000 --- a/mail-mta/exim/files/exim-4.80-spool-mail-group.patch +++ /dev/null @@ -1,27 +0,0 @@ -Change default such that we run on a stock Gentoo system. Bug #438606 - ---- src/configure.default -+++ src/configure.default -@@ -674,8 +674,9 @@ - # BSD mailbox format. By default it will be run under the uid and gid of the - # local user, and requires the sticky bit to be set on the /var/mail directory. - # Some systems use the alternative approach of running mail deliveries under a --# particular group instead of using the sticky bit. The commented options below --# show how this can be done. -+# particular group instead of using the sticky bit. This is also the -+# default case on Gentoo, therefore group and mode are set below. -+# Comment them out, to get the default behaviour. - - local_delivery: - driver = appendfile -@@ -683,8 +684,8 @@ - delivery_date_add - envelope_to_add - return_path_add --# group = mail --# mode = 0660 -+ group = mail -+ mode = 0660 - - - # This transport is used for handling pipe deliveries generated by alias or diff --git a/mail-mta/exim/files/exim-4.82-makefile-freebsd.patch b/mail-mta/exim/files/exim-4.82-makefile-freebsd.patch deleted file mode 100644 index 9693d49..0000000 --- a/mail-mta/exim/files/exim-4.82-makefile-freebsd.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- OS/Makefile-FreeBSD.orig 2013-09-30 19:59:09.000000000 +0200 -+++ OS/Makefile-FreeBSD 2013-09-30 20:01:22.000000000 +0200 -@@ -1,10 +1,8 @@ --# Exim: OS-specific make file for FreeBSD --# There's no setting of CFLAGS here, to allow the system default --# for "make" to be the default. -- --CHOWN_COMMAND=/usr/sbin/chown --STRIP_COMMAND=/usr/bin/strip --CHMOD_COMMAND=/bin/chmod -+# Exim: OS-specific FreeBSD make file, modified for Gentoo Prefix -+ -+CHOWN_COMMAND=look_for_it -+STRIP_COMMAND= -+CHMOD_COMMAND=look_for_it - - HAVE_SA_LEN=YES - -@@ -15,17 +13,9 @@ - CFLAGS_DYNAMIC=-shared -rdynamic -fPIC - - # FreeBSD always ships with Berkeley DB -+DBMLIB = -ldb - USE_DB=yes - --# This code for building outside ports suggested by Richard Clayton --.ifdef X11BASE --X11=${X11BASE} --.elifdef LOCALBASE --X11=$(LOCALBASE) --.else --X11=/usr/local --.endif -- - # nb: FreeBSD is entirely elf; objformat was removed prior to FreeBSD 7 - # http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/objformat/Attic/objformat.c - # deleted Jan 2007. -@@ -37,6 +27,7 @@ - # switch to default to ELF came with FreeBSD 3. elf(5) claims ELF support - # introduced in FreeBSD 2.2.6. - # -+X11=/usr/X11R6 - XINCLUDE=-I$(X11)/include - XLFLAGS=-L$(X11)/lib -Wl,-rpath,${X11}/lib - X11_LD_LIB=$(X11)/lib diff --git a/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch b/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch deleted file mode 100644 index 49e4309..0000000 --- a/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch +++ /dev/null @@ -1,145 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=352265 - -Make sure LDFLAGS comes first, such that all libraries are considered, -and not discarded when --as-needed is in effect. - -https://bugs.gentoo.org/show_bug.cgi?id=391279 - -Use LDFLAGS for all targets, not just the exim binary, such that ---as-needed works as well. - - ---- OS/Makefile-Base -+++ OS/Makefile-Base -@@ -346,12 +346,12 @@ - buildrouters buildtransports \ - $(OBJ_EXIM) version.o - @echo "$(LNCC) -o exim" -- $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \ -+ $(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \ - routers/routers.a transports/transports.a lookups/lookups.a \ - auths/auths.a pdkim/pdkim.a \ - $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \ - $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \ -- $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS) -+ $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) exim; \ - $(STRIP_COMMAND) exim; \ -@@ -367,8 +367,8 @@ - - exim_dumpdb: $(OBJ_DUMPDB) - @echo "$(LNCC) -o exim_dumpdb" -- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \ -- $(LIBS) $(EXTRALIBS) $(DBMLIB) -+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LDFLAGS) $(OBJ_DUMPDB) \ -+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) exim_dumpdb; \ - $(STRIP_COMMAND) exim_dumpdb; \ -@@ -382,8 +382,8 @@ - - exim_fixdb: $(OBJ_FIXDB) buildauths - @echo "$(LNCC) -o exim_fixdb" -- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \ -- auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) -+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LDFLAGS) $(OBJ_FIXDB) \ -+ auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) exim_fixdb; \ - $(STRIP_COMMAND) exim_fixdb; \ -@@ -397,8 +397,8 @@ - - exim_tidydb: $(OBJ_TIDYDB) - @echo "$(LNCC) -o exim_tidydb" -- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \ -- $(LIBS) $(EXTRALIBS) $(DBMLIB) -+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LDFLAGS) $(OBJ_TIDYDB) \ -+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) exim_tidydb; \ - $(STRIP_COMMAND) exim_tidydb; \ -@@ -410,8 +410,8 @@ - - exim_dbmbuild: exim_dbmbuild.o - @echo "$(LNCC) -o exim_dbmbuild" -- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \ -- $(LIBS) $(EXTRALIBS) $(DBMLIB) -+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LDFLAGS) exim_dbmbuild.o \ -+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) exim_dbmbuild; \ - $(STRIP_COMMAND) exim_dbmbuild; \ -@@ -425,8 +425,8 @@ - @echo "$(CC) exim_lock.c" - $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) exim_lock.c - @echo "$(LNCC) -o exim_lock" -- $(FE)$(LNCC) -o exim_lock $(LFLAGS) exim_lock.o \ -- $(LIBS) $(EXTRALIBS) -+ $(FE)$(LNCC) -o exim_lock $(LDFLAGS) exim_lock.o \ -+ $(LIBS) $(EXTRALIBS) $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) exim_lock; \ - $(STRIP_COMMAND) exim_lock; \ -@@ -462,9 +462,9 @@ - $(FE)$(CC) -o em_version.o -c \ - $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c - @echo "$(LNCC) -o eximon.bin" -- $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \ -+ $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LDFLAGS) $(XLFLAGS) \ - $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 $(PCRE_LIBS) \ -- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc -+ $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc $(LFLAGS) - @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ - echo $(STRIP_COMMAND) eximon.bin; \ - $(STRIP_COMMAND) eximon.bin; \ -@@ -780,9 +780,9 @@ - string.o tod.o version.o utf8.o - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c - $(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY store.c -- $(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \ -+ $(LNCC) -o test_dbfn $(LDFLAGS) dbfn.o \ - dummies.o sa-globals.o sa-os.o store.o string.o \ -- tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LDFLAGS) -+ tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LFLAGS) - rm -f dbfn.o store.o - - test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \ -@@ -790,29 +790,29 @@ - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c -- $(LNCC) -o test_host $(LFLAGS) \ -+ $(LNCC) -o test_host $(LDFLAGS) \ - host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \ -- tod.o tree.o $(LIBS) $(LIBRESOLV) -+ tod.o tree.o $(LIBS) $(LIBRESOLV) $(LFLAGS) - rm -f child.o dummies.o host.o dns.o - - test_os: os.h os.c dummies.o sa-globals.o store.o string.o tod.o utf8.o - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c -- $(LNCC) -o test_os $(LFLAGS) os.o dummies.o \ -- sa-globals.o store.o string.o tod.o utf8.o $(LIBS) $(LDFLAGS) -+ $(LNCC) -o test_os $(LDFLAGS) os.o dummies.o \ -+ sa-globals.o store.o string.o tod.o utf8.o $(LIBS) $(LFLAGS) - rm -f os.o - - test_parse: config.h parse.c dummies.o sa-globals.o \ - store.o string.o tod.o version.o utf8.o - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE parse.c -- $(LNCC) -o test_parse $(LFLAGS) parse.o \ -+ $(LNCC) -o test_parse $(LDFLAGS) parse.o \ - dummies.o sa-globals.o store.o string.o tod.o version.o \ -- utf8.o $(LDFLAGS) -+ utf8.o $(LFLAGS) - rm -f parse.o - - test_string: config.h string.c dummies.o sa-globals.o store.o tod.o utf8.o - $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE string.c -- $(LNCC) -o test_string $(LFLAGS) -DSTAND_ALONE string.o \ -- dummies.o sa-globals.o store.o tod.o utf8.o $(LIBS) $(LDFLAGS) -+ $(LNCC) -o test_string $(LDFLAGS) -DSTAND_ALONE string.o \ -+ dummies.o sa-globals.o store.o tod.o utf8.o $(LIBS) $(LFLAGS) - rm -f string.o - - # End diff --git a/mail-mta/exim/files/exim-4.92-fix-eval-expansion-32bit.patch b/mail-mta/exim/files/exim-4.92-fix-eval-expansion-32bit.patch deleted file mode 100644 index 17d7d21..0000000 --- a/mail-mta/exim/files/exim-4.92-fix-eval-expansion-32bit.patch +++ /dev/null @@ -1,51 +0,0 @@ -Extract from complete patch from -https://git.exim.org/exim.git/patch/26dd3aa007b3b77969610c031f59388e0953bd00 -to only take the buildconfig.c change because the git directory -structure is different from a release tarball causing this patch to fail -otherwise. - -From 26dd3aa007b3b77969610c031f59388e0953bd00 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Fri, 7 Jun 2019 11:54:10 +0100 -Subject: [PATCH] Fix detection of 32b platform at build time. Bug 2405 - ---- - src/src/buildconfig.c | 12 +++++--- - test/scripts/0000-Basic/0002 | 72 +++++++++++++++++++++++--------------------- - test/stdout/0002 | 72 +++++++++++++++++++++++--------------------- - 3 files changed, 83 insertions(+), 73 deletions(-) - -diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c -index 71cf97b..a680b34 100644 ---- a/src/src/buildconfig.c -+++ b/src/src/buildconfig.c -@@ -111,6 +111,7 @@ unsigned long test_ulong_t = 0L; - unsigned int test_uint_t = 0; - #endif - long test_long_t = 0; -+long long test_longlong_t = 0; - int test_int_t = 0; - FILE *base; - FILE *new; -@@ -155,15 +156,16 @@ This assumption is known to be OK for the common operating systems. */ - - fprintf(new, "#ifndef OFF_T_FMT\n"); - if (sizeof(test_off_t) > sizeof(test_long_t)) -- { - fprintf(new, "# define OFF_T_FMT \"%%lld\"\n"); -- fprintf(new, "# define LONGLONG_T long long int\n"); -- } - else -- { - fprintf(new, "# define OFF_T_FMT \"%%ld\"\n"); -+fprintf(new, "#endif\n\n"); -+ -+fprintf(new, "#ifndef LONGLONG_T\n"); -+if (sizeof(test_longlong_t) > sizeof(test_long_t)) -+ fprintf(new, "# define LONGLONG_T long long int\n"); -+else - fprintf(new, "# define LONGLONG_T long int\n"); -- } - fprintf(new, "#endif\n\n"); - - /* Now do the same thing for time_t variables. If the length is greater than diff --git a/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch deleted file mode 100644 index 57363e5..0000000 --- a/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -ur exim-4.92.orig/src/config.h.defaults exim-4.92/src/config.h.defaults ---- exim-4.92.orig/src/config.h.defaults 2019-01-30 14:59:52.000000000 +0100 -+++ exim-4.92/src/config.h.defaults 2019-02-16 18:17:24.547216157 +0100 -@@ -32,6 +32,8 @@ - - #define AUTH_VARS 3 - -+#define DLOPEN_LOCAL_SCAN -+ - #define BIN_DIRECTORY - - #define CONFIGURE_FILE -Only in exim-4.92/src: config.h.defaults.orig -diff -ur exim-4.92.orig/src/EDITME exim-4.92/src/EDITME ---- exim-4.92.orig/src/EDITME 2019-01-30 14:59:52.000000000 +0100 -+++ exim-4.92/src/EDITME 2019-02-16 18:17:24.547216157 +0100 -@@ -824,6 +824,24 @@ - - - #------------------------------------------------------------------------------ -+# On systems which support dynamic loading of shared libraries, Exim can -+# load a local_scan function specified in its config file instead of having -+# to be recompiled with the desired local_scan function. For a full -+# description of the API to this function, see the Exim specification. -+ -+#DLOPEN_LOCAL_SCAN=yes -+ -+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the -+# linker flags. Without it, the loaded .so won't be able to access any -+# functions from exim. -+ -+LFLAGS = -rdynamic -+ifeq ($(OSTYPE),Linux) -+LFLAGS += -ldl -+endif -+ -+ -+#------------------------------------------------------------------------------ - # The default distribution of Exim contains only the plain text form of the - # documentation. Other forms are available separately. If you want to install - # the documentation in "info" format, first fetch the Texinfo documentation -Only in exim-4.92/src: EDITME.orig -diff -ur exim-4.92.orig/src/globals.c exim-4.92/src/globals.c ---- exim-4.92.orig/src/globals.c 2019-01-30 14:59:52.000000000 +0100 -+++ exim-4.92/src/globals.c 2019-02-16 18:17:24.549216150 +0100 -@@ -41,6 +41,10 @@ - - uschar *no_aliases = NULL; - -+#ifdef DLOPEN_LOCAL_SCAN -+uschar *local_scan_path = NULL; -+#endif -+ - - /* For comments on these variables, see globals.h. I'm too idle to - duplicate them here... */ -Only in exim-4.92/src: globals.c.orig -diff -ur exim-4.92.orig/src/globals.h exim-4.92/src/globals.h ---- exim-4.92.orig/src/globals.h 2019-01-30 14:59:52.000000000 +0100 -+++ exim-4.92/src/globals.h 2019-02-16 18:17:24.549216150 +0100 -@@ -152,6 +152,9 @@ - extern int (*receive_ferror)(void); - extern BOOL (*receive_smtp_buffered)(void); - -+#ifdef DLOPEN_LOCAL_SCAN -+extern uschar *local_scan_path; /* Path to local_scan() library */ -+#endif - - /* For clearing, saving, restoring address expansion variables. We have to have - the size of this vector set explicitly, because it is referenced from more than -Only in exim-4.92/src: globals.h.orig -diff -ur exim-4.92.orig/src/local_scan.c exim-4.92/src/local_scan.c ---- exim-4.92.orig/src/local_scan.c 2019-01-30 14:59:52.000000000 +0100 -+++ exim-4.92/src/local_scan.c 2019-02-16 18:29:56.832732592 +0100 -@@ -5,61 +5,131 @@ - /* Copyright (c) University of Cambridge 1995 - 2009 */ - /* See the file NOTICE for conditions of use and distribution. */ - -+#include "exim.h" - --/****************************************************************************** --This file contains a template local_scan() function that just returns ACCEPT. --If you want to implement your own version, you should copy this file to, say --Local/local_scan.c, and edit the copy. To use your version instead of the --default, you must set -- --HAVE_LOCAL_SCAN=yes --LOCAL_SCAN_SOURCE=Local/local_scan.c -- --in your Local/Makefile. This makes it easy to copy your version for use with --subsequent Exim releases. -- --For a full description of the API to this function, see the Exim specification. --******************************************************************************/ -- -- --/* This is the only Exim header that you should include. The effect of --including any other Exim header is not defined, and may change from release to --release. Use only the documented interface! */ -- --#include "local_scan.h" -- -- --/* This is a "do-nothing" version of a local_scan() function. The arguments --are: -- -- fd The file descriptor of the open -D file, which contains the -- body of the message. The file is open for reading and -- writing, but modifying it is dangerous and not recommended. -- -- return_text A pointer to an unsigned char* variable which you can set in -- order to return a text string. It is initialized to NULL. -- --The return values of this function are: -- -- LOCAL_SCAN_ACCEPT -- The message is to be accepted. The return_text argument is -- saved in $local_scan_data. -- -- LOCAL_SCAN_REJECT -- The message is to be rejected. The returned text is used -- in the rejection message. -- -- LOCAL_SCAN_TEMPREJECT -- This specifies a temporary rejection. The returned text -- is used in the rejection message. --*/ -+#ifdef DLOPEN_LOCAL_SCAN -+#include -+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; -+static int load_local_scan_library(void); -+#endif - - int - local_scan(int fd, uschar **return_text) - { - fd = fd; /* Keep picky compilers happy */ - return_text = return_text; --return LOCAL_SCAN_ACCEPT; -+#ifdef DLOPEN_LOCAL_SCAN -+/* local_scan_path is defined AND not the empty string */ -+if (local_scan_path && *local_scan_path) -+ { -+ if (!local_scan_fn) -+ { -+ if (!load_local_scan_library()) -+ { -+ char *base_msg , *error_msg , *final_msg ; -+ int final_length = -1 ; -+ -+ base_msg=US"Local configuration error - local_scan() library failure\n"; -+ error_msg = dlerror() ; -+ -+ final_length = strlen(base_msg) + strlen(error_msg) + 1 ; -+ final_msg = (char*)malloc( final_length*sizeof(char) ) ; -+ *final_msg = '\0' ; -+ -+ strcat( final_msg , base_msg ) ; -+ strcat( final_msg , error_msg ) ; -+ -+ *return_text = final_msg ; -+ return LOCAL_SCAN_TEMPREJECT; -+ } -+ } -+ return local_scan_fn(fd, return_text); -+ } -+else -+#endif -+ return LOCAL_SCAN_ACCEPT; -+} -+ -+#ifdef DLOPEN_LOCAL_SCAN -+ -+static int load_local_scan_library(void) -+{ -+/* No point in keeping local_scan_lib since we'll never dlclose() anyway */ -+void *local_scan_lib = NULL; -+int (*local_scan_version_fn)(void); -+int vers_maj; -+int vers_min; -+ -+local_scan_lib = dlopen(local_scan_path, RTLD_NOW); -+if (!local_scan_lib) -+ { -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - " -+ "message temporarily rejected"); -+ return FALSE; -+ } -+ -+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major"); -+if (!local_scan_version_fn) -+ { -+ dlclose(local_scan_lib); -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " -+ "local_scan_version_major() function - message temporarily rejected"); -+ return FALSE; -+ } -+ -+/* The major number is increased when the ABI is changed in a non -+ backward compatible way. */ -+vers_maj = local_scan_version_fn(); -+ -+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor"); -+if (!local_scan_version_fn) -+ { -+ dlclose(local_scan_lib); -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " -+ "local_scan_version_minor() function - message temporarily rejected"); -+ return FALSE; -+ } -+ -+/* The minor number is increased each time a new feature is added (in a -+ way that doesn't break backward compatibility) -- Marc */ -+vers_min = local_scan_version_fn(); -+ -+ -+if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR) -+ { -+ dlclose(local_scan_lib); -+ local_scan_lib = NULL; -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major" -+ "version number, you need to recompile your module for this version" -+ "of exim (The module was compiled for version %d.%d and this exim provides" -+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, -+ LOCAL_SCAN_ABI_VERSION_MINOR); -+ return FALSE; -+ } -+else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR) -+ { -+ dlclose(local_scan_lib); -+ local_scan_lib = NULL; -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor" -+ "version number, you need to recompile your module for this version" -+ "of exim (The module was compiled for version %d.%d and this exim provides" -+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, -+ LOCAL_SCAN_ABI_VERSION_MINOR); -+ return FALSE; -+ } -+ -+local_scan_fn = dlsym(local_scan_lib, "local_scan"); -+if (!local_scan_fn) -+ { -+ dlclose(local_scan_lib); -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " -+ "local_scan() function - message temporarily rejected"); -+ return FALSE; -+ } -+ -+return TRUE; - } - -+#endif /* DLOPEN_LOCAL_SCAN */ -+ - /* End of local_scan.c */ -diff -ur exim-4.92.orig/src/readconf.c exim-4.92/src/readconf.c ---- exim-4.92.orig/src/readconf.c 2019-01-30 14:59:52.000000000 +0100 -+++ exim-4.92/src/readconf.c 2019-02-16 18:18:46.013947455 +0100 -@@ -199,6 +199,9 @@ - { "local_from_prefix", opt_stringptr, &local_from_prefix }, - { "local_from_suffix", opt_stringptr, &local_from_suffix }, - { "local_interfaces", opt_stringptr, &local_interfaces }, -+#ifdef DLOPEN_LOCAL_SCAN -+ { "local_scan_path", opt_stringptr, &local_scan_path }, -+#endif - #ifdef HAVE_LOCAL_SCAN - { "local_scan_timeout", opt_time, &local_scan_timeout }, - #endif diff --git a/mail-mta/exim/files/exim-submission.socket b/mail-mta/exim/files/exim-submission.socket deleted file mode 100644 index b9593e2..0000000 --- a/mail-mta/exim/files/exim-submission.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Exim Mail Transfer Agent (message submission) -Conflicts=exim.service - -[Socket] -ListenStream=587 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/mail-mta/exim/files/exim-submission_at.service b/mail-mta/exim/files/exim-submission_at.service deleted file mode 100644 index 4f90cd8..0000000 --- a/mail-mta/exim/files/exim-submission_at.service +++ /dev/null @@ -1,11 +0,0 @@ -# It doesn't make sense for this to be separate from exim@.service -# However, I couldn't think of a way to have two .socket files point -# to it ([Socket] Service= is rejected if Accept=yes is set). - -[Unit] -Description=Exim Mail Daemon per-connection server (message submission) - -[Service] -ExecStart=-/usr/bin/exim -bs -StandardInput=socket -StandardError=syslog diff --git a/mail-mta/exim/files/exim.confd b/mail-mta/exim/files/exim.confd deleted file mode 100644 index 1534d9d..0000000 --- a/mail-mta/exim/files/exim.confd +++ /dev/null @@ -1,5 +0,0 @@ -# Command-line options for running exim -EXIM_OPTS="-bd -q15m" - -# Additional flags passed to exim_tidydb upon start (e.g. -t 7d) -TIDY_OPTS="" diff --git a/mail-mta/exim/files/exim.logrotate b/mail-mta/exim/files/exim.logrotate deleted file mode 100644 index f54f8c4..0000000 --- a/mail-mta/exim/files/exim.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/exim/exim*.log { - daily - missingok - rotate 28 - compress - delaycompress - notifempty - create 640 mail mail -} diff --git a/mail-mta/exim/files/exim.rc10 b/mail-mta/exim/files/exim.rc10 deleted file mode 100644 index c44dba1..0000000 --- a/mail-mta/exim/files/exim.rc10 +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - need logger - use antivirus net - provide mta -} - -tidy_dbs() { - local spooldir=$(/usr/sbin/exim -C /etc/exim/${SVCNAME}.conf -bP -n spool_directory) - local db - local ret=0 - ebegin "Tidying hints databases in ${spooldir}/db" - for db in "${spooldir}"/db/* ; do - case "${db}" in - *".lockfile"|*"*") continue ;; - esac - /usr/sbin/exim_tidydb ${TIDY_OPTS} "${spooldir}" ${db##*/} > /dev/null - : $((ret += $?)) - done - eend ${ret} -} - -start() { - # if you use multiple instances, make sure you set spool_directory - # in the configfile - tidy_dbs - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/exim --pidfile /run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name exim - eend $? -} - -reload() { - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile /run/${SVCNAME}.pid --name exim - eend $? -} diff --git a/mail-mta/exim/files/exim.service b/mail-mta/exim/files/exim.service deleted file mode 100644 index c8a61cd..0000000 --- a/mail-mta/exim/files/exim.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Exim Mail Transport Agent -After=network.target - -[Service] -Environment=QUEUE=15m -ExecStart=/usr/sbin/exim -bdf -q${QUEUE} -ExecReload=/bin/kill -HUP $MAINPID -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/mail-mta/exim/files/exim.socket b/mail-mta/exim/files/exim.socket deleted file mode 100644 index 36d2868..0000000 --- a/mail-mta/exim/files/exim.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Exim Mail Transfer Agent -Conflicts=exim.service - -[Socket] -ListenStream=25 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/mail-mta/exim/files/exim_at.service b/mail-mta/exim/files/exim_at.service deleted file mode 100644 index 19c07a5..0000000 --- a/mail-mta/exim/files/exim_at.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Exim Mail Daemon per-connection server - -[Service] -ExecStart=-/usr/bin/exim -bs -StandardInput=socket -StandardError=syslog diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml deleted file mode 100644 index 6205114..0000000 --- a/mail-mta/exim/metadata.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - grobian@gentoo.org - - - Exim is a message transfer agent (MTA) developed at the University of - Cambridge for use on Unix systems connected to the Internet. It is - freely available under the terms of the GNU General Public Licence. In - style it is similar to Smail 3, but its facilities are more general. - There is a great deal of flexibility in the way mail can be routed, and - there are extensive facilities for checking incoming mail. Exim can be - installed in place of sendmail, although the configuration of exim is - quite different to that of sendmail. - - - Adds support for Authenticated Receive Chain - (ARC) - Adds support for Distributed Checksum Clearinghouse - (DCC) - Adds support for DNS-based Authentication of Named Entities - Adds support for DomainKeys Identified Mail - (DKIM) - Adds support for a DNS search for a record whose - domain name is the supplied query - Adds support for Dovecot's - authentication - Install local_scan.h header to compile separate - dlfunc libraries - Adds support for DMARC - Adds support for Delivery Status Notifications - (DSN) - Patch providing support for content - scanning - Adds support for lmtp - Adds support for UW's mbx format - Adds support for Sender Policy Framework - Adds support for Sender Rewriting Scheme - Add support for being behind a proxy, such as HAProxy - Require pkcs11 support in net-libs/gnutls with USE=gnutls - Adds support for querying dev-db/redis - Adds support for Per-Recipient Data Response - Adds support for Transport Post-Delivery Actions - - - http://bugs.exim.org/ - - - diff --git a/media-fonts/lato/Manifest b/media-fonts/lato/Manifest deleted file mode 100644 index 6da5f33..0000000 --- a/media-fonts/lato/Manifest +++ /dev/null @@ -1,19 +0,0 @@ -DIST Lato-Black.ttf 664748 BLAKE2B f48f577eae2867dad5968f3726002aa1808783b510985e5be7d12ef6a6037369849e2a9968d6fcfddbc930430fcb7d764c5ca685a0d8178d47bcbf4e31a3d7a8 SHA512 d48984df1bb4c0402a77219d57514d41231e6b4b0c643c8f148256ddce3c1847c4b13d0779a3688d5ad5ed181b7d9d0ef529e301b59605febd625e71f71584cf -DIST Lato-BlackItalic.ttf 698264 BLAKE2B 6f01b32be26008ad2319f96d4230ea7eea075612c6abdd4d9c987e38d1761d84f38e0a975ff9916194508d691985acb445a05f195a29f9a243ac26f6e98970c0 SHA512 702c393b1ccb5821958ed2687ca18055ee59e2a88a49853b6c155d60498afe289fbf83f6223519dcb3ed6b88361ae5af8c78704c82cb0a3f48cb892cdf87670e -DIST Lato-Bold.ttf 656544 BLAKE2B a7a57033aa65b14d0bd861f9bae6e035779988a304169d32d8489eb5e361add595716eb52fa71ebd8336ad717d46e474af8a7ab22cf33ce973a9936ec1fe15c7 SHA512 097cd16a3a037b4257fc02b4c5efe1aca0b316ab96bb73ffb59aba243b32a45e0cfd1d760c7c4c238c4cf949e22bce22a67c757556314f1147db76798022919b -DIST Lato-BoldItalic.ttf 698364 BLAKE2B 65c122051a74fe0294fa955e275f2fe4e46975cae6e422cafd5e2e95ce6b4512912a0e6ec48f168e6d684be34af61346e523bca9b2af147dafc0390f49f4e0df SHA512 921268e7a331f98c927a38f23346dfc5d739cf203455c621c1f8ea92ba64120ff6d4f6d0672b7ff16d5925e62b1e00b278fcc11c5019a99361e0901970a7b0e2 -DIST Lato-ExtraBold.ttf 613920 BLAKE2B 67823075373006e71a19a60c79311093f3e2fe420baa2f46a4467839566f9f4867a2339f8920ee5c9694f491752d6f7c3bcee8c07bbff14ca51add142090df58 SHA512 2761564aa78e5b6ddce408931094c1d467062c9606993eaab8ad42f360d12376dd41674e7e089c1431edfbeacf57fbcd8bc7fc8316e5e4c174d55dc10773a719 -DIST Lato-ExtraBoldItalic.ttf 671876 BLAKE2B 4dfc3897a17d74f18b2be85a2867767300c45504941aed23b3936378b0ff8303a4665769141a264d84e662cc01d9818892720697886e6319a5c526887e544052 SHA512 c2bfa7593ef4d316dfc6764c5a3be85641efde43e7c58dea561f2e767ee778ce0d2c16f7b442489d742ae7d53e575fa02f1137779d55980197b64f642101675c -DIST Lato-ExtraLight.ttf 626624 BLAKE2B 2be31aba8548bc9afccf148611ea57f3c310f6d9c585ff0d081c0eb164ec5d08e03f6086912ba07d084db82f40e8657c106a6a7d28784e7b75bfaf229c0637d5 SHA512 21a485d77ac1fcc484e516e140988eb5469eae3ea33691b748a66a11fe1efdb0fc026cd52217983f353a7807dc2fbacdd2044cb573f993382515d32c4b5f9f59 -DIST Lato-ExtraLightItalic.ttf 653640 BLAKE2B ee0a539776e617e50810e8635a18d6470a7f28f91d6f284bdf8f9345cf3222476a7b8fc3736bc46e492d1d584cbec30430084e760f61c16c59fff0371ec61e34 SHA512 cfd3ce1491d0d06596a79e39ea14cd07841e5ae2a9818a5e885d853cccdf1f2ba18e15dfcb6a142ffd88fb719375bb13cfe0d91ac6d06ecce494b676390238d9 -DIST Lato-Italic.ttf 722900 BLAKE2B a4ddefa0112e1ebb4affcc8ed3828933d1af5b765d6245a3cc800faaa8ec1c68410dfeff1757b87f3ee79e9a2f29591e8ecaded9c4a3c9e815a594e7c050d9d8 SHA512 76dd62014b200d287c750802a88dd38f0b855d0f62bf951bc0ba2fda6ce3a9ecbd4b4022a0dfbd0ef124e1e71109a1fddc06898c3cfbc87eab612cff5605459a -DIST Lato-Light.ttf 643884 BLAKE2B 432b0e098c34fd3fd8102f1ada160ec531e3f9f3612fb51e88aff8844c6015a07919ce78cc88e636b57c593f9d6ec1ac84bd211b9fd491cdc704cbdba455e8f0 SHA512 c5685218591b2521b8d4d415959d7c28b4485659613eb25c1d77997c52a49f148ca57a47a3da441ea355ef444a52ece4c5c204e1a1adaefae0152c05cfa4eaf9 -DIST Lato-LightItalic.ttf 657552 BLAKE2B a0ae063de9a0e32b44647469633cdb18f2cbecf32fd237ed67ef1d39ee85a2bc00f03faa27fb83bda86b0799639831882387954f9cbfc7de7ba3a7304f6efa96 SHA512 60fa9a5fb24664733bdb8729d219d055d0182d2a2abccce7370ac1f035265443d9661252108473e63bde25566680a599d521bffca361989e9a6abde44df39a94 -DIST Lato-Medium.ttf 636396 BLAKE2B 4f514ee460ebe727554df1eb54d9909774106afca054338eacc4fb31da3e8d928fc56d0bbf8912032d7d40b27b61056c34e87c3fb2cab7a55247281af69e7564 SHA512 da40c215356b4f588a8f30c63d3303ace637f1eeef1c93c29561e420dad610107e5e66542e3dbbf23a13db60333d89d740f9a147b071fecc48b077fbdd4f4514 -DIST Lato-MediumItalic.ttf 694924 BLAKE2B 6a7bea8638004cfa579ee32dfee44c42f7195fc7d2f7cb5bfe51a52be24e1a459fac3c331b5ab02010af2a4404629b42056355a7b228ca8fa1c6a993575403d3 SHA512 711200db3f07caa48b700d5c7a67ceeeda0ff9e91043826ccfde64741ada7a4cc22b91e262169810562f75755b630857df6a815f8c7f2406488d5557e9ceb97d -DIST Lato-Regular.ttf 656568 BLAKE2B 804ab360bb26ade017a80e20fc2d5ed3b38a040c36e1fe867ea6e9ab1b3b9e31be3f11a179adeffe2fce7be224abff2a2daa7376809e7a0027f3e08bb58b816d SHA512 be6667e1f6a50e23ada324b52fb614ca82848600a82f6edc4ec881a3c5f5d9f0477580af2421f42b94e1b529e07ddda7d2d9231b128d93056b4a327d63fe7222 -DIST Lato-SemiBold.ttf 668548 BLAKE2B 6a0f448aee7c23e66cf169e5a0fa8cfd52546a041dd3297188317cafdd3b494b8578f5c62c2c8938afac5f990c9469691e6e7010fd8aae8a19cfd12b83df428c SHA512 582a4eba883464a73a521227c0fbdcc9e47d9cfbf77748b3fcd1b376cd2f739862bbe45c322f8418d6319392a61edc1e0edac0a931a83462115e252922a87efe -DIST Lato-SemiBoldItalic.ttf 697364 BLAKE2B e66eac44a4e9a7d550f30f716f4dedf03aeb513588b15b8094762eda8d49dd277e44c54e963694440cbccde21ef47cbccbf5dde98e62fddf9c5032aec3f11b90 SHA512 d25c934693cc3a3a0ec5df7aeb3d4ecbec317cb1573cb7b3cb79cbfd9023d0526f9ee9059946168be61275df38c29f93eeee245a2fd022a8ae8537d8d301b395 -DIST Lato-Thin.ttf 584056 BLAKE2B 961163b60b0ce65b65b83a32112dc8327f86a8c018254f708beee4848144fc3b165fa057f90697c47e8ae5288c0819512cd34bb4ba3b81dd410124632c883dc5 SHA512 6fad8fcdb4884a05201a183ee4ed4cf223748b4c3dbb7273eaa201dc51f0b76161428b06ae8c4c727ad99abd9d072bbc5c3cf9ef1e128370101f170aa78f5a6c -DIST Lato-ThinItalic.ttf 608716 BLAKE2B 5e60737b64e80211e77b3daf56e97284382cdd683071aabd185ab069c4168c0b033607260bd12a30b600d8b735d7910d1ac31b278500c36cacc998743bd946e6 SHA512 931c4245a79bafe01e85489ec4d2dc29b7d815185b62b3e29d17e7b2d1a66b303d960acccfb07906ff56460fa5319f6d75a938f36b87cc31f08609f892a34b34 -EBUILD lato-1.104.ebuild 1470 BLAKE2B 600e94b1e3041eb544c67fd23853529451028d3c48786adbf859628fc7f25151455c51529da088f74cb51b487d77590056eb16d1d162d29873df49ea128b3905 SHA512 f8b92ef4d192f795bc9de924e9f93193decd4f0d23d95ed13158a82948ac8cb6c481bbd929e2dc9ee4ffb16d3ad857bda5ac0a5fc89cfc1d2adcb73258e2090f diff --git a/media-fonts/lato/lato-1.104.ebuild b/media-fonts/lato/lato-1.104.ebuild deleted file mode 100644 index 7175910..0000000 --- a/media-fonts/lato/lato-1.104.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -EAPI=7 - -inherit font-custom - -DESCRIPTION="Lato. A sans serif font family by Łukasz Dziedzic." -HOMEPAGE="https://fonts.google.com/specimen/Lato" -LICENSE="OFL-1.1" - -SRC_URI="https://github.com/google/fonts/raw/master/ofl/lato/Lato-Black.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-BlackItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-Bold.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-BoldItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-ExtraBold.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-ExtraBoldItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-ExtraLight.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-ExtraLightItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-Italic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-Light.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-LightItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-Medium.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-MediumItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-Regular.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-SemiBold.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-SemiBoldItalic.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-Thin.ttf - https://github.com/google/fonts/raw/master/ofl/lato/Lato-ThinItalic.ttf" diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest deleted file mode 100644 index bb2f100..0000000 --- a/media-fonts/noto/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST noto-20170403.tar.xz 11083152 BLAKE2B 8281cc19a100d1cbf7f57fba9cba077bb0005f7296f58d48247bef6c804b53597ff359dfab7b7d851e42c0294c757f311979b98dc9f1c22e2d3f3fabe4db77e7 SHA512 f8f1414b5b6f793e86ef3cc6a6320c4545f079b337c7672cb8cccc3c50d21d353d81557da4a555cdb6524c79be3e4c167f7d5aac102c38d64926f3b1887ca7f3 -EBUILD noto-20170403.ebuild 817 BLAKE2B a76982655e79b2e982ba7f5328c3cf8ed4a4f26cfb6e1754e665455a3d35a4191fea99bc18beae8c4cbbf79a1981b731e1e9ab7525ee2c74ff8e498aa8e9fa85 SHA512 ee77227ea727f952296723f1d5d2543aa7b4392d0ce0436b464b5c589b2ffdfea5d531fcf23cc180454a33572bcaefe04cd49e2f0dfa43f04e90359305592a8b diff --git a/media-fonts/noto/noto-20170403.ebuild b/media-fonts/noto/noto-20170403.ebuild deleted file mode 100644 index 6de30c9..0000000 --- a/media-fonts/noto/noto-20170403.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit font - -DESCRIPTION="Google's font family that aims to support all the world's languages" -HOMEPAGE="https://www.google.com/get/noto/" - -# https://noto-website.storage.googleapis.com/pkgs/Noto-hinted.zip -# Version number based on the timestamp of most recently updated font in the zip. -# When bumping, remove *CJK* and create a tarball (xz -9 gives the most -# compressed tarball) -SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - -LICENSE="OFL-1.1" # https://github.com/googlei18n/noto-fonts/blob/master/NEWS -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" -IUSE="cjk" - -RDEPEND="cjk? ( media-fonts/noto-cjk )" -RESTRICT="binchecks strip" - -FONT_S="${S}" -FONT_SUFFIX="ttf" diff --git a/media-fonts/rubik/Manifest b/media-fonts/rubik/Manifest deleted file mode 100644 index f50a49b..0000000 --- a/media-fonts/rubik/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -DIST Rubik-Black.ttf 510760 BLAKE2B a656a198449bfe5422c31b61f5d567e0238fdfceb032168fd5fd5c84d2fc63d66517a2b5f0c3e4d28e9c527099f8904ef73f33af3f823d250528a8b67940434a SHA512 5362a67e56be5f5bee28d7c5a7389ddac4faa6cc32f5bcf1173b1f46be8209afe9976cb81c9924469891eba04e8650c10d170de81cffbf3cd899ba2b89dc5640 -DIST Rubik-BlackItalic.ttf 540716 BLAKE2B 1855fb65afe489a049e1678dda93db364671c0d2ca9aa725810f5a5799bf50da54e4db35518e38475835326a7827433ae67e634c2dcbcefdbf667edb9f8a4267 SHA512 5f31e31b82d750c5b535e8d21b5232ab62aec1b51810a2c2dcd30b3bade6d679fddfb3e121dcd4585f08057cfdab79564183b47ac55bd4baf88bd69a046d9b55 -DIST Rubik-Bold.ttf 529376 BLAKE2B 0fc042a4f92e8663ac3e099745bc5aa4ca4a8fd4f12ba563807cc3041ff1394b343b83152cd38db35b035e218300917d89a863e3e843fba83e8a97e2d7cce57b SHA512 73708010f383ebc7387b6760bb9ecb827c932c048e7aebff3373eea1efd4437ba8d30c57e2cbc1c5d30d6e5847e2cb7ce94afebbd085cf16c89c5b27bbfb23df -DIST Rubik-BoldItalic.ttf 574128 BLAKE2B c46b9dde24abc6de8f908d5c2d1bd2a51c12a19d9d61e8607b6f375f8819762f51b225467918e3f7a0cb2e40ebab135ccfd198dc5de4a81c53672f9a92ab90e5 SHA512 5b4425d6ed0f442db9e94c95f62da7ac26757ac152a150b81e1a98b8bcae7fe2491c3d95c75f8b40efd62325b05e4723fc8057225a9028326244acc83da71d18 -DIST Rubik-Italic.ttf 582340 BLAKE2B 41156a1febcb290cb13b5a3a364da0b76b81d5fb666d624f24b4a95e775ce8e8bf4c415cb142afb077c6d9743c600247f9f1c34cb22dac7af89b9d50b1e12da9 SHA512 ec944037586558afd181cae34a9b440de259ce25401085f47d61c79c2e0c9fd2a2e47e880a3f8bd769e7e23653ab368903cc02a9eef3f7cdf08f455a1a7d891c -DIST Rubik-Light.ttf 523812 BLAKE2B c1a6407f7031f2f745622636e91fa75879179f215861d8faa7695efd9fbd2c84e10ac510037a0676e5952a7c3c06f7aa14f075310e9ef476ce1fd8312f816b6b SHA512 2eb14867eb537cf25fe2f5e248c0f9bcb4f37c55fa6328ae781211d1445ff0c68746d6cd5e784818cfc0347dd5004e0528f39cd9c62cd2a5d37863c3a306059d -DIST Rubik-LightItalic.ttf 586072 BLAKE2B e29df7f5a6d821838605c90651091f8665fbaf40cd0226691fb11e8781eefb450a900e5d2f3881a1a3e3c714978f51ae7ee87f26ec4c1c28f8b87cb7434668cf SHA512 c41f494c0448bcd45825d85ec7930c225709c33c7b84975428239ff0f3bbe5883d7960e3d47d0806af3b1e22354095b34a73dc66eb2b23948227fa8a72e387e1 -DIST Rubik-Medium.ttf 527560 BLAKE2B a540456fd5eb439a5c0968af25e43ff5082392a254b3affdd9c9627868d1194cbf4a734702de2f3b33d1e93b567c79c096d43dc4e0b2f76bbf1f4a004704dc10 SHA512 ab860e75567b1777ca3ccef7c8de53fd8afe3998d742c90277a077ba584eb591f9bdbbd4397305d2340faeaa319ac06c1a0f9b88d099e58ff18823954e5be657 -DIST Rubik-MediumItalic.ttf 578196 BLAKE2B 5ab3de390e478b96f38eb0dab4c2cf6c386f88480a11396bcb5bd010209c4655960aa89df2dfca90de94d592e6b52beacea737f5e97c38a938e7b53d58ce9814 SHA512 c8271918b6c56dd65755eb6af309ce74f2bc2a77e1d42e1a550620f784c63c977d06a74c37ce298b7839beb6741b683ff2caf069c3593d7f2c7a7340c2303509 -DIST Rubik-Regular.ttf 529936 BLAKE2B ca1b18629d09425c8484f8244bfe956f599a3c898c43b6d113113b84588ac660f8e3757672804a138723e251b0e3f54e8be14ffdaf86cdc35b8d0fa2704e39e4 SHA512 36ce395eaf7b7c07a6c090a07cdc8a18df121e4d324ccd0bcb9679b99dac677d000625865df24ce3f7d1f5a1fc6ba01f66d78689ad48cc6c4a6c3313561f0e51 -EBUILD rubik-2.100.ebuild 961 BLAKE2B fa220694bf818d295274b02b92bb13194a3211316f1ef9728e2cb34ac237775245f518f7cecc908d018b4d7a0bf79bd067ad59934f08150ea6a241762fc50420 SHA512 74010fa77d1cf754a08aa70f1deb84b00967b90696492b055a4a679c1d8e4db9fd69d10e08d708fb6e90c2b523c7a908a16ad3ea7302cd57e77b63a3f3df3408 diff --git a/media-fonts/rubik/rubik-2.100.ebuild b/media-fonts/rubik/rubik-2.100.ebuild deleted file mode 100644 index c41bba4..0000000 --- a/media-fonts/rubik/rubik-2.100.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -EAPI=7 - -inherit font-custom - -DESCRIPTION="Rubik. A sans serif font family with slightly rounded corners designed by Philipp Hubert and Sebastian Fischer." -HOMEPAGE="https://fonts.google.com/specimen/Rubik" -LICENSE="OFL-1.1" - -SRC_URI="https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-Black.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-BlackItalic.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-Bold.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-BoldItalic.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-Italic.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-Light.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-LightItalic.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-Medium.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-MediumItalic.ttf - https://github.com/google/fonts/raw/master/ofl/rubik/Rubik-Regular.ttf" diff --git a/media-fonts/sourcesanspro/Manifest b/media-fonts/sourcesanspro/Manifest deleted file mode 100644 index 858ca62..0000000 --- a/media-fonts/sourcesanspro/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -DIST SourceSansPro-Black.ttf 288824 BLAKE2B dcf9a283364200541e422acfd03302c3f2eda2fcee001127a3175cef4d7339cdab2244668645b4508ca125b8ae514dcc4c8be3fa7513d35e4f24c95bc1abbedd SHA512 94e8e169a00a3b8f510a2666d3d972bfa43aa69e064ae02c5ec398d425c8f21c96406dc3dc8de8a8945d3972a18b81be63c567cef77b6ec95157ab0ceff3209f -DIST SourceSansPro-BlackItalic.ttf 102944 BLAKE2B 37b42b7b05bb0dd8ab663f31fcf7347f6fe04c5a96d3777b7989f43000a3a8f866cf66cdbe2fb1b70ab4701f60e7d5098a05224479d300ba1a65313ad2376821 SHA512 99323afbed7a1e97cb8aea02dda92338b3e02bbc44929a1f2a5638e45e60308cbb705edecaaa80679aebae3ac0bd9caf76ac4df8734d02ed9841bbe32166e5bb -DIST SourceSansPro-Bold.ttf 290916 BLAKE2B 09ddaee438329bac66b1c689f81ca371670008f1956a4edadb3f3d2643397302272fab66f9ba53862be53930bbccfd5bba2a56de02fb588d035d6ebc8df76dde SHA512 d3738085d8f4891bf1a475a52108a4298b07c8959100e32d1c79038af8b39c182e45fb9d531dd75f7bd2a514d70cf808649dce83d3558be236c74160923ff794 -DIST SourceSansPro-BoldItalic.ttf 103200 BLAKE2B 3cc637da2869ff8ef66274ad77052921050d4c85f3c24e9f7ec380eb480e1408b2c6535a8950fc4f99935fc539f70cd24b802deda20332b9290011440e2fa30a SHA512 157af2eb0b1f4c5a9537c9b4cc194806f93363cb1af7ee52b9b04323462ec139dd3c33b36041e168ed97c03c0049d0674dad40b422c003e36c251f603d63268a -DIST SourceSansPro-ExtraLight.ttf 291112 BLAKE2B 582a27d9e3042d2c8082a9d3dbb883edaa04e783fbf26232cd347edd22c753d7b6ddfaca7d378bd8cca657365e9b36b5ff3b21ebfd2a599a2d2315b2603f0db5 SHA512 4dd6cbfd4f4dee41aa0027b42fa9d84ee32cb60cf1fcbd004e88d7445e7c0384953f08e4aa823a05aae5793aa6fac3b5c6f1491577f2e8c7750e68462b1bd270 -DIST SourceSansPro-ExtraLightItalic.ttf 104304 BLAKE2B 1288032210f985c5e5300986454e9b53a903012279225dffbea6a4734cf55f3b3ec69ab1aa2811401231244533b5ae90a25929cc381b41a54749e1b84f7f2856 SHA512 796e0ba30c1dcb69ef188c046478f13f40927381c8ad823a2fa899a084c7f6ab1652931bbaaf4afc91226e467bf8fefa2c94af7ca228afa93c1d853f99fc9868 -DIST SourceSansPro-Italic.ttf 103828 BLAKE2B 592b955ceccbfab00f7001cfac501349fe207fd909e95b6ac9c10f1f34150c2971155d4aba7aff3b5fe5c8bb6b14235fa4089b5d78bd4ee8aa1b75b9f68396ac SHA512 62310aeaf8c7c21c884ea8e670f01d9c3b71da8349c3d13a6bc699d012de80ef13ac609f26be54ded1e6d0c6ccb03ddf1f3128bc6a44312707d725befec37520 -DIST SourceSansPro-Light.ttf 292680 BLAKE2B e718e5d3c875d752dd6c34193becccb8029a888e51d8b846960da9d3c013b24b87120c76f099d5685322fa283028cbceae43999a93865abca9bea73d83e9cf65 SHA512 2e9fd0558717b954ee73848c95c7f5495f4c907192ba33c2f2a615621dc9174a3f544e44cbdb086716b48b993b724e81484305eebf0c69666ea48919e3476e3f -DIST SourceSansPro-LightItalic.ttf 104156 BLAKE2B 0272e135de170a7f1f89485ff356354f432ec920e5ca8368da8fa3190a637f356f913231e95e324a51e2cb584183961fb8dc8cf24fd669fb4f50f2cbdb442a19 SHA512 e9040d395899a02ade6bcf082353828554a0151ab979eab8d9c47075eccbf065f111ca82cf898144a35b351c6ee85b7c714d167271a39e0c78acebd84842e166 -DIST SourceSansPro-Regular.ttf 293516 BLAKE2B cd1c5225e59b502df7982b87af90a4d5701e31b6538c9c9b1b29d9c970508dc8dc0198d834b136a660112aef77d1762496f1c88efbc35ecce1f9360f644d2bd7 SHA512 cf37ee1e2c3574de5819e5c5328ee010832987750a3cdc0bc43f102c3bdafd3993a9984c8d51f66b18198e80049c0323fa2f8f692025d8947f9580eda6a7a5b2 -DIST SourceSansPro-SemiBold.ttf 291864 BLAKE2B fe6e122211bd99ddc3362aaf532425cbffe1b0cca99016af44581c709512de5f9a4cb5da5ce7aa05f8af64438aa7636a174e2a8b0a795cf9344cbbf2816290a1 SHA512 1636e6e468218fa20f505b84d080c6a4ca4e06caab7062f2dd27590acb2623651c24e3d42195fee3126d58e57886b59463cca61bb60353e19afd7d721a869279 -DIST SourceSansPro-SemiBoldItalic.ttf 103556 BLAKE2B 584dd49787e17b2bd0b19856f4d96ddc65e075c6a4661404a1f28e9fcb992f6270790b355e9280f4008fe95aaf0bc354f49be1a9a24218204124942ed647385b SHA512 c6cfb090f6c19b3c90d709ff1255ad9ede2283c4ac0df98e05895c7c1ab8bf98323a6f851efdd45fc1974c4283d28addd74ac9a0c72c2d3f7c7c03bab2651ad9 -EBUILD sourcesanspro-2.021.ebuild 1270 BLAKE2B 46ee15827f2d785882db366c1513b1fdc6a9aab9efe71d118fd8e654be3888e9845b9c001f735885e76c57910b5843d0d2dc8fd6f01a0cead37b9e363f4206c2 SHA512 4f9f05ada2920d067a82ef78188327d11b653417d8cdec08227d3bf3be5638da9a7489aa2bdfaed5d11d3dc05d71885dd6fa386d9e763730eeeb7fd50a3767b0 diff --git a/media-fonts/sourcesanspro/sourcesanspro-2.021.ebuild b/media-fonts/sourcesanspro/sourcesanspro-2.021.ebuild deleted file mode 100644 index cbef413..0000000 --- a/media-fonts/sourcesanspro/sourcesanspro-2.021.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -EAPI=7 - -inherit font-custom - -DESCRIPTION="Source Sans Pro. A sans serif font family by Paul D. Hunt." -HOMEPAGE="https://fonts.google.com/specimen/Source+Sans+Pro" -LICENSE="OFL-1.1" - -SRC_URI="https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-Black.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-BlackItalic.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-Bold.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-BoldItalic.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-ExtraLight.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-ExtraLightItalic.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-Italic.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-Light.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-LightItalic.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-Regular.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-SemiBold.ttf - https://github.com/google/fonts/raw/master/ofl/sourcesanspro/SourceSansPro-SemiBoldItalic.ttf" diff --git a/media-fonts/symbola/Manifest b/media-fonts/symbola/Manifest deleted file mode 100644 index 058faeb..0000000 --- a/media-fonts/symbola/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST symbola-11.00.pdf 1610961 BLAKE2B be2ed31f7d6e2401d76292a417a1ef4ee2d9974b0ab84abb5febccbecee0e3e625fb234a8950114ef13b1ec1242c7220a16d819bc71c245947d9c75a60a036f0 SHA512 92cbc6f0953cc5a8bb7ba5306e9e1ddf2d1081a94b2ecbbafb8c8e8c6cece4e20d9d3367ff67ae3688e2cb88b67c69716b3bd058ab80d2efa6dd0e064b032697 -DIST symbola-11.00.zip 2907542 BLAKE2B 38da4a33acda4d7177c70bcf832000647ad99c3d8aa6c15006792db1fdc5641399d5080e7f2970bcd321942ff87affa23a13c6c8239e104ee8817cde7140a6e8 SHA512 be7b3fd8b2070a6713b189c0ee0c6d8aef481eb0c7e476dabfa3eb1a599cc7f3a00f14d7b9ca1f563722d550c098f272f62bb99fc490aba8132ed5ae7de59a7b -DIST symbola-9.17.zip 4122777 BLAKE2B 60e7188366ff9204c41e42b99ee31242c0d2eefceb2bf663e6b68bb5a924a269d608d8ba2085e956dcb5d4c2c85d7a2993f199bdf8e0597d27e3d4bc34c50be6 SHA512 29c2141ba7d5be96b4d2faa52e4d2efbd1ff6a8368fdeae8986a4a3de50522a813c46efd462556b5b6c10bb97777ca068564b9dcdfd7961c485ece5fda18e04c -EBUILD symbola-11.00-r1.ebuild 677 BLAKE2B 6cdd1069f8d465d78f4761d035147de1c53e4f5af9954b879ab3ff70b61e3aac75b1d2a520534cd6c27215d97810665955f827d78ff8e85def8648aecf65c78c SHA512 19c584669d700eb59ba4bfefdc41144ce6a197ddbfddd0c5e9e561f049fb0df4f8cfda6a4e751715a015264d0a3427ff2d259c135e86197702fed3752bb88fc8 -EBUILD symbola-9.17.ebuild 601 BLAKE2B 23d962965678153378d65f22ece86796e6b2af91d82ac89525e5a79ddaee1f3d31c85e67fbbbc88758c25f86d74690836cdf1be1b3d48963f6302e0de6598720 SHA512 a85b90fbf601eabbf93a4c8adb499bb1ab21ec1122ec0d645a864ae8bb0bf211423e89a9e8f1c36984999616422941d46722284bca5a15563dffad21e3cdf5f8 -MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5 diff --git a/media-fonts/symbola/metadata.xml b/media-fonts/symbola/metadata.xml deleted file mode 100644 index 7c26ab5..0000000 --- a/media-fonts/symbola/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - chithanh@gentoo.org - Chí-Thanh Christopher Nguyễn - - - fonts@gentoo.org - Fonts - - diff --git a/media-fonts/symbola/symbola-11.00-r1.ebuild b/media-fonts/symbola/symbola-11.00-r1.ebuild deleted file mode 100644 index a73ffdb..0000000 --- a/media-fonts/symbola/symbola-11.00-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/s/S}" - -inherit font - -DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks" -HOMEPAGE="http://users.teilar.gr/~g1951d/" -SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip doc? ( http://users.teilar.gr/~g1951d/${MY_PN}.pdf -> ${P}.pdf )" -LICENSE="Unicode_Fonts_for_Ancient_Scripts" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="doc" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}" -FONT_S="${S}" -FONT_SUFFIX="ttf" - -src_prepare() { - if use doc; then - DOCS="${DISTDIR}/${P}.pdf" - fi - default -} diff --git a/media-fonts/symbola/symbola-9.17.ebuild b/media-fonts/symbola/symbola-9.17.ebuild deleted file mode 100644 index ae70f7a..0000000 --- a/media-fonts/symbola/symbola-9.17.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/s/S}" - -inherit font - -DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks" -HOMEPAGE="http://users.teilar.gr/~g1951d/" -SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip" -LICENSE="Unicode_Fonts_for_Ancient_Scripts" - -SLOT="0" -KEYWORDS="amd64 arm ppc x86" -IUSE="doc" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}" -FONT_S="${S}" -FONT_SUFFIX="ttf" - -src_prepare() { - if use doc; then - DOCS="${MY_PN}.pdf" - fi - default -} diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest deleted file mode 100644 index 4a8ecb3..0000000 --- a/media-libs/xine-lib/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f -EBUILD xine-lib-1.2.10.ebuild 5146 BLAKE2B e69301e844e4bf610228ba272a36b81fd357ef6597d18968f3ff91aa153dc89f85e93f51591959dd6e44aac30df6c51a100cc645e948aadb200764071c829944 SHA512 0a421c1b0775e7012e7cc20cdbf7fb5c71123f81e5101445a3621d79e0ceb91d00d41601b4fb2f50cc12ce6178db207605b79f1f18b73698ecff919c98c5fad9 -MISC metadata.xml 2498 BLAKE2B 949a34fcf5204424c2a565ce2329b3f878e4ef817882839bbec09a6d721a8756be6dc37eff2a0bb7e007d333e2bc4896ac6c853f7fe5b1f9c8f4ed3a66ada640 SHA512 f975a8763a3f31a27a769e4649cd7c6ecd113cb4fcd36556f5f7830b9de989be219a0c9f90db4a4df87e9ffd584d4c2e86346da084c95d32dc17adcc30f98c28 diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml deleted file mode 100644 index dddaa67..0000000 --- a/media-libs/xine-lib/metadata.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - media-video@gentoo.org - - - - Enable playback of Blu-ray filesystems using media-libs/libbluray - - - Enable support for DXR3 mpeg acceleration cards. - - - Build the media-libs/flac based FLAC demuxer and decoder. This - flag is not needed for playing FLAC content, neither standalone nor in Ogg - container (OggFLAC), but might have better support for exotic features like - 24-bit samples or 96kHz sample rates. - - - Build the gdkpixbuf-based image decoder plugin. - - - Build the ImageMagick-based image decoder plugin. - - - Build the media-libs/libmad based mp3 decoder. This mp3 decoder - has superior support compared to the one coming from FFmpeg that is used as - a fallback. If you experience any bad behaviour with mp3 files (skipping, - distorted sound) make sure you enabled this USE flag. - - - Use mmap() function while reading file from local disks. Using mmap() will - use more virtual memory space, but leaves to the Kernel the task of caching - the file's data. mmap() access should be faster, but might misbehave if the - device where the file resides in is removed during playback. - - - Use media-libs/freetype for font rendering and - media-libs/fontconfig for font discovery. Enabling this USE flag - will allow OSD (such as subtitles) to use more advanced font and to more - easily select which font to use. The support for TrueType fonts in xine-lib - is still experimental, and might not be as good looking as the bitmap fonts - used with this USE flag disabled. - - - Build the VDR plugin - - - Enable support for vidix video output. - - - Adds support for SIMD optimizations for UltraSPARC processors. - - - Enable VP8 codec support via media-libs/libvpx. - - - Enable support for XVideo Motion Compensation (accelerated mpeg playback). - - - - xine - - diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild b/media-libs/xine-lib/xine-lib-1.2.10.ebuild deleted file mode 100644 index 5e74cb9..0000000 --- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic libtool - -if [[ ${PV} == *9999* ]]; then - EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2" - inherit autotools mercurial - unset NLS_IUSE - NLS_DEPEND="sys-devel/gettext" - NLS_RDEPEND="virtual/libintl" -else - KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86" - SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" - NLS_IUSE="nls" - NLS_DEPEND="nls? ( sys-devel/gettext )" - NLS_RDEPEND="nls? ( virtual/libintl )" -fi - -DESCRIPTION="Core libraries for Xine movie player" -HOMEPAGE="http://xine.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="1" -IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl sftp speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}" - -RDEPEND="${NLS_RDEPEND} - dev-libs/libxdg-basedir - media-libs/libdvdnav - media-video/ffmpeg:0= - sys-libs/zlib:= - virtual/libiconv - a52? ( media-libs/a52dec ) - aac? ( media-libs/faad2 ) - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - bluray? ( >=media-libs/libbluray-0.2.1:= ) - css? ( >=media-libs/libdvdcss-1.2.10 ) - dts? ( media-libs/libdca ) - dxr3? ( media-libs/libfame ) - flac? ( media-libs/flac ) - gtk? ( x11-libs/gdk-pixbuf:2 ) - imagemagick? ( virtual/imagemagick-tools ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - libcaca? ( media-libs/libcaca ) - mad? ( media-libs/libmad ) - mng? ( media-libs/libmng:= ) - modplug? ( >=media-libs/libmodplug-0.8.8.1 ) - musepack? ( >=media-sound/musepack-tools-444 ) - opengl? ( - virtual/glu - virtual/opengl - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl ) - sftp? ( net-libs/libssh2 ) - speex? ( - media-libs/libogg - media-libs/speex - ) - theora? ( - media-libs/libogg - media-libs/libtheora - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - ) - v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva:0=[X,opengl] ) - vcd? ( - >=media-video/vcdimager-0.7.23 - dev-libs/libcdio:0=[-minimal] - ) - vdpau? ( x11-libs/libvdpau ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - vpx? ( media-libs/libvpx:0= ) - wavpack? ( media-sound/wavpack ) - wayland? ( dev-libs/wayland ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libxcb - ) - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" -DEPEND="${RDEPEND} - ${NLS_DEPEND} - app-arch/xz-utils - >=sys-devel/libtool-2.2.6b - virtual/pkgconfig - oss? ( virtual/os-headers ) - v4l? ( virtual/os-headers ) - X? ( - x11-base/xorg-proto - x11-libs/libXt - ) - xv? ( x11-base/xorg-proto ) - xvmc? ( x11-base/xorg-proto ) - xinerama? ( x11-base/xorg-proto ) -" -REQUIRED_USE=" - vidix? ( || ( X fbcon ) ) - xv? ( X ) - xinerama? ( X ) -" - -src_prepare() { - default - - sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die - - if [[ "${PV}" = *9999* ]] ; then - eautoreconf - else - elibtoolize - fi - - local x - for x in 0 1 2 3; do - sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die - done -} - -src_configure() { - [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519 - - local win32dir #197236 - if has_multilib_profile; then - win32dir=/usr/$(ABI="x86" get_libdir)/win32 - else - win32dir=/usr/$(get_libdir)/win32 - fi - - local myconf=( - --disable-directfb - --disable-gnomevfs - --disable-optimizations - --disable-real-codecs - --disable-v4l - --disable-w32dll - --enable-avformat - --with-external-dvdnav - --with-real-codecs-path=/usr/$(get_libdir)/codecs - --with-w32-path=${win32dir} - --with-xv-path=/usr/$(get_libdir) - --without-esound - --without-fusionsound - $(use_enable a52 a52dec) - $(use_enable aac faad) - $(use_enable aalib) - $(use_enable altivec) - $(use_enable bluray) - $(use_enable dts) - $(use_enable dvb) - $(use_enable dxr3) - $(use_enable fbcon fb) - $(use_enable gtk gdkpixbuf) - $(use_enable ipv6) - $(use_enable jpeg libjpeg) - $(use_enable mad) - $(use_enable mmap) - $(use_enable mng) - $(use_enable modplug) - $(use_enable musepack) - $(use_enable opengl) - $(use_enable opengl glu) - $(use_enable oss) - $(use_enable samba) - $(use_enable sftp) - $(use_enable v4l libv4l) - $(use_enable v4l v4l2) - $(use_enable vaapi) - $(use_enable vdpau) - $(use_enable vis) - $(use_enable vidix) - $(use_enable xinerama) - $(use_enable xvmc) - $(use_enable vcd) - $(use_enable vdr) - $(use_enable vpx) - $(use_enable wayland) - $(use_with alsa) - $(use_with flac libflac) - $(use_with imagemagick) - $(use_with jack) - $(use_with libcaca caca) - $(use_with pulseaudio) - $(use_with sdl) - $(use_with speex) - $(use_with theora) - $(use_with truetype fontconfig) - $(use_with truetype freetype) - $(use_with vorbis) - $(use_with wavpack) - $(use_with X x) - $(use_with X xcb) - ) - [[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) ) - - econf "${myconf[@]}" -} - -src_compile() { - # enable verbose building, bug #448140 - emake V=1 -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - rm -f "${ED}"usr/share/doc/${PF}/COPYING || die -} diff --git a/net-misc/openssh1/Manifest b/net-misc/openssh1/Manifest deleted file mode 100644 index 1a750af..0000000 --- a/net-misc/openssh1/Manifest +++ /dev/null @@ -1,17 +0,0 @@ -AUX openssh1-6.7_p1-openssl-ignore-status.patch 765 BLAKE2B 6ddc498cef115a38054eb8f1fddac34048b94592e54f8e31dc11717fe872f3d66a7e6877d2449102fbe18a0ee2a35732991abe946b1fe10abfa48bbec6871b26 SHA512 ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb96911111a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7 -AUX openssh1-7.3-mips-seccomp-n32.patch 634 BLAKE2B 12e931e6c2364d4cdd3f0d9ef8cf72665b65fedc7e8211a75250abe1bf359460afdf9707fdd7f9be8b8f8fd8fe40fdaddcd842da741c4b63fef94c364738cd26 SHA512 eba3e843d3714501a1df3161d02134c54c8ce584db3af698b87d303fc17c16635bd06db4d7c2d9bb47f461c3b211d870b480fd927f4563207e11c9ed2c446770 -AUX openssh1-7.5_p1-CVE-2017-15906.patch 1180 BLAKE2B 37fca347fc1fa969f410d514a76b3d7133914aa14c7ef577e6eb0b2f96b936313b20635c6cc23b5e91e3643e26c899e992b82769a5df6568d058eb4f7a43fab8 SHA512 dfba25e9962e4398688d5e6f9311de44931ea5292d7d50c69d8056838ceb41ce099c44f849c204f7b421515c3aa40bde6e9b98b80b9e99aa113c222841daecd4 -AUX openssh1-7.5_p1-GSSAPI-dns.patch 11137 BLAKE2B a54ed4d6f81632ae03523b7b61f750402d178d3213ec310bc0e57c0705ed67607a89a786d429599395722eaf40b2fb591c5b8de87ffc4f1dd7f6713b543c31c2 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e -AUX openssh1-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f8567e4e47de3d89b1d865bc92405da75bf7c64fa50b9f746d9c494dbf64bc09e04afc1960f673e68ea1d072a5381027afea63d SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550 -AUX openssh1-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1f783669c3447ea3c80c5c0f9b971b86ca1e79e99e906a90a519abb6b14db462f5766572e9759180719ea44f048ef5aa8efc37efb61d2b6ef7 SHA512 f35b15f1e8d0eb276d748ee14c71004c6599ddb124c33e2f84623bc9eb02bb4fd4680d25d0ba0289d6a723a526c95c9a56b30496bdaa565bae853bf3d1bab61f -AUX openssh1-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7 -AUX openssh1-7.5_p1-openssl-1.1.patch 112165 BLAKE2B d313d95d1844e0125dcc322f7efa6175a2b22043e323eec28a8fdc5e9eb109476d469e84f946918679d1e9a42c2096f1b0107c290d498b63a6f741932dea33b8 SHA512 88a148992e3c7234135e95701c9724064072e713494dbfcbc29072d2e5c6282605a21ffee5ed0c49a172f05b3a9af09affee7cc4b44924a441dba5f18b90f0fb -AUX openssh1-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61 -AUX openssh1-7.5_p1-ssh1.patch 8014 BLAKE2B a1dcbdf480f5800bc56a41834961c44e8f32ca16758f36155204605ceb3e672c3d86e3042fff42f979a1eecd13de1c155c912cf81b23d29c9fe3590a73c7fcb9 SHA512 73b5a1e3a7d0c241ccf2a7b146d72fa3066e7732a9400845b97a38640ebc4469691c295009dd6a2b58895fc08fd7161ac48b28403ba594cb78bc4062425e05f0 -AUX openssh1-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e -DIST openssh-7.4_p1-sctp.patch.xz 8220 BLAKE2B 2d571cacaab342b7950b42ec826bd896edf78780e9ee73fcd441cbc9764eb59e408e295062862db986918824d10498383bf34ae7c93df0da2c056eaec4d2c031 SHA512 0c199e3b26949482125aeaa88216b2458292589e3eac8908d9134d13a1cae891094fcb0f752ed3009b3126cc72277b460205f39140c251792eb1b545271c3bd4 -DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc266d1a450d298563bfc6ce705ec2829b8f9d91af5c5232941d55004b5aea2d3e0fb682a9d4acd9510c9761ba7ede2f2f0e37f SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a -DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc87d0aa0fa55915db1f0cab9c22e55f8aa0c6eeb5a56f438d849544d1650bdc574384b851292d621b79f673b78bc37617aa0b SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9 -DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81 -DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b -EBUILD openssh1-7.5_p1-r5.ebuild 9583 BLAKE2B 4a791054d59bf13cdaef18a445a53e98fe28366eb51b364e9b0ad9cf3960ca3455db1d26f1a430b3aaa6bf6796071edd16b8f4c8a7a8aa112c415ac30025657a SHA512 0d3556af1a92a3a3d1bc78be3e90e7b60fca112c4e699926beb16ebc20ef179adc1dfb3452a7caa44d2155e49feeb93477b55fd6ba7cdf8c7540b7a6e74c3a4e diff --git a/net-misc/openssh1/files/openssh1-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh1/files/openssh1-6.7_p1-openssl-ignore-status.patch deleted file mode 100644 index fa33af3..0000000 --- a/net-misc/openssh1/files/openssh1-6.7_p1-openssl-ignore-status.patch +++ /dev/null @@ -1,17 +0,0 @@ -the last nibble of the openssl version represents the status. that is, -whether it is a beta or release. when it comes to version checks in -openssh, this component does not matter, so ignore it. - -https://bugzilla.mindrot.org/show_bug.cgi?id=2212 - ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver) - * For versions >= 1.0.0, major,minor,status must match and library - * fix version must be equal to or newer than the header. - */ -- mask = 0xfff0000fL; /* major,minor,status */ -+ mask = 0xfff00000L; /* major,minor,status */ - hfix = (headerver & 0x000ff000) >> 12; - lfix = (libver & 0x000ff000) >> 12; - if ( (headerver & mask) == (libver & mask) && lfix >= hfix) diff --git a/net-misc/openssh1/files/openssh1-7.3-mips-seccomp-n32.patch b/net-misc/openssh1/files/openssh1-7.3-mips-seccomp-n32.patch deleted file mode 100644 index 7eaadaf..0000000 --- a/net-misc/openssh1/files/openssh1-7.3-mips-seccomp-n32.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/591392 -https://bugzilla.mindrot.org/show_bug.cgi?id=2590 - -7.3 added seccomp support to MIPS, but failed to handled the N32 -case. This patch is temporary until upstream fixes. - ---- openssh-7.3p1/configure.ac -+++ openssh-7.3p1/configure.ac -@@ -816,10 +816,10 @@ main() { if (NSVersionOfRunTimeLibrary(" - seccomp_audit_arch=AUDIT_ARCH_MIPSEL - ;; - mips64-*) -- seccomp_audit_arch=AUDIT_ARCH_MIPS64 -+ seccomp_audit_arch=AUDIT_ARCH_MIPS64N32 - ;; - mips64el-*) -- seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 -+ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32 - ;; - esac - if test "x$seccomp_audit_arch" != "x" ; then diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-CVE-2017-15906.patch b/net-misc/openssh1/files/openssh1-7.5_p1-CVE-2017-15906.patch deleted file mode 100644 index b97ceb4..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-CVE-2017-15906.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a6981567e8e215acc1ef690c8dbb30f2d9b00a19 Mon Sep 17 00:00:00 2001 -From: djm -Date: Tue, 4 Apr 2017 00:24:56 +0000 -Subject: [PATCH] disallow creation (of empty files) in read-only mode; - reported by Michal Zalewski, feedback & ok deraadt@ - ---- - usr.bin/ssh/sftp-server.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c -index 2510d234a3a..42249ebd60d 100644 ---- a/usr.bin/ssh/sftp-server.c -+++ b/usr.bin/ssh/sftp-server.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */ -+/* $OpenBSD: sftp-server.c,v 1.111 2017/04/04 00:24:56 djm Exp $ */ - /* - * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. - * -@@ -683,8 +683,8 @@ process_open(u_int32_t id) - logit("open \"%s\" flags %s mode 0%o", - name, string_from_portable(pflags), mode); - if (readonly && -- ((flags & O_ACCMODE) == O_WRONLY || -- (flags & O_ACCMODE) == O_RDWR)) { -+ ((flags & O_ACCMODE) != O_RDONLY || -+ (flags & (O_CREAT|O_TRUNC)) != 0)) { - verbose("Refusing open request in read-only mode"); - status = SSH2_FX_PERMISSION_DENIED; - } else { diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-GSSAPI-dns.patch b/net-misc/openssh1/files/openssh1-7.5_p1-GSSAPI-dns.patch deleted file mode 100644 index 6b1e6dd..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-GSSAPI-dns.patch +++ /dev/null @@ -1,351 +0,0 @@ -http://bugs.gentoo.org/165444 -https://bugzilla.mindrot.org/show_bug.cgi?id=1008 - ---- a/readconf.c -+++ b/readconf.c -@@ -148,6 +148,7 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, -@@ -194,9 +195,11 @@ - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - # else - { "gssapiauthentication", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - #ifdef ENABLE_PKCS11 - { "smartcarddevice", oPKCS11Provider }, -@@ -930,6 +933,10 @@ - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1649,6 +1656,7 @@ - options->challenge_response_authentication = -1; - options->gss_authentication = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1779,6 +1787,8 @@ - options->gss_authentication = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) ---- a/readconf.h -+++ b/readconf.h -@@ -46,6 +46,7 @@ - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ ---- a/ssh_config.5 -+++ b/ssh_config.5 -@@ -830,6 +830,16 @@ - Forward (delegate) credentials to the server. - The default is - .Cm no . -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 ---- a/sshconnect2.c -+++ b/sshconnect2.c -@@ -656,6 +656,13 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ const char *gss_host; -+ -+ if (options.gss_trust_dns) { -+ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); -+ gss_host = auth_get_canonical_hostname(active_state, 1); -+ } else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -668,7 +674,7 @@ - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host)) { - ok = 1; /* Mechanism works */ - } else { - mech++; - -need to move these two funcs back to canohost so they're available to clients -and the server. auth.c is only used in the server. - ---- a/auth.c -+++ b/auth.c -@@ -784,117 +784,3 @@ fakepw(void) - - return (&fake); - } -- --/* -- * Returns the remote DNS hostname as a string. The returned string must not -- * be freed. NB. this will usually trigger a DNS query the first time it is -- * called. -- * This function does additional checks on the hostname to mitigate some -- * attacks on legacy rhosts-style authentication. -- * XXX is RhostsRSAAuthentication vulnerable to these? -- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) -- */ -- --static char * --remote_hostname(struct ssh *ssh) --{ -- struct sockaddr_storage from; -- socklen_t fromlen; -- struct addrinfo hints, *ai, *aitop; -- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -- const char *ntop = ssh_remote_ipaddr(ssh); -- -- /* Get IP address of client. */ -- fromlen = sizeof(from); -- memset(&from, 0, sizeof(from)); -- if (getpeername(ssh_packet_get_connection_in(ssh), -- (struct sockaddr *)&from, &fromlen) < 0) { -- debug("getpeername failed: %.100s", strerror(errno)); -- return strdup(ntop); -- } -- -- ipv64_normalise_mapped(&from, &fromlen); -- if (from.ss_family == AF_INET6) -- fromlen = sizeof(struct sockaddr_in6); -- -- debug3("Trying to reverse map address %.100s.", ntop); -- /* Map the IP address to a host name. */ -- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -- NULL, 0, NI_NAMEREQD) != 0) { -- /* Host name not found. Use ip address. */ -- return strdup(ntop); -- } -- -- /* -- * if reverse lookup result looks like a numeric hostname, -- * someone is trying to trick us by PTR record like following: -- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -- hints.ai_flags = AI_NUMERICHOST; -- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -- name, ntop); -- freeaddrinfo(ai); -- return strdup(ntop); -- } -- -- /* Names are stored in lowercase. */ -- lowercase(name); -- -- /* -- * Map it back to an IP address and check that the given -- * address actually is an address of this host. This is -- * necessary because anyone with access to a name server can -- * define arbitrary names for an IP address. Mapping from -- * name to IP address can be trusted better (but can still be -- * fooled if the intruder has access to the name server of -- * the domain). -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = from.ss_family; -- hints.ai_socktype = SOCK_STREAM; -- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -- logit("reverse mapping checking getaddrinfo for %.700s " -- "[%s] failed.", name, ntop); -- return strdup(ntop); -- } -- /* Look for the address from the list of addresses. */ -- for (ai = aitop; ai; ai = ai->ai_next) { -- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -- (strcmp(ntop, ntop2) == 0)) -- break; -- } -- freeaddrinfo(aitop); -- /* If we reached the end of the list, the address was not there. */ -- if (ai == NULL) { -- /* Address not found for the host name. */ -- logit("Address %.100s maps to %.600s, but this does not " -- "map back to the address.", ntop, name); -- return strdup(ntop); -- } -- return strdup(name); --} -- --/* -- * Return the canonical name of the host in the other side of the current -- * connection. The host name is cached, so it is efficient to call this -- * several times. -- */ -- --const char * --auth_get_canonical_hostname(struct ssh *ssh, int use_dns) --{ -- static char *dnsname; -- -- if (!use_dns) -- return ssh_remote_ipaddr(ssh); -- else if (dnsname != NULL) -- return dnsname; -- else { -- dnsname = remote_hostname(ssh); -- return dnsname; -- } --} ---- a/canohost.c -+++ b/canohost.c -@@ -202,3 +202,117 @@ get_local_port(int sock) - { - return get_sock_port(sock, 1); - } -+ -+/* -+ * Returns the remote DNS hostname as a string. The returned string must not -+ * be freed. NB. this will usually trigger a DNS query the first time it is -+ * called. -+ * This function does additional checks on the hostname to mitigate some -+ * attacks on legacy rhosts-style authentication. -+ * XXX is RhostsRSAAuthentication vulnerable to these? -+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) -+ */ -+ -+static char * -+remote_hostname(struct ssh *ssh) -+{ -+ struct sockaddr_storage from; -+ socklen_t fromlen; -+ struct addrinfo hints, *ai, *aitop; -+ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -+ const char *ntop = ssh_remote_ipaddr(ssh); -+ -+ /* Get IP address of client. */ -+ fromlen = sizeof(from); -+ memset(&from, 0, sizeof(from)); -+ if (getpeername(ssh_packet_get_connection_in(ssh), -+ (struct sockaddr *)&from, &fromlen) < 0) { -+ debug("getpeername failed: %.100s", strerror(errno)); -+ return strdup(ntop); -+ } -+ -+ ipv64_normalise_mapped(&from, &fromlen); -+ if (from.ss_family == AF_INET6) -+ fromlen = sizeof(struct sockaddr_in6); -+ -+ debug3("Trying to reverse map address %.100s.", ntop); -+ /* Map the IP address to a host name. */ -+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -+ NULL, 0, NI_NAMEREQD) != 0) { -+ /* Host name not found. Use ip address. */ -+ return strdup(ntop); -+ } -+ -+ /* -+ * if reverse lookup result looks like a numeric hostname, -+ * someone is trying to trick us by PTR record like following: -+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -+ hints.ai_flags = AI_NUMERICHOST; -+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -+ name, ntop); -+ freeaddrinfo(ai); -+ return strdup(ntop); -+ } -+ -+ /* Names are stored in lowercase. */ -+ lowercase(name); -+ -+ /* -+ * Map it back to an IP address and check that the given -+ * address actually is an address of this host. This is -+ * necessary because anyone with access to a name server can -+ * define arbitrary names for an IP address. Mapping from -+ * name to IP address can be trusted better (but can still be -+ * fooled if the intruder has access to the name server of -+ * the domain). -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = from.ss_family; -+ hints.ai_socktype = SOCK_STREAM; -+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -+ logit("reverse mapping checking getaddrinfo for %.700s " -+ "[%s] failed.", name, ntop); -+ return strdup(ntop); -+ } -+ /* Look for the address from the list of addresses. */ -+ for (ai = aitop; ai; ai = ai->ai_next) { -+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -+ (strcmp(ntop, ntop2) == 0)) -+ break; -+ } -+ freeaddrinfo(aitop); -+ /* If we reached the end of the list, the address was not there. */ -+ if (ai == NULL) { -+ /* Address not found for the host name. */ -+ logit("Address %.100s maps to %.600s, but this does not " -+ "map back to the address.", ntop, name); -+ return strdup(ntop); -+ } -+ return strdup(name); -+} -+ -+/* -+ * Return the canonical name of the host in the other side of the current -+ * connection. The host name is cached, so it is efficient to call this -+ * several times. -+ */ -+ -+const char * -+auth_get_canonical_hostname(struct ssh *ssh, int use_dns) -+{ -+ static char *dnsname; -+ -+ if (!use_dns) -+ return ssh_remote_ipaddr(ssh); -+ else if (dnsname != NULL) -+ return dnsname; -+ else { -+ dnsname = remote_hostname(ssh); -+ return dnsname; -+ } -+} diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-cross-cache.patch b/net-misc/openssh1/files/openssh1-7.5_p1-cross-cache.patch deleted file mode 100644 index 1c2b7b8..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-cross-cache.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d588d6f83e9a3d48286929b4a705b43e74414241 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 24 May 2017 23:18:41 -0400 -Subject: [PATCH] configure: actually set cache vars when cross-compiling - -The cross-compiling fallback message says it's assuming the test -passed, but it didn't actually set the cache var which causes -later tests to fail. ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5cfea38c0a6c..895c5211ea93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3162,7 +3162,8 @@ AC_RUN_IFELSE( - select_works_with_rlimit=yes], - [AC_MSG_RESULT([no]) - select_works_with_rlimit=no], -- [AC_MSG_WARN([cross compiling: assuming yes])] -+ [AC_MSG_WARN([cross compiling: assuming yes]) -+ select_works_with_rlimit=yes] - ) - - AC_MSG_CHECKING([if setrlimit(RLIMIT_NOFILE,{0,0}) works]) -@@ -3188,7 +3189,8 @@ AC_RUN_IFELSE( - rlimit_nofile_zero_works=yes], - [AC_MSG_RESULT([no]) - rlimit_nofile_zero_works=no], -- [AC_MSG_WARN([cross compiling: assuming yes])] -+ [AC_MSG_WARN([cross compiling: assuming yes]) -+ rlimit_nofile_zero_works=yes] - ) - - AC_MSG_CHECKING([if setrlimit RLIMIT_FSIZE works]) --- -2.12.0 - diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-disable-conch-interop-tests.patch b/net-misc/openssh1/files/openssh1-7.5_p1-disable-conch-interop-tests.patch deleted file mode 100644 index a5647ce..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-disable-conch-interop-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -Disable conch interop tests which are failing when called -via portage for yet unknown reason and because using conch -seems to be flaky (test is failing when using Python2 but -passing when using Python3). - -Bug: https://bugs.gentoo.org/605446 - ---- a/regress/conch-ciphers.sh -+++ b/regress/conch-ciphers.sh -@@ -3,6 +3,10 @@ - - tid="conch ciphers" - -+# https://bugs.gentoo.org/605446 -+echo "conch interop tests skipped due to Gentoo bug #605446" -+exit 0 -+ - if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then - echo "conch interop tests not enabled" - exit 0 diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-hpn-x509-10.2-glue.patch b/net-misc/openssh1/files/openssh1-7.5_p1-hpn-x509-10.2-glue.patch deleted file mode 100644 index 11a5b36..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-hpn-x509-10.2-glue.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch ---- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:31:01.816551100 -0700 -+++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:51:03.894805846 -0700 -@@ -40,7 +40,7 @@ - @@ -44,7 +44,7 @@ CC=@CC@ - LD=@LD@ - CFLAGS=@CFLAGS@ -- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ - -LIBS=@LIBS@ - +LIBS=@LIBS@ -lpthread - K5LIBS=@K5LIBS@ -@@ -1023,6 +1023,3 @@ - do_authenticated(authctxt); - - /* The connection has been terminated. */ ---- --2.12.0 -- -diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch ---- a/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:31:01.816551100 -0700 -+++ b/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:49:44.513498976 -0700 -@@ -926,9 +926,9 @@ - @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1) - /* Send our own protocol version identification. */ - if (compat20) { -- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", --- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); --+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); -+ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n", -+- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION); -++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION); - } else { - xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", - - PROTOCOL_MAJOR_1, minor1, SSH_VERSION); -@@ -943,11 +943,11 @@ - @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) - char remote_version[256]; /* Must be at least as big as buf. */ - -- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", --- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, --+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, -+ xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s%s", -+- major, minor, SSH_VERSION, pkix_comment, -++ major, minor, SSH_RELEASE, pkix_comment, - *options.version_addendum == '\0' ? "" : " ", -- options.version_addendum); -+ options.version_addendum, newline); - - @@ -1020,6 +1020,8 @@ server_listen(void) - int ret, listen_sock, on = 1; -@@ -1006,12 +1008,9 @@ - --- a/version.h - +++ b/version.h --@@ -3,4 +3,5 @@ -+@@ -3,4 +3,6 @@ - #define SSH_VERSION "OpenSSH_7.5" - -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE -+-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" -++#define SSH_X509 ", PKIX-SSH " PACKAGE_VERSION - +#define SSH_HPN "-hpn14v12" - +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN ---- --2.12.0 -- diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-openssl-1.1.patch b/net-misc/openssh1/files/openssh1-7.5_p1-openssl-1.1.patch deleted file mode 100644 index 03b33d5..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-openssl-1.1.patch +++ /dev/null @@ -1,3520 +0,0 @@ -From dd6f41312c12853596f11c88c23e71a55af2dcae Mon Sep 17 00:00:00 2001 -From: Jakub Jelen -Date: Mon, 27 Nov 2017 11:09:08 +0000 -Subject: OpenSSL 1.1.0 compat - -This is too risky for the main OpenSSH packages, but for openssh-ssh1 -it's unlikely to make matters significantly worse. See: - - https://lists.mindrot.org/pipermail/openssh-unix-dev/2017-November/036467.html - -Bug-Debian: https://bugs.debian.org/873574 -Origin: vendor, https://src.fedoraproject.org/rpms/openssh/blob/9e46aafab9baa6bb905efdf442cd963ea074e8cd/f/openssh-7.3p1-openssl-1.1.0.patch -Author: Kurt Roeckx -Author: Colin Watson -Forwarded: https://github.com/openssh/openssh-portable/pull/48 -Last-Update: 2017-11-27 - -Patch-Name: openssl-1.1.patch ---- - Makefile.in | 2 +- - auth-pam.c | 4 + - authfd.c | 53 ++- - cipher-3des1.c | 68 ++-- - cipher-bf1.c | 27 +- - cipher.c | 8 +- - dh.c | 53 +-- - dh.h | 2 +- - digest-openssl.c | 17 +- - includes.h | 1 + - kexdhc.c | 19 +- - kexdhs.c | 10 +- - kexgexc.c | 28 +- - kexgexs.c | 19 +- - libcrypto-compat.c | 546 ++++++++++++++++++++++++++++ - libcrypto-compat.h | 98 +++++ - monitor.c | 7 +- - openbsd-compat/openssl-compat.c | 7 + - regress/unittests/sshkey/test_file.c | 20 +- - regress/unittests/sshkey/test_sshkey.c | 25 +- - rsa.c | 41 ++- - rsa.h | 2 +- - ssh-agent.c | 75 +++- - ssh-dss.c | 27 +- - ssh-ecdsa.c | 26 +- - ssh-keygen.c | 94 +++-- - ssh-keyscan.c | 11 +- - ssh-pkcs11-client.c | 12 +- - ssh-pkcs11.c | 42 ++- - ssh-rsa.c | 4 +- - ssh.c | 1 + - sshconnect.c | 1 + - sshconnect1.c | 64 ++-- - sshconnect2.c | 1 + - sshkey.c | 643 +++++++++++++++++++++++---------- - 35 files changed, 1593 insertions(+), 465 deletions(-) - create mode 100644 libcrypto-compat.c - create mode 100644 libcrypto-compat.h - -diff --git a/Makefile.in b/Makefile.in -index 5870e9e6..2645531e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -92,7 +92,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ - kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ - kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ - kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ -- platform-pledge.o platform-tracing.o -+ platform-pledge.o platform-tracing.o libcrypto-compat.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o -diff --git a/auth-pam.c b/auth-pam.c -index bc8e5e02..bd16d800 100644 ---- a/auth-pam.c -+++ b/auth-pam.c -@@ -129,6 +129,10 @@ extern u_int utmp_len; - typedef pthread_t sp_pthread_t; - #else - typedef pid_t sp_pthread_t; -+# define pthread_create(a, b, c, d) _ssh_compat_pthread_create(a, b, c, d) -+# define pthread_exit(a) _ssh_compat_pthread_exit(a) -+# define pthread_cancel(a) _ssh_compat_pthread_cancel(a) -+# define pthread_join(a, b) _ssh_compat_pthread_join(a, b) - #endif - - struct pam_ctxt { -diff --git a/authfd.c b/authfd.c -index a634bcb8..7f7c225f 100644 ---- a/authfd.c -+++ b/authfd.c -@@ -207,15 +207,26 @@ deserialise_identity1(struct sshbuf *ids, struct sshkey **keyp, char **commentp) - int r, keybits; - u_int32_t bits; - char *comment = NULL; -+ BIGNUM *e = NULL, *n = NULL; - - if ((key = sshkey_new(KEY_RSA1)) == NULL) - return SSH_ERR_ALLOC_FAIL; -+ if ((e = BN_new()) == NULL || -+ (n = BN_new()) == NULL) { -+ BN_free(e); -+ r = SSH_ERR_ALLOC_FAIL; -+ goto out; -+ } - if ((r = sshbuf_get_u32(ids, &bits)) != 0 || -- (r = sshbuf_get_bignum1(ids, key->rsa->e)) != 0 || -- (r = sshbuf_get_bignum1(ids, key->rsa->n)) != 0 || -- (r = sshbuf_get_cstring(ids, &comment, NULL)) != 0) -+ (r = sshbuf_get_bignum1(ids, e)) != 0 || -+ (r = sshbuf_get_bignum1(ids, n)) != 0 || -+ (r = sshbuf_get_cstring(ids, &comment, NULL)) != 0 || -+ (RSA_set0_key(key->rsa, n, e, NULL) == 0)) { -+ BN_free(n); -+ BN_free(e); - goto out; -- keybits = BN_num_bits(key->rsa->n); -+ } -+ keybits = BN_num_bits(n); - /* XXX previously we just warned here. I think we should be strict */ - if (keybits < 0 || bits != (u_int)keybits) { - r = SSH_ERR_KEY_BITS_MISMATCH; -@@ -393,15 +404,17 @@ ssh_decrypt_challenge(int sock, struct sshkey* key, BIGNUM *challenge, - struct sshbuf *msg; - int r; - u_char type; -+ const BIGNUM *e, *n; - - if (key->type != KEY_RSA1) - return SSH_ERR_INVALID_ARGUMENT; - if ((msg = sshbuf_new()) == NULL) - return SSH_ERR_ALLOC_FAIL; -+ RSA_get0_key(key->rsa, &n, &e, NULL); - if ((r = sshbuf_put_u8(msg, SSH_AGENTC_RSA_CHALLENGE)) != 0 || -- (r = sshbuf_put_u32(msg, BN_num_bits(key->rsa->n))) != 0 || -- (r = sshbuf_put_bignum1(msg, key->rsa->e)) != 0 || -- (r = sshbuf_put_bignum1(msg, key->rsa->n)) != 0 || -+ (r = sshbuf_put_u32(msg, BN_num_bits(n))) != 0 || -+ (r = sshbuf_put_bignum1(msg, e)) != 0 || -+ (r = sshbuf_put_bignum1(msg, n)) != 0 || - (r = sshbuf_put_bignum1(msg, challenge)) != 0 || - (r = sshbuf_put(msg, session_id, 16)) != 0 || - (r = sshbuf_put_u32(msg, 1)) != 0) /* Response type for proto 1.1 */ -@@ -499,15 +512,19 @@ static int - ssh_encode_identity_rsa1(struct sshbuf *b, RSA *key, const char *comment) - { - int r; -+ const BIGNUM *n, *e, *d, *q, *p, *iqmp; - -+ RSA_get0_key(key, &n, &e, &d); -+ RSA_get0_factors(key, &p, &q); -+ RSA_get0_crt_params(key, NULL, NULL, &iqmp); - /* To keep within the protocol: p < q for ssh. in SSL p > q */ -- if ((r = sshbuf_put_u32(b, BN_num_bits(key->n))) != 0 || -- (r = sshbuf_put_bignum1(b, key->n)) != 0 || -- (r = sshbuf_put_bignum1(b, key->e)) != 0 || -- (r = sshbuf_put_bignum1(b, key->d)) != 0 || -- (r = sshbuf_put_bignum1(b, key->iqmp)) != 0 || -- (r = sshbuf_put_bignum1(b, key->q)) != 0 || -- (r = sshbuf_put_bignum1(b, key->p)) != 0 || -+ if ((r = sshbuf_put_u32(b, BN_num_bits(n))) != 0 || -+ (r = sshbuf_put_bignum1(b, n)) != 0 || -+ (r = sshbuf_put_bignum1(b, e)) != 0 || -+ (r = sshbuf_put_bignum1(b, d)) != 0 || -+ (r = sshbuf_put_bignum1(b, iqmp)) != 0 || -+ (r = sshbuf_put_bignum1(b, q)) != 0 || -+ (r = sshbuf_put_bignum1(b, p)) != 0 || - (r = sshbuf_put_cstring(b, comment)) != 0) - return r; - return 0; -@@ -622,11 +639,13 @@ ssh_remove_identity(int sock, struct sshkey *key) - - #ifdef WITH_SSH1 - if (key->type == KEY_RSA1) { -+ const BIGNUM *e, *n; -+ RSA_get0_key(key->rsa, &n, &e, NULL); - if ((r = sshbuf_put_u8(msg, - SSH_AGENTC_REMOVE_RSA_IDENTITY)) != 0 || -- (r = sshbuf_put_u32(msg, BN_num_bits(key->rsa->n))) != 0 || -- (r = sshbuf_put_bignum1(msg, key->rsa->e)) != 0 || -- (r = sshbuf_put_bignum1(msg, key->rsa->n)) != 0) -+ (r = sshbuf_put_u32(msg, BN_num_bits(n))) != 0 || -+ (r = sshbuf_put_bignum1(msg, e)) != 0 || -+ (r = sshbuf_put_bignum1(msg, n)) != 0) - goto out; - } else - #endif -diff --git a/cipher-3des1.c b/cipher-3des1.c -index 9fcc2785..2051030c 100644 ---- a/cipher-3des1.c -+++ b/cipher-3des1.c -@@ -44,7 +44,7 @@ - */ - struct ssh1_3des_ctx - { -- EVP_CIPHER_CTX k1, k2, k3; -+ EVP_CIPHER_CTX *k1, *k2, *k3; - }; - - const EVP_CIPHER * evp_ssh1_3des(void); -@@ -65,7 +65,7 @@ ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, - if (key == NULL) - return 1; - if (enc == -1) -- enc = ctx->encrypt; -+ enc = EVP_CIPHER_CTX_encrypting(ctx); - k1 = k2 = k3 = (u_char *) key; - k2 += 8; - if (EVP_CIPHER_CTX_key_length(ctx) >= 16+8) { -@@ -74,12 +74,19 @@ ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, - else - k1 += 16; - } -- EVP_CIPHER_CTX_init(&c->k1); -- EVP_CIPHER_CTX_init(&c->k2); -- EVP_CIPHER_CTX_init(&c->k3); -- if (EVP_CipherInit(&c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 || -- EVP_CipherInit(&c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 || -- EVP_CipherInit(&c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) { -+ c->k1 = EVP_CIPHER_CTX_new(); -+ c->k2 = EVP_CIPHER_CTX_new(); -+ c->k3 = EVP_CIPHER_CTX_new(); -+ if (c->k1 == NULL || c->k2 == NULL || c->k3 == NULL) { -+ EVP_CIPHER_CTX_free(c->k1); -+ EVP_CIPHER_CTX_free(c->k2); -+ EVP_CIPHER_CTX_free(c->k3); -+ free(c); -+ return 0; -+ } -+ if (EVP_CipherInit(c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 || -+ EVP_CipherInit(c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 || -+ EVP_CipherInit(c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) { - explicit_bzero(c, sizeof(*c)); - free(c); - EVP_CIPHER_CTX_set_app_data(ctx, NULL); -@@ -95,9 +102,9 @@ ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, size_t len) - - if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) - return 0; -- if (EVP_Cipher(&c->k1, dest, (u_char *)src, len) == 0 || -- EVP_Cipher(&c->k2, dest, dest, len) == 0 || -- EVP_Cipher(&c->k3, dest, dest, len) == 0) -+ if (EVP_Cipher(c->k1, dest, (u_char *)src, len) == 0 || -+ EVP_Cipher(c->k2, dest, dest, len) == 0 || -+ EVP_Cipher(c->k3, dest, dest, len) == 0) - return 0; - return 1; - } -@@ -108,9 +115,9 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx) - struct ssh1_3des_ctx *c; - - if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { -- EVP_CIPHER_CTX_cleanup(&c->k1); -- EVP_CIPHER_CTX_cleanup(&c->k2); -- EVP_CIPHER_CTX_cleanup(&c->k3); -+ EVP_CIPHER_CTX_free(c->k1); -+ EVP_CIPHER_CTX_free(c->k2); -+ EVP_CIPHER_CTX_free(c->k3); - explicit_bzero(c, sizeof(*c)); - free(c); - EVP_CIPHER_CTX_set_app_data(ctx, NULL); -@@ -128,13 +135,13 @@ ssh1_3des_iv(EVP_CIPHER_CTX *evp, int doset, u_char *iv, int len) - if ((c = EVP_CIPHER_CTX_get_app_data(evp)) == NULL) - return SSH_ERR_INTERNAL_ERROR; - if (doset) { -- memcpy(c->k1.iv, iv, 8); -- memcpy(c->k2.iv, iv + 8, 8); -- memcpy(c->k3.iv, iv + 16, 8); -+ memcpy(EVP_CIPHER_CTX_iv_noconst(c->k1), iv, 8); -+ memcpy(EVP_CIPHER_CTX_iv_noconst(c->k2), iv + 8, 8); -+ memcpy(EVP_CIPHER_CTX_iv_noconst(c->k3), iv + 16, 8); - } else { -- memcpy(iv, c->k1.iv, 8); -- memcpy(iv + 8, c->k2.iv, 8); -- memcpy(iv + 16, c->k3.iv, 8); -+ memcpy(iv, EVP_CIPHER_CTX_iv(c->k1), 8); -+ memcpy(iv + 8, EVP_CIPHER_CTX_iv(c->k2), 8); -+ memcpy(iv + 16, EVP_CIPHER_CTX_iv(c->k3), 8); - } - return 0; - } -@@ -142,17 +149,14 @@ ssh1_3des_iv(EVP_CIPHER_CTX *evp, int doset, u_char *iv, int len) - const EVP_CIPHER * - evp_ssh1_3des(void) - { -- static EVP_CIPHER ssh1_3des; -- -- memset(&ssh1_3des, 0, sizeof(ssh1_3des)); -- ssh1_3des.nid = NID_undef; -- ssh1_3des.block_size = 8; -- ssh1_3des.iv_len = 0; -- ssh1_3des.key_len = 16; -- ssh1_3des.init = ssh1_3des_init; -- ssh1_3des.cleanup = ssh1_3des_cleanup; -- ssh1_3des.do_cipher = ssh1_3des_cbc; -- ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH; -- return &ssh1_3des; -+ EVP_CIPHER *ssh1_3des; -+ -+ ssh1_3des = EVP_CIPHER_meth_new(NID_undef, 8, 16); -+ EVP_CIPHER_meth_set_iv_length(ssh1_3des, 0); -+ EVP_CIPHER_meth_set_init(ssh1_3des, ssh1_3des_init); -+ EVP_CIPHER_meth_set_cleanup(ssh1_3des, ssh1_3des_cleanup); -+ EVP_CIPHER_meth_set_do_cipher(ssh1_3des, ssh1_3des_cbc); -+ EVP_CIPHER_meth_set_flags(ssh1_3des, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH); -+ return ssh1_3des; - } - #endif /* WITH_SSH1 */ -diff --git a/cipher-bf1.c b/cipher-bf1.c -index c205b077..b23bda7c 100644 ---- a/cipher-bf1.c -+++ b/cipher-bf1.c -@@ -89,17 +89,28 @@ bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, - const EVP_CIPHER * - evp_ssh1_bf(void) - { -- static EVP_CIPHER ssh1_bf; -+ EVP_CIPHER *ssh1_bf; - -- memcpy(&ssh1_bf, EVP_bf_cbc(), sizeof(EVP_CIPHER)); -- orig_bf = ssh1_bf.do_cipher; -- ssh1_bf.nid = NID_undef; -+ orig_bf = EVP_CIPHER_meth_get_do_cipher(EVP_bf_cbc()); -+ /* block_size, length, flags from openssl/crypto/engine/eng_cryptodev.c:638 */ -+ ssh1_bf = EVP_CIPHER_meth_new(NID_undef, 8, 32); -+ EVP_CIPHER_meth_set_iv_length(ssh1_bf, 8); -+ EVP_CIPHER_meth_set_flags(ssh1_bf, EVP_CIPH_CBC_MODE); - #ifdef SSH_OLD_EVP -- ssh1_bf.init = bf_ssh1_init; -+ EVP_CIPHER_meth_set_init(ssh1_bf, ssh1_bf_init); -+#else -+ EVP_CIPHER_meth_set_init(ssh1_bf, -+ EVP_CIPHER_meth_get_init(EVP_bf_cbc())); - #endif -- ssh1_bf.do_cipher = bf_ssh1_cipher; -- ssh1_bf.key_len = 32; -- return (&ssh1_bf); -+ /* copy methods and parameters from old EVP_BF_cbc() -+ * meth_dup does not allow to change type and key_len */ -+ EVP_CIPHER_meth_set_cleanup(ssh1_bf, -+ EVP_CIPHER_meth_get_cleanup(EVP_bf_cbc())); -+ EVP_CIPHER_meth_set_ctrl(ssh1_bf, -+ EVP_CIPHER_meth_get_ctrl(EVP_bf_cbc())); -+ /* ASN1 params??? */ -+ EVP_CIPHER_meth_set_do_cipher(ssh1_bf, bf_ssh1_cipher); -+ return ssh1_bf; - } - #endif /* defined(WITH_OPENSSL) && !defined(OPENSSL_NO_BF) */ - -diff --git a/cipher.c b/cipher.c -index 2def333b..ae566312 100644 ---- a/cipher.c -+++ b/cipher.c -@@ -625,7 +625,7 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len) - len, iv)) - return SSH_ERR_LIBCRYPTO_ERROR; - } else -- memcpy(iv, cc->evp->iv, len); -+ memcpy(iv, EVP_CIPHER_CTX_iv(cc->evp), len); - break; - #endif - #ifdef WITH_SSH1 -@@ -671,7 +671,7 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) - EVP_CTRL_GCM_SET_IV_FIXED, -1, (void *)iv)) - return SSH_ERR_LIBCRYPTO_ERROR; - } else -- memcpy(cc->evp->iv, iv, evplen); -+ memcpy(EVP_CIPHER_CTX_iv_noconst(cc->evp), iv, evplen); - break; - #endif - #ifdef WITH_SSH1 -@@ -685,8 +685,8 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) - } - - #ifdef WITH_OPENSSL --#define EVP_X_STATE(evp) (evp)->cipher_data --#define EVP_X_STATE_LEN(evp) (evp)->cipher->ctx_size -+#define EVP_X_STATE(evp) EVP_CIPHER_CTX_get_cipher_data(evp) -+#define EVP_X_STATE_LEN(evp) EVP_CIPHER_impl_ctx_size(EVP_CIPHER_CTX_cipher(evp)) - #endif - - int -diff --git a/dh.c b/dh.c -index 47531242..db192f63 100644 ---- a/dh.c -+++ b/dh.c -@@ -212,14 +212,15 @@ choose_dh(int min, int wantbits, int max) - /* diffie-hellman-groupN-sha1 */ - - int --dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) -+dh_pub_is_valid(const DH *dh, const BIGNUM *dh_pub) - { - int i; - int n = BN_num_bits(dh_pub); - int bits_set = 0; - BIGNUM *tmp; -+ const BIGNUM *p; - -- if (dh_pub->neg) { -+ if (BN_is_negative(dh_pub)) { - logit("invalid public DH value: negative"); - return 0; - } -@@ -232,7 +233,8 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) - error("%s: BN_new failed", __func__); - return 0; - } -- if (!BN_sub(tmp, dh->p, BN_value_one()) || -+ DH_get0_pqg(dh, &p, NULL, NULL); -+ if (!BN_sub(tmp, p, BN_value_one()) || - BN_cmp(dh_pub, tmp) != -1) { /* pub_exp > p-2 */ - BN_clear_free(tmp); - logit("invalid public DH value: >= p-1"); -@@ -243,14 +245,14 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) - for (i = 0; i <= n; i++) - if (BN_is_bit_set(dh_pub, i)) - bits_set++; -- debug2("bits set: %d/%d", bits_set, BN_num_bits(dh->p)); -+ debug2("bits set: %d/%d", bits_set, BN_num_bits(p)); - - /* - * if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial - */ - if (bits_set < 4) { - logit("invalid public DH value (%d/%d)", -- bits_set, BN_num_bits(dh->p)); -+ bits_set, BN_num_bits(p)); - return 0; - } - return 1; -@@ -260,9 +262,11 @@ int - dh_gen_key(DH *dh, int need) - { - int pbits; -+ const BIGNUM *p, *pub_key; - -- if (need < 0 || dh->p == NULL || -- (pbits = BN_num_bits(dh->p)) <= 0 || -+ DH_get0_pqg(dh, &p, NULL, NULL); -+ if (need < 0 || p == NULL || -+ (pbits = BN_num_bits(p)) <= 0 || - need > INT_MAX / 2 || 2 * need > pbits) - return SSH_ERR_INVALID_ARGUMENT; - if (need < 256) -@@ -271,10 +275,11 @@ dh_gen_key(DH *dh, int need) - * Pollard Rho, Big step/Little Step attacks are O(sqrt(n)), - * so double requested need here. - */ -- dh->length = MINIMUM(need * 2, pbits - 1); -- if (DH_generate_key(dh) == 0 || -- !dh_pub_is_valid(dh, dh->pub_key)) { -- BN_clear_free(dh->priv_key); -+ DH_set_length(dh, MINIMUM(need * 2, pbits - 1)); -+ if (DH_generate_key(dh) == 0) -+ return SSH_ERR_LIBCRYPTO_ERROR; -+ DH_get0_key(dh, &pub_key, NULL); -+ if (!dh_pub_is_valid(dh, pub_key)) { - return SSH_ERR_LIBCRYPTO_ERROR; - } - return 0; -@@ -284,15 +289,22 @@ DH * - dh_new_group_asc(const char *gen, const char *modulus) - { - DH *dh; -- -- if ((dh = DH_new()) == NULL) -- return NULL; -- if (BN_hex2bn(&dh->p, modulus) == 0 || -- BN_hex2bn(&dh->g, gen) == 0) { -- DH_free(dh); -- return NULL; -- } -+ BIGNUM *p, *g; -+ -+ if ((dh = DH_new()) == NULL || -+ (p = BN_new()) == NULL || -+ (g = BN_new()) == NULL) -+ goto err; -+ if (BN_hex2bn(&p, modulus) == 0 || -+ BN_hex2bn(&g, gen) == 0 || -+ DH_set0_pqg(dh, p, NULL, g) == 0) -+ goto err; - return (dh); -+err: -+ DH_free(dh); -+ BN_free(p); -+ BN_free(g); -+ return NULL; - } - - /* -@@ -307,8 +319,7 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulus) - - if ((dh = DH_new()) == NULL) - return NULL; -- dh->p = modulus; -- dh->g = gen; -+ DH_set0_pqg(dh, modulus, NULL, gen); - - return (dh); - } -diff --git a/dh.h b/dh.h -index bcd485cf..344b29e3 100644 ---- a/dh.h -+++ b/dh.h -@@ -42,7 +42,7 @@ DH *dh_new_group18(void); - DH *dh_new_group_fallback(int); - - int dh_gen_key(DH *, int); --int dh_pub_is_valid(DH *, BIGNUM *); -+int dh_pub_is_valid(const DH *, const BIGNUM *); - - u_int dh_estimate(int); - -diff --git a/digest-openssl.c b/digest-openssl.c -index c55ceb93..b94045bd 100644 ---- a/digest-openssl.c -+++ b/digest-openssl.c -@@ -43,7 +43,7 @@ - - struct ssh_digest_ctx { - int alg; -- EVP_MD_CTX mdctx; -+ EVP_MD_CTX *mdctx; - }; - - struct ssh_digest { -@@ -107,7 +107,7 @@ ssh_digest_bytes(int alg) - size_t - ssh_digest_blocksize(struct ssh_digest_ctx *ctx) - { -- return EVP_MD_CTX_block_size(&ctx->mdctx); -+ return EVP_MD_CTX_block_size(ctx->mdctx); - } - - struct ssh_digest_ctx * -@@ -119,8 +119,9 @@ ssh_digest_start(int alg) - if (digest == NULL || ((ret = calloc(1, sizeof(*ret))) == NULL)) - return NULL; - ret->alg = alg; -- EVP_MD_CTX_init(&ret->mdctx); -- if (EVP_DigestInit_ex(&ret->mdctx, digest->mdfunc(), NULL) != 1) { -+ ret->mdctx = EVP_MD_CTX_new(); -+ if (ret->mdctx == NULL || -+ EVP_DigestInit_ex(ret->mdctx, digest->mdfunc(), NULL) != 1) { - free(ret); - return NULL; - } -@@ -133,7 +134,7 @@ ssh_digest_copy_state(struct ssh_digest_ctx *from, struct ssh_digest_ctx *to) - if (from->alg != to->alg) - return SSH_ERR_INVALID_ARGUMENT; - /* we have bcopy-style order while openssl has memcpy-style */ -- if (!EVP_MD_CTX_copy_ex(&to->mdctx, &from->mdctx)) -+ if (!EVP_MD_CTX_copy_ex(to->mdctx, from->mdctx)) - return SSH_ERR_LIBCRYPTO_ERROR; - return 0; - } -@@ -141,7 +142,7 @@ ssh_digest_copy_state(struct ssh_digest_ctx *from, struct ssh_digest_ctx *to) - int - ssh_digest_update(struct ssh_digest_ctx *ctx, const void *m, size_t mlen) - { -- if (EVP_DigestUpdate(&ctx->mdctx, m, mlen) != 1) -+ if (EVP_DigestUpdate(ctx->mdctx, m, mlen) != 1) - return SSH_ERR_LIBCRYPTO_ERROR; - return 0; - } -@@ -162,7 +163,7 @@ ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen) - return SSH_ERR_INVALID_ARGUMENT; - if (dlen < digest->digest_len) /* No truncation allowed */ - return SSH_ERR_INVALID_ARGUMENT; -- if (EVP_DigestFinal_ex(&ctx->mdctx, d, &l) != 1) -+ if (EVP_DigestFinal_ex(ctx->mdctx, d, &l) != 1) - return SSH_ERR_LIBCRYPTO_ERROR; - if (l != digest->digest_len) /* sanity */ - return SSH_ERR_INTERNAL_ERROR; -@@ -173,7 +174,7 @@ void - ssh_digest_free(struct ssh_digest_ctx *ctx) - { - if (ctx != NULL) { -- EVP_MD_CTX_cleanup(&ctx->mdctx); -+ EVP_MD_CTX_free(ctx->mdctx); - explicit_bzero(ctx, sizeof(*ctx)); - free(ctx); - } -diff --git a/includes.h b/includes.h -index 497a038b..7e602f50 100644 ---- a/includes.h -+++ b/includes.h -@@ -163,6 +163,7 @@ - - #ifdef WITH_OPENSSL - #include /* For OPENSSL_VERSION_NUMBER */ -+#include "libcrypto-compat.h" - #endif - - #include "defines.h" -diff --git a/kexdhc.c b/kexdhc.c -index ad3975f0..0a55092e 100644 ---- a/kexdhc.c -+++ b/kexdhc.c -@@ -56,6 +56,7 @@ kexdh_client(struct ssh *ssh) - { - struct kex *kex = ssh->kex; - int r; -+ const BIGNUM *pub_key; - - /* generate and send 'e', client DH public key */ - switch (kex->kex_type) { -@@ -81,21 +82,27 @@ kexdh_client(struct ssh *ssh) - goto out; - } - debug("sending SSH2_MSG_KEXDH_INIT"); -- if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0 || -- (r = sshpkt_start(ssh, SSH2_MSG_KEXDH_INIT)) != 0 || -- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || -+ if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0) -+ goto out; -+ DH_get0_key(kex->dh, &pub_key, NULL); -+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXDH_INIT)) != 0 || -+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || - (r = sshpkt_send(ssh)) != 0) - goto out; - #ifdef DEBUG_KEXDH - DHparams_print_fp(stderr, kex->dh); - fprintf(stderr, "pub= "); -- BN_print_fp(stderr, kex->dh->pub_key); -+ BN_print_fp(stderr, pub_key); - fprintf(stderr, "\n"); - #endif - debug("expecting SSH2_MSG_KEXDH_REPLY"); - ssh_dispatch_set(ssh, SSH2_MSG_KEXDH_REPLY, &input_kex_dh); - r = 0; - out: -+ if (r != 0) { -+ DH_free(kex->dh); -+ kex->dh = NULL; -+ } - return r; - } - -@@ -110,6 +117,7 @@ input_kex_dh(int type, u_int32_t seq, void *ctxt) - u_char hash[SSH_DIGEST_MAX_LENGTH]; - size_t klen = 0, slen, sbloblen, hashlen; - int kout, r; -+ const BIGNUM *pub_key; - - if (kex->verify_host_key == NULL) { - r = SSH_ERR_INVALID_ARGUMENT; -@@ -169,6 +177,7 @@ input_kex_dh(int type, u_int32_t seq, void *ctxt) - #endif - - /* calc and verify H */ -+ DH_get0_key(kex->dh, &pub_key, NULL); - hashlen = sizeof(hash); - if ((r = kex_dh_hash( - kex->hash_alg, -@@ -177,7 +186,7 @@ input_kex_dh(int type, u_int32_t seq, void *ctxt) - sshbuf_ptr(kex->my), sshbuf_len(kex->my), - sshbuf_ptr(kex->peer), sshbuf_len(kex->peer), - server_host_key_blob, sbloblen, -- kex->dh->pub_key, -+ pub_key, - dh_server_pub, - shared_secret, - hash, &hashlen)) != 0) -diff --git a/kexdhs.c b/kexdhs.c -index 108f6642..8d0906e4 100644 ---- a/kexdhs.c -+++ b/kexdhs.c -@@ -87,6 +87,10 @@ kexdh_server(struct ssh *ssh) - ssh_dispatch_set(ssh, SSH2_MSG_KEXDH_INIT, &input_kex_dh_init); - r = 0; - out: -+ if (r != 0) { -+ DH_free(kex->dh); -+ kex->dh = NULL; -+ } - return r; - } - -@@ -102,6 +106,7 @@ input_kex_dh_init(int type, u_int32_t seq, void *ctxt) - size_t sbloblen, slen; - size_t klen = 0, hashlen; - int kout, r; -+ const BIGNUM *pub_key; - - if (kex->load_host_public_key == NULL || - kex->load_host_private_key == NULL) { -@@ -164,6 +169,7 @@ input_kex_dh_init(int type, u_int32_t seq, void *ctxt) - goto out; - /* calc H */ - hashlen = sizeof(hash); -+ DH_get0_key(kex->dh, &pub_key, NULL); - if ((r = kex_dh_hash( - kex->hash_alg, - kex->client_version_string, -@@ -172,7 +178,7 @@ input_kex_dh_init(int type, u_int32_t seq, void *ctxt) - sshbuf_ptr(kex->my), sshbuf_len(kex->my), - server_host_key_blob, sbloblen, - dh_client_pub, -- kex->dh->pub_key, -+ pub_key, - shared_secret, - hash, &hashlen)) != 0) - goto out; -@@ -198,7 +204,7 @@ input_kex_dh_init(int type, u_int32_t seq, void *ctxt) - /* send server hostkey, DH pubkey 'f' and singed H */ - if ((r = sshpkt_start(ssh, SSH2_MSG_KEXDH_REPLY)) != 0 || - (r = sshpkt_put_string(ssh, server_host_key_blob, sbloblen)) != 0 || -- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */ -+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */ - (r = sshpkt_put_string(ssh, signature, slen)) != 0 || - (r = sshpkt_send(ssh)) != 0) - goto out; -diff --git a/kexgexc.c b/kexgexc.c -index ad0d1c8c..da17c498 100644 ---- a/kexgexc.c -+++ b/kexgexc.c -@@ -95,6 +95,7 @@ input_kex_dh_gex_group(int type, u_int32_t seq, void *ctxt) - struct kex *kex = ssh->kex; - BIGNUM *p = NULL, *g = NULL; - int r, bits; -+ const BIGNUM *pub_key; - - debug("got SSH2_MSG_KEX_DH_GEX_GROUP"); - -@@ -119,26 +120,30 @@ input_kex_dh_gex_group(int type, u_int32_t seq, void *ctxt) - p = g = NULL; /* belong to kex->dh now */ - - /* generate and send 'e', client DH public key */ -- if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0 || -- (r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_INIT)) != 0 || -- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || -+ if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0) -+ goto out; -+ DH_get0_key(kex->dh, &pub_key, NULL); -+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_INIT)) != 0 || -+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || - (r = sshpkt_send(ssh)) != 0) - goto out; - debug("SSH2_MSG_KEX_DH_GEX_INIT sent"); - #ifdef DEBUG_KEXDH - DHparams_print_fp(stderr, kex->dh); - fprintf(stderr, "pub= "); -- BN_print_fp(stderr, kex->dh->pub_key); -+ BN_print_fp(stderr, pub_key); - fprintf(stderr, "\n"); - #endif - ssh_dispatch_set(ssh, SSH2_MSG_KEX_DH_GEX_GROUP, NULL); - ssh_dispatch_set(ssh, SSH2_MSG_KEX_DH_GEX_REPLY, &input_kex_dh_gex_reply); - r = 0; - out: -- if (p) -- BN_clear_free(p); -- if (g) -- BN_clear_free(g); -+ BN_clear_free(p); -+ BN_clear_free(g); -+ if (r != 0) { -+ DH_free(kex->dh); -+ kex->dh = NULL; -+ } - return r; - } - -@@ -153,6 +158,7 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt) - u_char hash[SSH_DIGEST_MAX_LENGTH]; - size_t klen = 0, slen, sbloblen, hashlen; - int kout, r; -+ const BIGNUM *p, *g, *pub_key; - - debug("got SSH2_MSG_KEX_DH_GEX_REPLY"); - if (kex->verify_host_key == NULL) { -@@ -219,6 +225,8 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt) - kex->min = kex->max = -1; - - /* calc and verify H */ -+ DH_get0_pqg(kex->dh, &p, NULL, &g); -+ DH_get0_key(kex->dh, &pub_key, NULL); - hashlen = sizeof(hash); - if ((r = kexgex_hash( - kex->hash_alg, -@@ -228,8 +236,8 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt) - sshbuf_ptr(kex->peer), sshbuf_len(kex->peer), - server_host_key_blob, sbloblen, - kex->min, kex->nbits, kex->max, -- kex->dh->p, kex->dh->g, -- kex->dh->pub_key, -+ p, g, -+ pub_key, - dh_server_pub, - shared_secret, - hash, &hashlen)) != 0) -diff --git a/kexgexs.c b/kexgexs.c -index 44960359..7cd8c7e7 100644 ---- a/kexgexs.c -+++ b/kexgexs.c -@@ -73,6 +73,7 @@ input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt) - struct kex *kex = ssh->kex; - int r; - u_int min = 0, max = 0, nbits = 0; -+ const BIGNUM *p, *g; - - debug("SSH2_MSG_KEX_DH_GEX_REQUEST received"); - if ((r = sshpkt_get_u32(ssh, &min)) != 0 || -@@ -102,9 +103,10 @@ input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt) - goto out; - } - debug("SSH2_MSG_KEX_DH_GEX_GROUP sent"); -+ DH_get0_pqg(kex->dh, &p, NULL, &g); - if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_GROUP)) != 0 || -- (r = sshpkt_put_bignum2(ssh, kex->dh->p)) != 0 || -- (r = sshpkt_put_bignum2(ssh, kex->dh->g)) != 0 || -+ (r = sshpkt_put_bignum2(ssh, p)) != 0 || -+ (r = sshpkt_put_bignum2(ssh, g)) != 0 || - (r = sshpkt_send(ssh)) != 0) - goto out; - -@@ -116,6 +118,10 @@ input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt) - ssh_dispatch_set(ssh, SSH2_MSG_KEX_DH_GEX_INIT, &input_kex_dh_gex_init); - r = 0; - out: -+ if (r != 0) { -+ DH_free(kex->dh); -+ kex->dh = NULL; -+ } - return r; - } - -@@ -131,6 +137,7 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) - size_t sbloblen, slen; - size_t klen = 0, hashlen; - int kout, r; -+ const BIGNUM *p, *g, *pub_key; - - if (kex->load_host_public_key == NULL || - kex->load_host_private_key == NULL) { -@@ -193,6 +200,8 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) - goto out; - /* calc H */ - hashlen = sizeof(hash); -+ DH_get0_pqg(kex->dh, &p, NULL, &g); -+ DH_get0_key(kex->dh, &pub_key, NULL); - if ((r = kexgex_hash( - kex->hash_alg, - kex->client_version_string, -@@ -201,9 +210,9 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) - sshbuf_ptr(kex->my), sshbuf_len(kex->my), - server_host_key_blob, sbloblen, - kex->min, kex->nbits, kex->max, -- kex->dh->p, kex->dh->g, -+ p, g, - dh_client_pub, -- kex->dh->pub_key, -+ pub_key, - shared_secret, - hash, &hashlen)) != 0) - goto out; -@@ -229,7 +238,7 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) - /* send server hostkey, DH pubkey 'f' and singed H */ - if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REPLY)) != 0 || - (r = sshpkt_put_string(ssh, server_host_key_blob, sbloblen)) != 0 || -- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */ -+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */ - (r = sshpkt_put_string(ssh, signature, slen)) != 0 || - (r = sshpkt_send(ssh)) != 0) - goto out; -diff --git a/libcrypto-compat.c b/libcrypto-compat.c -new file mode 100644 -index 00000000..1e17fecc ---- /dev/null -+++ b/libcrypto-compat.c -@@ -0,0 +1,546 @@ -+/* -+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. -+ * -+ * Licensed under the OpenSSL license (the "License"). You may not use -+ * this file except in compliance with the License. You can obtain a copy -+ * in the file LICENSE in the source distribution or at -+ * https://www.openssl.org/source/license.html -+ */ -+ -+#include "includes.h" -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include -+#include -+ -+static void *OPENSSL_zalloc(size_t num) -+{ -+ void *ret = OPENSSL_malloc(num); -+ -+ if (ret != NULL) -+ memset(ret, 0, num); -+ return ret; -+} -+ -+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) -+{ -+ /* If the fields n and e in r are NULL, the corresponding input -+ * parameters MUST be non-NULL for n and e. d may be -+ * left NULL (in case only the public key is used). -+ */ -+ if ((r->n == NULL && n == NULL) -+ || (r->e == NULL && e == NULL)) -+ return 0; -+ -+ if (n != NULL) { -+ BN_free(r->n); -+ r->n = n; -+ } -+ if (e != NULL) { -+ BN_free(r->e); -+ r->e = e; -+ } -+ if (d != NULL) { -+ BN_free(r->d); -+ r->d = d; -+ } -+ -+ return 1; -+} -+ -+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) -+{ -+ /* If the fields p and q in r are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((r->p == NULL && p == NULL) -+ || (r->q == NULL && q == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(r->p); -+ r->p = p; -+ } -+ if (q != NULL) { -+ BN_free(r->q); -+ r->q = q; -+ } -+ -+ return 1; -+} -+ -+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) -+{ -+ /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((r->dmp1 == NULL && dmp1 == NULL) -+ || (r->dmq1 == NULL && dmq1 == NULL) -+ || (r->iqmp == NULL && iqmp == NULL)) -+ return 0; -+ -+ if (dmp1 != NULL) { -+ BN_free(r->dmp1); -+ r->dmp1 = dmp1; -+ } -+ if (dmq1 != NULL) { -+ BN_free(r->dmq1); -+ r->dmq1 = dmq1; -+ } -+ if (iqmp != NULL) { -+ BN_free(r->iqmp); -+ r->iqmp = iqmp; -+ } -+ -+ return 1; -+} -+ -+void RSA_get0_key(const RSA *r, -+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) -+{ -+ if (n != NULL) -+ *n = r->n; -+ if (e != NULL) -+ *e = r->e; -+ if (d != NULL) -+ *d = r->d; -+} -+ -+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) -+{ -+ if (p != NULL) -+ *p = r->p; -+ if (q != NULL) -+ *q = r->q; -+} -+ -+void RSA_get0_crt_params(const RSA *r, -+ const BIGNUM **dmp1, const BIGNUM **dmq1, -+ const BIGNUM **iqmp) -+{ -+ if (dmp1 != NULL) -+ *dmp1 = r->dmp1; -+ if (dmq1 != NULL) -+ *dmq1 = r->dmq1; -+ if (iqmp != NULL) -+ *iqmp = r->iqmp; -+} -+ -+void DSA_get0_pqg(const DSA *d, -+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) -+{ -+ if (p != NULL) -+ *p = d->p; -+ if (q != NULL) -+ *q = d->q; -+ if (g != NULL) -+ *g = d->g; -+} -+ -+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) -+{ -+ /* If the fields p, q and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((d->p == NULL && p == NULL) -+ || (d->q == NULL && q == NULL) -+ || (d->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(d->p); -+ d->p = p; -+ } -+ if (q != NULL) { -+ BN_free(d->q); -+ d->q = q; -+ } -+ if (g != NULL) { -+ BN_free(d->g); -+ d->g = g; -+ } -+ -+ return 1; -+} -+ -+void DSA_get0_key(const DSA *d, -+ const BIGNUM **pub_key, const BIGNUM **priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = d->pub_key; -+ if (priv_key != NULL) -+ *priv_key = d->priv_key; -+} -+ -+int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) -+{ -+ /* If the field pub_key in d is NULL, the corresponding input -+ * parameters MUST be non-NULL. The priv_key field may -+ * be left NULL. -+ */ -+ if (d->pub_key == NULL && pub_key == NULL) -+ return 0; -+ -+ if (pub_key != NULL) { -+ BN_free(d->pub_key); -+ d->pub_key = pub_key; -+ } -+ if (priv_key != NULL) { -+ BN_free(d->priv_key); -+ d->priv_key = priv_key; -+ } -+ -+ return 1; -+} -+ -+void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) -+{ -+ if (pr != NULL) -+ *pr = sig->r; -+ if (ps != NULL) -+ *ps = sig->s; -+} -+ -+int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s) -+{ -+ if (r == NULL || s == NULL) -+ return 0; -+ BN_clear_free(sig->r); -+ BN_clear_free(sig->s); -+ sig->r = r; -+ sig->s = s; -+ return 1; -+} -+ -+void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) -+{ -+ if (pr != NULL) -+ *pr = sig->r; -+ if (ps != NULL) -+ *ps = sig->s; -+} -+ -+int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) -+{ -+ if (r == NULL || s == NULL) -+ return 0; -+ BN_clear_free(sig->r); -+ BN_clear_free(sig->s); -+ sig->r = r; -+ sig->s = s; -+ return 1; -+} -+ -+void DH_get0_pqg(const DH *dh, -+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) -+{ -+ if (p != NULL) -+ *p = dh->p; -+ if (q != NULL) -+ *q = dh->q; -+ if (g != NULL) -+ *g = dh->g; -+} -+ -+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) -+{ -+ /* If the fields p and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. q may remain NULL. -+ */ -+ if ((dh->p == NULL && p == NULL) -+ || (dh->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(dh->p); -+ dh->p = p; -+ } -+ if (q != NULL) { -+ BN_free(dh->q); -+ dh->q = q; -+ } -+ if (g != NULL) { -+ BN_free(dh->g); -+ dh->g = g; -+ } -+ -+ if (q != NULL) { -+ dh->length = BN_num_bits(q); -+ } -+ -+ return 1; -+} -+ -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = dh->pub_key; -+ if (priv_key != NULL) -+ *priv_key = dh->priv_key; -+} -+ -+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) -+{ -+ /* If the field pub_key in dh is NULL, the corresponding input -+ * parameters MUST be non-NULL. The priv_key field may -+ * be left NULL. -+ */ -+ if (dh->pub_key == NULL && pub_key == NULL) -+ return 0; -+ -+ if (pub_key != NULL) { -+ BN_free(dh->pub_key); -+ dh->pub_key = pub_key; -+ } -+ if (priv_key != NULL) { -+ BN_free(dh->priv_key); -+ dh->priv_key = priv_key; -+ } -+ -+ return 1; -+} -+ -+int DH_set_length(DH *dh, long length) -+{ -+ dh->length = length; -+ return 1; -+} -+ -+const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx) -+{ -+ return ctx->iv; -+} -+ -+unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx) -+{ -+ return ctx->iv; -+} -+ -+EVP_MD_CTX *EVP_MD_CTX_new(void) -+{ -+ return OPENSSL_zalloc(sizeof(EVP_MD_CTX)); -+} -+ -+static void OPENSSL_clear_free(void *str, size_t num) -+{ -+ if (str == NULL) -+ return; -+ if (num) -+ OPENSSL_cleanse(str, num); -+ OPENSSL_free(str); -+} -+ -+/* This call frees resources associated with the context */ -+int EVP_MD_CTX_reset(EVP_MD_CTX *ctx) -+{ -+ if (ctx == NULL) -+ return 1; -+ -+ /* -+ * Don't assume ctx->md_data was cleaned in EVP_Digest_Final, because -+ * sometimes only copies of the context are ever finalised. -+ */ -+ if (ctx->digest && ctx->digest->cleanup -+ && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_CLEANED)) -+ ctx->digest->cleanup(ctx); -+ if (ctx->digest && ctx->digest->ctx_size && ctx->md_data -+ && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)) { -+ OPENSSL_clear_free(ctx->md_data, ctx->digest->ctx_size); -+ } -+ EVP_PKEY_CTX_free(ctx->pctx); -+#ifndef OPENSSL_NO_ENGINE -+ ENGINE_finish(ctx->engine); -+#endif -+ OPENSSL_cleanse(ctx, sizeof(*ctx)); -+ -+ return 1; -+} -+ -+void EVP_MD_CTX_free(EVP_MD_CTX *ctx) -+{ -+ EVP_MD_CTX_reset(ctx); -+ OPENSSL_free(ctx); -+} -+ -+RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth) -+{ -+ RSA_METHOD *ret; -+ -+ ret = OPENSSL_malloc(sizeof(RSA_METHOD)); -+ -+ if (ret != NULL) { -+ memcpy(ret, meth, sizeof(*meth)); -+ ret->name = OPENSSL_strdup(meth->name); -+ if (ret->name == NULL) { -+ OPENSSL_free(ret); -+ return NULL; -+ } -+ } -+ -+ return ret; -+} -+ -+int RSA_meth_set1_name(RSA_METHOD *meth, const char *name) -+{ -+ char *tmpname; -+ -+ tmpname = OPENSSL_strdup(name); -+ if (tmpname == NULL) { -+ return 0; -+ } -+ -+ OPENSSL_free((char *)meth->name); -+ meth->name = tmpname; -+ -+ return 1; -+} -+ -+int RSA_meth_set_priv_enc(RSA_METHOD *meth, -+ int (*priv_enc) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, -+ int padding)) -+{ -+ meth->rsa_priv_enc = priv_enc; -+ return 1; -+} -+ -+int RSA_meth_set_priv_dec(RSA_METHOD *meth, -+ int (*priv_dec) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, -+ int padding)) -+{ -+ meth->rsa_priv_dec = priv_dec; -+ return 1; -+} -+ -+int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) -+{ -+ meth->finish = finish; -+ return 1; -+} -+ -+void RSA_meth_free(RSA_METHOD *meth) -+{ -+ if (meth != NULL) { -+ OPENSSL_free((char *)meth->name); -+ OPENSSL_free(meth); -+ } -+} -+ -+int RSA_bits(const RSA *r) -+{ -+ return (BN_num_bits(r->n)); -+} -+ -+int DSA_bits(const DSA *dsa) -+{ -+ return BN_num_bits(dsa->p); -+} -+ -+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey) -+{ -+ if (pkey->type != EVP_PKEY_RSA) { -+ return NULL; -+ } -+ return pkey->pkey.rsa; -+} -+ -+EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len) -+{ -+ EVP_CIPHER *cipher = OPENSSL_zalloc(sizeof(EVP_CIPHER)); -+ -+ if (cipher != NULL) { -+ cipher->nid = cipher_type; -+ cipher->block_size = block_size; -+ cipher->key_len = key_len; -+ } -+ return cipher; -+} -+ -+void EVP_CIPHER_meth_free(EVP_CIPHER *cipher) -+{ -+ OPENSSL_free(cipher); -+} -+ -+int EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len) -+{ -+ cipher->iv_len = iv_len; -+ return 1; -+} -+ -+int EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags) -+{ -+ cipher->flags = flags; -+ return 1; -+} -+ -+int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, -+ int (*init) (EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, -+ const unsigned char *iv, -+ int enc)) -+{ -+ cipher->init = init; -+ return 1; -+} -+ -+int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, -+ int (*do_cipher) (EVP_CIPHER_CTX *ctx, -+ unsigned char *out, -+ const unsigned char *in, -+ size_t inl)) -+{ -+ cipher->do_cipher = do_cipher; -+ return 1; -+} -+ -+int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, -+ int (*cleanup) (EVP_CIPHER_CTX *)) -+{ -+ cipher->cleanup = cleanup; -+ return 1; -+} -+ -+int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, -+ int (*ctrl) (EVP_CIPHER_CTX *, int type, -+ int arg, void *ptr)) -+{ -+ cipher->ctrl = ctrl; -+ return 1; -+} -+ -+int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, -+ const unsigned char *iv, -+ int enc) -+{ -+ return cipher->init; -+} -+ -+int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx, -+ unsigned char *out, -+ const unsigned char *in, -+ size_t inl) -+{ -+ return cipher->do_cipher; -+} -+ -+int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *) -+{ -+ return cipher->cleanup; -+} -+ -+int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, -+ int type, int arg, -+ void *ptr) -+{ -+ return cipher->ctrl; -+} -+ -+int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) -+{ -+ return ctx->encrypt; -+} -+ -+#endif /* OPENSSL_VERSION_NUMBER */ -diff --git a/libcrypto-compat.h b/libcrypto-compat.h -new file mode 100644 -index 00000000..5ef87a65 ---- /dev/null -+++ b/libcrypto-compat.h -@@ -0,0 +1,98 @@ -+#ifndef LIBCRYPTO_COMPAT_H -+#define LIBCRYPTO_COMPAT_H -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include -+#include -+#include -+#include -+#include -+ -+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); -+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); -+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp); -+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d); -+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q); -+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp); -+ -+void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); -+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g); -+void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key); -+int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key); -+ -+void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); -+int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s); -+ -+void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); -+int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s); -+ -+void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); -+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key); -+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key); -+int DH_set_length(DH *dh, long length); -+ -+const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx); -+unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx); -+int EVP_MD_CTX_reset(EVP_MD_CTX *ctx); -+EVP_MD_CTX *EVP_MD_CTX_new(void); -+void EVP_MD_CTX_free(EVP_MD_CTX *ctx); -+#define EVP_CIPHER_impl_ctx_size(e) e->ctx_size -+#define EVP_CIPHER_CTX_get_cipher_data(ctx) ctx->cipher_data -+ -+RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth); -+int RSA_meth_set1_name(RSA_METHOD *meth, const char *name); -+#define RSA_meth_get_finish(meth) meth->finish -+int RSA_meth_set_priv_enc(RSA_METHOD *meth, int (*priv_enc) (int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)); -+int RSA_meth_set_priv_dec(RSA_METHOD *meth, int (*priv_dec) (int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)); -+int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)); -+void RSA_meth_free(RSA_METHOD *meth); -+ -+int RSA_bits(const RSA *r); -+int DSA_bits(const DSA *d); -+ -+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey); -+ -+EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len); -+void EVP_CIPHER_meth_free(EVP_CIPHER *cipher); -+ -+int EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len); -+int EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags); -+int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, -+ int (*init) (EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, -+ const unsigned char *iv, -+ int enc)); -+int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, -+ int (*do_cipher) (EVP_CIPHER_CTX *ctx, -+ unsigned char *out, -+ const unsigned char *in, -+ size_t inl)); -+int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, -+ int (*cleanup) (EVP_CIPHER_CTX *)); -+int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, -+ int (*ctrl) (EVP_CIPHER_CTX *, int type, -+ int arg, void *ptr)); -+ -+int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, -+ const unsigned char *iv, -+ int enc); -+int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx, -+ unsigned char *out, -+ const unsigned char *in, -+ size_t inl); -+int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *); -+int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, -+ int type, int arg, -+ void *ptr); -+ -+#define EVP_CIPHER_CTX_reset(c) EVP_CIPHER_CTX_init(c) -+ -+int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx); -+ -+#endif /* OPENSSL_VERSION_NUMBER */ -+ -+#endif /* LIBCRYPTO_COMPAT_H */ -+ -diff --git a/monitor.c b/monitor.c -index 96d22b7e..f49bddd9 100644 ---- a/monitor.c -+++ b/monitor.c -@@ -581,9 +581,12 @@ mm_answer_moduli(int sock, Buffer *m) - return (0); - } else { - /* Send first bignum */ -+ const BIGNUM *p, *g; -+ -+ DH_get0_pqg(dh, &p, NULL, &g); - buffer_put_char(m, 1); -- buffer_put_bignum2(m, dh->p); -- buffer_put_bignum2(m, dh->g); -+ buffer_put_bignum2(m, p); -+ buffer_put_bignum2(m, g); - - DH_free(dh); - } -diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c -index aaa953f2..0eae7fca 100644 ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -70,12 +70,19 @@ ssh_compatible_openssl(long headerver, long libver) - void - ssh_OpenSSL_add_all_algorithms(void) - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - OpenSSL_add_all_algorithms(); - - /* Enable use of crypto hardware */ - ENGINE_load_builtin_engines(); -+#if OPENSSL_VERSION_NUMBER < 0x10001000L - ENGINE_register_all_complete(); -+#endif - OPENSSL_config(NULL); -+#else -+ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS | -+ OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL); -+#endif - } - #endif - -diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c -index 906491f2..ec270de3 100644 ---- a/regress/unittests/sshkey/test_file.c -+++ b/regress/unittests/sshkey/test_file.c -@@ -46,6 +46,7 @@ sshkey_file_tests(void) - struct sshbuf *buf, *pw; - BIGNUM *a, *b, *c; - char *cp; -+ const BIGNUM *n, *p, *q, *g, *pub_key, *priv_key; - - TEST_START("load passphrase"); - pw = load_text_file("pw"); -@@ -58,7 +59,8 @@ sshkey_file_tests(void) - sshbuf_free(buf); - ASSERT_PTR_NE(k1, NULL); - a = load_bignum("rsa1_1.param.n"); -- ASSERT_BIGNUM_EQ(k1->rsa->n, a); -+ RSA_get0_key(k1->rsa, &n, NULL, NULL); -+ ASSERT_BIGNUM_EQ(n, a); - BN_free(a); - TEST_DONE(); - -@@ -109,9 +111,11 @@ sshkey_file_tests(void) - a = load_bignum("rsa_1.param.n"); - b = load_bignum("rsa_1.param.p"); - c = load_bignum("rsa_1.param.q"); -- ASSERT_BIGNUM_EQ(k1->rsa->n, a); -- ASSERT_BIGNUM_EQ(k1->rsa->p, b); -- ASSERT_BIGNUM_EQ(k1->rsa->q, c); -+ RSA_get0_key(k1->rsa, &n, NULL, NULL); -+ RSA_get0_factors(k1->rsa, &p, &q); -+ ASSERT_BIGNUM_EQ(n, a); -+ ASSERT_BIGNUM_EQ(p, b); -+ ASSERT_BIGNUM_EQ(q, c); - BN_free(a); - BN_free(b); - BN_free(c); -@@ -200,9 +204,11 @@ sshkey_file_tests(void) - a = load_bignum("dsa_1.param.g"); - b = load_bignum("dsa_1.param.priv"); - c = load_bignum("dsa_1.param.pub"); -- ASSERT_BIGNUM_EQ(k1->dsa->g, a); -- ASSERT_BIGNUM_EQ(k1->dsa->priv_key, b); -- ASSERT_BIGNUM_EQ(k1->dsa->pub_key, c); -+ DSA_get0_pqg(k1->dsa, NULL, NULL, &g); -+ DSA_get0_key(k1->dsa, &pub_key, &priv_key); -+ ASSERT_BIGNUM_EQ(g, a); -+ ASSERT_BIGNUM_EQ(priv_key, b); -+ ASSERT_BIGNUM_EQ(pub_key, c); - BN_free(a); - BN_free(b); - BN_free(c); -diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c -index 1476dc2e..c0f94eec 100644 ---- a/regress/unittests/sshkey/test_sshkey.c -+++ b/regress/unittests/sshkey/test_sshkey.c -@@ -197,9 +197,6 @@ sshkey_tests(void) - k1 = sshkey_new(KEY_RSA1); - ASSERT_PTR_NE(k1, NULL); - ASSERT_PTR_NE(k1->rsa, NULL); -- ASSERT_PTR_NE(k1->rsa->n, NULL); -- ASSERT_PTR_NE(k1->rsa->e, NULL); -- ASSERT_PTR_EQ(k1->rsa->p, NULL); - sshkey_free(k1); - TEST_DONE(); - -@@ -207,9 +204,6 @@ sshkey_tests(void) - k1 = sshkey_new(KEY_RSA); - ASSERT_PTR_NE(k1, NULL); - ASSERT_PTR_NE(k1->rsa, NULL); -- ASSERT_PTR_NE(k1->rsa->n, NULL); -- ASSERT_PTR_NE(k1->rsa->e, NULL); -- ASSERT_PTR_EQ(k1->rsa->p, NULL); - sshkey_free(k1); - TEST_DONE(); - -@@ -217,8 +211,6 @@ sshkey_tests(void) - k1 = sshkey_new(KEY_DSA); - ASSERT_PTR_NE(k1, NULL); - ASSERT_PTR_NE(k1->dsa, NULL); -- ASSERT_PTR_NE(k1->dsa->g, NULL); -- ASSERT_PTR_EQ(k1->dsa->priv_key, NULL); - sshkey_free(k1); - TEST_DONE(); - -@@ -244,9 +236,6 @@ sshkey_tests(void) - k1 = sshkey_new_private(KEY_RSA); - ASSERT_PTR_NE(k1, NULL); - ASSERT_PTR_NE(k1->rsa, NULL); -- ASSERT_PTR_NE(k1->rsa->n, NULL); -- ASSERT_PTR_NE(k1->rsa->e, NULL); -- ASSERT_PTR_NE(k1->rsa->p, NULL); - ASSERT_INT_EQ(sshkey_add_private(k1), 0); - sshkey_free(k1); - TEST_DONE(); -@@ -255,8 +244,6 @@ sshkey_tests(void) - k1 = sshkey_new_private(KEY_DSA); - ASSERT_PTR_NE(k1, NULL); - ASSERT_PTR_NE(k1->dsa, NULL); -- ASSERT_PTR_NE(k1->dsa->g, NULL); -- ASSERT_PTR_NE(k1->dsa->priv_key, NULL); - ASSERT_INT_EQ(sshkey_add_private(k1), 0); - sshkey_free(k1); - TEST_DONE(); -@@ -295,18 +282,13 @@ sshkey_tests(void) - ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0); - ASSERT_PTR_NE(kr, NULL); - ASSERT_PTR_NE(kr->rsa, NULL); -- ASSERT_PTR_NE(kr->rsa->n, NULL); -- ASSERT_PTR_NE(kr->rsa->e, NULL); -- ASSERT_PTR_NE(kr->rsa->p, NULL); -- ASSERT_INT_EQ(BN_num_bits(kr->rsa->n), 1024); -+ ASSERT_INT_EQ(RSA_bits(kr->rsa), 1024); - TEST_DONE(); - - TEST_START("generate KEY_DSA"); - ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &kd), 0); - ASSERT_PTR_NE(kd, NULL); - ASSERT_PTR_NE(kd->dsa, NULL); -- ASSERT_PTR_NE(kd->dsa->g, NULL); -- ASSERT_PTR_NE(kd->dsa->priv_key, NULL); - TEST_DONE(); - - #ifdef OPENSSL_HAS_ECC -@@ -333,9 +315,6 @@ sshkey_tests(void) - ASSERT_PTR_NE(kr, k1); - ASSERT_INT_EQ(k1->type, KEY_RSA); - ASSERT_PTR_NE(k1->rsa, NULL); -- ASSERT_PTR_NE(k1->rsa->n, NULL); -- ASSERT_PTR_NE(k1->rsa->e, NULL); -- ASSERT_PTR_EQ(k1->rsa->p, NULL); - TEST_DONE(); - - TEST_START("equal KEY_RSA/demoted KEY_RSA"); -@@ -349,8 +328,6 @@ sshkey_tests(void) - ASSERT_PTR_NE(kd, k1); - ASSERT_INT_EQ(k1->type, KEY_DSA); - ASSERT_PTR_NE(k1->dsa, NULL); -- ASSERT_PTR_NE(k1->dsa->g, NULL); -- ASSERT_PTR_EQ(k1->dsa->priv_key, NULL); - TEST_DONE(); - - TEST_START("equal KEY_DSA/demoted KEY_DSA"); -diff --git a/rsa.c b/rsa.c -index 5ecacef9..6ff9947f 100644 ---- a/rsa.c -+++ b/rsa.c -@@ -76,11 +76,14 @@ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) - { - u_char *inbuf = NULL, *outbuf = NULL; - int len, ilen, olen, r = SSH_ERR_INTERNAL_ERROR; -+ const BIGNUM *e, *n; - -- if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e)) -+ RSA_get0_key(key, &n, &e, NULL); -+ -+ if (BN_num_bits(e) < 2 || !BN_is_odd(e)) - return SSH_ERR_INVALID_ARGUMENT; - -- olen = BN_num_bytes(key->n); -+ olen = BN_num_bytes(n); - if ((outbuf = malloc(olen)) == NULL) { - r = SSH_ERR_ALLOC_FAIL; - goto out; -@@ -122,8 +125,11 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key) - { - u_char *inbuf = NULL, *outbuf = NULL; - int len, ilen, olen, r = SSH_ERR_INTERNAL_ERROR; -+ const BIGNUM *n; -+ -+ RSA_get0_key(key, &n, NULL, NULL); - -- olen = BN_num_bytes(key->n); -+ olen = BN_num_bytes(n); - if ((outbuf = malloc(olen)) == NULL) { - r = SSH_ERR_ALLOC_FAIL; - goto out; -@@ -157,31 +163,42 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key) - return r; - } - --/* calculate p-1 and q-1 */ -+/* calculate d mod p-1 and d mod q-1 */ - int --rsa_generate_additional_parameters(RSA *rsa) -+rsa_generate_additional_parameters(RSA *rsa, BIGNUM *iqmp) - { - BIGNUM *aux = NULL; - BN_CTX *ctx = NULL; - int r; -+ const BIGNUM *p, *q, *d; -+ BIGNUM *dmp1 = NULL, *dmq1 = NULL; -+ -+ RSA_get0_factors(rsa, &p, &q); -+ RSA_get0_key(rsa, NULL, NULL, &d); - -- if ((ctx = BN_CTX_new()) == NULL) -- return SSH_ERR_ALLOC_FAIL; -- if ((aux = BN_new()) == NULL) { -+ if ((ctx = BN_CTX_new()) == NULL || -+ (aux = BN_new()) == NULL || -+ (dmp1 = BN_new()) == NULL || -+ (dmq1 = BN_new()) == NULL) { - r = SSH_ERR_ALLOC_FAIL; - goto out; - } - -- if ((BN_sub(aux, rsa->q, BN_value_one()) == 0) || -- (BN_mod(rsa->dmq1, rsa->d, aux, ctx) == 0) || -- (BN_sub(aux, rsa->p, BN_value_one()) == 0) || -- (BN_mod(rsa->dmp1, rsa->d, aux, ctx) == 0)) { -+ if ((BN_sub(aux, q, BN_value_one()) == 0) || -+ (BN_mod(dmq1, d, aux, ctx) == 0) || -+ (BN_sub(aux, p, BN_value_one()) == 0) || -+ (BN_mod(dmp1, d, aux, ctx) == 0) || -+ (RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp) == 0)) { - r = SSH_ERR_LIBCRYPTO_ERROR; - goto out; - } -+ dmp1 = NULL; -+ dmq1 = NULL; - r = 0; - out: - BN_clear_free(aux); -+ BN_clear_free(dmp1); -+ BN_clear_free(dmq1); - BN_CTX_free(ctx); - return r; - } -diff --git a/rsa.h b/rsa.h -index c476707d..4da69363 100644 ---- a/rsa.h -+++ b/rsa.h -@@ -21,6 +21,6 @@ - - int rsa_public_encrypt(BIGNUM *, BIGNUM *, RSA *); - int rsa_private_decrypt(BIGNUM *, BIGNUM *, RSA *); --int rsa_generate_additional_parameters(RSA *); -+int rsa_generate_additional_parameters(RSA *, BIGNUM *); - - #endif /* RSA_H */ -diff --git a/ssh-agent.c b/ssh-agent.c -index b987562b..5f7c36fe 100644 ---- a/ssh-agent.c -+++ b/ssh-agent.c -@@ -258,12 +258,12 @@ process_request_identities(SocketEntry *e, int version) - TAILQ_FOREACH(id, &tab->idlist, next) { - if (id->key->type == KEY_RSA1) { - #ifdef WITH_SSH1 -+ const BIGNUM *r_n, *r_e; -+ RSA_get0_key(id->key->rsa, &r_n, &r_e, NULL); - if ((r = sshbuf_put_u32(msg, -- BN_num_bits(id->key->rsa->n))) != 0 || -- (r = sshbuf_put_bignum1(msg, -- id->key->rsa->e)) != 0 || -- (r = sshbuf_put_bignum1(msg, -- id->key->rsa->n)) != 0) -+ BN_num_bits(r_n))) != 0 || -+ (r = sshbuf_put_bignum1(msg, r_e)) != 0 || -+ (r = sshbuf_put_bignum1(msg, r_n)) != 0) - fatal("%s: buffer error: %s", - __func__, ssh_err(r)); - #endif -@@ -302,6 +302,7 @@ process_authentication_challenge1(SocketEntry *e) - struct sshbuf *msg; - struct ssh_digest_ctx *md; - struct sshkey *key; -+ BIGNUM *r_n = NULL, *r_e = NULL; - - if ((msg = sshbuf_new()) == NULL) - fatal("%s: sshbuf_new failed", __func__); -@@ -310,11 +311,16 @@ process_authentication_challenge1(SocketEntry *e) - if ((challenge = BN_new()) == NULL) - fatal("%s: BN_new failed", __func__); - -- if ((r = sshbuf_get_u32(e->request, NULL)) != 0 || /* ignored */ -- (r = sshbuf_get_bignum1(e->request, key->rsa->e)) != 0 || -- (r = sshbuf_get_bignum1(e->request, key->rsa->n)) != 0 || -- (r = sshbuf_get_bignum1(e->request, challenge))) -+ if ((r_n = BN_new()) == NULL || (r_e = BN_new()) == NULL || -+ (r = sshbuf_get_u32(e->request, NULL)) != 0 || /* ignored */ -+ (r = sshbuf_get_bignum1(e->request, r_e)) != 0 || -+ (r = sshbuf_get_bignum1(e->request, r_n)) != 0 || -+ (r = sshbuf_get_bignum1(e->request, challenge)) || -+ RSA_set0_key(key->rsa, r_n, r_e, NULL) == 0) { -+ BN_free(r_n); -+ BN_free(r_e); - fatal("%s: buffer error: %s", __func__, ssh_err(r)); -+ } - - /* Only protocol 1.1 is supported */ - if (sshbuf_len(e->request) == 0) -@@ -450,6 +456,7 @@ process_remove_identity(SocketEntry *e, int version) - u_char *blob; - #ifdef WITH_SSH1 - u_int bits; -+ BIGNUM *r_n = NULL, *r_e = NULL; - #endif /* WITH_SSH1 */ - - switch (version) { -@@ -459,10 +466,15 @@ process_remove_identity(SocketEntry *e, int version) - error("%s: sshkey_new failed", __func__); - return; - } -- if ((r = sshbuf_get_u32(e->request, &bits)) != 0 || -- (r = sshbuf_get_bignum1(e->request, key->rsa->e)) != 0 || -- (r = sshbuf_get_bignum1(e->request, key->rsa->n)) != 0) -+ if ((r_n = BN_new()) == NULL || (r_e = BN_new()) == NULL || -+ (r = sshbuf_get_u32(e->request, &bits)) != 0 || -+ (r = sshbuf_get_bignum1(e->request, r_e)) != 0 || -+ (r = sshbuf_get_bignum1(e->request, r_n)) != 0 || -+ RSA_set0_key(key->rsa, r_n, r_e, NULL) == 0) { -+ BN_free(r_n); -+ BN_free(r_e); - fatal("%s: buffer error: %s", __func__, ssh_err(r)); -+ } - - if (bits != sshkey_size(key)) - logit("Warning: identity keysize mismatch: " -@@ -565,23 +577,46 @@ agent_decode_rsa1(struct sshbuf *m, struct sshkey **kp) - { - struct sshkey *k = NULL; - int r = SSH_ERR_INTERNAL_ERROR; -+ BIGNUM *n = NULL, *e = NULL, *d = NULL, -+ *iqmp = NULL, *q = NULL, *p = NULL; - - *kp = NULL; - if ((k = sshkey_new_private(KEY_RSA1)) == NULL) - return SSH_ERR_ALLOC_FAIL; - -- if ((r = sshbuf_get_u32(m, NULL)) != 0 || /* ignored */ -- (r = sshbuf_get_bignum1(m, k->rsa->n)) != 0 || -- (r = sshbuf_get_bignum1(m, k->rsa->e)) != 0 || -- (r = sshbuf_get_bignum1(m, k->rsa->d)) != 0 || -- (r = sshbuf_get_bignum1(m, k->rsa->iqmp)) != 0 || -+ if ((n = BN_new()) == NULL || (e = BN_new()) == NULL || -+ (d = BN_new()) == NULL || (iqmp = BN_new()) == NULL || -+ (q = BN_new()) == NULL || (p = BN_new()) == NULL || -+ (r = sshbuf_get_u32(m, NULL)) != 0 || /* ignored */ -+ (r = sshbuf_get_bignum1(m, n)) != 0 || -+ (r = sshbuf_get_bignum1(m, e)) != 0 || -+ (r = sshbuf_get_bignum1(m, d)) != 0 || -+ (r = sshbuf_get_bignum1(m, iqmp)) != 0 || - /* SSH1 and SSL have p and q swapped */ -- (r = sshbuf_get_bignum1(m, k->rsa->q)) != 0 || /* p */ -- (r = sshbuf_get_bignum1(m, k->rsa->p)) != 0) /* q */ -+ (r = sshbuf_get_bignum1(m, q)) != 0 || /* p */ -+ (r = sshbuf_get_bignum1(m, p)) != 0 || /* q */ -+ RSA_set0_key(k->rsa, n, e, d) == 0) { -+ BN_free(n); -+ BN_free(e); -+ BN_free(d); -+ BN_free(p); -+ BN_free(q); -+ BN_free(iqmp); -+ goto out; -+ } -+ if (RSA_set0_factors(k->rsa, p, q) == 0) { -+ BN_free(p); -+ BN_free(q); -+ BN_free(iqmp); - goto out; -+ } -+ if (RSA_set0_crt_params(k->rsa, NULL, NULL, iqmp) == 0) { -+ BN_free(iqmp); -+ goto out; -+ } - - /* Generate additional parameters */ -- if ((r = rsa_generate_additional_parameters(k->rsa)) != 0) -+ if ((r = rsa_generate_additional_parameters(k->rsa, NULL)) != 0) - goto out; - /* enable blinding */ - if (RSA_blinding_on(k->rsa, NULL) != 1) { -diff --git a/ssh-dss.c b/ssh-dss.c -index 7af59fa6..e36751ec 100644 ---- a/ssh-dss.c -+++ b/ssh-dss.c -@@ -55,6 +55,7 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, - size_t rlen, slen, len, dlen = ssh_digest_bytes(SSH_DIGEST_SHA1); - struct sshbuf *b = NULL; - int ret = SSH_ERR_INVALID_ARGUMENT; -+ const BIGNUM *r, *s; - - if (lenp != NULL) - *lenp = 0; -@@ -76,15 +77,16 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, - goto out; - } - -- rlen = BN_num_bytes(sig->r); -- slen = BN_num_bytes(sig->s); -+ DSA_SIG_get0(sig, &r, &s); -+ rlen = BN_num_bytes(r); -+ slen = BN_num_bytes(s); - if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) { - ret = SSH_ERR_INTERNAL_ERROR; - goto out; - } - explicit_bzero(sigblob, SIGBLOB_LEN); -- BN_bn2bin(sig->r, sigblob + SIGBLOB_LEN - INTBLOB_LEN - rlen); -- BN_bn2bin(sig->s, sigblob + SIGBLOB_LEN - slen); -+ BN_bn2bin(r, sigblob + SIGBLOB_LEN - INTBLOB_LEN - rlen); -+ BN_bn2bin(s, sigblob + SIGBLOB_LEN - slen); - - if (compat & SSH_BUG_SIGBLOB) { - if (sigp != NULL) { -@@ -137,6 +139,7 @@ ssh_dss_verify(const struct sshkey *key, - int ret = SSH_ERR_INTERNAL_ERROR; - struct sshbuf *b = NULL; - char *ktype = NULL; -+ BIGNUM *r = NULL, *s = NULL; - - if (key == NULL || key->dsa == NULL || - sshkey_type_plain(key->type) != KEY_DSA || -@@ -177,16 +180,19 @@ ssh_dss_verify(const struct sshkey *key, - - /* parse signature */ - if ((sig = DSA_SIG_new()) == NULL || -- (sig->r = BN_new()) == NULL || -- (sig->s = BN_new()) == NULL) { -+ (r = BN_new()) == NULL || -+ (s = BN_new()) == NULL) { - ret = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) || -- (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL)) { -+ if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) || -+ (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL) || -+ (DSA_SIG_set0(sig, r, s) == 0)) { - ret = SSH_ERR_LIBCRYPTO_ERROR; - goto out; - } -+ r = NULL; -+ s = NULL; - - /* sha1 the data */ - if ((ret = ssh_digest_memory(SSH_DIGEST_SHA1, data, datalen, -@@ -207,8 +213,9 @@ ssh_dss_verify(const struct sshkey *key, - - out: - explicit_bzero(digest, sizeof(digest)); -- if (sig != NULL) -- DSA_SIG_free(sig); -+ BN_free(r); -+ BN_free(s); -+ DSA_SIG_free(sig); - sshbuf_free(b); - free(ktype); - if (sigblob != NULL) { -diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c -index d7bf3c69..985b7e55 100644 ---- a/ssh-ecdsa.c -+++ b/ssh-ecdsa.c -@@ -54,6 +54,7 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, - size_t len, dlen; - struct sshbuf *b = NULL, *bb = NULL; - int ret = SSH_ERR_INTERNAL_ERROR; -+ const BIGNUM *r, *s; - - if (lenp != NULL) - *lenp = 0; -@@ -80,8 +81,9 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, - ret = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if ((ret = sshbuf_put_bignum2(bb, sig->r)) != 0 || -- (ret = sshbuf_put_bignum2(bb, sig->s)) != 0) -+ ECDSA_SIG_get0(sig, &r, &s); -+ if ((ret = sshbuf_put_bignum2(bb, r)) != 0 || -+ (ret = sshbuf_put_bignum2(bb, s)) != 0) - goto out; - if ((ret = sshbuf_put_cstring(b, sshkey_ssh_name_plain(key))) != 0 || - (ret = sshbuf_put_stringb(b, bb)) != 0) -@@ -119,6 +121,7 @@ ssh_ecdsa_verify(const struct sshkey *key, - int ret = SSH_ERR_INTERNAL_ERROR; - struct sshbuf *b = NULL, *sigbuf = NULL; - char *ktype = NULL; -+ BIGNUM *r = NULL, *s = NULL; - - if (key == NULL || key->ecdsa == NULL || - sshkey_type_plain(key->type) != KEY_ECDSA || -@@ -147,15 +150,23 @@ ssh_ecdsa_verify(const struct sshkey *key, - } - - /* parse signature */ -- if ((sig = ECDSA_SIG_new()) == NULL) { -+ if ((sig = ECDSA_SIG_new()) == NULL || -+ (r = BN_new()) == NULL || -+ (s = BN_new()) == NULL) { - ret = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if (sshbuf_get_bignum2(sigbuf, sig->r) != 0 || -- sshbuf_get_bignum2(sigbuf, sig->s) != 0) { -+ if (sshbuf_get_bignum2(sigbuf, r) != 0 || -+ sshbuf_get_bignum2(sigbuf, s) != 0) { - ret = SSH_ERR_INVALID_FORMAT; - goto out; - } -+ if (ECDSA_SIG_set0(sig, r, s) == 0) { -+ ret = SSH_ERR_LIBCRYPTO_ERROR; -+ goto out; -+ } -+ r = NULL; -+ s = NULL; - if (sshbuf_len(sigbuf) != 0) { - ret = SSH_ERR_UNEXPECTED_TRAILING_DATA; - goto out; -@@ -180,8 +191,9 @@ ssh_ecdsa_verify(const struct sshkey *key, - explicit_bzero(digest, sizeof(digest)); - sshbuf_free(sigbuf); - sshbuf_free(b); -- if (sig != NULL) -- ECDSA_SIG_free(sig); -+ BN_free(r); -+ BN_free(s); -+ ECDSA_SIG_free(sig); - free(ktype); - return ret; - } -diff --git a/ssh-keygen.c b/ssh-keygen.c -index f17af036..3d7eff99 100644 ---- a/ssh-keygen.c -+++ b/ssh-keygen.c -@@ -482,40 +482,67 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) - free(type); - - switch (key->type) { -- case KEY_DSA: -- buffer_get_bignum_bits(b, key->dsa->p); -- buffer_get_bignum_bits(b, key->dsa->g); -- buffer_get_bignum_bits(b, key->dsa->q); -- buffer_get_bignum_bits(b, key->dsa->pub_key); -- buffer_get_bignum_bits(b, key->dsa->priv_key); -+ case KEY_DSA: { -+ BIGNUM *p = NULL, *g = NULL, *q = NULL, *pub_key = NULL, *priv_key = NULL; -+ -+ if ((p = BN_new()) == NULL || -+ (g = BN_new()) == NULL || -+ (q = BN_new()) == NULL || -+ (pub_key = BN_new()) == NULL || -+ (priv_key = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ buffer_get_bignum_bits(b, p); -+ buffer_get_bignum_bits(b, g); -+ buffer_get_bignum_bits(b, q); -+ buffer_get_bignum_bits(b, pub_key); -+ buffer_get_bignum_bits(b, priv_key); -+ if (DSA_set0_pqg(key->dsa, p, q, g) == 0 || -+ DSA_set0_key(key->dsa, pub_key, priv_key) == 0) { -+ fatal("failed to set DSA key"); -+ } -+ } - break; -- case KEY_RSA: -- if ((r = sshbuf_get_u8(b, &e1)) != 0 || -- (e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) || -- (e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0)) -- fatal("%s: buffer error: %s", __func__, ssh_err(r)); -- e = e1; -- debug("e %lx", e); -- if (e < 30) { -- e <<= 8; -- e += e2; -+ case KEY_RSA: { -+ BIGNUM *bn_e = NULL, *bn_d = NULL, *bn_n = NULL, *bn_iqmp = NULL, *bn_p = NULL, *bn_q = NULL; -+ -+ if ((bn_e = BN_new()) == NULL || -+ (bn_d = BN_new()) == NULL || -+ (bn_n = BN_new()) == NULL || -+ (bn_iqmp = BN_new()) == NULL || -+ (bn_p = BN_new()) == NULL || -+ (bn_q = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ -+ if ((r = sshbuf_get_u8(b, &e1)) != 0 || -+ (e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) || -+ (e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0)) -+ fatal("%s: buffer error: %s", __func__, ssh_err(r)); -+ e = e1; - debug("e %lx", e); -- e <<= 8; -- e += e3; -- debug("e %lx", e); -- } -- if (!BN_set_word(key->rsa->e, e)) { -- sshbuf_free(b); -- sshkey_free(key); -- return NULL; -+ if (e < 30) { -+ e <<= 8; -+ e += e2; -+ debug("e %lx", e); -+ e <<= 8; -+ e += e3; -+ debug("e %lx", e); -+ } -+ if (!BN_set_word(bn_e, e)) { -+ sshbuf_free(b); -+ sshkey_free(key); -+ return NULL; -+ } -+ buffer_get_bignum_bits(b, bn_d); -+ buffer_get_bignum_bits(b, bn_n); -+ buffer_get_bignum_bits(b, bn_iqmp); -+ buffer_get_bignum_bits(b, bn_q); -+ buffer_get_bignum_bits(b, bn_p); -+ if (RSA_set0_key(key->rsa, bn_n, bn_e, bn_d) == 0 || -+ RSA_set0_factors(key->rsa, bn_p, bn_q) == 0) -+ fatal("Failed to set RSA parameters"); -+ if ((r = rsa_generate_additional_parameters(key->rsa, bn_iqmp)) != 0) -+ fatal("generate RSA parameters failed: %s", ssh_err(r)); - } -- buffer_get_bignum_bits(b, key->rsa->d); -- buffer_get_bignum_bits(b, key->rsa->n); -- buffer_get_bignum_bits(b, key->rsa->iqmp); -- buffer_get_bignum_bits(b, key->rsa->q); -- buffer_get_bignum_bits(b, key->rsa->p); -- if ((r = rsa_generate_additional_parameters(key->rsa)) != 0) -- fatal("generate RSA parameters failed: %s", ssh_err(r)); - break; - } - rlen = sshbuf_len(b); -@@ -623,7 +650,7 @@ do_convert_from_pkcs8(struct sshkey **k, int *private) - identity_file); - } - fclose(fp); -- switch (EVP_PKEY_type(pubkey->type)) { -+ switch (EVP_PKEY_base_id(pubkey)) { - case EVP_PKEY_RSA: - if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) - fatal("sshkey_new failed"); -@@ -647,7 +674,7 @@ do_convert_from_pkcs8(struct sshkey **k, int *private) - #endif - default: - fatal("%s: unsupported pubkey type %d", __func__, -- EVP_PKEY_type(pubkey->type)); -+ EVP_PKEY_base_id(pubkey)); - } - EVP_PKEY_free(pubkey); - return; -@@ -1689,6 +1716,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv) - #ifdef ENABLE_PKCS11 - pkcs11_terminate(); - #endif -+ free(ca); - exit(0); - } - -diff --git a/ssh-keyscan.c b/ssh-keyscan.c -index 1f95239a..efeb191a 100644 ---- a/ssh-keyscan.c -+++ b/ssh-keyscan.c -@@ -195,6 +195,7 @@ keygrab_ssh1(con *c) - static struct sshbuf *msg; - int r; - u_char type; -+ BIGNUM *n = NULL, *e = NULL; - - if (rsa == NULL) { - if ((rsa = sshkey_new(KEY_RSA1)) == NULL) { -@@ -213,16 +214,20 @@ keygrab_ssh1(con *c) - sshbuf_reset(msg); - return NULL; - } -- if ((r = sshbuf_consume(msg, 8)) != 0 || /* cookie */ -+ if ((n = BN_new()) == NULL || (e = BN_new()) == NULL || -+ (r = sshbuf_consume(msg, 8)) != 0 || /* cookie */ - /* server key */ - (r = sshbuf_get_u32(msg, NULL)) != 0 || - (r = sshbuf_get_bignum1(msg, NULL)) != 0 || - (r = sshbuf_get_bignum1(msg, NULL)) != 0 || - /* host key */ - (r = sshbuf_get_u32(msg, NULL)) != 0 || -- (r = sshbuf_get_bignum1(msg, rsa->rsa->e)) != 0 || -- (r = sshbuf_get_bignum1(msg, rsa->rsa->n)) != 0) { -+ (r = sshbuf_get_bignum1(msg, e)) != 0 || -+ (r = sshbuf_get_bignum1(msg, n)) != 0 || -+ RSA_set0_key(rsa->rsa, n, e, NULL) == 0) { - buf_err: -+ BN_free(n); -+ BN_free(e); - error("%s: buffer error: %s", __func__, ssh_err(r)); - sshbuf_reset(msg); - return NULL; -diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c -index fac0167e..b82deecd 100644 ---- a/ssh-pkcs11-client.c -+++ b/ssh-pkcs11-client.c -@@ -143,12 +143,14 @@ pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa, - static int - wrap_key(RSA *rsa) - { -- static RSA_METHOD helper_rsa; -+ static RSA_METHOD *helper_rsa; - -- memcpy(&helper_rsa, RSA_get_default_method(), sizeof(helper_rsa)); -- helper_rsa.name = "ssh-pkcs11-helper"; -- helper_rsa.rsa_priv_enc = pkcs11_rsa_private_encrypt; -- RSA_set_method(rsa, &helper_rsa); -+ if (helper_rsa == NULL) { -+ helper_rsa = RSA_meth_dup(RSA_get_default_method()); -+ RSA_meth_set1_name(helper_rsa, "ssh-pkcs11-helper"); -+ RSA_meth_set_priv_enc(helper_rsa, pkcs11_rsa_private_encrypt); -+ } -+ RSA_set_method(rsa, helper_rsa); - return (0); - } - -diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c -index aaf712d9..6cbd22e2 100644 ---- a/ssh-pkcs11.c -+++ b/ssh-pkcs11.c -@@ -67,7 +67,7 @@ struct pkcs11_key { - struct pkcs11_provider *provider; - CK_ULONG slotidx; - int (*orig_finish)(RSA *rsa); -- RSA_METHOD rsa_method; -+ RSA_METHOD *rsa_method; - char *keyid; - int keyid_len; - }; -@@ -326,13 +326,21 @@ pkcs11_rsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx, - k11->keyid = xmalloc(k11->keyid_len); - memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len); - } -- k11->orig_finish = def->finish; -- memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method)); -- k11->rsa_method.name = "pkcs11"; -- k11->rsa_method.rsa_priv_enc = pkcs11_rsa_private_encrypt; -- k11->rsa_method.rsa_priv_dec = pkcs11_rsa_private_decrypt; -- k11->rsa_method.finish = pkcs11_rsa_finish; -- RSA_set_method(rsa, &k11->rsa_method); -+ k11->orig_finish = RSA_meth_get_finish(def); -+ if ((k11->rsa_method = RSA_meth_dup(def)) == NULL || -+ RSA_meth_set1_name(k11->rsa_method, "pkcs11") == 0 || -+ RSA_meth_set_priv_enc(k11->rsa_method, pkcs11_rsa_private_encrypt) == 0 || -+ RSA_meth_set_priv_dec(k11->rsa_method, pkcs11_rsa_private_decrypt) == 0 || -+ RSA_meth_set_finish(k11->rsa_method, pkcs11_rsa_finish) == 0) { -+ RSA_meth_free(k11->rsa_method); -+ k11->rsa_method = NULL; -+ pkcs11_provider_unref(k11->provider); -+ free(k11->keyid); -+ free(k11); -+ return (-1); -+ } -+ -+ RSA_set_method(rsa, k11->rsa_method); - RSA_set_app_data(rsa, k11); - return (0); - } -@@ -460,6 +468,7 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx, - CK_ULONG nfound; - CK_SESSION_HANDLE session; - CK_FUNCTION_LIST *f; -+ const BIGNUM *n, *e; - - f = p->function_list; - session = p->slotinfo[slotidx].session; -@@ -512,10 +521,14 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx, - if ((rsa = RSA_new()) == NULL) { - error("RSA_new failed"); - } else { -- rsa->n = BN_bin2bn(attribs[1].pValue, -+ BIGNUM *rsa_n, *rsa_e; -+ -+ rsa_n = BN_bin2bn(attribs[1].pValue, - attribs[1].ulValueLen, NULL); -- rsa->e = BN_bin2bn(attribs[2].pValue, -+ rsa_e = BN_bin2bn(attribs[2].pValue, - attribs[2].ulValueLen, NULL); -+ if (RSA_set0_key(rsa, rsa_n, rsa_e, NULL) == 0) -+ error("RSA_set0_key failed"); - } - } else { - cp = attribs[2].pValue; -@@ -525,17 +538,18 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx, - == NULL) { - error("d2i_X509 failed"); - } else if ((evp = X509_get_pubkey(x509)) == NULL || -- evp->type != EVP_PKEY_RSA || -- evp->pkey.rsa == NULL) { -+ EVP_PKEY_id(evp) != EVP_PKEY_RSA || -+ EVP_PKEY_get0_RSA(evp) == NULL) { - debug("X509_get_pubkey failed or no rsa"); -- } else if ((rsa = RSAPublicKey_dup(evp->pkey.rsa)) -+ } else if ((rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(evp))) - == NULL) { - error("RSAPublicKey_dup"); - } - if (x509) - X509_free(x509); - } -- if (rsa && rsa->n && rsa->e && -+ RSA_get0_key(rsa, &n, &e, NULL); -+ if (rsa && n && e && - pkcs11_rsa_wrap(p, slotidx, &attribs[0], rsa) == 0) { - key = sshkey_new(KEY_UNSPEC); - key->rsa = rsa; -diff --git a/ssh-rsa.c b/ssh-rsa.c -index cde05df1..efcda37c 100644 ---- a/ssh-rsa.c -+++ b/ssh-rsa.c -@@ -100,7 +100,7 @@ ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, - hash_alg = rsa_hash_alg_from_ident(alg_ident); - if (key == NULL || key->rsa == NULL || hash_alg == -1 || - sshkey_type_plain(key->type) != KEY_RSA || -- BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) -+ RSA_bits(key->rsa) < SSH_RSA_MINIMUM_MODULUS_SIZE) - return SSH_ERR_INVALID_ARGUMENT; - slen = RSA_size(key->rsa); - if (slen <= 0 || slen > SSHBUF_MAX_BIGNUM) -@@ -172,7 +172,7 @@ ssh_rsa_verify(const struct sshkey *key, - - if (key == NULL || key->rsa == NULL || - sshkey_type_plain(key->type) != KEY_RSA || -- BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE || -+ RSA_bits(key->rsa) < SSH_RSA_MINIMUM_MODULUS_SIZE || - sig == NULL || siglen == 0) - return SSH_ERR_INVALID_ARGUMENT; - -diff --git a/ssh.c b/ssh.c -index b65f35ac..14e2cdb9 100644 ---- a/ssh.c -+++ b/ssh.c -@@ -1231,6 +1231,7 @@ main(int ac, char **av) - free(cp); - } - free(conn_hash_hex); -+ free(host_arg); - - if (config_test) { - dump_client_config(&options, host); -diff --git a/sshconnect.c b/sshconnect.c -index d9ed5910..40a41158 100644 ---- a/sshconnect.c -+++ b/sshconnect.c -@@ -1370,6 +1370,7 @@ ssh_login(Sensitive *sensitive, const char *orighost, - char *server_user, *local_user; - - local_user = xstrdup(pw->pw_name); -+ free(pw); - server_user = options.user ? options.user : local_user; - - /* Convert the user-supplied hostname into all lowercase. */ -diff --git a/sshconnect1.c b/sshconnect1.c -index dc00b4cd..cf0b4ec9 100644 ---- a/sshconnect1.c -+++ b/sshconnect1.c -@@ -70,6 +70,7 @@ try_agent_authentication(void) - u_char response[16]; - size_t i; - BIGNUM *challenge; -+ const BIGNUM *n; - struct ssh_identitylist *idlist = NULL; - - /* Get connection to the agent. */ -@@ -96,8 +97,9 @@ try_agent_authentication(void) - idlist->comments[i]); - - /* Tell the server that we are willing to authenticate using this key. */ -+ RSA_get0_key(idlist->keys[i]->rsa, &n, NULL, NULL); - packet_start(SSH_CMSG_AUTH_RSA); -- packet_put_bignum(idlist->keys[i]->rsa->n); -+ packet_put_bignum((BIGNUM *)n); - packet_send(); - packet_write_wait(); - -@@ -220,6 +222,7 @@ static int - try_rsa_authentication(int idx) - { - BIGNUM *challenge; -+ const BIGNUM *n; - Key *public, *private; - char buf[300], *passphrase = NULL, *comment, *authfile; - int i, perm_ok = 1, type, quit; -@@ -231,8 +234,9 @@ try_rsa_authentication(int idx) - debug("Trying RSA authentication with key '%.100s'", comment); - - /* Tell the server that we are willing to authenticate using this key. */ -+ RSA_get0_key(public->rsa, &n, NULL, NULL); - packet_start(SSH_CMSG_AUTH_RSA); -- packet_put_bignum(public->rsa->n); -+ packet_put_bignum((BIGNUM *)n); - packet_send(); - packet_write_wait(); - -@@ -348,15 +352,17 @@ try_rhosts_rsa_authentication(const char *local_user, Key * host_key) - { - int type; - BIGNUM *challenge; -+ const BIGNUM *n, *e; - - debug("Trying rhosts or /etc/hosts.equiv with RSA host authentication."); - - /* Tell the server that we are willing to authenticate using this key. */ -+ RSA_get0_key(host_key->rsa, &n, &e, NULL); - packet_start(SSH_CMSG_AUTH_RHOSTS_RSA); - packet_put_cstring(local_user); -- packet_put_int(BN_num_bits(host_key->rsa->n)); -- packet_put_bignum(host_key->rsa->e); -- packet_put_bignum(host_key->rsa->n); -+ packet_put_int(BN_num_bits(n)); -+ packet_put_bignum((BIGNUM *)e); -+ packet_put_bignum((BIGNUM *)n); - packet_send(); - packet_write_wait(); - -@@ -502,6 +508,8 @@ ssh_kex(char *host, struct sockaddr *hostaddr) - { - int i; - BIGNUM *key; -+ BIGNUM *server_n = NULL, *server_e = NULL, -+ *host_n = NULL, *host_e = NULL; - Key *host_key, *server_key; - int bits, rbits; - int ssh_cipher_default = SSH_CIPHER_3DES; -@@ -523,10 +531,14 @@ ssh_kex(char *host, struct sockaddr *hostaddr) - if ((server_key = key_new(KEY_RSA1)) == NULL) - fatal("%s: key_new(KEY_RSA1) failed", __func__); - bits = packet_get_int(); -- packet_get_bignum(server_key->rsa->e); -- packet_get_bignum(server_key->rsa->n); -- -- rbits = BN_num_bits(server_key->rsa->n); -+ if ((server_e = BN_new()) == NULL || -+ (server_n = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum(server_e); -+ packet_get_bignum(server_n); -+ RSA_set0_key(server_key->rsa, server_n, server_e, NULL); -+ -+ rbits = BN_num_bits(server_n); - if (bits != rbits) { - logit("Warning: Server lies about size of server public key: " - "actual size is %d bits vs. announced %d.", rbits, bits); -@@ -536,10 +548,14 @@ ssh_kex(char *host, struct sockaddr *hostaddr) - if ((host_key = key_new(KEY_RSA1)) == NULL) - fatal("%s: key_new(KEY_RSA1) failed", __func__); - bits = packet_get_int(); -- packet_get_bignum(host_key->rsa->e); -- packet_get_bignum(host_key->rsa->n); -- -- rbits = BN_num_bits(host_key->rsa->n); -+ if ((host_e = BN_new()) == NULL || -+ (host_n = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum(host_e); -+ packet_get_bignum(host_n); -+ RSA_set0_key(host_key->rsa, host_n, host_e, NULL); -+ -+ rbits = BN_num_bits(host_n); - if (bits != rbits) { - logit("Warning: Server lies about size of server host key: " - "actual size is %d bits vs. announced %d.", rbits, bits); -@@ -555,14 +571,14 @@ ssh_kex(char *host, struct sockaddr *hostaddr) - packet_check_eom(); - - debug("Received server public key (%d bits) and host key (%d bits).", -- BN_num_bits(server_key->rsa->n), BN_num_bits(host_key->rsa->n)); -+ BN_num_bits(server_n), BN_num_bits(host_n)); - - if (verify_host_key(host, hostaddr, host_key) == -1) - fatal("Host key verification failed."); - - client_flags = SSH_PROTOFLAG_SCREEN_NUMBER | SSH_PROTOFLAG_HOST_IN_FWD_OPEN; - -- derive_ssh1_session_id(host_key->rsa->n, server_key->rsa->n, cookie, session_id); -+ derive_ssh1_session_id(host_n, server_n, cookie, session_id); - - /* - * Generate an encryption key for the session. The key is a 256 bit -@@ -597,14 +613,14 @@ ssh_kex(char *host, struct sockaddr *hostaddr) - * Encrypt the integer using the public key and host key of the - * server (key with smaller modulus first). - */ -- if (BN_cmp(server_key->rsa->n, host_key->rsa->n) < 0) { -+ if (BN_cmp(server_n, host_n) < 0) { - /* Public key has smaller modulus. */ -- if (BN_num_bits(host_key->rsa->n) < -- BN_num_bits(server_key->rsa->n) + SSH_KEY_BITS_RESERVED) { -+ if (BN_num_bits(host_n) < -+ BN_num_bits(server_n) + SSH_KEY_BITS_RESERVED) { - fatal("respond_to_rsa_challenge: host_key %d < server_key %d + " - "SSH_KEY_BITS_RESERVED %d", -- BN_num_bits(host_key->rsa->n), -- BN_num_bits(server_key->rsa->n), -+ BN_num_bits(host_n), -+ BN_num_bits(server_n), - SSH_KEY_BITS_RESERVED); - } - if (rsa_public_encrypt(key, key, server_key->rsa) != 0 || -@@ -612,12 +628,12 @@ ssh_kex(char *host, struct sockaddr *hostaddr) - fatal("%s: rsa_public_encrypt failed", __func__); - } else { - /* Host key has smaller modulus (or they are equal). */ -- if (BN_num_bits(server_key->rsa->n) < -- BN_num_bits(host_key->rsa->n) + SSH_KEY_BITS_RESERVED) { -+ if (BN_num_bits(server_n) < -+ BN_num_bits(host_n) + SSH_KEY_BITS_RESERVED) { - fatal("respond_to_rsa_challenge: server_key %d < host_key %d + " - "SSH_KEY_BITS_RESERVED %d", -- BN_num_bits(server_key->rsa->n), -- BN_num_bits(host_key->rsa->n), -+ BN_num_bits(server_n), -+ BN_num_bits(host_n), - SSH_KEY_BITS_RESERVED); - } - if (rsa_public_encrypt(key, key, host_key->rsa) != 0 || -diff --git a/sshconnect2.c b/sshconnect2.c -index f8a54bee..b96ff057 100644 ---- a/sshconnect2.c -+++ b/sshconnect2.c -@@ -235,6 +235,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) - packet_send(); - packet_write_wait(); - #endif -+ /* XXX free myproposal ?? */ - } - - /* -diff --git a/sshkey.c b/sshkey.c -index 53a7674b..b434daa0 100644 ---- a/sshkey.c -+++ b/sshkey.c -@@ -275,10 +275,10 @@ sshkey_size(const struct sshkey *k) - case KEY_RSA1: - case KEY_RSA: - case KEY_RSA_CERT: -- return BN_num_bits(k->rsa->n); -+ return RSA_bits(k->rsa); - case KEY_DSA: - case KEY_DSA_CERT: -- return BN_num_bits(k->dsa->p); -+ return DSA_bits(k->dsa); - case KEY_ECDSA: - case KEY_ECDSA_CERT: - return sshkey_curve_nid_to_bits(k->ecdsa_nid); -@@ -478,11 +478,7 @@ sshkey_new(int type) - case KEY_RSA1: - case KEY_RSA: - case KEY_RSA_CERT: -- if ((rsa = RSA_new()) == NULL || -- (rsa->n = BN_new()) == NULL || -- (rsa->e = BN_new()) == NULL) { -- if (rsa != NULL) -- RSA_free(rsa); -+ if ((rsa = RSA_new()) == NULL) { - free(k); - return NULL; - } -@@ -490,13 +486,7 @@ sshkey_new(int type) - break; - case KEY_DSA: - case KEY_DSA_CERT: -- if ((dsa = DSA_new()) == NULL || -- (dsa->p = BN_new()) == NULL || -- (dsa->q = BN_new()) == NULL || -- (dsa->g = BN_new()) == NULL || -- (dsa->pub_key = BN_new()) == NULL) { -- if (dsa != NULL) -- DSA_free(dsa); -+ if ((dsa = DSA_new()) == NULL) { - free(k); - return NULL; - } -@@ -536,21 +526,10 @@ sshkey_add_private(struct sshkey *k) - case KEY_RSA1: - case KEY_RSA: - case KEY_RSA_CERT: --#define bn_maybe_alloc_failed(p) (p == NULL && (p = BN_new()) == NULL) -- if (bn_maybe_alloc_failed(k->rsa->d) || -- bn_maybe_alloc_failed(k->rsa->iqmp) || -- bn_maybe_alloc_failed(k->rsa->q) || -- bn_maybe_alloc_failed(k->rsa->p) || -- bn_maybe_alloc_failed(k->rsa->dmq1) || -- bn_maybe_alloc_failed(k->rsa->dmp1)) -- return SSH_ERR_ALLOC_FAIL; - break; - case KEY_DSA: - case KEY_DSA_CERT: -- if (bn_maybe_alloc_failed(k->dsa->priv_key)) -- return SSH_ERR_ALLOC_FAIL; - break; --#undef bn_maybe_alloc_failed - case KEY_ECDSA: - case KEY_ECDSA_CERT: - /* Cannot do anything until we know the group */ -@@ -669,17 +648,31 @@ sshkey_equal_public(const struct sshkey *a, const struct sshkey *b) - #ifdef WITH_OPENSSL - case KEY_RSA1: - case KEY_RSA_CERT: -- case KEY_RSA: -- return a->rsa != NULL && b->rsa != NULL && -- BN_cmp(a->rsa->e, b->rsa->e) == 0 && -- BN_cmp(a->rsa->n, b->rsa->n) == 0; -+ case KEY_RSA: { -+ const BIGNUM *a_e, *a_n, *b_e, *b_n; -+ -+ if (a->rsa == NULL || b->rsa == NULL) -+ return 0; -+ RSA_get0_key(a->rsa, &a_n, &a_e, NULL); -+ RSA_get0_key(b->rsa, &b_n, &b_e, NULL); -+ return BN_cmp(a_e, b_e) == 0 && BN_cmp(a_n, b_n) == 0; -+ } - case KEY_DSA_CERT: -- case KEY_DSA: -- return a->dsa != NULL && b->dsa != NULL && -- BN_cmp(a->dsa->p, b->dsa->p) == 0 && -- BN_cmp(a->dsa->q, b->dsa->q) == 0 && -- BN_cmp(a->dsa->g, b->dsa->g) == 0 && -- BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0; -+ case KEY_DSA: { -+ const BIGNUM *a_p, *a_q, *a_g, *a_pub_key; -+ const BIGNUM *b_p, *b_q, *b_g, *b_pub_key; -+ -+ if (a->dsa == NULL || b->dsa == NULL) -+ return 0; -+ DSA_get0_pqg(a->dsa, &a_p, &a_q, &a_g); -+ DSA_get0_key(a->dsa, &a_pub_key, NULL); -+ DSA_get0_pqg(b->dsa, &b_p, &b_q, &b_g); -+ DSA_get0_key(b->dsa, &b_pub_key, NULL); -+ return BN_cmp(a_p, b_p) == 0 && -+ BN_cmp(a_q, b_q) == 0 && -+ BN_cmp(a_g, b_g) == 0 && -+ BN_cmp(a_pub_key, b_pub_key) == 0; -+ } - # ifdef OPENSSL_HAS_ECC - case KEY_ECDSA_CERT: - case KEY_ECDSA: -@@ -754,15 +747,21 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain) - return ret; - break; - #ifdef WITH_OPENSSL -- case KEY_DSA: -- if (key->dsa == NULL) -- return SSH_ERR_INVALID_ARGUMENT; -- if ((ret = sshbuf_put_cstring(b, typename)) != 0 || -- (ret = sshbuf_put_bignum2(b, key->dsa->p)) != 0 || -- (ret = sshbuf_put_bignum2(b, key->dsa->q)) != 0 || -- (ret = sshbuf_put_bignum2(b, key->dsa->g)) != 0 || -- (ret = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0) -- return ret; -+ case KEY_DSA: { -+ const BIGNUM *p, *q, *g, *pub_key; -+ -+ if (key->dsa == NULL) -+ return SSH_ERR_INVALID_ARGUMENT; -+ -+ DSA_get0_pqg(key->dsa, &p, &q, &g); -+ DSA_get0_key(key->dsa, &pub_key, NULL); -+ if ((ret = sshbuf_put_cstring(b, typename)) != 0 || -+ (ret = sshbuf_put_bignum2(b, p)) != 0 || -+ (ret = sshbuf_put_bignum2(b, q)) != 0 || -+ (ret = sshbuf_put_bignum2(b, g)) != 0 || -+ (ret = sshbuf_put_bignum2(b, pub_key)) != 0) -+ return ret; -+ } - break; - # ifdef OPENSSL_HAS_ECC - case KEY_ECDSA: -@@ -775,13 +774,18 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain) - return ret; - break; - # endif -- case KEY_RSA: -- if (key->rsa == NULL) -- return SSH_ERR_INVALID_ARGUMENT; -- if ((ret = sshbuf_put_cstring(b, typename)) != 0 || -- (ret = sshbuf_put_bignum2(b, key->rsa->e)) != 0 || -- (ret = sshbuf_put_bignum2(b, key->rsa->n)) != 0) -- return ret; -+ case KEY_RSA: { -+ const BIGNUM *e, *n; -+ -+ if (key->rsa == NULL) -+ return SSH_ERR_INVALID_ARGUMENT; -+ -+ RSA_get0_key(key->rsa, &n, &e, NULL); -+ if ((ret = sshbuf_put_cstring(b, typename)) != 0 || -+ (ret = sshbuf_put_bignum2(b, e)) != 0 || -+ (ret = sshbuf_put_bignum2(b, n)) != 0) -+ return ret; -+ } - break; - #endif /* WITH_OPENSSL */ - case KEY_ED25519: -@@ -887,8 +891,13 @@ sshkey_fingerprint_raw(const struct sshkey *k, int dgst_alg, - - if (k->type == KEY_RSA1) { - #ifdef WITH_OPENSSL -- int nlen = BN_num_bytes(k->rsa->n); -- int elen = BN_num_bytes(k->rsa->e); -+ const BIGNUM *n, *e; -+ int nlen, elen; -+ -+ RSA_get0_key(k->rsa, &n, &e, NULL); -+ -+ nlen = BN_num_bytes(n); -+ elen = BN_num_bytes(e); - - if (nlen < 0 || elen < 0 || nlen >= INT_MAX - elen) { - r = SSH_ERR_INVALID_FORMAT; -@@ -899,8 +908,8 @@ sshkey_fingerprint_raw(const struct sshkey *k, int dgst_alg, - r = SSH_ERR_ALLOC_FAIL; - goto out; - } -- BN_bn2bin(k->rsa->n, blob); -- BN_bn2bin(k->rsa->e, blob + nlen); -+ BN_bn2bin(n, blob); -+ BN_bn2bin(e, blob + nlen); - #endif /* WITH_OPENSSL */ - } else if ((r = to_blob(k, &blob, &blob_len, 1)) != 0) - goto out; -@@ -1239,6 +1248,7 @@ sshkey_read(struct sshkey *ret, char **cpp) - struct sshbuf *blob; - #ifdef WITH_SSH1 - u_long bits; -+ BIGNUM *e = NULL, *n = NULL; - #endif /* WITH_SSH1 */ - - if (ret == NULL) -@@ -1255,12 +1265,21 @@ sshkey_read(struct sshkey *ret, char **cpp) - bits == 0 || bits > SSHBUF_MAX_BIGNUM * 8) - return SSH_ERR_INVALID_FORMAT; /* Bad bit count... */ - /* Get public exponent, public modulus. */ -- if ((r = read_decimal_bignum(&ep, ret->rsa->e)) < 0) -+ if ((e = BN_new()) == NULL || (n = BN_new()) == NULL) { -+ BN_free(e); -+ return SSH_ERR_ALLOC_FAIL; -+ } -+ if ((r = read_decimal_bignum(&ep, e)) < 0) - return r; -- if ((r = read_decimal_bignum(&ep, ret->rsa->n)) < 0) -+ if ((r = read_decimal_bignum(&ep, n)) < 0) - return r; -+ if (RSA_set0_key(ret->rsa, n, e, NULL) == 0) { -+ BN_free(e); -+ BN_free(n); -+ return -1; -+ } - /* validate the claimed number of bits */ -- if (BN_num_bits(ret->rsa->n) != (int)bits) -+ if (BN_num_bits(n) != (int)bits) - return SSH_ERR_KEY_BITS_MISMATCH; - *cpp = ep; - retval = 0; -@@ -1425,19 +1444,20 @@ sshkey_format_rsa1(const struct sshkey *key, struct sshbuf *b) - #ifdef WITH_SSH1 - u_int bits = 0; - char *dec_e = NULL, *dec_n = NULL; -+ const BIGNUM *e, *n; - -- if (key->rsa == NULL || key->rsa->e == NULL || -- key->rsa->n == NULL) { -+ RSA_get0_key(key->rsa, &n, &e, NULL); -+ if (key->rsa == NULL || e == NULL || n == NULL) { - r = SSH_ERR_INVALID_ARGUMENT; - goto out; - } -- if ((dec_e = BN_bn2dec(key->rsa->e)) == NULL || -- (dec_n = BN_bn2dec(key->rsa->n)) == NULL) { -+ if ((dec_e = BN_bn2dec(e)) == NULL || -+ (dec_n = BN_bn2dec(n)) == NULL) { - r = SSH_ERR_ALLOC_FAIL; - goto out; - } - /* size of modulus 'n' */ -- if ((bits = BN_num_bits(key->rsa->n)) <= 0) { -+ if ((bits = BN_num_bits(n)) <= 0) { - r = SSH_ERR_INVALID_ARGUMENT; - goto out; - } -@@ -1769,15 +1789,32 @@ sshkey_from_private(const struct sshkey *k, struct sshkey **pkp) - switch (k->type) { - #ifdef WITH_OPENSSL - case KEY_DSA: -- case KEY_DSA_CERT: -- if ((n = sshkey_new(k->type)) == NULL) -- return SSH_ERR_ALLOC_FAIL; -- if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) || -- (BN_copy(n->dsa->q, k->dsa->q) == NULL) || -- (BN_copy(n->dsa->g, k->dsa->g) == NULL) || -- (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL)) { -- sshkey_free(n); -- return SSH_ERR_ALLOC_FAIL; -+ case KEY_DSA_CERT: { -+ const BIGNUM *k_p, *k_q, *k_g, *k_pub_key; -+ BIGNUM *n_p = NULL, *n_q = NULL, *n_g = NULL, *n_pub_key = NULL; -+ -+ if ((n = sshkey_new(k->type)) == NULL) -+ return SSH_ERR_ALLOC_FAIL; -+ -+ DSA_get0_pqg(k->dsa, &k_p, &k_q, &k_g); -+ DSA_get0_key(k->dsa, &k_pub_key, NULL); -+ -+ if (((n_p = BN_dup(k_p)) == NULL) || -+ ((n_q = BN_dup(k_q)) == NULL) || -+ ((n_g = BN_dup(k_g)) == NULL) || -+ (DSA_set0_pqg(n->dsa, n_p, n_q, n_g) == 0)) { -+ sshkey_free(n); -+ BN_free(n_p); -+ BN_free(n_q); -+ BN_free(n_g); -+ return SSH_ERR_ALLOC_FAIL; -+ } -+ if (((n_pub_key = BN_dup(k_pub_key)) == NULL) || -+ (DSA_set0_key(n->dsa, n_pub_key, NULL) == 0)) { -+ sshkey_free(n); -+ BN_free(n_pub_key); -+ return SSH_ERR_ALLOC_FAIL; -+ } - } - break; - # ifdef OPENSSL_HAS_ECC -@@ -1800,13 +1837,22 @@ sshkey_from_private(const struct sshkey *k, struct sshkey **pkp) - # endif /* OPENSSL_HAS_ECC */ - case KEY_RSA: - case KEY_RSA1: -- case KEY_RSA_CERT: -- if ((n = sshkey_new(k->type)) == NULL) -- return SSH_ERR_ALLOC_FAIL; -- if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) || -- (BN_copy(n->rsa->e, k->rsa->e) == NULL)) { -- sshkey_free(n); -- return SSH_ERR_ALLOC_FAIL; -+ case KEY_RSA_CERT: { -+ const BIGNUM *k_n, *k_e; -+ BIGNUM *n_n = NULL, *n_e = NULL; -+ -+ if ((n = sshkey_new(k->type)) == NULL) -+ return SSH_ERR_ALLOC_FAIL; -+ -+ RSA_get0_key(k->rsa, &k_n, &k_e, NULL); -+ if (((n_n = BN_dup(k_n)) == NULL) || -+ ((n_e = BN_dup(k_e)) == NULL) || -+ RSA_set0_key(n->rsa, n_n, n_e, NULL) == 0) { -+ sshkey_free(n); -+ BN_free(n_n); -+ BN_free(n_e); -+ return SSH_ERR_ALLOC_FAIL; -+ } - } - break; - #endif /* WITH_OPENSSL */ -@@ -2004,10 +2050,20 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp, - ret = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if (sshbuf_get_bignum2(b, key->rsa->e) != 0 || -- sshbuf_get_bignum2(b, key->rsa->n) != 0) { -- ret = SSH_ERR_INVALID_FORMAT; -- goto out; -+ { -+ BIGNUM *e, *n; -+ -+ e = BN_new(); -+ n = BN_new(); -+ if (e == NULL || n == NULL || -+ sshbuf_get_bignum2(b, e) != 0 || -+ sshbuf_get_bignum2(b, n) != 0 || -+ RSA_set0_key(key->rsa, n, e, NULL) == 0) { -+ BN_free(e); -+ BN_free(n); -+ ret = SSH_ERR_ALLOC_FAIL; -+ goto out; -+ } - } - #ifdef DEBUG_PK - RSA_print_fp(stderr, key->rsa, 8); -@@ -2025,12 +2081,34 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp, - ret = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if (sshbuf_get_bignum2(b, key->dsa->p) != 0 || -- sshbuf_get_bignum2(b, key->dsa->q) != 0 || -- sshbuf_get_bignum2(b, key->dsa->g) != 0 || -- sshbuf_get_bignum2(b, key->dsa->pub_key) != 0) { -- ret = SSH_ERR_INVALID_FORMAT; -- goto out; -+ { -+ BIGNUM *p, *q, *g, *pub_key; -+ -+ p = BN_new(); -+ q = BN_new(); -+ g = BN_new(); -+ pub_key = BN_new(); -+ -+ if (p == NULL || q == NULL || g == NULL || -+ pub_key == NULL || -+ sshbuf_get_bignum2(b, p) != 0 || -+ sshbuf_get_bignum2(b, q) != 0 || -+ sshbuf_get_bignum2(b, g) != 0 || -+ sshbuf_get_bignum2(b, pub_key) != 0 || -+ DSA_set0_pqg(key->dsa, p, q, g) == 0) { -+ BN_free(p); -+ BN_free(q); -+ BN_free(g); -+ BN_free(pub_key); -+ ret = SSH_ERR_ALLOC_FAIL; -+ goto out; -+ } -+ -+ if (DSA_set0_key(key->dsa, pub_key, NULL) == 0) { -+ BN_free(pub_key); -+ ret = SSH_ERR_LIBCRYPTO_ERROR; -+ goto out; -+ } - } - #ifdef DEBUG_PK - DSA_print_fp(stderr, key->dsa, 8); -@@ -2270,26 +2348,53 @@ sshkey_demote(const struct sshkey *k, struct sshkey **dkp) - goto fail; - /* FALLTHROUGH */ - case KEY_RSA1: -- case KEY_RSA: -- if ((pk->rsa = RSA_new()) == NULL || -- (pk->rsa->e = BN_dup(k->rsa->e)) == NULL || -- (pk->rsa->n = BN_dup(k->rsa->n)) == NULL) { -- ret = SSH_ERR_ALLOC_FAIL; -- goto fail; -+ case KEY_RSA: { -+ const BIGNUM *k_e, *k_n; -+ BIGNUM *pk_e = NULL, *pk_n = NULL; -+ -+ RSA_get0_key(k->rsa, &k_n, &k_e, NULL); -+ if ((pk->rsa = RSA_new()) == NULL || -+ (pk_e = BN_dup(k_e)) == NULL || -+ (pk_n = BN_dup(k_n)) == NULL || -+ RSA_set0_key(pk->rsa, pk_n, pk_e, NULL) == 0) { -+ BN_free(pk_e); -+ BN_free(pk_n); -+ ret = SSH_ERR_ALLOC_FAIL; -+ goto fail; - } -+ } - break; - case KEY_DSA_CERT: - if ((ret = sshkey_cert_copy(k, pk)) != 0) - goto fail; - /* FALLTHROUGH */ -- case KEY_DSA: -- if ((pk->dsa = DSA_new()) == NULL || -- (pk->dsa->p = BN_dup(k->dsa->p)) == NULL || -- (pk->dsa->q = BN_dup(k->dsa->q)) == NULL || -- (pk->dsa->g = BN_dup(k->dsa->g)) == NULL || -- (pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL) { -- ret = SSH_ERR_ALLOC_FAIL; -- goto fail; -+ case KEY_DSA: { -+ const BIGNUM *k_p, *k_q, *k_g, *k_pub_key; -+ BIGNUM *pk_p = NULL, *pk_q = NULL, *pk_g = NULL; -+ BIGNUM *pk_pub_key = NULL; -+ -+ DSA_get0_pqg(k->dsa, &k_p, &k_q, &k_g); -+ DSA_get0_key(k->dsa, &k_pub_key, NULL); -+ -+ if ((pk->dsa = DSA_new()) == NULL || -+ (pk_p = BN_dup(k_p)) == NULL || -+ (pk_q = BN_dup(k_q)) == NULL || -+ (pk_g = BN_dup(k_g)) == NULL || -+ (pk_pub_key = BN_dup(k_pub_key)) == NULL || -+ DSA_set0_pqg(pk->dsa, pk_p, pk_q, pk_g) == 0) { -+ BN_free(pk_p); -+ BN_free(pk_q); -+ BN_free(pk_g); -+ BN_free(pk_pub_key); -+ ret = SSH_ERR_ALLOC_FAIL; -+ goto fail; -+ } -+ -+ if (DSA_set0_key(pk->dsa, pk_pub_key, NULL) == 0) { -+ BN_free(pk_pub_key); -+ ret = SSH_ERR_LIBCRYPTO_ERROR; -+ goto fail; -+ } - } - break; - case KEY_ECDSA_CERT: -@@ -2410,12 +2515,17 @@ sshkey_certify(struct sshkey *k, struct sshkey *ca, const char *alg) - /* XXX this substantially duplicates to_blob(); refactor */ - switch (k->type) { - #ifdef WITH_OPENSSL -- case KEY_DSA_CERT: -- if ((ret = sshbuf_put_bignum2(cert, k->dsa->p)) != 0 || -- (ret = sshbuf_put_bignum2(cert, k->dsa->q)) != 0 || -- (ret = sshbuf_put_bignum2(cert, k->dsa->g)) != 0 || -- (ret = sshbuf_put_bignum2(cert, k->dsa->pub_key)) != 0) -- goto out; -+ case KEY_DSA_CERT: { -+ const BIGNUM *p, *q, *g, *pub_key; -+ -+ DSA_get0_pqg(k->dsa, &p, &q, &g); -+ DSA_get0_key(k->dsa, &pub_key, NULL); -+ if ((ret = sshbuf_put_bignum2(cert, p)) != 0 || -+ (ret = sshbuf_put_bignum2(cert, q)) != 0 || -+ (ret = sshbuf_put_bignum2(cert, g)) != 0 || -+ (ret = sshbuf_put_bignum2(cert, pub_key)) != 0) -+ goto out; -+ } - break; - # ifdef OPENSSL_HAS_ECC - case KEY_ECDSA_CERT: -@@ -2427,10 +2537,15 @@ sshkey_certify(struct sshkey *k, struct sshkey *ca, const char *alg) - goto out; - break; - # endif /* OPENSSL_HAS_ECC */ -- case KEY_RSA_CERT: -- if ((ret = sshbuf_put_bignum2(cert, k->rsa->e)) != 0 || -- (ret = sshbuf_put_bignum2(cert, k->rsa->n)) != 0) -- goto out; -+ case KEY_RSA_CERT: { -+ const BIGNUM *e, *n; -+ -+ RSA_get0_key(k->rsa, &n, &e, NULL); -+ if (e == NULL || n == NULL || -+ (ret = sshbuf_put_bignum2(cert, e)) != 0 || -+ (ret = sshbuf_put_bignum2(cert, n)) != 0) -+ goto out; -+ } - break; - #endif /* WITH_OPENSSL */ - case KEY_ED25519_CERT: -@@ -2587,43 +2702,65 @@ sshkey_private_serialize(const struct sshkey *key, struct sshbuf *b) - goto out; - switch (key->type) { - #ifdef WITH_OPENSSL -- case KEY_RSA: -- if ((r = sshbuf_put_bignum2(b, key->rsa->n)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->e)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->d)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->iqmp)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->p)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->q)) != 0) -- goto out; -+ case KEY_RSA: { -+ const BIGNUM *n, *e, *d, *iqmp, *p, *q; -+ RSA_get0_key(key->rsa, &n, &e, &d); -+ RSA_get0_crt_params(key->rsa, NULL, NULL, &iqmp); -+ RSA_get0_factors(key->rsa, &p, &q); -+ if ((r = sshbuf_put_bignum2(b, n)) != 0 || -+ (r = sshbuf_put_bignum2(b, e)) != 0 || -+ (r = sshbuf_put_bignum2(b, d)) != 0 || -+ (r = sshbuf_put_bignum2(b, iqmp)) != 0 || -+ (r = sshbuf_put_bignum2(b, p)) != 0 || -+ (r = sshbuf_put_bignum2(b, q)) != 0) -+ goto out; -+ } - break; - case KEY_RSA_CERT: - if (key->cert == NULL || sshbuf_len(key->cert->certblob) == 0) { - r = SSH_ERR_INVALID_ARGUMENT; - goto out; - } -- if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->d)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->iqmp)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->p)) != 0 || -- (r = sshbuf_put_bignum2(b, key->rsa->q)) != 0) -- goto out; -+ { -+ const BIGNUM *d, *iqmp, *p, *q; -+ -+ RSA_get0_key(key->rsa, NULL, NULL, &d); -+ RSA_get0_factors(key->rsa, &p, &q); -+ RSA_get0_crt_params(key->rsa, NULL, NULL, &iqmp); -+ if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 || -+ (r = sshbuf_put_bignum2(b, d)) != 0 || -+ (r = sshbuf_put_bignum2(b, iqmp)) != 0 || -+ (r = sshbuf_put_bignum2(b, p)) != 0 || -+ (r = sshbuf_put_bignum2(b, q)) != 0) -+ goto out; -+ } - break; -- case KEY_DSA: -- if ((r = sshbuf_put_bignum2(b, key->dsa->p)) != 0 || -- (r = sshbuf_put_bignum2(b, key->dsa->q)) != 0 || -- (r = sshbuf_put_bignum2(b, key->dsa->g)) != 0 || -- (r = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0 || -- (r = sshbuf_put_bignum2(b, key->dsa->priv_key)) != 0) -- goto out; -+ case KEY_DSA: { -+ const BIGNUM *p, *q, *g, *pub_key, *priv_key; -+ -+ DSA_get0_pqg(key->dsa, &p, &q, &g); -+ DSA_get0_key(key->dsa, &pub_key, &priv_key); -+ if ((r = sshbuf_put_bignum2(b, p)) != 0 || -+ (r = sshbuf_put_bignum2(b, q)) != 0 || -+ (r = sshbuf_put_bignum2(b, g)) != 0 || -+ (r = sshbuf_put_bignum2(b, pub_key)) != 0 || -+ (r = sshbuf_put_bignum2(b, priv_key)) != 0) -+ goto out; -+ } - break; - case KEY_DSA_CERT: - if (key->cert == NULL || sshbuf_len(key->cert->certblob) == 0) { - r = SSH_ERR_INVALID_ARGUMENT; - goto out; - } -- if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 || -- (r = sshbuf_put_bignum2(b, key->dsa->priv_key)) != 0) -- goto out; -+ { -+ const BIGNUM *priv_key; -+ -+ DSA_get0_key(key->dsa, NULL, &priv_key); -+ if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 || -+ (r = sshbuf_put_bignum2(b, priv_key)) != 0) -+ goto out; -+ } - break; - # ifdef OPENSSL_HAS_ECC - case KEY_ECDSA: -@@ -2699,18 +2836,51 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) - r = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if ((r = sshbuf_get_bignum2(buf, k->dsa->p)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->dsa->q)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->dsa->g)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->dsa->pub_key)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->dsa->priv_key)) != 0) -- goto out; -+ { -+ BIGNUM *p, *q, *g, *pub_key, *priv_key; -+ -+ p = BN_new(); -+ q = BN_new(); -+ g = BN_new(); -+ pub_key = BN_new(); -+ priv_key = BN_new(); -+ if (p == NULL || q == NULL || g == NULL || -+ pub_key == NULL || priv_key == NULL || -+ (r = sshbuf_get_bignum2(buf, p)) != 0 || -+ (r = sshbuf_get_bignum2(buf, q)) != 0 || -+ (r = sshbuf_get_bignum2(buf, g)) != 0 || -+ (r = sshbuf_get_bignum2(buf, pub_key)) != 0 || -+ (r = sshbuf_get_bignum2(buf, priv_key)) != 0 || -+ (r = ((DSA_set0_pqg(k->dsa, p, q, g) == 0) -+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0) { -+ BN_free(p); -+ BN_free(q); -+ BN_free(g); -+ BN_free(pub_key); -+ BN_free(priv_key); -+ goto out; -+ } -+ if (DSA_set0_key(k->dsa, pub_key, priv_key) == 0) { -+ r = SSH_ERR_LIBCRYPTO_ERROR; -+ BN_free(pub_key); -+ BN_free(priv_key); -+ goto out; -+ } -+ } - break; -- case KEY_DSA_CERT: -- if ((r = sshkey_froms(buf, &k)) != 0 || -- (r = sshkey_add_private(k)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->dsa->priv_key)) != 0) -- goto out; -+ case KEY_DSA_CERT: { -+ BIGNUM *priv_key = BN_new(); -+ -+ if (priv_key == NULL || -+ (r = sshkey_froms(buf, &k)) != 0 || -+ (r = sshkey_add_private(k)) != 0 || -+ (r = sshbuf_get_bignum2(buf, priv_key)) != 0 || -+ (r = ((DSA_set0_key(k->dsa, NULL, priv_key) == 0) -+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0) { -+ BN_free(priv_key); -+ goto out; -+ } -+ } - break; - # ifdef OPENSSL_HAS_ECC - case KEY_ECDSA: -@@ -2769,24 +2939,84 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) - r = SSH_ERR_ALLOC_FAIL; - goto out; - } -- if ((r = sshbuf_get_bignum2(buf, k->rsa->n)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->e)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 || -- (r = rsa_generate_additional_parameters(k->rsa)) != 0) -- goto out; -+ { -+ BIGNUM *n, *e, *d, *iqmp, *p, *q; -+ -+ n = BN_new(); -+ e = BN_new(); -+ d = BN_new(); -+ iqmp = BN_new(); -+ p = BN_new(); -+ q = BN_new(); -+ -+ if (n == NULL || e == NULL || d == NULL || -+ iqmp == NULL || p == NULL || q == NULL || -+ (r = sshbuf_get_bignum2(buf, n)) != 0 || -+ (r = sshbuf_get_bignum2(buf, e)) != 0 || -+ (r = sshbuf_get_bignum2(buf, d)) != 0 || -+ (r = sshbuf_get_bignum2(buf, iqmp)) != 0 || -+ (r = sshbuf_get_bignum2(buf, p)) != 0 || -+ (r = sshbuf_get_bignum2(buf, q)) != 0 || -+ (r = ((RSA_set0_key(k->rsa, n, e, d) == 0) -+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0) { -+ BN_free(n); -+ BN_free(e); -+ BN_free(d); -+ BN_free(iqmp); -+ BN_free(p); -+ BN_free(q); -+ goto out; -+ } -+ if (RSA_set0_factors(k->rsa, p, q) == 0) { -+ r = SSH_ERR_LIBCRYPTO_ERROR; -+ BN_free(iqmp); -+ BN_free(p); -+ BN_free(q); -+ goto out; -+ } -+ if ((r = rsa_generate_additional_parameters(k->rsa, iqmp)) != 0) { -+ BN_free(iqmp); -+ goto out; -+ } -+ } - break; -- case KEY_RSA_CERT: -- if ((r = sshkey_froms(buf, &k)) != 0 || -- (r = sshkey_add_private(k)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 || -- (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 || -- (r = rsa_generate_additional_parameters(k->rsa)) != 0) -- goto out; -+ case KEY_RSA_CERT: { -+ BIGNUM *d, *iqmp, *p, *q; -+ -+ /* N and E are already set so make sure we will not overwrite them */ -+ d = BN_new(); -+ iqmp = BN_new(); -+ p = BN_new(); -+ q = BN_new(); -+ -+ if (d == NULL || iqmp == NULL || p == NULL || -+ q == NULL || -+ (r = sshkey_froms(buf, &k)) != 0 || -+ (r = sshkey_add_private(k)) != 0 || -+ (r = sshbuf_get_bignum2(buf, d)) != 0 || -+ (r = sshbuf_get_bignum2(buf, iqmp)) != 0 || -+ (r = sshbuf_get_bignum2(buf, p)) != 0 || -+ (r = sshbuf_get_bignum2(buf, q)) != 0 || -+ (r = ((RSA_set0_key(k->rsa, NULL, NULL, d) == 0) -+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0) { -+ BN_free(d); -+ BN_free(iqmp); -+ BN_free(p); -+ BN_free(q); -+ goto out; -+ } -+ if (RSA_set0_factors(k->rsa, p, q) == 0) { -+ r = SSH_ERR_LIBCRYPTO_ERROR; -+ BN_free(p); -+ BN_free(q); -+ goto out; -+ } -+ if (rsa_generate_additional_parameters(k->rsa, iqmp) != 0) { -+ r = SSH_ERR_LIBCRYPTO_ERROR; -+ free(iqmp); -+ goto out; -+ } -+ } - break; - #endif /* WITH_OPENSSL */ - case KEY_ED25519: -@@ -3421,6 +3651,7 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob, - struct sshcipher_ctx *ciphercontext = NULL; - const struct sshcipher *cipher; - u_char *cp; -+ const BIGNUM *n, *e, *d, *q, *p, *iqmp; - - /* - * If the passphrase is empty, use SSH_CIPHER_NONE to ease converting -@@ -3447,10 +3678,13 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob, - * format would just give known plaintext). - * Note: q and p are stored in reverse order to SSL. - */ -- if ((r = sshbuf_put_bignum1(buffer, key->rsa->d)) != 0 || -- (r = sshbuf_put_bignum1(buffer, key->rsa->iqmp)) != 0 || -- (r = sshbuf_put_bignum1(buffer, key->rsa->q)) != 0 || -- (r = sshbuf_put_bignum1(buffer, key->rsa->p)) != 0) -+ RSA_get0_key(key->rsa, &n, &e, &d); -+ RSA_get0_factors(key->rsa, &p, &q); -+ RSA_get0_crt_params(key->rsa, NULL, NULL, &iqmp); -+ if ((r = sshbuf_put_bignum1(buffer, d)) != 0 || -+ (r = sshbuf_put_bignum1(buffer, iqmp)) != 0 || -+ (r = sshbuf_put_bignum1(buffer, q)) != 0 || -+ (r = sshbuf_put_bignum1(buffer, p)) != 0) - goto out; - - /* Pad the part to be encrypted to a size that is a multiple of 8. */ -@@ -3475,9 +3709,9 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob, - goto out; - - /* Store public key. This will be in plain text. */ -- if ((r = sshbuf_put_u32(encrypted, BN_num_bits(key->rsa->n))) != 0 || -- (r = sshbuf_put_bignum1(encrypted, key->rsa->n)) != 0 || -- (r = sshbuf_put_bignum1(encrypted, key->rsa->e)) != 0 || -+ if ((r = sshbuf_put_u32(encrypted, BN_num_bits(n))) != 0 || -+ (r = sshbuf_put_bignum1(encrypted, n)) != 0 || -+ (r = sshbuf_put_bignum1(encrypted, e)) != 0 || - (r = sshbuf_put_cstring(encrypted, comment)) != 0) - goto out; - -@@ -3604,6 +3838,7 @@ sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob, - int r; - struct sshkey *pub = NULL; - struct sshbuf *copy = NULL; -+ BIGNUM *n = NULL, *e = NULL; - - if (keyp != NULL) - *keyp = NULL; -@@ -3633,10 +3868,16 @@ sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob, - goto out; - - /* Read the public key from the buffer. */ -- if ((pub = sshkey_new(KEY_RSA1)) == NULL || -- (r = sshbuf_get_bignum1(copy, pub->rsa->n)) != 0 || -- (r = sshbuf_get_bignum1(copy, pub->rsa->e)) != 0) -+ if ((n = BN_new()) == NULL || -+ (e = BN_new()) == NULL || -+ (pub = sshkey_new(KEY_RSA1)) == NULL || -+ (r = sshbuf_get_bignum1(copy, n)) != 0 || -+ (r = sshbuf_get_bignum1(copy, e)) != 0 || -+ RSA_set0_key(pub->rsa, n, e, NULL) == 0) { -+ BN_free(n); -+ BN_free(e); - goto out; -+ } - - /* Finally, the comment */ - if ((r = sshbuf_get_string(copy, (u_char**)commentp, NULL)) != 0) -@@ -3668,6 +3909,8 @@ sshkey_parse_private_rsa1(struct sshbuf *blob, const char *passphrase, - struct sshcipher_ctx *ciphercontext = NULL; - const struct sshcipher *cipher; - struct sshkey *prv = NULL; -+ BIGNUM *n = NULL, *e = NULL, *d = NULL, *q = NULL, *p = NULL, -+ *iqmp = NULL; - - if (keyp != NULL) - *keyp = NULL; -@@ -3703,11 +3946,17 @@ sshkey_parse_private_rsa1(struct sshbuf *blob, const char *passphrase, - goto out; - - /* Read the public key and comment from the buffer. */ -- if ((r = sshbuf_get_u32(copy, NULL)) != 0 || /* key bits */ -- (r = sshbuf_get_bignum1(copy, prv->rsa->n)) != 0 || -- (r = sshbuf_get_bignum1(copy, prv->rsa->e)) != 0 || -- (r = sshbuf_get_cstring(copy, &comment, NULL)) != 0) -+ if ((n = BN_new()) == NULL || -+ (e = BN_new()) == NULL || -+ (r = sshbuf_get_u32(copy, NULL)) != 0 || /* key bits */ -+ (r = sshbuf_get_bignum1(copy, n)) != 0 || -+ (r = sshbuf_get_bignum1(copy, e)) != 0 || -+ (r = sshbuf_get_cstring(copy, &comment, NULL)) != 0 || -+ RSA_set0_key(prv->rsa, n, e, NULL) == 0) { -+ BN_free(n); -+ BN_free(e); - goto out; -+ } - - /* Check that it is a supported cipher. */ - cipher = cipher_by_number(cipher_type); -@@ -3736,15 +3985,33 @@ sshkey_parse_private_rsa1(struct sshbuf *blob, const char *passphrase, - } - - /* Read the rest of the private key. */ -- if ((r = sshbuf_get_bignum1(decrypted, prv->rsa->d)) != 0 || -- (r = sshbuf_get_bignum1(decrypted, prv->rsa->iqmp)) != 0 || -- (r = sshbuf_get_bignum1(decrypted, prv->rsa->q)) != 0 || -- (r = sshbuf_get_bignum1(decrypted, prv->rsa->p)) != 0) -+ if ((d = BN_new()) == NULL || -+ (p = BN_new()) == NULL || -+ (q = BN_new()) == NULL || -+ (iqmp = BN_new()) == NULL || -+ (r = sshbuf_get_bignum1(decrypted, d)) != 0 || -+ (r = sshbuf_get_bignum1(decrypted, iqmp)) != 0 || -+ (r = sshbuf_get_bignum1(decrypted, q)) != 0 || -+ (r = sshbuf_get_bignum1(decrypted, p)) != 0 || -+ (RSA_set0_key(prv->rsa, NULL, NULL, d) == 0)) { -+ BN_free(d); -+ BN_free(p); -+ BN_free(q); -+ BN_free(iqmp); - goto out; -+ } -+ if (RSA_set0_factors(prv->rsa, p, q) == 0) { -+ BN_free(p); -+ BN_free(q); -+ BN_free(iqmp); -+ goto out; -+ } - - /* calculate p-1 and q-1 */ -- if ((r = rsa_generate_additional_parameters(prv->rsa)) != 0) -+ if ((r = rsa_generate_additional_parameters(prv->rsa, iqmp)) != 0) { -+ BN_free(iqmp); - goto out; -+ } - - /* enable blinding */ - if (RSA_blinding_on(prv->rsa, NULL) != 1) { -@@ -3817,7 +4084,9 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, - case EVP_R_BAD_DECRYPT: - r = SSH_ERR_KEY_WRONG_PASSPHRASE; - goto out; -+#ifdef EVP_R_BN_DECODE_ERROR - case EVP_R_BN_DECODE_ERROR: -+#endif - case EVP_R_DECODE_ERROR: - #ifdef EVP_R_PRIVATE_KEY_DECODE_ERROR - case EVP_R_PRIVATE_KEY_DECODE_ERROR: -@@ -3835,7 +4104,7 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, - r = SSH_ERR_LIBCRYPTO_ERROR; - goto out; - } -- if (pk->type == EVP_PKEY_RSA && -+ if (EVP_PKEY_id(pk) == EVP_PKEY_RSA && - (type == KEY_UNSPEC || type == KEY_RSA)) { - if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { - r = SSH_ERR_ALLOC_FAIL; -@@ -3850,7 +4119,7 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, - r = SSH_ERR_LIBCRYPTO_ERROR; - goto out; - } -- } else if (pk->type == EVP_PKEY_DSA && -+ } else if (EVP_PKEY_id(pk) == EVP_PKEY_DSA && - (type == KEY_UNSPEC || type == KEY_DSA)) { - if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { - r = SSH_ERR_ALLOC_FAIL; -@@ -3862,7 +4131,7 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, - DSA_print_fp(stderr, prv->dsa, 8); - #endif - #ifdef OPENSSL_HAS_ECC -- } else if (pk->type == EVP_PKEY_EC && -+ } else if (EVP_PKEY_id(pk) == EVP_PKEY_EC && - (type == KEY_UNSPEC || type == KEY_ECDSA)) { - if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { - r = SSH_ERR_ALLOC_FAIL; diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-s390-seccomp.patch b/net-misc/openssh1/files/openssh1-7.5_p1-s390-seccomp.patch deleted file mode 100644 index d793200..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-s390-seccomp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 58b8cfa2a062b72139d7229ae8de567f55776f24 Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Wed, 22 Mar 2017 12:43:02 +1100 -Subject: [PATCH] Missing header on Linux/s390 - -Patch from Jakub Jelen ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index a8d472a63ccb..2831e9d1083c 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -50,6 +50,9 @@ - #include - - #include -+#ifdef __s390__ -+#include -+#endif - - #include - #include --- -2.15.1 - diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch b/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch deleted file mode 100644 index 3a374a0..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- openssh-7.5p1/Makefile.in.orig 2017-03-20 03:39:27.000000000 +0100 -+++ openssh-7.5p1/Makefile.in 2019-12-10 05:50:55.590037728 +0100 -@@ -62,7 +62,7 @@ - EXEEXT=@EXEEXT@ - MANFMT=@MANFMT@ - --TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) -+TARGETS=ssh$(EXEEXT) ssh-keygen$(EXEEXT) scp$(EXEEXT) - - LIBOPENSSH_OBJS=\ - ssh_api.o \ -@@ -112,15 +112,15 @@ - sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ - sandbox-solaris.o - --MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out --MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 -+MANPAGES = scp.1.out ssh-keygen.1.out ssh.1.out ssh_config.5.out -+MANPAGES_IN = scp.1 ssh-keygen.1 ssh.1 ssh_config.5 - MANTYPE = @MANTYPE@ - --CONFIGFILES=sshd_config.out ssh_config.out moduli.out --CONFIGFILES_IN=sshd_config ssh_config moduli -+CONFIGFILES=ssh_config.out -+CONFIGFILES_IN=ssh_config - - PATHSUBS = \ -- -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \ -+ -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config1|g' \ - -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \ - -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \ - -e 's|/usr/libexec|$(libexecdir)|g' \ -@@ -301,71 +301,31 @@ - $(AUTORECONF) - -rm -rf autom4te.cache - --install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config -+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf - install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - --check-config: -- -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config -- - install-files: - $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -- $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 -- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 -- $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) -- (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) -- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent$(EXEEXT) $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) -- $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) -- $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) -- $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 -- $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 -- $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 -- $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 -- $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 -- $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 -- $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 -- $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 -- $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 -- $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 -- $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 -- $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 -- $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 -- $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 -+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh1$(EXEEXT) -+ $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp1$(EXEEXT) -+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen1$(EXEEXT) -+ $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh1.1 -+ $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp1.1 -+ $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen1.1 -+ $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config1.5 - - install-sysconf: - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ -- $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ -- else \ -- echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ -- fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ -- $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ -- else \ -- echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ -- fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ -- if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ -- echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ -- mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ -- else \ -- $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ -- fi ; \ -+ @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config1 ]; then \ -+ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config1; \ - else \ -- echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ -+ echo "$(DESTDIR)$(sysconfdir)/ssh_config1 already exists, install will not overwrite"; \ - fi - - host-key: ssh-keygen$(EXEEXT) -@@ -385,8 +345,7 @@ - fi - - uninstallall: uninstall -- -rm -f $(DESTDIR)$(sysconfdir)/ssh_config -- -rm -f $(DESTDIR)$(sysconfdir)/sshd_config -+ -rm -f $(DESTDIR)$(sysconfdir)/ssh_config1 - -rmdir $(DESTDIR)$(sysconfdir) - -rmdir $(DESTDIR)$(bindir) - -rmdir $(DESTDIR)$(sbindir) -@@ -398,26 +357,10 @@ - uninstall: - -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT) -- -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) -- -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) -- -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) -- -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) -- -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) -- -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) -- -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) -- -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 -- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 - - regress-prep: - [ -d `pwd`/regress ] || mkdir -p `pwd`/regress diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-x32-typo.patch b/net-misc/openssh1/files/openssh1-7.5_p1-x32-typo.patch deleted file mode 100644 index 5dca1b0..0000000 --- a/net-misc/openssh1/files/openssh1-7.5_p1-x32-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 596c432181e1c4a9da354388394f640afd29f44b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 20 Mar 2017 14:57:40 -0400 -Subject: [PATCH] seccomp sandbox: fix typo w/x32 check - ---- - sandbox-seccomp-filter.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 3a1aedce72c2..a8d472a63ccb 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -235,7 +235,7 @@ static const struct sock_filter preauth_insns[] = { - * x86-64 syscall under some circumstances, e.g. - * https://bugs.debian.org/849923 - */ -- SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT); -+ SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT), - #endif - - /* Default deny */ --- -2.12.0 - diff --git a/net-misc/openssh1/openssh1-7.5_p1-r5.ebuild b/net-misc/openssh1/openssh1-7.5_p1-r5.ebuild deleted file mode 100644 index f0a9794..0000000 --- a/net-misc/openssh1/openssh1-7.5_p1-r5.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils user flag-o-matic multilib autotools pam systemd - -# Make it more portable between straight releases -# and _p? releases. -PARCH=openssh-7.5p1 - -HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz" -SCTP_PATCH="openssh-7.4_p1-sctp.patch.xz" -LDAP_PATCH="openssh-lpk-7.5p1-0.3.14.patch.xz" -X509_VER="10.2" X509_PATCH="openssh-${PV/_}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="http://www.openssh.org/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}} - ${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )} - ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} - ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} - " - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssh1 +ssl static test X X509" -REQUIRED_USE="ldns? ( ssl ) - pie? ( !static ) - ssh1? ( ssl ) - static? ( !kerberos !pam ) - X509? ( !ldap !sctp ssl ) - test? ( ssl )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) - ssl? ( - !libressl? ( - >=dev-libs/openssl-1.0.1:0=[bindist=] - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - >=sys-libs/zlib-1.2.3:=[static-libs(+)]" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig - virtual/os-headers - sys-devel/autoconf" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) - X? ( x11-apps/xauth )" - -S=${WORKDIR}/${PARCH} - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use X509 && maybe_fail X509 X509_PATCH) - $(use ldap && maybe_fail ldap LDAP_PATCH) - $(use hpn && maybe_fail hpn HPN_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - fi -} - -save_version() { - # version.h patch conflict avoidence - mv version.h version.h.$1 - cp -f version.h.pristine version.h -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - # keep this as we need it to avoid the conflict between LPK and HPN changing - # this file. - cp version.h version.h.pristine - - if use X509 ; then - if use hpn ; then - pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch - popd >/dev/null - fi - save_version X509 - epatch "${WORKDIR}"/${X509_PATCH%.*} - fi - - if use ldap ; then - epatch "${WORKDIR}"/${LDAP_PATCH%.*} - save_version LPK - fi - - epatch "${FILESDIR}"/${PN}-7.5_p1-ssh1.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex - epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch - use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252 - use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} - use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch - use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-openssl-1.1.patch - - if use hpn ; then - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ - EPATCH_MULTI_MSG="Applying HPN patchset ..." \ - epatch "${WORKDIR}"/${HPN_PATCH%.*.*} - save_version HPN - fi - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - epatch_user #473004 - - # Now we can build a sane merged version.h - ( - sed '/^#define SSH_RELEASE/d' version.h.* | sort -u - macros=() - for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done - printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}" - ) > version.h - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-sandbox=no - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the ldap patch conditionally, so can't pass --without-ldap - # unconditionally else we get unknown flag warnings. - $(use ldap && use_with ldap) - $(use_with ldns) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use X509 || use_with sctp) - $(use_with selinux) - $(use_with skey) - $(use_with ssh1) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - ) - - econf "${myconf[@]}" -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config1 - - # Send locale environment variables #367017 - SendEnv LANG LC_* - EOF - - if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then - insinto /etc/openldap/schema/ - newins openssh-lpk_openldap.schema openssh-lpk.schema - fi - - dodoc CREDITS OVERVIEW README* TODO - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" \ - emake -k -j1 ${t} - - - - pacho@gentoo.org - Pacho Ramos - - diff --git a/net-print/cndrvcups-common-sfp/Manifest b/net-print/cndrvcups-common-sfp/Manifest deleted file mode 100644 index cbed5b7..0000000 --- a/net-print/cndrvcups-common-sfp/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST linux-UFRIILT-drv-v140_uken.tar.gz 106958045 BLAKE2B 605663beea4737a3d7503340d66106a959167fc60ee8f0bfea514ee320c73ce5488290b2a105d72d0f8257d131656c5cd92f7f025297cb2526a2cf28e1066d3f SHA512 3d25db05dd17a85c299bb1fdab776225be5370e6f1f634496a8b4f7dfd59b7a545bccfeb436656387343238e96d624556448047659968fe8094148937ba04e84 -EBUILD cndrvcups-common-sfp-1.40.ebuild 2906 BLAKE2B 1432ede749b38bfad70ee62abdbad20e0dbacb6c9f02e50e7abf49e3c5574f89936ad543942a1cdd7f74f9f01595defb639ab79c369fd2c4d4191da2d02967b4 SHA512 e9958ba535eda035d6285816bd0f1c6e4bcf7f2a13269b3c71988eb4a863a87f846ce55056b127581c0b012c91af42c676ff976a26bb8a4ec78a36b296992c02 -MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 diff --git a/net-print/cndrvcups-common-sfp/cndrvcups-common-sfp-1.40.ebuild b/net-print/cndrvcups-common-sfp/cndrvcups-common-sfp-1.40.ebuild deleted file mode 100644 index 8787f40..0000000 --- a/net-print/cndrvcups-common-sfp/cndrvcups-common-sfp-1.40.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools versionator - -MY_PV="$(delete_all_version_separators)" -SOURCES_NAME="linux-UFRIILT-drv-v${MY_PV}-uken" - -DESCRIPTION="Common files for Canon drivers" -HOMEPAGE="https://www.canon.co.uk/support/consumer_products/products/printers/laser/i-sensys_lbp7110cw.aspx?type=drivers&language=&os=Linux%20(64-bit)" -SRC_URI="http://gdlp01.c-wss.com/gds/0/0100005950/08/${SOURCES_NAME/-uken/_uken}.tar.gz" -LICENSE="Canon-UFR-II GPL-2 MIT" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" - -RDEPEND=" - >=dev-libs/libxml2-2.6:2 - >=gnome-base/libglade-2.4:2.0 - >=net-print/cups-1.1.17 - >=x11-libs/gtk+-2.4:2 -" -DEPEND="${DEPEND}" - -S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-sfp-${PV}/-3.80}" - -pkg_setup() { - # Don't raise a fuss over pre-built binaries - QA_PREBUILT=" - /usr/libexec/cups/filter/c3pldrv - /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0 - /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1 - /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0 - /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0 - /usr/$(get_libdir)/libcanonc3pl.so.1.0.0 - " - QA_SONAME=" - /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0 - " -} - -src_unpack() { - unpack ${A} - cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die - unpack ./${P/-sfp-${PV}/-3.80}-1.tar.gz -} - -change_dir() { - for i in cngplp buftool backend; do - cd "${i}" || die - "${@}" - cd "${S}" || die - done -} - -src_prepare() { - default - sed -i -e \ - "s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \ - backend/Makefile.am || die - - export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0" - change_dir eautoreconf -} - -src_configure() { - change_dir econf -} - -src_compile() { - change_dir emake - - # Cannot be moved to 'change_dir' as it doesn't need eautoreconf - ( cd "${S}/c3plmod_ipc" && emake ) || die -} - -src_install() { - MAKEOPTS+=" -j1" default - - einstalldocs - - cd "${S}/c3plmod_ipc" || die - dolib.so libcanonc3pl.so.1.0.0 - dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1" - dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so" - - cd "${S}/data" || die - insinto /usr/share/caepcm - doins * - - ABI=x86 - cd "${S}/libs" || die - exeinto $(cups-config --serverbin)/filter - doexe c3pldrv - dolib.so libcaepcm.so.1.0 - dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1" - dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so" - for lib in *.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - - # c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :( - if [[ "$(get_libdir)" != lib ]]; then - dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so - fi -} diff --git a/net-print/cndrvcups-common-sfp/metadata.xml b/net-print/cndrvcups-common-sfp/metadata.xml deleted file mode 100644 index f618816..0000000 --- a/net-print/cndrvcups-common-sfp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - pacho@gentoo.org - Pacho Ramos - - diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest deleted file mode 100644 index 6bee83d..0000000 --- a/net-print/cndrvcups-lb/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b SHA512 2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3 -EBUILD cndrvcups-lb-3.50.ebuild 2614 BLAKE2B f347fd292c7b582c5e768932b1c7e444fef9d0fb5d415b4325a7f154bac83eae950db7a96e7994cbb1d017973001f1e673cd0af22e0aadb1ce42aa90817f2070 SHA512 0d61406771d9c36418ba1e08ccd188083fa6323fb54aba6fceb74e7e4c231341580bfef7727a11b63e7dd564056e882e97747a648be1eba19f087b1d32d57e5d -MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild deleted file mode 100644 index 489c7b5..0000000 --- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools versionator - -MY_PV="$(delete_all_version_separators)" -SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken" - -DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux" -HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX" -SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/01/${SOURCES_NAME}.tar.gz" - -LICENSE="Canon-UFR-II" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] - >=gnome-base/libglade-2.4:2.0 - >=net-print/cups-1.1.17 - ~net-print/cndrvcups-common-lb-${PV} - >=x11-libs/gtk+-2.4:2 - virtual/jpeg:62[abi_x86_32(-)] -" -DEPEND="${DEPEND}" - -S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}" - -MAKEOPTS+=" -j1" - -pkg_setup() { - # Don't raise a fuss over pre-built binaries - QA_PREBUILT=" - /usr/bin/cnpkbidi - /usr/bin/cnpkmoduleufr2 - /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0 - /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0 - " - QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0" -} - -src_unpack() { - unpack ${A} - cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die - unpack ./${P}-1.tar.gz -} - -change_dir() { - for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do - cd "${i}" || die - "${@}" - cd "${S}" || die - done -} - -src_prepare() { - default - sed -i -e \ - "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \ - pstoufr2cpca/filter/Makefile.am || die - - export "LIBS=-lgmodule-2.0" - change_dir eautoreconf -} - -src_configure() { - change_dir econf -} - -src_install() { - default - einstalldocs - - find "${D}" -name '*.la' -delete || die - - cd "${S}/data" || die - insinto /usr/share/caepcm - doins * - - cd "${S}/libs" || die - insinto /usr/share/cnpkbidi - doins cnpkbidi_info* - - insinto /usr/share/ufr2filter - doins ThLB* - - ABI=x86 - dobin cnpkbidi cnpkmoduleufr2 - dolib.so libcnlbcm.so.1.0 - dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1" - dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so" - for lib in *.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - - # c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :( - if [[ "$(get_libdir)" != lib ]]; then - dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so - fi -} diff --git a/net-print/cndrvcups-lb/metadata.xml b/net-print/cndrvcups-lb/metadata.xml deleted file mode 100644 index f618816..0000000 --- a/net-print/cndrvcups-lb/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - pacho@gentoo.org - Pacho Ramos - - diff --git a/net-print/cndrvcups-sfp/Manifest b/net-print/cndrvcups-sfp/Manifest deleted file mode 100644 index 18e6d49..0000000 --- a/net-print/cndrvcups-sfp/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX remove-StatusMonitor.patch 249 BLAKE2B b36889d01f1232987add0e495c147cbd8b9c3515f38935cfc3ce5047a9773cd2673c5348a58169d32592add4b36f7f10f577037482e78c35683a77b66d4ea8ba SHA512 ed6cc24512173635ec7737ff12bbd6f2e5715e38ba72312d31ea22e1419dc7ef9270f7f6f26c28f0587fd9217de126e02a4a31377010d70a00d60b2e0e94b80d -DIST linux-UFRIILT-drv-v140_uken.tar.gz 106958045 BLAKE2B 605663beea4737a3d7503340d66106a959167fc60ee8f0bfea514ee320c73ce5488290b2a105d72d0f8257d131656c5cd92f7f025297cb2526a2cf28e1066d3f SHA512 3d25db05dd17a85c299bb1fdab776225be5370e6f1f634496a8b4f7dfd59b7a545bccfeb436656387343238e96d624556448047659968fe8094148937ba04e84 -EBUILD cndrvcups-sfp-1.40.ebuild 4357 BLAKE2B da0d8ab22d62b2a4adef03a24388cbd3a36af832432fcaa94af6f204a699314e6d4d129a91f02ee9d55d9814684964d589a25385d0755e47d6d0328d8a55d33b SHA512 dad46dd1a89c3bc20665af5cd1d05df2bbe3856e174a9280d5b02fa47122634a600f723784f1a99749327597f75fcfc6fadd3c73f4c72975605f2abdc2a7c82a -MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 diff --git a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild deleted file mode 100644 index 7ed5ed8..0000000 --- a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools versionator - -MY_PV="$(delete_all_version_separators)" -SOURCES_NAME="linux-UFRIILT-drv-v${MY_PV}-uken" - -DESCRIPTION="Canon UFR II LT Printer Driver for Linux" -HOMEPAGE="https://www.canon.co.uk/support/consumer_products/products/printers/laser/i-sensys_lbp7110cw.aspx?type=drivers&language=&os=Linux%20(64-bit)" -SRC_URI="http://gdlp01.c-wss.com/gds/0/0100005950/08/${SOURCES_NAME/-uken/_uken}.tar.gz" -LICENSE="Canon-UFR-II" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" - -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] - >=gnome-base/libglade-2.4:2.0 - >=net-print/cups-1.1.17 - ~net-print/cndrvcups-common-sfp-${PV} - >=x11-libs/gtk+-2.4:2 - virtual/jpeg:62[abi_x86_32(-)] -" -DEPEND="${DEPEND}" - -S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}" - -MAKEOPTS+=" -j1" - -PATCHES=( - "${FILESDIR}"/remove-StatusMonitor.patch -) - -pkg_setup() { - # Don't raise a fuss over pre-built binaries - QA_PREBUILT=" - /usr/bin/pksmncap - /usr/bin/commandfilefilter - /usr/bin/cnpkmodulencap - /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libncapfilter.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcnncapcm.so.1.0 - /usr/$(get_abi_LIBDIR x86)/libcaio_usb_cdc.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libccpd_util.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanon_common.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanonncap.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libCUPS_Communicator.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libCommIsolation.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_ncapcaio.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_stdout.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_usbmlport.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_usbsock.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_websrv.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libinfo.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libinfo_analyze.so.1.0.0 - " - QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaio_usb_cdc.so.1.0.0" -} - -src_unpack() { - unpack ${A} - cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die - unpack ./${P}-1.tar.gz -} - -change_dir() { - for i in ppd pstoncapcpca cngplp cngplp/files cpca ; do - cd "${i}" || die - "${@}" - cd "${S}" || die - done -} - -src_prepare() { - default - sed -i -e \ - "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \ - pstoncapcpca/filter/Makefile.am || die - - export "LIBS=-lgmodule-2.0" - change_dir eautoreconf -} - -src_configure() { - change_dir econf -} - -src_install() { - default - einstalldocs - - find "${D}" -name '*.la' -delete || die - - newdir /var/cache/Canon/CUPS_SFP - - cd "${S}/rules" || die - insinto /usr/share/cups/usb - doins canon-sfp-printer.usb-quirks - insinto /etc/udev/rules.d - doins 80-usb-ncapstatusui.rules - - cd "${S}/data" || die - insinto /usr/share/caepcm - doins * - - cd "${S}/libs" || die - insinto /usr/share/ncapfilter - doins ThLB* - - use x86 && libsource=libs - use amd64 && libsource=libs64 - cd "${S}/${libsource}" || die - exeinto /usr/lib/Canon/CUPS_SFP/Bins - doexe commandfilefilter - exeinto /usr/lib/Canon/CUPS_SFP/Utilities - doexe pksmncap - exeinto /usr/lib/Canon/CUPS_SFP/Bidi - for lib in libcomm_*.so.?.?.? libccpd_util.so.?.?.? libcaio_usb_cdc.so.?.?.?; do - doexe "${lib}" - dosym "${lib}" "/usr/lib/Canon/CUPS_SFP/Bidi/${lib%.?.?}" - dosym "${lib}" "/usr/lib/Canon/CUPS_SFP/Bidi/${lib%.?.?.?}" - done - exeinto /usr/lib/Canon/CUPS_SFP/Libs - for lib in libCUPS_Communicator.so.?.?.? libCommIsolation.so.?.?.? libcanon_common.so.?.?.? libinfo*.so.?.?.?; do - doexe "${lib}" - dosym "${lib}" "/usr/lib/Canon/CUPS_SFP/Libs/${lib%.?.?}" - dosym "${lib}" "/usr/lib/Canon/CUPS_SFP/Libs/${lib%.?.?.?}" - done - cd "${S}/libs" || die - exeinto /usr/lib/Canon/CUPS_SFP/Libs - for lib in libEno*.so.?.?.?; do - doexe "${lib}" - dosym "${lib}" "/usr/lib/Canon/CUPS_SFP/Libs/${lib%.?.?}" - dosym "${lib}" "/usr/lib/Canon/CUPS_SFP/Libs/${lib%.?.?.?}" - done - - ABI=x86 - dobin cnpkmodulencap - dolib.so libcnncapcm.so.1.0 - dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so.1" - dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so" - for lib in libcnncapcm*.so.?.? libncapfilter.so.?.?.? libcanonncap.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done -} diff --git a/net-print/cndrvcups-sfp/files/remove-StatusMonitor.patch b/net-print/cndrvcups-sfp/files/remove-StatusMonitor.patch deleted file mode 100644 index 67770b0..0000000 --- a/net-print/cndrvcups-sfp/files/remove-StatusMonitor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2014-12-08 05:09:22.000000000 +0100 -+++ b/Makefile 2018-05-30 14:24:12.013657597 +0200 -@@ -8,7 +8,7 @@ - PPDDIR = ppd - CPCADIR = cpca - CNGPLPDIR = cngplp --SMDIR = StatusMonitor -+SMDIR = - SRCDIRS =\ - $(FILTERDIR)\ - $(PPDDIR)\ diff --git a/net-print/cndrvcups-sfp/metadata.xml b/net-print/cndrvcups-sfp/metadata.xml deleted file mode 100644 index f618816..0000000 --- a/net-print/cndrvcups-sfp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - pacho@gentoo.org - Pacho Ramos - - diff --git a/net-vpn/softether/Manifest b/net-vpn/softether/Manifest deleted file mode 100644 index 9a53ba6..0000000 --- a/net-vpn/softether/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX softether-4.04-sandbox.patch 775 BLAKE2B 2b8c577e853afda5004a344413ab3dd5e2b1a0fd8ec0800a7790f2798e7c7c7997e541cd4b055fbb86106dbccddba84a7eb6015a5ed8de8470afb420352d49d3 SHA512 4742927b11caea67bd183bf26d24a1ca70ca6a764f0b263bd4aa54784759c883358bd3cb16edd3b27ce8aaa84fb230002441dfb0ecfab9b3398e6ecc06c9159d -AUX softether-4.25-compile-flags.patch 7107 BLAKE2B a6f138fb2f0b08db32235e7f3f4d260942aa69c17c904c856b40da6b5a0e0ffe547da8cf1240a0efad978906800bdb06c84857452fd046bbba61317df63ef401 SHA512 220662d5ba181229e1ba4aad1b8125244f3dde88a7e9bef01516740fb14353652573b742aac6593891283bbafb7ec0c4c084b6dcd30912de082ee8d59ea28373 -AUX softether-bridge.confd 36 BLAKE2B aa4efb532188bfffbb4ee9393c458a3769ef497242b623b0c79f55fe6a3bbac3e30ca6b2cafb13b003e024dff14f097978e94bd2fb77be4f6b8a203aa03f337d SHA512 2261dc21b23b0e745b611c4e79a3ce940068007512308b2acef9db860e8b6fa86693447968ddeed1dbe9d25601f1ace88064ea49f106a450f65eee24dfb11e2b -AUX softether-bridge.initd 1012 BLAKE2B 58699bf0fa96986a77a2b81161a5f21aaeda56e42cd6e2ff76a07842dee400d413b02966173c5b7ce3f152277518eaee9b6eda8c68588326d25dc469e4e87e05 SHA512 73c56bd43bcbfd22841d91953b961f5b109d11a674daee1b4c8e3e147471b0f710f281ec173f369e63098697709e6286e510bb74e46013049faf4ef538d0c519 -AUX softether-client.confd 36 BLAKE2B aa4efb532188bfffbb4ee9393c458a3769ef497242b623b0c79f55fe6a3bbac3e30ca6b2cafb13b003e024dff14f097978e94bd2fb77be4f6b8a203aa03f337d SHA512 2261dc21b23b0e745b611c4e79a3ce940068007512308b2acef9db860e8b6fa86693447968ddeed1dbe9d25601f1ace88064ea49f106a450f65eee24dfb11e2b -AUX softether-client.initd 1012 BLAKE2B ad11ba665a890af15f866d21dc8fd3bed78b4d94ed34cc644a57cebf77d73e5ad3de0cbb090431b155fb4e7fa6fffe4f0327b82c7f3668d4738a4e0365d7fc8c SHA512 82193c7706865c23e1f7784ce5672dfe402366d7487245faabbb2668ba722a1945ac0aa26ee63357a12d85853c7071dbc0ab87b5598fbbc9587435984175f953 -AUX softether-server.confd 36 BLAKE2B aa4efb532188bfffbb4ee9393c458a3769ef497242b623b0c79f55fe6a3bbac3e30ca6b2cafb13b003e024dff14f097978e94bd2fb77be4f6b8a203aa03f337d SHA512 2261dc21b23b0e745b611c4e79a3ce940068007512308b2acef9db860e8b6fa86693447968ddeed1dbe9d25601f1ace88064ea49f106a450f65eee24dfb11e2b -AUX softether-server.initd 1012 BLAKE2B 1f95a0974034fcc625977a9cf8f6d53e4717f6d1338622f37bb13a1002db430026dcbf03a41b89280ca4b586941141913ce1ae03ee8c9ed18ebea0edb8615465 SHA512 53c17c72670952b472bc70666870bfcd3eb7dc11ce4d00e77319969554c002d013af7b4688c6c610350ae657deaebba014a5d495165e3073f23a84ada6c11af8 -DIST v4.34-9745-beta.tar.gz 59121057 BLAKE2B f25f5f1064223a4b44998442e65143972754d71729f10d03af0c7bcb437f1b59b6172a924315ac904583c2c982ac5e2a5370fc9e4590fcc36c9121a976208551 SHA512 747b569bf60acf06032f76a1dc5eb5352f74da8bfe4511908d7ba45c3ac67eb3dc9a8f3c1885f4b89f9f915f4f617c7f59da3c63cb0c376396f8ba90e447e045 -EBUILD softether-4.34.9745_beta.ebuild 2297 BLAKE2B 1c8031ea2d25de245d81c5c959bb4ef99ee01c2c0e6983124519d7b0d472e2d0d75ed461d5a3955123a4af19699ca72ec38d9302905e704aac5818f1a582012e SHA512 52721adfb53d4adf6547250a911f8474b1bd5618c860f79685e477a2fbe8bd34d0ca053795bac469cad6051a1f3af267eddaa01d35632471e3f9e6e649dff040 -MISC metadata.xml 1015 BLAKE2B febf7c27f3ced24ae27ff810e21d1d5995a2e9cb2cef54488019c0e32505200c30b72f08bc5fac57dbd4932500a3f6a2188ad491d60400a99a83dcc2710d8efe SHA512 c11c41731fd992670c74343c54ba5b390da650b99a1292cd2a0f882ff876e8f6341ab0bcca9fb3b464b0e77ee0d09247c240bc880369fe13ca61435bbfc72217 diff --git a/net-vpn/softether/files/softether-4.04-sandbox.patch b/net-vpn/softether/files/softether-4.04-sandbox.patch deleted file mode 100644 index b7482eb..0000000 --- a/net-vpn/softether/files/softether-4.04-sandbox.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/Mayaqua/Unix.c.org 2014-03-05 07:24:37.000000000 +0200 -+++ b/src/Mayaqua/Unix.c 2014-03-05 07:24:48.000000000 +0200 -@@ -2150,14 +2150,14 @@ - #endif // RLIMIT_NPROC - - // Write a value to the threads-max of the proc file system -- o = UnixFileCreate("/proc/sys/kernel/threads-max"); -- if (o != NULL) -- { -- char tmp[128]; -- sprintf(tmp, "%u\n", UNIX_LINUX_MAX_THREADS); -- UnixFileWrite(o, tmp, strlen(tmp)); -- UnixFileClose(o, false); -- } -+ //o = UnixFileCreate("/proc/sys/kernel/threads-max"); -+ //if (o != NULL) -+ //{ -+ // char tmp[128]; -+ // sprintf(tmp, "%u\n", UNIX_LINUX_MAX_THREADS); -+ // UnixFileWrite(o, tmp, strlen(tmp)); -+ // UnixFileClose(o, false); -+ //} - - // Set the signals that is to be ignored - signal(SIGPIPE, SIG_IGN); diff --git a/net-vpn/softether/files/softether-4.25-compile-flags.patch b/net-vpn/softether/files/softether-4.25-compile-flags.patch deleted file mode 100644 index 884a350..0000000 --- a/net-vpn/softether/files/softether-4.25-compile-flags.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Nru v4.25-9656.orig/src/makefiles/linux_32bit.mak v4.25-9656/src/makefiles/linux_32bit.mak ---- v4.25-9656.orig/src/makefiles/linux_32bit.mak 2018-01-15 05:00:42.000000000 +0300 -+++ v4.25-9656/src/makefiles/linux_32bit.mak 2018-06-04 00:06:00.475000000 +0300 -@@ -24,14 +24,15 @@ - # Variables - - #CC=gcc -+RANLIB?=ranlib - - OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char - - OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz - --OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -+OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ ${CFLAGS} -fsigned-char - --OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -+OPTIONS_LINK_RELEASE=${CFLAGS} ${LDFLAGS} -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz - - INSTALL_BINDIR=/usr/bin/ - INSTALL_VPNSERVER_DIR=/usr/vpnserver/ -@@ -324,8 +325,8 @@ - - tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpnserver.a -- ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o -- ranlib tmp/as/vpnserver.a -+ $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o -+ $(RANLIB) tmp/as/vpnserver.a - - bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2 -@@ -339,8 +340,8 @@ - - tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpnclient.a -- ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o -- ranlib tmp/as/vpnclient.a -+ $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o -+ $(RANLIB) tmp/as/vpnclient.a - - bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2 -@@ -354,8 +355,8 @@ - - tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpnbridge.a -- ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o -- ranlib tmp/as/vpnbridge.a -+ $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o -+ $(RANLIB) tmp/as/vpnbridge.a - - bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2 -@@ -369,8 +370,8 @@ - - tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpncmd.a -- ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o -- ranlib tmp/as/vpncmd.a -+ $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o -+ $(RANLIB) tmp/as/vpncmd.a - - bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2 -diff -Nru v4.25-9656.orig/src/makefiles/linux_64bit.mak v4.25-9656/src/makefiles/linux_64bit.mak ---- v4.25-9656.orig/src/makefiles/linux_64bit.mak 2018-01-15 05:00:42.000000000 +0300 -+++ v4.25-9656/src/makefiles/linux_64bit.mak 2018-06-04 00:06:10.592000000 +0300 -@@ -24,14 +24,15 @@ - # Variables - - #CC=gcc -+RANLIB?=ranlib - - OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64 - - OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz - --OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64 -+OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ ${CFLAGS} -fsigned-char - --OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -+OPTIONS_LINK_RELEASE=${CFLAGS} ${LDFLAGS} -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz - - INSTALL_BINDIR=/usr/bin/ - INSTALL_VPNSERVER_DIR=/usr/vpnserver/ -@@ -324,8 +325,8 @@ - - tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpnserver.a -- ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o -- ranlib tmp/as/vpnserver.a -+ $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o -+ $(RANLIB) tmp/as/vpnserver.a - - bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2 -@@ -339,8 +340,8 @@ - - tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpnclient.a -- ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o -- ranlib tmp/as/vpnclient.a -+ $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o -+ $(RANLIB) tmp/as/vpnclient.a - - bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2 -@@ -354,8 +355,8 @@ - - tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpnbridge.a -- ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o -- ranlib tmp/as/vpnbridge.a -+ $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o -+ $(RANLIB) tmp/as/vpnbridge.a - - bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2 -@@ -369,8 +370,8 @@ - - tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) - rm -f tmp/as/vpncmd.a -- ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o -- ranlib tmp/as/vpncmd.a -+ $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o -+ $(RANLIB) tmp/as/vpncmd.a - - bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2 diff --git a/net-vpn/softether/files/softether-bridge.confd b/net-vpn/softether/files/softether-bridge.confd deleted file mode 100644 index 8630a12..0000000 --- a/net-vpn/softether/files/softether-bridge.confd +++ /dev/null @@ -1,2 +0,0 @@ -OPTS_START="start" -OPTS_STOP="stop" diff --git a/net-vpn/softether/files/softether-bridge.initd b/net-vpn/softether/files/softether-bridge.initd deleted file mode 100644 index 34e98e5..0000000 --- a/net-vpn/softether/files/softether-bridge.initd +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -NAME=${SVCNAME##*.} -if [ -n "${NAME}" -a "${SVCNAME}" != "softether-bridge" ]; then - PID="/run/softether-bridge.${NAME}.pid" - PNAME=$(echo ${RC_SVCNAME} | sed 's/.*\-/vpn/;s/\..*//g') - CONF_DEFAULT="/etc/conf.d/softether-bridge.${NAME}" -else - PID="/run/softether-bridge.pid" - PNAME=$(echo ${RC_SVCNAME} | sed 's/.*\-/vpn/') - CONF_DEFAULT="/etc/conf.d/softether-bridge" -fi -CONF=${CONF:-${CONF_DEFAULT}} -EXEC=${EXEC:-/opt/softether/bin/vpnbridge/vpnbridge} - -depend() { - need net - provide softether-bridge -} - -start() { - ebegin "Starting softether-bridge" - start-stop-daemon --start --quiet --make-pidfile --pidfile ${PID} --exec ${EXEC} -- ${OPTS_START} - eend $? -} - -start_post() { - pgrep -n $(echo ${PNAME}) > ${PID} -} - -stop() { - ebegin "Stopping softether-bridge" - start-stop-daemon --stop --quiet --pidfile ${PID} -- ${OPTS_STOP} - rm -f ${PID} - eend $? -} diff --git a/net-vpn/softether/files/softether-client.confd b/net-vpn/softether/files/softether-client.confd deleted file mode 100644 index 8630a12..0000000 --- a/net-vpn/softether/files/softether-client.confd +++ /dev/null @@ -1,2 +0,0 @@ -OPTS_START="start" -OPTS_STOP="stop" diff --git a/net-vpn/softether/files/softether-client.initd b/net-vpn/softether/files/softether-client.initd deleted file mode 100644 index 5686b09..0000000 --- a/net-vpn/softether/files/softether-client.initd +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -NAME=${SVCNAME##*.} -if [ -n "${NAME}" -a "${SVCNAME}" != "softether-client" ]; then - PID="/run/softether-client.${NAME}.pid" - PNAME=$(echo ${RC_SVCNAME} | sed 's/.*\-/vpn/;s/\..*//g') - CONF_DEFAULT="/etc/conf.d/softether-client.${NAME}" -else - PID="/run/softether-client.pid" - PNAME=$(echo ${RC_SVCNAME} | sed 's/.*\-/vpn/') - CONF_DEFAULT="/etc/conf.d/softether-client" -fi -CONF=${CONF:-${CONF_DEFAULT}} -EXEC=${EXEC:-/opt/softether/bin/vpnclient/vpnclient} - -depend() { - need net - provide softether-client -} - -start() { - ebegin "Starting softether-client" - start-stop-daemon --start --quiet --make-pidfile --pidfile ${PID} --exec ${EXEC} -- ${OPTS_START} - eend $? -} - -start_post() { - pgrep -n $(echo ${PNAME}) > ${PID} -} - -stop() { - ebegin "Stopping softether-client" - start-stop-daemon --stop --quiet --pidfile ${PID} -- ${OPTS_STOP} - rm -f ${PID} - eend $? -} diff --git a/net-vpn/softether/files/softether-server.confd b/net-vpn/softether/files/softether-server.confd deleted file mode 100644 index 8630a12..0000000 --- a/net-vpn/softether/files/softether-server.confd +++ /dev/null @@ -1,2 +0,0 @@ -OPTS_START="start" -OPTS_STOP="stop" diff --git a/net-vpn/softether/files/softether-server.initd b/net-vpn/softether/files/softether-server.initd deleted file mode 100644 index 410ecdc..0000000 --- a/net-vpn/softether/files/softether-server.initd +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -NAME=${SVCNAME##*.} -if [ -n "${NAME}" -a "${SVCNAME}" != "softether-server" ]; then - PID="/run/softether-server.${NAME}.pid" - PNAME=$(echo ${RC_SVCNAME} | sed 's/.*\-/vpn/;s/\..*//g') - CONF_DEFAULT="/etc/conf.d/softether-server.${NAME}" -else - PID="/run/softether-server.pid" - PNAME=$(echo ${RC_SVCNAME} | sed 's/.*\-/vpn/') - CONF_DEFAULT="/etc/conf.d/softether-server" -fi -CONF=${CONF:-${CONF_DEFAULT}} -EXEC=${EXEC:-/opt/softether/bin/vpnserver/vpnserver} - -depend() { - need net - provide softether-server -} - -start() { - ebegin "Starting softether-server" - start-stop-daemon --start --quiet --make-pidfile --pidfile ${PID} --exec ${EXEC} -- ${OPTS_START} - eend $? -} - -start_post() { - pgrep -n $(echo ${PNAME}) > ${PID} -} - -stop() { - ebegin "Stopping softether-server" - start-stop-daemon --stop --quiet --pidfile ${PID} -- ${OPTS_STOP} - rm -f ${PID} - eend $? -} diff --git a/net-vpn/softether/metadata.xml b/net-vpn/softether/metadata.xml deleted file mode 100644 index dc9c026..0000000 --- a/net-vpn/softether/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - An Open-Source Free Cross-platform Multi-protocol VPN Program, - as an academic project from University of Tsukuba. - SoftEther VPN runs on Windows, Linux, Mac, FreeBSD and Solaris. - SoftEther VPN supports most of widely-used VPN protocols - including SSL-VPN, OpenVPN, IPsec, L2TP, MS-SSTP, L2TPv3 and EtherIP. - - - Enable install of SoftEther VPN bridge - Enable install of SoftEther VPN client - Enable install of SoftEther VPN cmd - Enable install of SoftEther VPN server - - - http://www.softether.org/5-download/history - http://www.softether.org/4-docs - mailto:softether-vpn-security@softether.org - - diff --git a/net-vpn/softether/softether-4.34.9745_beta.ebuild b/net-vpn/softether/softether-4.34.9745_beta.ebuild deleted file mode 100644 index 6086c93..0000000 --- a/net-vpn/softether/softether-4.34.9745_beta.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LEVEL="${PV#*_}" -VERSION="${PV%%_*}" -BUILD="${VERSION##*.}" -VERSION="${VERSION%.*}" -[ "$LEVEL" != "beta" ] && LEVEL="rtm" - -MY_P="SoftEtherVPN_Stable-${VERSION}-${BUILD}-${LEVEL}" - -inherit systemd toolchain-funcs - -DESCRIPTION="Multi-protocol VPN software" -HOMEPAGE="http://www.softether.org/" -SRC_URI="https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${VERSION}-${BUILD}-${LEVEL}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bridge client cmd debug libressl server" -REQUIRED_USE="|| ( bridge client cmd server )" - -RDEPEND="sys-libs/ncurses:0= - sys-libs/readline:0= - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS.TXT ChangeLog README ) -# Prohibit to modify number of threads, respect FLAGS -PATCHES=( "${FILESDIR}"/softether-4.04-sandbox.patch - "${FILESDIR}"/softether-4.25-compile-flags.patch ) - -src_prepare() { - default - - sed -i '/opt\/vpn/s|/opt|/opt/softether|' systemd/*.service \ - || die "sed failed for systemd files" - - rm -f configure || die - if use amd64; then - cp src/makefiles/linux_64bit.mak Makefile \ - || die "copy Makefile for amd64 failed" - elif use x86; then - cp src/makefiles/linux_32bit.mak Makefile \ - || die "copy Makefile for x86 failed" - fi -} - -src_compile() { - tc-export CC AR RANLIB - emake DEBUG="$(usex debug YES NO '' '')" -} - -src_install() { - einstalldocs - - # Define local variable, strip 'debug' and 'libressl' USE flags - local MODULES - MODULES="${IUSE//debug}" - MODULES="${IUSE//libressl}" - - # Define installation location - insinto /opt/softether - doins src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - - # Install binary in accordance to used USE flags - for module in ${MODULES}; do - if use "$module" ; then - dosym ../../hamcore.se2 /opt/softether/bin/vpn"$module"/hamcore.se2 - insinto /opt/softether/bin/vpn"$module" - doins bin/vpn"$module"/vpn"$module" - fperms 0755 /opt/softether/bin/vpn"$module"/vpn"$module" - if [ "$module" != "cmd" ] ; then - newinitd "${FILESDIR}"/"${PN}"-"$module".initd "${PN}"-"$module" - systemd_newunit "systemd/${PN}-vpn$module.service" "${PN}"-"$module".service - fi - fi - done -} diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest deleted file mode 100644 index 6e5965f..0000000 --- a/sys-apps/dool/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST dool-20190910.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968 -EBUILD dool-20190910.ebuild 1278 BLAKE2B 0bfe164cb7afbd1b31a464e4645c585f253d84456fbaaeb0b4834aace2b973a70838ea3ec63ced3745613f7b7f81c49c04ae0cfacf59e799f52e258ed04ec50a SHA512 b4b5ecdf88a542d0a385a69e9556e423444852910f8788a0fad8946d587a9789ecc08eef298ee7a8dbf2e19f028bca74ed276e720b644e54b750f4e7a9fc0913 -MISC metadata.xml 872 BLAKE2B b3fb30b6fb84a1e571bb5e98be057145cb60d569af897a4cebd6378ee0aa30862895cdc12f452e6b50f11b70eae34b6d7931644a7e2aa9764a93e757888ca4a1 SHA512 a096e2a58480088661b4f3b6b0c79445ea0ed534f225d9111a1139b35e9a746654628b1d4a2c03eec42fd469ec47701120422e1fffde95023a6ad05d31cfd0e9 diff --git a/sys-apps/dool/dool-20190910.ebuild b/sys-apps/dool/dool-20190910.ebuild deleted file mode 100644 index 742b64c..0000000 --- a/sys-apps/dool/dool-20190910.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit python-r1 - -DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat" -HOMEPAGE="https://github.com/scottchiefbaker/dool" -COMMIT=6b89f2d0b6e38e1c8d706e88a12e020367f5100d -SRC_URI="https://github.com/scottchiefbaker/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -MY_P="${PN}-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux" -IUSE="doc examples" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - - # bug fix: allow delay to be specified - # backport from: https://github.com/dagwieers/dstat/pull/167/files - sed -i -e 's; / op\.delay; // op.delay;' "dool" || die - - sed -i -e 's;dstat\.1;dool.1;' docs/Makefile || die - - default -} - -src_install() { - python_foreach_impl python_doscript dool - - insinto /usr/share/dool - newins dool dool.py - doins plugins/dool_*.py - - doman docs/dool.1 - - einstalldocs - - if use examples; then - dodoc examples/{mstat,read}.py - fi - if use doc; then - dodoc docs/*.html - fi -} - -src_test() { - python_foreach_impl emake test -} diff --git a/sys-apps/dool/metadata.xml b/sys-apps/dool/metadata.xml deleted file mode 100644 index eb2a4a2..0000000 --- a/sys-apps/dool/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - lmiphay@gmail.com - Paul Healy - - - proxy-maint@gentoo.org - Proxy Maintainers - - -Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat overcomes -some of the limitations and adds some extra features. - -Dstat allows you to view all of your system resources instantly, you can eg. -compare disk usage in combination with interrupts from your IDE controller, or -compare the network bandwidth numbers directly with the disk throughput (in the -same interval). - - - scottchiefbaker/dool - - - diff --git a/sys-apps/openwsman/Manifest b/sys-apps/openwsman/Manifest deleted file mode 100644 index 4fdf4cd..0000000 --- a/sys-apps/openwsman/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX openwsman-2.6.5-libcurl-error-codes-update.patch 1162 BLAKE2B 59802194fee1ecb8786569c85f57fc9255456b43895a781dcac6a3cd903f106eadbf53f1de39b203dd9d61d6a1bde4dc2bc48cea28d7c704c08d71562d8503c8 SHA512 f887f52412d8bf1565cd6576340d6f81acad65c9977d56a7a9a9af6ba9950a025db0dffda0b767d2aa351ea7990f12dfeaa7d5f7b3c618982a8a766633caed5a -AUX openwsmand.confd 2 BLAKE2B a5cdc0d97724f51411f2f5ba99734c297507df295742618499a23296c99bac5d6cef25d497fb3afb76a3e67e4ac53d4b5bccfa55309d7b02ff5793bcf53dfec2 SHA512 a80f7cc2606ef6e5474e96b1e520c17ecf432f0da9a566bd157044130cfb548f10d929ffb5783008df78b6d07d07d109bffbad1998cb8309eccec7e4d3fc813a -AUX openwsmand.initd 263 BLAKE2B 246449862d8bf51dae573ff8bb4e4715284ba37de65be9cf226d001a081f825506256c3b1c1322ffa59b7df99466ce1fe35f164c993566023be7a1c7eed08d21 SHA512 bd20fc3815d02b0dd5a2c2336b5204550ef941e362f686ddb00f7f96d93bd2222dd4cb076f39efe2e85d3262356c548d0c9d7c1d566a04bba2c4a942126851d2 -DIST openwsman-2.7.0.tar.gz 513225 BLAKE2B c6463358c8b665a1019b4a4be370ebd006fb31c3a17abf2bf5f699a33fa96795d272ac687bf69dafab769301c21fc10ddb4e71744f7456dc8d16dbcc81d65b75 SHA512 e61792eafd09e3608c736091d2742049086adaf5fffcda9391e4712ed1dedf3a533546a6af61ea6ce49d4cf4fb3649cb168f20260c4e975797395d6e565c6c37 -EBUILD openwsman-2.7.0.ebuild 2482 BLAKE2B 20712d8a0243540808efcd1a278d0de033c69effee409637e09ae47f8ce4c5306c08fb5ba37b91479c3e23739db45bddd00a38bcac68ea071ff3e90a4ae23351 SHA512 9deb0acca133e77b2bce19177583cd207c5fda00c3d34011e074c659c93de1df77aa7f9381418bc839898825eb49504732432e39ab5b28ff531db3be2f366a9d diff --git a/sys-apps/openwsman/files/openwsman-2.6.5-libcurl-error-codes-update.patch b/sys-apps/openwsman/files/openwsman-2.6.5-libcurl-error-codes-update.patch deleted file mode 100644 index 82ee51f..0000000 --- a/sys-apps/openwsman/files/openwsman-2.6.5-libcurl-error-codes-update.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up openwsman-2.6.5/src/lib/wsman-curl-client-transport.c.orig openwsman-2.6.5/src/lib/wsman-curl-client-transport.c ---- openwsman-2.6.5/src/lib/wsman-curl-client-transport.c.orig 2018-11-14 13:53:27.442138557 +0100 -+++ openwsman-2.6.5/src/lib/wsman-curl-client-transport.c 2018-11-14 14:11:28.508714204 +0100 -@@ -186,16 +186,23 @@ convert_to_last_error(CURLcode r) - return WS_LASTERR_SSL_CONNECT_ERROR; - case CURLE_BAD_FUNCTION_ARGUMENT: - return WS_LASTERR_CURL_BAD_FUNCTION_ARG; -+#if LIBCURL_VERSION_NUM < 0x073E00 - case CURLE_SSL_PEER_CERTIFICATE: - return WS_LASTERR_SSL_PEER_CERTIFICATE; -+#endif - case CURLE_SSL_ENGINE_NOTFOUND: - return WS_LASTERR_SSL_ENGINE_NOTFOUND; - case CURLE_SSL_ENGINE_SETFAILED: - return WS_LASTERR_SSL_ENGINE_SETFAILED; - case CURLE_SSL_CERTPROBLEM: - return WS_LASTERR_SSL_CERTPROBLEM; -+#if LIBCURL_VERSION_NUM < 0x073E00 - case CURLE_SSL_CACERT: - return WS_LASTERR_SSL_CACERT; -+#else -+ case CURLE_PEER_FAILED_VERIFICATION: -+ return WS_LASTERR_SSL_PEER_CERTIFICATE; -+#endif - #if LIBCURL_VERSION_NUM > 0x70C01 - case CURLE_SSL_ENGINE_INITFAILED: - return WS_LASTERR_SSL_ENGINE_INITFAILED; diff --git a/sys-apps/openwsman/files/openwsmand.confd b/sys-apps/openwsman/files/openwsmand.confd deleted file mode 100644 index 792d600..0000000 --- a/sys-apps/openwsman/files/openwsmand.confd +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/sys-apps/openwsman/files/openwsmand.initd b/sys-apps/openwsman/files/openwsmand.initd deleted file mode 100644 index f7f0d57..0000000 --- a/sys-apps/openwsman/files/openwsmand.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -command=/usr/sbin/openwsmand -pidfile=/run/openwsmand.pid -command_args="${WSMAND_OPTS} -p ${pidfile}" - -depend() { - use net -} diff --git a/sys-apps/openwsman/openwsman-2.7.0.ebuild b/sys-apps/openwsman/openwsman-2.7.0.ebuild deleted file mode 100644 index 6acc087..0000000 --- a/sys-apps/openwsman/openwsman-2.7.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_8 python3_9 ) - -inherit python-single-r1 cmake-utils ssl-cert java-pkg-opt-2 - -DESCRIPTION="Opensource Implementation of WS-Management Client" -HOMEPAGE="https://github.com/Openwsman" -SRC_URI="https://github.com/Openwsman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -RESTRICT="mirror" -BINDINGS_USE="java perl python ruby" -IUSE="+cim debug examples +eventing ipv6 pam +plugins ssl +server test ${BINDINGS_USE}" -REQUIRED_USE=" - java? ( plugins ) - perl? ( plugins ) - python? ( plugins ) - ruby? ( plugins ) -" - -JAVA_PKG_NV_DEPEND="virtual/jdk:1.8" -RDEPEND=" - cim? ( dev-libs/sblim-sfcc ) - ssl? ( dev-libs/openssl:0 ) - pam? ( virtual/pam ) - ruby? ( dev-lang/ruby:= ) - perl? ( dev-lang/perl ) - java? ( ${JAVA_PKG_NV_DEPEND} ) - python? ( ${PYTHON_DEPS} ) - net-misc/curl[idn] - dev-libs/libxml2[icu] - " -DEPEND=" - ${RDEPEND} - test? ( dev-util/cunit ) - java? ( dev-lang/swig:0 ) - perl? ( dev-lang/swig:0 ) - python? ( dev-lang/swig:0 ) - ruby? ( dev-lang/swig:0 ) - " - -PATCHES=( -) - -# LIBC != glibc build fail - add block -src_prepare(){ - #Ruby gem builder does not like Unicode - sed -e 's/Kämpf/Kaempf/' -i bindings/ruby/openwsman.gemspec.in - default -} - -src_configure() { - local bindings=NO - for f in $BINDINGS_USE; do - use $f && bindings=YES - done - local mycmakeargs=( - -DPACKAGE_ARCHITECTURE=${ARCH} - -DBUILD_BINDINGS=${bindings} - -DBUILD_CUNIT_TESTS=$(usex test) - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_JAVA=$(usex java) - -DBUILD_LIBCIM=$(usex cim) - -DBUILD_PERL=$(usex perl) - -DBUILD_PYTHON=$(usex python) - -DBUILD_RUBY=$(usex ruby) - -DBUILD_SWIG_PLUGIN=${bindings} - -DBUILD_TESTS=$(usex test) - -DDISABLE_PLUGINS="$(usex plugins) - -DDISABLE_SERVER="$(usex server) - -DENABLE_EVENTING_SUPPORT="$(usex eventing) - -DWSMAN_DEBUG_VERBOSE="$(usex debug) - -DENABLE_IPV6="$(usex ipv6) - -DUSE_PAM="$(usex pam) - ) - use ruby && mycmakeargs+=( -DBUILD_RUBY_GEM=YES ) - cmake-utils_src_configure -} - -src_compile(){ - cmake-utils_src_compile -j1 #Upstream doesn't know about target dependencies, sigh -} - -src_install() { - cmake-utils_src_install -} - -pkg_postinst() { - if use ssl && [[ ! -f "${ROOT}"/etc/ssl/openwsman/servercert.pem \ - && ! -f "${ROOT}"/etc/ssl/postfix/serverkey.pem ]] ; then - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Local OpenWSman Server}" - install_cert /etc/openwsman/servercert - fi -} diff --git a/sys-apps/wsmancli/Manifest b/sys-apps/wsmancli/Manifest deleted file mode 100644 index 0d1079d..0000000 --- a/sys-apps/wsmancli/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST wsmancli-2.6.0.tar.gz 42913 BLAKE2B 9482153e3e0efe0b31d88f58862e6f9b3a0162dcdaaf74500fb6663e1502485a0877808ba517d6660226bd68d2a9b8d68351544c74f3eaf9ebe3172ce8502543 SHA512 40f69dfefd5cfc9c1d137c5c58bd0e84e1bb460ecb6770e1c56b023477f7521769f04e041682686d267796477704c7465d437f6fdb4068268a51d1136d5c8a56 -EBUILD wsmancli-2.6.0.ebuild 788 BLAKE2B 8968b9ac2cebdeecf38071e938335fda7d759c13c5cdab96f6703f6421e694842c6fbbf3c38db648b95e7f217a977153f64546dc56e8138d68a051f812dbf8ea SHA512 d108d48a174fe0709724b1db06d78f72b1187847fcf8b0df56146bd527019c053d3c61e95580a826715a61e96636beb7db7fb4c51b22723a7464686d14632f71 diff --git a/sys-apps/wsmancli/wsmancli-2.6.0.ebuild b/sys-apps/wsmancli/wsmancli-2.6.0.ebuild deleted file mode 100644 index 4773ec9..0000000 --- a/sys-apps/wsmancli/wsmancli-2.6.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -WANT_AUTOCONF=2.5 -WANT_AUTOMAKE=1.11 - -inherit autotools-utils - -DESCRIPTION="Opensource Implementation of WS-Management - Command line utility" -HOMEPAGE="https://github.com/Openwsman" -SRC_URI="https://github.com/Openwsman/wsmancli/archive/v2.6.0.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="test examples static-libs" - -CDEPEND=" - net-misc/curl[idn] - sys-apps/openwsman - " - -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND} - test? ( dev-util/cunit ) - " - -src_prepare() { - ./bootstrap -} - -src_configure() { - local myeconfargs=( - $(use_with test) - $(use_with examples) - ) - autotools-utils_src_configure -} -# TODO patch vconfigure option to work exmaples=yes diff --git a/sys-fs/wimlib/Manifest b/sys-fs/wimlib/Manifest deleted file mode 100644 index 4dc67cd..0000000 --- a/sys-fs/wimlib/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344 -DIST wimlib-1.9.2.tar.gz 1012703 BLAKE2B bf5759c6a409ceaa6042960949db7efdd2b8c78218fea8c9baf16026961c95c0c9fde5ff60ed0f17aa92041aebcb90cc24392787f5b2f2646b61384fcffffbc9 SHA512 89a030f2611d0793cc76e4974d55d995f8638129d9323a04a07ed40d3018dbcbde58701cd30946efa5eff06b4d5d236cd1710fcf93f874a7d2f801febe871cf3 -EBUILD wimlib-1.13.4.ebuild 939 BLAKE2B 444ee4685689452caccb6428f240ae26daff1db580ecf1cbd1c69884dae33e2fcda59a3ab6ab7db0a90b44de891e43af92003c06cad108c1201da952a12b2313 SHA512 339e93c18f98ab10606f1b866368f9a1e19d95ed275b5c87b14c8d8ae76b0586666025d014845f9b489c78f3706ffe646ef11e0a8fc6828a114fa0e2386954f6 -EBUILD wimlib-1.9.2.ebuild 938 BLAKE2B 00ceedbb62690258942cf5691da7b1e4c167fe3ec7f1444e914d09b0a9068185bfbfb92bfcf3036126c9297210cc1dac1a5c32b582e79e94a89c5cad56142b05 SHA512 41db069a9fc48a09905cba060421fc7c9d4142cf9f5dadf56670f07f8eba0a7cbb73b9e48d00fbf0bdf8fbd682f9981592480eccfed9a3690e04ac2e85bc0042 diff --git a/sys-fs/wimlib/wimlib-1.13.4.ebuild b/sys-fs/wimlib/wimlib-1.13.4.ebuild deleted file mode 100644 index cea6537..0000000 --- a/sys-fs/wimlib/wimlib-1.13.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils -DESCRIPTION="The open source Windows Imaging (WIM) library" -HOMEPAGE="https://wimlib.net" -SRC_URI="https://wimlib.net/downloads/${P}.tar.gz" -LICENSE="CC0 GPLv3 LGPLv3" - -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+fuse +xattr +ntfs ssl iso-fs +disk-img +cab" - -RDEPEND=" - dev-libs/libxml2 - fuse? ( - sys-fs/fuse:0 - sys-apps/attr - ) - ntfs? ( sys-fs/ntfs3g ) - ssl? ( dev-libs/openssl ) - iso-fs? ( app-cdr/cdrkit ) - disk-img? ( - sys-fs/mtools - sys-boot/syslinux - ) - cab? ( app-arch/cabextract ) -" - -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - $(use_with fuse) \ - $(use_with ntfs ntfs-3g) \ - $(use_with ssl libcrypto) -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - default -} diff --git a/sys-fs/wimlib/wimlib-1.9.2.ebuild b/sys-fs/wimlib/wimlib-1.9.2.ebuild deleted file mode 100644 index 34914d4..0000000 --- a/sys-fs/wimlib/wimlib-1.9.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils -DESCRIPTION="The open source Windows Imaging (WIM) library" -HOMEPAGE="https://wimlib.net" -SRC_URI="https://wimlib.net/downloads/${P}.tar.gz" -LICENSE="CC0 GPLv3 LGPLv3" - -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+fuse +xattr +ntfs ssl iso-fs +disk-img +cab" - -RDEPEND=" - dev-libs/libxml2 - fuse? ( - sys-fs/fuse - sys-apps/attr - ) - ntfs? ( sys-fs/ntfs3g ) - ssl? ( dev-libs/openssl ) - iso-fs? ( app-cdr/cdrkit ) - disk-img? ( - sys-fs/mtools - sys-boot/syslinux - ) - cab? ( app-arch/cabextract ) -" - -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - $(use_with fuse) \ - $(use_with ntfs ntfs-3g) \ - $(use_with ssl libcrypto) -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - default -} diff --git a/sys-kernel/mygentoo-sources/Manifest b/sys-kernel/mygentoo-sources/Manifest deleted file mode 100644 index 1796554..0000000 --- a/sys-kernel/mygentoo-sources/Manifest +++ /dev/null @@ -1,78 +0,0 @@ -AUX drmmm-4.14.34.fix.patch 3675 BLAKE2B a60cba32ebd87f2fe76103ebe240e0290b5d53074a8fec1d2be0da9bb9bf05190baddc5a4e034e0081c9053163f1f6b7b650e4c5b47bcda36fe18a27b1264f0b SHA512 2b7e5f07f9943026f6a2957780434835cf95338406bb62654dd458010f2e25dd1d9c58a3b50c6751b8e9f97bfa98ef188cbf35bccd0e5513c0f4cd0d72bb5f4b -AUX gpu-4.14.33.fix.patch 2554 BLAKE2B 935cad15dced2a40ddf13f7970c32584711bdde1b1ac43babf573e92a8e91621622bd73fcf38c6a8496e1a3d8c20a9bf09a717463232a44dce587dc969778c26 SHA512 7c74a3220894f607917987556cdb69af932e2e1c3889193fef5c6524a7b2b7d96731c095b063255ad19f1b0c480bd3f0c575768abf106eec6eb948c4bda133e7 -DIST genpatches-4.14-108.base.tar.xz 2499024 BLAKE2B 47bab0dad064f14fde3424e55d6d4fe686a83623c7fd7053843d3a4b29e64c6b54972f6f6208c522216c54b43ef59e16d631192b9c1383971a485e08410286f3 SHA512 3b16250368f2cfca9d29c925c70bb0ee3ca4f3a39db4928f3064375b2d5085ddcfcbfc0cc0e9f277b65dec5e1cc7e3274ed61ca299f05749b01aab906b8f4097 -DIST genpatches-4.14-108.experimental.tar.xz 5220 BLAKE2B edeed6f02c74b9d368976b4547dc62f2d9d7b5780156a0e1885aa7d057737922495b6d5b31fccc59a58da350c21e4555fad6a1a95a7c942a38b7efd75edc9fd4 SHA512 8462d583fd9bd30a1d9a4549730bbdb78a8634330be85ee5d1c34abd7bf1ba1151af8a5a92bd19ada6abcea8b44ee3de4c70ff9634392bbca9d18fba39a1b244 -DIST genpatches-4.14-108.extras.tar.xz 17488 BLAKE2B 19d2d5d1d24914745c2a491bc0e1dc7af8a05aef61803cf5ca8990abc3d843b897e2eb5784b4482c69dbaa8d360813129a9bb697bdc67b20765e6dfe0b814e92 SHA512 c6ac23b2dffdb3e5cba1856ca0e317361399370c494364e77e159b3dfec769230e075d41e030468e016588cca0b2fea64a9f52ee15318d94f722ef3433b11b9c -DIST genpatches-4.14-32.base.tar.xz 860348 BLAKE2B e73aed43c8c9128a2bba5d0ee5eebb29cd07b37befc2893d6cc87722f09f61f2b01488367e0a452ca65913d072dc7dcf6e79beebc2e490042cc56b3be4517054 SHA512 204a061dc8f155f045a8e146675656d8a5da2b6ed09fe5e98de63c448981e0eb69d4d065744a2f97d9a2bc04bb05d380f7b3ce41a82250d713d667da48c2b0ac -DIST genpatches-4.14-32.experimental.tar.xz 5188 BLAKE2B b6904102cf9636b1ad30f69f8cf82343f08d8b3803ae8e4db95a0de93f5dc5c60c1195d401cfb7c571840c8b636a71344514122175e94bbd6a1326daa799c229 SHA512 10d5d49af865d6e87197ca004ef0f46c1422429e9ecc23a8c4c971098e1f10a292ff051e6126916035640065ec9ea2c1f3b9262ac88d72e06afbaf151b90ffbe -DIST genpatches-4.14-32.extras.tar.xz 17492 BLAKE2B e8a5f33b2d0ad9f78078f85f572b2387a88db205a6f209f7ae3aabc7e637b4b83d086880f22282f92080b2ab9c0c8cdfbaee5094170b7fc6dd1df7d86f18cfcf SHA512 a284dee3cf3ca96b89c615b155bbf47dcca638895638312a32118f3357e72b9607aa2dc6605f3db2e3785c5e4c8a011e354e63601a7b86406ede00728f521263 -DIST genpatches-4.14-48.base.tar.xz 1222408 BLAKE2B 8870bd2081a385e3243c18e96a9a89c768c196bcc54e188f1793bfd48f29e8994beb0b787f38b14db2ed459aa53845074fb5ddaf3bed4d6e39f32b479b0651ba SHA512 e4c4a84feecf0fbd8392fa3981d7276aee2f40aad3a2568598146e935973432670a7f3c32fda09f4bfc17ee5273fd0a7e0b6fd2f4531a10336169586da085640 -DIST genpatches-4.14-48.experimental.tar.xz 5184 BLAKE2B e0fe9fcdb7c1f5e648791a3e686871f2c2951786092a8ebf97b84bb79e80521e3baabbe4a0537b72c2bf5641b2cc292da0853b46124c46bc69b106e61bed1e3b SHA512 d845805a394c93ae5d0ecf22a4c9902fd2d3b1382fd791b0431b5ebead9d3e580759c76a1c95b63f444b8246437dec300a79341049d2573ecd4af060e7fc1f4d -DIST genpatches-4.14-48.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14 -DIST genpatches-4.14-65.base.tar.xz 1677072 BLAKE2B dd0f4496c545b357f67cbb9ead5785bdbd19bc16081a2fbb4a8dafa4d92f201db1add3ea5a69c5185797baa780486420494bc44f8298e7c6916c9860915937ac SHA512 a24c414ec5f13a4805ce1d8acdf261c1d49a5ca5fe4b5c5f16cf64b02816efd10b4008ca13ea5ca203bb214e6dc2ec262e87db9a3e31c94a84d00f5de43c35ee -DIST genpatches-4.14-65.experimental.tar.xz 5224 BLAKE2B 7435fa53f9278635a316a403a4e3ee03ec585338673b3148ef69190901e52dfc1c8cb19a0600eaebb54b120e65c60bb9b688883af33eb0240cd8623f7fea771c SHA512 c1024431a43cb397a65eec12c206ec57cbcf267364ad8dae4875e6ccfa90b955e468907e440db25bb93610898a7b8f8a99dba5ec542ccd850770963b1b5785bf -DIST genpatches-4.14-65.extras.tar.xz 17496 BLAKE2B d156cc7b5612ee7d6d5faed0e606a0c8ed49f952cfe77097e37e432b142b8241f3b9fab156ed71f716540bc906f21050c2901b067b3ba1498893068ad45cb9e3 SHA512 8f3c9098a559556d3e256a9b8243cc5886387f23431501093f3c0ce9599a93fb885c5056d28b9189cbcd693b4c7e3601827abd96e548e659b4a7e33bd3403045 -DIST genpatches-4.14-69.base.tar.xz 1723168 BLAKE2B c0c9cbf34647abacefe97a76962f7b460ee3fda43a6530dd4eb8a380647842d7508c4e190aa05ee2eaa372e557c4528d1d36100f4a838727e633ba0d41de0979 SHA512 16b38854b1bfe9cbafa4feacc77dd88bde74e9d860db08cb143e2917360d80eb71bc298517b325eef1cabafcce0f35f0debf95e9122a6a016b3381a104a38e27 -DIST genpatches-4.14-69.experimental.tar.xz 5228 BLAKE2B fb72699292780b650d892e7f4b2e5ea96825023bda1b1a8640a6d7c7a428371e16e2510d9927b76bfb3020937ac295719658dc1bbfca1ecd83ba30f3c4a2b392 SHA512 10b096bd29e0f792eaa3c09106a89987b73812ed20e37a6becf5b817e856cb79928c3ec24a71a05dc69447ab199dc63ec82f4e4023b8f506be4f5a07e90e9cc3 -DIST genpatches-4.14-69.extras.tar.xz 17492 BLAKE2B ff0c08ce223b758746b57a7f1a3acd54499bfc9fcbb8bb41ed090d8397b2e3df61791b3e2159d97f43629e351bf722a500c44338d4d88c6818ba83047ada273e SHA512 876f1b98a896c46a5ed0ed76c1adbf1ae4884132d4f4a2c1166fb546cb3aa1de580be9cfd64e9d7e8a3193965b05603350b681ff9f52eb8799a8342fe288cee7 -DIST genpatches-4.14-80.base.tar.xz 1970464 BLAKE2B cdb1a4c7f6b6412e6936be19bcb4f429c035b5d46d03c2aeb8a90d588eafd7427b5968ff42f8c44b6332e53223f4da0c6e46d8891f981a3180fadb3a9c455c37 SHA512 327a2bf6effe3479a202e6a6bf8a9318804ff84f53050f786546d6d1fa265ad068a0fd4df5c1d64724f613a076c10d305a48f0e68ab2f119fa7e9ec0a200f979 -DIST genpatches-4.14-80.experimental.tar.xz 5228 BLAKE2B 0ac2b4b56e615216918d7f5739668223d4692a9dd1273202c6b346f223b149e306797693c1ac034e4316102e774a472bc8872c9486a862f841f20c0f13ba4d4f SHA512 9f143960a869c2ef2ab9ef31dc73de3f1ea9b1a34ceac332f6e7ac448d4380ceb7359b9014298a6f17cce2d12bfe270b2af112dd60a7feadf994ad28d5a717da -DIST genpatches-4.14-80.extras.tar.xz 17496 BLAKE2B 9668753679261522d678778c29b3637388624ab6a8ae1223241c5c47979083caaa37b4926d7239ff574977c29afc66c7147a34eb42538f1f10fa7b5006fdaea4 SHA512 0459e6453a44ae88870890756b9e3a852b3da0356c3df723e4f81593a52d85b5547ce18470ca831f3f0eeb43feebbc5255167c8a73e69d6b94719b4b2167ac86 -DIST genpatches-4.14-85.base.tar.xz 2050508 BLAKE2B 3d4b9917b538d6f906f8112cce00d06e07d09783fce9478ce7f166c900707d56cc147d30ffe4dcc6f26c1975881aa2771dfb76dd21d3580dc47430c035d6d850 SHA512 23b1b30c43e78ebe57c7dc06fb6a6aea035b1160d421c6577eaeb5afe0eb8c72390eb5b33e708990f3c0452fad4678946a74279f3e9ba547ebd385f59bfc6ead -DIST genpatches-4.14-85.experimental.tar.xz 5224 BLAKE2B dcedc912566883c0c57934acc23a8c5d89c95d14bc3e6f52b715562a414a535896774f5e184c1c83f1d601c32231ab3b98579eac848fd6a71ee7f833a044088a SHA512 6beeb2a40e8f668f833da082d79fa33a3901891a7f062fca56f4f6182fe6d6368466ed9eef4ad1daddc62b383ec5aeb8189b09577b33fd39be9b53e1e53c920a -DIST genpatches-4.14-85.extras.tar.xz 17492 BLAKE2B 220ed00e4813e2b94bc1815e5cdca40409239864b1447bc7eb261a37a6b132b92935f0cf1a01749d4d2b2522c7e932c2e5fd3eb127fb0d09b7b3615dcb8d531c SHA512 fa0cf06245bb72a36bece9cd98daa55ae49b82e08ad5bdd3474ac6fd875f43278eaaf85e64620c120856700222e4f8b61102cb0349566be3a2f39e561140bd43 -DIST genpatches-4.19-128.base.tar.xz 3579128 BLAKE2B 3826eb7e22f0c03382d3c417d9b58bd27f86ea2f06e2569f7eb10ecfe031c5e9bcf12dc6522a5bc7896a0777a4b3ac21ae89f2e9c9a75f5f8ea9539ac7193b36 SHA512 b3fdd7120bb07c5b8da15725d20d6f7d7b877d9b0aa4dea0deeed92026a958362cd3741dfd407129e282aaf3ffbe1257fbe1e2c77c640cbe7a78894c307c6ecd -DIST genpatches-4.19-128.experimental.tar.xz 6432 BLAKE2B 94f7574d43c1c970c21b581d9b52ee1d150a676ebbdfd956be06e9f2af03d44128e842b88f47f92c219751f6552b480399b02e88f63869c6be4762905cce9e56 SHA512 be0a40143e569fcf3b17126b21cf8d74453a6009875f41e891691573b8026bf3ca85f12ea49e46951a5c9e0dd8971f72f3870fe756a7c916918400631d2b1bb3 -DIST genpatches-4.19-128.extras.tar.xz 17524 BLAKE2B 885ad7ab0be8ad9c2f2094e8dda22ea8b5a07dcf2da1478f1e5c6c5019b32f224dc589b5a9fe300e9c55dc2a462f6430e55d72eb130c52226ee58302946a6797 SHA512 e732168665d86658ceb92d0dbb5794c9dd441fcb09c6a9a28208668fcf63830da118c247156e177967016900e08e5754cbc573672ca90728447263f073c7f4f0 -DIST genpatches-4.19-151.base.tar.xz 4004372 BLAKE2B ab830d3f5ae37f48d4aa71e6b9913498397c00fe17630184b7283b42415ed55b2a3fe0d9d3c619923f43c8e244b476ed28916f0dc2e44c53dc8022a21ad152f8 SHA512 0b7d374b9dbd90f99ae73537e543d19c253d219ffea77e56a1c6825516d94f5bf4e2d85323f5a7318e0b8b5233e8b7363fbb2962e60c09b5c9825b1718bc7ae9 -DIST genpatches-4.19-151.experimental.tar.xz 6976 BLAKE2B 136a9a1f5de573917000f3b41f28a6bf84b61588cc8d61824d43df5fd191feb4608a55e5418633f18df9002dde899670a03b9713feaddf6b60b64c207005c256 SHA512 1650b33e6a3a431d91c3d9f054bcfe6a3bf3a93d2eda87beb23af93846f4b04ff8b67f31e71361584bd8963e2cacdecea7c33ad15e273c3b708aa353467afce8 -DIST genpatches-4.19-151.extras.tar.xz 3316 BLAKE2B fd6adfc4ce72c3a84b4821c6adcc79cf421e30609c1556dd9534b851faec4b5eb92210a48d2cf5e3c4a34781fefd4101ee6ede03808bbccd5aeb5875cc9d4515 SHA512 288a504278449d0646377e9e6b5191787fc218d5912a2298b7243a0cf8cddb21a7108449e9868f36c6e97e43081e8eafa880093ad1d87673f670042e31467e59 -DIST genpatches-4.19-213.base.tar.xz 5023460 BLAKE2B 108643587a66448ea4728b8ac22e8e68474f262bc1d037d10a038762b7b327a7d696db028bd3841dd47c0e5b5caa25e143d8cb010b08398d471167bbfe49e2c2 SHA512 48e4d89f13e025b4322e3a71376ccb065b0a21f5350344e9d82833397f1425e0ea9665c12ce3cf1afb43e639d8517d8f721714780a711da8d58d8ec5e3d043d4 -DIST genpatches-4.19-213.experimental.tar.xz 5460 BLAKE2B 6edd7e612fb2a0a729756f33f056b8f5c05a91fcacf2651535085d1375f7f442f369850a11c3fd10e49281c1e06983850ecd2c5258a5f3472de44914ce74ebdb SHA512 a922ac258871ef2892114c4313084c509b693aeaaba910d123b4c23cdfe5573556de28218e05d55671e462963e402a65234ea20718fe812d5c1ceefe18c867fc -DIST genpatches-4.19-213.extras.tar.xz 3664 BLAKE2B ebbbdfbff438cf7358528c3fad45dd9e6bc004993263d72acecd1267403fc58152abe519276c8e75336cc8a89b7bd61308b5e8d5254d11aa040c9154c058f264 SHA512 e2f864f91e8dd10730b47f3888d212987076aef647c3fdfb2c8f062aa14739c3f2a0fdd86c27d1aa835c6bd6baba1b5e0a9122d65b36fc6da22fb8c1a3c27200 -DIST genpatches-4.19-23.base.tar.xz 716484 BLAKE2B 2edeeb338869b57a90517664a89e1d031b996d2c21d2235a1feb260c911a885826b049e260a25521848f9f11cac363df7307e30c77bcaad513193a9a3c772285 SHA512 fd4b57fa9bfe6867e570ed028ed220af5117f2cef343a9ccae2e1ab0ca2f0b27b6d4cde2938d0828644331bb2594d5acff9755b56eac9f83b2d8bfddfe7ac0de -DIST genpatches-4.19-23.experimental.tar.xz 5224 BLAKE2B 85b88037a13b8d5ceb9a5f84d413c2da723178418657075bb436dd7c682836b159d8a4e311c3267140c2936cca1a4149390f8608e66eaca54b2bb622b2a68cc4 SHA512 da6afcc4d230907ff72486fac5a40a31dd11c7ecdce428b9a19f0067b1f6a0c21c76ef72f24c18e36fa77ea4dffe9fee917c8e18a95c5e9911635ed6bcd50a51 -DIST genpatches-4.19-23.extras.tar.xz 17484 BLAKE2B 2ca6355134f9d84b5c564185244ec1ab0b84ff81ba86e425154247e23ba1a73434e5adc55ec495258f15c5451c634d7655d4be7c7b0e20c2a1092385a8e18493 SHA512 bf3d8f8edc009233c4b6e485e050d0cf3f2e1d260af2e045236884b18de0d997c032f10486c17c4a8c24d566665264263f8cae2bf475742ccf34df4fece2dccb -DIST genpatches-4.19-35.base.tar.xz 1040668 BLAKE2B d96d03e4aacf66dd5b43866c959443956e36c1cb357807c1344684e7dc4b467bab3508214f651b145da72c0645fb7b5bfd89ab89281f0a41bf3882c6053f595b SHA512 b399ab1aa6153f3378e32b8958eea182e18b97aa5bd5d76690d88ba97d8e9cf4b44ef9ca2fd5ac60ac96219b26d0657a4a506f536373c1fc03b0d67314fa5418 -DIST genpatches-4.19-35.experimental.tar.xz 5808 BLAKE2B 788e53ed6116f24a76345d19d6c25a979b1802685d56725c6313afa72570c37067f6a61659dfeae8a2887f21d29d37e9e5bf21d78627bf539c2940f91032a5ae SHA512 f4094fa73c8149a3eadbb27071caceb926926c45ad0dfb11c936b9a6b89ca2f75d3fac774f44a392147e3606adaffce61237ebb61008961569a46eb1cc74ebf7 -DIST genpatches-4.19-35.extras.tar.xz 17480 BLAKE2B 92f8254df7b97efe6130f5832076d49dbbeed1754e3344e66328806f67de2b3e3ffb721baa40e7fd3454210867d98ec8488061eb45ed83eee03719373046fb39 SHA512 c84b3ad8fe5c347c27dd9c59672a998f0b4dd8d2183bc692144e19857070e9609d054bd2dc622468dd68c50c9e86ba74db460fbd0e5474caf09364e5e430ad26 -DIST genpatches-4.19-45.base.tar.xz 1284916 BLAKE2B d4bdbd0392400382d6baa9bfef5f71a43737aef688037865373eac04802a380c60265a6deaf3889702b5d023d695e30ec049bff0ddad74543ce8bdde034f29ba SHA512 82e23dbfdda4828d28fdbae5526a07e36a958387115fbb5dc9e6825439eb3fdba8602d490e0460e84cc2b3c8f21be15107a4db2aba73d4245b2a551f2010a470 -DIST genpatches-4.19-45.experimental.tar.xz 5800 BLAKE2B 66685ef52bc6ec8d856e66c2f96c1e2be0e6054c0ab126078e74d0f99fc4fbf6a184eeb50791a4d49d0f2e4c34d569d319a938d6c9bdd932ec549db2b274051f SHA512 89fcfd336aab90d068a02da9fbba85b954f8fb728c5fa9dbe8478300d32780bbb375929b31d18a032f5ec74547b05b40df3ce42c0236e67f9b9fed5e7c1a250e -DIST genpatches-4.19-45.extras.tar.xz 17480 BLAKE2B f69d00cc9948456df19b0bbcad0f2c1767aa28e985c74fae8f2d702f8bb075b25b0132d42678820946075ef9373b85e17801c97c654157d656f6c9d34750e8c5 SHA512 71f9f57ca59026a01f5f4dcd7ffc7e62960328d4b5fcfc9e561b5d6a1073f90604f510e6656128fa6a2c23bb847b65643094c4b1cb20224a83611778d7aaac31 -DIST genpatches-4.19-57.base.tar.xz 1555700 BLAKE2B e1d6d04de6b22dadf737a927883580aff444d18e2b16010ea5b0cc64a7c14f66615f6bbe117edc3b4a09df93e70b2b4bfb2183509bc539922da82de3c59fe508 SHA512 598f7f85cdd5f63e9cdadc2e33ac556e71a0711bfbc518b7f1b0f77f76c65a68c4844a160fe7092f7c2ac3b123c0aeaa147064007fae03ff97b3e1b16ee4a01d -DIST genpatches-4.19-57.experimental.tar.xz 5808 BLAKE2B 44f72723d72260c39200227610fc4c952bac4e2d767020ad69f8f58bc68e154a30772e612c799aef4f0ca52906cb02a326275dd3d3286c6f0bf846fd3303e2b2 SHA512 94a00f9b6c72486f869245176e311a6fffd6d6b4a0a3b533b19b25d4571f8c149d0ed34a90357cd43135596f9901b25af7bc8cec9f8bb78748a12082a48f79bb -DIST genpatches-4.19-57.extras.tar.xz 17476 BLAKE2B 6ba89592e66f964600d509d1ed4e01c5e59dbb00df75cc7fbde3d3aa6505e50722c4d4b565df03a595dd4fc55d89ce133421fb7e29816c751559929198d3842d SHA512 5e67c9f60306c915a1645b522039c4f4436073babaaae8029beb53104f407f242d8f6bf539b4c54e2ce9494fb271e5bfa33da1e3992ae6e1ecb2627aaf216cb3 -DIST genpatches-4.19-85.base.tar.xz 2403008 BLAKE2B ed31488bc37aff8e5a7e0491f9b4ac2d70689c9d47c219f001d6900b0c79792cc0dd82e5e368924193be93d747e8a17931aa462cd263e6c517ed8ae1fc070ddb SHA512 6218d1fb01617544f3218b451fbf0ff2b166c861621bb782d00dd01a28a51c97685b44d19f1a2e8da0b8d4178eb38adfc8047a98a2931558f1ff4f26288b8323 -DIST genpatches-4.19-85.experimental.tar.xz 6428 BLAKE2B e1f94a7fbb0b72c9d43d0785f212a4d739e086eb6338e7fdf3979c9055c69908a388e9c2f5669eaae6ac8a9adce14dad11d450878b0dbeffa8b5316513f92b16 SHA512 ca204d8ca75278e72648b8e79609b533de9de7635e3602476773f7040ae493c6e356de08a60588defe9491960b4ac046aee5813a25dfcb3eae9779b720a341d0 -DIST genpatches-4.19-85.extras.tar.xz 17500 BLAKE2B 869534152df10ea77feb65211729acb49d98a6cf28cdbfe8f4faf0c6a14f788ba1f7fcd868da5571195a8aeeee083c7257e9dcea628708cb8dd370cb9af6165f SHA512 9931dc1de3062ab85a14bcbe20007d5bc1b15cf1a77570076637df0311615adc763ca91e5d13052f812237f489d7e4c9a376395c547a926be770f787740d9581 -DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7 -DIST genpatches-5.4-135.experimental.tar.xz 16912 BLAKE2B c234446b36bf86e724e8720b365197a1069a399eceeebb94dde9cfd89e8675e256a770c80ef1c179c16adb13d0addb72677ebea436fa8277a4697f5f24c75a3e SHA512 3af8e6bf588da4cff5ee24765ba2012b470e3147f54fa04acf23143f0c2ea382bcc3e4cc283bf7edc67cddddec9810bf7a564dc12a40928b2031048b75307f09 -DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77 -DIST genpatches-5.4-160.base.tar.xz 4078816 BLAKE2B 478bc44ce285e02c37b4452fae6948ca61d0ae841328444e91403a517d398c416cd91a232d057c27a2c3994df19626475566e832457310744d20b700a854ab43 SHA512 ab1500a95a8f9295a6f5ebb7f9c0beb24bf1d0f6d67ca03e1135dc6724e74fe33f5025fba96ba2fd1d96078a20e5099ba1c1e0f1be149d01ebcaa991ff5c2dae -DIST genpatches-5.4-160.experimental.tar.xz 16900 BLAKE2B 70a2f442ad7309b617b0dd98a00e35ec195674a3dbbb5b88afd404fe1672e32a0b28182f6646ef325166b8cc9fda570104045d96afcf316bf13bc80df0ed5d68 SHA512 3f8cc1082156159bb7100997de0f0ecaa440928a0eed9cf81e3ad93fe2b6e10f9f180acc501e9bbf816a8e05c07d15d94e5719dfe48b829f5045861a4a25e4ef -DIST genpatches-5.4-160.extras.tar.xz 1784 BLAKE2B 8184089c122bb794bc18181ed165b2d03b301f336730b3579c92780b8a551d75963051a0c3c2ce8015a8e7102fda224e7a069ddc5fb5ea90d313637879602270 SHA512 f304a0b349c1a2f42297595ef732a6e31a7babfc71031b56e7e81e14b030cbbcefc25b49429381b47bb60676f63a3ca86b24de333a4ca928825fb2fb59109839 -DIST genpatches-5.4-99.base.tar.xz 3064716 BLAKE2B f71d76c88a9932d3b0e1b45d065fa0946f36a3100e3b59c5ce4c373519119066973067e4bb74d094cd5b79e689affa4615faf40da75a730b62df2259d3361c43 SHA512 833a83d7aecb1a216783fdf57e0fda342fd481c74166d976326a8333dfb2a13bd61f1b20b749f17b3498756b6134f8538a971507427f4e955bc9128742a3be5f -DIST genpatches-5.4-99.experimental.tar.xz 18092 BLAKE2B a6263f1dd87eb2f701e248ce34c48251cb3ab796fc38ac4a9477c14528436eac0a767a3f380f634f8a68b987dad500b3c11ddba873982e958b0c8d14aaba2691 SHA512 995c465b79f4f67678c325c84abf3d66970b2e3de786b1b83863b224f2a83335401384f236a71b9294daa6a2d815ae79c6b612b0e157463a317c507e447eda76 -DIST genpatches-5.4-99.extras.tar.xz 1772 BLAKE2B 6ffe84c928fc61b306d3e9a096470c090b79bfe99c90981b64e324d40157e818b50c0aebbaf342f51eeba29867b8cf8a6e91394dd594c1ecdb4f2a64f8d76e00 SHA512 7f2db3353809e7922951e1e884d7fe4a426556750bf4e38619278185fb09d519b30a972f4b5aeda3f7aca335fc95372edcc5dadd0881febbf43403c4d5c1c497 -DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 -DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -EBUILD mygentoo-sources-4.14.102.ebuild 855 BLAKE2B e2e6e00f2a976bafe10053232efcd89117d42c4019efcec105bad7a7886085594b45be24dd5d7d53d15315fa103a70b1f46c15ce20661200ba9be2304276a795 SHA512 67e67d40ee0e6ab20a690162c9fa9c5111e69f0ae955532a732697931b3be382fc9fb2a2c6e0864e63180198136957ea40444008a65c9699bb8cf7c9f23a9f18 -EBUILD mygentoo-sources-4.14.27.ebuild 740 BLAKE2B 2e6f24837f1c25ec51b145a3a59dabe0e638ad5f3370668bc41baff215537b8efe9fa57f2955e0be0ce827cfcc39adaefed6fcecf8a8f01857ecf00e80a52e9f SHA512 9381bbb6f08ab183b865450ae0add739665692cb6d8c31e1e32c7ca39de00ce628e9f3a9ac45d9d962bd3093b11db0d82f75fbec49bb1ffe2c520ea57f88beea -EBUILD mygentoo-sources-4.14.43.ebuild 857 BLAKE2B f595def727bcb8a621b643b91fa2d3552f3ad13cdf55b1d8127f0fcd22d2d4e4d4f3aee5109f90fabd7bb74c83d7631604573da88da646b43096340df8e27ce0 SHA512 18a427a82e24bd34816026eaee318fb9e496272c51d80674ec91e4c6ecdb1ebc241268e8f8ce744603ff0163527b24011b6a11f3f84288db1df25edcf13a5e67 -EBUILD mygentoo-sources-4.14.60.ebuild 857 BLAKE2B bf1915e131963da4454104d22a58d03650ae1121cd4f38aa925a72895fe419db8c695e43b4d2db1b91636f24f8f0612f321f38a4f2838c191d6ff741e8070cdd SHA512 83c1ceb49300685891756df27e8b7941d1e44bd91e3412bd7d5ab13d60c1706b9cae423344fcf2bd512e388c2a53f818521ac305b2e550e2bd0296fe2d214908 -EBUILD mygentoo-sources-4.14.63.ebuild 857 BLAKE2B 6ba687158cb8cbfdfac7083b59e2f43922dc7b5b55dcc2b832072fdfa74e4c12a1f7b72e8796639b8887f8194f13304ffe2cef85bf4e0fc52ae4e10fca44ac30 SHA512 8b79bbc8c9b64e97aecbba1705ced8eb4df5560a3c68c76acb52b89662a98a721ad1a6bf9aa9283beb9e7da709fb812acf0c4c717b6b219c3f0a25fb4d95b8e0 -EBUILD mygentoo-sources-4.14.74.ebuild 854 BLAKE2B 5d2d5cfc1df2ac75be8a2ebb0c6adf504fc9ebd727cfdf7ba40e918cbbb3fb26c7b5f7633c2d2d2ff6574b7413a85628065d87eddf02c7c6238b61bca88b27f2 SHA512 500dcda14a730fa3edd3cbe7fe595ea138db87c858a34a0099588047047fee8485f8809efbb56b6d6e8b7469ee4ac9e4e3deea1d9a06a69b065e094158ca0ebd -EBUILD mygentoo-sources-4.14.78.ebuild 854 BLAKE2B c71408d78ea7f8545ba6322a50c9d20069adfa84564ae1595b3323267c7c1efd144be8fb71e06c5d24943d81be9b3dc9c421011d4886e53bb2397401ec639e78 SHA512 c020988a0770259a766765f9379ba7713023362a4d5d6c98f2d057cbc4460b57634eb4d56c6fd698b26778150e586c2c6e54732f82cbfe98bff60900b780cba3 -EBUILD mygentoo-sources-4.19.129.ebuild 730 BLAKE2B cfb4dfcacfbd15945d4990c23342cc97759c4d9a9a480e99964b045f8af2b0e3957ae4ced08ee294579755ec4b2ea864fe4cd5461c12cea8c04c990e81f5a022 SHA512 7a5b183017703855298b6485b9babbf044ea7d51e7420cd55d4c4b1af6f546d0556531c5745e3550931d2cd0d35999588814ac785644958586c10a356f94b27b -EBUILD mygentoo-sources-4.19.152.ebuild 730 BLAKE2B 4d4e2dec06821a9a4872bc8daca04056713c505fda277bbe4f807c1f70c0c9c73096bb5b4273f436f487cd15db278e7d553a0315c85d59ac0c042501690ac510 SHA512 04407efb44b0ff95ffb9d60abe8b0b3dc29483c5c087d1dda236214f5d9255eb075f862d098e0d6547a98719151caaa9a3d6f0092ac75bc7cd0e93d2faf853fd -EBUILD mygentoo-sources-4.19.214.ebuild 730 BLAKE2B 63f728d420b9676ec8c4f2af540c61efb74ec8b47abb99d4e95ebf926d9d4d345463f32f7ddb622660b476cb9ca3d008d3d656358e7a11a4d1e11a1c19f48d06 SHA512 fb9504bda5fc1c89e3141e910c0c18327fbdd45e674392e75164a35c536a0096bb97ba3790fb40b1debd65415a0f1d2844944aed43caaacbf9f8c49e64a51cdc -EBUILD mygentoo-sources-4.19.23.ebuild 733 BLAKE2B fadeffb3ca0b67193beb4e3da7b25245911988e78211bbdc00757560fc9f280fc090316855ab4e3310faaba71100da755baf9f839998be1ac758255b3e08eb22 SHA512 931b3b5b296cfc211fb5b297106bf5fe8d49ee5182266818c25f6a9f64ed26247b9475e9ed42a9ae443a7ee0edafee38d40574301e64bb84b6c1d20f5b485ea0 -EBUILD mygentoo-sources-4.19.34.ebuild 737 BLAKE2B 5022e4fc9749a99212dbd09b7dc6184348c2783dfff0a044de0816844ffcf802be78a7fe7a50d419264a2bfd8bb3628b72ff1133fd7fd78c385c07adbf109c5b SHA512 98964ed7092768f9cb3442298a9b1e789eee5f315f4bd75ed37aabffb25c871a9a6d1ce2434952e718e1a4c4543314eb7ae069fcffae8689d284fa9f469ded00 -EBUILD mygentoo-sources-4.19.44.ebuild 734 BLAKE2B 994f79e6092e12073a69ef4cfa8138c8e058718c8fbe8926c65479faa432ddd41232d8f717ad4299b38a0b72f8ad7f62fced05234a4720fc989ee76602e2abfb SHA512 23eda446e264b1927f24422f1024d051fe37188961187d336bc4f974616fca22b46e61630a6c80a19e164fe1b49b665953c157b7d06142d40498f1caa53b6897 -EBUILD mygentoo-sources-4.19.57.ebuild 736 BLAKE2B d1313a6f93964e3b7a6c75b4f5639257ab53944b7948cbc9b085821250ef936b966b84ce09764215de24c54e140f64fcf442fe99137aa9a8afeebb7c3a6e0755 SHA512 5fb41e306243da605ea8eb1854ddadd38a36eac3b56e66a45ce0ca609b811048ab27916977a6ac8089326514f6e951dec219fbac9e39da0969b0111601ae3904 -EBUILD mygentoo-sources-4.19.86.ebuild 732 BLAKE2B da3cd68b2829e6aed1f8ddd84dd0641dd977f908d8566555cea8c3f7447a1d01895562bd9d3a73a81827209f2ef16f60053f60e937b5430581f4953c702f669b SHA512 8bf105a5d938d3bd7a2a59b1d76862d67f676322cb20ccb64545ebaf77c0a6009c2a13b689d029082b5652f96882896bb8d7ffcc18712356be4fd1220605062d -EBUILD mygentoo-sources-5.4.131.ebuild 731 BLAKE2B 351da3aea83b95dc4db3723394804986b3a5c4d530775c156716d6de8f821f82ba7afcec66dc05d9612303f2c593621fd35116841625ffe8d06d0ea83dc0d2ec SHA512 f54d0ee21a2e138d844f36ee3f5f09b146c6bcd0b3393dca39b2e9a38a44809fa5ac0d8d7fe226c5dbf70f691c4bf8945eafdb1df98deaf9da46d8de9a2e5884 -EBUILD mygentoo-sources-5.4.156.ebuild 729 BLAKE2B d490e0fec0a906e43b7cf009bc0ef206bd8cad29eb28b8168301f7e237083a9cd36665382ce1c02566354a89bd4f9409ccdb55d3def41e957141c397c42882af SHA512 863dfd211b3c1d0ca31a868cc145f50ab9778b434230dfbf414331836b4848e6924da8cdff17aaccd9fdc2173eca435695ba943649cbd7bf7e91dce7d57d9a26 -EBUILD mygentoo-sources-5.4.97.ebuild 733 BLAKE2B 9d1b1a56dc1e61273732315898999f0583fc7a5785e088b7b34a0e1c822fb016476cee5bbb348c3b2bbdc4c8a139da26a3f2ab4d867431ff38ec678c0b86ce84 SHA512 0a7bfd516c978a4ce5500f39a354d6983bb544584bf5ca8a4f49d5426ea3fd379f03d3d4e2099d3c45fa6ab4709896bed5146fb126af3786e6ce1c524730c3af -MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b diff --git a/sys-kernel/mygentoo-sources/files/drmmm-4.14.34.fix.patch b/sys-kernel/mygentoo-sources/files/drmmm-4.14.34.fix.patch deleted file mode 100644 index a4eb0cc..0000000 --- a/sys-kernel/mygentoo-sources/files/drmmm-4.14.34.fix.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 338f1d9d1b829fec494d053f62820a2ee625b1ec Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Thu, 14 Dec 2017 15:32:28 -0800 -Subject: [PATCH] lib/rbtree,drm/mm: add rbtree_replace_node_cached() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a variant of rbtree_replace_node() that maintains the leftmost cache -of struct rbtree_root_cached when replacing nodes within the rbtree. - -As drm_mm is the only rb_replace_node() being used on an interval tree, -the mistake looks fairly self-contained. Furthermore the only user of -drm_mm_replace_node() is its testsuite... - -Testcase: igt/drm_mm/replace - -Link: http://lkml.kernel.org/r/20171122100729.3742-1-chris@chris-wilson.co.uk -Link: https://patchwork.freedesktop.org/patch/msgid/20171109212435.9265-1-chris@chris-wilson.co.uk -Fixes: f808c13fd373 ("lib/interval_tree: fast overlap detection") -Signed-off-by: Chris Wilson -Reviewed-by: Joonas Lahtinen -Acked-by: Davidlohr Bueso -Cc: Jérôme Glisse -Cc: Joonas Lahtinen -Cc: Daniel Vetter -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - drivers/gpu/drm/drm_mm.c | 8 +++++--- - include/linux/rbtree.h | 2 ++ - lib/rbtree.c | 10 ++++++++++ - 3 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c -index 61a1c8ea74bc..c3c79ee6119e 100644 ---- a/drivers/gpu/drm/drm_mm.c -+++ b/drivers/gpu/drm/drm_mm.c -@@ -575,21 +575,23 @@ EXPORT_SYMBOL(drm_mm_remove_node); - */ - void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new) - { -+ struct drm_mm *mm = old->mm; -+ - DRM_MM_BUG_ON(!old->allocated); - - *new = *old; - - list_replace(&old->node_list, &new->node_list); -- rb_replace_node(&old->rb, &new->rb, &old->mm->interval_tree.rb_root); -+ rb_replace_node_cached(&old->rb, &new->rb, &mm->interval_tree); - - if (drm_mm_hole_follows(old)) { - list_replace(&old->hole_stack, &new->hole_stack); - rb_replace_node(&old->rb_hole_size, - &new->rb_hole_size, -- &old->mm->holes_size); -+ &mm->holes_size); - rb_replace_node(&old->rb_hole_addr, - &new->rb_hole_addr, -- &old->mm->holes_addr); -+ &mm->holes_addr); - } - - old->allocated = false; -diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h -index d574361943ea..fcbeed4053ef 100644 ---- a/include/linux/rbtree.h -+++ b/include/linux/rbtree.h -@@ -99,6 +99,8 @@ extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, - struct rb_root *root); - extern void rb_replace_node_rcu(struct rb_node *victim, struct rb_node *new, - struct rb_root *root); -+extern void rb_replace_node_cached(struct rb_node *victim, struct rb_node *new, -+ struct rb_root_cached *root); - - static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, - struct rb_node **rb_link) -diff --git a/lib/rbtree.c b/lib/rbtree.c -index ba4a9d165f1b..d3ff682fd4b8 100644 ---- a/lib/rbtree.c -+++ b/lib/rbtree.c -@@ -603,6 +603,16 @@ void rb_replace_node(struct rb_node *victim, struct rb_node *new, - } - EXPORT_SYMBOL(rb_replace_node); - -+void rb_replace_node_cached(struct rb_node *victim, struct rb_node *new, -+ struct rb_root_cached *root) -+{ -+ rb_replace_node(victim, new, &root->rb_root); -+ -+ if (root->rb_leftmost == victim) -+ root->rb_leftmost = new; -+} -+EXPORT_SYMBOL(rb_replace_node_cached); -+ - void rb_replace_node_rcu(struct rb_node *victim, struct rb_node *new, - struct rb_root *root) - { diff --git a/sys-kernel/mygentoo-sources/files/gpu-4.14.33.fix.patch b/sys-kernel/mygentoo-sources/files/gpu-4.14.33.fix.patch deleted file mode 100644 index e9a848f..0000000 --- a/sys-kernel/mygentoo-sources/files/gpu-4.14.33.fix.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- linux-4.14.33.orig/drivers/gpu/drm/i915/intel_bios.c 2017-11-12 19:46:13.000000000 +0100 -+++ linux-4.14.33/drivers/gpu/drm/i915/intel_bios.c 2018-04-11 15:08:21.073058586 +0200 -@@ -1110,6 +1110,28 @@ - } - } - -+static const u8 cnp_ddc_pin_map[] = { -+ [0] = 0, /* N/A */ -+ [DDC_BUS_DDI_B] = GMBUS_PIN_1_BXT, -+ [DDC_BUS_DDI_C] = GMBUS_PIN_2_BXT, -+ [DDC_BUS_DDI_D] = GMBUS_PIN_4_CNP, /* sic */ -+ [DDC_BUS_DDI_F] = GMBUS_PIN_3_BXT, /* sic */ -+}; -+ -+static u8 map_ddc_pin(struct drm_i915_private *dev_priv, u8 vbt_pin) -+{ -+ if (HAS_PCH_CNP(dev_priv)) { -+ if (vbt_pin < ARRAY_SIZE(cnp_ddc_pin_map)) { -+ return cnp_ddc_pin_map[vbt_pin]; -+ } else { -+ DRM_DEBUG_KMS("Ignoring alternate pin: VBT claims DDC pin %d, which is not valid for this platform\n", vbt_pin); -+ return 0; -+ } -+ } -+ -+ return vbt_pin; -+} -+ - static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, - const struct bdb_header *bdb) - { -@@ -1155,7 +1177,6 @@ - return; - - aux_channel = child->common.aux_channel; -- ddc_pin = child->common.ddc_pin; - - is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING; - is_dp = child->common.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT; -@@ -1195,18 +1216,15 @@ - DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port)); - - if (is_dvi) { -- info->alternate_ddc_pin = ddc_pin; -- -- /* -- * All VBTs that we got so far for B Stepping has this -- * information wrong for Port D. So, let's just ignore for now. -- */ -- if (IS_CNL_REVID(dev_priv, CNL_REVID_B0, CNL_REVID_B0) && -- port == PORT_D) { -- info->alternate_ddc_pin = 0; -+ ddc_pin = map_ddc_pin(dev_priv, child->common.ddc_pin); -+ if (intel_gmbus_is_valid_pin(dev_priv, ddc_pin)) { -+ info->alternate_ddc_pin = ddc_pin; -+ sanitize_ddc_pin(dev_priv, port); -+ } else { -+ DRM_DEBUG_KMS("Port %c has invalid DDC pin %d, " -+ "reverting to defaults\n", -+ port_name(port), ddc_pin); - } -- -- sanitize_ddc_pin(dev_priv, port); - } - - if (is_dp) { ---- linux-4.14.33.orig/drivers/gpu/drm/i915/intel_vbt_defs.h 2017-11-12 19:46:13.000000000 +0100 -+++ linux-4.14.33/drivers/gpu/drm/i915/intel_vbt_defs.h 2018-04-11 15:18:03.342920432 +0200 -@@ -230,6 +230,14 @@ - #define DEVICE_PORT_DVOB 0x01 - #define DEVICE_PORT_DVOC 0x02 - -+/* DDC Bus DDI Type 155+ */ -+enum vbt_gmbus_ddi { -+ DDC_BUS_DDI_B = 0x1, -+ DDC_BUS_DDI_C, -+ DDC_BUS_DDI_D, -+ DDC_BUS_DDI_F, -+}; -+ - /* - * We used to keep this struct but without any version control. We should avoid - * using it in the future, but it should be safe to keep using it in the old diff --git a/sys-kernel/mygentoo-sources/metadata.xml b/sys-kernel/mygentoo-sources/metadata.xml deleted file mode 100644 index 93b88c1..0000000 --- a/sys-kernel/mygentoo-sources/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - kernel@gentoo.org - Gentoo Kernel Project - - - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental". - - - cpe:/o:linux:linux_kernel - - diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.102.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.102.ebuild deleted file mode 100644 index db0308c..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.102.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="108" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -PATCHES=( - "${FILESDIR}"/gpu-4.14.33.fix.patch - "${FILESDIR}"/drmmm-4.14.34.fix.patch -) - -src_prepare() { - default -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.27.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.27.ebuild deleted file mode 100644 index 9f676fb..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.27.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="32" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.43.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.43.ebuild deleted file mode 100644 index e7e2093..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.43.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="48" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -PATCHES=( - "${FILESDIR}"/gpu-4.14.33.fix.patch - "${FILESDIR}"/drmmm-4.14.34.fix.patch -) - -src_prepare() { - default -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.60.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.60.ebuild deleted file mode 100644 index db75b5a..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.60.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="65" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -PATCHES=( - "${FILESDIR}"/gpu-4.14.33.fix.patch - "${FILESDIR}"/drmmm-4.14.34.fix.patch -) - -src_prepare() { - default -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.63.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.63.ebuild deleted file mode 100644 index 200a452..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.63.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="69" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -PATCHES=( - "${FILESDIR}"/gpu-4.14.33.fix.patch - "${FILESDIR}"/drmmm-4.14.34.fix.patch -) - -src_prepare() { - default -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.74.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.74.ebuild deleted file mode 100644 index 4126ea0..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.74.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="80" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -PATCHES=( - "${FILESDIR}"/gpu-4.14.33.fix.patch - "${FILESDIR}"/drmmm-4.14.34.fix.patch -) - -src_prepare() { - default -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.78.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.78.ebuild deleted file mode 100644 index 1758e26..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.14.78.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="85" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -PATCHES=( - "${FILESDIR}"/gpu-4.14.33.fix.patch - "${FILESDIR}"/drmmm-4.14.34.fix.patch -) - -src_prepare() { - default -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.129.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.129.ebuild deleted file mode 100644 index 45e18a6..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.129.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="128" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.152.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.152.ebuild deleted file mode 100644 index 50f30b0..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.152.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="151" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.214.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.214.ebuild deleted file mode 100644 index 6475b8a..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.214.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="213" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.23.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.23.ebuild deleted file mode 100644 index b8eda38..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.23.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="23" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.34.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.34.ebuild deleted file mode 100644 index 51bf668..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.34.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="35" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.44.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.44.ebuild deleted file mode 100644 index 77a4ca3..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.44.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="45" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.57.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.57.ebuild deleted file mode 100644 index 52ac8d4..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.57.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="57" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.86.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.86.ebuild deleted file mode 100644 index 68fc304..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-4.19.86.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="85" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.131.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.131.ebuild deleted file mode 100644 index 12352ff..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.131.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="135" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.156.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.156.ebuild deleted file mode 100644 index c9bcfda..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.156.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="160" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.97.ebuild b/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.97.ebuild deleted file mode 100644 index 3870118..0000000 --- a/sys-kernel/mygentoo-sources/mygentoo-sources-5.4.97.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="99" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest deleted file mode 100644 index 303b9e9..0000000 --- a/sys-libs/libstdc++-v3/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX libstdc++-v3-3.3.6-glibc226.patch 1349 BLAKE2B e16351bae2539fac5d71b1cec43e0869f079c34e1bc59a170b7ff699e6c9aff95dbde09b07c17f3ec4a66f02548a3c78e4679eab38244aa5a2ddde12856fb1fc SHA512 05e2195c385b8cfbeb7b4978a70c3dbcee02210ff7b1785ad736f6c2cbbb8bf3abefec93417c427c2719b2bf6ebe565f432f45e5e17a4c51672785ed5b650a22 -AUX libstdc++-v3-3.3.6-skip-testsuite-build.patch 2077 BLAKE2B 2a8123ee34ccaf986591f27984253851a57b9eadb29b7aefc7574e23c2a42de9bc3dfdc1b7e349b0227faf430dd07a53e21f33931106670815937d19dae8b58c SHA512 cad0c0d231b5609ad06ccd0ef25386c6088f67d9c4ea0e5af7b6271245b2feff8680311f22dc5fe2eb27af6729c06209299bad72c760e04f42fe2921cd9307d9 -DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c -DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed -EBUILD libstdc++-v3-3.3.6-r1.ebuild 5038 BLAKE2B b72005c71c35c6d0f864e7d198e46be396796e5a339a48487e8e2d93ef642421a9794546d4b1c51123ad0062e6157a80a22f7277f689343addcb4e7200381b3a SHA512 87b5fb3d6cb8ccacc00a3766d2e17a3f59b50ac2b9b34f1e2dc8259a5f8fb2cf32b1e7f299287933735f93dbcaea6c77c58d2a2a548d10ccd92e8953c965608f -MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch deleted file mode 100644 index a444da2..0000000 --- a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux.h gcc-3.3.6/gcc/config/i386/linux.h ---- gcc-3.3.6.orig/gcc/config/i386/linux.h 2018-01-01 20:14:36.311860098 +0100 -+++ gcc-3.3.6/gcc/config/i386/linux.h 2018-01-01 20:16:05.912287579 +0100 -@@ -261,7 +261,7 @@ - siginfo_t *pinfo; \ - void *puc; \ - siginfo_t info; \ -- struct ucontext uc; \ -+ struct ucontext_t uc; \ - } *rt_ = (CONTEXT)->cfa; \ - sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ - } \ -diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux64.h gcc-3.3.6/gcc/config/i386/linux64.h ---- gcc-3.3.6.orig/gcc/config/i386/linux64.h 2018-01-01 20:14:36.271859907 +0100 -+++ gcc-3.3.6/gcc/config/i386/linux64.h 2018-01-01 20:16:05.912287579 +0100 -@@ -112,7 +112,7 @@ - if (*(unsigned char *)(pc_+0) == 0x48 \ - && *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7) \ - { \ -- struct ucontext *uc_ = (CONTEXT)->cfa; \ -+ struct ucontext_t *uc_ = (CONTEXT)->cfa; \ - sc_ = (struct sigcontext *) &uc_->uc_mcontext; \ - } \ - else \ -@@ -182,7 +182,7 @@ - siginfo_t *pinfo; \ - void *puc; \ - siginfo_t info; \ -- struct ucontext uc; \ -+ struct ucontext_t uc; \ - } *rt_ = (CONTEXT)->cfa; \ - sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ - } \ diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-skip-testsuite-build.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-skip-testsuite-build.patch deleted file mode 100644 index 0086c49..0000000 --- a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-skip-testsuite-build.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -urpN gcc-3.3.6.orig/libstdc++-v3/Makefile.am gcc-3.3.6/libstdc++-v3/Makefile.am ---- gcc-3.3.6.orig/libstdc++-v3/Makefile.am 2003-07-04 12:53:54.000000000 -0700 -+++ gcc-3.3.6/libstdc++-v3/Makefile.am 2018-06-07 20:33:51.747397861 -0700 -@@ -25,7 +25,7 @@ - AUTOMAKE_OPTIONS = 1.3 cygnus - MAINT_CHARSET = latin1 - --SUBDIRS = include libio libmath libsupc++ src po testsuite -+SUBDIRS = include libio libmath libsupc++ src po - - mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs - -@@ -38,13 +38,11 @@ PWD_COMMAND = $${PWDCMD-pwd} - # compile time, execution time, and binary size. - check-script: $(top_builddir)/mkcheck - -(chmod + $(top_builddir)/mkcheck; \ -- cd testsuite; \ -- @glibcpp_builddir@/mkcheck 0) -+ cd testsuite - - check-script-install: $(top_builddir)/mkcheck - -(chmod + $(top_builddir)/mkcheck; \ -- cd testsuite; \ -- @glibcpp_builddir@/mkcheck 1) -+ cd testsuite - - # These rules are messy, but are hella worth it. - doxygen: -Binary files gcc-3.3.6.orig/libstdc++-v3/.Makefile.am.swp and gcc-3.3.6/libstdc++-v3/.Makefile.am.swp differ -diff -urpN gcc-3.3.6.orig/libstdc++-v3/Makefile.in gcc-3.3.6/libstdc++-v3/Makefile.in ---- gcc-3.3.6.orig/libstdc++-v3/Makefile.in 2003-07-04 12:53:54.000000000 -0700 -+++ gcc-3.3.6/libstdc++-v3/Makefile.in 2018-06-07 20:34:32.451011377 -0700 -@@ -147,7 +147,7 @@ toplevel_srcdir = @toplevel_srcdir@ - AUTOMAKE_OPTIONS = 1.3 cygnus - MAINT_CHARSET = latin1 - --SUBDIRS = include libio libmath libsupc++ src po testsuite -+SUBDIRS = include libio libmath libsupc++ src po - - mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs - -@@ -488,13 +488,11 @@ mostlyclean distclean maintainer-clean - # compile time, execution time, and binary size. - check-script: $(top_builddir)/mkcheck - -(chmod + $(top_builddir)/mkcheck; \ -- cd testsuite; \ -- @glibcpp_builddir@/mkcheck 0) -+ cd testsuite - - check-script-install: $(top_builddir)/mkcheck - -(chmod + $(top_builddir)/mkcheck; \ -- cd testsuite; \ -- @glibcpp_builddir@/mkcheck 1) -+ cd testsuite - - # These rules are messy, but are hella worth it. - doxygen: diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild deleted file mode 100644 index 8ce98b2..0000000 --- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic libtool multilib - -transform_known_flags() { - declare setting - - # and on x86, we just need to filter the 3.4 specific amd64 -marchs - replace-cpu-flags k8 athlon64 opteron x86-64 - - # gcc 3.3 doesn't support -march=pentium-m - replace-cpu-flags pentium-m pentium3m pentium3 - - #GCC 3.3 does not understand G3, G4, G5 on ppc - replace-cpu-flags G3 750 - replace-cpu-flags G4 7400 - replace-cpu-flags G5 7400 -} - -is_arch_allowed() { - i386_processor_table="i386 i486 i586 pentium pentium-mmx winchip-c6 \ - winchip2 c3 i686 pentiumpro pentium2 pentium3 pentium4 prescott \ - nocona k6 k6-2 k6-3 athlon athlon-tbird x86-64 athlon-4 athlon-xp \ - athlon-mp" - - for proc in ${i386_processor_table} ; do - [ "${proc}" == "${1}" ] && return 0 - done - - mips_processor_table="mips1 mips2 mips3 mips4 mips32 mips64 r3000 r2000 \ - r3900 r6000 r4000 vr4100 vr4111 vr4120 vr4300 r4400 r4600 orion \ - r4650 r8000 vr5000 vr5400 vr5500 4kc 4kp 5kc 20kc sr71000 sb1" - - for proc in ${mips_processor_table} ; do - [ "${proc}" == "${1}" ] && return 0 - done - - rs6000_processor_table="common power power2 power3 power4 powerpc \ - powerpc64 rios rios1 rsc rsc1 rios2 rs64a 401 403 405 505 601 602 \ - 603 603e ec603e 604 604e 620 630 740 750 7400 7450 8540 801 821 823 \ - 860" - - for proc in ${rs6000_processor_table} ; do - [ "${proc}" == "${1}" ] && return 0 - done - - return 1 -} - -do_filter_flags() { - declare setting - - # In general gcc does not like optimization, and add -O2 where - # it is safe. This is especially true for gcc 3.3 + 3.4 - replace-flags -O? -O2 - - # gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail - setting="`get-flag mtune`" - [ ! -z "${setting}" ] && filter-flags -mtune="${setting}" - - # in gcc 3.3 there is a bug on ppc64 where if -mcpu is used - # the compiler incorrectly assumes the code you are about to build - # is 32 bit - use ppc64 && setting="`get-flag mcpu`" - [ ! -z "${setting}" ] && filter-flags -mcpu="${setting}" - - # only allow the flags that we -know- are supported - transform_known_flags - setting="`get-flag march`" - if [ ! -z "${setting}" ] ; then - is_arch_allowed "${setting}" || filter-flags -march="${setting}" - fi - setting="`get-flag mcpu`" - if [ ! -z "${setting}" ] ; then - is_arch_allowed "${setting}" || filter-flags -mcpu="${setting}" - fi - - # xgcc wont understand gcc 3.4 flags... - filter-flags -fno-unit-at-a-time - filter-flags -funit-at-a-time - filter-flags -fweb - filter-flags -fno-web - filter-flags -mno-tls-direct-seg-refs - - # xgcc isnt patched with propolice - filter-flags -fstack-protector-all - filter-flags -fno-stack-protector-all - filter-flags -fstack-protector - filter-flags -fno-stack-protector - - # xgcc isnt patched with the gcc symbol visibility patch - filter-flags -fvisibility-inlines-hidden - filter-flags -fvisibility=hidden - - # Bug #269433 & #290202 - filter-flags -fno-strict-overflow - filter-flags -fstrict-overflow - - # Bug #442784 - filter-flags '-W*' - - filter-flags -frecord-gcc-switches - filter-flags '-fdiagnostics-color*' - - # ...sure, why not? - strip-unsupported-flags - - strip-flags -} - -PATCH_VER="1.9" - -DESCRIPTION="Compatibility package for binaries linked against a pre gcc 3.4 libstdc++" -HOMEPAGE="https://gcc.gnu.org/libstdc++/" -SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 - mirror://gentoo/gcc-${PV}-patches-${PATCH_VER}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~mips ppc -ppc64 sparc x86 ~x86-fbsd" -IUSE="multilib nls" - -DEPEND="sys-devel/bison" -RDEPEND="" - -S=${WORKDIR}/gcc-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch - - # bug 637608 - has_version '>=sys-libs/glibc-2.26' && epatch "${FILESDIR}/${P}-glibc226.patch" - - epatch "${FILESDIR}/${P}-skip-testsuite-build.patch" - - elibtoolize --portage --shallow - ./contrib/gcc_update --touch - mkdir -p "${WORKDIR}"/build - - if use multilib && [[ ${SYMLINK_LIB} == "yes" ]] ; then - # ugh, this shit has to match the way we've hacked gcc else - # the build falls apart #259215 - sed -i \ - -e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \ - "${S}"/gcc/config/i386/t-linux64 \ - || die "sed failed!" - fi -} - -src_configure() { - cd "${WORKDIR}"/build - do_filter_flags - ECONF_SOURCE=${S} \ - econf \ - --enable-shared \ - --with-system-zlib \ - --enable-languages=c++ \ - --enable-threads=posix \ - --enable-long-long \ - --disable-checking \ - --enable-cstdio=stdio \ - --enable-__cxa_atexit \ - $(use_enable multilib) \ - $(use_enable nls) \ - $(use_with !nls included-gettext) - - touch "${S}"/gcc/c-gperf.h -} - -src_compile() { - emake -j1 \ - -C "${WORKDIR}"/build \ - all-target-libstdc++-v3 || die -} - -src_install() { - emake -j1 \ - -C "${WORKDIR}"/build \ - DESTDIR="${D}" \ - install-target-libstdc++-v3 || die - - # scrub everything but the library we care about - pushd "${D}" >/dev/null - mv usr/lib* . || die - rm -rf usr - rm -f lib*/*.{a,la,so} || die - dodir /usr - mv lib* usr/ || die -} diff --git a/sys-libs/libstdc++-v3/metadata.xml b/sys-libs/libstdc++-v3/metadata.xml deleted file mode 100644 index e396f37..0000000 --- a/sys-libs/libstdc++-v3/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - toolchain@gentoo.org - Gentoo Toolchain Project - - diff --git a/virtual/linux-sources/ChangeLog b/virtual/linux-sources/ChangeLog deleted file mode 100644 index 13f6b6f..0000000 --- a/virtual/linux-sources/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -# ChangeLog for virtual/linux-sources -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /home/sysadmin/cvsroot/portoverlay/myhardened/virtual/linux-sources/ChangeLog,v 1.1 2011/05/18 11:05:18 valko Exp $ - -*linux-sources-2.6 (30 Apr 2011) -*linux-sources-2.4 (30 Apr 2011) - - 30 Apr 2011; Ulrich Mueller +linux-sources-2.4.ebuild, - +linux-sources-2.6.ebuild, +metadata.xml: - Initial import, bug 118442. - diff --git a/virtual/linux-sources/Manifest b/virtual/linux-sources/Manifest deleted file mode 100644 index f75cece..0000000 --- a/virtual/linux-sources/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -EBUILD linux-sources-4.ebuild 738 BLAKE2B 43dd53c0992a2caa7956a09aa5edaf7233dffac27daa7c61078fdd800e737204e7570db99fc325ab3788d15870382e9d82ba837a89182107cb609581cb1ea598 SHA512 c046242a2ac62f07224e77a0319b9bac38d9cb52a8b5a9e6024ea9cebed332e513373903dd784b1bd54fbf704078393a467849b3b1d43a20cacce0bee715b886 -MISC ChangeLog 452 BLAKE2B fcb3084ef1d7772201360fc5472ad2ed8a8d8ecfae6ffce4619092bd8551d29cb0eda1d0bfc51729c3f023b03d031fc3c2ebd711336596324686f41b63fd41fc SHA512 0196b8b6e7983893077fde86fc106d647010c67169b721544cbffc927b078dcddba64204ea412307ed4b74b8c894dfc844364b36c6e2143a8cbf241dbc3c83c9 -MISC metadata.xml 223 BLAKE2B 8e91bf059a4d5cd941a46d6dc90dec147f0171ea6e53fac46cf8384cac2550260aae9dda5266cce78d270554508f4088dc46bd1c226338b65a4c387aec54d89a SHA512 5fefb6cbf52338b205b57f7ce80f03c7c1d3a6457b48a730996deb84b9c3e7c325cb032f8c8711d5382d6c898733e1fff38ac02e74927f5b2d6fe11dc0be6844 diff --git a/virtual/linux-sources/linux-sources-4.ebuild b/virtual/linux-sources/linux-sources-4.ebuild deleted file mode 100644 index ca1b12f..0000000 --- a/virtual/linux-sources/linux-sources-4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Virtual for Linux kernel sources" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="firmware" - -RDEPEND=" - firmware? ( sys-kernel/linux-firmware ) - || ( - sys-kernel/mygentoo-sources - sys-kernel/gentoo-sources - sys-kernel/vanilla-sources - sys-kernel/ck-sources - sys-kernel/git-sources - sys-kernel/hardened-sources - sys-kernel/mips-sources - sys-kernel/openvz-sources - sys-kernel/pf-sources - sys-kernel/rt-sources - sys-kernel/tuxonice-sources - sys-kernel/xbox-sources - sys-kernel/zen-sources - sys-kernel/aufs-sources - sys-kernel/raspberrypi-sources - )" diff --git a/virtual/linux-sources/metadata.xml b/virtual/linux-sources/metadata.xml deleted file mode 100644 index 8ca3486..0000000 --- a/virtual/linux-sources/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -kernel-misc - - ulm@gentoo.org - - diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest deleted file mode 100644 index 126e8c3..0000000 --- a/www-client/opera/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 -DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b -EBUILD opera-12.16_p1860-r1.ebuild 5856 BLAKE2B d0a4b60a31890f5c7de5e2e93ba592812011e6ea623bba69f6c61d7146cce0cfd7475b58952bd4cc42af61d1a46504457c3d13af4f1827362bd32f6a37445f80 SHA512 53ff6f14efc73ea822e0dfb83210163d22671b2aff5bd0793c8fb517eaabfb378c43effddd72036cb88031a5e44b599df84a074b30970903b4a0ef4e63fe7073 diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild deleted file mode 100644 index 50d3c00..0000000 --- a/www-client/opera/opera-12.16_p1860-r1.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils gnome2-utils multilib pax-utils versionator xdg-utils - -DESCRIPTION="A fast and secure web browser and Internet suite" -HOMEPAGE="https://www.opera.com/" - -SLOT="0" -LICENSE="OPERA-12 LGPL-2 LGPL-3" -KEYWORDS="amd64 x86" -IUSE="elibc_FreeBSD gtk multilib" - -O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00 -O_B="$(get_version_component_range 3)" # Build number, i.e. 1156 - -# == Variables that often change == -# All other variables should be accounted for by _pre/_p - -O_K="noserch" # The key to the snapshot URL - -O_LINGUAS=" - af ar az be bg bn cnr cs da de el en-GB es-419 es-ES et fa fi fr fr-CA fy - gd he hi hr hu id it ja ka kk ko lt lv mk ms nb nl nn pa pl pt pt-BR ro ru - sk sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu -" # Supported linguas - -# == End of variables that often change == - -if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre - HOMEPAGE="https://my.opera.com/desktopteam/blog/" - - O_D="${O_K}_${O_V}-${O_B/pre}" # directory string - O_P="${PN}-${O_V}-${O_B/pre}" # package string - O_U="https://snapshot.opera.com/unix/" # base URI - - SRC_URI=" - amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz ) - x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz ) - " -else # release: _p - O_D="${O_V/./}" # directory string - O_P="${PN}-${O_V}-${O_B/p}" # package string - O_U="mirror://opera/" # base URI - - SRC_URI=" - amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz ) - x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz ) - " -fi - -for O_LINGUA in ${O_LINGUAS}; do - IUSE+=" l10n_${O_LINGUA}" -done - -DEPEND=" - >=sys-apps/sed-4 - app-arch/xz-utils -" -GTKRDEPEND=" - dev-libs/atk - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf - gtk? ( x11-libs/gtk+:2 ) - x11-libs/pango - x11-libs/pixman -" -RDEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - x11-libs/libXt - x11-misc/xdg-utils - gtk? ( ${GTKRDEPEND} ) -" - -QA_PREBUILT="*" - -pkg_setup() { - OPREFIX="/usr/$(get_abi_LIBDIR)" -} - -src_unpack() { - unpack ${A} - mv -v ${PN}* "${S}" || die -} - -src_prepare() { - default - - local LNGDIR="share/${PN}/locale" - - # Count linguas - count() { echo ${#}; } - local lingua_count=$(count ${O_LINGUAS} en) - local locale_count=$(count ${LNGDIR}/*) - [[ ${lingua_count} = ${locale_count} ]] \ - || die "Number of LINGUAS does not match number of locales" - unset count - - # Remove unwanted linguas - for LINGUA in ${O_LINGUAS}; do - if ! use l10n_${LINGUA}; then - # Remap codes for Montenegrin and Spanish (Latin America) - case ${LINGUA} in - cnr) LINGUA=me ;; - es-419) LINGUA=es-LA ;; - esac - LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) - rm -r "${LINGUA}" || die "The list of linguas needs to be fixed" - fi - done - - # Remove doc directory but keep the LICENSE under another name (bug #315473) - mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt - rm -rf share/doc - for locale in share/${PN}/locale/*; do - rm -f "${locale}/license.txt" - ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \ - || die - done - - # Remove package directory - rm -rf share/${PN}/package - - rm -r lib/${PN}/gstreamer || die - - # Optional libraries - if ! use gtk; then - rm lib/${PN}/liboperagtk2.so || die - fi - - rm lib/${PN}/liboperakde4.so || die - - if use amd64 && ! use multilib; then - rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die - fi - - # Unzip the man pages before sedding - gunzip share/man/man1/* || die - - local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX= - if [[ ${PN} = opera-next ]]; then - OPERA_SUFFIX="-next" - OPERA__SUFFIX=" Next" - OPERA_USUFFIX="-NEXT" - fi - - # Replace PREFIX, SUFFIX and PN in various files - sed -i \ - -e "s:@@{PREFIX}:/usr:g" \ - -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \ - -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \ - -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \ - share/man/man1/* \ - share/mime/packages/* \ - share/applications/${PN}-*.desktop \ - || die - - # Create /usr/bin/opera wrapper - echo '#!/bin/sh' > ${PN} - echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN} - echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ - >> ${PN} - echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} - - # Change libfreetype.so.9 to libfreetype.so.6 for Gentoo/FreeBSD, bug #477594 - if use elibc_FreeBSD; then - scanelf -qR -N libfreetype.so.9 -F "#N" lib/${PN}/ | \ - while read i; do - if [[ $(strings "$i" | fgrep -c libfreetype.so.9) -ne 1 ]]; - then - export SANITY_CHECK_LIBFREETYPE_FAILED=1 - break - fi - sed -i \ - "$i" \ - -e 's/libfreetype\.so\.9/libfreetype.so.6/g' - done - [[ "$SANITY_CHECK_LIBFREETYPE_FAILED" = "1" ]] && die - fi -} - -src_install() { - # We install into usr instead of opt as Opera does not support the latter - dodir /usr - if ! use elibc_FreeBSD; then - rm lib/${PN}/opera_autoupdatechecker || die - fi - mv lib/ "${D}/${OPREFIX}" || die - mv share/ "${D}/usr/" || die - - # Install startup scripts - dobin ${PN} - - # Stop revdep-rebuild from checking opera binaries - dodir /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \ - > "${D}"/etc/revdep-rebuild/90${PN} - - # Set PaX markings for hardened/PaX (bug #344267) - pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) ) -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - if use elibc_FreeBSD; then - elog - elog "To improve shared memory usage please set:" - elog "$ sysctl kern.ipc.shm_allow_removed=1" - fi - - # Update desktop file database and gtk icon cache (bug #334993) - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - # Update desktop file database and gtk icon cache (bug #334993) - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest deleted file mode 100644 index 29e7822..0000000 --- a/www-plugins/adobe-flash/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd -AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1 -AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee -DIST adobe-flash-32.0.0.465-npapi.i386.tar.gz 8548148 BLAKE2B f70bd9d9ca06492c35ab91db70a201bea9c3b84651f15492ef27025b55434d148ffd454835790ee64c6bb32c3b0eff344ca1f8605113cd0814a851d5c40667e1 SHA512 5c7b81aa38667aedc230a14899d0dbb26d0a59c255946966e1b11b8abad98312e1d45d75b1fddf4ace8587121b431d77b1050ce764613eb4e8ea34ea37587b3e -DIST adobe-flash-32.0.0.465-npapi.x86_64.tar.gz 9064884 BLAKE2B dc108bc0e7085b87bfc1410716f0b7251951022329b8cc85a1eed194a8b5010d31b76f104099a267aee2f16e5a1706b27802f0c8baed1dcd8234d249ba84a2c2 SHA512 b2fd7b16326facadb94e505de4e27d608d8b7690a719753348d381a54362984905dcb431ceb3f12853ddd3f2a5542497e2e5bb09afbdd728ca1217408fea1797 -DIST adobe-flash-32.0.0.465-ppapi.i386.tar.gz 8832791 BLAKE2B 7804580db3340c9e7bd57657bf48add202ee6a71ac8d79bd6634c12dffd21b0d6eb2e92046ee6f0105939af5dccefc0e43f9ccb8f728afcff007abb846633eff SHA512 7cc4da295b1c2cf1a8995c71f755e9fb5ffb57001aa14fa049c9f626ebc7191c6944fdb6e3f723c52f664532a51fada17dcfe839d4065bf80a492521bfa94eef -DIST adobe-flash-32.0.0.465-ppapi.x86_64.tar.gz 9763881 BLAKE2B 9b6df0213f365611efa1f9b07ce621bb328990f3adadf1c1fed018c4cfc5a375096e462415825e190bae944bdd16de5e960f5f49e5d2249ddd86c89e5459c4db SHA512 cc31f1d8c5d50501b2e2bacd65b644f788e484acd3d1ae654db0851ae16b24c0292f5f07f1582cc9462afe6beb201f7b107fa86136256890f1e19f12857021cc -EBUILD adobe-flash-32.0.0.465.ebuild 3659 BLAKE2B 7eb3cf6531ea89c5bd0bcb0839d8c061fdcc6ef1f9f96b05ff1a8ec873076f7844a71882a2b7b5975f582544a2878791c04ccdb305e72273d2902e08bb344876 SHA512 cb79e6dbaae54841adea5d780c5e38a4ebb1a0a385961313dc5764c13cd3cb427a0938c3905fb3a7325ca02e5dd85c354fde48899668b0ef7763885750e5311b -MISC metadata.xml 481 BLAKE2B d871797b2c896190a05ff5101e8f695a34bfec3576626710b8f9ef8cd84936abc2f7c0d8dcadab1678262d0407ee96f7ab7dfeff37d411a247f6c6c07074bb5f SHA512 2f50c0cdb3dafdd169281ebe04aa92ed184f5b4f68c0f37e350177091d379c5df86b0addd3111db722a0274cd7435e66cf3c6aa1776d0f029013aa05d26990b7 diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.465.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.465.ebuild deleted file mode 100644 index 577e386..0000000 --- a/www-plugins/adobe-flash/adobe-flash-32.0.0.465.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit xdg-utils nsplugins multilib multilib-minimal - -DESCRIPTION="Adobe Flash Player" -HOMEPAGE=" - https://www.adobe.com/products/flashplayer.html - https://get.adobe.com/flashplayer/ - https://helpx.adobe.com/security/products/flash-player.html -" - -AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}" -AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz" -AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz" -AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz" -AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz" - -IUSE="+nsplugin +ppapi" -REQUIRED_USE=" - || ( nsplugin ppapi ) -" - -SRC_URI=" - nsplugin? ( - abi_x86_32? ( ${AF_NP_32_URI} ) - abi_x86_64? ( ${AF_NP_64_URI} ) - ) - ppapi? ( - abi_x86_32? ( ${AF_PP_32_URI} ) - abi_x86_64? ( ${AF_PP_64_URI} ) - ) -" -SLOT="22" - -KEYWORDS="-* amd64 x86" -LICENSE="AdobeFlash-11.x" -RESTRICT="bindist mirror strip" - -NPAPI_RDEPEND=" - dev-libs/atk[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - media-libs/freetype[${MULTILIB_USEDEP}] - >=sys-libs/glibc-2.4 - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] -" -RDEPEND=" - !www-plugins/chrome-binary-plugins[flash(-)] - nsplugin? ( - ${NPAPI_RDEPEND} - !www-plugins/adobe-flash:0 - ) -" - -S="${WORKDIR}" - -# Ignore QA warnings in these closed-source binaries, since we can't fix them: -QA_PREBUILT="usr/*" - -src_unpack() { - local files=( ${A} ) - - multilib_src_unpack() { - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - # we need to filter out the other archive(s) - local other_abi - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64 - unpack ${files[@]//*${other_abi}*/} - } - - multilib_parallel_foreach_abi multilib_src_unpack -} - -multilib_src_install() { - local pkglibdir=lib - [[ -d usr/lib64 ]] && pkglibdir=lib64 - - if use nsplugin; then - # PLUGINS_DIR comes from nsplugins.eclass - exeinto /usr/$(get_libdir)/${PLUGINS_DIR} - doexe libflashplayer.so - - if multilib_is_native_abi; then - # No KDE applet, so allow the GTK utility to show up in KDE: - sed \ - -i usr/share/applications/flash-player-properties.desktop \ - -e "/^NotShowIn=KDE;/d" || die - - # The userland 'flash-player-properties' standalone app: - dobin usr/bin/flash-player-properties - - # Icon and .desktop for 'flash-player-properties' - insinto /usr/share - doins -r usr/share/{icons,applications} - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \ - /usr/share/pixmaps/flash-player-properties.png - fi - - # The magic config file! - insinto "/etc/adobe" - doins "${FILESDIR}/mms.cfg" - fi - - if use ppapi; then - exeinto /usr/$(get_libdir)/chromium/PepperFlash - doexe libpepflashplayer.so - insinto /usr/$(get_libdir)/chromium/PepperFlash - doins manifest.json - - if multilib_is_native_abi; then - dodir /etc/chromium - sed "${FILESDIR}"/pepper-flash-r1 \ - -e "s|@FP_LIBDIR@|$(get_libdir)|g" \ - -e "s|@FP_PV@|${PV}|g" \ - > "${D}"/etc/chromium/pepper-flash \ - || die - fi - fi -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/www-plugins/adobe-flash/files/mms.cfg b/www-plugins/adobe-flash/files/mms.cfg deleted file mode 100644 index 3d53391..0000000 --- a/www-plugins/adobe-flash/files/mms.cfg +++ /dev/null @@ -1,117 +0,0 @@ -# -# /etc/adobe/mms.cfg: Adobe Flash privacy and security settings -# -# For more details on the meaning of most of these options, please visit: -# http://www.adobe.com/devnet/flashplayer/articles/flash_player_admin_guide.html -# - -# Lets you prevent users from designating any files on the local file system as -# trusted -# 0 = Not Allowed, 1 = Allowed (default) -#AllowUserLocalTrust = 1 - -# Lets you specify a hard limit on the amount of local storage that Flash Player -# uses for the storage of common Flash components -# Size in megabytes (default is 20), 0 = Component storage disabled -#AssetCacheSize = 20 - -# Lets you prevent Flash Player from automatically checkingfor and installing -# updated versions -# 0 = Not Disabled (default), 1 = Disabled -AutoUpdateDisable = 1 - -# Lets you specify how often to check for an updated version of Flash Player -# Number of days, 0 = Every startup -# There is no default value, which falls back to the user's setting (30 days by -# default) -#AutoUpdateInterval = - -# Lets you prevent SWF files from accessing webcams or microphones -# 0 = Not Disabled (default), 1 = Disabled -#AVHardwareDisable = 0 - -# Lets you prevent information on installed fonts from being displayed -# 0 = Not Disabled (default), 1 = Disabled -#DisableDeviceFontEnumeration = 0 - -# Lets you prevent networking or file system access if any kind -# Set to the executable filename, default is empty -#DisableNetworkAndFilesystemInHostApp = - -# Lets you prevent native code applications that are digitally signed and -# delivered by Adobe from being downloaded -# 0 = Not Disabled (default), 1 = Disabled -#DisableProductDownload = 0 - -# Lets you enable or disable the use of the Socket.connect() and -# XMLSocket.connect() methods -# 0 = Not Disabled (default), 1 = Disabled -#DisableSockets = 0 - -# Lets you create a whitelist of servers to which socket connections are allowed -# Set to hostname or IP address. This can be specified multiple times in this -# file to allow more than one host, and only takes effect if DisableSockets -# (above) is set to 1. -#EnableSocketsTo = localhost.localdomain -#EnableSocketsTo = 127.0.0.1 - -# Lets you prevent the ActionScript FileReference API from performing file -# downloads -# 0 = Not Disabled (default), 1 = Disabled -#FileDownloadDisable = 0 - -# Lets you prevent the ActionScript FileReference API from prerforming file -# uploads -# 0 = Not Disabled (default), 1 = Disabled -#FileUploadDisable = 0 - -# Lets you disable SWF files playing via a browser plug-in from being displayed -# in full-screen mode -# 0 = Not Disabled (default), 1 = Disabled -#FullScreenDisable = 0 - -# Lets you specify whether SWF files produced for Flash Player 6 and earlier can -# execute an operation that has been restricted in a newer version of Flash -# Player -# 0 = Deny, 1 = Allow -# There is no default value, which falls back to the user's setting (Defaults to -# "Ask" -#LegacyDomainMatching = - -# Lets you specify how Flash Player should determine whether to execute certain -# local SWF files that were originally produced for Flash Player 7 and earlier -# 0 = Deny, 1 = Allow -# There is no default value, which falls back to the user's setting -#LocalFileLegacyAction = - -# Lets you prevent local SWF files from having read access to files on local -# drive -# 0 = Not Disabled (default), 1 = Disabled -#LocalFileReadDisable = 0 - -# Lets you specify a hard limit on the amout of local storage that Flash Player -# uses (per domain) for persistent shared objects -# 1 = no storage, 2 = 10KB, 3 = 100KB, 4 = 1MB, 5 = 10MB, -# 6 = User specified (default) -# If the user does not specify a limit, the default is 100KB. -#LocalStorageLimit = 6 - -# Lets you override GPU validation checks to force hardware acceleration -# Warning: This may make your player (more) unstable! -# 0 = Check GPU (default), 1 = Skip checks -# More details: -# http://blogs.adobe.com/penguin.swf/2008/08/secrets_of_the_mmscfg_file_1.html -#OverrideGPUValidation = 0 - -# Lets you specify whether third-party SWF files can read and write locally -# persistent shared objects -# 0 = disabled, 1 = enabled -# There is no default value, which falls back to the user's setting -#ThirdPartyStorage = - -# Lets you disable "Windowless" mode, which may cause crashes in firefox -# version 3.01 and earlier. -# 0 = Not Disabled (default), 1 = Disabled -# More details: -# http://blogs.adobe.com/penguin.swf/2008/08/windowless_mode_fix.html -#WindowlessDisable = 0 diff --git a/www-plugins/adobe-flash/files/pepper-flash b/www-plugins/adobe-flash/files/pepper-flash deleted file mode 100644 index 31b5575..0000000 --- a/www-plugins/adobe-flash/files/pepper-flash +++ /dev/null @@ -1 +0,0 @@ -CHROMIUM_FLAGS="${CHROMIUM_FLAGS} --ppapi-flash-path=/usr/@FP_LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=@FP_PV@" diff --git a/www-plugins/adobe-flash/files/pepper-flash-r1 b/www-plugins/adobe-flash/files/pepper-flash-r1 deleted file mode 100644 index b70c40c..0000000 --- a/www-plugins/adobe-flash/files/pepper-flash-r1 +++ /dev/null @@ -1 +0,0 @@ -CHROMIUM_FLAGS="${CHROMIUM_FLAGS} --ppapi-flash-path=/usr/@FP_LIBDIR@/chromium/PepperFlash/libpepflashplayer.so --ppapi-flash-version=@FP_PV@" diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml deleted file mode 100644 index 359704f..0000000 --- a/www-plugins/adobe-flash/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - -desktop-misc@gentoo.org -Gentoo Desktop Miscellaneous Project - - -Install the Netscape Flash API plugin (for Firefox and similar browsers) -Install the Pepper Flash API plugin (for Chrome and similar browsers) - -