As the saying goes, you can't use a technical solution to fix a social problem.
One way to fix the social problem is to vote politicians out of office when they make bad decisions--not just about surveillance, but in general. People who don't have to pay a cost for bad decisions have no incentive to make better decisions.
Another way is to not give powers like this to governments in the first place. If politicians don't have decision making power at all over something, they can't harm the rest of us by making a bad decision.