Patchwork [meta-oe,v2] nettle: update to version 3.0

login
register
mail settings
Submitter Armin Kuster
Date July 15, 2014, 3:13 p.m.
Message ID <1405437238-28782-1-git-send-email-akuster@mvista.com>
Download mbox | patch
Permalink /patch/75655/
State New
Headers show

Comments

Armin Kuster - July 15, 2014, 3:13 p.m.
Updating to version 3.x
Version 3.x includes GPL v3 code. They call it dual
  licensing
Keeping 2.7.1 as it is GPL v2
Put common code in inc file

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta/recipes-support/nettle/nettle.inc      | 27 +++++++++++++++++++++++++++
 meta/recipes-support/nettle/nettle_2.7.1.bb | 20 +++-----------------
 meta/recipes-support/nettle/nettle_3.0.bb   | 16 ++++++++++++++++
 3 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 meta/recipes-support/nettle/nettle.inc
 create mode 100644 meta/recipes-support/nettle/nettle_3.0.bb
Saul Wold - July 15, 2014, 3:21 p.m.
On 07/15/2014 08:13 AM, Armin Kuster wrote:
> Updating to version 3.x
> Version 3.x includes GPL v3 code. They call it dual
>    licensing
> Keeping 2.7.1 as it is GPL v2
> Put common code in inc file
>
> Signed-off-by: Armin Kuster <akuster@mvista.com>
> ---
>   meta/recipes-support/nettle/nettle.inc      | 27 +++++++++++++++++++++++++++
>   meta/recipes-support/nettle/nettle_2.7.1.bb | 20 +++-----------------
>   meta/recipes-support/nettle/nettle_3.0.bb   | 16 ++++++++++++++++
>   3 files changed, 46 insertions(+), 17 deletions(-)
>   create mode 100644 meta/recipes-support/nettle/nettle.inc
>   create mode 100644 meta/recipes-support/nettle/nettle_3.0.bb
>
> diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc
> new file mode 100644
> index 0000000..bca35c0
> --- /dev/null
> +++ b/meta/recipes-support/nettle/nettle.inc
> @@ -0,0 +1,27 @@
> +SUMMARY = "A low level cryptographic library"
> +HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
> +SECTION = "libs"
> +LICENSE = "LGPLv2.1 & GPLv2"
> +
> +# Version 2.7.1 is GPL v2
> +# set PREFERRED_VERSION_nettle =  "2.7.1" in local.conf
> +# if you want GPLv2 code
> +#

The preferred mechanism for getting GPLv2 is to set 
INCOMPATIBLE_LICENSE="GPLv3", not by setting PREFERRED_VERSION, so I am 
not sure this comment is best here.

> +# Version 3.x is GPL v2 and v3
> +
> +
> +DEPENDS += "gmp"
> +
> +SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
> +
> +EXTRA_OECONF = "--disable-openssl"
> +
> +do_configure_prepend() {
> +       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
> +               cp ${S}/aclocal.m4 ${S}/acinclude.m4
> +       fi
> +}
> +
> +inherit autotools
> +
> +BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_2.7.1.bb
> index 8aa5351..9ef9f64 100644
> --- a/meta/recipes-support/nettle/nettle_2.7.1.bb
> +++ b/meta/recipes-support/nettle/nettle_2.7.1.bb
> @@ -1,26 +1,12 @@
> -SUMMARY = "A low level cryptographic library"
> -HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
> -SECTION = "libs"
> +
> +include nettle.inc
> +
>   LICENSE = "LGPLv2.1 & GPLv2"
>   LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>                       file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \
>                       file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d"
>
> -DEPENDS += "gmp"
> -
> -SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
>
>   SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
>   SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
>
> -EXTRA_OECONF = "--disable-openssl"
> -
> -do_configure_prepend() {
> -       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
> -               cp ${S}/aclocal.m4 ${S}/acinclude.m4
> -       fi
> -}
> -
> -inherit autotools
> -
> -BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-support/nettle/nettle_3.0.bb b/meta/recipes-support/nettle/nettle_3.0.bb
> new file mode 100644
> index 0000000..bac2e71
> --- /dev/null
> +++ b/meta/recipes-support/nettle/nettle_3.0.bb
> @@ -0,0 +1,16 @@
> +#
> +# Nettle  3 and above contains GPL v3 code
> +# use 2.7.1 if you do not want GPL v3 code
> +#
> +
> +include nettle.inc
> +
> +LICENSE = "LGPLv2.1 & GPLv2 & GPLv3"
> +
This should be | (single) then based on your follow up email to RP.

Sau!

> +LIC_FILES_CHKSUM = "file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\
> +                    file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 \
> +                    file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8"
> +
> +SRC_URI[md5sum] = "f64b1bf1e774b7ae6e507318e340250e"
> +SRC_URI[sha256sum] = "9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913"
> +
>
Ross Burton - July 15, 2014, 3:24 p.m.
On 15 July 2014 16:13, Armin Kuster <akuster@mvista.com> wrote:
> +LICENSE = "LGPLv2.1 & GPLv2 & GPLv3"

