Another debian license fix.

Add apache license for regexp that were delivered from SpamAssassin project.
Fix debian/copyright for src/dns.c.

conf/lua/regexp/drugs.lua

@@ -1,3 +1,20 @@
+-- Actually these regular expressions were obtained from SpamAssassin project, so they are licensed by apache license:
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to you under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at:
+-- 
+--     http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
 -- Drugs spam (viagra, pills etc)
 -- XXX: remove this legacy to statfile
 

conf/lua/regexp/fraud.lua

@@ -1,3 +1,20 @@
+-- Actually these regular expressions were obtained from SpamAssassin project, so they are licensed by apache license:
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to you under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at:
+-- 
+--     http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
 -- Fraud messages (Nigeria spam, viagra, etc)
 local reconf = config['regexp']
 

conf/lua/regexp/headers.lua

@@ -1,3 +1,20 @@
+-- Actually these regular expressions were obtained from SpamAssassin project, so they are licensed by apache license:
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to you under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at:
+-- 
+--     http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
 -- Definitions of header regexps
 
 local reconf = config['regexp']

conf/lua/regexp/lotto.lua

@@ -1,3 +1,20 @@
+-- Actually these regular expressions were obtained from SpamAssassin project, so they are licensed by apache license:
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to you under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at:
+-- 
+--     http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
 -- Rules that are specific for lotto spam messages
 
 local reconf = config['regexp']

debian/copyright

@@ -78,6 +78,38 @@ 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>
+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.
+
+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-2012 Vsevolod Stakhov <vsevolod@highsecure.ru>
 License: BSD-2-Clause

src/binlog.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/bloom.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/buffer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/cfg_utils.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/cfg_xml.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/classifiers/bayes.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/classifiers/classifiers.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/classifiers/winnow.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/controller.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/dns.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * Copyright (c) 2008, 2009, 2010  William Ahern
  *
  * All rights reserved.

src/events.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/expressions.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/filter.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/fstring.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/fuzzy.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/fuzzy_storage.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/hash.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/html.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lmtp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lmtp_proto.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/logger.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lua/lua_cfg_file.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lua/lua_classifier.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lua/lua_common.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lua/lua_config.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lua/lua_message.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/lua/lua_task.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/map.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/mem_pool.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/memcached-test.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/memcached.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/message.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/chartable.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/custom/ipmark/ipmark.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/custom/regmark/metaphone.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/custom/regmark/prefix_tree.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/custom/regmark/regmark.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/fuzzy_check.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/regexp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/spf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/plugins/surbl.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/protocol.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/radix.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/settings.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/smtp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/smtp_proto.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/spf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/statfile.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/statfile_sync.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/symbols_cache.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tokenizers/osb.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tokenizers/tokenizers.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/upstream.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/url.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/util.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/view.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/worker.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Vsevolod Stakhov
+ * Copyright (c) 2009-2012, Vsevolod Stakhov
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without