Update debian packaging.

4 files changed, 262 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 16b007a78..139dc25a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-rspamd (0.7.1) UNRELEASED; urgency=low
+rspamd (0.7.2) UNRELEASED; urgency=low
 
   * New release.
 
- -- Mikhail Gusarov <dottedmag@debian.org>  Tue, 30 Sep 2014 12:31:00 +0100
+ -- Mikhail Gusarov <dottedmag@debian.org>  Wed, 15 Oct 2014 17:27:00 +0100
 
 rspamd (0.6.9) unstable; urgency=low
 
diff --git a/debian/copyright.orig b/debian/copyright.orig
new file mode 100644
index 000000000..c7c185af1
--- /dev/null
+++ b/debian/copyright.orig
@@ -0,0 +1,234 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rspamd
+Source: https://github.com/vstakhov/rspamd
+
+Files: contrib/lgpl/*
+Copyright: 1999, 2000  Scott Wimer,
+           2004        Matthias Clasen <mclasen@redhat.com>,
+           2005 - 2007 Marco Barisione <marco@barisione.org>
+License: LGPL-2+
+
+Files: contrib/hiredis/*
+Copyright: 2009 - 2011 Salvatore Sanfilippo <antirez at gmail dot com>
+           2010 - 2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
+License: BSD-3-clause-Redis
+
+Files: compat/queue.h
+Copyright: 1991, 1993 The Regents of the University of California.
+License: BSD-3-clause-RotUoC
+
+Files: contrib/uthash/*
+Copyright: 2003-2013 Troy D. Hanson http://troydhanson.github.com/uthash/
+License: BSD-1-clause
+
+Files: src/json/*
+Copyright: 2009 Petri Lehtinen <petri@digip.org>
+License: Expat
+
+Files: conf/lua/regexp/*
+Copyright: 2000-2012 The Apache Software Foundation
+License: Apache 2.0
+
+Files: src/json/*
+Copyright: 2009 Petri Lehtinen <petri@digip.org>
+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: contrib/xxhash/xxhash.*
+Copyright: 2012-2013, Yann Collet.
+License: BSD-2-Clause
+
+Files: src/diff.c
+Copyright: 2004 Michael B. Allen <mba2000 ioplex.com>
+           2010-2014 Vsevolod Stakhov <vsevolod@highsecure.ru>
+License: MIT
+
+Files: *
+Copyright: 2008-2013 Vsevolod Stakhov <vsevolod@highsecure.ru>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2011-2012 Vsevolod Stakhov <vsevolod@highsecure.ru>
+ 2014 Mikhail Gusarov <dottedmag@dottedmag.net>
+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:
+ .
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
+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 REGENTS 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 REGENTS 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.
+
+License: BSD-3-clause-RotUoC
+ 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.
+ .
+ Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
+License: BSD-3-clause-Redis
+ 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.
+ .
+ Neither the name of Redis nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+ .
+ 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.
+
+License: Expat
+ 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.
+
+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
+ <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+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/copyright.rej b/debian/copyright.rej
new file mode 100644
index 000000000..f7dd7c8c0
--- /dev/null
+++ b/debian/copyright.rej
@@ -0,0 +1,25 @@
+--- debian/copyright
++++ debian/copyright
+@@ -248,22 +283,3 @@
+  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/>.
+-
+-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.
diff --git a/debian/workers.conf b/debian/workers.conf
index 5cb921f3f..aa3c43829 100644
--- a/debian/workers.conf
+++ b/debian/workers.conf
@@ -1,20 +1,13 @@
 worker {
     type = "normal";
     bind_socket = "systemd:0";
-    http = false;
-    allow_learn = true;
     mime = true;
 }
 worker {
     type = "controller";
     bind_socket = "systemd:1";
     count = 1;
-}
-worker {
-    type = "webui";
-    count = 1;
-    bind_socket = "systemd:2";
     password = "q1";
     secure_ip = "127.0.0.1";
 	static_dir = "${WWWDIR}";
-}
+}
\ No newline at end of file