From patchwork Sun Feb 23 15:13:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2804 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48QTHN0DLnz3wjN for ; Sun, 23 Feb 2020 15:13:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48QTHL6dRdz1JM; Sun, 23 Feb 2020 15:13:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48QTHL2Jz1z2yCq; Sun, 23 Feb 2020 15:13:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48QTHK2V9sz2xJH for ; Sun, 23 Feb 2020 15:13:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48QTHJ3TYCzXv; Sun, 23 Feb 2020 15:13:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1582470828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=S8pDpK0ZVS8As0wVSoriyHZz6JtvhYsi0rml/opOfAs=; b=BdYlS9EFxBFP/lmjCgx4aYP52meSvcIdcBqSwrJziWXOcvCvisB7UaDt37MQIZgQdC/uSW sSBFsaVUQSmjfVAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1582470828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=S8pDpK0ZVS8As0wVSoriyHZz6JtvhYsi0rml/opOfAs=; b=DXTOSYPdKcQORn1a1ygd0Lpk1HTZoRFMBG/GiG6OYWQq/lg2amD2Vuq+5/8FbVt3YXaT/d lIPbHoqQ2L6VusCLusc5F9ThLVNqNSW/rTNGa8NTACiyO6nV0i3gri58cgT/gwELWpaEkY UWhu5AW5g6h7A9l6I5zApow0RksjQVd8tQLgGw8IdfSjglBA5NNKr1avlbchrqenTDneSX Zit6Jve9WO4ZmP0yktf6L8ceCVG76i/g3JZ2EiAjnCK1ZE/p0Lu7g3c65Y0fcyHHHKBm0I Q487r3ooa3PeKrpo7YoiVEuu8+8onA5eYgAtfDs2oNpKpmfvRhog4eDfp2V/Gg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] fireinfo.cgi: Use pakfire lib to gather the pakfire version. Date: Sun, 23 Feb 2020 16:13:46 +0100 Message-Id: <20200223151346.2704-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl --- html/cgi-bin/fireinfo.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index 08fee3d8a..967e250c7 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -28,6 +28,7 @@ use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require '/opt/pakfire/lib/functions.pl'; my $configfile = "/var/ipfire/main/send_profile"; @@ -84,7 +85,7 @@ if ($errormessage) { } my $ipfire_version = `cat /etc/system-release`; -my $pakfire_version = `cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`; +my $pakfire_version = &Pakfire::make_version(); my $kernel_version = `uname -a`; &Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'});