diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/copyright | 130 | ||||
| -rw-r--r-- | debian/watch | 2 | ||||
| -rw-r--r-- | src/diff.c | 23 |
5 files changed, 107 insertions, 56 deletions
diff --git a/debian/changelog b/debian/changelog index 34beeee6c..68db3fa44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rspamd (0.6.8-1) unstable; urgency=low + + * Upgrade to 0.6.8 + + -- Vsevolod Stakhov <vsevolod@highsecure.ru> Mon, 17 Feb 2013 14:50:00 +0000 + rspamd (0.6.7-1) unstable; urgency=low * Upgrade to 0.6.7 diff --git a/debian/compat b/debian/compat index 7f8f011eb..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/copyright b/debian/copyright index ba8245db1..8237baf2e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: rspamd -Source: https://bitbucket.org/vstakhov/rspamd +Source: https://github.com/vstakhov/rspamd Files: contrib/lgpl/* Copyright: 1999, 2000 Scott Wimer, @@ -130,9 +130,14 @@ License: Expat OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: src/dns.c -Copyright: 2009-2012 Vsevolod Stakhov <vsevolod@highsecure.ru> - 2008-2010 William Ahern <william@25thandClement.com> +Files: conf/lua/regexp/* +Copyright: 2000-2012 The Apache Software Foundation +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' + +Files: * +Copyright: 2008-2014 Vsevolod Stakhov <vsevolod@highsecure.ru> 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: @@ -156,14 +161,8 @@ License: BSD-2-Clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: conf/lua/regexp/* -Copyright: 2000-2012 The Apache Software Foundation -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' - -Files: * -Copyright: 2008-2013 Vsevolod Stakhov <vsevolod@highsecure.ru> +Files: debian/* +Copyright: 2011-2014 Vsevolod Stakhov <vsevolod@highsecure.ru> 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: @@ -187,26 +186,93 @@ License: BSD-2-Clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: debian/* -Copyright: 2011-2012 Vsevolod Stakhov <vsevolod@highsecure.ru> -License: GPL-2+ - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. +Files: contrib/http-parser/* +Copyright: 2002-2014 Igor Sysoev + Joyent, Inc. and other Node contributors +License: MIT + http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright + Igor Sysoev. . - 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 General Public License for more - details. + Additional changes are licensed under the same terms as NGINX and + copyright Joyent, Inc. and other Node contributors. All rights reserved. . - You should have received a copy of the GNU 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 + 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: . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. + 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. + +Files: contrib/libottery/* +Copyright: Nick Mathewson +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 + <http://creativecommons.org/publicdomain/zero/1.0/>. + +Files: src/ucl/src/xxhash.* +Copytight: 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 <mba2000 ioplex.com> + 2010-2014 Vsevolod Stakhov <vsevolod@highsecure.ru> +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.
\ No newline at end of file diff --git a/debian/watch b/debian/watch index 7d714f2b2..e65154095 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://bitbucket.org/vstakhov/rspamd/downloads .+rspamd-(\d+[\d\.]*).tar.gz +https://rspamd.com/downloads .+rspamd-(\d+[\d\.]*).tar.gz diff --git a/src/diff.c b/src/diff.c index ee921fa6e..4038d8680 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1,5 +1,6 @@ /* diff - compute a shortest edit script (SES) given two sequences * Copyright (c) 2004 Michael B. Allen <mba2000 ioplex.com> + * Copyright (c) 2010-2014, Vsevolod Stakhov * * The MIT License * @@ -33,28 +34,6 @@ * This is the same algorithm used by GNU diff(1). */ -/* Copyright (c) 2010, Vsevolod Stakhov - * All rights reserved. - * - * 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 ''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 AUTHOR 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. - */ #include "config.h" #include "diff.h" |