From 53ceb249883ed0dafef2c30db6ff9bef621aba1e Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 22 Dec 2024 12:00:10 +0100 Subject: T6674: move patches to "package/" subfolder This prevents the accidental applying of a patch to multiple source directories defined in package.toml. Example FRR: Package consits of build instructions for libyang, rtrlib and frr itself. Previously patches in frr/patches folder got applied to libyang, rtrlib and frr which made no sense and could also fail a build. --- ...-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch | 49 ---------------------- ...-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch | 49 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 scripts/package-build/pmacct/patches/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch create mode 100644 scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch (limited to 'scripts/package-build/pmacct') diff --git a/scripts/package-build/pmacct/patches/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch b/scripts/package-build/pmacct/patches/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch deleted file mode 100644 index cb5f7399..00000000 --- a/scripts/package-build/pmacct/patches/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 - 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 new file mode 100644 index 00000000..cb5f7399 --- /dev/null +++ b/scripts/package-build/pmacct/patches/pmacct/0001-fix-pmacctd-SEGV-when-ICMP-ICMPv6-traffic-was-proces.patch @@ -0,0 +1,49 @@ +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 + -- cgit v1.2.3