| Message ID | 1490881430-10434-16-git-send-email-rahulbedarkar89@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On 30-03-17 15:43, Rahul Bedarkar wrote: > Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Quick comment on this one... First of all, I think it's a very good idea to have first the fully automatic patches, and then do remaining fixups like this one. However, I think there is still a lot more to be fixed up. There are also plenty of places where we refer to (L)GPLv[23] in e.g. comments. So instead of this patch, I would add a series of patches that uses the same (or maybe slightly more generic) sed expressions but now doesn't limit to _LICENSE or to .mk files. I did a quick check, there are about 25 instances of GPLv left, but you need to filter out patches and _LICENSE_FILES, so perhaps an automatic sed expression is going to be difficult. Anyway, my message is: those 25 remaining instances should be replaced as well. Regards, Arnout > --- > package/freeswitch/freeswitch.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk > index 32439b8..0ce67f0 100644 > --- a/package/freeswitch/freeswitch.mk > +++ b/package/freeswitch/freeswitch.mk > @@ -8,11 +8,11 @@ FREESWITCH_VERSION = 1.6.15 > FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz > FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases > FREESWITCH_LICENSE = MPL-1.1, \ > - GPLv3+ with font exception (fonts), \ > + GPL-3.0+ with font exception (fonts), \ > Apache-2.0 (apr, apr-util), \ > - LGPLv2+ (sofia-sip), \ > - LGPLv2.1, GPLv2 (spandsp), \ > - BSD-3c (libsrtp), \ > + LGPL-2.0+ (sofia-sip), \ > + LGPL-2.1, GPL-2.0 (spandsp), \ > + BSD-3-Clause (libsrtp), \ > tiff license > > FREESWITCH_LICENSE_FILES = \ >
Hello, On Fri, Mar 31, 2017 at 3:49 AM, Arnout Vandecappelle <arnout@mind.be> wrote: > > > On 30-03-17 15:43, Rahul Bedarkar wrote: >> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> > > Quick comment on this one... > > First of all, I think it's a very good idea to have first the fully automatic > patches, and then do remaining fixups like this one. > > However, I think there is still a lot more to be fixed up. There are also > plenty of places where we refer to (L)GPLv[23] in e.g. comments. So instead of > this patch, I would add a series of patches that uses the same (or maybe > slightly more generic) sed expressions but now doesn't limit to _LICENSE or to > .mk files. I did a quick check, there are about 25 instances of GPLv left, but > you need to filter out patches and _LICENSE_FILES, so perhaps an automatic sed > expression is going to be difficult. > > Anyway, my message is: those 25 remaining instances should be replaced as well. I was not sure if license strings in comments should be updated to use SPDX identifier. May be for consistency it should be ? But it doesn't harm either, so I will fix those separately with this one. Thanks, Rahul
Hello, On Fri, 31 Mar 2017 00:19:18 +0200, Arnout Vandecappelle wrote: > First of all, I think it's a very good idea to have first the fully automatic > patches, and then do remaining fixups like this one. > > However, I think there is still a lot more to be fixed up. There are also > plenty of places where we refer to (L)GPLv[23] in e.g. comments. So instead of > this patch, I would add a series of patches that uses the same (or maybe > slightly more generic) sed expressions but now doesn't limit to _LICENSE or to > .mk files. I did a quick check, there are about 25 instances of GPLv left, but > you need to filter out patches and _LICENSE_FILES, so perhaps an automatic sed > expression is going to be difficult. > > Anyway, my message is: those 25 remaining instances should be replaced as well. I've merged Rahul series as-is, and expect to get additional patches fixing the remaining exceptions here and there. I didn't want to hold off too long on Rahul series, as it's the stuff that quickly gets out of date, and gets a lot of conflict when applied. Best regards, Thomas
diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 32439b8..0ce67f0 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -8,11 +8,11 @@ FREESWITCH_VERSION = 1.6.15 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases FREESWITCH_LICENSE = MPL-1.1, \ - GPLv3+ with font exception (fonts), \ + GPL-3.0+ with font exception (fonts), \ Apache-2.0 (apr, apr-util), \ - LGPLv2+ (sofia-sip), \ - LGPLv2.1, GPLv2 (spandsp), \ - BSD-3c (libsrtp), \ + LGPL-2.0+ (sofia-sip), \ + LGPL-2.1, GPL-2.0 (spandsp), \ + BSD-3-Clause (libsrtp), \ tiff license FREESWITCH_LICENSE_FILES = \
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> --- package/freeswitch/freeswitch.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)