The manual says:

"Nettle is dual licenced under the GNU General Public License version
2 or later, and the GNU Lesser General Public License version 3 or
later. When using Nettle, you must comply fully with all conditions of
at least one of these licenses."

So I think you mean LICENSE="GPLv2+ | LGPLv3+"

I'm undecided whether this means we can drop the old Nettle or not...

Ross
Armin Kuster - July 15, 2014, 3:34 p.m.
On 07/15/2014 08:24 AM, Burton, Ross wrote:
> On 15 July 2014 16:13, Armin Kuster <akuster@mvista.com> wrote:
>> +LICENSE = "LGPLv2.1 & GPLv2 & GPLv3"
> The manual says:
>
> "Nettle is dual licenced under the GNU General Public License version
> 2 or later, and the GNU Lesser General Public License version 3 or
> later. When using Nettle, you must comply fully with all conditions of
> at least one of these licenses."
>
> So I think you mean LICENSE="GPLv2+ | LGPLv3+"
>
> I'm undecided whether this means we can drop the old Nettle or not...

Ok. I will wait for the dust to settle before I submit patch v3.

- Armin
>
> Ross
Armin Kuster - July 15, 2014, 3:35 p.m.
On 07/15/2014 08:21 AM, Saul Wold wrote:
> On 07/15/2014 08:13 AM, Armin Kuster wrote:
>> Updating to version 3.x
>> Version 3.x includes GPL v3 code. They call it dual
>>    licensing
>> Keeping 2.7.1 as it is GPL v2
>> Put common code in inc file
>>
>> Signed-off-by: Armin Kuster <akuster@mvista.com>
>> ---
>>   meta/recipes-support/nettle/nettle.inc      | 27 
>> +++++++++++++++++++++++++++
>>   meta/recipes-support/nettle/nettle_2.7.1.bb | 20 +++-----------------
>>   meta/recipes-support/nettle/nettle_3.0.bb   | 16 ++++++++++++++++
>>   3 files changed, 46 insertions(+), 17 deletions(-)
>>   create mode 100644 meta/recipes-support/nettle/nettle.inc
>>   create mode 100644 meta/recipes-support/nettle/nettle_3.0.bb
>>
>> diff --git a/meta/recipes-support/nettle/nettle.inc 
>> b/meta/recipes-support/nettle/nettle.inc
>> new file mode 100644
>> index 0000000..bca35c0
>> --- /dev/null
>> +++ b/meta/recipes-support/nettle/nettle.inc
>> @@ -0,0 +1,27 @@
>> +SUMMARY = "A low level cryptographic library"
>> +HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
>> +SECTION = "libs"
>> +LICENSE = "LGPLv2.1 & GPLv2"
>> +
>> +# Version 2.7.1 is GPL v2
>> +# set PREFERRED_VERSION_nettle =  "2.7.1" in local.conf
>> +# if you want GPLv2 code
>> +#
>
> The preferred mechanism for getting GPLv2 is to set 
> INCOMPATIBLE_LICENSE="GPLv3", not by setting PREFERRED_VERSION, so I 
> am not sure this comment is best here.

ok. will correct.


>
>> +# Version 3.x is GPL v2 and v3
>> +
>> +
>> +DEPENDS += "gmp"
>> +
>> +SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
>> +
>> +EXTRA_OECONF = "--disable-openssl"
>> +
>> +do_configure_prepend() {
>> +       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
>> +               cp ${S}/aclocal.m4 ${S}/acinclude.m4
>> +       fi
>> +}
>> +
>> +inherit autotools
>> +
>> +BBCLASSEXTEND = "native"
>> diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb 
>> b/meta/recipes-support/nettle/nettle_2.7.1.bb
>> index 8aa5351..9ef9f64 100644
>> --- a/meta/recipes-support/nettle/nettle_2.7.1.bb
>> +++ b/meta/recipes-support/nettle/nettle_2.7.1.bb
>> @@ -1,26 +1,12 @@
>> -SUMMARY = "A low level cryptographic library"
>> -HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
>> -SECTION = "libs"
>> +
>> +include nettle.inc
>> +
>>   LICENSE = "LGPLv2.1 & GPLv2"
>>   LIC_FILES_CHKSUM = 
>> "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>> file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d 
>> \
>> file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d"
>>
>> -DEPENDS += "gmp"
>> -
>> -SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
>>
>>   SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
>>   SRC_URI[sha256sum] = 
>> "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
>>
>> -EXTRA_OECONF = "--disable-openssl"
>> -
>> -do_configure_prepend() {
>> -       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
>> -               cp ${S}/aclocal.m4 ${S}/acinclude.m4
>> -       fi
>> -}
>> -
>> -inherit autotools
>> -
>> -BBCLASSEXTEND = "native"
>> diff --git a/meta/recipes-support/nettle/nettle_3.0.bb 
>> b/meta/recipes-support/nettle/nettle_3.0.bb
>> new file mode 100644
>> index 0000000..bac2e71
>> --- /dev/null
>> +++ b/meta/recipes-support/nettle/nettle_3.0.bb
>> @@ -0,0 +1,16 @@
>> +#
>> +# Nettle  3 and above contains GPL v3 code
>> +# use 2.7.1 if you do not want GPL v3 code
>> +#
>> +
>> +include nettle.inc
>> +
>> +LICENSE = "LGPLv2.1 & GPLv2 & GPLv3"
>> +
> This should be | (single) then based on your follow up email to RP.

