This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via b1110eb1bd0d1ed0f40da0d3ce73648743a5be3c (commit) via 7642da793c938fce6bf0bb7b7dce97dbf2a51f9d (commit) from d95a414ce12306762849b4df8a50ddd18a838129 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b1110eb1bd0d1ed0f40da0d3ce73648743a5be3c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 31 09:27:27 2023 +0000

pmacct: Increment package release

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 7642da793c938fce6bf0bb7b7dce97dbf2a51f9d Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 13 19:03:49 2023 +0200

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

-----------------------------------------------------------------------

Summary of changes: lfs/pmacct | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

Difference in files: diff --git a/lfs/pmacct b/lfs/pmacct index 4be1be156..038777646 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -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,8 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 6 - +PAK_VER = 7

DEPS = libcdada

@@ -49,7 +48,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f +$(DL_FILE)_BLAKE2 = 7b86189cde0bcfd1756a03dbcdccde17a5780b3c3f2616a917609ba617de2ad6e08e16ae00f81c90233944157f19ec995bd43c06030ab70da869bb523f0433a7

install : $(TARGET)

@@ -82,11 +81,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

hooks/post-receive -- IPFire 2.x development tree