Under the terms of the GPL, I believe the first is absolutely verboten, the second feels shaky.

However, if you have the rights to dual-license the code, either of those would be just fine under whatever second license you'd like to cook up.