From d921ead106eef37c3491f0f232f092aff693e04c Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Jul 15 2009 10:10:59 +0000 Subject: initial import --- diff --git a/.cvsignore b/.cvsignore index e69de29..2f94839 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +dansguardian-2.10.1.1.tar.gz diff --git a/dansguardian-clamav095.patch b/dansguardian-clamav095.patch new file mode 100644 index 0000000..f4f5067 --- /dev/null +++ b/dansguardian-clamav095.patch @@ -0,0 +1,165 @@ +# patch by Imre Gergely +diff -ruN dansguardian-2.10.0.3.orig/src/contentscanners/clamav.cpp dansguardian-2.10.0.3/src/contentscanners/clamav.cpp +--- dansguardian-2.10.0.3.orig/src/contentscanners/clamav.cpp 2009-05-09 22:25:45.552238568 +0200 ++++ dansguardian-2.10.0.3/src/contentscanners/clamav.cpp 2009-05-09 22:44:06.398108444 +0200 +@@ -69,9 +69,11 @@ + // virus database root node + // Update to support ClamAV 0.90 + // Based on patch supplied by Aecio F. Neto +- struct cl_engine *root; ++ struct cl_engine *engine; ++#ifndef CL_INIT_DEFAULT + // archive limit options + struct cl_limits limits; ++#endif + + #ifdef HAVE_CLAMAV_SHM + // use POSIX shared memory +@@ -100,7 +102,11 @@ + // destroy plugin + int clamavinstance::quit() + { +- cl_free(root); ++#ifdef CL_INIT_DEFAULT ++ cl_engine_free(engine); ++#else ++ cl_free(engine); ++#endif + return DGCS_OK; + } + +@@ -164,7 +170,11 @@ + return DGCS_SCANERROR; + } + +- rc = cl_scandesc(fd, &vn, NULL, root, &limits, CL_SCAN_STDOPT); ++#ifdef CL_INIT_DEFAULT ++ rc = cl_scandesc(fd, &vn, NULL, engine, CL_SCAN_STDOPT); ++#else ++ rc = cl_scandesc(fd, &vn, NULL, engine, &limits, CL_SCAN_STDOPT); ++#endif + close(fd); + + #ifdef HAVE_CLAMAV_SHM +@@ -189,7 +199,11 @@ + { + lastmessage = lastvirusname = ""; + const char *vn = NULL; +- int rc = cl_scanfile(filename, &vn, NULL, root, &limits, CL_SCAN_STDOPT ); ++#ifdef CL_INIT_DEFAULT ++ int rc = cl_scanfile(filename, &vn, NULL, engine, CL_SCAN_STDOPT ); ++#else ++ int rc = cl_scanfile(filename, &vn, NULL, engine, &limits, CL_SCAN_STDOPT ); ++#endif + return doRC(rc, vn); + } + +@@ -220,6 +234,7 @@ + // initialise libclamav + int clamavinstance::init(void* args) + { ++ int rc; + // always include these lists + if (!readStandardLists()) { + return DGCS_ERROR; +@@ -244,18 +259,41 @@ + return DGCS_ERROR; + } + +- // set clam's own temp dir +- if (cv["tempdir"].length() > 0) +- cl_settempdir(cv["tempdir"].toCharArray(), 0); +- + #ifdef DGDEBUG + std::cout << "Scanbuffmethod: " << smethod << std::endl; + std::cout << "Scanbuffdir: " << memdir << std::endl; + std::cout << "Tempdir: " << cv["tempdir"] << std::endl; + #endif + ++#ifdef CL_INIT_DEFAULT ++ if ( (rc = cl_init(CL_INIT_DEFAULT)) != CL_SUCCESS ) { ++ return DGCS_ERROR; ++ } ++ if ( !(engine = cl_engine_new()) ) { ++ return DGCS_ERROR; ++ } ++ ++ // set file, recursion and compression ratio limits for scanning archives ++ if ( (rc = cl_engine_set_num(engine, CL_ENGINE_MAX_FILES, (long long)cv["maxfiles"].toInteger())) ) { ++ return DGCS_ERROR; ++ } ++ if ( (rc = cl_engine_set_num(engine, CL_ENGINE_MAX_FILESIZE, (long long)o.max_content_filecache_scan_size + 1024 * 1024)) ) { ++ return DGCS_ERROR; ++ } ++ if ( (rc = cl_engine_set_num(engine, CL_ENGINE_MAX_RECURSION, (long long)cv["maxreclevel"].toInteger())) ) { ++ return DGCS_ERROR; ++ } ++ if ( (rc = cl_engine_set_num(engine, CL_ENGINE_MAX_SCANSIZE, (long long)cv["maxscansize"].toInteger() * 1024)) ) { ++ return DGCS_ERROR; ++ } ++// FIXME: need debug output code here ++ if (cv["tempdir"].length() > 0) ++ if ( (rc = cl_engine_set_str(engine, CL_ENGINE_TMPDIR, cv["tempdir"].toCharArray())) ) { ++ return DGCS_ERROR; ++ } ++#else + // set file, recursion and compression ratio limits for scanning archives +- root = NULL; ++ engine = NULL; + limits.maxfiles = cv["maxfiles"].toInteger(); + limits.maxfilesize = o.max_content_filecache_scan_size + 1024 * 1024; + limits.maxreclevel = cv["maxreclevel"].toInteger(); +@@ -264,12 +302,35 @@ + std::cerr << "maxfiles: " << limits.maxfiles << " maxfilesize: " << limits.maxfilesize + << " maxreclevel: " << limits.maxreclevel << " maxscansize: " << limits.maxscansize << std::endl; + #endif ++ if (cv["tempdir"].length() > 0) ++ cl_settempdir(cv["tempdir"].toCharArray(), 0); ++ ++#endif + + // load virus database +- unsigned int virnum = 0; +- int rc = cl_load(cl_retdbdir(), &root, &virnum, CL_DB_STDOPT); ++ unsigned int sigs = 0; ++#ifdef CL_INIT_DEFAULT ++ if ( (rc = cl_load(cl_retdbdir(), engine, &sigs, 0)) != CL_SUCCESS ) { ++ if (!is_daemonised) ++ std::cerr << "Error loading clamav db: " << cl_strerror(rc) << std::endl; ++ syslog(LOG_ERR, "Error loading clamav db: %s", cl_strerror(rc)); ++ return DGCS_ERROR; ++ } ++#ifdef DGDEBUG ++ std::cout << "engine: " << engine << " sigs: " << sigs << std::endl; ++#endif ++ if ( (rc = cl_engine_compile(engine)) != CL_SUCCESS ) { ++ if (!is_daemonised) ++ std::cerr << "Error preparing clamav engine: " << cl_strerror(rc) << std::endl; ++ syslog(LOG_ERR, "Error preparing clamav engine: %s", cl_strerror(rc)); ++ return DGCS_ERROR; ++ } ++ return DGCS_OK; ++ ++#else ++ rc = cl_load(cl_retdbdir(), &engine, &sigs, CL_DB_STDOPT); + #ifdef DGDEBUG +- std::cout << "engine: " << root << " virnum: " << virnum << std::endl; ++ std::cout << "engine: " << engine << " sigs: " << sigs << std::endl; + #endif + if (rc != 0) { + if (!is_daemonised) +@@ -277,7 +338,7 @@ + syslog(LOG_ERR, "Error loading clamav db: %s", cl_strerror(rc)); + return DGCS_ERROR; + } +- rc = cl_build(root); ++ rc = cl_build(engine); + if (rc != 0) { + if (!is_daemonised) + std::cerr << "Error building clamav db: " << cl_strerror(rc) << std::endl; +@@ -285,4 +346,5 @@ + return DGCS_ERROR; + } + return DGCS_OK; ++#endif + } diff --git a/dansguardian-copyright-notice.patch b/dansguardian-copyright-notice.patch new file mode 100644 index 0000000..14da93c --- /dev/null +++ b/dansguardian-copyright-notice.patch @@ -0,0 +1,812 @@ +As requested by RH legal: https://bugzilla.redhat.com/show_bug.cgi?id=458643#c8 + + +diff -Nrup dansguardian-2.9.9.5.orig/src/Auth.cpp dansguardian-2.9.9.5/src/Auth.cpp +--- dansguardian-2.9.9.5.orig/src/Auth.cpp 2007-11-26 06:59:22.000000000 -0500 ++++ dansguardian-2.9.9.5/src/Auth.cpp 2008-12-21 06:47:01.039671280 -0500 +@@ -1,8 +1,7 @@ + // AuthPlugin class - interface for plugins for retrieving client usernames + // and filter group membership + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/Auth.hpp dansguardian-2.9.9.5/src/Auth.hpp +--- dansguardian-2.9.9.5.orig/src/Auth.hpp 2007-03-19 13:26:06.000000000 -0400 ++++ dansguardian-2.9.9.5/src/Auth.hpp 2008-12-21 06:47:01.054671865 -0500 +@@ -1,8 +1,7 @@ + // AuthPlugin class - interface for plugins for retrieving client usernames + // and filter group membership + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/BaseSocket.cpp dansguardian-2.9.9.5/src/BaseSocket.cpp +--- dansguardian-2.9.9.5.orig/src/BaseSocket.cpp 2007-11-20 08:26:31.000000000 -0500 ++++ dansguardian-2.9.9.5/src/BaseSocket.cpp 2008-12-21 06:47:01.047672035 -0500 +@@ -1,7 +1,6 @@ + // Base socket class - inherit this to implement UNIX/INET domain sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/BaseSocket.hpp dansguardian-2.9.9.5/src/BaseSocket.hpp +--- dansguardian-2.9.9.5.orig/src/BaseSocket.hpp 2007-11-20 08:26:21.000000000 -0500 ++++ dansguardian-2.9.9.5/src/BaseSocket.hpp 2008-12-21 06:47:01.044671289 -0500 +@@ -1,7 +1,6 @@ + // BaseSocket class - inherit & implement to make UNIX/INET domain sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/ConfigVar.cpp dansguardian-2.9.9.5/src/ConfigVar.cpp +--- dansguardian-2.9.9.5.orig/src/ConfigVar.cpp 2005-10-13 05:22:08.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ConfigVar.cpp 2008-12-21 06:47:01.050671104 -0500 +@@ -1,7 +1,6 @@ + //Implements the ConfigVar class + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/ConfigVar.hpp dansguardian-2.9.9.5/src/ConfigVar.hpp +--- dansguardian-2.9.9.5.orig/src/ConfigVar.hpp 2008-03-06 05:25:39.000000000 -0500 ++++ dansguardian-2.9.9.5/src/ConfigVar.hpp 2008-12-21 06:47:01.033671116 -0500 +@@ -1,8 +1,7 @@ + //Defines the ConfigVar class, which implements reading options from a file + //into a map + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/ConnectionHandler.cpp dansguardian-2.9.9.5/src/ConnectionHandler.cpp +--- dansguardian-2.9.9.5.orig/src/ConnectionHandler.cpp 2008-05-22 05:21:11.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ConnectionHandler.cpp 2008-12-21 06:47:01.042671048 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ConnectionHandler.hpp dansguardian-2.9.9.5/src/ConnectionHandler.hpp +--- dansguardian-2.9.9.5.orig/src/ConnectionHandler.hpp 2008-05-22 05:21:11.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ConnectionHandler.hpp 2008-12-21 06:47:01.028671317 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ContentScanner.cpp dansguardian-2.9.9.5/src/ContentScanner.cpp +--- dansguardian-2.9.9.5.orig/src/ContentScanner.cpp 2007-07-12 05:05:24.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ContentScanner.cpp 2008-12-21 06:47:01.044671289 -0500 +@@ -1,7 +1,6 @@ + // Implements CSPlugin class and cs_plugin_loader base class + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/ContentScanner.hpp dansguardian-2.9.9.5/src/ContentScanner.hpp +--- dansguardian-2.9.9.5.orig/src/ContentScanner.hpp 2007-01-09 05:12:30.000000000 -0500 ++++ dansguardian-2.9.9.5/src/ContentScanner.hpp 2008-12-21 06:47:01.038671195 -0500 +@@ -1,7 +1,6 @@ + // Defines the class interface to be implemented by ContentScanner plugins + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/DataBuffer.cpp dansguardian-2.9.9.5/src/DataBuffer.cpp +--- dansguardian-2.9.9.5.orig/src/DataBuffer.cpp 2008-05-22 05:08:26.000000000 -0400 ++++ dansguardian-2.9.9.5/src/DataBuffer.cpp 2008-12-21 06:47:01.057671214 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/DataBuffer.hpp dansguardian-2.9.9.5/src/DataBuffer.hpp +--- dansguardian-2.9.9.5.orig/src/DataBuffer.hpp 2007-12-11 09:22:59.000000000 -0500 ++++ dansguardian-2.9.9.5/src/DataBuffer.hpp 2008-12-21 06:47:01.027671791 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@/jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/DownloadManager.cpp dansguardian-2.9.9.5/src/DownloadManager.cpp +--- dansguardian-2.9.9.5.orig/src/DownloadManager.cpp 2007-01-08 07:56:47.000000000 -0500 ++++ dansguardian-2.9.9.5/src/DownloadManager.cpp 2008-12-21 06:47:01.057671214 -0500 +@@ -1,7 +1,6 @@ + // Implements dm_plugin_load and base DMPlugin methods + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/DownloadManager.hpp dansguardian-2.9.9.5/src/DownloadManager.hpp +--- dansguardian-2.9.9.5.orig/src/DownloadManager.hpp 2005-11-07 10:15:21.000000000 -0500 ++++ dansguardian-2.9.9.5/src/DownloadManager.hpp 2008-12-21 06:47:01.036671443 -0500 +@@ -1,7 +1,6 @@ + //Defines the DMPlugin base class, and dm_plugin_loader function + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/DynamicIPList.cpp dansguardian-2.9.9.5/src/DynamicIPList.cpp +--- dansguardian-2.9.9.5.orig/src/DynamicIPList.cpp 2006-01-23 09:08:01.000000000 -0500 ++++ dansguardian-2.9.9.5/src/DynamicIPList.cpp 2008-12-21 06:47:01.057671214 -0500 +@@ -1,8 +1,7 @@ + // DynamicIPList - maintains a sorted list of IP addresses, for checking & + // limiting the number of concurrent proxy users. + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/DynamicIPList.hpp dansguardian-2.9.9.5/src/DynamicIPList.hpp +--- dansguardian-2.9.9.5.orig/src/DynamicIPList.hpp 2006-01-23 09:08:01.000000000 -0500 ++++ dansguardian-2.9.9.5/src/DynamicIPList.hpp 2008-12-21 06:47:01.032670961 -0500 +@@ -1,8 +1,7 @@ + // DynamicIPList - maintains a sorted list of IP addresses, for checking & + // limiting the number of concurrent proxy users. + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/DynamicURLList.cpp dansguardian-2.9.9.5/src/DynamicURLList.cpp +--- dansguardian-2.9.9.5.orig/src/DynamicURLList.cpp 2007-09-10 09:23:49.000000000 -0400 ++++ dansguardian-2.9.9.5/src/DynamicURLList.cpp 2008-12-21 06:47:01.033671116 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/DynamicURLList.hpp dansguardian-2.9.9.5/src/DynamicURLList.hpp +--- dansguardian-2.9.9.5.orig/src/DynamicURLList.hpp 2006-01-17 11:09:01.000000000 -0500 ++++ dansguardian-2.9.9.5/src/DynamicURLList.hpp 2008-12-21 06:47:01.036671443 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/FDFuncs.cpp dansguardian-2.9.9.5/src/FDFuncs.cpp +--- dansguardian-2.9.9.5.orig/src/FDFuncs.cpp 2005-10-13 05:22:08.000000000 -0400 ++++ dansguardian-2.9.9.5/src/FDFuncs.cpp 2008-12-21 06:47:01.055671671 -0500 +@@ -2,8 +2,7 @@ + // and (in future) creating files + // Please use *only* for files, not sockets! + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/FDFuncs.hpp dansguardian-2.9.9.5/src/FDFuncs.hpp +--- dansguardian-2.9.9.5.orig/src/FDFuncs.hpp 2005-10-13 05:22:08.000000000 -0400 ++++ dansguardian-2.9.9.5/src/FDFuncs.hpp 2008-12-21 06:47:01.054671865 -0500 +@@ -2,8 +2,7 @@ + // and (in future) creating files + // Please use *only* for files, not sockets! + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/FDTunnel.cpp dansguardian-2.9.9.5/src/FDTunnel.cpp +--- dansguardian-2.9.9.5.orig/src/FDTunnel.cpp 2007-12-11 11:24:48.000000000 -0500 ++++ dansguardian-2.9.9.5/src/FDTunnel.cpp 2008-12-21 06:47:01.028671317 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/FDTunnel.hpp dansguardian-2.9.9.5/src/FDTunnel.hpp +--- dansguardian-2.9.9.5.orig/src/FDTunnel.hpp 2007-12-11 10:21:40.000000000 -0500 ++++ dansguardian-2.9.9.5/src/FDTunnel.hpp 2008-12-21 06:47:01.047672035 -0500 +@@ -2,8 +2,7 @@ + // that uses blocking select() to be as efficient as possible. It tunnels + // between the two supplied FDs. + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/FOptionContainer.cpp dansguardian-2.9.9.5/src/FOptionContainer.cpp +--- dansguardian-2.9.9.5.orig/src/FOptionContainer.cpp 2008-05-22 05:27:41.000000000 -0400 ++++ dansguardian-2.9.9.5/src/FOptionContainer.cpp 2008-12-21 06:47:01.046670971 -0500 +@@ -1,8 +1,7 @@ + // FOptionContainer class - contains the options for a filter group, + // including the banned/grey/exception site lists and the content/site/url regexp lists + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/FOptionContainer.hpp dansguardian-2.9.9.5/src/FOptionContainer.hpp +--- dansguardian-2.9.9.5.orig/src/FOptionContainer.hpp 2008-05-22 05:27:50.000000000 -0400 ++++ dansguardian-2.9.9.5/src/FOptionContainer.hpp 2008-12-21 06:47:01.047672035 -0500 +@@ -1,8 +1,7 @@ + // FOptionContainer class - contains the options for a filter group, + // including the banned/grey/exception site lists and the content/site/url regexp lists + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/FatController.cpp dansguardian-2.9.9.5/src/FatController.cpp +--- dansguardian-2.9.9.5.orig/src/FatController.cpp 2008-05-22 05:23:54.000000000 -0400 ++++ dansguardian-2.9.9.5/src/FatController.cpp 2008-12-21 06:47:01.053671291 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/FatController.hpp dansguardian-2.9.9.5/src/FatController.hpp +--- dansguardian-2.9.9.5.orig/src/FatController.hpp 2005-10-12 07:43:16.000000000 -0400 ++++ dansguardian-2.9.9.5/src/FatController.hpp 2008-12-21 06:47:01.027671791 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/HTMLTemplate.cpp dansguardian-2.9.9.5/src/HTMLTemplate.cpp +--- dansguardian-2.9.9.5.orig/src/HTMLTemplate.cpp 2006-05-26 04:53:55.000000000 -0400 ++++ dansguardian-2.9.9.5/src/HTMLTemplate.cpp 2008-12-21 06:47:01.054671865 -0500 +@@ -1,7 +1,6 @@ + //Implements the HTMLTemplate class, for displaying template-based banned pages to clients + +-//Please refer to http://dansguardian.org/?page=copyright +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/HTMLTemplate.hpp dansguardian-2.9.9.5/src/HTMLTemplate.hpp +--- dansguardian-2.9.9.5.orig/src/HTMLTemplate.hpp 2006-01-18 12:37:39.000000000 -0500 ++++ dansguardian-2.9.9.5/src/HTMLTemplate.hpp 2008-12-21 06:47:01.043671273 -0500 +@@ -1,7 +1,6 @@ + //Declares the HTMLTemplate class, for displaying template-based banned pages to clients + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/HTTPHeader.cpp dansguardian-2.9.9.5/src/HTTPHeader.cpp +--- dansguardian-2.9.9.5.orig/src/HTTPHeader.cpp 2008-04-01 06:36:21.000000000 -0400 ++++ dansguardian-2.9.9.5/src/HTTPHeader.cpp 2008-12-21 06:47:01.038671195 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/HTTPHeader.hpp dansguardian-2.9.9.5/src/HTTPHeader.hpp +--- dansguardian-2.9.9.5.orig/src/HTTPHeader.hpp 2007-12-11 10:20:10.000000000 -0500 ++++ dansguardian-2.9.9.5/src/HTTPHeader.hpp 2008-12-21 06:47:01.042671048 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/IPList.hpp dansguardian-2.9.9.5/src/IPList.hpp +--- dansguardian-2.9.9.5.orig/src/IPList.hpp 2008-06-05 09:11:50.000000000 -0400 ++++ dansguardian-2.9.9.5/src/IPList.hpp 2008-12-21 06:47:01.039671280 -0500 +@@ -1,6 +1,5 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 ++//Copyright (C) Daniel Barron. + // +-//for the license for this code. + //Written by Daniel Barron (daniel@jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ImageContainer.cpp dansguardian-2.9.9.5/src/ImageContainer.cpp +--- dansguardian-2.9.9.5.orig/src/ImageContainer.cpp 2006-04-05 12:22:07.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ImageContainer.cpp 2008-12-21 06:47:01.039671280 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@jadeb//.com) but heavily based on code + //written by Aecio F. Neto (afn@harvest.com.br). + //For support go to http://groups.yahoo.com/group/dansguardian +diff -Nrup dansguardian-2.9.9.5.orig/src/ImageContainer.hpp dansguardian-2.9.9.5/src/ImageContainer.hpp +--- dansguardian-2.9.9.5.orig/src/ImageContainer.hpp 2005-10-12 08:21:33.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ImageContainer.hpp 2008-12-21 06:47:01.028671317 -0500 +@@ -1,7 +1,6 @@ + // ImageContainer - container class for custom banned image + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/LanguageContainer.cpp dansguardian-2.9.9.5/src/LanguageContainer.cpp +--- dansguardian-2.9.9.5.orig/src/LanguageContainer.cpp 2005-10-12 08:21:33.000000000 -0400 ++++ dansguardian-2.9.9.5/src/LanguageContainer.cpp 2008-12-21 06:47:01.034671761 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/LanguageContainer.hpp dansguardian-2.9.9.5/src/LanguageContainer.hpp +--- dansguardian-2.9.9.5.orig/src/LanguageContainer.hpp 2005-10-12 08:21:33.000000000 -0400 ++++ dansguardian-2.9.9.5/src/LanguageContainer.hpp 2008-12-21 06:47:01.028671317 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ListContainer.cpp dansguardian-2.9.9.5/src/ListContainer.cpp +--- dansguardian-2.9.9.5.orig/src/ListContainer.cpp 2008-04-25 10:16:47.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ListContainer.cpp 2008-12-21 06:47:01.032670961 -0500 +@@ -1,7 +1,6 @@ + // ListContainer - class for both item and phrase lists + +-//Please refer to http://dansguardian.org/?page=copyright +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ListContainer.hpp dansguardian-2.9.9.5/src/ListContainer.hpp +--- dansguardian-2.9.9.5.orig/src/ListContainer.hpp 2008-05-22 05:04:56.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ListContainer.hpp 2008-12-21 06:47:01.025671270 -0500 +@@ -1,7 +1,6 @@ + // ListContainer class - for item and phrase lists + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@/ jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ListManager.cpp dansguardian-2.9.9.5/src/ListManager.cpp +--- dansguardian-2.9.9.5.orig/src/ListManager.cpp 2007-09-10 09:23:50.000000000 -0400 ++++ dansguardian-2.9.9.5/src/ListManager.cpp 2008-12-21 06:47:01.026671286 -0500 +@@ -1,7 +1,6 @@ + // ListManager - contains the ListContainers for all item and phrase lists, and can create new ones + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@/ jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/ListManager.hpp dansguardian-2.9.9.5/src/ListManager.hpp +--- dansguardian-2.9.9.5.orig/src/ListManager.hpp 2005-11-17 07:43:45.000000000 -0500 ++++ dansguardian-2.9.9.5/src/ListManager.hpp 2008-12-21 06:47:01.054671865 -0500 +@@ -1,7 +1,6 @@ + // ListManager - for creating & containing all ListContainers of item & phrase lists + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@/jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/NaughtyFilter.cpp dansguardian-2.9.9.5/src/NaughtyFilter.cpp +--- dansguardian-2.9.9.5.orig/src/NaughtyFilter.cpp 2008-05-22 05:06:22.000000000 -0400 ++++ dansguardian-2.9.9.5/src/NaughtyFilter.cpp 2008-12-21 06:47:01.050671104 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/NaughtyFilter.hpp dansguardian-2.9.9.5/src/NaughtyFilter.hpp +--- dansguardian-2.9.9.5.orig/src/NaughtyFilter.hpp 2008-05-22 05:06:30.000000000 -0400 ++++ dansguardian-2.9.9.5/src/NaughtyFilter.hpp 2008-12-21 06:47:01.036671443 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/OptionContainer.cpp dansguardian-2.9.9.5/src/OptionContainer.cpp +--- dansguardian-2.9.9.5.orig/src/OptionContainer.cpp 2008-05-22 05:26:28.000000000 -0400 ++++ dansguardian-2.9.9.5/src/OptionContainer.cpp 2008-12-21 06:47:01.043671273 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/OptionContainer.hpp dansguardian-2.9.9.5/src/OptionContainer.hpp +--- dansguardian-2.9.9.5.orig/src/OptionContainer.hpp 2008-05-22 05:26:28.000000000 -0400 ++++ dansguardian-2.9.9.5/src/OptionContainer.hpp 2008-12-21 06:47:01.058671160 -0500 +@@ -1,6 +1,5 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 ++//Copyright (C) Daniel Barron. + // +-//for the license for this code. + //Written by Daniel Barron (daniel@jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/Plugin.hpp dansguardian-2.9.9.5/src/Plugin.hpp +--- dansguardian-2.9.9.5.orig/src/Plugin.hpp 2005-11-03 06:44:13.000000000 -0500 ++++ dansguardian-2.9.9.5/src/Plugin.hpp 2008-12-21 06:47:01.044671289 -0500 +@@ -1,7 +1,6 @@ + // the Plugin interface - inherit this to define new plugin types + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/RegExp.cpp dansguardian-2.9.9.5/src/RegExp.cpp +--- dansguardian-2.9.9.5.orig/src/RegExp.cpp 2008-03-06 05:25:56.000000000 -0500 ++++ dansguardian-2.9.9.5/src/RegExp.cpp 2008-12-21 06:47:01.026671286 -0500 +@@ -1,7 +1,6 @@ + // RegExp class - search text using regular expressions + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@// jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/RegExp.hpp dansguardian-2.9.9.5/src/RegExp.hpp +--- dansguardian-2.9.9.5.orig/src/RegExp.hpp 2005-10-24 07:37:15.000000000 -0400 ++++ dansguardian-2.9.9.5/src/RegExp.hpp 2008-12-21 06:47:01.032670961 -0500 +@@ -1,7 +1,6 @@ + // RegExp class - search text using regular expressions + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@// jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/Socket.cpp dansguardian-2.9.9.5/src/Socket.cpp +--- dansguardian-2.9.9.5.orig/src/Socket.cpp 2007-11-20 09:20:24.000000000 -0500 ++++ dansguardian-2.9.9.5/src/Socket.cpp 2008-12-21 06:47:01.039671280 -0500 +@@ -1,7 +1,6 @@ + // Socket class - implements BaseSocket for INET domain sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/Socket.hpp dansguardian-2.9.9.5/src/Socket.hpp +--- dansguardian-2.9.9.5.orig/src/Socket.hpp 2007-11-20 09:19:51.000000000 -0500 ++++ dansguardian-2.9.9.5/src/Socket.hpp 2008-12-21 06:47:01.034671761 -0500 +@@ -1,7 +1,6 @@ + // Socket class - implements BaseSocket for INET domain sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/SocketArray.cpp dansguardian-2.9.9.5/src/SocketArray.cpp +--- dansguardian-2.9.9.5.orig/src/SocketArray.cpp 2006-04-11 05:44:06.000000000 -0400 ++++ dansguardian-2.9.9.5/src/SocketArray.cpp 2008-12-21 06:47:01.027671791 -0500 +@@ -1,7 +1,6 @@ + // SocketArray - wrapper for clean handling of an array of Sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/SocketArray.hpp dansguardian-2.9.9.5/src/SocketArray.hpp +--- dansguardian-2.9.9.5.orig/src/SocketArray.hpp 2006-01-17 10:24:54.000000000 -0500 ++++ dansguardian-2.9.9.5/src/SocketArray.hpp 2008-12-21 06:47:01.038671195 -0500 +@@ -1,7 +1,6 @@ + // SocketArray - wrapper for clean handling of an array of Sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/String.cpp dansguardian-2.9.9.5/src/String.cpp +--- dansguardian-2.9.9.5.orig/src/String.cpp 2008-03-06 05:25:22.000000000 -0500 ++++ dansguardian-2.9.9.5/src/String.cpp 2008-12-21 06:47:01.034671761 -0500 +@@ -1,7 +1,6 @@ + // String - guess what: it's a string class! + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/String.hpp dansguardian-2.9.9.5/src/String.hpp +--- dansguardian-2.9.9.5.orig/src/String.hpp 2007-12-13 12:14:24.000000000 -0500 ++++ dansguardian-2.9.9.5/src/String.hpp 2008-12-21 06:47:01.046670971 -0500 +@@ -1,8 +1,7 @@ + // String - guess what: it's a string class! Cut down version of Java string + // class interface + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@ jadeb//.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/SysV.cpp dansguardian-2.9.9.5/src/SysV.cpp +--- dansguardian-2.9.9.5.orig/src/SysV.cpp 2005-10-12 08:15:57.000000000 -0400 ++++ dansguardian-2.9.9.5/src/SysV.cpp 2008-12-21 06:47:01.028671317 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@ //jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/SysV.hpp dansguardian-2.9.9.5/src/SysV.hpp +--- dansguardian-2.9.9.5.orig/src/SysV.hpp 2005-10-12 08:15:57.000000000 -0400 ++++ dansguardian-2.9.9.5/src/SysV.hpp 2008-12-21 06:47:01.029671263 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@?? jadeb.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/UDSocket.cpp dansguardian-2.9.9.5/src/UDSocket.cpp +--- dansguardian-2.9.9.5.orig/src/UDSocket.cpp 2005-10-25 10:03:32.000000000 -0400 ++++ dansguardian-2.9.9.5/src/UDSocket.cpp 2008-12-21 06:47:01.051670980 -0500 +@@ -1,7 +1,6 @@ + // UDSocket class - implements BaseSocket for UNIX domain sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/UDSocket.hpp dansguardian-2.9.9.5/src/UDSocket.hpp +--- dansguardian-2.9.9.5.orig/src/UDSocket.hpp 2005-10-25 10:03:32.000000000 -0400 ++++ dansguardian-2.9.9.5/src/UDSocket.hpp 2008-12-21 06:47:01.048671072 -0500 +@@ -1,7 +1,6 @@ + // UDSocket class - implements BaseSocket for UNIX domain sockets + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/authplugins/digest.cpp dansguardian-2.9.9.5/src/authplugins/digest.cpp +--- dansguardian-2.9.9.5.orig/src/authplugins/digest.cpp 2007-11-26 06:57:04.000000000 -0500 ++++ dansguardian-2.9.9.5/src/authplugins/digest.cpp 2008-12-21 06:47:01.034671761 -0500 +@@ -1,8 +1,7 @@ + // Digest auth plugin + // Based on contribution by Darryl Sutherland + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/authplugins/ident.cpp dansguardian-2.9.9.5/src/authplugins/ident.cpp +--- dansguardian-2.9.9.5.orig/src/authplugins/ident.cpp 2007-03-27 07:36:25.000000000 -0400 ++++ dansguardian-2.9.9.5/src/authplugins/ident.cpp 2008-12-21 06:47:01.035671078 -0500 +@@ -1,7 +1,6 @@ + // Ident server auth plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/authplugins/ip.cpp dansguardian-2.9.9.5/src/authplugins/ip.cpp +--- dansguardian-2.9.9.5.orig/src/authplugins/ip.cpp 2008-05-22 10:49:14.000000000 -0400 ++++ dansguardian-2.9.9.5/src/authplugins/ip.cpp 2008-12-21 06:47:01.036671443 -0500 +@@ -1,7 +1,6 @@ + // IP (range, subnet) auth plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/authplugins/ntlm.cpp dansguardian-2.9.9.5/src/authplugins/ntlm.cpp +--- dansguardian-2.9.9.5.orig/src/authplugins/ntlm.cpp 2007-12-11 10:19:10.000000000 -0500 ++++ dansguardian-2.9.9.5/src/authplugins/ntlm.cpp 2008-12-21 06:47:01.035671078 -0500 +@@ -1,7 +1,6 @@ + // NTLM auth plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/authplugins/proxy.cpp dansguardian-2.9.9.5/src/authplugins/proxy.cpp +--- dansguardian-2.9.9.5.orig/src/authplugins/proxy.cpp 2007-03-19 13:26:06.000000000 -0400 ++++ dansguardian-2.9.9.5/src/authplugins/proxy.cpp 2008-12-21 06:47:01.035671078 -0500 +@@ -1,7 +1,6 @@ + // Proxy auth plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/contentscanners/clamav.cpp dansguardian-2.9.9.5/src/contentscanners/clamav.cpp +--- dansguardian-2.9.9.5.orig/src/contentscanners/clamav.cpp 2008-04-25 11:21:34.000000000 -0400 ++++ dansguardian-2.9.9.5/src/contentscanners/clamav.cpp 2008-12-21 06:47:01.023671379 -0500 +@@ -1,7 +1,6 @@ + // LibClamAV content scanning plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/contentscanners/clamdscan.cpp dansguardian-2.9.9.5/src/contentscanners/clamdscan.cpp +--- dansguardian-2.9.9.5.orig/src/contentscanners/clamdscan.cpp 2007-10-23 08:04:28.000000000 -0400 ++++ dansguardian-2.9.9.5/src/contentscanners/clamdscan.cpp 2008-12-21 06:47:01.024672232 -0500 +@@ -1,7 +1,6 @@ + // ClamD content scanning plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/contentscanners/commandlinescan.cpp dansguardian-2.9.9.5/src/contentscanners/commandlinescan.cpp +--- dansguardian-2.9.9.5.orig/src/contentscanners/commandlinescan.cpp 2007-11-20 09:36:04.000000000 -0500 ++++ dansguardian-2.9.9.5/src/contentscanners/commandlinescan.cpp 2008-12-21 06:47:01.024672232 -0500 +@@ -1,7 +1,6 @@ + // Command line content scanning plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/contentscanners/icapscan.cpp dansguardian-2.9.9.5/src/contentscanners/icapscan.cpp +--- dansguardian-2.9.9.5.orig/src/contentscanners/icapscan.cpp 2007-11-20 09:13:55.000000000 -0500 ++++ dansguardian-2.9.9.5/src/contentscanners/icapscan.cpp 2008-12-21 06:47:01.025671270 -0500 +@@ -1,7 +1,6 @@ + // ICAP server content scanning plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/contentscanners/kavdscan.cpp dansguardian-2.9.9.5/src/contentscanners/kavdscan.cpp +--- dansguardian-2.9.9.5.orig/src/contentscanners/kavdscan.cpp 2006-12-19 06:16:33.000000000 -0500 ++++ dansguardian-2.9.9.5/src/contentscanners/kavdscan.cpp 2008-12-21 06:47:01.024672232 -0500 +@@ -1,7 +1,6 @@ + // Kaspersky AV Daemon content scanning plugin + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/dansguardian.cpp dansguardian-2.9.9.5/src/dansguardian.cpp +--- dansguardian-2.9.9.5.orig/src/dansguardian.cpp 2007-09-10 09:23:50.000000000 -0400 ++++ dansguardian-2.9.9.5/src/dansguardian.cpp 2008-12-21 06:47:01.048671072 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + //Written by Daniel Barron (daniel@//jadeb/.com). + //For support go to http://groups.yahoo.com/group/dansguardian + +diff -Nrup dansguardian-2.9.9.5.orig/src/downloadmanagers/default.cpp dansguardian-2.9.9.5/src/downloadmanagers/default.cpp +--- dansguardian-2.9.9.5.orig/src/downloadmanagers/default.cpp 2007-12-11 10:22:18.000000000 -0500 ++++ dansguardian-2.9.9.5/src/downloadmanagers/default.cpp 2008-12-21 06:47:01.030671349 -0500 +@@ -1,7 +1,6 @@ + // Default download manager, used when no other plugin matches the user agent + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/downloadmanagers/fancy.cpp dansguardian-2.9.9.5/src/downloadmanagers/fancy.cpp +--- dansguardian-2.9.9.5.orig/src/downloadmanagers/fancy.cpp 2007-12-24 08:34:07.000000000 -0500 ++++ dansguardian-2.9.9.5/src/downloadmanagers/fancy.cpp 2008-12-21 06:47:01.030671349 -0500 +@@ -1,5 +1,4 @@ +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 +diff -Nrup dansguardian-2.9.9.5.orig/src/downloadmanagers/trickle.cpp dansguardian-2.9.9.5/src/downloadmanagers/trickle.cpp +--- dansguardian-2.9.9.5.orig/src/downloadmanagers/trickle.cpp 2007-12-11 10:33:05.000000000 -0500 ++++ dansguardian-2.9.9.5/src/downloadmanagers/trickle.cpp 2008-12-21 06:47:01.029671263 -0500 +@@ -5,8 +5,7 @@ + // working, malicious portion sent to the browser before scanning has + // completed! + +-//Please refer to http://dansguardian.org/?page=copyright2 +-//for the license for this code. ++//Copyright (C) Daniel Barron. + + // 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 diff --git a/dansguardian-gcc44.patch b/dansguardian-gcc44.patch new file mode 100644 index 0000000..3cdef6e --- /dev/null +++ b/dansguardian-gcc44.patch @@ -0,0 +1,55 @@ +diff -ruN dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp dansguardian-2.10.1.1/src/ConnectionHandler.cpp +--- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100 ++++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-07-15 12:02:09.801533048 +0200 +@@ -45,6 +45,7 @@ + + #ifdef ENABLE_ORIG_IP + #include ++#include + #include + #endif + +diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/clamav.cpp dansguardian-2.10.1.1/src/contentscanners/clamav.cpp +--- dansguardian-2.10.1.1.orig/src/contentscanners/clamav.cpp 2008-11-18 12:27:04.000000000 +0100 ++++ dansguardian-2.10.1.1/src/contentscanners/clamav.cpp 2009-07-15 11:59:12.316495912 +0200 +@@ -26,6 +26,7 @@ + #include "../ContentScanner.hpp" + #include "../OptionContainer.hpp" + ++#include + #include + #include + #include +diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/commandlinescan.cpp dansguardian-2.10.1.1/src/contentscanners/commandlinescan.cpp +--- dansguardian-2.10.1.1.orig/src/contentscanners/commandlinescan.cpp 2008-11-18 12:27:04.000000000 +0100 ++++ dansguardian-2.10.1.1/src/contentscanners/commandlinescan.cpp 2009-07-15 11:59:12.317495697 +0200 +@@ -28,6 +28,7 @@ + #include "../OptionContainer.hpp" + #include "../RegExp.hpp" + ++#include + #include + #include + #include +diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/icapscan.cpp dansguardian-2.10.1.1/src/contentscanners/icapscan.cpp +--- dansguardian-2.10.1.1.orig/src/contentscanners/icapscan.cpp 2008-11-18 12:27:04.000000000 +0100 ++++ dansguardian-2.10.1.1/src/contentscanners/icapscan.cpp 2009-07-15 11:59:12.318495062 +0200 +@@ -29,6 +29,7 @@ + #include "../ContentScanner.hpp" + #include "../OptionContainer.hpp" + ++#include + #include + #include + #include +diff -ruN dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp +--- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100 ++++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-07-15 11:59:12.319495964 +0200 +@@ -26,6 +26,7 @@ + #include "../HTMLTemplate.hpp" + #include "../ConnectionHandler.hpp" + ++#include + #include + #include + #include diff --git a/dansguardian.httpd b/dansguardian.httpd new file mode 100644 index 0000000..2b5915b --- /dev/null +++ b/dansguardian.httpd @@ -0,0 +1,7 @@ +ScriptAlias /dansguardian /usr/share/dansguardian/dansguardian.pl + + + order deny,allow + deny from all + allow from 127.0.0.1 + diff --git a/dansguardian.init b/dansguardian.init new file mode 100644 index 0000000..260f053 --- /dev/null +++ b/dansguardian.init @@ -0,0 +1,84 @@ +#!/bin/bash +# +# Init file for DansGuardian content filter. +# +# Written by Dag Wieers . +# +# chkconfig: - 92 8 +# description: DansGuardian content filter. +# +# processname: dansguardian +# config: /etc/dansguardian/dansguardian.conf +# pidfile: /var/run/dansguardian + +source /etc/init.d/functions +source /etc/sysconfig/network + +### Check that networking is up. +[ "${NETWORKING}" == "no" ] && exit 0 + +[ -x "/usr/sbin/dansguardian" ] || exit 1 +[ -r "/etc/dansguardian/dansguardian.conf" ] || exit 1 + +RETVAL=0 +prog="dansguardian" +desc="Web Content Filter" + +start() { + echo -n $"Starting $desc ($prog): " + daemon $prog + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dansguardian + return $RETVAL +} + +stop() { + echo -n $"Shutting down $desc ($prog): " + killproc $prog + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dansguardian + return $RETVAL +} + +restart() { + stop + start +} + +reload() { + echo -n $"Reloading $desc ($prog): " + killproc $prog -HUP + RETVAL=$? + echo + return $RETVAL +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + condrestart) + [ -e /var/lock/subsys/dansguardian ] && restart + RETVAL=$? + ;; + status) + status $prog + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|status}" + RETVAL=1 +esac + +exit $RETVAL diff --git a/dansguardian.spec b/dansguardian.spec new file mode 100644 index 0000000..e2ac3bd --- /dev/null +++ b/dansguardian.spec @@ -0,0 +1,157 @@ +Name: dansguardian +Version: 2.10.1.1 +Release: 1%{?dist} +Summary: Content filtering web proxy +Summary(de): Contentfilter-Proxy + +Group: System Environment/Daemons +# upstream dual-licenses this with GPLv2+ and an own license +# for us GPLv2+ applies as stated on http://dansguardian.org/?page=copyright2 +# citation: +# freely (no cost) downloadable from this site for general purpose unix +# distributions like FreeBSD, Debian, Fedora, Ubuntu, etc +License: GPLv2+ +URL: http://www.dansguardian.org/ +Source0: http://dansguardian.org/downloads/2/Stable/%{name}-%{version}.tar.gz +Source1: dansguardian.init +Source2: dansguardian.httpd +# This patch removes the upstream restrictions on the GPLv2+ source +Patch0: dansguardian-copyright-notice.patch +# Fixes some compilation errors with gcc 4.4 +Patch1: dansguardian-gcc44.patch +# Adds support for ClamAV > 0.95 +Patch2: dansguardian-clamav095.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: clamav-devel pcre-devel zlib-devel +BuildRequires: pkgconfig +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts + + +%description +DansGuardian filters the content of pages based on many methods including +phrase matching, PICS filtering and URL filtering. It does not purely filter +based on a banned list of sites. + +It provides real-time virus scanning capabilities for content access. + +DansGuardian is designed to be completely flexible and allows you to tailor the +filtering to your exact needs. It can be as draconian or as unobstructive as +you want. The default settings are geared towards what a primary school might +want but DansGuardian puts you in control of what you want to block. + +DansGuardian requires squid or another similar caching proxy server on your +local network. + +%description(de) +DansGuardian filtert den Content einer Webseite basierend auf verschiedenen +Methoden wie beispielsweise Wortfilter, PICS filtering und URL filtering. Es +handelt sich also um ein echtes Content filtering anstatt einfacher Blacklists. + +Außerdem bietet DansGuardian die Möglichkeit einen Virenfilter einzubinden. + +DansGuardian wurde darauf ausgelegt so flexibel wie möglich zu sein und +erlaubt es die Filterregeln exakt auf die eigenen Bedürfnisse anzupassen. +Vorgegeben sind Einstellungen die dem Bedarf einer Grundschule entsprechen. + +DansGuardian benötigt squid oder einen ähnlichen Caching-Proxy-Server im +lokalen Netzwerk. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@/lists/|' configs/%{name}*.conf.in + + +%build +%configure --enable-orig-ip \ + --enable-clamav \ + --enable-clamd \ + --enable-icap \ + --enable-kavd \ + --enable-commandline \ + --enable-trickledm \ + --enable-ntlm \ + --enable-email + +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +install -Dpm 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/%{name} \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +# delete the other scripts since they are of no use for Fedora users +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts +chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.pl + +# move the lists to the datadir, since they really are data +mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/lists \ + $RPM_BUILD_ROOT%{_datadir}/%{name} + +# install init script and httpd config +install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} +install -Dp -m0644 %{SOURCE2} \ + $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf + +# we'll install this later within %doc +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name} + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/chkconfig --add %{name} + + +%preun +if [ $1 = 0 ] ; then + /sbin/service %{name} stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name} +fi + + +%postun +if [ "$1" -ge "1" ] ; then + /sbin/service %{name} condrestart >/dev/null 2>&1 || : +fi + + +%files +%defattr(-,root,root,-) +%doc COPYING INSTALL README UPGRADING +%doc doc/AuthPlugins doc/ContentScanners doc/DownloadManagers doc/FAQ +%doc doc/FAQ.html doc/Plugins +%doc %{_mandir}/man?/* +%{_sbindir}/%{name} +%{_datadir}/%{name} +%{_initrddir}/%{name} +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name}*.conf +%dir %{_sysconfdir}/%{name}/authplugins +%config(noreplace) %{_sysconfdir}/%{name}/authplugins/* +%dir %{_sysconfdir}/%{name}/contentscanners +%config(noreplace) %{_sysconfdir}/%{name}/contentscanners/* +%dir %{_sysconfdir}/%{name}/downloadmanagers +%config(noreplace) %{_sysconfdir}/%{name}/downloadmanagers/* +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf + + + +%changelog +* Wed Jul 15 2009 Felix Kaechele - 2.10.1.1-1 +- news upstream version + +* Fri May 29 2009 Felix Kaechele - 2.10.0.3-2 +- added licensing information + +* Sat May 09 2009 Felix Kaechele - 2.10.0.3-1 +- initial build + diff --git a/import.log b/import.log new file mode 100644 index 0000000..7240096 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +dansguardian-2_10_1_1-1_fc11:HEAD:dansguardian-2.10.1.1-1.fc11.src.rpm:1247652625 diff --git a/sources b/sources index e69de29..7646283 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0987a1c9bfbdf398118386f10279611a dansguardian-2.10.1.1.tar.gz