From 12eec3f22894db6a9d5922a5b441aa65238d1c07 Mon Sep 17 00:00:00 2001 From: Kyrylo Yatsenko Date: Mon, 15 Sep 2025 18:36:06 +0300 Subject: [PATCH] T75: remove pmacct --- .../workflows/trigger_rebuild_packages.yml | 6 --- .../live/18-enable-disable_services.chroot | 1 - scripts/package-build/pmacct/.gitignore | 1 - scripts/package-build/pmacct/build.py | 1 - scripts/package-build/pmacct/package.toml | 4 -- ...-when-ICMP-ICMPv6-traffic-was-proces.patch | 49 ------------------- 6 files changed, 62 deletions(-) delete mode 100644 scripts/package-build/pmacct/.gitignore delete mode 120000 scripts/package-build/pmacct/build.py delete mode 100644 scripts/package-build/pmacct/package.toml delete mode 100644 scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml index 4eb740f3..cb316f6f 100644 --- a/.github/workflows/trigger_rebuild_packages.yml +++ b/.github/workflows/trigger_rebuild_packages.yml @@ -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: @@ -215,10 +213,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 diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 04ca7f3e..905805d9 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -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 diff --git a/scripts/package-build/pmacct/.gitignore b/scripts/package-build/pmacct/.gitignore deleted file mode 100644 index 65042174..00000000 --- a/scripts/package-build/pmacct/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pmacct/ diff --git a/scripts/package-build/pmacct/build.py b/scripts/package-build/pmacct/build.py deleted file mode 120000 index 3c76af73..00000000 --- a/scripts/package-build/pmacct/build.py +++ /dev/null @@ -1 +0,0 @@ -../build.py \ No newline at end of file diff --git a/scripts/package-build/pmacct/package.toml b/scripts/package-build/pmacct/package.toml deleted file mode 100644 index 6f5961be..00000000 --- a/scripts/package-build/pmacct/package.toml +++ /dev/null @@ -1,4 +0,0 @@ -[[packages]] -name = "pmacct" -commit_id = "debian/1.7.7-1" -scm_url = "https://salsa.debian.org/debian/pmacct.git" diff --git a/scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch b/scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch deleted file mode 100644 index cb5f7399..00000000 --- a/scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 58900c9d0f98f224577c28dc2323061d33823f39 Mon Sep 17 00:00:00 2001 -From: Paolo Lucente -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 -