pmacct: Fix for Bug#13163 - no such column: vlan_in [CU 175]

- 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 <jon.murphy@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2023-07-13 19:03:49 +02:00
committed by Michael Tremer
parent d95a414ce1
commit 7642da793c

View File

@@ -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
@@ -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