From: Vsevolod Stakhov Date: Tue, 18 Feb 2014 13:25:45 +0000 (+0000) Subject: Merge remote-tracking branch 'dottedmag/debian' into rspamd-0.6 X-Git-Tag: 0.6.9~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=638217b039dd3200b06288fb240b33cf9ffffa85;p=thirdparty%2Frspamd.git Merge remote-tracking branch 'dottedmag/debian' into rspamd-0.6 Conflicts: debian/copyright debian/watch --- 638217b039dd3200b06288fb240b33cf9ffffa85 diff --cc debian/copyright index 8bfdf7826c,0db9c9a6d9..2444ed3f14 --- a/debian/copyright +++ b/debian/copyright @@@ -89,7 -19,31 +19,48 @@@ License: BSD-3-clause-RotUo Files: contrib/uthash/* Copyright: 2003-2013 Troy D. Hanson http://troydhanson.github.com/uthash/ - License: BSD-2-CLAUSE + License: BSD-1-clause + + Files: src/json/* + Copyright: 2009 Petri Lehtinen + License: Expat + -Files: src/dns.c -Copyright: 2009-2012 Vsevolod Stakhov - 2008-2010 William Ahern -License: BSD-2-clause - + Files: conf/lua/regexp/* + Copyright: 2000-2012 The Apache Software Foundation + License: Apache 2.0 + ++Files: src/json/* ++Copyright: 2009 Petri Lehtinen ++License: Expat ++ ++Files: contrib/http-parser/* ++Copyright: 2002-2014 Igor Sysoev ++ Joyent, Inc. and other Node contributors ++License: MIT ++ ++Files: contrib/libottery/* ++Copyright: Nick Mathewson ++License: CC0 ++ ++Files: src/ucl/src/xxhash.* ++Copyright: 2012-2013, Yann Collet. ++License: BSD-2-Clause ++ ++Files: src/diff.c ++Copyright: 2004 Michael B. Allen ++ 2010-2014 Vsevolod Stakhov ++License: MIT ++ + Files: * + Copyright: 2008-2013 Vsevolod Stakhov + License: BSD-2-clause + + Files: debian/* + Copyright: 2011-2012 Vsevolod Stakhov + 2014 Mikhail Gusarov + License: BSD-2-clause + + License: BSD-1-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@@ -210,69 -155,32 +172,63 @@@ License: Expa IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. - - Files: contrib/libottery/* - Copyright: Nick Mathewson + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + License: LGPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU Library General Public License for more + details. + . + You should have received a copy of the GNU Library General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU Library General Public + License version 2 can be found in the file + `/usr/share/common-licenses/LGPL-2'. + + License: Apache 2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0' ++ +License: CC0 + This software has been dedicated to the public domain under the CC0 + public domain dedication. + . + To the extent possible under law, the person who associated CC0 with + libottery has waived all copyright and related or neighboring rights + to libottery. + . + You should have received a copy of the CC0 legalcode along with this + work in doc/cc0.txt. If not, see + . + - Files: src/ucl/src/xxhash.* - Copyright: 2012-2013, Yann Collet. - License: BSD-2-Clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - . - Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - Files: src/diff.c - Copyright: 2004 Michael B. Allen - 2010-2014 Vsevolod Stakhov +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE.