I think GPLv3 already does this, with its anti-tivoization requirements. People just need to switch to an up-to-date copyleft license rather than permissive licenses.
GPLv3 still doesn't allow discriminating on fields of endeavor. I think we might need to change those terms to stop corporations from using our own software to harm us.