From 72c0cb05503ed109da1671aeb94bf855bc7352ea7a0ea6eac84b4c00e0e9c5db Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Mon, 19 Jun 2023 18:42:48 +0000 Subject: [PATCH] 1.34.3 OBS-URL: https://build.opensuse.org/package/show/devel:languages:javascript/deno?expand=0&rev=134 --- _service | 4 +- deno-1.34.2.tar.xz | 3 -- deno-1.34.3.tar.xz | 3 ++ deno-pull-19537.patch | 40 ++++++++++++++ deno-rm-upgrade-cmd.patch | 108 +++++++++++++++++++------------------- deno.changes | 35 ++++++++++++ deno.spec | 3 +- vendor.tar.xz | 4 +- 8 files changed, 139 insertions(+), 61 deletions(-) delete mode 100644 deno-1.34.2.tar.xz create mode 100644 deno-1.34.3.tar.xz create mode 100644 deno-pull-19537.patch diff --git a/_service b/_service index c2aa8f0..c37ac7c 100644 --- a/_service +++ b/_service @@ -13,8 +13,8 @@ git https://github.com/denoland/deno - v1.34.2 - 1.34.2 + v1.34.3 + 1.34.3 docs diff --git a/deno-1.34.2.tar.xz b/deno-1.34.2.tar.xz deleted file mode 100644 index 5c09a84..0000000 --- a/deno-1.34.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:356d0d9f3f4609f5cfb1858827767f618078b633011a404037a90f1f742afc77 -size 7187604 diff --git a/deno-1.34.3.tar.xz b/deno-1.34.3.tar.xz new file mode 100644 index 0000000..053d7e5 --- /dev/null +++ b/deno-1.34.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15056df531381af170f84023dbaf381a8686a12bd73872b00bc8ffb537e328a9 +size 7206304 diff --git a/deno-pull-19537.patch b/deno-pull-19537.patch new file mode 100644 index 0000000..8ca1411 --- /dev/null +++ b/deno-pull-19537.patch @@ -0,0 +1,40 @@ +From 85825efdaf2ed1f0dbc937994967d428651d8c61 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= +Date: Fri, 16 Jun 2023 17:02:32 +0200 +Subject: [PATCH] chore: add conditional compilation for tokio_unstable feature + +--- + runtime/tokio_util.rs | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/runtime/tokio_util.rs b/runtime/tokio_util.rs +index 204b928f43dee..4dbaabf442a81 100644 +--- a/runtime/tokio_util.rs ++++ b/runtime/tokio_util.rs +@@ -3,6 +3,7 @@ use std::fmt::Debug; + use std::str::FromStr; + + use deno_core::task::MaskFutureAsSend; ++#[cfg(tokio_unstable)] + use tokio_metrics::RuntimeMonitor; + + /// Default configuration for tokio. In the future, this method may have different defaults +@@ -70,6 +71,7 @@ where + // SAFETY: this this is guaranteed to be running on a current-thread executor + let future = unsafe { MaskFutureAsSend::new(future) }; + ++ #[cfg(tokio_unstable)] + let join_handle = if metrics_enabled { + rt.spawn(async move { + let metrics_interval: u64 = std::env::var("DENO_TOKIO_METRICS_INTERVAL") +@@ -93,6 +95,10 @@ where + } else { + rt.spawn(future) + }; ++ ++ #[cfg(not(tokio_unstable))] ++ let join_handle = rt.spawn(future); ++ + rt.block_on(join_handle).unwrap().into_inner() + } + diff --git a/deno-rm-upgrade-cmd.patch b/deno-rm-upgrade-cmd.patch index b19de79..2e0446d 100644 --- a/deno-rm-upgrade-cmd.patch +++ b/deno-rm-upgrade-cmd.patch @@ -16,7 +16,7 @@ diff --git a/cli/args/flags.rs.1 b/cli/args/flags.rs index fa28241..5ef386a 100644 --- a/cli/args/flags.rs.1 +++ b/cli/args/flags.rs -@@ -229,7 +220,6 @@ pub enum DenoSubcommand { +@@ -262,7 +262,6 @@ pub enum DenoSubcommand { Task(TaskFlags), Test(TestFlags), Types, @@ -24,7 +24,7 @@ index fa28241..5ef386a 100644 Vendor(VendorFlags), } -@@ -531,7 +521,7 @@ impl Flags { +@@ -579,7 +578,7 @@ impl Flags { std::env::current_dir().ok() } Bundle(_) | Completions(_) | Doc(_) | Fmt(_) | Init(_) | Install(_) @@ -33,7 +33,7 @@ index fa28241..5ef386a 100644 } } -@@ -662,7 +652,6 @@ pub fn flags_from_vec(args: Vec) -> clap::error::Result { +@@ -710,7 +709,6 @@ pub fn flags_from_vec(args: Vec) -> clap::error::Result { "test" => test_parse(&mut flags, &mut m), "types" => types_parse(&mut flags, &mut m), "uninstall" => uninstall_parse(&mut flags, &mut m), @@ -41,23 +41,24 @@ index fa28241..5ef386a 100644 "vendor" => vendor_parse(&mut flags, &mut m), _ => unreachable!(), } -@@ -760,7 +749,6 @@ fn clap_root() -> Command { - .subcommand(task_subcommand()) - .subcommand(test_subcommand()) - .subcommand(types_subcommand()) -- .subcommand(upgrade_subcommand()) - .subcommand(vendor_subcommand()) +@@ -810,7 +808,6 @@ fn clap_root() -> Command { + .subcommand(task_subcommand()) + .subcommand(test_subcommand()) + .subcommand(types_subcommand()) +- .subcommand(upgrade_subcommand()) + .subcommand(vendor_subcommand()) + }) .long_about(DENO_HELP) - .after_help(ENV_VARIABLES_HELP) -@@ -1769,56 +1757,6 @@ The declaration file could be saved and used for typing information.", - ) +@@ -1847,58 +1844,6 @@ The declaration file could be saved and used for typing information.", + }) } -fn upgrade_subcommand() -> Command { -- Command::new("upgrade") -- .about("Upgrade deno executable to given version") -- .long_about( -- "Upgrade deno executable to the given version. +- Command::new("upgrade").defer(|cmd| { +- cmd +- .about("Upgrade deno executable to given version") +- .long_about( +- "Upgrade deno executable to the given version. -Defaults to latest. - -The version is downloaded from @@ -68,45 +69,46 @@ index fa28241..5ef386a 100644 -update to a different location, use the --output flag - - deno upgrade --output $HOME/my_deno", -- ) -- .arg( -- Arg::new("version") -- .long("version") -- .help("The version to upgrade to"), -- ) -- .arg( -- Arg::new("output") -- .long("output") -- .help("The path to output the updated version to") -- .value_parser(value_parser!(PathBuf)) -- .value_hint(ValueHint::FilePath), -- ) -- .arg( -- Arg::new("dry-run") -- .long("dry-run") -- .help("Perform all checks without replacing old exe") -- .action(ArgAction::SetTrue), -- ) -- .arg( -- Arg::new("force") -- .long("force") -- .short('f') -- .help("Replace current exe even if not out-of-date") -- .action(ArgAction::SetTrue), -- ) -- .arg( -- Arg::new("canary") -- .long("canary") -- .help("Upgrade to canary builds") -- .action(ArgAction::SetTrue), -- ) -- .arg(ca_file_arg()) +- ) +- .arg( +- Arg::new("version") +- .long("version") +- .help("The version to upgrade to"), +- ) +- .arg( +- Arg::new("output") +- .long("output") +- .help("The path to output the updated version to") +- .value_parser(value_parser!(PathBuf)) +- .value_hint(ValueHint::FilePath), +- ) +- .arg( +- Arg::new("dry-run") +- .long("dry-run") +- .help("Perform all checks without replacing old exe") +- .action(ArgAction::SetTrue), +- ) +- .arg( +- Arg::new("force") +- .long("force") +- .short('f') +- .help("Replace current exe even if not out-of-date") +- .action(ArgAction::SetTrue), +- ) +- .arg( +- Arg::new("canary") +- .long("canary") +- .help("Upgrade to canary builds") +- .action(ArgAction::SetTrue), +- ) +- .arg(ca_file_arg()) +- }) -} - fn vendor_subcommand() -> Command { Command::new("vendor") - .about("Vendor remote modules into a local directory") -@@ -2953,23 +2891,6 @@ fn types_parse(flags: &mut Flags, _matches: &mut ArgMatches) { + .defer(|cmd| cmd.about("Vendor remote modules into a local directory") +@@ -3035,23 +2980,6 @@ fn types_parse(flags: &mut Flags, _matches: &mut ArgMatches) { flags.subcommand = DenoSubcommand::Types; } @@ -130,7 +132,7 @@ index fa28241..5ef386a 100644 fn vendor_parse(flags: &mut Flags, matches: &mut ArgMatches) { ca_file_arg_parse(flags, matches); config_args_parse(flags, matches); -@@ -3338,25 +3259,6 @@ mod tests { +@@ -3425,25 +3353,6 @@ mod tests { assert_eq!(flags2, flags); } @@ -156,7 +158,7 @@ index fa28241..5ef386a 100644 #[test] fn version() { let r = flags_from_vec(svec!["deno", "--version"]); -@@ -5977,25 +5879,6 @@ mod tests { +@@ -6167,25 +6076,6 @@ mod tests { ); } diff --git a/deno.changes b/deno.changes index 8539a9f..03f1d83 100644 --- a/deno.changes +++ b/deno.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Sun Jun 18 20:19:32 UTC 2023 - Avindra Goolcharan + +- update to 1.34.3: + * feat(UNSTABLE) kv queue implementation (#19459) + * fix(cli): avoid crash on import of invalid module names (#19523) + * fix(compile): some npm dependencies were missing in compiled output (#19503) + * fix(config): do not canonicalize config file path before loading (#19436) + * fix(ext/http): Include hostname in onListen argument (#19497) + * fix(ext/http): replace await Deno.serve with await + Deno.serve().finished (#19485) + * fix(ext/node): HTTPS server (#19362) + * fix(ext/node): handle 'upgrade' responses (#19412) + * fix(ext/node): make Buffer.slice be the same as subarray (#19481) + * fix(ext/websockets): ensure we fully send frames before close (#19484) + * fix(fmt): do not panic formatting json with multiple values (#19442) + * fix(lsp): don't pre-load documents matched in the config + file's "exclude" (#19431) + * fix(lsp): update import map config when deno.json changes (#19476) + * fix(ext/node): Worker constructor doesn't check type: module + of package.json (#19480) + * fix(npm): warn when tarball contains hardlink or symlink (#19474) + * fix: reload config files on watcher restarts (#19487) + * perf(ext/http): from_maybe_shared_unchecked for header values (#19478) + * perf(http): cache verified headers (#19465) + * perf(node): cache realpath_sync calls in read permission check (#19379) + * perf(serve): hoist promise error callback (#19456) + * perf(serve): hoist repeated condition (#19449) + * perf(web): optimize timer resolution (#19493) + * perf: don't run microtask checkpoint if macrotask callback + did no work (#19492) + * perf: optimize ByteString checks, hoist server rid getter (#19452) +- rebase deno-rm-upgrade-cmd.patch +- add deno-pull-19537.patch to build unsafe tokio features + ------------------------------------------------------------------- Wed Jun 14 18:31:25 UTC 2023 - Avindra Goolcharan diff --git a/deno.spec b/deno.spec index b72f07f..2d4abec 100644 --- a/deno.spec +++ b/deno.spec @@ -19,7 +19,7 @@ Name: deno -Version: 1.34.2 +Version: 1.34.3 Release: 0 Summary: A secure JavaScript and TypeScript runtime License: MIT @@ -31,6 +31,7 @@ Source2: cargo_config Source99: revendor_source.sh Patch0: deno-disable-update-check.patch Patch1: deno-rm-upgrade-cmd.patch +Patch2: https://github.com/denoland/deno/pull/19537.patch#/deno-pull-19537.patch BuildRequires: cargo-packaging # gcc-c++ needed to build SPIRV-Cross BuildRequires: clang diff --git a/vendor.tar.xz b/vendor.tar.xz index 79f8836..0fc0c05 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84678d20ac0ff0c45f364b0392759a05fe5f18f4eb69169262cba25cb8f5cc1f -size 72123480 +oid sha256:63a07ed6c616f8df5db9f95a3a632cde16c4583c9684955e107ac00598a1c85a +size 72251760