Teach about a -G parameter to pfctl -i ifname -Fs -G gateway to kill all states with the gateway set to help #1629
Correct patch applying to avoid fuzzy. It also need p1 now after regeneration
Do not rely on fuzzy
Make patch apply cleanly after latest changes