From fef1baf448b5d9d6f8f4e1ac9378d91a1309004b Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Thu, 13 Dec 2012 17:46:28 +0000 Subject: [PATCH] sort out the openzap and some more of apr --- debian/copyright | 61 +++++++++++++++++++++++++++++++++++- debian/license-reconcile.yml | 27 +++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index e25a5df71e..8eeeab571f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1144,7 +1144,9 @@ License: curl Files: libs/curl/lib/md4.c Copyright: 1990-1992, RSA Data Security, Inc -License: +License: RSA + +License: RSA License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD4 Message-Digest Algorithm" in all material mentioning or referencing this software @@ -1326,6 +1328,24 @@ Copyright: 2000-2005 The Apache Software Foundation or its licensors 2000, Clark Cooper License: Apache-2.0 +Files: libs/apr/include/apr_fnmatch.h +Copyright: 1992, 1993 The Regents of the University of California +License: BSD-4-clause + +Files: libs/apr/strings/apr_strnatcmp.c +Copyright: 2000 by Martin Pool +License: zlib/libpng + +Files: libs/apr/file_io/unix/mktemp.c +Copyright: 1987, 1993 The Regents of the University of California +License: Apache-2.0 or BSD-4-clause + +Files: libs/apr-util/crypto/apr_md5.c +Copyright: 1991-2, RSA Data Security, Inc. + 2000-2005 The Apache Software Foundation or its licensors + phk@login.dknet.dk +License: RSA and Apache-2.0 and Beerware + Files: libs/miniupnpc/* Copyright: 2005-2009, Thomas Bernard License: BSD-3-clause @@ -1692,6 +1712,45 @@ Copyright: 2006-2012 Philip R. Zimmermann. 2010 Soft Industry License: AGPL-3 +Files: libs/openzap/* +Copyright: 2005-2012, Anthony Minessale II + 2007-2012, Anthony Minessale II, Nenad Corbic + 2005-2012, Anthony Minessale II + 2006 Nenad Corbic + 2007 Jan Vidar Berger, Case Labs, Ltd. + 2007,2008 Michael Jerris + 2008 Shane Burrell + 2007 Michael S. Collins + 2001 Steve Underwood + 2002,2004 Christopher Clark + 2002 Christopher Clark + 2007-2009, Sangoma Technologies + 2009, Moises Silva + 1984-2007 Sangoma Technologies Inc. + 2008, Stefan Knoblich, axsentis GmbH. + 2005 Xygnada Technology, Inc. + 2001 Steve Underwood +License: BSD-3-clause + +Files: libs/openzap/src/fsk.c + libs/openzap/src/include/uart.h + libs/openzap/src/uart.c +Copyright: 2009-2012, Anthony Minessale II + 2005 Robert Krten +License: BSD-2-clause + +Files: libs/openzap/src/include/libteletone.h + libs/openzap/mod_openzap/mod_openzap.c +Copyright: 2005-2012, Anthony Minessale II + 2005-2012, Anthony Minessale II +License: MPL-1.1 + +Files: libs/openzap/src/sangoma_pri.[ch] + libs/openzap/src/priserver.c +Copyright: 2005-2012 Anthony Minessale II + 2006 Nenad Corbic +License: GPL-2+ + Files: libs/libzrtp/test/cmockery/cmockery.c Copyright: 2008 Google Inc License: Apache-2.0 diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml index 580df633fc..e58a12cf5e 100644 --- a/debian/license-reconcile.yml +++ b/debian/license-reconcile.yml @@ -57,9 +57,24 @@ Rules: Copyright: D. Richard Hipp License: public-domain - - Glob: libs/apr-util/crypto/apr_md4.c + Glob: libs/apr-util/crypto/apr_md5.c + Matches: Licensed\sunder\sthe\sApache\sLicense,\sVersion\s2.0 + Matches: THE\sBEER-WARE\sLICENSE + License: RSA and Apache-2.0 and Beerware + Copyright: 1991-1992, RSA Data Security, Inc. + Copyright: 2000-2005 The Apache Software Foundation or its licensors + Copyright: phk@login.dknet.dk + - + Glob: libs/apr-util/*/apr_md[45].[ch] Matches: Copyright\s\(C\)\s1991-2,\sRSA\sData\sSecurity,\sInc. Copyright: 1991-1992, RSA Data Security, Inc. + - + Glob: libs/apr/file_io/unix/mktemp.c + Matches: The\sASF\slicenses\sthis\sfile\sto\sYou\sunder\sthe\sApache\sLicense,\sVersion\s2.0 + Matches: Copyright\s\(c\)\s1987,\s1993 + Matches: The\sRegents\sof\sthe\sUniversity\sof\sCalifornia.\s+All\srights\sreserved. + Copyright: 1987, 1993 The Regents of the University of California + License: Apache-2.0 or BSD-4-clause - Glob: libs/js/* Matches: Version:\sMPL\s1.1/GPL\s2.0/LGPL\s2.1 @@ -130,6 +145,16 @@ Rules: Matches: Copyright\s\(c\)\s2006-2011,\sSkype\sLimited. Matches: THIS\sSOFTWARE\sIS\sPROVIDED\sBY\sTHE\sCOPYRIGHT\sHOLDERS\sAND Copyright: 2006-2011, Skype Limited. + - + Glob: libs/openzap/src/ozmod/ozmod_wanpipe/wanpipe_tdm_api_iface.h + Matches: Copyright\s\(c\)\s2007\s-\s08,\sSangoma\sTechnologies + Copyright: 2007-2008, Sangoma Technologies + - + Glob: libs/openzap/src/testm3ua.c + Matches: Created\sby\sShane\sBurrell\son\s4/8/08. + Matches: Copyright\s2008\s__MyCompanyName__. + Copyright: 2008, Shane Burrell + Justification: I presume that __MyCompanyName__ is nonsense, which is why I'm crediting Shane Burrell - Glob: debian/* Copyright: 2012 Travis Cross