From 38a0019993048e24d2500e81fdcfae62b7ba54c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= Date: Sat, 30 Jun 2007 11:50:56 +0000 Subject: [PATCH] stick to GPLv2 git-svn: trunk@3121 --- ChangeLog | 7 ++++++- libclamav/encoding_aliases.h | 5 ++--- libclamav/entconv.c | 5 ++--- libclamav/entconv.h | 5 ++--- libclamav/hashtab.c | 5 ++--- libclamav/hashtab.h | 5 ++--- libclamav/iana_tld.h | 5 ++--- libclamav/phish_domaincheck_db.c | 5 ++--- libclamav/phish_domaincheck_db.h | 5 ++--- libclamav/phish_whitelist.c | 5 ++--- libclamav/phish_whitelist.h | 5 ++--- libclamav/phishcheck.c | 5 ++--- libclamav/phishcheck.h | 5 ++--- libclamav/regex_list.c | 5 ++--- libclamav/regex_list.h | 5 ++--- libclamav/rtf.c | 5 ++--- libclamav/rtf.h | 5 ++--- 17 files changed, 38 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index a731ff5f6..7b6715bc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -Wed Jun 28 14:36:00 CEST 2007 (edwin) +Sat Jun 30 13:55:00 CEST 2007 (edwin) +---------------------------------- + * libclamav/phish*,[ch], rtf.[ch], entconv.[ch], + regex_list.[ch], hashtab.[ch], encoding_aliases.h: stick to GPLv2 + +Thu Jun 28 14:36:00 CEST 2007 (edwin) ---------------------------------- * libclamav/phishcheck.c, docs/man: Rename Phishing.Email.* to Phishing.Heuristics.Email.*. Update documentation. The URL-based heuristic diff --git a/libclamav/encoding_aliases.h b/libclamav/encoding_aliases.h index d935ba211..0806d64e5 100644 --- a/libclamav/encoding_aliases.h +++ b/libclamav/encoding_aliases.h @@ -4,9 +4,8 @@ * Copyright (C) 2006 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/entconv.c b/libclamav/entconv.c index b88b2f492..2a62e452a 100644 --- a/libclamav/entconv.c +++ b/libclamav/entconv.c @@ -4,9 +4,8 @@ * Copyright (C) 2006 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/entconv.h b/libclamav/entconv.h index ce8fe6ce7..e6596adc2 100644 --- a/libclamav/entconv.h +++ b/libclamav/entconv.h @@ -4,9 +4,8 @@ * Copyright (C) 2006 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/hashtab.c b/libclamav/hashtab.c index 5569868f3..cc0185270 100644 --- a/libclamav/hashtab.c +++ b/libclamav/hashtab.c @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/hashtab.h b/libclamav/hashtab.h index ee51cbe01..6abe37648 100644 --- a/libclamav/hashtab.h +++ b/libclamav/hashtab.h @@ -4,9 +4,8 @@ * Copyright (C) 2006 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/iana_tld.h b/libclamav/iana_tld.h index 95730ea99..2d24d9b83 100644 --- a/libclamav/iana_tld.h +++ b/libclamav/iana_tld.h @@ -4,9 +4,8 @@ * Copyright (C) 2006 Torok Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/phish_domaincheck_db.c b/libclamav/phish_domaincheck_db.c index f3ac39688..ac5fed362 100644 --- a/libclamav/phish_domaincheck_db.c +++ b/libclamav/phish_domaincheck_db.c @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/phish_domaincheck_db.h b/libclamav/phish_domaincheck_db.h index 61c9136d9..084d5dd1e 100644 --- a/libclamav/phish_domaincheck_db.h +++ b/libclamav/phish_domaincheck_db.h @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/phish_whitelist.c b/libclamav/phish_whitelist.c index a5793ff0b..ff9a6c65e 100644 --- a/libclamav/phish_whitelist.c +++ b/libclamav/phish_whitelist.c @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/phish_whitelist.h b/libclamav/phish_whitelist.h index 804c5645e..ac528a50a 100644 --- a/libclamav/phish_whitelist.h +++ b/libclamav/phish_whitelist.h @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/phishcheck.c b/libclamav/phishcheck.c index c3faedd98..975f032d4 100644 --- a/libclamav/phishcheck.c +++ b/libclamav/phishcheck.c @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/phishcheck.h b/libclamav/phishcheck.h index 7c28edd53..849fdae1f 100644 --- a/libclamav/phishcheck.h +++ b/libclamav/phishcheck.h @@ -2,9 +2,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/regex_list.c b/libclamav/regex_list.c index 679c9e27f..a71792c7a 100644 --- a/libclamav/regex_list.c +++ b/libclamav/regex_list.c @@ -4,9 +4,8 @@ * Copyright (C) 2006-2007 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/regex_list.h b/libclamav/regex_list.h index 1e7543df5..87e933d77 100644 --- a/libclamav/regex_list.h +++ b/libclamav/regex_list.h @@ -4,9 +4,8 @@ * Copyright (C) 2006 Török Edvin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/rtf.c b/libclamav/rtf.c index 2693d8c94..33c24eae2 100644 --- a/libclamav/rtf.c +++ b/libclamav/rtf.c @@ -2,9 +2,8 @@ * Copyright (C) 2006 Török Edwin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libclamav/rtf.h b/libclamav/rtf.h index 990a106db..5e3eebd67 100644 --- a/libclamav/rtf.h +++ b/libclamav/rtf.h @@ -2,9 +2,8 @@ * Copyright (C) 2006 Török Edwin * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of