From patchwork Thu Jul 13 17:03:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6993 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 (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4R21D12Ny7z3wjw for ; Thu, 13 Jul 2023 17:04:01 +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 (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4R21Cy4H0KzT1; Thu, 13 Jul 2023 17:03:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4R21Cy1FNcz2y1m; Thu, 13 Jul 2023 17:03:58 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4R21Cx2qcSz2xSJ for ; Thu, 13 Jul 2023 17:03:57 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4R21Cw0G2bzT1; Thu, 13 Jul 2023 17:03:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1689267836; 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=2Ldb3bj4ZthmMU7zLIKZl7JqO3S9Jy6HZfw5mSl/Z6A=; b=f9IQqE9fK4aSZNJ7K0igu1NZG82nOkQrSdXOCPTPyeEEBTQIFTJXJsWzbkDffa70AAM9/g wcrI3uEiNnM77MBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1689267836; 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=2Ldb3bj4ZthmMU7zLIKZl7JqO3S9Jy6HZfw5mSl/Z6A=; b=NvnGilpk+o3Hggi0UiRDa8R/WPUXLV+4Bc9jM+pMYVjY9MCvuRK52EtHhEcXfNBIevUmFM zz01o5OUkgjKtFf/SXhID+m3QhDraF3ov4tX1gyh/wVD5IdjXsmd0C3Di9Mxx5wuhf/StO IRrK3q7YEHm1sD5TrgDmzXlAXwEbSF+Mi6Tj4LfktEvlWPweAkQVT0nkOP4Wv92ynkO0yv +z4GxkD1h6MKvTdpEic0yurpEynSt6RRWvWGLTqqhQotqrf5d1AGUKOQOmJq5rs8KZTsXS e0x3ZnjnOdkK8SCyssbzDjyraumJxDKpGibhKkBVY60nLaSWZNr1HC3zTJFuzQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] pmacct: Fix for Bug#13163 - no such column: vlan_in [CU 175] Date: Thu, 13 Jul 2023 19:03:49 +0200 Message-ID: <20230713170349.3479430-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" - This problem occurred with pmacct-1.7.8 and was raised with upstream. They identified a bug and provided a commit with a fix. - Unfortunately the commit can not be used on version 1.7.8 from Dec 2022 as it depends on other commits applied in the period from Dec 2022 to July 2023. - The next version release is likely to come out around Dec 2023 to Mar 2024 based on the previous release frequency (6 to 9 months) - The only alternative was to make a release from the commit stage of the fix. In Github this only provides a zip file. So I extracted the zip file and then re-archived it as a .tar.gz file - Build went successfully and the .ipfire package file was tested successfully by @Jon Fixes: Bug#13163 Tested-by: Jon Murphy Signed-off-by: Adolf Belka --- lfs/pmacct | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lfs/pmacct b/lfs/pmacct index 7c8b32772..bb1079d62 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2019-2023 IPFire Team # +# Copyright (C) 2019-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config SUMMARY = Accounting and aggregation toolsuite for IPv4 and IPv6 -VER = 1.7.8 +VER = 5a5e272 THISAPP = pmacct-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 5 +PAK_VER = 6 DEPS = libcdada @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f +$(DL_FILE)_BLAKE2 = 7b86189cde0bcfd1756a03dbcdccde17a5780b3c3f2616a917609ba617de2ad6e08e16ae00f81c90233944157f19ec995bd43c06030ab70da869bb523f0433a7 install : $(TARGET) @@ -82,11 +82,12 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/pmacct \ - --enable-sqlite3 \ - --enable-l2 \ + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/pmacct \ + --enable-sqlite3 \ + --enable-l2 \ --enable-jansson # Add directory for plugins and pipes -mkdir -v /var/spool/pmacct