[packages_10.03.2] portsentry: merge r28964