From fc0aca0068e331ed8c0f4002c914472d8ded15b4 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 13 Jun 2024 16:12:11 +0100 Subject: [PATCH 01/10] Drop coreos-devel/fero-client and any usage of it We sign releases manually now. Signed-off-by: James Le Cuirot --- core_sign_update | 25 +-- .../coreos-devel/fero-client/Manifest | 133 ------------ .../fero-client/fero-client-0.1.1-r1.ebuild | 1 - .../fero-client/fero-client-9999.ebuild | 196 ------------------ .../files/0001-gettid-glibc-2.30.patch | 34 --- .../coreos-devel/fero-client/metadata.xml | 4 - ...48.ebuild => sdk-depends-0.0.1-r49.ebuild} | 0 .../sdk-depends/sdk-depends-0.0.1.ebuild | 1 - signing/sign.sh | 65 ------ signing/transfer.sh | 20 +- 10 files changed, 6 insertions(+), 473 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/Manifest delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml rename sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/{sdk-depends-0.0.1-r48.ebuild => sdk-depends-0.0.1-r49.ebuild} (100%) delete mode 100755 signing/sign.sh diff --git a/core_sign_update b/core_sign_update index fca2ca8191..808de93d9f 100755 --- a/core_sign_update +++ b/core_sign_update @@ -18,13 +18,9 @@ export GCLIENT_ROOT=$(readlink -f "${SCRIPT_ROOT}/../../") DEFINE_string image "" "The filesystem image of /usr" DEFINE_string kernel "" "The kernel image" DEFINE_string output "" "Output file" -DEFINE_string private_keys "" "Path, pkcs11 URI, or fero: for private keys." +DEFINE_string private_keys "" "Path or pkcs11 URI for private keys." DEFINE_string public_keys "" "Path to public keys in .pem format." DEFINE_string keys_separator ":" "Separator for the above keys" -DEFINE_string user_signatures "" \ - "Colon-separated paths to user signatures to provide to signing server" -DEFINE_string signing_server_address "" "Hostname of the signing server" -DEFINE_integer signing_server_port "50051" "Port of the signing server" # Parse command line FLAGS "$@" || exit 1 @@ -68,16 +64,6 @@ for key in "${private_keys[@]}"; do done signature_sizes="${signature_sizes:1:${#signature_sizes}}" -# We don't need to maintain backwards compatibility with old `sign.sh` scripts here, so we only -# allow colon-separated values for user signature files. -IFS=":" read -a user_signatures <<< "$FLAGS_user_signatures" - -user_signatures_arg="" -for user_signature in "${user_signatures[@]}"; do - user_signatures_arg="${user_signatures_arg} --signature ${user_signature}" -done -user_signatures_arg="${user_signatures_arg:1:${#user_signatures_arg}}" - delta_generator \ --signature_size ${signature_sizes} \ --in_file update \ @@ -137,15 +123,6 @@ signature_sizes="" for key in "${private_keys[@]}"; do if [[ "${key}" == pkcs11* ]]; then sudo OPENSSL_CONF=/etc/ssl/pkcs11.cnf openssl pkeyutl -engine pkcs11 -sign -keyform engine -inkey "${key}" -in update.pkcs11-padhash -out "update.sig.${i}" - elif [[ "${key}" == fero* ]]; then - fero-client \ - --address $FLAGS_signing_server_address \ - --port $FLAGS_signing_server_port \ - sign --pkcs1 \ - --file update.hash \ - --output update.sig.${i} \ - --secret-key ${key:5:${#key}} \ - ${user_signatures_arg} else openssl rsautl -raw -sign -inkey ${key} -in update.padhash -out update.sig.${i} fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/Manifest deleted file mode 100644 index 2c9c729562..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/Manifest +++ /dev/null @@ -1,133 +0,0 @@ -DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65 -DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa -DIST arrayref-0.3.4.crate 7028 BLAKE2B 90a1d155801035d6883fd40b636e9c5c1f20f56b0823346f841035c8b93cdeccc9c62e448e0bba6c56daf7a6bc11d483728e85a34ed814330b7d53e7519dd3c3 SHA512 64a53e4fa200b2a43396ae79e7bebf9f7d6e97ce407f97493f80a220bdeac795915ef267804a137426ce2322fffdff1768bc8fbeef8436cb99cd95e79d7493d5 -DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b -DIST backtrace-0.3.6.crate 28437 BLAKE2B 63f056086b8c56707e7a3f9719e211a70368584c85a6a3b05ed8ad31cf3ac86f6fc091c826392439fcaf9a0f4066de8da00449a9715d90c1585d450fff63bbdd SHA512 c42e9891a2297aefa08e6ec627520bfd3f93f7eddc2782cb5eb277092d588b1d84e75ac724d29548eab77de19de3400748b90bf2eccfed5ce1e20a979dd210e6 -DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4 -DIST base64-0.8.0.crate 33091 BLAKE2B 9e72a457841f532956b684a30906924756fd791da2b1fbe6cd0ff4c418738f6eeea15d1a8379e6e033d0acec17736c78c4b01dd352dd5e9d59fd230be91235eb SHA512 7ce30633e5fa48cf0103ec66183192ecfec03a64b8147f42e5fd4dc9bb0d2e7885c19f7aadb130d306b8fbef6798b97199a1ab65b7c19a08b6d35d2e076d518d -DIST bindgen-0.32.3.crate 172240 BLAKE2B f0f71a49778fb0dc6f99c690c9bb06975d181c686bac60b0666190ec3df3f11f2fb098f0364bef181daf3ad7190c097603014b226ea64452c7a9dfb314c41e75 SHA512 c20b844849d2f67f3e4d4b39ee372833cc94082b749954bb5969fe20b56bbdd01d28383f97a6ec70cd358e823aa1fc192165920fd6a6abe843739d07c5028a67 -DIST bit-vec-0.4.4.crate 17895 BLAKE2B 5c53607cd8a88ae518ccb6a1802ea56b67f619ade59ee40c13ac87d8a0bc2c7179eac8a27d075c3bfe84c166356fbe8a7e488faf2ca9567988cd256d7d6e2a47 SHA512 e42790ba17117c5b60c5408c06097ee6b0e142995cc32d6b626a31ef17e054f7fde7af0792cfeb38290b54a822f951ba06f4794a1e8a4e03934447eec1f6e021 -DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8 -DIST block-buffer-0.3.3.crate 7070 BLAKE2B 696a4e1d56b684eb1b03cb0851724d5118e02c4e8d428c8e4d22cd2b86e8120c7524c9a6298657c5869f33ff6367aa343f583cf42dd8b48e83b3ca849070827a SHA512 4214c64c16e66824776ea141241e2c2e5ec8249e99ce9706eb573b13e338976388338d484528d41587af48ece63e5403c813c43578457b7a550b7db31373679f -DIST byte-tools-0.2.0.crate 6454 BLAKE2B 8fac079ccb1f8bdafacfd54d0bb20628b3c1c08ffdc86feb70c44ae973cb36dbdb8bf92fcf859535d5de0098b936592db68e4951edba8890902107d8952fc314 SHA512 bad83b237d3f8dd1784f9031f26dd8ce2772aa9d307951cf6f5eb6c445567f80b554c26f597a2933d4164adc110e42db618f35ee68e951a0bb837abf20f6b0b5 -DIST byteorder-1.2.2.crate 18909 BLAKE2B 69b23142053a738768028a9b28935461d5f12e1ac8849e30a007e7f223efe81004c4815ba13b92fa9e23867d32867810d889586f4d70bd5bac3280dfa5a6eb51 SHA512 b3b0aa23f0d6a5023fbc8571e73cb7aabd8148f9dcba8da9aad49cabf97dabbbb3a05764cd3604edbd00ecb56ee0695cd30a67d9d51264539169e400d7bbc478 -DIST bzip2-0.3.2.crate 14720 BLAKE2B 532e2e5e41eb2f24a2a96ef5313da1f6c12f2a6875179c1b57c0e44f86380699fa607c3b470b584b6c0407611cb12f90188cf549219e789f561067dd75ba2386 SHA512 da7fca72b1a4e476d39fc670fa7f92bc3963c21c19cb6fe4ac878a0dd4d2a72d0795087b3bbeeecd3c600b7ff8e353dd0217c3a17c9594e1ba2a774bb8aa70a4 -DIST bzip2-sys-0.1.6.crate 609274 BLAKE2B 8203c31de6279f5f80fc2549978eb2762630e43d85ee534bc942b36fb00daa076ed8314468a84c4ab6320948c80b1b0d455d571873fe60703783dd3eb67531a1 SHA512 d7c69e8eff1b9f1317577ccf0cbaffb6ed284c3f1f6c18db96e2e5380e69a818406107e6bc2634222c2f3ed56c478a1cb9ca58b7b3df29ee4a82e76493533d63 -DIST cc-1.0.15.crate 41839 BLAKE2B a00d432720c168b0d69fc7d321d3abec3e18662c6e0c44e6092482e7215dc51688b1f01888150f060e57c88f3003e58b5f8985f1dd31731bb259921bd7a45d9f SHA512 220b88ad675b076b6fc322253f4f8de641fb2c3b27814a3fa5fdc2f79c52e93f2de4e6fc176a6d3a0b7a9fff46d9bd2d4396310cfde4a68f7082224510a9a831 -DIST cexpr-0.2.3.crate 15747 BLAKE2B 59f416a367b2d129cbc520a04fedf867740e0bddbf9cbf9ace4ba0396e9168f066b517aac365d7c40c40eced6667f4cc5d1fd42b7142c275d1533ee5c16a2bf0 SHA512 93d87866dc192af4c091dc43484af58da6470cdec61f1b638abe3c084772efc084ce3a04ae3499a7c7dd89a19b672f383c68e74444fe67a984bcb1d968ae1e2d -DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa -DIST chrono-0.4.2.crate 129309 BLAKE2B 691be25cb01dc36b65dac214b7e0246515f85d646deb2754adb53243ccd30f84d659eef6c2c2d9169af98adfb27b52dc04a345ce6ade3236ece4a37cf097d4e7 SHA512 1433e5293931b41598ff7e50f233c8b17c6297617fb86ea293ae0f6dbea2d074b896ea8eb63edd4fb0f5c16fb8663666370cb76e7b3789efade06af202d6a74d -DIST clang-sys-0.21.2.crate 31272 BLAKE2B 35109e6bf0f4f7167510f96a48aaf5c2d927164924ab3c22cc3d69fbda79efdb01644b48b07203eb20890750c42ff45d159e9185f21984af6fd61cc2b163fc0f SHA512 01209eee3355f63952f05039fc2c5c044de9c9c8709dcd7a8d37326a5b8807813d0ceae8ab559efa8676cf501d2e34ababb4aab159d40815df330cb936318ce7 -DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127 -DIST cmake-0.1.30.crate 12477 BLAKE2B 23529899687c844e3d0e864272d964d5d4ea1900afbee9e4c323a4712fe9341378f41667463cd3b9e6944bc56c123c6331161e25e8816143a8efc3109164e14b SHA512 c27e7b6e50e77409f1e7481a88839e2de64ce6d94345cd955e9b3ff6f5720a090f02adcc1067113471cd48125b236952c0177920be7e03cf15bf2baa323788b1 -DIST conv-0.3.3.crate 22124 BLAKE2B 9a05d9beecbd288168438e920ab4f42075f1217f224c9dc91d8e23869808868274e108ae5f881da157276cd407a63f2e8dd990b7cd9fa1731045c2cbd2f3a48e SHA512 f050cff8528f0fb5a8dd936995c423c5478afc47041c3a8cc8611ceae3228098b80589fdadf78d0028e960fa354768440dd7084cf295a29f2c6aeb554f47a8cb -DIST cstr-argument-0.0.2.crate 4402 BLAKE2B ae1de0d3c0ad08619b91a55cdeb202d726702c0bae1dfc9d6d5c6db137e03636fed5cf28575076d7c496e962c943a4c74cdc386dc9b719b5d8c50f8c5733aa18 SHA512 2039633777ea82202430a22d0f34aa6e3d5abcbb2636c70ef211bad747ab588864acf6a6fab10e88b7135d6dd7b89e39880d5106929ceeb409bf2aae2a46018d -DIST custom_derive-0.1.7.crate 10700 BLAKE2B 205c46bd4f052873ff9790974052f8d81ca1fb16815b591d20db96fb330ef5b782a54eca9c07615edc5e55ba93eb38fcd37c1225f49251e83ea6059ed2cc3910 SHA512 593a98f7c9adfbd07eeacbc6915d3de053ffb33076099f425f5a72c089ee0dfabab8ea31f525cd3eb5da5c19782925ddd14a3672bd9999c6866fd9f14150518c -DIST diesel-1.2.2.crate 169803 BLAKE2B 8b5d8ffd45dee99dfedc85b66f9bf31b728f68c1be24684f25ada00bb1694085f58724df092639c4f10ce2e98b52167ed00108feb8ab4417459f79c6a9b3e13b SHA512 f9b8e47e83d8a5bfe42bd74dc5159a07cf8d254797815c4b982753f58e945d3bfe3d973af02cde08a0746a6a0f1518a31da84d23564dccc13fe9ea539fe2a196 -DIST diesel-derive-enum-0.4.4.crate 9636 BLAKE2B e17461f4f65abac2602f10a0e2ca3ecaceda3b4027ddb230be5e01fcab212a253b21d4246d034ef4de2d3c4493e3bd78d4ef4e561cf8ea4a6690cfbbf58c0356 SHA512 98610d5ebe65ee9343e6c387aa3aac1606bc7d41a6ec24226d45a5351a9b0cdcaa6da689bf380bf83a343367c9a5dd647eb662fda3da947eac1e1f91383e1e80 -DIST diesel_derives-1.2.0.crate 16087 BLAKE2B 5406f7120ba5c1a66c981e06cc36477b98be148348ebb688ea6cdd21088fe297b766e09f841e741bcc99732a7962bafcd6151eb10f8d4ce559102d07b9e01be5 SHA512 1dc38f333c6ce8b660318130e52f45b665a8a44853789c0dd0bbc689c3a0c0f860d20bed552622b23257e77602b803399b1d44f8556a508bb63824e7a976f0d0 -DIST diesel_migrations-1.2.0.crate 3081 BLAKE2B 4f18cab86c00071d7e177f4d3647246f7c2a0a29bea6a086ac18f20d34c932e614ae0f9c1dac5f8e7f4ecc7a32d2e96b10fd122314a362689a65b74d45c3df13 SHA512 c3c2af2993968c703728831cdfb2e4792ef07d005beb96f306e52f73aa21c7943a35310afc8b2517e7023279768cb7f34092b81c8c27ae9ca01ddd2c726bef08 -DIST digest-0.7.2.crate 8386 BLAKE2B 1b83e7ddcd3ab570381a25097eb93e51744d3df76d9b64be9af46594373e6460668f9ea58e94899119df4278720781261d319eaf2ffc5190c0a1d7389e5025c5 SHA512 8232be4fbc7a77d437933d18423ed6c113abbc84084ceb998fac26413b374266975fd3c00e90131985c800dd0b83ff006dd9e77629d2e6ee19638bd67295ff85 -DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246 -DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b -DIST failure-0.1.1.crate 26782 BLAKE2B 6e00d30bc0189325e540a0a9290e517747ebbc79a94a884540de1f46fc0a64d257b59604725cdc30e62731b51e45b6aec215d2d488bffea6511b6ff53be50a0b SHA512 3c4075dc13c3ea6557582455ab3bb35ea81bd43892de5fac103e7dbcdf24ca3614e3b3673f694256d9fb9c6bdf97375ea17fbe290148881599403c01dab0e5e4 -DIST failure_derive-0.1.1.crate 9312 BLAKE2B 14dcb7bab17f874e5f3efa9abd059e079a4580d918017825de104851fab0b0cfb88aba4f71513f387ca645ab74a3199c5f0268853c156111c67351e1c7e9327d SHA512 885b45ebe5098f04699bc0c7cf2b6816d3afec6f111f8d244b0fa824c0198127ac3062e23c052186e196832755e9e0b271e5efb005df35e6d1e4d671640b8e91 -DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 -DIST flate2-1.0.1.crate 61869 BLAKE2B 3f9b94327ae0d044f962759fe498776d7bef014fb93328e3454f5cd8f37c8ac8c8c5d3f38825e4744a07dc873f93ba5fb420450677a55622afca8492c9423057 SHA512 2be6cf3228e9df76643e7b45ab1ea4956e7618e90e9bf8cce62f6d0bac864e2bd7a808aad1b54728797831b170801acf43a6a254d9268c8fc57052f1e2d172b9 -DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 -DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 -DIST futures-0.1.21.crate 155902 BLAKE2B 224db9e9767d76daccb8dac39f8b9f536d53829334a8dca0e14ec9f1b84aaf387d4bedbf116b635a4f3d63c7ec38a771f4ecee269a64d514e813f7a21f14b679 SHA512 b6079674974489fc325182404896ddd6c2fb3a3a230d0a5ebb611a418a404378442550c92c9895aad9742a6d305a90f3099c9d6ca5bdce55ed1dab2b3e01e755 -DIST gag-0.1.10.crate 5491 BLAKE2B a734246685628166de020a44d34968ecc53739f65e058d9208b133afafaadfc187697076b3b6aea158442178495f8ba53c4f6a77723da88ba72127e41c509cf6 SHA512 db76c8acedfc9ddd255f6b4ec1162c6f0391578b603807ac725564b79f2af7f78c231f36831e574775c22626ffd8f2309126ab862d43abd12345cb013fcc6d32 -DIST generic-array-0.9.0.crate 10702 BLAKE2B 4b8216493f7ffbe4dd6633b0595c0e0fc70aeea7de19da510241fbac3af4dc02e12c7986361246b1fd7167f73e0a1435b80d64804cc6fb66174d42825be79ab8 SHA512 e2a00d8856a4231a5c29bae592b2a84b98c70737058104fd67570af1220259994d11cb4506f1a1412f3c8a04576fe2617ef015600f677ecfccc8ff7a07425400 -DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e -DIST gpg-error-0.3.2.crate 4161 BLAKE2B 1fccab9b0a2e35c721ec168635d2a757f49b085ccf625e9d8def40e3d536319c061618910565fac8a0206efbd3dfde8d932e06f41810d7334643d221a836b8e2 SHA512 5dd640067556e00f3ec51cc9869a81d10e243b6db85d8da2351a97f3b8052d3097d7436f2602770ad2d4712e936b47bcd3116b2ec80e41ab088e13ad12725f93 -DIST gpgme-0.7.2.crate 75595 BLAKE2B 608d662a62c053fa038b7933c5c512953bfaed8e5f685c36189a60959b20677fc1b42726ec2ab4f09368d6b368bb5f7a749d10d68c1bec08425725d60425de5a SHA512 f975ba04a380dae698d5360ff31c0100149e6316a877ae9dd1029b6cc99bc2607bb5237ecc84b69e5322b4ca9a3021cf9da2e899304fc3b74f76a6b5f539d119 -DIST gpgme-sys-0.7.0.crate 1799939 BLAKE2B 9dff707f1c93a05c57f79294df47d630efdb136c60793808fea4f3d6a16d873b22ea2c6406f286ae1d33445a909084ea25d668372862a1c479f16d150aa5bac4 SHA512 d7f85d3013da0dc0f23715601818eed7e3b88f09fae1ac00068177f8caa42cbcd0ef80fba2049966e2452f08b7ad15a4ba2caf68bf95f21848ea53b16ce3012e -DIST grpcio-0.2.3.crate 47106 BLAKE2B e79d0e437c3780ef0028ba968f8d8ae4843e168f86efc626f1fc57caf79083150c12b443e20d08af0b04884468cd7d2cbcef2abe9ef7a172e2035c8533deda72 SHA512 03dc64dd058b8302971032b01e250c7ab55213b51cf81fc5a1824851ad5d9f0417d7495b10c98782c0ae6ba75f9350241d01a81e469c0945bd185363712349e8 -DIST grpcio-compiler-0.2.0.crate 5456 BLAKE2B 9e9d302d860e305ad7ba67b43776cacc4d6438fb3b3d0dbb4812bea80198268444e05304582eca75d944386f368aced0ca94be9c67602ff72cb1d97a16698e70 SHA512 d693ad6d60123992984341ccdf671b37ad6cf5949154c0435da85a8f2fc3ecd975c56a0d0cc608c3fc6169c6849b1371e274ffb8a9d24c429203bc5868404a1f -DIST grpcio-sys-0.2.3.crate 8844428 BLAKE2B f397e64f643bd5060eee6044c63a6180205e34c3064c0e79b1a8af1f1a81e2a1fd2922c302b5085f983488b9462ebda42d2d153cd9e59ef50499c5ebe2fd362c SHA512 23cac70f2e1a2b70e87bc10ef5b08bb23e47811f5f1ff4e095a6ff185c6f1c97cf1b4d9737c2780bb10c4f43f1cde5c15445881874146d2aa21ea603a7f05bd2 -DIST heck-0.3.0.crate 54128 BLAKE2B e2b922c722afa5d67e2c8a1ec2195ce579541141c9fc983afb2589de4c5208702476bd57c928b5358a5f8d09c5e67c179c7c43bf6bcdf4031cc0b78385c92c94 SHA512 6987552f783d26064968c2860e1ffac9ec1cdeaf69bcc2966e81c151bc001e481157179742704d41d7094198559720b89ad4113b989a9d3288ef2f2550c67903 -DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b -DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b -DIST libc-0.2.40.crate 327272 BLAKE2B fbad5d1e07d6ad43cf0c94d1e5e1ae9dc11490d7a500a796060fadef39b4b58778aaf9eea27c6bf93b9481b3d94cb807e192860eb074c682ac559349de9bf9df SHA512 21dfb230796885d4459b1119de31f2615ee4f1020578e74d2e07fa5340777fde4c2f60aabba7444f00434519c95f12e6e1a3bfc496b83c11cea582a219005dd4 -DIST libgpg-error-sys-0.3.2.crate 842786 BLAKE2B b8320dd583e7957c63ed7013b98f97c9ad1476815f454a3def0a15126fe1013ff2fdd717faa978b562c3cb7bae4c5d6a50bff30f2edf78eab7427089918dc721 SHA512 8c12bf87ede2108c5e53e74af1ec9c7b9d2c0756cfccfb21038f5995181f23d916f943da08558e5f9e10c109d6ef7bbd9a497faf7d65933989abc0595567a9c1 -DIST libloading-0.4.3.crate 15613 BLAKE2B b2c8c60e8f336043ba30bf17006a10f260b740fd167e139f98f2fef8704b331740084a6916667f960394e562c09a9c1c7f87e48133b4e947c4203f0ca1e1592f SHA512 ca5f6eef2241e7246d0d00808fc2feecfda4a424a2a34e5125ba020f5b555f6bad9aa26236b99b2515c465016dcb0a549cf3138cd8973d3a52e5ce12b75b9bc0 -DIST libsqlite3-sys-0.9.1.crate 2025898 BLAKE2B 17752c3a6963c5d0118e594f0795842785886e48ac8dcb2f2c0b087e38c4f3c67069693e552b0c01523816c8ecfdae22c9dfa527045113812b5c979307f735ab SHA512 a889fe811afe6aad12270cda3c9b98e24eafe32bb9aa86bbe902f3b4a774d828c8a2fe4ace3fd412b2f020242727d7d4e2d492f1f009de0176636790f69b6076 -DIST libyubihsm-0.2.1.crate 34948 BLAKE2B 355ffcaba8ee7fc18f46e98a0ebb31888e709ceef235e680d9b67a5345c3ef0e97298b0cb83091cadc61ca4b33e85111aef86a202b5865ec65aa8a0dcf513add SHA512 5786399f1d9a83dc4807215048c67ed7905ee10317575c2e9258768dc4b7fa02653120b720554dbbe0efd0594336a0822d7d1121455474b4e1ba639f3f40a647 -DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f -DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0 -DIST loggerv-0.7.1.crate 10074 BLAKE2B 2590f84dc12ca93e5bccfdf96b08f615408346e33301fa59127ed19c12474a22da53ec5c0e728cdd45ba00e7c66cce3c83c5717e156a88b613bc55b8b97ed3df SHA512 51ef7ff7ebdbedb5c23d4dbda9466bdac12df97fe1247e198323517ea7e34761b744d4ca083eae37a73241417213dc1e90441df9c4bdc2ecbee7854a04dc9c10 -DIST md-5-0.7.0.crate 12771 BLAKE2B 55e02ba50fcd3089c500599952af8788cc0cbe23a33644306125f6bc4ac07aa9193fe107b663e403c4dd30061fb347578818be40b5bd4d46e03bb510efda59b3 SHA512 8e89377c0451e73ed119ece369078c52374f856e03893aff94935144d90cd184e31ce5cda35c2e9c295b8f0f53a6624084e719081d8016dc658fb045d9a794a8 -DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24 -DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1 -DIST migrations_internals-1.2.0.crate 7412 BLAKE2B 4b4faca0af25143713fba7d761871ff02ec11f61c2ea996d3bbd9a07589806a4d297eb37af5643c11a1e922e218e33b0320a9ba66717c98ed754e6a7ab8475e0 SHA512 20846c56986d95c5976b63376064d7907116dfbc2f3eb7cefed4be0596ffeec4fcb574d17a4799e69a32d6f77b62400563c0216aafcf53b21937247c4472dce8 -DIST migrations_macros-1.2.0.crate 3611 BLAKE2B de588b0bcd89c4c3c7c485e6474191377cd421dbbe4847278d2e866f86446e59f6bb673f5ed602c1aa99ffce2fc50bd4ac371ed1ebabbf283bc76fcd54de863a SHA512 1c9c5d6b6a59925b050d6c816deca70d2257d274c8eefe046e202bf0963694368e556237ad7c7d92ec135878edd9f38b6b83c90c5e0e53103dd028c1d75f3841 -DIST miniz-sys-0.1.10.crate 53357 BLAKE2B 88c511d46cfd47fc2053bf618180d6da3e7912bc9d0e84e4f904506daeaa5664c5f7c5036f3536c8c6def2a5b2d0615bb3bcd309653544c236ac3be64987cfaa SHA512 d7a6f0bc462cf10a5f630ea20f4c991830059b359f67780e160a662671a8bab21bbc29aae2220694d008817b1227b9b8e0c3c458b99a29ad2e5d141241c60844 -DIST nom-3.2.1.crate 104073 BLAKE2B 0aadea9d5b79fb0b34ace1c1c410119c954982810d928a033ebc280a824da6af61035bd1b31fe5f610812b9ebdcc02839ad5e863148aa01733b5c8472335d70e SHA512 2baf05e568c426eaa1560569538e0f08706e40333a797374bd3f897bcadfcf239c6dc9eaabb99e9ac72d8b79e46f12ade8b5d88b04ce10ef24e8b21513392c77 -DIST num-0.1.42.crate 8323 BLAKE2B 24c31affacb1a4bdfc30e30afc402d92344d4d17079b9cfc103e5a7fda50b0c62a877180b94af79a8898bb2b81de44324b04c00d5983c8d10d30581f3027464f SHA512 d8d48080f84dbda59d16418f39aca158deda1fabfba2aed1944f77b3c6099a244d7a32e79f28b9b72dad4cd446a8f4f854afaf3f368e3ffbbd124e64e4aef3cc -DIST num-bigint-0.1.43.crate 63022 BLAKE2B 428c1bb5c0e0ce0c3b5a0658a555ef79496f52384c1df393563c17baca1888d4ffc1088ecfe06028190b3265829887d95cef1839484748361fd0ef3f5625ea7b SHA512 07119e28588b22236fce2f5cbd074ccc1b5a31081a9f5ca3d5981680ebe68231b21c1250d80f656ab1411f0ab3aa942d54889845c03935f28e68fd510ae943cb -DIST num-complex-0.1.43.crate 17731 BLAKE2B 4b18c7839e7826c16c60b15f9d5c6bbf9f9874e962429cfaad6fc9fc9bca9dfb260ae390e051dac2b2e6cbd4700666851318ccff137badab00bd39f8c4407732 SHA512 e82f3ea86e9725a51e6669aad07b87dfe86cbf2fcbf76629a2479bcb9b7c5ea2cdc2fab7a98091686c15f4ae7ab68c66e01982f35738f9055a41938930e72582 -DIST num-integer-0.1.36.crate 12168 BLAKE2B b492ae16a4143996d447dd2cdd348ebee6237d924e2f756ffb4a236b9de166a9b12355ba8e9027bebb58c50404ec64f392b0c52bf336c6205128e27d1184cca2 SHA512 9f7f8ae499ab181d77d69f6e761457fc170305767a0867142ccd549cf55c24b9731434f6289856d959ac239aee32a6574c77a5a783a701ca583310ed9134911d -DIST num-iter-0.1.35.crate 9013 BLAKE2B adfc4bfb7f390e2abbed94fb64348f4f4e7d6652f0bd5aab4d7f06a59c1cdeb46a5190ce3868e64705bec208a3ae4292516d99db2aef120153de5eb01a6e4251 SHA512 df4fc06ff7ae28b4576a1004d2284d49865e899ae315c5621258aa1087c951b2927e1e413d2a8fa992ede242c2e73eb40c6efbf3feb1adbbe5aad8ea323d9e4c -DIST num-rational-0.1.42.crate 17253 BLAKE2B a3aad3fac51192e00f00a4489590c1358adf1bc7d0704dd069375501fb820c1413089f542900ad5593745d4c5f775f7101a38d65c1e2fe892dedf3d6f83245da SHA512 f0ad3c6e807db1cccb5260caa1b2abce354d1aca63e765c0bb2d18401e941d57a47c8edbe485ff0d67ab363c937592e2adcb89538132b5a2d6d4408141f17ef7 -DIST num-traits-0.2.2.crate 34777 BLAKE2B affa210c22e3c27f743d6b23393fc61749e37c066fb4503f7d9d5e634a2236c2632bb9fcb4130be10aea64a583e15160d33e28570fbbaf8ef935b1864fc0a9e8 SHA512 2b2baea40084f4b1c7b4aace26681e92f0d4fc40686ce248849ca9672b2e24f545dd168e37f33ef162b07663e192d81c9b1f2ede1cd45afa5910fe9aa2c365a5 -DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721 -DIST pem-0.5.0.crate 6752 BLAKE2B 95dc8a87c9d6a14d7732a8f79a3b6f8ddf5bb8c8901976c371020065368887df6849970e207f3b5c2f4be173cee4355790e563c5f00b8e25e4cae73c01d9774a SHA512 dbe99097d09a439b4a0b21be6e8f9d756ed202b80b5789a4ef37ccc024b9e7d37b6d9bc102b611752de7498db2fc575e3ff104ac580ca00c36afc620da2190c4 -DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6 -DIST pretty-good-0.2.2.crate 18766 BLAKE2B a7e5779bcd69420acf18417ee6528e9c73a940f7d9f90538e985b5e216583f14376a8089caf9eacafc1589d5dfc29c7cd1aec45624ed31e35d61b52b63b57bf3 SHA512 77fc2219f1834d09ac7e0686b1740add648c552e0401f680058686526fd5f59ee3b8de16d3476cf1d6b8a518cb919aefafa84453fb0f8d776efa77797a0d0a4a -DIST proc-macro2-0.2.3.crate 21558 BLAKE2B 1facd121547c01345fdd4426a3584ced6939e15689aa0f9403fdbe15a2a499249b235fa59903a94cbaa776965f35d23f3bf8631935732ffb64c0d4b46a45cd6f SHA512 4805769dfba01ab6a10f1192189028cff8944ce4e3765ecd2a2ddbe6a66b0b4f884a51775391029277c69b8faaad4a9770835dd85c79a8ce4b9f5047496fc6f3 -DIST proc-macro2-0.4.6.crate 27767 BLAKE2B de75113c1481c23c97e2628db2fa1bcb97212778f566a0eb111cd8f2453dafdf688eb7879415d066babc1cb94545c6c71091bacf4d342839521a43b5ec935e01 SHA512 d5f92bee40455cdcbadae9a4ca8ebb08959f2d4996bf5165f1bc70ac02f55520286ac1342ca7bc7804d5116bd9a1dc18d2c6bd47e503f3c585c4682d3464b73a -DIST protobuf-1.5.1.crate 165142 BLAKE2B 9d05f1d4bb723914ded40c51476eeac342a4f41523a25e59a976cf02478fc88b8446937e62ddfb99e5dc68380d282247b8ba2cdd842dd535daba10de1deb4f6f SHA512 d9729b419637e5858c497c1780b3632c245aecb5afc521da7935dda7618f72477c51eca2dd24ea42e9c6c5109bb98c1464b701aeb3748cbfcbd6ba5fc0020a89 -DIST protoc-1.5.1.crate 2692 BLAKE2B 06c527ffa59eebdd3429b741a9bd47bb6f2e91209928e14dc650f588cc143fb3bd1444fc448c2d4f16fd1459e5b93002462361480a2d86ec65e4ab491ffe34fa SHA512 3461de8c79934e7f9d4fe38a934a9c9718b56180bf99cb1b08334f6d58084bf3f23f42e43693314b0449a1bf22c8e0344edff3c963788cde00fbbd956fc5dfa9 -DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7 -DIST quote-0.4.2.crate 14756 BLAKE2B 0387aa925e862704403e88b552a11d07ef7c0337288024b0decf89e86e7cb819d852776adc43ce953f1bb0979949d98f9cf9a5f163b0e126513abee31c0c96fd SHA512 9ca038ee67a2b3e527cafbd7cd3536c92316ad6a05b4d9e787e882c12e0548b5fac648efe1da98b9a517f213581b2afc57b5838f9e968b5385a5292fe9c93a2a -DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10 -DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad -DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48 -DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 -DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead -DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455 -DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928 -DIST ripemd160-0.7.0.crate 9716 BLAKE2B 9e24e43955c6de0dca5805e0f2b908f3dc00262de4c46b41c1a5308a630388b4c23176b7855adeed450f1fcd9adcbc25f85f2d1babb5575fbd500cdf4585416f SHA512 5c791c169e8ed9cd040184ff12dd37c1832e4f43b91199799a20a045725bccdb6926671b296fd146f123e8553bc12852c69a835e64b893e7f43aa45eb39b9dab -DIST rpassword-2.0.0.crate 8586 BLAKE2B c70ac825ab002abcbb8d63ed7d8e4fd1efed823ad706915799bde67e5f2882078af81c094968448d90f550651bc8d5084223a1dc5b98f666e5bf193fea1a0130 SHA512 ba9ecebc150b95af013fd0d26fda9242fb5bc4df37bea9ca1e14d435e4da9fbf3f165ebde3d8714dbbd75c25701109dc25dedb17a0b78f1b9992c0fc3b938792 -DIST rustc-demangle-0.1.7.crate 10681 BLAKE2B 2679a27863f3172712d13d24cc76e13c67b61ae018cdb1ce01296625a2aa4b53c3c44572e9d2bc639ce9f663e221fed8e91f79296bf721a3934b8d4267587b86 SHA512 75dd8581fd0dccfcc8cd2afaf18b9f44a5cea95f6c6573bf9e0b23d79cf5e959b3565bea0e9e26ee5b80f3142a16b549eefa99f5f65aa0ca9c780307091358ec -DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884 -DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a -DIST secstr-0.3.0.crate 6483 BLAKE2B c4158fe045887c020099b6c52e02e8292f2a92fbf47dd4842f864c95454e3754ac780b9f97b0ae521e0d7cc780107b30c77b8a9cc0708483ba92b42efe8f0fcf SHA512 524d90be4b53ae2123a6f309e066431e8c0effb9c5e7b795628521ffdd7e08503ef94b192aaa9b6a25884d723d52111fb557013d05348c439dfae35374cb41bf -DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc -DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f -DIST sha-1-0.7.0.crate 10710 BLAKE2B 50d78edf4ecb19362c8a76af9cf6731af66bd705edd2e39f2f955b4e63a5d7e0965db531b2ca42659420a92e2c635d7be1b603faba213dbd86febf9210d80773 SHA512 29201f72adf901eefc6360baf39e42d320f5ab0377d3f2b8b5026c9c26f319309f3c93136bd40e6b9faaf10d2f5293d43dd560132921524e8c7c0b5eafd37daa -DIST sha2-0.7.1.crate 17626 BLAKE2B 1811030e01ba9e33040747448718133cc2f1967468bc06d404fd7c14e183a3932be6c466362453190331f8fb149744836a6cd9bc1b4eff42259119dd4225b274 SHA512 356ec3d0764ef922b2ddb9168538115b6e5e6475ee34464a9d59f87276bbb697214cc85eb2bf1d7e90662169c56ae0c6454b851fda13e0010db464c936a84ccc -DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31 -DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983 -DIST structopt-0.2.10.crate 21488 BLAKE2B 44e64a23e9daa5115f316f964e3e113a4ad3c7f773fdf213a6e500784493b41714ff86a5d9c50b62d80d799ddac05d86d4ab57244694a6bb0416eb1934c6699a SHA512 890e53afc1161025606e09930494c1f1abb80d1d126966e5e7763862b7b7716a937f6c399db8ae4e0861a7e7db5467cd8cc61db1b32dc817bd74a5fe9153eda5 -DIST structopt-derive-0.2.10.crate 11091 BLAKE2B d85d51371e0e6acdfbadb005065f85e76c9130beb18484c447d5a2d075d6192ce14c896f4e555f1979138c286b79d391e41bb99f8b61e1c903867c6dc87f91ad SHA512 082826c52d88f61e07dc430861a345af78ebc6caffd115aeb8a0ad2388d7f0aa51fa071657b8c66f1c885d929f1e2cdaccab716905581d656a691fd74325b036 -DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e -DIST syn-0.12.15.crate 132636 BLAKE2B 4b0dd0f05f8e7c774b8400c088561c1af247a74846a8ef4e309b92fa1dd50c2f4859485014854ac975f79ee04c6bcd60aa28dfabe497090a8cf429b6e9a53310 SHA512 6d6afca4a83a8adf6f56b3609ecdc6bfafe0df7b51a5197dc6546dc53735351228faa49b5792b0819df52eeeb86416941513006d29fd161426535dae5cc32864 -DIST syn-0.14.4.crate 133818 BLAKE2B 30341fda4688c0e3f93d7b20e1cbac991e34b86a0e80b1bd5720026c983d348325a5486546c1aeb4649408f675351ca95ec982cc7c75ac914f55437b2d023878 SHA512 248aa29bab8403def4aba211fe7789efca3fc88571ff9646eadfcddb24b29b481066fb37ecc1fed947cbfa1d7a20a3f94384a9577b6ccc4d1fde9f52eb942ff6 -DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e -DIST synstructure-0.6.1.crate 11257 BLAKE2B 28a71b4f0e49a658064dd5b4eee0f1a61ef5502a24de4edb7aaa0f0741529a7640b874d19400757feef527ff78432e29fbe8574732e19a7395d13f2cef23d39d SHA512 e3234d03a99373a7c35a33611e7d5383b282f232a17c592d630dc2ef5613ca272d3f8419a87d40cf1d50f3ff982a01086d9b7a0202c5a819463d157f684d41b9 -DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe -DIST tempfile-3.0.2.crate 20825 BLAKE2B 0165940c98b5a28dcc087bdbaebd94dffe532fd571b7f28c440583848fa2368029c9416be914291f3ff0366066b2c99b8a241f3e581209f73fbfbf8c71188530 SHA512 8ece130a10d4a698884d3d29530c925944ef6d9bf8375b87abdad890cf1baa196b0c80b461b6ff436a8fb29931e181b4d0acba50e851ebbf4c0e9aa512e823c6 -DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76 -DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35 -DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6 -DIST time-0.1.39.crate 29295 BLAKE2B b94696ad093d016b7e7ad92744d30191d8221a7c4695bed3f3ec79a97d3acff853345fc703ce126107efe7add614b641317a859581ed49360943caa34f61e544 SHA512 522e9f3a1fc712a6dbb428d5bfe4ea32067028137d5c68c3e9059bb31c874785993aace65e9ac137fb8355f762def9c2602ec08217f395d8ef8bfc790b38108d -DIST typenum-1.10.0.crate 30009 BLAKE2B ea68f463c2edd2cd7ace126571a88cead26ea37beb8a13ebc00eb033d9a6e9d7060bebcdb208830cea4944a2b2eae16e7ed7a60f0b9270868559292bf99df6c7 SHA512 9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449 -DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738 -DIST unicode-segmentation-1.2.1.crate 68223 BLAKE2B 935c15d99571fc7fd597c2af9cee9333ccb1f19153fe7c8a835dce4f8cf13bd69e424d9e42b0a056b7035a9122bb5169cfbb96239aa2b3839e317aa495559e70 SHA512 431da71eb9056902c51a5ab53d239c8cf6448dc2f87be727628cb40a4808f5700f427936a9da4ef41935156896d9e0234b9de80aaae342b839e95c9a80d053b3 -DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3 -DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091 -DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d -DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948 -DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643 -DIST vcpkg-0.2.3.crate 6015 BLAKE2B 8259f1e9c137fdbbc0277976bfaec28074af3ce87149fffb441a5692c84b0e4a9c70b61b57d82c82d7603569fb3a9a86244a68a1834797e4745f179b941d1ce6 SHA512 ff1440f2d7d2e231fd959a328fc07ac1d4e4041f42723d2edf2226b74024aa13016eaaa364d7221ca8440381769ca03c24bc1c8d49aa2b5708871541b8a9ef0a -DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520 -DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 -DIST which-1.0.5.crate 5366 BLAKE2B fea2fd7040addae5f4511c48ca7c3140414fda04853e30a797e3a3c67df6dd6dde75d2c6537716d7d12b2aad2a0e113add7a13f994654da6b296b46b14fbe3cb SHA512 5f6f794abdac8479d0f2fe130cc72fa57dcb3f9c1310befcefa4110551bc5084dbbde503c48023a65dce9d73ceed8a705163508bcf1cb0fb975fb8c5202988ac -DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe -DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579 -DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 -DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST yasna-0.1.3.crate 19608 BLAKE2B 15d29bfa7c89756a8bbe3a14c94a1cf2e91c197904cb0919cd2d56b060959a7feb3a9365a181ee459a849fc96a8dcb23882c92608157c83aab36042137035728 SHA512 3edcb3ac918cc5f3b79f9699399650a8ccd9a80954abd7cdc2093ca0441c7603f73822de1eb376adf4ead7b8499af0981014436961b27ce4285f6984ce1f94a2 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild deleted file mode 120000 index 9c3c9626e1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -fero-client-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild deleted file mode 100644 index aefcc94e21..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright (c) 2018 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CROS_WORKON_PROJECT="coreos/fero" -CROS_WORKON_LOCALNAME="fero" -CROS_WORKON_REPO="https://github.com" - -if [[ ${PV} == 9999 ]]; then - KEYWORDS="~amd64 ~arm64" -else - CROS_WORKON_COMMIT="1fb33da499e51b2699394d158b0b66d36fc52974" # v0.1.1 - KEYWORDS="amd64 arm64" -fi - -inherit cargo cros-workon - -DESCRIPTION="Client for fero signing server" -HOMEPAGE="https://github.com/coreos/fero" -LICENSE="LGPL-2.1+" -SLOT="0" - -IUSE="" - -DEPEND=">=dev-libs/protobuf-3.0.0 - dev-build/cmake" -RDEPEND=">=dev-libs/protobuf-3.0.0" - -src_unpack() { - cros-workon_src_unpack "$@" - cargo_src_unpack "$@" -} - -src_prepare() { - # fero-client uses the grpcio-sys-0.2.3 Rust crate (amond others, see CRATES) - # grpcio-sys-0.2.3 needs a patch to compile against >=glibc-2.30. - # The crates's sources are put in ECARGO_HOME so we need to change - # directories before applying the patch. - local cwd="$(pwd)" - cd "${ECARGO_HOME}" - eapply -p0 "${FILESDIR}/0001-gettid-glibc-2.30.patch" - eapply_user - cd "$cwd" -} - -src_compile() { - export CARGO_HOME="${ECARGO_HOME}" - cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) -p ${PN} \ - || die "cargo build failed" -} - -src_install() { - cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") --path fero-client \ - || die "cargo install failed" - rm -f "${D}/usr/.crates.toml" -} - -# sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock -CRATES=" -aho-corasick-0.6.4 -ansi_term-0.11.0 -arrayref-0.3.4 -atty-0.2.10 -backtrace-0.3.6 -backtrace-sys-0.1.16 -base64-0.8.0 -bindgen-0.32.3 -bit-vec-0.4.4 -bitflags-1.0.3 -block-buffer-0.3.3 -byte-tools-0.2.0 -byteorder-1.2.2 -bzip2-0.3.2 -bzip2-sys-0.1.6 -cc-1.0.15 -cexpr-0.2.3 -cfg-if-0.1.2 -chrono-0.4.2 -clang-sys-0.21.2 -clap-2.31.2 -cmake-0.1.30 -conv-0.3.3 -cstr-argument-0.0.2 -custom_derive-0.1.7 -diesel-1.2.2 -diesel-derive-enum-0.4.4 -diesel_derives-1.2.0 -diesel_migrations-1.2.0 -digest-0.7.2 -env_logger-0.4.3 -error-chain-0.11.0 -failure-0.1.1 -failure_derive-0.1.1 -fake-simd-0.1.2 -flate2-1.0.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.21 -gag-0.1.10 -generic-array-0.9.0 -glob-0.2.11 -gpg-error-0.3.2 -gpgme-0.7.2 -gpgme-sys-0.7.0 -grpcio-0.2.3 -grpcio-compiler-0.2.0 -grpcio-sys-0.2.3 -heck-0.3.0 -kernel32-sys-0.2.2 -lazy_static-1.0.0 -libc-0.2.40 -libgpg-error-sys-0.3.2 -libloading-0.4.3 -libsqlite3-sys-0.9.1 -libyubihsm-0.2.1 -log-0.3.9 -log-0.4.1 -loggerv-0.7.1 -md-5-0.7.0 -memchr-1.0.2 -memchr-2.0.1 -migrations_internals-1.2.0 -migrations_macros-1.2.0 -miniz-sys-0.1.10 -nom-3.2.1 -num-0.1.42 -num-bigint-0.1.43 -num-complex-0.1.43 -num-integer-0.1.36 -num-iter-0.1.35 -num-rational-0.1.42 -num-traits-0.2.2 -peeking_take_while-0.1.2 -pem-0.5.0 -pkg-config-0.3.11 -pretty-good-0.2.2 -proc-macro2-0.2.3 -proc-macro2-0.4.6 -protobuf-1.5.1 -protoc-1.5.1 -quote-0.3.15 -quote-0.4.2 -quote-0.6.3 -rand-0.4.2 -redox_syscall-0.1.37 -redox_termios-0.1.1 -regex-0.2.11 -regex-syntax-0.5.6 -remove_dir_all-0.5.1 -ripemd160-0.7.0 -rpassword-2.0.0 -rustc-demangle-0.1.7 -rustc-serialize-0.3.24 -safemem-0.2.0 -secstr-0.3.0 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.7.0 -sha2-0.7.1 -smallvec-0.6.5 -strsim-0.7.0 -structopt-0.2.10 -structopt-derive-0.2.10 -syn-0.11.11 -syn-0.12.15 -syn-0.14.4 -synom-0.11.3 -synstructure-0.6.1 -tempdir-0.3.7 -tempfile-3.0.2 -termion-1.5.1 -textwrap-0.9.0 -thread_local-0.3.5 -time-0.1.39 -typenum-1.10.0 -ucd-util-0.1.1 -unicode-segmentation-1.2.1 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unicode-xid-0.1.0 -unreachable-1.0.0 -utf8-ranges-1.0.0 -vcpkg-0.2.3 -vec_map-0.8.0 -void-1.0.2 -which-1.0.5 -winapi-0.2.8 -winapi-0.3.4 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -yasna-0.1.3 -" - -SRC_URI="$(cargo_crate_uris ${CRATES})" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch deleted file mode 100644 index 8174587758..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch +++ /dev/null @@ -1,34 +0,0 @@ -grpcio-sys-0.2.3 defines its own gettid() function which conflicts with gettid() -shipped with glibc-2.30 and above. So we only define that function if -glibc < 2.30. - -Fixes: -grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c:42:13: error: conflicting types for 'gettid' - 42 | static long gettid(void) { return syscall(__NR_gettid); } - | ^~~~~~ - In file included from /usr/include/unistd.h:1187, - from grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c:40: - /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' was here - 34 | extern __pid_t gettid (void) __THROW; - | ^~~~~~ - ---- gentoo/grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c 2020-11-23 18:29:18.053038547 +0000 -+++ gentoo/grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c 2020-11-23 18:32:39.502926134 +0000 -@@ -39,7 +39,17 @@ - #include - #include - -+/* glibc-2.30 and above ship gettid */ -+#define NEED_GETTID 1 -+#if defined(__GLIBC_PREREQ) -+# if __GLIBC_PREREQ(2,30) -+# define NEED_GETTID 0 -+# endif -+#endif -+ -+#if NEED_GETTID - static long gettid(void) { return syscall(__NR_gettid); } -+#endif - - void gpr_log(const char *file, int line, gpr_log_severity severity, - const char *format, ...) { diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r48.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r49.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r48.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r49.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 3fa37ea36a..de9f637cca 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -26,7 +26,6 @@ DEPEND=" app-text/mandoc coreos-base/hard-host-depends coreos-base/coreos-sb-keys - coreos-devel/fero-client dev-libs/gobject-introspection dev-python/setuptools dev-python/six diff --git a/signing/sign.sh b/signing/sign.sh deleted file mode 100755 index fe852b7cbf..0000000000 --- a/signing/sign.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -if [[ $# -lt 2 ]]; then - echo "Usage: $0 DATA_DIR SIGS_DIR [SERVER_ADDR [SERVER_PORT]]" - exit 1 -fi - -DATA_DIR="$(readlink -f "$1")" -KEYS_DIR="$(readlink -f "$(dirname "$0")")" -SIGS_DIR="$(readlink -f "$2")" -SERVER_ADDR="${3:-10.7.68.102}" -SERVER_PORT="${4:-50051}" - -echo "=== Verifying update payload... ===" -gpg2 --verify "${DATA_DIR}/flatcar_production_update.bin.bz2.sig" -gpg2 --verify "${DATA_DIR}/flatcar_production_image.vmlinuz.sig" -gpg2 --verify "${DATA_DIR}/flatcar_production_update.zip.sig" -echo "=== Decompressing update payload... ===" -bunzip2 --keep "${DATA_DIR}/flatcar_production_update.bin.bz2" -unzip "${DATA_DIR}/flatcar_production_update.zip" -d "${DATA_DIR}" - -payload_signature_files="" -for i in ${SIGS_DIR}/update.sig.*; do - payload_signature_files=${payload_signature_files}:${i} -done -payload_signature_files="${payload_signature_files:1:${#payload_signature_files}}" - -pushd "${DATA_DIR}" -./core_sign_update \ - --image "${DATA_DIR}/flatcar_production_update.bin" \ - --kernel "${DATA_DIR}/flatcar_production_image.vmlinuz" \ - --output "${DATA_DIR}/flatcar_production_update.gz" \ - --private_keys "${KEYS_DIR}/devel.key.pem+fero:flatcar-image-signing-key" \ - --public_keys "${KEYS_DIR}/devel.pub.pem+${KEYS_DIR}/prod-2.pub.pem" \ - --keys_separator "+" \ - --signing_server_address "$SERVER_ADDR" \ - --signing_server_port "$SERVER_PORT" \ - --user_signatures "${payload_signature_files}" -popd - -echo "=== Signing torcx manifest... ===" -torcx_signature_arg="" -for torcx_signature in ${SIGS_DIR}/torcx_manifest.json.sig.*; do - torcx_signature_arg="${torcx_signature_arg} --signature ${torcx_signature}" -done -torcx_signature_arg="${torcx_signature_arg:1:${#torcx_signature_arg}}" - -fero-client \ - --address $SERVER_ADDR \ - --port $SERVER_PORT \ - sign \ - --file "${DATA_DIR}/torcx_manifest.json" \ - --output "${DATA_DIR}/torcx_manifest.json.sig-fero" \ - --secret-key flatcar-app-signing-key \ - ${torcx_signature_arg} -gpg2 --enarmor \ - --output - \ - "${DATA_DIR}/torcx_manifest.json.sig-fero" \ - | sed 's/ARMORED FILE/SIGNATURE/' \ - > "${DATA_DIR}/torcx_manifest.json.asc" - -echo "=== Torcx manifest signed successfully. ===" -rm -f "${DATA_DIR}/torcx_manifest.json.sig-fero" diff --git a/signing/transfer.sh b/signing/transfer.sh index c308fc48d4..c5a788a0ed 100755 --- a/signing/transfer.sh +++ b/signing/transfer.sh @@ -60,16 +60,6 @@ devsign() { git -C "${SIGDIR}" commit -m "Add sigs from ${USER} for ${channel} ${version}" } -sign() { - local channel="$1" - local version="$2" - local board="$3" - - "$(dirname $0)/sign.sh" \ - "${BASEDIR}/${board}/${version}" \ - "${SIGDIR}/${board}/${version}" -} - upload() { local channel="$1" local version="$2" @@ -181,7 +171,7 @@ roll() { usage() { echo "Usage: $0 {download|upload} [{-a|-b|-s} ]..." >&2 - echo "Usage: $0 {devsign|sign} [{-a|-b|-s} ]..." >&2 + echo "Usage: $0 devsign [{-a|-b|-s} ]..." >&2 echo "Usage: $0 ready [{-a|-b|-s} ]..." >&2 echo "Usage: $0 roll [{-a|-b|-s} ]..." >&2 exit 1 @@ -191,7 +181,7 @@ usage() { CMD="${1:-}" shift ||: case "${CMD}" in - download|devsign|sign) + download|devsign) ;; upload|ready|roll) if [[ -e "${HOME}/.config/roller.conf" ]]; then @@ -210,7 +200,7 @@ esac # Parse fixed args if necessary. case "${CMD}" in - download|devsign|sign|upload) + download|devsign|upload) BASEDIR="${1:-}" shift ||: if [[ -z "${BASEDIR}" ]]; then @@ -219,7 +209,7 @@ case "${CMD}" in ;; esac case "${CMD}" in - devsign|sign) + devsign) SIGDIR="${1:-}" shift ||: if [[ -z "${SIGDIR}" ]]; then @@ -230,7 +220,7 @@ esac # Sync SIGDIR exactly once. case "${CMD}" in - devsign|sign) + devsign) echo "Updating ${SIGDIR}..." git -C "${SIGDIR}" pull -r ;; From e90451ff2b1c060b95ba4aa3431de2e904346b34 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 12 Jun 2024 18:15:47 +0100 Subject: [PATCH 02/10] rust-toolchain.eclass: Sync with Gentoo Signed-off-by: James Le Cuirot --- .../workflows/portage-stable-packages-list | 1 + .../eclass/rust-toolchain.eclass | 34 +++++-------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index ef1603b719..d4c0635dda 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -373,6 +373,7 @@ eclass/python-utils-r1.eclass eclass/readme.gentoo-r1.eclass eclass/ruby-single.eclass eclass/ruby-utils.eclass +eclass/rust-toolchain.eclass eclass/rpm.eclass eclass/savedconfig.eclass eclass/selinux-policy-2.eclass diff --git a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass index 5824a48734..111aece796 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rust-toolchain.eclass @@ -7,17 +7,14 @@ # @SUPPORTED_EAPIS: 8 # @BLURB: helps map gentoo arches to rust ABIs # @DESCRIPTION: -# This eclass contains a src_unpack default phase function, and -# helper functions, to aid in proper rust-ABI handling for various -# gentoo arches. +# This eclass contains helper functions, to aid in proper rust-ABI handling for +# various gentoo arches. case ${EAPI} in 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -inherit multilib-build - # @ECLASS_VARIABLE: RUST_TOOLCHAIN_BASEURL # @DESCRIPTION: # This variable specifies the base URL used by the @@ -48,7 +45,8 @@ rust_abi() { powerpc64le*) echo powerpc64le-unknown-linux-gnu;; powerpc64*) echo powerpc64-unknown-linux-gnu;; powerpc*) echo powerpc-unknown-linux-gnu;; - riscv64*) echo riscv64gc-unknown-linux-gnu;; + riscv64*gnu) echo riscv64gc-unknown-linux-gnu;; + riscv64*musl) echo riscv64gc-unknown-linux-musl;; s390x*) echo s390x-unknown-linux-gnu;; x86_64*gnu) echo x86_64-unknown-linux-gnu;; x86_64*musl) echo x86_64-unknown-linux-musl;; @@ -56,24 +54,6 @@ rust_abi() { esac } -# @FUNCTION: rust_all_abis -# @DESCRIPTION: -# Outputs a list of all the enabled Rust ABIs -rust_all_abis() { - if use multilib; then - local abi - local ALL_ABIS=() - for abi in $(multilib_get_enabled_abis); do - ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) ) - done - local abi_list - IFS=, eval 'abi_list=${ALL_ABIS[*]}' - echo ${abi_list} - else - rust_abi - fi -} - # @FUNCTION: rust_arch_uri # @USAGE: [alt-distfile-basename] # @DESCRIPTION: @@ -127,7 +107,9 @@ rust_all_arch_uris() big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) !big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) ) - riscv? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) + riscv? ( + elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) + ) s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) " From 2c2ecc997ae650945c746ff859b76f5bb2f9578c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 17 Jun 2024 11:02:48 +0100 Subject: [PATCH 03/10] cargo.eclass: Sync with Gentoo Signed-off-by: James Le Cuirot --- sdk_container/.repo/manifests/version.txt | 4 +- .../portage-stable/eclass/cargo.eclass | 104 +++++++++++------- 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/sdk_container/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt index 7a7c1b3340..c7bbe23f36 100644 --- a/sdk_container/.repo/manifests/version.txt +++ b/sdk_container/.repo/manifests/version.txt @@ -1,4 +1,4 @@ -FLATCAR_VERSION=4000.0.0+nightly-20240613-2100 +FLATCAR_VERSION=4000.0.0+nightly-20240613-2100-10-ga2901d9a72 FLATCAR_VERSION_ID=4000.0.0 -FLATCAR_BUILD_ID="nightly-20240613-2100" +FLATCAR_BUILD_ID="nightly-20240613-2100-10-ga2901d9a72" FLATCAR_SDK_VERSION=4000.0.0+nightly-20240613-2100 diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass index 0f2da982f6..7db34efb4e 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass @@ -7,11 +7,11 @@ # @AUTHOR: # Doug Goldstein # Georgy Yakovlev -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: common functions and variables for cargo builds case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -23,10 +23,6 @@ _CARGO_ECLASS=1 RUST_DEPEND="virtual/rust" case ${EAPI} in - 7) - # 1.37 added 'cargo vendor' subcommand and net.offline config knob - RUST_DEPEND=">=virtual/rust-1.37.0" - ;; 8) # 1.39 added --workspace # 1.46 added --target dir @@ -38,7 +34,7 @@ case ${EAPI} in ;; esac -inherit flag-o-matic multiprocessing toolchain-funcs +inherit flag-o-matic multiprocessing rust-toolchain toolchain-funcs [[ ! ${CARGO_OPTIONAL} ]] && BDEPEND="${RUST_DEPEND}" @@ -52,7 +48,7 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # @PRE_INHERIT # @DESCRIPTION: # Bash string containing all crates that are to be downloaded. -# It is used by cargo_crate_uris. +# It is used by cargo_crate_uris. Typically generated by app-portage/pycargoebuild. # # Ideally, crate names and versions should be separated by a `@` # character. A legacy syntax using hyphen is also supported but it is @@ -323,46 +319,66 @@ _cargo_gen_git_config() { fi } +# @FUNCTION: cargo_target_dir +# @DESCRIPTION: +# Return the directory within target that contains the build, e.g. +# target/aarch64-unknown-linux-gnu/release. +cargo_target_dir() { + local abi + tc-is-cross-compiler && abi=/$(rust_abi) + echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)" +} + # @FUNCTION: cargo_src_unpack # @DESCRIPTION: # Unpacks the package and the cargo registry. cargo_src_unpack() { debug-print-function ${FUNCNAME} "$@" - mkdir -p "${ECARGO_VENDOR}" || die - mkdir -p "${S}" || die + mkdir -p "${ECARGO_VENDOR}" "${S}" || die local archive shasum pkg + local crates=() for archive in ${A}; do case "${archive}" in *.crate) - # when called by pkgdiff-mg, do not unpack crates - [[ ${PKGBUMPING} == ${PVR} ]] && continue - - ebegin "Loading ${archive} into Cargo registry" - tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_VENDOR}/" || die - # generate sha256sum of the crate itself as cargo needs this - shasum=$(sha256sum "${DISTDIR}"/${archive} | cut -d ' ' -f 1) - pkg=$(basename ${archive} .crate) - cat <<- EOF > ${ECARGO_VENDOR}/${pkg}/.cargo-checksum.json - { - "package": "${shasum}", - "files": {} - } - EOF - # if this is our target package we need it in ${WORKDIR} too - # to make ${S} (and handle any revisions too) - if [[ ${P} == ${pkg}* ]]; then - tar -xf "${DISTDIR}"/${archive} -C "${WORKDIR}" || die - fi - eend $? + crates+=( "${archive}" ) ;; *) - unpack ${archive} + unpack "${archive}" ;; esac done + if [[ ${PKGBUMPING} != ${PVR} && ${crates[@]} ]]; then + pushd "${DISTDIR}" >/dev/null || die + + ebegin "Unpacking crates" + printf '%s\0' "${crates[@]}" | + xargs -0 -P "$(makeopts_jobs)" -n 1 -t -- \ + tar -x -C "${ECARGO_VENDOR}" -f + assert + eend $? + + while read -d '' -r shasum archive; do + pkg=${archive%.crate} + cat <<- EOF > ${ECARGO_VENDOR}/${pkg}/.cargo-checksum.json || die + { + "package": "${shasum}", + "files": {} + } + EOF + + # if this is our target package we need it in ${WORKDIR} too + # to make ${S} (and handle any revisions too) + if [[ ${P} == ${pkg}* ]]; then + tar -xf "${archive}" -C "${WORKDIR}" || die + fi + done < <(sha256sum -z "${crates[@]}" || die) + + popd >/dev/null || die + fi + cargo_gen_config } @@ -519,6 +535,21 @@ cargo_src_compile() { filter-lto tc-export AR CC CXX PKG_CONFIG + if tc-is-cross-compiler; then + export CARGO_BUILD_TARGET=$(rust_abi) + local TRIPLE=${CARGO_BUILD_TARGET//-/_} + export CARGO_TARGET_"${TRIPLE^^}"_LINKER=$(tc-getCC) + + # Set vars for cc-rs crate. + tc-export_build_env + export \ + HOST_AR=$(tc-getBUILD_AR) + HOST_CC=$(tc-getBUILD_CC) + HOST_CXX=$(tc-getBUILD_CXX) + HOST_CFLAGS=${BUILD_CFLAGS} + HOST_CXXFLAGS=${BUILD_CXXFLAGS} + fi + set -- cargo build $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@" einfo "${@}" "${@}" || die "cargo build failed" @@ -546,17 +577,6 @@ cargo_src_install() { rm -f "${ED}/usr/.crates.toml" || die rm -f "${ED}/usr/.crates2.json" || die - - # it turned out to be non-standard dir, so get rid of it future EAPI - # and only run for EAPI=7 - # https://bugs.gentoo.org/715890 - case ${EAPI:-0} in - 7) - if [ -d "${S}/man" ]; then - doman "${S}/man" || return 0 - fi - ;; - esac } # @FUNCTION: cargo_src_test From 278050271b2eee1b4f2eda9699234439ff3dd934 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 11 Jun 2024 17:04:56 +0100 Subject: [PATCH 04/10] coreos-base/afterburn: Don't use coreos-cargo.eclass, fix warnings Signed-off-by: James Le Cuirot --- .../afterburn/afterburn-9999.ebuild | 582 +++++++++--------- .../coreos-base/afterburn/metadata.xml | 3 + 2 files changed, 294 insertions(+), 291 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild index 0c85763b59..b5ff51addc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild @@ -16,297 +16,297 @@ fi # https://github.com/gentoo/cargo-ebuild CRATES=" - addr2line-0.21.0 - adler-1.0.2 - adler32-1.2.0 - aho-corasick-1.1.2 - anstyle-1.0.4 - anyhow-1.0.79 - arc-swap-1.6.0 - assert-json-diff-2.0.2 - async-broadcast-0.5.1 - async-channel-2.1.1 - async-executor-1.8.0 - async-fs-1.6.0 - async-io-1.13.0 - async-io-2.2.2 - async-lock-2.8.0 - async-lock-3.3.0 - async-process-1.8.1 - async-recursion-1.0.5 - async-signal-0.2.5 - async-task-4.7.0 - async-trait-0.1.77 - atomic-waker-1.1.2 - atty-0.2.14 - autocfg-1.1.0 - backtrace-0.3.69 - base64-0.13.1 - base64-0.21.7 - bitflags-1.3.2 - bitflags-2.4.1 - block-buffer-0.10.4 - blocking-1.5.1 - bumpalo-3.14.0 - byteorder-1.5.0 - bytes-1.5.0 - cc-1.0.83 - cfg-if-1.0.0 - charset-0.1.3 - clap-4.4.16 - clap_builder-4.4.16 - clap_derive-4.4.7 - clap_lex-0.6.0 - colored-2.1.0 - concurrent-queue-2.4.0 - core-foundation-0.9.4 - core-foundation-sys-0.8.6 - cpufeatures-0.2.12 - crc32fast-1.3.2 - crossbeam-channel-0.5.11 - crossbeam-utils-0.8.19 - crypto-common-0.1.6 - data-encoding-2.5.0 - deranged-0.3.11 - derivative-2.2.0 - digest-0.10.7 - dirs-next-2.0.0 - dirs-sys-next-0.1.2 - encoding_rs-0.8.33 - enumflags2-0.7.8 - enumflags2_derive-0.7.8 - equivalent-1.0.1 - errno-0.3.8 - event-listener-2.5.3 - event-listener-3.1.0 - event-listener-4.0.3 - event-listener-strategy-0.4.0 - fastrand-1.9.0 - fastrand-2.0.1 - fnv-1.0.7 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - form_urlencoded-1.2.1 - futures-0.3.30 - futures-channel-0.3.30 - futures-core-0.3.30 - futures-executor-0.3.30 - futures-io-0.3.30 - futures-lite-1.13.0 - futures-lite-2.2.0 - futures-macro-0.3.30 - futures-sink-0.3.30 - futures-task-0.3.30 - futures-util-0.3.30 - generic-array-0.14.7 - getrandom-0.2.12 - gimli-0.28.1 - h2-0.3.23 - hashbrown-0.14.3 - heck-0.4.1 - hermit-abi-0.1.19 - hermit-abi-0.3.3 - hex-0.4.3 - hmac-0.12.1 - hostname-0.3.1 - http-0.2.11 - http-body-0.4.6 - httparse-1.8.0 - httpdate-1.0.3 - hyper-0.14.28 - hyper-tls-0.5.0 - idna-0.5.0 - indexmap-2.1.0 - instant-0.1.12 - io-lifetimes-1.0.11 - ipnet-2.9.0 - ipnetwork-0.20.0 - itoa-1.0.10 - js-sys-0.3.66 - lazy_static-1.4.0 - libc-0.2.152 - libflate-1.4.0 - libflate_lz77-1.2.0 - libredox-0.0.1 - libsystemd-0.7.0 - linux-raw-sys-0.3.8 - linux-raw-sys-0.4.12 - lock_api-0.4.11 - log-0.4.20 - mailparse-0.14.0 - maplit-1.0.2 - match_cfg-0.1.0 - md-5-0.10.6 - memchr-2.7.1 - memoffset-0.7.1 - memoffset-0.9.0 - mime-0.3.17 - minimal-lexical-0.2.1 - miniz_oxide-0.7.1 - mio-0.8.10 - mockito-1.2.0 - native-tls-0.2.11 - nix-0.26.4 - nix-0.27.1 - no-std-net-0.6.0 - nom-7.1.3 - num_cpus-1.16.0 - num_threads-0.1.6 - object-0.32.2 - once_cell-1.19.0 - openssh-keys-0.6.2 - openssl-0.10.62 - openssl-macros-0.1.1 - openssl-probe-0.1.5 - openssl-sys-0.9.98 - ordered-stream-0.2.0 - parking-2.2.0 - parking_lot-0.12.1 - parking_lot_core-0.9.9 - percent-encoding-2.3.1 - pin-project-lite-0.2.13 - pin-utils-0.1.0 - piper-0.2.1 - pkg-config-0.3.28 - pnet_base-0.34.0 - pnet_datalink-0.34.0 - pnet_sys-0.34.0 - polling-2.8.0 - polling-3.3.1 - powerfmt-0.2.0 - ppv-lite86-0.2.17 - proc-macro-crate-1.3.1 - proc-macro2-1.0.76 - quote-1.0.35 - quoted_printable-0.4.8 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - redox_syscall-0.4.1 - redox_users-0.4.4 - regex-1.10.2 - regex-automata-0.4.3 - regex-syntax-0.8.2 - reqwest-0.11.23 - rle-decode-fast-1.0.3 - rustc-demangle-0.1.23 - rustix-0.37.27 - rustix-0.38.28 - rustversion-1.0.14 - ryu-1.0.16 - schannel-0.1.23 - scopeguard-1.2.0 - security-framework-2.9.2 - security-framework-sys-2.9.1 - serde-1.0.195 - serde-xml-rs-0.6.0 - serde_derive-1.0.195 - serde_json-1.0.111 - serde_repr-0.1.18 - serde_urlencoded-0.7.1 - serde_yaml-0.9.30 - sha1-0.10.6 - sha2-0.10.8 - signal-hook-registry-1.4.1 - similar-2.4.0 - slab-0.4.9 - slog-2.7.0 - slog-async-2.8.0 - slog-scope-4.4.0 - slog-term-2.9.0 - smallvec-1.11.2 - socket2-0.4.10 - socket2-0.5.5 - static_assertions-1.1.0 - strsim-0.10.0 - subtle-2.5.0 - syn-1.0.109 - syn-2.0.48 - system-configuration-0.5.1 - system-configuration-sys-0.5.0 - take_mut-0.2.2 - tempfile-3.9.0 - term-0.7.0 - terminal_size-0.3.0 - thiserror-1.0.56 - thiserror-impl-1.0.56 - thread_local-1.1.7 - time-0.3.31 - time-core-0.1.2 - time-macros-0.2.16 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.35.1 - tokio-macros-2.2.0 - tokio-native-tls-0.3.1 - tokio-util-0.7.10 - toml_datetime-0.6.5 - toml_edit-0.19.15 - tower-service-0.3.2 - tracing-0.1.40 - tracing-attributes-0.1.27 - tracing-core-0.1.32 - try-lock-0.2.5 - typenum-1.17.0 - uds_windows-1.1.0 - unicode-bidi-0.3.14 - unicode-ident-1.0.12 - unicode-normalization-0.1.22 - unsafe-libyaml-0.2.10 - url-2.5.0 - uuid-1.6.1 - uzers-0.11.3 - vcpkg-0.2.15 - version_check-0.9.4 - vmw_backdoor-0.2.4 - waker-fn-1.1.1 - want-0.3.1 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.89 - wasm-bindgen-backend-0.2.89 - wasm-bindgen-futures-0.4.39 - wasm-bindgen-macro-0.2.89 - wasm-bindgen-macro-support-0.2.89 - wasm-bindgen-shared-0.2.89 - web-sys-0.3.66 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.48.0 - windows-sys-0.52.0 - windows-targets-0.48.5 - windows-targets-0.52.0 - windows_aarch64_gnullvm-0.48.5 - windows_aarch64_gnullvm-0.52.0 - windows_aarch64_msvc-0.48.5 - windows_aarch64_msvc-0.52.0 - windows_i686_gnu-0.48.5 - windows_i686_gnu-0.52.0 - windows_i686_msvc-0.48.5 - windows_i686_msvc-0.52.0 - windows_x86_64_gnu-0.48.5 - windows_x86_64_gnu-0.52.0 - windows_x86_64_gnullvm-0.48.5 - windows_x86_64_gnullvm-0.52.0 - windows_x86_64_msvc-0.48.5 - windows_x86_64_msvc-0.52.0 - winnow-0.5.34 - winreg-0.50.0 - xdg-home-1.0.0 - xml-rs-0.8.19 - zbus-3.14.1 - zbus_macros-3.14.1 - zbus_names-2.6.0 - zvariant-3.15.0 - zvariant_derive-3.15.0 - zvariant_utils-1.0.1 + addr2line@0.21.0 + adler@1.0.2 + adler32@1.2.0 + aho-corasick@1.1.2 + anstyle@1.0.4 + anyhow@1.0.79 + arc-swap@1.6.0 + assert-json-diff@2.0.2 + async-broadcast@0.5.1 + async-channel@2.1.1 + async-executor@1.8.0 + async-fs@1.6.0 + async-io@1.13.0 + async-io@2.2.2 + async-lock@2.8.0 + async-lock@3.3.0 + async-process@1.8.1 + async-recursion@1.0.5 + async-signal@0.2.5 + async-task@4.7.0 + async-trait@0.1.77 + atomic-waker@1.1.2 + atty@0.2.14 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.13.1 + base64@0.21.7 + bitflags@1.3.2 + bitflags@2.4.1 + block-buffer@0.10.4 + blocking@1.5.1 + bumpalo@3.14.0 + byteorder@1.5.0 + bytes@1.5.0 + cc@1.0.83 + cfg-if@1.0.0 + charset@0.1.3 + clap@4.4.16 + clap_builder@4.4.16 + clap_derive@4.4.7 + clap_lex@0.6.0 + colored@2.1.0 + concurrent-queue@2.4.0 + core-foundation@0.9.4 + core-foundation-sys@0.8.6 + cpufeatures@0.2.12 + crc32fast@1.3.2 + crossbeam-channel@0.5.11 + crossbeam-utils@0.8.19 + crypto-common@0.1.6 + data-encoding@2.5.0 + deranged@0.3.11 + derivative@2.2.0 + digest@0.10.7 + dirs-next@2.0.0 + dirs-sys-next@0.1.2 + encoding_rs@0.8.33 + enumflags2@0.7.8 + enumflags2_derive@0.7.8 + equivalent@1.0.1 + errno@0.3.8 + event-listener@2.5.3 + event-listener@3.1.0 + event-listener@4.0.3 + event-listener-strategy@0.4.0 + fastrand@1.9.0 + fastrand@2.0.1 + fnv@1.0.7 + foreign-types@0.3.2 + foreign-types-shared@0.1.1 + form_urlencoded@1.2.1 + futures@0.3.30 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-executor@0.3.30 + futures-io@0.3.30 + futures-lite@1.13.0 + futures-lite@2.2.0 + futures-macro@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.12 + gimli@0.28.1 + h2@0.3.23 + hashbrown@0.14.3 + heck@0.4.1 + hermit-abi@0.1.19 + hermit-abi@0.3.3 + hex@0.4.3 + hmac@0.12.1 + hostname@0.3.1 + http@0.2.11 + http-body@0.4.6 + httparse@1.8.0 + httpdate@1.0.3 + hyper@0.14.28 + hyper-tls@0.5.0 + idna@0.5.0 + indexmap@2.1.0 + instant@0.1.12 + io-lifetimes@1.0.11 + ipnet@2.9.0 + ipnetwork@0.20.0 + itoa@1.0.10 + js-sys@0.3.66 + lazy_static@1.4.0 + libc@0.2.152 + libflate@1.4.0 + libflate_lz77@1.2.0 + libredox@0.0.1 + libsystemd@0.7.0 + linux-raw-sys@0.3.8 + linux-raw-sys@0.4.12 + lock_api@0.4.11 + log@0.4.20 + mailparse@0.14.0 + maplit@1.0.2 + match_cfg@0.1.0 + md-5@0.10.6 + memchr@2.7.1 + memoffset@0.7.1 + memoffset@0.9.0 + mime@0.3.17 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + mio@0.8.10 + mockito@1.2.0 + native-tls@0.2.11 + nix@0.26.4 + nix@0.27.1 + no-std-net@0.6.0 + nom@7.1.3 + num_cpus@1.16.0 + num_threads@0.1.6 + object@0.32.2 + once_cell@1.19.0 + openssh-keys@0.6.2 + openssl@0.10.62 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.98 + ordered-stream@0.2.0 + parking@2.2.0 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + percent-encoding@2.3.1 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + piper@0.2.1 + pkg-config@0.3.28 + pnet_base@0.34.0 + pnet_datalink@0.34.0 + pnet_sys@0.34.0 + polling@2.8.0 + polling@3.3.1 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + proc-macro-crate@1.3.1 + proc-macro2@1.0.76 + quote@1.0.35 + quoted_printable@0.4.8 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.4.1 + redox_users@0.4.4 + regex@1.10.2 + regex-automata@0.4.3 + regex-syntax@0.8.2 + reqwest@0.11.23 + rle-decode-fast@1.0.3 + rustc-demangle@0.1.23 + rustix@0.37.27 + rustix@0.38.28 + rustversion@1.0.14 + ryu@1.0.16 + schannel@0.1.23 + scopeguard@1.2.0 + security-framework@2.9.2 + security-framework-sys@2.9.1 + serde@1.0.195 + serde-xml-rs@0.6.0 + serde_derive@1.0.195 + serde_json@1.0.111 + serde_repr@0.1.18 + serde_urlencoded@0.7.1 + serde_yaml@0.9.30 + sha1@0.10.6 + sha2@0.10.8 + signal-hook-registry@1.4.1 + similar@2.4.0 + slab@0.4.9 + slog@2.7.0 + slog-async@2.8.0 + slog-scope@4.4.0 + slog-term@2.9.0 + smallvec@1.11.2 + socket2@0.4.10 + socket2@0.5.5 + static_assertions@1.1.0 + strsim@0.10.0 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.48 + system-configuration@0.5.1 + system-configuration-sys@0.5.0 + take_mut@0.2.2 + tempfile@3.9.0 + term@0.7.0 + terminal_size@0.3.0 + thiserror@1.0.56 + thiserror-impl@1.0.56 + thread_local@1.1.7 + time@0.3.31 + time-core@0.1.2 + time-macros@0.2.16 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.35.1 + tokio-macros@2.2.0 + tokio-native-tls@0.3.1 + tokio-util@0.7.10 + toml_datetime@0.6.5 + toml_edit@0.19.15 + tower-service@0.3.2 + tracing@0.1.40 + tracing-attributes@0.1.27 + tracing-core@0.1.32 + try-lock@0.2.5 + typenum@1.17.0 + uds_windows@1.1.0 + unicode-bidi@0.3.14 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unsafe-libyaml@0.2.10 + url@2.5.0 + uuid@1.6.1 + uzers@0.11.3 + vcpkg@0.2.15 + version_check@0.9.4 + vmw_backdoor@0.2.4 + waker-fn@1.1.1 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.89 + wasm-bindgen-backend@0.2.89 + wasm-bindgen-futures@0.4.39 + wasm-bindgen-macro@0.2.89 + wasm-bindgen-macro-support@0.2.89 + wasm-bindgen-shared@0.2.89 + web-sys@0.3.66 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winnow@0.5.34 + winreg@0.50.0 + xdg-home@1.0.0 + xml-rs@0.8.19 + zbus@3.14.1 + zbus_macros@3.14.1 + zbus_names@2.6.0 + zvariant@3.15.0 + zvariant_derive@3.15.0 + zvariant_utils@1.0.1 " -inherit coreos-cargo cros-workon systemd +inherit cargo cros-workon systemd DESCRIPTION="A tool for collecting instance metadata from various providers" HOMEPAGE="https://github.com/coreos/afterburn" -SRC_URI="$(cargo_crate_uris ${CRATES})" +SRC_URI="${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" @@ -325,8 +325,8 @@ PATCHES=( ) src_unpack() { - cros-workon_src_unpack "$@" - coreos-cargo_src_unpack "$@" + cros-workon_src_unpack + cargo_src_unpack } src_prepare() { @@ -339,11 +339,11 @@ src_prepare() { } src_compile() { - cargo_src_compile --features cl-legacy "$@" + cargo_src_compile --features cl-legacy } src_install() { - cargo_src_install --features cl-legacy "$@" + cargo_src_install --features cl-legacy mv "${D}/usr/bin/afterburn" "${D}/usr/bin/coreos-metadata" systemd_dounit "${FILESDIR}/coreos-metadata.service" @@ -351,5 +351,5 @@ src_install() { } src_test() { - cargo_src_test --features cl-legacy "$@" + cargo_src_test --features cl-legacy } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml index 097975e3ad..d29cfaf5b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml @@ -1,4 +1,7 @@ + + coreos/afterburn + From d5216b4884d10a280ed8428279995599c7930957 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 11 Jun 2024 17:13:37 +0100 Subject: [PATCH 05/10] coreos-base/ue-rs: Don't use coreos-cargo.eclass, fix warnings Signed-off-by: James Le Cuirot --- .../coreos-base/ue-rs/metadata.xml | 7 + .../coreos-base/ue-rs/ue-rs-9999.ebuild | 374 +++++++++--------- 2 files changed, 194 insertions(+), 187 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml new file mode 100644 index 0000000000..e03c0d5933 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml @@ -0,0 +1,7 @@ + + + + + flatcar/ue-rs + + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild index 13a49b5184..7a597e52c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Flatcar Maintainers +# Copyright (c) 2023-2024 Flatcar Maintainers # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,212 +16,212 @@ fi # https://github.com/gentoo/cargo-ebuild CRATES=" - addr2line-0.21.0 - adler-1.0.2 - aho-corasick-1.0.5 - anyhow-1.0.75 - argh-0.1.12 - argh_derive-0.1.12 - argh_shared-0.1.12 - autocfg-1.1.0 - backtrace-0.3.69 - base64-0.21.3 - base64ct-1.6.0 - bitflags-1.3.2 - bitflags-2.4.0 - block-buffer-0.10.4 - bstr-1.6.2 - bumpalo-3.13.0 - byteorder-1.4.3 - bytes-1.4.0 - bzip2-0.4.4 - bzip2-sys-0.1.11+1.0.8 - cc-1.0.83 - cfg-if-1.0.0 - const-oid-0.9.5 - core-foundation-0.9.3 - core-foundation-sys-0.8.4 - cpufeatures-0.2.9 - crypto-common-0.1.6 - ct-codecs-1.1.1 - der-0.7.8 - digest-0.10.7 - encoding_rs-0.8.33 - env_logger-0.10.0 - equivalent-1.0.1 - errno-0.3.3 - errno-dragonfly-0.1.2 - fastrand-2.0.0 - fnv-1.0.7 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - form_urlencoded-1.2.0 - futures-channel-0.3.28 - futures-core-0.3.28 - futures-io-0.3.29 - futures-sink-0.3.28 - futures-task-0.3.28 - futures-util-0.3.28 - generic-array-0.14.7 - getrandom-0.2.10 - gimli-0.28.0 - globset-0.4.13 - h2-0.3.26 - hashbrown-0.14.3 - hermit-abi-0.3.2 - http-0.2.9 - http-body-0.4.5 - httparse-1.8.0 - httpdate-1.0.3 - humantime-2.1.0 - hyper-0.14.28 - hyper-tls-0.5.0 - idna-0.4.0 - indexmap-2.2.1 - ipnet-2.8.0 - is-terminal-0.4.9 - itoa-1.0.9 - jetscii-0.5.3 - js-sys-0.3.64 - lazy_static-1.4.0 - libc-0.2.150 - libm-0.2.7 - linux-raw-sys-0.4.11 - log-0.4.20 - memchr-2.6.3 - mime-0.3.17 - miniz_oxide-0.7.1 - mio-0.8.11 - native-tls-0.2.11 - num-bigint-dig-0.8.4 - num-integer-0.1.45 - num-iter-0.1.43 - num-traits-0.2.16 - object-0.32.1 - once_cell-1.18.0 - openssl-0.10.60 - openssl-macros-0.1.1 - openssl-probe-0.1.5 - openssl-sys-0.9.96 - pem-rfc7468-0.7.0 - percent-encoding-2.3.0 - pin-project-lite-0.2.13 - pin-utils-0.1.0 - pkcs1-0.7.5 - pkcs8-0.10.2 - pkg-config-0.3.27 - ppv-lite86-0.2.17 - proc-macro2-1.0.66 - protobuf-3.2.0 - protobuf-support-3.2.0 - quote-1.0.33 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - redox_syscall-0.4.1 - regex-1.9.5 - regex-automata-0.3.8 - regex-syntax-0.7.5 - reqwest-0.11.26 - rsa-0.9.2 - rustc-demangle-0.1.23 - rustix-0.38.23 - rustls-pemfile-1.0.4 - ryu-1.0.15 - schannel-0.1.22 - security-framework-2.9.2 - security-framework-sys-2.9.1 - serde-1.0.188 - serde_derive-1.0.188 - serde_json-1.0.105 - serde_urlencoded-0.7.1 - sha1-0.10.6 - sha2-0.10.8 - signature-2.1.0 - slab-0.4.9 - smallvec-1.11.0 - socket2-0.5.3 - spin-0.5.2 - spki-0.7.2 - subtle-2.5.0 - syn-1.0.109 - syn-2.0.31 - sync_wrapper-0.1.2 - system-configuration-0.5.1 - system-configuration-sys-0.5.0 - tempfile-3.8.1 - termcolor-1.2.0 - thiserror-1.0.48 - thiserror-impl-1.0.48 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.32.0 - tokio-native-tls-0.3.1 - tokio-util-0.7.8 - tower-service-0.3.2 - tracing-0.1.37 - tracing-core-0.1.31 - try-lock-0.2.4 - typenum-1.16.0 - unicode-bidi-0.3.13 - unicode-ident-1.0.11 - unicode-normalization-0.1.22 - url-2.4.1 - uuid-1.8.0 - vcpkg-0.2.15 - version_check-0.9.4 - want-0.3.1 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.87 - wasm-bindgen-backend-0.2.87 - wasm-bindgen-futures-0.4.37 - wasm-bindgen-macro-0.2.87 - wasm-bindgen-macro-support-0.2.87 - wasm-bindgen-shared-0.2.87 - web-sys-0.3.64 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.48.0 - windows-targets-0.48.5 - windows_aarch64_gnullvm-0.48.5 - windows_aarch64_msvc-0.48.5 - windows_i686_gnu-0.48.5 - windows_i686_msvc-0.48.5 - windows_x86_64_gnu-0.48.5 - windows_x86_64_gnullvm-0.48.5 - windows_x86_64_msvc-0.48.5 - winreg-0.50.0 - xmlparser-0.13.5 - zeroize-1.6.0 + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.0.5 + anyhow@1.0.75 + argh@0.1.12 + argh_derive@0.1.12 + argh_shared@0.1.12 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.3 + base64ct@1.6.0 + bitflags@1.3.2 + bitflags@2.4.0 + block-buffer@0.10.4 + bstr@1.6.2 + bumpalo@3.13.0 + byteorder@1.4.3 + bytes@1.4.0 + bzip2@0.4.4 + bzip2-sys@0.1.11+1.0.8 + cc@1.0.83 + cfg-if@1.0.0 + const-oid@0.9.5 + core-foundation@0.9.3 + core-foundation-sys@0.8.4 + cpufeatures@0.2.9 + crypto-common@0.1.6 + ct-codecs@1.1.1 + der@0.7.8 + digest@0.10.7 + encoding_rs@0.8.33 + env_logger@0.10.0 + equivalent@1.0.1 + errno@0.3.3 + errno-dragonfly@0.1.2 + fastrand@2.0.0 + fnv@1.0.7 + foreign-types@0.3.2 + foreign-types-shared@0.1.1 + form_urlencoded@1.2.0 + futures-channel@0.3.28 + futures-core@0.3.28 + futures-io@0.3.29 + futures-sink@0.3.28 + futures-task@0.3.28 + futures-util@0.3.28 + generic-array@0.14.7 + getrandom@0.2.10 + gimli@0.28.0 + globset@0.4.13 + h2@0.3.26 + hashbrown@0.14.3 + hermit-abi@0.3.2 + http@0.2.9 + http-body@0.4.5 + httparse@1.8.0 + httpdate@1.0.3 + humantime@2.1.0 + hyper@0.14.28 + hyper-tls@0.5.0 + idna@0.4.0 + indexmap@2.2.1 + ipnet@2.8.0 + is-terminal@0.4.9 + itoa@1.0.9 + jetscii@0.5.3 + js-sys@0.3.64 + lazy_static@1.4.0 + libc@0.2.150 + libm@0.2.7 + linux-raw-sys@0.4.11 + log@0.4.20 + memchr@2.6.3 + mime@0.3.17 + miniz_oxide@0.7.1 + mio@0.8.11 + native-tls@0.2.11 + num-bigint-dig@0.8.4 + num-integer@0.1.45 + num-iter@0.1.43 + num-traits@0.2.16 + object@0.32.1 + once_cell@1.18.0 + openssl@0.10.60 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.96 + pem-rfc7468@0.7.0 + percent-encoding@2.3.0 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + pkcs1@0.7.5 + pkcs8@0.10.2 + pkg-config@0.3.27 + ppv-lite86@0.2.17 + proc-macro2@1.0.66 + protobuf@3.2.0 + protobuf-support@3.2.0 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.4.1 + regex@1.9.5 + regex-automata@0.3.8 + regex-syntax@0.7.5 + reqwest@0.11.26 + rsa@0.9.2 + rustc-demangle@0.1.23 + rustix@0.38.23 + rustls-pemfile@1.0.4 + ryu@1.0.15 + schannel@0.1.22 + security-framework@2.9.2 + security-framework-sys@2.9.1 + serde@1.0.188 + serde_derive@1.0.188 + serde_json@1.0.105 + serde_urlencoded@0.7.1 + sha1@0.10.6 + sha2@0.10.8 + signature@2.1.0 + slab@0.4.9 + smallvec@1.11.0 + socket2@0.5.3 + spin@0.5.2 + spki@0.7.2 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.31 + sync_wrapper@0.1.2 + system-configuration@0.5.1 + system-configuration-sys@0.5.0 + tempfile@3.8.1 + termcolor@1.2.0 + thiserror@1.0.48 + thiserror-impl@1.0.48 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.32.0 + tokio-native-tls@0.3.1 + tokio-util@0.7.8 + tower-service@0.3.2 + tracing@0.1.37 + tracing-core@0.1.31 + try-lock@0.2.4 + typenum@1.16.0 + unicode-bidi@0.3.13 + unicode-ident@1.0.11 + unicode-normalization@0.1.22 + url@2.4.1 + uuid@1.8.0 + vcpkg@0.2.15 + version_check@0.9.4 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.87 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-futures@0.4.37 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-shared@0.2.87 + web-sys@0.3.64 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + winreg@0.50.0 + xmlparser@0.13.5 + zeroize@1.6.0 " -inherit coreos-cargo cros-workon systemd +inherit cargo cros-workon DESCRIPTION="Prototype Omaha Rust implementation" HOMEPAGE="https://github.com/flatcar/ue-rs" -SRC_URI="$(cargo_crate_uris)" +SRC_URI="${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="dev-libs/openssl:0=" RDEPEND=" ${DEPEND} " -BDEPEND="" src_unpack() { - cros-workon_src_unpack "$@" - coreos-cargo_src_unpack "$@" + cros-workon_src_unpack + cargo_src_unpack } src_compile() { - cargo_src_compile $(usex test '' '--bin download_sysext') "$@" + cargo_src_compile $(usex test '' '--bin download_sysext') } src_install() { - cargo_src_install $(usex test '' '--bin download_sysext') "$@" + cargo_src_install $(usex test '' '--bin download_sysext') } From daab7c39700ca2c331f9c8e4121b201f5d2314ee Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 11 Jun 2024 17:18:04 +0100 Subject: [PATCH 06/10] coreos-base/update-ssh-keys: Don't use coreos-cargo.eclass, fix warnings Signed-off-by: James Le Cuirot --- .../coreos-base/update-ssh-keys/metadata.xml | 3 + .../update-ssh-keys-9999.ebuild | 106 +++++++++--------- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml index 097975e3ad..fa8ff64732 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml @@ -1,4 +1,7 @@ + + flatcar/update-ssh-keys + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild index 6408833068..3643334865 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild @@ -14,65 +14,63 @@ else KEYWORDS="amd64 arm64" fi -PATCHES=( -) - # generated by cargo ebuild CRATES=" -anstream-0.6.4 -anstyle-1.0.4 -anstyle-parse-0.2.2 -anstyle-query-1.0.0 -anstyle-wincon-3.0.1 -base64-0.21.5 -block-buffer-0.10.4 -byteorder-1.5.0 -cfg-if-1.0.0 -clap-4.4.6 -clap_builder-4.4.6 -clap_lex-0.5.1 -colorchoice-1.0.0 -cpufeatures-0.2.10 -crypto-common-0.1.6 -digest-0.10.7 -error-chain-0.12.4 -fs2-0.4.3 -generic-array-0.14.7 -libc-0.2.149 -log-0.4.20 -md-5-0.10.6 -openssh-keys-0.6.2 -proc-macro2-1.0.69 -quote-1.0.33 -sha2-0.10.8 -strsim-0.10.0 -syn-2.0.38 -thiserror-1.0.50 -thiserror-impl-1.0.50 -typenum-1.17.0 -unicode-ident-1.0.12 -utf8parse-0.2.1 -uzers-0.11.3 -version_check-0.9.4 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows-sys-0.48.0 -windows-targets-0.48.5 -windows_aarch64_gnullvm-0.48.5 -windows_aarch64_msvc-0.48.5 -windows_i686_gnu-0.48.5 -windows_i686_msvc-0.48.5 -windows_x86_64_gnu-0.48.5 -windows_x86_64_gnullvm-0.48.5 -windows_x86_64_msvc-0.48.5 + anstream@0.6.4 + anstyle@1.0.4 + anstyle-parse@0.2.2 + anstyle-query@1.0.0 + anstyle-wincon@3.0.1 + base64@0.21.5 + block-buffer@0.10.4 + byteorder@1.5.0 + cfg-if@1.0.0 + clap@4.4.6 + clap_builder@4.4.6 + clap_lex@0.5.1 + colorchoice@1.0.0 + cpufeatures@0.2.10 + crypto-common@0.1.6 + digest@0.10.7 + error-chain@0.12.4 + fs2@0.4.3 + generic-array@0.14.7 + libc@0.2.149 + log@0.4.20 + md-5@0.10.6 + openssh-keys@0.6.2 + proc-macro2@1.0.69 + quote@1.0.33 + sha2@0.10.8 + strsim@0.10.0 + syn@2.0.38 + thiserror@1.0.50 + thiserror-impl@1.0.50 + typenum@1.17.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uzers@0.11.3 + version_check@0.9.4 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 " -inherit coreos-cargo cros-workon +inherit cargo cros-workon DESCRIPTION="Utility for managing OpenSSH authorized public keys" HOMEPAGE="https://github.com/flatcar/update-ssh-keys" -SRC_URI="https://mirror.release.flatcar-linux.net/coreos/openssh-keys-0.5.1-alpha.0.crate -> openssh-keys-0.5.1-alpha.0.crate $(cargo_crate_uris ${CRATES})" +SRC_URI="https://mirror.release.flatcar-linux.net/coreos/openssh-keys-0.5.1-alpha.0.crate + ${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" @@ -82,6 +80,6 @@ SLOT="0" RDEPEND="! Date: Tue, 11 Jun 2024 17:21:09 +0100 Subject: [PATCH 07/10] coreos-cargo.eclass: Drop this eclass and the associated overrides Cross-compiling is handled in the upstream cargo.eclass now. Signed-off-by: James Le Cuirot --- .../coreos/config/env/sys-apps/zram-generator | 8 -- .../env/sys-block/thin-provisioning-tools | 16 --- .../coreos-overlay/eclass/coreos-cargo.eclass | 113 ------------------ 3 files changed, 137 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator deleted file mode 100644 index 2ca892c2bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator +++ /dev/null @@ -1,8 +0,0 @@ -cros_pre_src_unpack_coreos_unpack() { - local _COREOS_CARGO_SKIP_INHERIT=1 - source "${CROS_ADDONS_TREE}"/../eclass/coreos-cargo.eclass - src_unpack() { - einfo "Running coreos-cargo_src_unpack" - coreos-cargo_src_unpack - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools deleted file mode 100644 index e2b17a5677..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools +++ /dev/null @@ -1,16 +0,0 @@ -cros_pre_src_unpack_coreos_unpack() { - local _COREOS_CARGO_SKIP_INHERIT=1 - source "${CROS_ADDONS_TREE}"/../eclass/coreos-cargo.eclass - src_unpack() { - einfo "Running coreos-cargo_src_unpack" - coreos-cargo_src_unpack - } -} - -cros_pre_src_install_rust_cross() { - pushd "${S}" - local rust_target="$(ls -d target/*-unknown-linux-gnu)" - rust_target="${rust_target#target/}" - ln -f target/{"${rust_target}",}/"$(usex debug debug release)/pdata_tools" || die - popd -} diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass deleted file mode 100644 index 405696dc22..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2017-2018 CoreOS, Inc. -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: coreos-cargo.eclass -# @MAINTAINER: -# team-os@coreos.com -# @AUTHOR: -# David Michael -# @BLURB: cargo cross-compilation support for CoreOS/ChromeOS targets - -if [[ -z ${_COREOS_CARGO_ECLASS} ]]; then -_COREOS_CARGO_ECLASS=1 - -# XXX: Don't require host dependencies to also be in the sysroot. -if [[ -z ${_COREOS_CARGO_SKIP_INHERIT} ]]; then - CATEGORY=dev-util PN=cargo inherit cargo - inherit toolchain-funcs - - EXPORT_FUNCTIONS src_unpack -fi - -# @FUNCTION: coreos-cargo_src_unpack -# @DESCRIPTION: -# This amends the src_unpack from cargo.eclass to add support for Rust -# cross-compiling to the ChromeOS targets. It maps the host triplet to -# one built into rustc and uses the board root as its sysroot. -coreos-cargo_src_unpack() { - debug-print-function ${FUNCNAME} "$@" - cargo_src_unpack "$@" - - [[ ${CBUILD:-${CHOST}} != ${CHOST} ]] || return 0 - - # Map the SDK host triplet to one that is built into rustc. - function rust_builtin_target() case "$1" in - aarch64-*-linux-gnu) echo aarch64-unknown-linux-gnu ;; - x86_64-*-linux-gnu) echo x86_64-unknown-linux-gnu ;; - *) die "Unknown host triplet: $1" ;; - esac - - # Set the gcc-rs flags for cross-compiling. - export TARGET_CFLAGS="${CFLAGS}" - export TARGET_CXXFLAGS="${CXXFLAGS}" - - # Wrap ar for gcc-rs to work around rust-lang/cargo#4456. - export TARGET_AR="${T}/rustproof-ar" - cat <<- EOF > "${TARGET_AR}" && chmod 0755 "${TARGET_AR}" - #!/bin/sh - unset LD_LIBRARY_PATH - exec $(tc-getAR) "\$@" - EOF - - # Wrap gcc for gcc-rs to work around rust-lang/cargo#4456. - export TARGET_CC="${T}/rustproof-cc" - cat <<- EOF > "${TARGET_CC}" && chmod 0755 "${TARGET_CC}" - #!/bin/sh - unset LD_LIBRARY_PATH - exec $(tc-getCC) "\$@" - EOF - - # Wrap g++ for gcc-rs to work around rust-lang/cargo#4456. - export TARGET_CXX="${T}/rustproof-cxx" - cat <<- EOF > "${TARGET_CXX}" && chmod 0755 "${TARGET_CXX}" - #!/bin/sh - unset LD_LIBRARY_PATH - exec $(tc-getCXX) "\$@" - EOF - - # Create a compiler wrapper that uses a sysroot for cross-compiling. - export RUSTC_WRAPPER="${T}/wrustc" - cat <<- 'EOF' > "${RUSTC_WRAPPER}" && chmod 0755 "${RUSTC_WRAPPER}" - #!/bin/bash -e - rustc=${1:?Missing rustc command} - shift - xflags=() - # rustlib is part of host rustc now, so no: [ "x$*" = "x${*#--target}" ] || xflags=( --sysroot="${ROOT:-/}usr" ) - exec "${rustc}" "${xflags[@]}" "$@" - EOF - - # Compile for the built-in target, using the SDK cross-tools. - export RUST_TARGET=$(rust_builtin_target "${CHOST}") - local -a config_lines - local build_amended=0 - local target_rust_target_amended=0 - local REPLY - readonly b_header='[build]' - readonly t_header="[target.${RUST_TARGET}]" - readonly target_line="target = \"${RUST_TARGET}\"" - readonly ar_line="ar = \"${TARGET_AR}\"" - readonly linker_line="linker = \"${TARGET_CC}\"" - while read -r; do - config_lines+=("${REPLY}") - case "${REPLY}" in - "${b_header}") - config_lines+=("${target_line}") - build_amended=1 - ;; - "${t_header}") - config_lines+=("${ar_line}") - config_lines+=("${linker_line}") - target_rust_target_amended=1 - ;; - esac - done <"${ECARGO_HOME}/config" - if [[ "${build_amended}" -eq 0 ]]; then - config_lines+=('' "${b_header}" "${target_line}") - fi - if [[ "${target_rust_target_amended}" -eq 0 ]]; then - config_lines+=('' "${t_header}" "${ar_line}" "${linker_line}") - fi - printf '%s\n' "${config_lines[@]}" >"${ECARGO_HOME}/config" -} - -fi From f0717fb61374ed938fde92599fb118f918862d1e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 17 Jun 2024 11:06:04 +0100 Subject: [PATCH 08/10] sys-block/thin-provisioning-tools: Sync with Gentoo Signed-off-by: James Le Cuirot --- .../thin-provisioning-tools-1.0.10.ebuild | 2 +- .../thin-provisioning-tools/thin-provisioning-tools-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild index df14c87327..6907ab3f3b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild @@ -175,7 +175,7 @@ src_install() { emake \ DESTDIR="${D}" \ DATADIR="${ED}/usr/share" \ - PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + PDATA_TOOLS="$(cargo_target_dir)/pdata_tools" \ install einstalldocs diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild index 021c5e9a4b..d617bae938 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild @@ -175,7 +175,7 @@ src_install() { emake \ DESTDIR="${D}" \ DATADIR="${ED}/usr/share" \ - PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + PDATA_TOOLS="$(cargo_target_dir)/pdata_tools" \ install einstalldocs From dc37240b51b0f197fdf66525ec808cf98c4199e8 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 17 Jun 2024 11:03:10 +0100 Subject: [PATCH 09/10] app-containers/aardvark-dns: Sync with Gentoo Signed-off-by: James Le Cuirot --- .../app-containers/aardvark-dns/Manifest | 6 ++- .../aardvark-dns/aardvark-dns-1.10.0.ebuild | 2 +- .../aardvark-dns/aardvark-dns-1.11.0.ebuild | 47 +++++++++++++++++++ .../aardvark-dns/aardvark-dns-1.9.0.ebuild | 47 +++++++++++++++++++ .../aardvark-dns/aardvark-dns-9999.ebuild | 47 +++++++++++++++++++ 5 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest index 68a2265a90..131bc511f6 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest @@ -1,2 +1,6 @@ -DIST aardvark-dns-v1.10.0-vendor.tar.gz 6283889 BLAKE2B cb69144eabf876e418667782171273541bbc416b456193780b4d7f1d22ad03e18f06ec0d6b1e51e21eab912317bd61dd73266d717fa97a81b4314a3c7d14776a SHA512 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c DIST aardvark-dns-1.10.0.crate 51028 BLAKE2B 81cdc4eb7eaff7359a1a12657b2bc42603383cf0f80a3a599ce9ce277e15ad83e9d5b36c3de3bef15b3201a1e60d86286ad61469d1d58ba2252b4c0174506ea2 SHA512 3d67f1b3c66aeaf4878c09e5e8fc34717cea6c348e0295bc0521c0c4144433656a3306731c24bb362a0e340e652b036b7544e544cca99b61590547bd7a6ce629 +DIST aardvark-dns-1.11.0.crate 8977859 BLAKE2B d37c2015d1a46308bea214682133d6364fb50c75e840b664c692c6f344d21a093acab5a93dbf1c7dd624a0adc7cdd38cedc35be8dfde0904a7a773b4f620e002 SHA512 0fb9f9cb20e6c548483778a1109ec315c6135dc1afa3736980754847b06a2e988f5704de7b52b2784b20297d370d47d034137d3899f519d2bb5818a5a68234d8 +DIST aardvark-dns-1.9.0.crate 50846 BLAKE2B bae46eae2ec2071b1a1a301f00dc3e3aac0b3a5f1247f1f5be4f2e4b1d9d906fc22c53e5d56967731fcf226a295e8b1d8868dcfae228b05674a5ddecb58a1455 SHA512 1f21b4c40567c0aff967d38ea224884d5c2cb4a85ddffe7bbc5badd237a1195943e4d76f3c65ceb0cab984aa0c2528d8486e78e1e53c5376792477a6a5f426e7 +DIST aardvark-dns-v1.10.0-vendor.tar.gz 6283889 BLAKE2B cb69144eabf876e418667782171273541bbc416b456193780b4d7f1d22ad03e18f06ec0d6b1e51e21eab912317bd61dd73266d717fa97a81b4314a3c7d14776a SHA512 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c +DIST aardvark-dns-v1.11.0-vendor.tar.gz 6829221 BLAKE2B 42f7df29c407dd91e8e9ea1b43fc368b6795ea17169091d3900e59aea12be16174241c996b016e2f5de3e7a592ac3a1fa1c6b817f16ba282ebdda1ab65bfe61a SHA512 e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56 +DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B 487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f SHA512 f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild index e4edd4d987..3f6fb3a7a9 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild @@ -38,7 +38,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild new file mode 100644 index 0000000000..1e5d082427 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" +inherit cargo + +DESCRIPTION="A container-focused DNS server" +HOMEPAGE="https://github.com/containers/aardvark-dns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git" +else + SRC_URI="${CARGO_CRATE_URIS}" + SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB" +SLOT="0" +QA_FLAGS_IGNORED="usr/libexec/podman/${PN}" +QA_PRESTRIPPED="usr/libexec/podman/${PN}" +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_install() { + export PREFIX="${EPREFIX}"/usr + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild new file mode 100644 index 0000000000..3f6fb3a7a9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" +inherit cargo + +DESCRIPTION="A container-focused DNS server" +HOMEPAGE="https://github.com/containers/aardvark-dns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git" +else + SRC_URI="${CARGO_CRATE_URIS}" + SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB" +SLOT="0" +QA_FLAGS_IGNORED="usr/libexec/podman/${PN}" +QA_PRESTRIPPED="usr/libexec/podman/${PN}" +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_install() { + export PREFIX="${EPREFIX}"/usr + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild new file mode 100644 index 0000000000..1e5d082427 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" +inherit cargo + +DESCRIPTION="A container-focused DNS server" +HOMEPAGE="https://github.com/containers/aardvark-dns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git" +else + SRC_URI="${CARGO_CRATE_URIS}" + SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB" +SLOT="0" +QA_FLAGS_IGNORED="usr/libexec/podman/${PN}" +QA_PRESTRIPPED="usr/libexec/podman/${PN}" +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_install() { + export PREFIX="${EPREFIX}"/usr + default +} From d421f8c7e16d54dc268dd86f4a9fc148a8c03ce4 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 17 Jun 2024 11:01:05 +0100 Subject: [PATCH 10/10] app-containers/netavark: Sync with Gentoo Signed-off-by: James Le Cuirot --- .../app-containers/netavark/Manifest | 6 ++ .../netavark/netavark-1.10.2.ebuild | 59 +++++++++++++++++++ .../netavark/netavark-1.10.3.ebuild | 2 +- .../netavark/netavark-1.11.0.ebuild | 59 +++++++++++++++++++ .../netavark/netavark-1.9.0.ebuild | 59 +++++++++++++++++++ .../netavark/netavark-9999.ebuild | 59 +++++++++++++++++++ 6 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest index ee3ad3d2e8..e0fe74fbb9 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest @@ -1,2 +1,8 @@ +DIST netavark-1.10.2.crate 154261 BLAKE2B 2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6 SHA512 362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d DIST netavark-1.10.3.crate 154416 BLAKE2B a7750304484ae820eb3bb1bc4de8c2ad22d95494fe10471014e0eb999fb7578c5e9c2ab352fe357d964d701206ee7016f87134a62afe0a03cd1b574cae1264ca SHA512 6ed9cd5a69a6eacc4ad839a82680c7b98d453564aadee41eb6ea632223fba7fbdb20f11e4146dc74b6c6d3695ac50624424b3260dbb7769a4100a918e4328dbf +DIST netavark-1.11.0.crate 155698 BLAKE2B df460f6a2e5ce82645dccf6ca487724da2abc6f3f2c90f56d935d691ddd9a4229b785177a4e6360f75aa13ee7cdb29a2794c0b7360ef9d40ea3f946771d3ab73 SHA512 e25b075f98cb2aa55cf0e8d8868aac3b6ff0b390f4f0632d6ee2f431cede144948ed98015576cf8a64fcc1a2c33c454415159951aacbdf0611613da867db9a13 +DIST netavark-1.9.0.crate 139321 BLAKE2B c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e711115d6f51d722125e152eea0ac0a631 SHA512 7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe +DIST netavark-v1.10.2-vendor.tar.gz 16135498 BLAKE2B 607cad9d80067d579adaafdea22b238f5e2f6f92a3c6aed530c8e97bce2f7f869adeabbc7b7d1c04f7c517459112c42b5588aa3ccbf04d5205d2b8212c1e7a42 SHA512 a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0 DIST netavark-v1.10.3-vendor.tar.gz 16135507 BLAKE2B 114519b76d932c5918fd91cea73e8bc9f5aa3a63275f9218e667e400c3e2512e5db29ce806b5e5b509b043c04a3436344a27cf170e203d4360d00247e48b5ca9 SHA512 b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5 +DIST netavark-v1.11.0-vendor.tar.gz 17751524 BLAKE2B b466b27674e6944b2de8a684ee3e14f26775b6065f0f1e82987a0c240725c01f88d2138641b768b5e03fce5b26908d0281b1983b8c1844af4999064bf24d8f15 SHA512 d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb +DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild new file mode 100644 index 0000000000..42ba29c833 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild index d157e0604a..499417f28d 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild new file mode 100644 index 0000000000..42ba29c833 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild new file mode 100644 index 0000000000..499417f28d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild new file mode 100644 index 0000000000..42ba29c833 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +}