From 72cbece6db0285121ff63f62f8dfb982c45b05f4 Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 30 May 2023 18:46:49 +0200 Subject: [PATCH] oxidized: 0.26.3 -> 0.29.1 (#234001) This commit updates oxidized, fixes the oxidized-script executable and removes the non existing oxidized-web executable (oxidized-web is just a library for oxidized and does not provide a executable). --- pkgs/tools/admin/oxidized/Gemfile | 10 ++- pkgs/tools/admin/oxidized/Gemfile.lock | 70 ++++++++------- pkgs/tools/admin/oxidized/default.nix | 4 +- pkgs/tools/admin/oxidized/gemset.nix | 118 +++++++++++++++---------- 4 files changed, 120 insertions(+), 82 deletions(-) diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile index bddfe1adee53..6987f5d3da29 100644 --- a/pkgs/tools/admin/oxidized/Gemfile +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -1,5 +1,11 @@ source 'https://rubygems.org' -gem 'oxidized', '0.26.3' +gem 'oxidized', '0.29.1' gem 'oxidized-web', '0.13.1' -gem 'oxidized-script', '0.6.0' + +# The version on rubygems is not up2date +gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d' + +# Fix for https://github.com/ytti/oxidized/issues/2769 +gem 'psych', '~> 3.3.2' + diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index 64bc02cafc3c..062fecd2ad20 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -1,31 +1,39 @@ +GIT + remote: https://github.com/ytti/oxidized-script.git + revision: 988cded5d89f52e274afb545bd3e011e19d5d22d + ref: 988cded5d89f52e274afb545bd3e011e19d5d22d + specs: + oxidized-script (0.6.0) + oxidized (~> 0.28) + slop (~> 4.6) + GEM remote: https://rubygems.org/ specs: - asetus (0.3.0) - backports (3.14.0) - charlock_holmes (0.7.6) + asetus (0.4.0) + backports (3.24.1) + bcrypt_pbkdf (1.1.0) + charlock_holmes (0.7.7) + ed25519 (1.3.0) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) - ffi (1.10.0) - git (1.5.0) - haml (5.0.4) + ffi (1.15.5) + haml (5.2.2) temple (>= 0.8.0) tilt htmlentities (4.3.4) - json (2.2.0) - multi_json (1.13.1) - net-ssh (5.2.0) - net-telnet (0.1.1) - oxidized (0.26.3) + json (2.6.3) + multi_json (1.15.0) + net-ssh (7.1.0) + net-telnet (0.2.0) + oxidized (0.29.1) asetus (~> 0.1) - git (~> 1) - net-ssh (~> 5) - net-telnet (~> 0.1.1) - rugged (~> 0.21, >= 0.21.4) - slop (~> 3.5) - oxidized-script (0.6.0) - oxidized (~> 0.25) - slop (~> 3.5) + bcrypt_pbkdf (~> 1.0) + ed25519 (~> 1.2) + net-ssh (~> 7.1) + net-telnet (~> 0.2) + rugged (~> 1.6) + slop (~> 4.6) oxidized-web (0.13.1) charlock_holmes (~> 0.7.5) emk-sinatra-url-for (~> 0.2) @@ -38,16 +46,17 @@ GEM sass (~> 3.3) sinatra (~> 1.4, >= 1.4.6) sinatra-contrib (~> 1.4, >= 1.4.6) + psych (3.3.4) puma (3.11.4) - rack (1.6.11) + rack (1.6.13) rack-protection (1.5.5) rack rack-test (0.7.0) rack (>= 1.0, < 3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) - rugged (0.28.1) + rugged (1.6.3) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -64,17 +73,18 @@ GEM rack-test sinatra (~> 1.4.0) tilt (>= 1.3, < 3) - slop (3.6.0) - temple (0.8.1) - tilt (2.0.9) + slop (4.10.1) + temple (0.10.1) + tilt (2.1.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES - oxidized (= 0.26.3) - oxidized-script (= 0.6.0) + oxidized (= 0.29.1) + oxidized-script! oxidized-web (= 0.13.1) + psych (~> 3.3.2) BUNDLED WITH - 2.1.4 + 2.3.26 diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index 022b304a8459..db56ef894b38 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -6,7 +6,7 @@ bundlerApp { inherit ruby; - exes = [ "oxidized" "oxidized-web" "oxidized-script" ]; + exes = [ "oxidized" "oxs" ]; passthru.updateScript = bundlerUpdateScript "oxidized"; @@ -14,7 +14,7 @@ bundlerApp { description = "A network device configuration backup tool. It's a RANCID replacement!"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz nicknovitski ]; + maintainers = with maintainers; [ willibutz nicknovitski netali ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index f6a3aaa67803..0f3072352885 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -4,30 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790"; + sha256 = "0li09rcpgc21ymfayvhnjwvfl10s75g8aj52973gk0gvygscrhah"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; backports = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; + sha256 = "1f3zcy0q88rw3clk0r7bai7sp4r253lndf0qmdgczq1ykbm219w3"; type = "gem"; }; - version = "3.14.0"; + version = "3.24.1"; + }; + bcrypt_pbkdf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + type = "gem"; + }; + version = "1.1.0"; }; charlock_holmes = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; + }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; + type = "gem"; + }; + version = "1.3.0"; }; emk-sinatra-url-for = { dependencies = ["sinatra"]; @@ -45,20 +65,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.10.0"; - }; - git = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh"; - type = "gem"; - }; - version = "1.5.0"; + version = "1.15.5"; }; haml = { dependencies = ["temple" "tilt"]; @@ -66,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; + sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf"; type = "gem"; }; - version = "5.0.4"; + version = "5.2.2"; }; htmlentities = { groups = ["default"]; @@ -86,60 +96,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.2.0"; + version = "2.6.3"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; type = "gem"; }; - version = "5.2.0"; + version = "7.1.0"; }; net-telnet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + sha256 = "16nkxc79nqm7fd6w1fba4kb98vpgwnyfnlwxarpdcgywz300fc15"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; oxidized = { - dependencies = ["asetus" "git" "net-ssh" "net-telnet" "rugged" "slop"]; + dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ssh" "net-telnet" "rugged" "slop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07hpxmdjkfpkc00ln3hhh5qkj0lyhcmgbi0jza2c8cnjyy9sc73x"; + sha256 = "1ww8iv89zvklnvq9cv2lb6wyb5y73hinzm6xgd21za4204aanlps"; type = "gem"; }; - version = "0.26.3"; + version = "0.29.1"; }; oxidized-script = { dependencies = ["oxidized" "slop"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6"; - type = "gem"; + fetchSubmodules = false; + rev = "988cded5d89f52e274afb545bd3e011e19d5d22d"; + sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf"; + type = "git"; + url = "https://github.com/ytti/oxidized-script.git"; }; version = "0.6.0"; }; @@ -154,6 +166,16 @@ }; version = "0.13.1"; }; + psych = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph"; + type = "gem"; + }; + version = "3.3.4"; + }; puma = { groups = ["default"]; platforms = []; @@ -169,10 +191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.13"; }; rack-protection = { dependencies = ["rack"]; @@ -201,10 +223,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.10.3"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -212,20 +234,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; rugged = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; + sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; type = "gem"; }; - version = "0.28.1"; + version = "1.6.3"; }; sass = { dependencies = ["sass-listen"]; @@ -276,29 +298,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4"; type = "gem"; }; - version = "3.6.0"; + version = "4.10.1"; }; temple = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09"; + sha256 = "1jj8lny5hp8gm920k73r6xpb40j5mpiw1dcr8g5id4hxjggkw8by"; type = "gem"; }; - version = "0.8.1"; + version = "0.10.1"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; type = "gem"; }; - version = "2.0.9"; + version = "2.1.0"; }; }