Unverified Commit e412e489 authored by Craige McWhirter's avatar Craige McWhirter
Browse files

toxvpn: 2019-09-09 -> 2024-08-21 

* Includes fix for boostrapping toxVPN
* removes the deprecated stdenv.lib
* version bumps toxcore
* Avoids casting away constness unnecessarily
* Fixes memory leaks on early return paths from main().
* Add required default bootstrap.json
* Added myself as a maintainer
parent 51648b2f

pkgs/tools/networking/toxvpn/bootstrap.json

0 → 100644
+1 −0
Original line number Diff line number Diff line 
{"last_scan":1724191272,"last_refresh":1724191153,"nodes":[{"ipv4":"144.217.167.73","ipv6":"-","port":33445,"tcp_ports":[33445,3389],"public_key":"7E5668E0EE09E19F320AD47902419331FFEE147BB3606769CFBE921A2A2FD34C","maintainer":"velusip","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Jera","last_ping":1724191272},{"ipv4":"tox.abilinski.com","ipv6":"-","port":33445,"tcp_ports":[33445],"public_key":"10C00EB250C3233E343E2AEBA07115A5C28920E9C8D29492F6D00B29049EDC7E","maintainer":"AnthonyBilinski","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Running https://github.com/toktok/c-toxcore v0.2.13. qTox best Tox! Contact: AC18841E56CCDEE16E93E10E6AB2765BE54277D67F1372921B5B418A6B330D3D3FAFA60B0931","last_ping":1724191272},{"ipv4":"tox.kurnevsky.net","ipv6":"tox.kurnevsky.net","port":33445,"tcp_ports":[],"public_key":"82EF82BA33445A1F91A7DB27189ECFC0C013E06E3DA71F588ED692BED625EC23","maintainer":"kurnevsky","location":"NL","status_udp":true,"status_tcp":false,"version":"3000002000","motd":"Hi from tox-rs!","last_ping":1724191272},{"ipv4":"205.185.115.131","ipv6":"-","port":53,"tcp_ports":[53,443,33445,3389],"public_key":"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68","maintainer":"GDR!","location":"US","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"https://gdr.name/tuntox/","last_ping":1724191272},{"ipv4":"tox2.abilinski.com","ipv6":"tox2.abilinski.com","port":33445,"tcp_ports":[33445],"public_key":"7A6098B590BDC73F9723FC59F82B3F9085A64D1B213AAF8E610FD351930D052D","maintainer":"AnthonyBilinski","location":"US","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Running https://github.com/toktok/c-toxcore v0.2.13. qTox best Tox! Contact: AC18841E56CCDEE16E93E10E6AB2765BE54277D67F1372921B5B418A6B330D3D3FAFA60B0931","last_ping":1724191272},{"ipv4":"tox1.mf-net.eu","ipv6":"tox1.mf-net.eu","port":33445,"tcp_ports":[33445,3389],"public_key":"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506","maintainer":"2mf","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"tox4.plastiras.org","ipv6":"-","port":33445,"tcp_ports":[3389,443,33445],"public_key":"836D1DA2BE12FE0E669334E437BE3FB02806F1528C2B2782113E0910C7711409","maintainer":"Tha_14","location":"MD","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191272},{"ipv4":"188.225.9.167","ipv6":"209:dead:ded:4991:49f3:b6c0:9869:3019","port":33445,"tcp_ports":[33445,3389],"public_key":"1911341A83E02503AB1FD6561BD64AF3A9D6C3F12B5FBB656976B2E678644A67","maintainer":"Nikat","location":"RU","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"First yggdrasil tox bootstrapd!!!\nYou can read about it here: https://yggdrasil-network.github.io/","last_ping":1724191273},{"ipv4":"3.0.24.15","ipv6":"-","port":33445,"tcp_ports":[33445],"public_key":"E20ABCF38CDBFFD7D04B29C956B33F7B27A3BB7AF0618101617B036E4AEA402D","maintainer":"Hardy","location":"SG","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"tox3.plastiras.org","ipv6":"tox3.plastiras.org","port":33445,"tcp_ports":[33445],"public_key":"4B031C96673B6FF123269FF18F2847E1909A8A04642BBECD0189AC8AEEADAF64","maintainer":"Tha_14","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191274},{"ipv4":"104.225.141.59","ipv6":"-","port":43334,"tcp_ports":[33445,3389],"public_key":"933BA20B2E258B4C0D475B6DECE90C7E827FE83EFA9655414E7841251B19A72C","maintainer":"Gabe","location":"US","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"True peace is in Jesus Matt 11:28-30 Tox ID: CD9E37503A5B2DFB41947B9A0E4B921381340B49FC318FEB07250789C715DA3470885905869F  matt2446.us","last_ping":1724191274},{"ipv4":"139.162.110.188","ipv6":"2400:8902::f03c:93ff:fe69:bf77","port":33445,"tcp_ports":[33445,3389,443],"public_key":"F76A11284547163889DDC89A7738CF271797BF5E5E220643E97AD3C7E7903D55","maintainer":"ToxTom","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"ToxTom","last_ping":1724191272},{"ipv4":"tox2.mf-net.eu","ipv6":"tox2.mf-net.eu","port":33445,"tcp_ports":[3389,33445],"public_key":"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F","maintainer":"2mf","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"172.105.109.31","ipv6":"2600:3c04::f03c:92ff:fe30:5df","port":33445,"tcp_ports":[33445],"public_key":"D46E97CF995DC1820B92B7D899E152A217D36ABE22730FEA4B6BF1BFC06C617C","maintainer":"amr","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"FrozenDev Node: tox-bootstrapd Add me on tox: A625D9E9EAAA7B40C399F50BA8B255836EE5A09B6DD0C54CF0E190E24544DC39237D6389FAED","last_ping":1724191274},{"ipv4":"91.146.66.26","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"B5E7DAC610DBDE55F359C7F8690B294C8E4FCEC4385DE9525DBFA5523EAD9D53","maintainer":"Toxdaemon","location":"EE","status_udp":true,"status_tcp":false,"version":"1000002013","motd":"tox-bootstrapd 91.146.66.26","last_ping":1724191272},{"ipv4":"tox2.plastiras.org","ipv6":"tox2.plastiras.org","port":33445,"tcp_ports":[33445,3389],"public_key":"B6626D386BE7E3ACA107B46F48A5C4D522D29281750D44A0CBA6A2721E79C951","maintainer":"Tha_14","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191272},{"ipv4":"172.104.215.182","ipv6":"2600:3c03::f03c:93ff:fe7f:6096","port":33445,"tcp_ports":[33445,3389,443],"public_key":"DA2BD927E01CD05EBCC2574EBE5BEBB10FF59AE0B2105A7D1E2B40E49BB20239","maintainer":"zero-one","location":"US","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"tox.initramfs.io","ipv6":"tox.initramfs.io","port":33445,"tcp_ports":[3389,33445],"public_key":"3F0A45A268367C1BEA652F258C85F4A66DA76BCAA667A49E770BCC4917AB6A25","maintainer":"initramfs","location":"TW","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"initramfs' tox bootstrap node","last_ping":1724191272},{"ipv4":"tox.plastiras.org","ipv6":"tox.plastiras.org","port":33445,"tcp_ports":[443,33445],"public_key":"8E8B63299B3D520FB377FE5100E65E3322F7AE5B20A0ACED2981769FC5B43725","maintainer":"Tha_14","location":"LU","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191272},{"ipv4":"188.214.122.30","ipv6":"-","port":33445,"tcp_ports":[3389,33445],"public_key":"2A9F7A620581D5D1B09B004624559211C5ED3D1D712E8066ACDB0896A7335705","maintainer":"turambar","location":"EG","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"62.183.96.32","ipv6":"-","port":33445,"tcp_ports":[33445],"public_key":"52BD37D53357701CB9C69ABA81E7741C5F14105523C89153A770D73F434AC473","maintainer":"Alexsandr","location":"RU","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"New Adugeya tox boostrap node","last_ping":1724191272},{"ipv4":"141.11.229.155","ipv6":"-","port":33445,"tcp_ports":[3389,33445],"public_key":"1FD96DF8DCAC4A95C117B460F23EB740C8FBA60DE89BE7B45136790B8E3D4B63","maintainer":"lzk","location":"US","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"43.198.227.166","ipv6":"-","port":33445,"tcp_ports":[33445,3389],"public_key":"AD13AB0D434BCE6C83FE2649237183964AE3341D0AFB3BE1694B18505E4E135E","maintainer":"Hardy","location":"CN","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"95.181.230.108","ipv6":"2a03:c980:db:5d::","port":33445,"tcp_ports":[33445],"public_key":"B5FFECB4E4C26409EBB88DB35793E7B39BFA3BA12AC04C096950CB842E3E130A","maintainer":"wdwp","location":"RU","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"5.19.249.240","ipv6":"-","port":38296,"tcp_ports":[3389,38296],"public_key":"DA98A4C0CD7473A133E115FEA2EBDAEEA2EF4F79FD69325FC070DA4DE4BA3238","maintainer":"Toxdaemon","location":"RU","status_udp":false,"status_tcp":true,"version":"","motd":"","last_ping":1724191272},{"ipv4":"198.199.98.108","ipv6":"2604:a880:1:20::32f:1001","port":33445,"tcp_ports":[],"public_key":"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F","maintainer":"Cody","location":"US","status_udp":false,"status_tcp":false,"version":"1000002015","motd":"Cody's Tox node!","last_ping":1692090783},{"ipv4":"46.101.197.175","ipv6":"2a03:b0c0:3:d0::ac:5001","port":33445,"tcp_ports":[],"public_key":"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707","maintainer":"kotelnik","location":"DE","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Power to Ukraine!","last_ping":1716531423},{"ipv4":"tox01.ky0uraku.xyz","ipv6":"tox01.ky0uraku.xyz","port":33445,"tcp_ports":[],"public_key":"FD04EB03ABC5FC5266A93D37B4D6D6171C9931176DC68736629552D8EF0DE174","maintainer":"ky0uraku","location":"NL","status_udp":false,"status_tcp":false,"version":"1000002013","motd":"ky0uraku tox01 node","last_ping":1691512685},{"ipv4":"122.116.39.151","ipv6":"2001:b011:8:2f22:1957:7f9d:e31f:96dd","port":33445,"tcp_ports":[],"public_key":"5716530A10D362867C8E87EE1CD5362A233BAFBBA4CF47FA73B7CAD368BD5E6E","maintainer":"miaoski","location":"TW","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"tox-bootstrapd","last_ping":1681799519},{"ipv4":"173.232.195.131","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"3F7D1765E54FADEE08DEDDFECCF8ACF38C52580D4DCA77B30CC3E478F2C50A34","maintainer":"DEADBEEF","location":"PL","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Maintained by DEADBEEF; ID: AFF6CAA16FFEDE7F458A08D2B19D5DABA6E39A3B26319CC516178DEFBC652154EE393B6C2008","last_ping":1692574743},{"ipv4":"NONE","ipv6":"2607:f130:0:f8::4c85:a645","port":33445,"tcp_ports":[],"public_key":"8AFE1FC6426E5B77AB80318ED64F5F76341695B9FB47AB8AC9537BF5EE9E9D29","maintainer":"Busindre","location":"US","status_udp":false,"status_tcp":false,"version":"","motd":"","last_ping":1718916783},{"ipv4":"198.98.49.206","ipv6":"2605:6400:10:caa:1:be:a:7001","port":33445,"tcp_ports":[],"public_key":"28DB44A3CEEE69146469855DFFE5F54DA567F5D65E03EFB1D38BBAEFF2553255","maintainer":"Cüber","location":"US","status_udp":false,"status_tcp":false,"version":"1000002013","motd":"Tox","last_ping":1685639465},{"ipv4":"tox02.ky0uraku.xyz","ipv6":"tox02.ky0uraku.xyz","port":33445,"tcp_ports":[],"public_key":"D3D6D7C0C7009FC75406B0A49E475996C8C4F8BCE1E6FC5967DE427F8F600527","maintainer":"ky0uraku","location":"FR","status_udp":false,"status_tcp":false,"version":"1000002016","motd":"ky0uraku tox02 node","last_ping":1713682503},{"ipv4":"kusoneko.moe","ipv6":"kusoneko.moe","port":33445,"tcp_ports":[],"public_key":"BE7ED53CD924813507BA711FD40386062E6DC6F790EFA122C78F7CDEEE4B6D1B","maintainer":"Kusoneko","location":"CA","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Managed by kusoneko (ID:D8E4A5E926A4E7A85FA40F8CA55D47554F043D3C5CDB457187726F19CE20E52C0D7C3FCE9466)","last_ping":1711445823},{"ipv4":"NONE","ipv6":"200:832f:2e56:91a6:678e:aaaf:80bf:4a8a","port":33445,"tcp_ports":[],"public_key":"444361B1717AD5E10D9C03EA1C714A846C9D3B16A875186D0034DC516A49F013","maintainer":"Dima(Yggdrasil)","location":"RU","status_udp":false,"status_tcp":false,"version":"","motd":"","last_ping":0},{"ipv4":"193.168.141.224","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"8E82CF0D7CC42B63748C01DD61EAA490BC35DBDB177942D423DC96D40762C01D","maintainer":"DEADBEEF","location":"RO","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Maintained by DEADBEEF; ID: AFF6CAA16FFEDE7F458A08D2B19D5DABA6E39A3B26319CC516178DEFBC652154EE393B6C2008","last_ping":1689605883},{"ipv4":"194.36.190.71","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"99E8460035E45C0A6B6DC2C02B14440F7F876518E9D054D028209B5669827645","maintainer":"UR1229SWL","location":"NL","status_udp":false,"status_tcp":false,"version":"3000002000","motd":"Welcome to https://rx-tx.info and t.me/rx_tx_info","last_ping":1722501794}]}

pkgs/tools/networking/toxvpn/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 


stdenv.mkDerivation {

  pname = "toxvpn";

  version = "unstable-2019-09-09";

  version = "unstable-2024-08-21";



  src = fetchFromGitHub {

    owner = "cleverca22";

    repo = "toxvpn";

    rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a";

    sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb";

    rev = "c727451eb871b43855b825ff93dc48fa0d3320b6";

    sha256 = "sha256-UncU0cpoyy9Z0TCChGmaHpyhW9ctz32gU7n3hgpOEwU=";

  };



  buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
@@ -28,13 +28,16 @@ stdenv.mkDerivation { 


  cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ];



  postInstall = "$out/bin/toxvpn -h";

  postInstall = "cp ${./bootstrap.json} $out/share/toxvpn/";



  installCheckPhase = "$out/bin/toxvpn -h";

  doInstallCheck = true;



  meta = with lib; {

    description = "Powerful tool that allows one to make tunneled point to point connections over Tox";

    homepage = "https://github.com/cleverca22/toxvpn";

    license = licenses.gpl3;

    maintainers = with maintainers; [ cleverca22 obadz toonn ];

    maintainers = with maintainers; [ cleverca22 craigem obadz toonn ];

    platforms = platforms.unix;

  };

}