Probably again making legal what has been going on illegally for a long time.
The thing is, technology alone will not be enough as a protection. We need a sane legal framework. They have a virtually unlimited budget (our taxes) that they can use against us and they will always find new ways to carry out their mass surveillance.
If we allow our governments to take our money to make us puppets, then we're pretty much f#cked until the next big revolution (in whatever form that will have to be).
Instead of having to deal with it we have to face it an confront, fight and destroy authoritarian laws as much as we can.