to a 2-clause licence (retaining UCB clauses (1) and (2)), per PR 22409 from Joel Baker, approved by Theo de Raadt.