From: Vsevolod Stakhov Date: Mon, 2 Dec 2013 13:36:19 +0000 (+0000) Subject: Some copyright fixes. X-Git-Tag: 0.6.1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d0e298836fb8b7cbc4f7d8dd7204fd702c6ddde;p=thirdparty%2Frspamd.git Some copyright fixes. --- diff --git a/conf/metrics.conf b/conf/metrics.conf index 73092a7508..727bea6da5 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -2,9 +2,11 @@ metric { name = "default"; - action = "reject:10"; - action = "greylist:4"; - action = "add_header:6"; + actions { + reject = 10; + add_header = 6; + greylist = 4; + }; symbol { weight = 2.0; description = "Subject is missing inside message"; diff --git a/debian/copyright b/debian/copyright index be773226c4..ba8245db1f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -89,7 +89,7 @@ License: BSD-3-CLAUSE Files: contrib/uthash/* Copyright: 2003-2013 Troy D. Hanson http://troydhanson.github.com/uthash/ -License: BSD-1-CLAUSE +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: @@ -163,7 +163,7 @@ License: Apache 2.0 Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0' Files: * -Copyright: 2008-2012 Vsevolod Stakhov +Copyright: 2008-2013 Vsevolod Stakhov 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: