From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Gradl Subject: [Patch 6/10] telephony: Add license prefix. Date: Mon, 12 Sep 2016 21:28:15 -0500 Message-ID: <87twdkzg74.fsf@openmailbox.org> References: <87mvjc1quq.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdSU-000861-98 for guix-devel@gnu.org; Mon, 12 Sep 2016 22:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjdSQ-0002YB-7W for guix-devel@gnu.org; Mon, 12 Sep 2016 22:28:26 -0400 Received: from smtp6.openmailbox.org ([62.4.1.40]:41376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdSP-0002Xz-Sx for guix-devel@gnu.org; Mon, 12 Sep 2016 22:28:22 -0400 In-Reply-To: <87mvjc1quq.fsf@openmailbox.org> (Lukas Gradl's message of "Mon, 12 Sep 2016 21:22:05 -0500") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-telephony-Add-license-prefix.patch Content-Transfer-Encoding: quoted-printable From=20630ad1d1d15131bb62eafe4afb842e5fa2fc5675 Mon Sep 17 00:00:00 2001 From: Lukas Gradl Date: Sun, 28 Aug 2016 12:40:21 -0500 Subject: [PATCH 06/10] gnu: telephony: Add 'license:' prefix. * gnu/packages/telephony.scm (commoncpp) [license]: Add prefix. (ucommon) [license]: Add prefix. (ccrtp) [license]: Add prefix. (osip) [license]: Add prefix. (exosip) [license]: Add prefix. (sipwitch) [license]: Add prefix. (libsrtp) [license]: Add prefix. (libiax2) [license]: Add prefix. (seren) [license]: Add prefix. (pjproject-sfl) [license]: Add prefix. =2D-- gnu/packages/telephony.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 4893dbd..bd849d6 100644 =2D-- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -32,7 +32,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages xiph) =2D #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -63,7 +63,7 @@ threaded applications, supporting concurrent synchronizat= ion, inter-process communications via sockets, and various methods for data handling, such as serialization and XML parsing. It includes the uCommon C++ library, a sma= ller reimplementation.") =2D (license gpl2+) ; plus runtime exception + (license license:gpl2+) ; plus runtime exception (home-page "http://www.gnu.org/software/commoncpp"))) =20 (define-public ucommon @@ -83,7 +83,7 @@ reimplementation.") to facilitate using C++ design patterns even for very deeply embedded applications, such as for systems using uclibc along with posix threading support.") =2D (license gpl3+) + (license license:gpl3+) (home-page "http://www.gnu.org/software/commoncpp") (properties '((ftp-directory . "/gnu/commoncpp"))))) =20 @@ -107,7 +107,7 @@ protocol from the IETF. It is suitable both for high c= apacity servers and personal client applications. It is flexible in its design, allowing it to function as a framework for the framework, rather than just being a packet-manipulation library.") =2D (license gpl2+) ; plus runtime exception + (license license:gpl2+) ; plus runtime exception (home-page "http://www.gnu.org/software/ccrtp"))) =20 =20 @@ -126,7 +126,7 @@ packet-manipulation library.") (description "GNU oSIP is an implementation of the SIP protocol. It is used to provide multimedia and telecom software developers with an interfa= ce to initiate and control SIP sessions.") =2D (license lgpl2.1+) + (license license:lgpl2.1+) (home-page "http://www.gnu.org/software/osip"))) =20 =20 @@ -149,7 +149,7 @@ SIP protocol for multimedia session establishment. Thi= s protocol is mainly to be used by VoIP telephony applications (endpoints or conference server) but might be also useful for any application that wish to establish sessions l= ike multiplayer games.") =2D (license gpl2+) + (license license:gpl2+) ;; (plus OpenSSL linking exception) ;; http://git.savannah.gnu.org/cgit/exosip.git/plain/LICENSE.OpenSSL (home-page "http://savannah.nongnu.org/projects/exosip"))) @@ -194,7 +194,7 @@ without the need for a service provider. Its peer-to-p= eer design ensures that there is no central point for media intercept or capture and thus it can be used to construct a secure telephone system that operates over the public internet.") =2D (license gpl3+) + (license license:gpl3+) (home-page "http://www.gnu.org/software/sipwitch"))) =20 (define-public libsrtp @@ -218,7 +218,7 @@ internet.") Real-time Transport Protocol (SRTP), the Universal Security Transform (UST= ), and a supporting cryptographic kernel.") (home-page "https://github.com/cisco/libsrtp") =2D (license bsd-3))) + (license license:bsd-3))) =20 (define-public libiax2 (let ((commit "0e5980f1d78ce462e2d1ed6bc39ff35c8341f201")) @@ -257,7 +257,9 @@ Voice-over-IP (VoIP) communications.") ;; '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. =2D (license (list lgpl2.0 public-domain gpl2+))))) + (license (list license:lgpl2.0 + license:public-domain + license:gpl2+))))) =20 (define-public seren (package @@ -287,7 +289,7 @@ without having to register accounts, exchange emails, o= r add people to contact lists. All you need to join an existing conference is the host name or IP address of one of the participants.") (home-page "http://holdenc.altervista.org/seren/") =2D (license gpl3+))) + (license license:gpl3+))) =20 (define-public pjproject-sfl (let ((sfl-patches @@ -463,7 +465,7 @@ Initiation Protocol (SIP) and a multimedia framework. =20 This package is intended for use with libring. There are several custom patches, most notably the use of gnutls instead of openssl for encryption.= ") =2D (license '(gpl2+ ; pjproject =2D gpl3+ ; sfl-patches =2D lgpl2+))))) ; bundled resample + (license '(license:gpl2+ ; pjproject + license:gpl3+ ; sfl-patches + license:lgpl2+))))) ; bundled resample =20 =2D-=20 2.9.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX12Q/AAoJEFP7dyh+2DCR4gsQANKTOIcTsJPWB8OuxbB+huiZ Jho3PK0K9DHtVmoCJnRFAfsjxZj/E3fdu1iGzBZ5rH7kmQz+ZYjfStl03Ox9AdwU e4K4rZy9IK6Yv1pBbcDy/wxqXpYBMD/dYH3SOgv2BMYkBn40lIVZFc25KHbYudiE L0bJef3P5OsYaYsuAKggidUfKcAK268Bp78NxI60PJ7F4ZsIQZ76/0KI0XuJsWWm pqHl7JxOdLhjXS08vIVzdrJ/auTjutce6onnpKrBxgQzqEw/Yz1S/L1MTPsyGLcM enl1WleDtbqt4w5Z4Lh8lESoGwTVRl1nnMCK3AujbwtHPuH8lY0VoAKigeNw545p 0+brOKuJAHjjNRAxkHxg39eF907mkAv3TixTZsAmW8qVl8j4yYFEnH16PsiHXzfG nJ0RP3Tvvh07rqwxsWfNvBn2m+3/4Z9trZj64SXWnZrcYMMIJOM6eXdNSEuqev7F 0WNZQ6SsCWEa4/qGYWC+CgqLCLHxvp9EnhoxgOVRa98z+HXkA8qSPSqrdFC+amT9 WCqJHoCB8HUJay2exG9EuaaRCt4Tiejn3Puy4oUi7VXWFxIa4iLRmISNJn9BYHtj rHpNiaBCExOWqH6qUICBg3wU+dxTe+JFKmZ/uqF40KJZYj4w9LtKskL3Bwn23NUQ YIEb1HxWv6zd9dGT+cl2 =Y6xR -----END PGP SIGNATURE----- --==-=-=--