From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CB12D7E517 for ; Wed, 10 Nov 2021 13:49:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA0AB1C0C8 for ; Wed, 10 Nov 2021 13:49:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6AB681C06A for ; Wed, 10 Nov 2021 13:49:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 219DA44BAF for ; Wed, 10 Nov 2021 13:49:08 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 10 Nov 2021 13:49:04 +0100 Message-Id: <20211110124904.164053-6-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211110124904.164053-1-w.bumiller@proxmox.com> References: <20211110124904.164053-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.380 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SHORT 0.001 Use of a URL Shortener for very short URL PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far PROLO_LEO3 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pveproxy.pm] Subject: [pve-devel] [PATCH manager] depend on and use libjs-qrcodejs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2021 12:49:42 -0000 Signed-off-by: Wolfgang Bumiller --- PVE/Service/pveproxy.pm | 3 +++ debian/control | 1 + www/Makefile | 1 - www/index.html.tpl | 2 +- www/qrcode.min.js | 1 - 5 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 www/qrcode.min.js diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index d10c4fe9..31493dbf 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -120,6 +120,9 @@ sub init { '/proxmoxlib.js' =3D> { file =3D> "$basedirs->{widgettoolkit}/proxmoxlib.js", }, + '/qrcode.min.js' =3D> { + file =3D> '/usr/share/javascript/qrcodejs/qrcode.min.js', + }, }, dirs =3D> $dirs, }; diff --git a/debian/control b/debian/control index 04865acf..259043b4 100644 --- a/debian/control +++ b/debian/control @@ -45,6 +45,7 @@ Depends: apt-transport-https | apt (>=3D 1.5~), libfile-readbackwards-perl, libfilesys-df-perl, libjs-extjs (>=3D 7.0.0), + libjs-qrcodejs (>=3D 1.20201119), libjson-perl, liblwp-protocol-https-perl, libnet-dns-perl, diff --git a/www/Makefile b/www/Makefile index 639ad4b4..84abd027 100644 --- a/www/Makefile +++ b/www/Makefile @@ -9,7 +9,6 @@ install: install -m 0644 index.html.tpl ${WWWBASEDIR} install -d ${WWWJSDIR} install -m 0644 u2f-api.js ${WWWJSDIR} - install -m 0644 qrcode.min.js ${WWWJSDIR} =20 .PHONY: check check: diff --git a/www/index.html.tpl b/www/index.html.tpl index 7f07ea18..92491618 100644 --- a/www/index.html.tpl +++ b/www/index.html.tpl @@ -25,7 +25,7 @@ [% END %] -