pfSense

Remove txtsupport from Unbound. Of limited use, and the back end code was never ported over from the package (and is messy to do so). Ticket #5545

Sanitize the session_id/logout_id in captive portal.

Merge pull request #2049 from phil-davis/patch-4

Merge pull request #2083 from phil-davis/patch-10

Merge pull request #2082 from phil-davis/patch-9

Make block bogon rule display consistent - RELENG_2_2

The block private networks and anti-lockout rules display in the firewall rules display with the schedule column blank. But the block bogon networks has an asterisk. That looks odd. I noticed it just now when looking at firewall rules in 2.3....

Backport fix #5467 to RELENG_2_2

Backport Redmine #5440 to RELENG_2_2

The code in RELENG_2_2 for system_usermanager_settings.php seems to work OK in RELENG_2_2 so I did not touch anything there.
But diag_authentication.php had nothing about $pconfig on initial page load. This extra code makes it select a reasonable default auth server when the page first loads. After that, each time the user does "Test", the page comes back with the previously selected auth server, user name and password (like it did already) - so that seems good.

diag_ipsec.php - show button for child SAs only when some are established. Fix ID used by child SA disconnect button.

Unbound advanced Invoming TCP Buffers validation

There is a variable cut-paste error here. Actually it never makes any difference in practice because outgoing_num_tcp and incoming_num_tcp are both set, so the logic comes out the same.
I noticed this while reviewing stuff in master for 2.3-ALPHA - might as well back-port stuff like this so that nobody who notices will worry about it in RELENG_2_2.