diff options
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/Manifest.gz | bin | 31013 -> 31012 bytes | |||
-rw-r--r-- | net-libs/libpsl/Manifest | 1 | ||||
-rw-r--r-- | net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch | 39 | ||||
-rw-r--r-- | net-libs/nodejs/Manifest | 1 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-20.11.0-riscv.patch | 155 | ||||
-rw-r--r-- | net-libs/xdp-tools/Manifest | 2 | ||||
-rw-r--r-- | net-libs/xdp-tools/xdp-tools-1.4.3.ebuild | 1 |
7 files changed, 2 insertions, 197 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex b875128c1415..82b57a31be69 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest index 96a71cf232c0..1cd09c4facae 100644 --- a/net-libs/libpsl/Manifest +++ b/net-libs/libpsl/Manifest @@ -1,4 +1,3 @@ -AUX libpsl-0.21.2-tests-optional.patch 1141 BLAKE2B a72459d3e735391222d0a4e2fb7e42eccdd07a0c2ef05c381b49f3a967df797d3da225fcb5cb6d98ad8a14eb460589e60f7f16d338171c7b081741d5382b09ed SHA512 1b3fee48b1f5c85f58f704e3447e831b1a0b17a07b7f1e9456e8fde54ece4222be79c3f11811bfc5c601317b5a4b18ac7c358e5d438a08c6452b4ccdbd53b2aa DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5 EBUILD libpsl-0.21.5.ebuild 1305 BLAKE2B ee7b8a1f57eaa49833d9be6f70d610ccbfb30cefbc92b16d0dfa75177af097596989c169066aaf280e760e4217d2d250172a384c51798f09dc33f8d8ea838a9a SHA512 971c9c2dc9755bf29656d0c9445c0ba749108d74be137d02981594116da38b1dacb2a06ec7345079fca857778e3864c84c1e6a3f459b7cba3f611661ba0ceaab MISC metadata.xml 341 BLAKE2B 8b4e137684e24b96357cbd463dc95b7d1c0bdc6bd33f51f0a43b8bb80063db494c56afafc5c48f369f0b12fa87d468792bb7e883a1ee7dbb93370922d050a7f4 SHA512 48594aec5e8bb724ddbab35405d9257688ea5ac8eeb39cd4b06f9f9e53c95d821b7bb11a61f3fd54da85fe902c296fb2bb4e5d79ed866e93d3a5c7da330f8a44 diff --git a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch deleted file mode 100644 index 0f5773d75739..000000000000 --- a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/rockdaboot/libpsl/commit/fb6b75317ab669c255906fa4db256837332eb1ed - -From fb6b75317ab669c255906fa4db256837332eb1ed Mon Sep 17 00:00:00 2001 -From: Vincent Torri <vtorri@outlook.fr> -Date: Sat, 14 Jan 2023 17:25:31 +0100 -Subject: [PATCH] add 'tests' option to disable tests and fuzzers - ---- - meson.build | 6 ++++-- - meson_options.txt | 3 +++ - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index d96748d..4492354 100644 ---- a/meson.build -+++ b/meson.build -@@ -132,6 +132,8 @@ endif - subdir('include') - subdir('src') - subdir('tools') --subdir('tests') --subdir('fuzz') -+if get_option('tests') -+ subdir('tests') -+ subdir('fuzz') -+endif - subdir(join_paths('docs', 'libpsl')) -diff --git a/meson_options.txt b/meson_options.txt -index e9d6a23..d66f256 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,3 +17,6 @@ option('psl_testfile', type : 'string', value : '', - - option('docs', type: 'boolean', value: false, - description: 'Build the API reference (requires gtk-doc)') -+ -+option('tests', type: 'boolean', value: true, -+ description: 'Build the tests and fuzzers') - diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 039cd37f195e..39d9fd8463c8 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,5 +1,4 @@ AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9 -AUX nodejs-20.11.0-riscv.patch 7660 BLAKE2B 8af657b4c87f892a7e8ab4e0b0f6c8927841585cf71971cb3a0e9b508c182222ace7178fd76f12000432df8a1b51c1a553616a3797a16b35f9499edce1e84638 SHA512 29b42307e017de0ef54c2e80e5e56d771a04f282ca858bcd3300c68ef4d72bb2fb5f2841a85a9845ee17f1909a33a64c798da9ed624feb34fcb11661dbe9fe69 AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8 AUX nodejs-22.2.0-riscv.patch 1760 BLAKE2B f5f033dd589637481d2a2f3e67cdbb7a6052bdb187d2666b145a76f23da6e36adeddfe2b6e1718ae4412df914f8517bec2cdc5c15b18eb9dca5dad7a6668cc04 SHA512 f2ff6da8cf5dcc994a7a20342e2928dc1821fbbf42891009a6234b6051277e0200d7e3fbba63b9a2773887591d0ad5ceb1bb3d25e5efeb557f6d00109a80253c DIST node-v18.20.4.tar.xz 40445740 BLAKE2B 0675f2aba1d9a9cd9aeb665ecb3a0f61b9caf39daeb6154941f84b9c423caa7a658c14b8c2c5e12d94424b2470748ec7fad28ecb10390d37f92eb7e50f8adc26 SHA512 1ccef99ebee3906f5bad3c1582f9551ced9bed15e6a047d59d1a23c6110004fb46ea4bebcf9899748c64109f78788d7365ee956444e645eaf397dabbcddda21e diff --git a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch b/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch deleted file mode 100644 index 3bf7a80ea078..000000000000 --- a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch +++ /dev/null @@ -1,155 +0,0 @@ -From dda5cdb15cfe5c7437f471054f5bd79a82b6eda2 Mon Sep 17 00:00:00 2001 -From: kxxt <rsworktech@outlook.com> -Date: Wed, 17 Jan 2024 09:16:34 +0800 -Subject: [PATCH] Revert "deps: V8: cherry-pick 13192d6e10fa" - -This reverts commit bc2ebb972b34f54e042de9636e7451d2526436a9, which -shouldn't be applied to v20.x. - -Fix https://github.com/nodejs/unofficial-builds/issues/106 ---- - common.gypi | 2 +- - deps/v8/src/builtins/riscv/builtins-riscv.cc | 2 +- - deps/v8/src/codegen/riscv/assembler-riscv-inl.h | 16 ++++++++-------- - deps/v8/src/codegen/riscv/assembler-riscv.h | 2 +- - deps/v8/src/execution/riscv/simulator-riscv.cc | 8 ++++---- - .../regexp/riscv/regexp-macro-assembler-riscv.cc | 2 +- - 6 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/common.gypi b/common.gypi -index db09a8a33df06..fa0729ffe45e8 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -36,7 +36,7 @@ - - # Reset this number to 0 on major V8 upgrades. - # Increment by one for each non-official patch applied to deps/v8. -- 'v8_embedder_string': '-node.17', -+ 'v8_embedder_string': '-node.18', - - ##### V8 defaults for Node.js ##### - -diff --git a/deps/v8/src/builtins/riscv/builtins-riscv.cc b/deps/v8/src/builtins/riscv/builtins-riscv.cc -index d6091434b9b0a..3404562785991 100644 ---- a/deps/v8/src/builtins/riscv/builtins-riscv.cc -+++ b/deps/v8/src/builtins/riscv/builtins-riscv.cc -@@ -1512,7 +1512,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) { - // Set the return address to the correct point in the interpreter entry - // trampoline. - Label builtin_trampoline, trampoline_loaded; -- Tagged<Smi> interpreter_entry_return_pc_offset( -+ Smi interpreter_entry_return_pc_offset( - masm->isolate()->heap()->interpreter_entry_return_pc_offset()); - DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero()); - -diff --git a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h -index ca6d641e2c94e..55f191e6afe76 100644 ---- a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h -+++ b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h -@@ -128,9 +128,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at( - } - - void Assembler::deserialization_set_special_target_at( -- Address instruction_payload, Tagged<Code> code, Address target) { -+ Address instruction_payload, Code code, Address target) { - set_target_address_at(instruction_payload, -- !code.is_null() ? code->constant_pool() : kNullAddress, -+ !code.is_null() ? code.constant_pool() : kNullAddress, - target); - } - -@@ -159,13 +159,12 @@ void Assembler::deserialization_set_target_internal_reference_at( - } - } - --Tagged<HeapObject> RelocInfo::target_object(PtrComprCageBase cage_base) { -+HeapObject RelocInfo::target_object(PtrComprCageBase cage_base) { - DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_)); - if (IsCompressedEmbeddedObject(rmode_)) { -- return HeapObject::cast( -- Tagged<Object>(V8HeapCompressionScheme::DecompressTagged( -- cage_base, -- Assembler::target_compressed_address_at(pc_, constant_pool_)))); -+ return HeapObject::cast(Object(V8HeapCompressionScheme::DecompressTagged( -+ cage_base, -+ Assembler::target_compressed_address_at(pc_, constant_pool_)))); - } else { - return HeapObject::cast( - Object(Assembler::target_address_at(pc_, constant_pool_))); -@@ -187,7 +186,8 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) { - } - } - --void RelocInfo::set_target_object(Tagged<HeapObject> target, -+void RelocInfo::set_target_object(Heap* heap, HeapObject target, -+ WriteBarrierMode write_barrier_mode, - ICacheFlushMode icache_flush_mode) { - DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_)); - if (IsCompressedEmbeddedObject(rmode_)) { -diff --git a/deps/v8/src/codegen/riscv/assembler-riscv.h b/deps/v8/src/codegen/riscv/assembler-riscv.h -index bcd5a62d324ee..ed222b52d6927 100644 ---- a/deps/v8/src/codegen/riscv/assembler-riscv.h -+++ b/deps/v8/src/codegen/riscv/assembler-riscv.h -@@ -286,7 +286,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase, - // This is for calls and branches within generated code. The serializer - // has already deserialized the lui/ori instructions etc. - inline static void deserialization_set_special_target_at(Address location, -- Tagged<Code> code, -+ Code code, - Address target); - - // Get the size of the special target encoded at 'instruction_payload'. -diff --git a/deps/v8/src/execution/riscv/simulator-riscv.cc b/deps/v8/src/execution/riscv/simulator-riscv.cc -index 052a2d67dd7e4..9582db489638a 100644 ---- a/deps/v8/src/execution/riscv/simulator-riscv.cc -+++ b/deps/v8/src/execution/riscv/simulator-riscv.cc -@@ -1781,7 +1781,7 @@ void RiscvDebugger::Debug() { - sreg_t value; - StdoutStream os; - if (GetValue(arg1, &value)) { -- Tagged<Object> obj(value); -+ Object obj(value); - os << arg1 << ": \n"; - #ifdef DEBUG - obj.Print(os); -@@ -1830,7 +1830,7 @@ void RiscvDebugger::Debug() { - PrintF(" 0x%012" PRIxPTR " : 0x%016" REGIx_FORMAT - " %14" REGId_FORMAT " ", - reinterpret_cast<intptr_t>(cur), *cur, *cur); -- Tagged<Object> obj(*cur); -+ Object obj(*cur); - Heap* current_heap = sim_->isolate_->heap(); - if (obj.IsSmi() || - IsValidHeapObject(current_heap, HeapObject::cast(obj))) { -@@ -4692,7 +4692,7 @@ bool Simulator::DecodeRvvVS() { - Builtin Simulator::LookUp(Address pc) { - for (Builtin builtin = Builtins::kFirst; builtin <= Builtins::kLast; - ++builtin) { -- if (builtins_.code(builtin)->contains(isolate_, pc)) return builtin; -+ if (builtins_.code(builtin).contains(isolate_, pc)) return builtin; - } - return Builtin::kNoBuiltinId; - } -@@ -4709,7 +4709,7 @@ void Simulator::DecodeRVIType() { - if (builtin != Builtin::kNoBuiltinId) { - auto code = builtins_.code(builtin); - if ((rs1_reg() != ra || imm12() != 0)) { -- if ((Address)get_pc() == code->instruction_start()) { -+ if ((Address)get_pc() == code.InstructionStart()) { - sreg_t arg0 = get_register(a0); - sreg_t arg1 = get_register(a1); - sreg_t arg2 = get_register(a2); -diff --git a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc -index 72f89767eb348..4063b4b3d2194 100644 ---- a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc -+++ b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc -@@ -1211,7 +1211,7 @@ static T* frame_entry_address(Address re_frame, int frame_offset) { - int64_t RegExpMacroAssemblerRISCV::CheckStackGuardState(Address* return_address, - Address raw_code, - Address re_frame) { -- Tagged<InstructionStream> re_code = InstructionStream::cast(Object(raw_code)); -+ InstructionStream re_code = InstructionStream::cast(Object(raw_code)); - return NativeRegExpMacroAssembler::CheckStackGuardState( - frame_entry<Isolate*>(re_frame, kIsolateOffset), - static_cast<int>(frame_entry<int64_t>(re_frame, kStartIndexOffset)), - diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest index 9cc008ad3977..c8b3fae73386 100644 --- a/net-libs/xdp-tools/Manifest +++ b/net-libs/xdp-tools/Manifest @@ -1,5 +1,5 @@ DIST xdp-tools-1.4.2.tar.gz 340864 BLAKE2B c5197330ff917043e03a16346823acab760db5fe903f2e039bd2c178ad34bb04d96a0d6b321fd3565256c39422f3f1f7b475970bd22ab487e30468c96e11c711 SHA512 aedf79859872523d514f18e7a6e8b7999bd1942021968dbba9a7e86cde1c193e31b328bc56d6bf2b3fbc7f266c9df8d942d90a70bbd9d514ce38d56c07cd18ca DIST xdp-tools-1.4.3.tar.gz 339989 BLAKE2B 836eb66a2264e9d46124a009a8b3e039da23f28f83460fb3aa724c8ca4c37952979278e3041e9acca44acd68cc94423d73f381febc107c454db7da01f583ae41 SHA512 3ba176e573d02feefc1baf81570b514bc25a61d7be3256ce530128092f07b246b8731430289cdcd874f8846122a4451f0bcd06891565dd1b48beaa10b854c646 EBUILD xdp-tools-1.4.2.ebuild 2285 BLAKE2B 1782fc7c7fd82f8bf779ee1f9c292c5c0985f3e8fda4c51b67ec7c9b30440d9263b389f285021d289ff4e0bf0fccf454530e46753ffa9dabe1811a8f6077da94 SHA512 33bdd3e3df88cfe77b0d431d9dddf4f9ceac1e86d34706900c67c4e9622726373faf5017bd16be00dfd604ad60e211d3ecb71f4fdc051a0c358603397409dd25 -EBUILD xdp-tools-1.4.3.ebuild 2286 BLAKE2B f628edd88fd0dc18f02e46bc5e2fa7bfb11ea6483f6d6d14a11fd7e0be0c97032902a4a3eaa9b57b85fc784ff15a16335d48f35c92fa338e4dbf3f2a38c4f74a SHA512 b26960a9d91d9997aaa4c7c7f5817e5709ca4636f25aa03ed5f7f804640d81b4a62af8a7693d46a967c5d35227763d2f87dfb2c73d5725d4d589c7d3f2f09989 +EBUILD xdp-tools-1.4.3.ebuild 2300 BLAKE2B a427d25efbf45f8f462dbe70829cb2a6dc23d5492aad26803678df48eaa34d02f5d26d9569445550feb9d5cba5242c7b2c27e68e00e00211dbe3c59787dde442 SHA512 381c8ac5edce6d7e2bae4cc648689e956783efbffb2362f39e92b8292eef71632f2f86584b0318f1858a0a0eaba46dc015e7e536d76ca0fb6bbec9721f1f8be2 MISC metadata.xml 731 BLAKE2B a9c958d31f9ece376e4518e213823c14474df47747205020b76da7a0a67f7ed926ec55002b586143ce84cb965a23ad1794a42862597278682ef3605fc7d07911 SHA512 78774e4bcc6e05d56fe82b0aacd46e4d23e3bd89aa5bb55900adb94648d06b3251c575d4d0b6108cdad0f2ffbabcc2973e50e804b120a73e8923cd679601384f diff --git a/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild index 6861f5e2c969..4a8225a808b2 100644 --- a/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild +++ b/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild @@ -25,6 +25,7 @@ RDEPEND="${DEPEND}" BDEPEND=" sys-apps/grep[pcre] >=sys-devel/clang-11.0.0 + sys-devel/m4 " # Not prebuilt -- we build them -- but they're not ordinary ELF objects either. |