From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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
Content-Type: multipart/mixed; boundary="===============7140158203044932276=="
List-Id: <development.lists.ipfire.org>

--===============7140158203044932276==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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-arc=
hived it
   as a .tar.gz file
- Build went successfully and the .ipfire package file was tested successfull=
y by @Jon

Fixes: Bug#13163
Tested-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 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  <info(a)ipfire.org>                 =
         #
+# Copyright (C) 2019-2023  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # 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
=20
 SUMMARY    =3D Accounting and aggregation toolsuite for IPv4 and IPv6
=20
-VER        =3D 1.7.8
+VER        =3D 5a5e272
=20
 THISAPP    =3D pmacct-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D pmacct
-PAK_VER    =3D 5
+PAK_VER    =3D 6
=20
=20
 DEPS       =3D libcdada
@@ -49,7 +49,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86=
f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f
+$(DL_FILE)_BLAKE2 =3D 7b86189cde0bcfd1756a03dbcdccde17a5780b3c3f2616a917609b=
a617de2ad6e08e16ae00f81c90233944157f19ec995bd43c06030ab70da869bb523f0433a7
=20
 install : $(TARGET)
=20
@@ -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=3D/usr 			    \
-		        --sysconfdir=3D/etc/pmacct 	\
-		        --enable-sqlite3 		    \
-		        --enable-l2			        \
+	cd $(DIR_APP) && ./autogen.sh
+	cd $(DIR_APP) && ./configure \
+		        --prefix=3D/usr \
+		        --sysconfdir=3D/etc/pmacct \
+		        --enable-sqlite3 \
+		        --enable-l2 \
 		        --enable-jansson
 	# Add directory for plugins and pipes
 	-mkdir -v /var/spool/pmacct
--=20
2.41.0


--===============7140158203044932276==--