will fix this too.

-Armin

>
> Sau!
>
>> +LIC_FILES_CHKSUM = 
>> "file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\
>> + 
>> file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 
>> \
>> + 
>> file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8"
>> +
>> +SRC_URI[md5sum] = "f64b1bf1e774b7ae6e507318e340250e"
>> +SRC_URI[sha256sum] = 
>> "9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913"
>> +
>>
Saul Wold - July 16, 2014, 5:18 p.m.
On 07/15/2014 08:34 AM, akuster wrote:
>
> On 07/15/2014 08:24 AM, Burton, Ross wrote:
>> On 15 July 2014 16:13, Armin Kuster <akuster@mvista.com> wrote:
>>> +LICENSE = "LGPLv2.1 & GPLv2 & GPLv3"
>> The manual says:
>>
>> "Nettle is dual licenced under the GNU General Public License version
>> 2 or later, and the GNU Lesser General Public License version 3 or
>> later. When using Nettle, you must comply fully with all conditions of
>> at least one of these licenses."
>>
>> So I think you mean LICENSE="GPLv2+ | LGPLv3+"
>>
>> I'm undecided whether this means we can drop the old Nettle or not...
>
> Ok. I will wait for the dust to settle before I submit patch v3.
>

So I checked on this and it would be an or ('|').

The only other concern I have is there is a COPYING.GPLv3, you might 
want to check with the upstream what the intent of having that License 
file is for, do they intend on some parts being v3 and if so which parts?

I am not sure if the INCOMPATIBLE_LICENSE will handle the OR properly, 
but we should just have one version.

Sau!

> - Armin
>>
>> Ross
>
Ross Burton - July 16, 2014, 9:23 p.m.
On 16 July 2014 18:18, Saul Wold <sgw@linux.intel.com> wrote:
> The only other concern I have is there is a COPYING.GPLv3, you might want to
> check with the upstream what the intent of having that License file is for,
> do they intend on some parts being v3 and if so which parts?

They'll need a LGPLv3 license alongside the GPLv2 license if they're
dual-licensing, but we should checksum the "LGPLv3 or GPLv2" statement
if it's written down anywhere in the tarball (which I hope it is) so
we get alerted if they ever decide to be LGPLv3+ only.

> I am not sure if the INCOMPATIBLE_LICENSE will handle the OR properly, but
> we should just have one version.

The INCOMPATIBLE_LICENSE checks do handle "or" license statements.

Ross

Patch

diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc
new file mode 100644
index 0000000..bca35c0
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle.inc
@@ -0,0 +1,27 @@ 
+SUMMARY = "A low level cryptographic library"
+HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1 & GPLv2"
+
+# Version 2.7.1 is GPL v2
+# set PREFERRED_VERSION_nettle =  "2.7.1" in local.conf
+# if you want GPLv2 code
+#
+# Version 3.x is GPL v2 and v3
+
+
+DEPENDS += "gmp"
+
+SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
+
+EXTRA_OECONF = "--disable-openssl"
+
+do_configure_prepend() {
+       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
+               cp ${S}/aclocal.m4 ${S}/acinclude.m4
+       fi
+}
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_2.7.1.bb
index 8aa5351..9ef9f64 100644
--- a/meta/recipes-support/nettle/nettle_2.7.1.bb
+++ b/meta/recipes-support/nettle/nettle_2.7.1.bb
@@ -1,26 +1,12 @@ 
-SUMMARY = "A low level cryptographic library"
-HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
-SECTION = "libs"
+
+include nettle.inc
+
 LICENSE = "LGPLv2.1 & GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \
                     file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d"
 
-DEPENDS += "gmp"
-
-SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
 
 SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
 SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
 
-EXTRA_OECONF = "--disable-openssl"
-
-do_configure_prepend() {
-       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
-               cp ${S}/aclocal.m4 ${S}/acinclude.m4
-       fi
-}
-
-inherit autotools
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/nettle/nettle_3.0.bb b/meta/recipes-support/nettle/nettle_3.0.bb
new file mode 100644
index 0000000..bac2e71
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle_3.0.bb
@@ -0,0 +1,16 @@ 
+#
+# Nettle  3 and above contains GPL v3 code
+# use 2.7.1 if you do not want GPL v3 code
+#
+
+include nettle.inc
+
+LICENSE = "LGPLv2.1 & GPLv2 & GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\
+                    file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 \
+                    file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8"
+
+SRC_URI[md5sum] = "f64b1bf1e774b7ae6e507318e340250e"
+SRC_URI[sha256sum] = "9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913"
+