From 42e5ec18344b4bd3a691ccbd635374d6f3592417 Mon Sep 17 00:00:00 2001 From: Tobias Bossert Date: Tue, 20 Dec 2022 11:40:19 +0100 Subject: [PATCH] Raised wg-meta version to 0.3.3 to fix deadlock when calling reload callbacks --- CHANGES | 8 +- README.md | 6 +- VERSION | 2 +- cpanfile | 2 +- debian/changelog | 8 +- share/messages.pot | 458 --------------------------------------------- 6 files changed, 19 insertions(+), 465 deletions(-) delete mode 100644 share/messages.pot diff --git a/CHANGES b/CHANGES index 71a3e709..39e341b4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,14 @@ +wg-wrangler (0.2.3) unstable; urgency=medium + + * Raised wg-meta version to 0.3.3 to fix deadlock when calling the reload callback + + -- Tobias Bossert Thu, 25 Dec 2022 11:35:59 +0100 + wg-wrangler (0.2.2) unstable; urgency=medium * fixed ip suggestions - -- Tobias Bossert Fri, 25 Jul 2022 20:57:23 +0100 + -- Tobias Bossert Fri, 25 Nov 2022 20:57:23 +0100 wg-wrangler (0.2.1) unstable; urgency=medium diff --git a/README.md b/README.md index 11be6f67..078ea83e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ WGwrangler =========== Version: 0.2.2 -Date: 2022-11-25 +Date: 2022-12-20 WGwrangler is a web application to manage local Wireguard Configuration using [wg-meta](https://metacpan.org/release/Wireguard-WGmeta) in its backend. @@ -61,7 +61,7 @@ setup: Type=simple User=wireguard_manager Group=wireguard_manager - ExecStart=/usr/bin/perl /home/wireguard_manager/opt/wgwrangler/bin/wgwrangler prefork --listen 'http://127.0.0.1:7171' + ExecStart=/usr/bin/perl /home/wireguard_manager/opt/wgwrangler/bin/wgwrangler prefork --listen 'http://0.2.2.1:7171' [Install] WantedBy=multi-user.target @@ -110,7 +110,7 @@ You can also package the application as a nice tar.gz file, it uses carton to install dependent module. If you want to make sure that your project builds with perl 5.22, make sure to set the `PERL` environment variable to a perl 5.22 interpreter, make sure to delete any `PERL5LIB` environment variable, and run -`make clean && make`. This will cause a `cpanfile-0.1.0.snapshot` file to be included +`make clean && make`. This will cause a `cpanfile-0.2.2.snapshot` file to be included with your tar ball, when building the app this snapshot will be used to make sure all the right versions of the dependent modules get installed. diff --git a/VERSION b/VERSION index ee1372d3..71790396 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.2 +0.2.3 diff --git a/cpanfile b/cpanfile index 82e75fc5..2a4b50c8 100644 --- a/cpanfile +++ b/cpanfile @@ -1,6 +1,6 @@ requires 'CallBackery', '>= 0.42.4'; requires 'Mojo::SQLite'; -requires 'Wireguard::WGmeta', '>= 0.3.2'; +requires 'Wireguard::WGmeta', '>= 0.3.3'; requires 'Net::IP', '>=1.26'; requires 'Email::MIME'; requires 'Email::Sender'; diff --git a/debian/changelog b/debian/changelog index 71a3e709..39e341b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +wg-wrangler (0.2.3) unstable; urgency=medium + + * Raised wg-meta version to 0.3.3 to fix deadlock when calling the reload callback + + -- Tobias Bossert Thu, 25 Dec 2022 11:35:59 +0100 + wg-wrangler (0.2.2) unstable; urgency=medium * fixed ip suggestions - -- Tobias Bossert Fri, 25 Jul 2022 20:57:23 +0100 + -- Tobias Bossert Fri, 25 Nov 2022 20:57:23 +0100 wg-wrangler (0.2.1) unstable; urgency=medium diff --git a/share/messages.pot b/share/messages.pot deleted file mode 100644 index a4845edf..00000000 --- a/share/messages.pot +++ /dev/null @@ -1,458 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the wgwrangler package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: wgwrangler 0.2.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-18 13:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:48 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:23 -msgid "*" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:153 -msgid "A device name" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:423 -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:500 -msgid "Access Denied" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:189 -msgid "Actual Address" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:367 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:145 -msgid "Add Peer" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:205 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:92 -msgid "Add User" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:172 -msgid "Address Override" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:199 -msgid "Advanced Options" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:242 -msgid "Alias" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:151 -msgid "Alias is already defined for this interface" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:159 -msgid "Allowed IPs" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:84 -msgid "Allowed-IPs" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/CommitMessageForm.pm:79 -msgid "Apply Config" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:274 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:279 -msgid "Apply configuration" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/CommitMessageForm.pm:51 -msgid "Briefly describe your changes" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:215 -msgid "Client Interface Port" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:207 -msgid "Client specific configuration" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:91 -msgid "Comment" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/CommitMessageForm.pm:48 -msgid "Commit Message" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/CommitMessageForm.pm:43 -msgid "Commit message" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:66 -msgid "Config Preview" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/CommitMessageForm.pm:70 -msgid "Could not checkin new version. Error ID: " -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:202 -msgid "Create Admin Account" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:107 -msgid "Created" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:229 -msgid "DNS" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:443 -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:517 -msgid "Data Decoding Problem %1" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:74 -msgid "Date" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:217 -msgid "Delete Peer" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:130 -msgid "Delete User" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:274 -msgid "Description" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:145 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:77 -msgid "Device" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:352 -msgid "Disable Peer" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:41 -msgid "Disabled" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:289 -msgid "Discard Changes" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:133 -msgid "Do you really want to delete the selected user ?" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:220 -msgid "Do you really want to delete this peer - This cannot be undone!" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:291 -msgid "Do you really want to discard all changes?" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:107 -msgid "Do you really want to go back to this revision?" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:133 -msgid "Does not look like an email address" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:135 -msgid "Does not look like an ip address" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:171 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:180 -msgid "Edit Peer" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:105 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:110 -msgid "Edit User" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:70 -msgid "Email" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:352 -msgid "Enable Peer" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:190 -msgid "Enable/Disable" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:130 -msgid "Endpoint" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:42 -msgid "Error" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/AbstractTable.pm:130 -msgid "Export %1" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:97 -msgid "FQDN" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:150 -msgid "Faild to remove user %1" -msgstr "" - -#: lib/WGwrangler/Model/Email.pm:135 -msgid "Failed to send mail to %1" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:94 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:60 -msgid "Family Name" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:85 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:53 -msgid "Given Name" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:145 -msgid "Has to be in range 1025-65535 and a number" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:153 -msgid "Has to be larger than 0 and a number" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:44 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:48 -msgid "Interface" -msgstr "" - -#: lib/WGwrangler/Model/IPmanager.pm:236 -msgid "It seems that some parts of" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:183 -msgid "List of ip addresses, separated by comma and in CDIR notation" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:117 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:63 -msgid "Name" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:125 -msgid "Name of the person which this peer belongs to" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:96 -msgid "New User" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:150 -msgid "New Wireguard Peer" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:50 -msgid "No interface selected" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:44 -msgid "No user selected." -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:138 -msgid "Not enough arguments for validator `address_override`" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:149 -msgid "Not enough arguments for validator `alias`" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:104 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:74 -msgid "Note" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:131 -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:132 -msgid "Only a-Z, 0-9 and -/_ allowed" -msgstr "" - -#: lib/WGwrangler/Model/WireguardDataAdapter.pm:134 -msgid "Only a-Z, 0-9, -/_ and one space are allowed" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:68 -msgid "Password" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:76 -msgid "Password Again" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:87 -msgid "Peer Private Key" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:77 -msgid "Peer Public Key" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:259 -msgid "Persistent-keepalive" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:428 -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:507 -msgid "Plugin Name missing" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:55 -msgid "Public Key" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:126 -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:256 -msgid "Reload Data" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:105 -msgid "Restore Version" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:67 -msgid "Rights" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:204 -msgid "Save Changes" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:284 -msgid "Send by Email" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:268 -msgid "Send keep-alive pings every N seconds" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:277 -msgid "Some extra infos about this peer (Not visible in config preview)" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:247 -msgid "Something went wrong while trying to delete this peer. Error ID: " -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:222 -msgid "The listen port on the peer" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:156 -msgid "The password instances did not match." -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:91 -msgid "Transfer-RX" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:104 -msgid "Transfer-TX" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/Controller/RpcService.pm:434 -msgid "Upload Missing" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:84 -msgid "User" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:131 -msgid "User email" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardAddPeerForm.pm:139 -msgid "User email - config is sent to this email if desired" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:50 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:38 -msgid "UserId" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:59 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:46 -msgid "Username" -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardVersions.pm:67 -msgid "Version" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/Config.pm:491 -msgid "Wrong password!" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:141 -msgid "You can not delete the user you are logged in with" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/UserForm.pm:152 -msgid "You can only edit your own stuff unless you have admin permissions." -msgstr "" - -#: lib/WGwrangler/GuiPlugin/WireguardShow.pm:227 -msgid "You have to select a peer first" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:115 -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/Users.pm:139 -msgid "You have to select a user first" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/AbstractCardlist.pm:82 -msgid "cardCfg must be defined in child plugin class" -msgstr "" - -#: lib/WGwrangler/Model/IPmanager.pm:236 -msgid "do not belong to" -msgstr "" - -#: lib/WGwrangler/Model/IPmanager.pm:221 -msgid "is already acquired" -msgstr "" - -#: lib/WGwrangler/Model/IPmanager.pm:227 -msgid "overlaps with an already acquired network" -msgstr "" - -#: thirdparty/lib/perl5/CallBackery/GuiPlugin/AbstractForm.pm:139 -msgid "sorry, don't know the field you are talking about" -msgstr ""