vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1030 from hedrok/T75-remove-pmacct

Browse Source 
T75: remove pmacct
This commit is contained in:
Daniil Baturin 2025-09-18 15:22:07 +01:00 committed by GitHub
commit 8dbddfdbf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/trigger_rebuild_packages.yml vendored
View File

@ -74,8 +74,6 @@ jobs:
- 'scripts/package-build/owamp/**'
pam_tacplus:
- 'scripts/package-build/pam_tacplus/**'
pmacct:
- 'scripts/package-build/pmacct/**'
podman:
- 'scripts/package-build/podman/**'
pyhumps:
@ -217,10 +215,6 @@ jobs:
trigger_build "pam_tacplus"
fi
if [ "${{ steps.changes.outputs.pmacct }}" == "true" ]; then
trigger_build "pmacct"
fi
if [ "${{ steps.changes.outputs.podman }}" == "true" ]; then
trigger_build "podman"
fi

1
data/live-build-config/hooks/live/18-enable-disable_services.chroot
View File

@ -10,7 +10,6 @@ systemctl disable kea-dhcp4-server.service
systemctl disable kea-dhcp6-server.service
systemctl disable isc-dhcp-relay.service
systemctl disable nfacctd.service
systemctl disable pmacctd.service
systemctl disable sfacctd.service
systemctl disable uacctd.service
systemctl disable ssh.service

1
scripts/package-build/pmacct/.gitignore vendored
View File

@ -1 +0,0 @@
/pmacct/

1
scripts/package-build/pmacct/build.py
View File

@ -1 +0,0 @@
../build.py

4
scripts/package-build/pmacct/package.toml
View File

@ -1,4 +0,0 @@
[[packages]]
name = "pmacct"
commit_id = "debian/1.7.7-1"
scm_url = "https://salsa.debian.org/debian/pmacct.git"

49
scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch
View File

@ -1,49 +0,0 @@
From 58900c9d0f98f224577c28dc2323061d33823f39 Mon Sep 17 00:00:00 2001
From: Paolo Lucente <pl+github@pmacct.net>
Date: Fri, 4 Mar 2022 22:07:29 +0000
Subject: [PATCH] * fix, pmacctd: SEGV when ICMP/ICMPv6 traffic was processed
and 'flows' primitive was enabled. To address Issue #586
---
src/nl.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/nl.c b/src/nl.c
index c42689ed..6a3da94b 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -1,6 +1,6 @@
/*
pmacct (Promiscuous mode IP Accounting package)
- pmacct is Copyright (C) 2003-2021 by Paolo Lucente
+ pmacct is Copyright (C) 2003-2022 by Paolo Lucente
*/
/*
@@ -293,10 +293,7 @@ int ip_handler(register struct packet_ptrs *pptrs)
}
}
else {
- if (pptrs->l4_proto != IPPROTO_ICMP) {
- pptrs->tlh_ptr = dummy_tlhdr;
- }
-
+ pptrs->tlh_ptr = dummy_tlhdr;
if (off < caplen) pptrs->payload_ptr = ptr;
}
@@ -479,10 +476,7 @@ int ip6_handler(register struct packet_ptrs *pptrs)
}
}
else {
- if (pptrs->l4_proto != IPPROTO_ICMPV6) {
- pptrs->tlh_ptr = dummy_tlhdr;
- }
-
+ pptrs->tlh_ptr = dummy_tlhdr;
if (off < caplen) pptrs->payload_ptr = ptr;
}
--
2.34.1