This is not a Democrat/Republican issue. Obama and Bush both expanded these programs with their party's blessing. There are pockets of civil liberty defenders in both parties.
It should have become pretty clear that this wasn't partisan when an outgoing Obama helped ramp up surveillance in full knowledge of who was next. Seeing people treat this as a D/R fight when Udall and Feinstein are viciously opposed to one another is bizarre to me.