[PATCH] Add libiax

[PATCH] Add libiax

[Lukas Gradl]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]


Hi Guix,

Attached is a patch for LibIAX, a library that is used by the Ring
(formerly SFLphone).

Upstream seems to use no version numbers.  I used the git commit ID that
is also refered to in the version that is bundeled with Ring.  This is
also the latest commit to libiax.

Thank you!



[-- Attachment #2: 0001-gnu-telephony-Add-libiax.patch --]
[-- Type: text/x-patch, Size: 2609 bytes --]

From b6319840932e87b40c1f8ae4a7546727f7547d91 Mon Sep 17 00:00:00 2001
From: Lukas Gradl <lgradl@openmailbox.org>
Date: Sat, 28 May 2016 17:50:28 -0500
Subject: [PATCH] gnu: telephony: Add libiax.

* gnu/packages/telephony.scm (libiax): New variable.
---
 gnu/packages/telephony.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 50a83fb..754c4c5 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
 
 (define-module (gnu packages telephony)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)  
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
@@ -211,3 +213,36 @@ Real-time Transport Protocol (SRTP), the Universal Security Transform (UST),
 and a supporting cryptographic kernel.")
     (home-page "https://github.com/cisco/libsrtp")
     (license bsd-3)))
+
+(define-public libiax
+  (let ((commit "0e5980f1d78ce462e2d1ed6bc39ff35c8341f201"))
+    ;; This is the commit used by the Ring Project.
+    (package
+      (name "libiax")
+      (version (string-append "2-" (string-take commit 7)))
+      (source
+       (origin
+         (method url-fetch)
+         (uri
+          (string-append
+           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
+           "repository/archive.tar.gz?ref="
+           commit))
+         (sha256
+          (base32
+           "0cj5293bixp3k5x3hjwyd0iq7z8w5p7yavxvvkqk5817hjq386y2"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    (add-before 'configure 'autoconf
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))
+      (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2")
+      (synopsis "Inter-Asterisk-Protocol library")
+      (description "LibIAX implements the Inter-Asterisk-Protocol for relaying
+Voice-over-IP (VoIP) comminications.")
+      (license lgpl2.0))))
-- 
2.7.4

Re: [PATCH] Add libiax

[Leo Famulari]

On Sat, May 28, 2016 at 06:08:57PM -0500, Lukas Gradl wrote:
> 
> Hi Guix,
> 
> Attached is a patch for LibIAX, a library that is used by the Ring
> (formerly SFLphone).

Cool!

> Upstream seems to use no version numbers.  I used the git commit ID that
> is also refered to in the version that is bundeled with Ring.  This is
> also the latest commit to libiax.

Since there are no upstream versions, I think the version string should
use 0.0.0 to refer to the upstream version, then the Guix package
revision number, and then the 7 characters of the commit.

So, it would end up like this: 0.0.0-1.cabba9e

See here:
https://www.gnu.org/software/guix/manual/html_node/Version-Numbers.html#Version-Numbers

> +    (package
> +      (name "libiax")
> +      (version (string-append "2-" (string-take commit 7)))

By the way, what does the "2-" refer to?

Re: [PATCH] Add libiax

[Lukas Gradl]

Thank you for your review!

Leo Famulari <leo@famulari.name> writes:

> On Sat, May 28, 2016 at 06:08:57PM -0500, Lukas Gradl wrote:
>> 
>> Hi Guix,
>> 
>> Attached is a patch for LibIAX, a library that is used by the Ring
>> (formerly SFLphone).
>
> Cool!
>
>> Upstream seems to use no version numbers.  I used the git commit ID that
>> is also refered to in the version that is bundeled with Ring.  This is
>> also the latest commit to libiax.
>
> Since there are no upstream versions, I think the version string should
> use 0.0.0 to refer to the upstream version, then the Guix package
> revision number, and then the 7 characters of the commit.
>
> So, it would end up like this: 0.0.0-1.cabba9e
>
> See here:
> https://www.gnu.org/software/guix/manual/html_node/Version-Numbers.html#Version-Numbers

OK, Thank you for pointing this out!  I missed that in the manual.
I updated the patch accordingly and will send it soon.

>
>> +    (package
>> +      (name "libiax")
>> +      (version (string-append "2-" (string-take commit 7)))
>
> By the way, what does the "2-" refer to?

Upstream seems to refer to the software as "iax" "libiax" and "libiax2"
interchangeably.  The "2" was the closest thing I could find to a version
number.

Thank you!

Re: [PATCH] Add libiax

[Andreas Enge]

Hello,

just a quick comment on the name:

On Mon, May 30, 2016 at 02:47:55PM -0500, Lukas Gradl wrote:
> Upstream seems to refer to the software as "iax" "libiax" and "libiax2"
> interchangeably.  The "2" was the closest thing I could find to a version
> number.

notice that the tarball name is always "correct" as the package name, unless
upstream consistently uses a different name. In this case:

+           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
+           "repository/archive.tar.gz?ref="

I would suggest to use "libiax2" as the package name (variable name and
package NAME field), and the version number as proposed by Leo.

Andreas

Re: [PATCH] Add libiax

[Leo Famulari]

On Tue, May 31, 2016 at 09:02:21PM +0200, Andreas Enge wrote:
> Hello,
> 
> just a quick comment on the name:
> 
> On Mon, May 30, 2016 at 02:47:55PM -0500, Lukas Gradl wrote:
> > Upstream seems to refer to the software as "iax" "libiax" and "libiax2"
> > interchangeably.  The "2" was the closest thing I could find to a version
> > number.
> 
> notice that the tarball name is always "correct" as the package name, unless
> upstream consistently uses a different name. In this case:
> 
> +           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
> +           "repository/archive.tar.gz?ref="
> 
> I would suggest to use "libiax2" as the package name (variable name and
> package NAME field), and the version number as proposed by Leo.

Okay, so let's change the naming to libiax2, and give some more detail
about the licensing, as shown in my patch from earlier today. Then we
should be ready to merge :)

Re: [PATCH] Add libiax

[Lukas Gradl]

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, May 31, 2016 at 09:02:21PM +0200, Andreas Enge wrote:
>> Hello,
>> 
>> just a quick comment on the name:
>> 
>> On Mon, May 30, 2016 at 02:47:55PM -0500, Lukas Gradl wrote:
>> > Upstream seems to refer to the software as "iax" "libiax" and "libiax2"
>> > interchangeably.  The "2" was the closest thing I could find to a version
>> > number.
>> 
>> notice that the tarball name is always "correct" as the package name, unless
>> upstream consistently uses a different name. In this case:
>> 
>> +           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
>> +           "repository/archive.tar.gz?ref="
>> 
>> I would suggest to use "libiax2" as the package name (variable name and
>> package NAME field), and the version number as proposed by Leo.
>
> Okay, so let's change the naming to libiax2, and give some more detail
> about the licensing, as shown in my patch from earlier today. Then we
> should be ready to merge :)


OK, I changed the name to libiax2 and added the license field + comment
from your patch.

A big Thank you to everyone for their input!  I still feel fairly unsure
about what I am doing, so I really appreciate that!

Best,
Lukas


[-- Attachment #2: 0001-gnu-telephony-Add-libiax2.patch --]
[-- Type: text/x-patch, Size: 3052 bytes --]

> From 4ce8aa5e14f4895402ea8312a9e99e29192221c2 Mon Sep 17 00:00:00 2001
From: Lukas Gradl <lgradl@openmailbox.org>
Date: Wed, 1 Jun 2016 09:33:44 -0500
Subject: [PATCH] gnu: telephony: Add libiax2.

* gnu/packages/telephony.scm (libiax2): New variable.
---
 gnu/packages/telephony.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 50a83fb..b27dd1f 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
 
 (define-module (gnu packages telephony)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
@@ -211,3 +213,42 @@ Real-time Transport Protocol (SRTP), the Universal Security Transform (UST),
 and a supporting cryptographic kernel.")
     (home-page "https://github.com/cisco/libsrtp")
     (license bsd-3)))
+
+(define-public libiax2
+  (let ((commit "0e5980f1d78ce462e2d1ed6bc39ff35c8341f201"))
+    ;; This is the commit used by the Ring Project.
+    (package
+      (name "libiax2")
+      (version (string-append "0.0.0-1." (string-take commit 7)))
+      (source
+       (origin
+         (method url-fetch)
+         (uri
+          (string-append
+           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
+           "repository/archive.tar.gz?ref="
+           commit))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+          (base32
+           "0cj5293bixp3k5x3hjwyd0iq7z8w5p7yavxvvkqk5817hjq386y2"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    (add-before 'configure 'autoconf
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))
+      (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2")
+      (synopsis "Inter-Asterisk-Protocol library")
+      (description "LibIAX2 implements the Inter-Asterisk-Protocol for relaying
+Voice-over-IP (VoIP) communications.")
+      ;; The file 'src/md5.c' is released into the public domain by RSA Data
+      ;; Security.  The files 'src/answer.h', 'src/miniphone.c',
+      ;; 'src/options.c', 'src/options.h', 'src/ring10.h', 'src/winiphone.c' are
+      ;; covered under the 'GPL'.
+      ;; The package as a whole is distributed under the LGPL 2.0.
+      (license (list lgpl2.0 public-domain gpl2+)))))
-- 
2.7.4

Re: [PATCH] Add libiax

[Leo Famulari]

On Wed, Jun 01, 2016 at 09:40:36AM -0500, Lukas Gradl wrote:
> OK, I changed the name to libiax2 and added the license field + comment
> from your patch.

Thanks! Pushed as 4ff2060524.

I noticed in my final review that the commit title was like this:

gnu: telephony: Add libiax2.

Our convention is mention the new package, but not the package's module,
so I changed it to this:

gnu: Add libiax2.

> A big Thank you to everyone for their input!  I still feel fairly unsure
> about what I am doing, so I really appreciate that!

Thanks for working on Ring!

Re: [PATCH] Add libiax

[Leo Famulari]

On Sat, May 28, 2016 at 06:08:57PM -0500, Lukas Gradl wrote:
> +  #:use-module (gnu packages autotools)  
                                           ^
Also, there is some extra whitespace at the end of the line above.

> +         (uri
> +          (string-append
> +           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
> +           "repository/archive.tar.gz?ref="
> +           commit))

Can you use (file-name ...) to make the file-name like
libiax-version.tar.gz?

Re: [PATCH] Add libiax

[Lukas Gradl]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Sat, May 28, 2016 at 06:08:57PM -0500, Lukas Gradl wrote:
>> +  #:use-module (gnu packages autotools)  
>                                            ^
> Also, there is some extra whitespace at the end of the line above.
>

Oops!  Good catch!

>> +         (uri
>> +          (string-append
>> +           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
>> +           "repository/archive.tar.gz?ref="
>> +           commit))
>
> Can you use (file-name ...) to make the file-name like
> libiax-version.tar.gz?
>

I updated this in the attached patch.

Thank you for your review!



[-- Attachment #2: 0001-gnu-telephony-Add-libiax.patch --]
[-- Type: text/x-patch, Size: 2680 bytes --]

From 581f899fe2ff3db7151b5d488dc00c77ca9602bd Mon Sep 17 00:00:00 2001
From: Lukas Gradl <lgradl@openmailbox.org>
Date: Mon, 30 May 2016 14:40:51 -0500
Subject: [PATCH] gnu: telephony: Add libiax.

* gnu/packages/telephony.scm (libiax): New variable.
---
 gnu/packages/telephony.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 50a83fb..0f43e79 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
 
 (define-module (gnu packages telephony)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
@@ -211,3 +213,37 @@ Real-time Transport Protocol (SRTP), the Universal Security Transform (UST),
 and a supporting cryptographic kernel.")
     (home-page "https://github.com/cisco/libsrtp")
     (license bsd-3)))
+
+(define-public libiax
+  (let ((commit "0e5980f1d78ce462e2d1ed6bc39ff35c8341f201"))
+    ;; This is the commit used by the Ring Project.
+    (package
+      (name "libiax")
+      (version (string-append "0.0.0-1." (string-take commit 7)))
+      (source
+       (origin
+         (method url-fetch)
+         (uri
+          (string-append
+           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
+           "repository/archive.tar.gz?ref="
+           commit))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+          (base32
+           "0cj5293bixp3k5x3hjwyd0iq7z8w5p7yavxvvkqk5817hjq386y2"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    (add-before 'configure 'autoconf
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))
+      (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2")
+      (synopsis "Inter-Asterisk-Protocol library")
+      (description "LibIAX implements the Inter-Asterisk-Protocol for relaying
+Voice-over-IP (VoIP) communications.")
+      (license lgpl2.0))))
-- 
2.7.4

Re: [PATCH] Add libiax

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

On Mon, May 30, 2016 at 02:50:02PM -0500, Lukas Gradl wrote:
> * gnu/packages/telephony.scm (libiax): New variable.

> +      (license lgpl2.0))))

In my final review, I found that some source files are licensed under
the GPL (no version specified) as well as one public-domain file. The
details are in the attached patch revision.

Since I don't understand the fine points of these things, I ask the
group: can a source distribution be LGPL 2.0 and include GPL components?

[-- Attachment #2: 0001-gnu-telephony-Add-libiax.patch --]
[-- Type: text/x-diff, Size: 3018 bytes --]

From c2d8163b0d2b9400582266d9fca8f8df3be9ac4e Mon Sep 17 00:00:00 2001
From: Lukas Gradl <lgradl@openmailbox.org>
Date: Mon, 30 May 2016 14:40:51 -0500
Subject: [PATCH] gnu: telephony: Add libiax.

* gnu/packages/telephony.scm (libiax): New variable.

Signed-off-by: Leo Famulari <leo@famulari.name>
---
 gnu/packages/telephony.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 50a83fb..2676bdc 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
 
 (define-module (gnu packages telephony)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
@@ -211,3 +213,43 @@ Real-time Transport Protocol (SRTP), the Universal Security Transform (UST),
 and a supporting cryptographic kernel.")
     (home-page "https://github.com/cisco/libsrtp")
     (license bsd-3)))
+
+(define-public libiax
+  (let ((commit "0e5980f1d78ce462e2d1ed6bc39ff35c8341f201"))
+    ;; This is the commit used by the Ring Project.
+    (package
+      (name "libiax")
+      (version (string-append "0.0.0-1." (string-take commit 7)))
+      (source
+       (origin
+         (method url-fetch)
+         (uri
+          (string-append
+           "https://gitlab.savoirfairelinux.com/sflphone/libiax2/"
+           "repository/archive.tar.gz?ref="
+           commit))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+          (base32
+           "0cj5293bixp3k5x3hjwyd0iq7z8w5p7yavxvvkqk5817hjq386y2"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    (add-before 'configure 'autoconf
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))
+      (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2")
+      (synopsis "Inter-Asterisk-Protocol library")
+      (description "LibIAX implements the Inter-Asterisk-Protocol for relaying
+Voice-over-IP (VoIP) communications.")
+
+      ;; The file 'src/md5.c' is released into the public domain by RSA Data
+      ;; Security.  The files 'src/answer.h', 'src/miniphone.c',
+      ;; 'src/options.c', 'src/options.h', 'src/ring10.h', 'src/winiphone.c' are
+      ;; covered under the 'GPL'.
+      ;; The package as a whole is distributed under the LGPL 2.0.
+      (license (list lgpl2.0 public-domain gpl2+)))))
-- 
2.8.3

Re: [PATCH] Add libiax

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 937 bytes --]

On Tue, May 31, 2016 at 12:25:55PM -0400, Leo Famulari wrote:
> On Mon, May 30, 2016 at 02:50:02PM -0500, Lukas Gradl wrote:
> > * gnu/packages/telephony.scm (libiax): New variable.
> 
> > +      (license lgpl2.0))))
> 
> In my final review, I found that some source files are licensed under
> the GPL (no version specified) as well as one public-domain file. The
> details are in the attached patch revision.
> 
> Since I don't understand the fine points of these things, I ask the
> group: can a source distribution be LGPL 2.0 and include GPL components?

I saw it explained another time that if the license is just "GPL" then
we can read it as we see fit, which usually means GPL3+ (for those
portions).

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] Add libiax

[Andreas Enge]

On Tue, May 31, 2016 at 12:25:55PM -0400, Leo Famulari wrote:
> Since I don't understand the fine points of these things, I ask the
> group: can a source distribution be LGPL 2.0 and include GPL components?

In my understanding, mixing LGPL and GPL (assuming the versions are compatible)
"upgrades" the aggregated works to GPL.

Andreas

Re: [PATCH] Add libiax

[Leo Famulari]

On Tue, May 31, 2016 at 09:13:23PM +0200, Andreas Enge wrote:
> On Tue, May 31, 2016 at 12:25:55PM -0400, Leo Famulari wrote:
> > Since I don't understand the fine points of these things, I ask the
> > group: can a source distribution be LGPL 2.0 and include GPL components?
> 
> In my understanding, mixing LGPL and GPL (assuming the versions are compatible)
> "upgrades" the aggregated works to GPL.

On #fsf, they said that LGPL code can always be redistributed under the
GPL, although I'm not suggesting we do this. But they did not say that
the "upgrade" happends automatically.

Re: [PATCH] Add libiax

[Leo Famulari]

On Tue, May 31, 2016 at 12:25:55PM -0400, Leo Famulari wrote:
> On Mon, May 30, 2016 at 02:50:02PM -0500, Lukas Gradl wrote:
> > * gnu/packages/telephony.scm (libiax): New variable.
> 
> > +      (license lgpl2.0))))
> 
> In my final review, I found that some source files are licensed under
> the GPL (no version specified) as well as one public-domain file. The
> details are in the attached patch revision.
> 
> Since I don't understand the fine points of these things, I ask the
> group: can a source distribution be LGPL 2.0 and include GPL components?

I asked on #fsf, and was advised that this combination is fine. They
also gave me the link to this handy GNU license compatibility matrix:
http://www.gnu.org/licenses/gpl-faq.html#AllCompatibility