Bug#683746: Review of debian/copyright for rspamd
Hi Andreas, I'm going to upload new package soon. On Mon, Aug 11, 2014 at 9:56 PM, Andreas Cadhalpun andreas.cadhal...@googlemail.com wrote: Hi Vsevolod, On 11.08.2014 16:18, Vsevolod Stakhov wrote: I've applied the suggested patch to both 0.6 and master branches. Thank you for the contribution! You're welcome. I hope this helps to get rspamd into Debian. It's probably a good idea to upload a new package with debian/copyright fixed. Best regards, Andreas -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#683746: Review of debian/copyright for rspamd
Andreas, On 08/08/14 22:14, Andreas Cadhalpun wrote: Hi, On 08.08.2014 15:07, Vsevolod Stakhov wrote: On 08/08/14 00:42, Andreas Cadhalpun wrote: I'm sorry to say, but bitbucket repository is absolutely outdated and I've now closed it completely. The current repository is now on github: https://github.com/vstakhov/rspamd The debian/copyright file has been rewritten completely since bitbucket version. Ah, I see. Fortunately the copyright situation didn't change much, so I merged my changes into the rewritten copyright file and reviewed the differences between the bitbucket and github repositories. This resulted in attached patch, which fixes minor issues, e.g. moving the general stanza to the beginning, adding some missing copyright holders, mentioning the files licensed under LGPL-2.1+ or in the public domain, correcting copyright years, changing license names to more standard ones (BSD-2-clause - BSD-2-Clause, Apache 2.0 - Apache-2.0), and removing the MIT license, which is actually a duplicate of the Expat license. I've applied the suggested patch to both 0.6 and master branches. Thank you for the contribution! -- Vsevolod Stakhov -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#683746: Review of debian/copyright for rspamd
Hi Vsevolod, On 11.08.2014 16:18, Vsevolod Stakhov wrote: I've applied the suggested patch to both 0.6 and master branches. Thank you for the contribution! You're welcome. I hope this helps to get rspamd into Debian. It's probably a good idea to upload a new package with debian/copyright fixed. Best regards, Andreas -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#683746: Review of debian/copyright for rspamd
Hi, On 08.08.2014 15:07, Vsevolod Stakhov wrote: On 08/08/14 00:42, Andreas Cadhalpun wrote: I'm sorry to say, but bitbucket repository is absolutely outdated and I've now closed it completely. The current repository is now on github: https://github.com/vstakhov/rspamd The debian/copyright file has been rewritten completely since bitbucket version. Ah, I see. Fortunately the copyright situation didn't change much, so I merged my changes into the rewritten copyright file and reviewed the differences between the bitbucket and github repositories. This resulted in attached patch, which fixes minor issues, e.g. moving the general stanza to the beginning, adding some missing copyright holders, mentioning the files licensed under LGPL-2.1+ or in the public domain, correcting copyright years, changing license names to more standard ones (BSD-2-clause - BSD-2-Clause, Apache 2.0 - Apache-2.0), and removing the MIT license, which is actually a duplicate of the Expat license. Best regards, Andreas diff --git a/debian/copyright b/debian/copyright index c7c185a..a3911e0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,24 +2,34 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: rspamd Source: https://github.com/vstakhov/rspamd +Files: * +Copyright: 2008-2014 Vsevolod Stakhov vsevo...@highsecure.ru +License: BSD-2-Clause + Files: contrib/lgpl/* -Copyright: 1999, 2000 Scott Wimer, +Copyright: 1999 - 2000 Tom Tromey + 2000, 2005 Red Hat, Inc. + 2007Emmanuele Bassi eba...@gnome.org +License: LGPL-2+ + +Files: contrib/lgpl/gregex.* +Copyright: 1999 - 2000 Scott Wimer 2004Matthias Clasen mcla...@redhat.com, 2005 - 2007 Marco Barisione ma...@barisione.org -License: LGPL-2+ +License: LGPL-2.1+ Files: contrib/hiredis/* -Copyright: 2009 - 2011 Salvatore Sanfilippo antirez at gmail dot com +Copyright: 2006 - 2011 Salvatore Sanfilippo antirez at gmail dot com 2010 - 2011 Pieter Noordhuis pcnoordhuis at gmail dot com -License: BSD-3-clause-Redis +License: BSD-3-Clause-Redis Files: compat/queue.h Copyright: 1991, 1993 The Regents of the University of California. -License: BSD-3-clause-RotUoC +License: BSD-3-Clause-RotUoC Files: contrib/uthash/* Copyright: 2003-2013 Troy D. Hanson http://troydhanson.github.com/uthash/ -License: BSD-1-clause +License: BSD-1-Clause Files: src/json/* Copyright: 2009 Petri Lehtinen pe...@digip.org @@ -27,40 +37,46 @@ License: Expat Files: conf/lua/regexp/* Copyright: 2000-2012 The Apache Software Foundation -License: Apache 2.0 - -Files: src/json/* -Copyright: 2009 Petri Lehtinen pe...@digip.org -License: Expat +License: Apache-2.0 Files: contrib/http-parser/* Copyright: 2002-2014 Igor Sysoev Joyent, Inc. and other Node contributors -License: MIT +License: Expat Files: contrib/libottery/* Copyright: Nick Mathewson License: CC0 +Files: contrib/libottery/chacha_crovetz.c + contrib/libottery/chacha_merged.c +Copyright: Ted Krovetz t...@krovetz.net + D. J. Bernstein +License: public-domain + Files: contrib/xxhash/xxhash.* Copyright: 2012-2013, Yann Collet. License: BSD-2-Clause -Files: src/diff.c +Files: src/libutil/diff.c Copyright: 2004 Michael B. Allen mba2000 ioplex.com 2010-2014 Vsevolod Stakhov vsevo...@highsecure.ru -License: MIT - -Files: * -Copyright: 2008-2013 Vsevolod Stakhov vsevo...@highsecure.ru -License: BSD-2-clause +License: Expat Files: debian/* Copyright: 2011-2012 Vsevolod Stakhov vsevo...@highsecure.ru 2014 Mikhail Gusarov dotted...@dottedmag.net -License: BSD-2-clause +License: BSD-2-Clause + +Files: src/cdb/cdb* +Copyright: Michael Tokarev m...@corpit.ru +License: public-domain + The code is in public domain, that is, you may do anything you want with it. +Comment: + The exact meaning of Public domain mentioned in the file headers was taken from: + http://www.corpit.ru/mjt/tinycdb.html -License: BSD-1-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: @@ -80,7 +96,7 @@ License: BSD-1-clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-2-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: . @@ -103,7 +119,7 @@ License: BSD-2-clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-3-clause-RotUoC +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: @@ -131,7 +147,7 @@ License: BSD-3-clause-RotUoC OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
Bug#683746: Review of debian/copyright for rspamd
Hello Andreas, Thank you for your help. rspamd has moved to github (bitbucket repo is stale. Vsevolod: hint-hint). Please have a look at up-to-date debian/copyright here: https://github.com/vstakhov/rspamd/blob/master/debian/copyright. I'll go through it and see what needs updating, but if you could eyeball it too, I'd be grateful. On Fri, Aug 8, 2014 at 12:52 PM, Vsevolod Stakhov vsevo...@highsecure.ru wrote: Forwarded Message Subject: Bug#683746: Review of debian/copyright for rspamd Date: Fri, 08 Aug 2014 01:42:41 +0200 From: Andreas Cadhalpun andreas.cadhal...@googlemail.com To: 683...@bugs.debian.org, Vsevolod Stakhov vsevo...@highsecure.ru CC: ftpmas...@debian.org, cont...@bugs.debian.org user debian-le...@lists.debian.org usertags 683746 one-copyright-review thanks Hi, rspamd has been waiting in the NEW queue for more than 4 months, which is rather long. In order to help the ftp-masters processing the NEW queue[1], I have reviewed the debian/copyright file of rspamd following the guidelines at [2]. For this task I obtained the sources from https://bitbucket.org/vstakhov/rspamd/src. Attached patch fixes the issues I noticed. The most important ones were that the licenses for some files were missing. Also note that the copyright format always considers the last matching expressions for Files: as the correct one. So one can special case particular files after 'Files: *', but any Files: stanza before 'Files: *' gets ignored. If these issues are fixed, rspamd will hopefully be available in the Debian archive soon. Best regards, Andreas 1: https://ftp-master.debian.org/new.html 2: https://wiki.debian.org/CopyrightReview -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#683746: Review of debian/copyright for rspamd
Hi Mikhail, On 08.08.2014 23:38, Mikhail Gusarov wrote: Thank you for your help. rspamd has moved to github (bitbucket repo is stale. Vsevolod: hint-hint). Please have a look at up-to-date debian/copyright here: https://github.com/vstakhov/rspamd/blob/master/debian/copyright. I'll go through it and see what needs updating, but if you could eyeball it too, I'd be grateful. Yes, Vsevolod already told me that and I merged my changes, see [1]. Best regards, Andreas 1: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683746#93 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#683746: Review of debian/copyright for rspamd
user debian-le...@lists.debian.org usertags 683746 one-copyright-review thanks Hi, rspamd has been waiting in the NEW queue for more than 4 months, which is rather long. In order to help the ftp-masters processing the NEW queue[1], I have reviewed the debian/copyright file of rspamd following the guidelines at [2]. For this task I obtained the sources from https://bitbucket.org/vstakhov/rspamd/src. Attached patch fixes the issues I noticed. The most important ones were that the licenses for some files were missing. Also note that the copyright format always considers the last matching expressions for Files: as the correct one. So one can special case particular files after 'Files: *', but any Files: stanza before 'Files: *' gets ignored. If these issues are fixed, rspamd will hopefully be available in the Debian archive soon. Best regards, Andreas 1: https://ftp-master.debian.org/new.html 2: https://wiki.debian.org/CopyrightReview diff -r e0a967fb0b4e debian/copyright --- a/debian/copyright Wed Jan 29 17:35:59 2014 + +++ b/debian/copyright Fri Aug 08 00:52:16 2014 +0200 @@ -2,10 +2,37 @@ Upstream-Name: rspamd Source: https://bitbucket.org/vstakhov/rspamd +Files: * +Copyright: 2008-2014 Vsevolod Stakhov vsevo...@highsecure.ru + 2012-2013 Yann Collet. + 2013 Dmitriy V. Reshetnikov +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: contrib/lgpl/* -Copyright: 1999, 2000 Scott Wimer, - 2004Matthias Clasen mcla...@redhat.com, - 2005 - 2007 Marco Barisione ma...@barisione.org +Copyright: 1999 - 2000 Tom Tromey + 2000, 2005 Red Hat, Inc. + 2007Emmanuele Bassi eba...@gnome.org 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 @@ -18,7 +45,7 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - . +Comment: 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, @@ -28,10 +55,33 @@ License version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'. +Files: contrib/lgpl/gregex.* +Copyright: 1999 - 2000 Scott Wimer + 2004Matthias Clasen mcla...@redhat.com, + 2005 - 2007 Marco Barisione ma...@barisione.org +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. +Comment: + You should have received a copy of the GNU Lesser General Public + License along with this library; 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.1'. + Files: contrib/hiredis/* -Copyright: 2009 - 2011 Salvatore Sanfilippo antirez at gmail dot com +Copyright: 2006 - 2011 Salvatore Sanfilippo antirez at gmail dot com 2010 - 2011 Pieter Noordhuis pcnoordhuis at gmail dot com -License: BSD-3-CLAUSE +License: BSD-3-Clause Redistribution and use in source and binary forms, with or
