summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package-build/pmacct/.gitignore1
l---------scripts/package-build/pmacct/build.py1
-rw-r--r--scripts/package-build/pmacct/package.toml4
-rw-r--r--scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch49
4 files changed, 0 insertions, 55 deletions
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 <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
-