K 10 svn:author V 2 kp K 8 svn:date V 27 2021-10-22T12:33:37.054420Z K 7 svn:log V 614 pfctl: delay label macro expansion until after rule optimisation We used to expand the $nr macro in labels into the rule number prior to the optimisation step. This would occasionally produce incorrect rule numbers in the labels. Delay all macro expansion until after the optimisation step to ensure that we expand the correct values. MFC after: 1 week Reported by: Özkan KIRIK Differential Revision: https://reviews.freebsd.org/D32488 (cherry picked from commit 09c7f2386973f8c36978895a7600320916bc3d07) Git Hash: 6358f57209e2d16c2f1a6a9e6df09ba8f20f6868 Git Author: kp@FreeBSD.org END