Your message dated Thu, 18 Aug 2005 13:32:14 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#319568: fixed in dansguardian 2.8.0.6-antivirus-6.3.8-1-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 23 Jul 2005 02:10:03 +0000
>From [EMAIL PROTECTED] Fri Jul 22 19:10:03 2005
Return-path: <[EMAIL PROTECTED]>
Received: from zoot.lafn.org [206.117.18.6]
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1Dw9Sk-0000TA-00; Fri, 22 Jul 2005 19:10:02 -0700
Received: from localhost.localdomain
(pool-71-104-165-253.lsanca.dsl-w.verizon.net [71.104.165.253])
(authenticated bits=0)
by zoot.lafn.org (8.13.1/8.13.1) with ESMTP id j6N2A05v034222
(version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO)
for <[EMAIL PROTECTED]>; Fri, 22 Jul 2005 19:10:01 -0700 (PDT)
(envelope-from [EMAIL PROTECTED])
Received: from kraai by localhost.localdomain with local (Exim 4.52)
id 1Dw5z7-0001Ig-BE
for [EMAIL PROTECTED]; Fri, 22 Jul 2005 15:27:13 -0700
Date: Fri, 22 Jul 2005 15:27:13 -0700
From: Matt Kraai <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: FTBFS: Missing namespace qualifiers
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="RASg3xLB4tUQ4RcS"
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
X-Virus-Scanned: ClamAV version 0.85.1, clamav-milter version 0.85 on
zoot.lafn.org
X-Virus-Status: Clean
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-2.6 required=4.0 tests=BAYES_00,DATE_IN_PAST_03_06
autolearn=no version=2.60-bugs.debian.org_2005_01_02
--RASg3xLB4tUQ4RcS
Content-Type: multipart/mixed; boundary="bg08WKrSYDhXBjb5"
Content-Disposition: inline
--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Package: dansguardian
Version: 2.8.0.4-2
Severity: serious
Tags: patch
dansguardian fails to build because it does not use "std::" for
symbols in the std namespace:
> g++ -O2 -Wall -c String.cpp
> In file included from /usr/lib/gcc/i486-linux-gnu/4.0.1/../../../../inclu=
de/c++/4.0.1/backward/strstream:51,
> from String.cpp:27:
> /usr/lib/gcc/i486-linux-gnu/4.0.1/../../../../include/c++/4.0.1/backward/=
backward_warning.h:32:2: warning: #warning This file includes at least one =
deprecated or antiquated header. Please consider using one of the 32 header=
s found in section 17.4.1.2 of the C++ standard. Examples include substitut=
ing the <X> header for the <X.h> header for C++ includes, or <iostream> ins=
tead of the deprecated header <iostream.h>. To disable this warning use -Wn=
o-deprecated.
> String.hpp:43: error: ISO C++ forbids declaration of 'ostream' with no ty=
pe
> String.hpp:43: error: 'ostream' is neither function nor member function; =
cannot be declared friend
> String.hpp:43: error: expected ';' before '&' token
> String.cpp:119: error: expected constructor, destructor, or type conversi=
on before '&' token
The attached patch makes it do so.
--=20
Matt
--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch
Content-Transfer-Encoding: quoted-printable
diff -u dansguardian-2.8.0.4/UDSocket.cpp dansguardian-2.8.0.4/UDSocket.cpp
--- dansguardian-2.8.0.4/UDSocket.cpp
+++ dansguardian-2.8.0.4/UDSocket.cpp
@@ -173,7 +173,7 @@
}
=20
=20
-void UDSocket::checkForInput(int timeout) throw (exception) {
+void UDSocket::checkForInput(int timeout) throw (std::exception) {
// blocks if socket blocking
// until timeout
fd_set fdSet;
@@ -183,8 +183,8 @@
t.tv_sec =3D timeout;
t.tv_usec =3D 0;
if (UDSocket::selectEINTR(sck_un + 1, &fdSet, NULL, NULL, &t) < 1) {
- string err("select() on input (unix socket): ");
- throw runtime_error(err + (errno? strerror(errno) : "timeout"));
+ std::string err("select() on input (unix socket): ");
+ throw std::runtime_error(err + (errno? strerror(errno) : "timeout"=
));
}
}
=20
@@ -203,7 +203,7 @@
}
=20
=20
-void UDSocket::readyForOutput(int timeout) throw(exception) {
+void UDSocket::readyForOutput(int timeout) throw(std::exception) {
// blocks if socket blocking
// until timeout
fd_set fdSet;
@@ -213,12 +213,12 @@
t.tv_sec =3D timeout;
t.tv_usec =3D 0;
if (UDSocket::selectEINTR(sck_un + 1, NULL, &fdSet, NULL, &t) < 1) {
- string err("select() on output (unix socket): ");
- throw runtime_error(err + (errno? strerror(errno) : "timeout"));
+ std::string err("select() on output (unix socket): ");
+ throw std::runtime_error(err + (errno? strerror(errno) : "timeout"=
));
}
}
=20
-int UDSocket::getline(char* buff, int size, int timeout) throw(exception) {
+int UDSocket::getline(char* buff, int size, int timeout) throw(std::except=
ion) {
=20
char b[1];
int rc;
@@ -227,7 +227,7 @@
while(i < (size - 1)) {
rc =3D readFromSocket(b, 1, 0, timeout);
if (rc < 0) {
- throw runtime_error(string("Can't read from unix socket: ") + =
strerror(errno)); // on error
+ throw std::runtime_error(std::string("Can't read from unix soc=
ket: ") + strerror(errno)); // on error
}
if (rc =3D=3D 0) { // eof, other end closed so
b[0] =3D '\n'; // force it to return what read
@@ -244,16 +244,16 @@
}
=20
=20
-void UDSocket::writeString(const char* line) throw(exception) {
+void UDSocket::writeString(const char* line) throw(std::exception) {
int l =3D strlen(line);
if (!writeToSocket((char*)line, l, 0, 10)) {
- throw runtime_error(string("Can't write to unix socket: ") + strer=
ror(errno));
+ throw std::runtime_error(std::string("Can't write to unix socket: =
") + strerror(errno));
}
}
=20
-void UDSocket::writeToSockete(char* buff, int len, unsigned int flags, int=
timeout) throw(exception) {
+void UDSocket::writeToSockete(char* buff, int len, unsigned int flags, int=
timeout) throw(std::exception) {
if (!UDSocket::writeToSocket(buff, len, flags, timeout)) {
- throw runtime_error(string("Can't write to unix socket: ") + strerro=
r(errno));
+ throw std::runtime_error(std::string("Can't write to unix socket: ")=
+ strerror(errno));
}
}
=20
@@ -263,7 +263,7 @@
while (actuallysent < len) {
try {
readyForOutput(timeout); // throws exception on error or time=
out
- } catch (exception& e) {
+ } catch (std::exception& e) {
return false;
}
sent =3D send(sck_un, buff + actuallysent, len - actuallysent, 0);
@@ -288,7 +288,7 @@
while (cnt > 0) {
try {
checkForInput(timeout); // throws exception on error or timeo=
ut
- } catch (exception& e) {
+ } catch (std::exception& e) {
return -1;
}
rc =3D recv(sck_un, buff, len, flags);
@@ -312,7 +312,7 @@
int rc;
try {
checkForInput(timeout);
- } catch (exception& e) {
+ } catch (std::exception& e) {
return -1;
}
while (true) {
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/ConnectionHandler.cpp
+++ dansguardian-2.8.0.4/ConnectionHandler.cpp
@@ -145,10 +145,10 @@
peerconn.writeString(o.language_list.getTranslation(200));
// The requested URL is malformed.
peerconn.writeString("</BODY></HTML>\n");
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
try {
proxysock.close(); // close connection to proxy
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
return;
}
=20
@@ -268,10 +268,10 @@
decideHowToLog(clientuser, clientip, url.toCharArray()=
, header.port, exceptionreason, header.requesttype().toCharArray(), docsize=
, o.ll, false, isexception, o.log_exception_hits, false, &thestart, cachehi=
t, 200, mimetype);
}
=20
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
try {
proxysock.close(); // close connection to proxy
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
return; // connection dealt with so exit
}
=20
@@ -303,10 +303,10 @@
fdt.tunnel(proxysock.getFD(), peerconn.getFD()); // not ex=
pected to exception
docsize =3D fdt.throughput;
decideHowToLog(clientuser, clientip, url.toCharArray(), he=
ader.port, exceptionreason, header.requesttype().toCharArray(), docsize, o.=
ll, false, isexception, o.log_exception_hits, false, &thestart, cachehit, 2=
00, mimetype);
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
try {
proxysock.close(); // close connection to proxy
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
return; // connection dealt with so exit
}
=20
@@ -581,23 +581,23 @@
decideHowToLog(clientuser, clientip, url.toCharArray(), header=
=2Eport, exceptionreason, header.requesttype().toCharArray(), docsize, o.ll=
, false, isexception, o.log_exception_hits, docheader.iscontenttype("text")=
, &thestart, cachehit, 200, mimetype);
=20
}
- } catch (exception& e) {
+ } catch (std::exception& e) {
#ifdef DGDEBUG
std::cout << "connection handler caught an exception" << std::=
endl;
#endif
try {
proxysock.close(); // close connection to proxy
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
return;
}
=20
try {
proxysock.close(); // close conection to squid
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
try {
peerconn.readyForOutput(10);
}
- catch (exception& e) {
+ catch (std::exception& e) {
return;
}
return;
@@ -780,7 +780,7 @@
try {
ipcsock.writeString(url.toCharArray()); // throws on err
}
- catch (exception& e) {
+ catch (std::exception& e) {
#ifdef DGDEBUG
std::cerr << "Exception writing to url cache" << std::endl;
std::cerr << e.what() << std::endl;
@@ -791,7 +791,7 @@
try {
ipcsock.getline(reply, 7, 6); // throws on err
}
- catch (exception& e) {
+ catch (std::exception& e) {
#ifdef DGDEBUG
std::cerr << "Exception reading from url cache" << std::endl;
std::cerr << e.what() << std::endl;
@@ -828,7 +828,7 @@
try {
ipcsock.writeString(url.toCharArray()); // throws on err
}
- catch (exception& e) {
+ catch (std::exception& e) {
#ifdef DGDEBUG
std::cerr << "Exception adding to url cache" << std::endl;
std::cerr << e.what() << std::endl;
@@ -1000,7 +1000,7 @@
writestring +=3D redirhttps;
writestring +=3D "\n\n";
(*peerconn).writeString(writestring.toCharArray());
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
}
else {
=20
@@ -1024,7 +1024,7 @@
=20
try { // writestring throws exception on error/timeout
(*peerconn).writeString(writestring.toCharArray());
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
}
}
else {
@@ -1155,14 +1155,14 @@
else if (o.reporting_level =3D=3D -1) { // stealth
(*checkme).isItNaughty =3D false; // dont block
}
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
if ((*checkme).isItNaughty) { // not stealth mode then
try {
(*peerconn).readyForOutput(10); //as best a flush as I can
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
try {
(*proxysock).close(); // close connection to proxy
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
return true; // we said no, so return true saying exit
}
return false;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/dansguardian.cpp
+++ dansguardian-2.8.0.4/dansguardian.cpp
@@ -58,14 +58,14 @@
int rc =3D open(configfile, 0, O_RDONLY);
if (rc < 0) {
syslog(LOG_ERR, "Error opening %s", configfile);
- cerr << "Error opening " << configfile << std::endl;
+ std::cerr << "Error opening " << configfile << std::endl;
exit(1); // could not open conf file for reading, exit with error
}
close (rc);
=20
if (!o.read(configfile, type)) {
syslog(LOG_ERR, "%s","Error parsing the dansguardian.conf file or =
other DansGuardian configuration files");
- cerr << "Error parsing the dansguardian.conf file or other DansGua=
rdian configuration files" << std::endl;
+ std::cerr << "Error parsing the dansguardian.conf file or other Da=
nsGuardian configuration files" << std::endl;
exit(1); // OptionContainer class had an error reading the conf o=
r other files so exit with error
}
}
@@ -187,15 +187,15 @@
}
else {
syslog(LOG_ERR, "%s","Unable to getpwnam() - does the proxy user e=
xist?");
- cerr << "Unable to getpwnam() - does the proxy user exist?" <<
std::endl;
- cerr << "Proxy user looking for is '" << o.daemon_user_name << "'" <<
std=
::endl;
+ std::cerr << "Unable to getpwnam() - does the proxy user exist?" <<
std::=
endl;
+ std::cerr << "Proxy user looking for is '" << o.daemon_user_name << "'"
<=
< std::endl;
return 1; // was unable to lockup the user id from passwd
// for some reason, so exit with error
}
=20
=20
if (o.no_logger =3D=3D 0) {
- ofstream logfiletest(o.log_location.c_str(), ios::app);
+ std::ofstream logfiletest(o.log_location.c_str(), std::ios::app);
if (logfiletest.fail()) {
syslog(LOG_ERR, "%s","Error opening/creating log file. (check =
ownership and access rights).");
std::cout << "Error opening/creating log file. (check ownershi=
p and access rights)." << std::endl;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/DataBuffer.cpp
+++ dansguardian-2.8.0.4/DataBuffer.cpp
@@ -76,7 +76,7 @@
block =3D new char[newsize];
try {
(*sock).checkForInput(timeout);
- } catch (exception& e) {
+ } catch (std::exception& e) {
delete[] block;
break;
}
@@ -119,7 +119,7 @@
return toobig;
}
=20
-void DataBuffer::read(Socket *sock, int l) throw (exception) {
+void DataBuffer::read(Socket *sock, int l) throw (std::exception) {
delete[] data; // delete the current data store (should be emtpy anyw=
ay)
data =3D new char[l + 2]; // create a new store large enough
int rc;
@@ -127,7 +127,7 @@
rc =3D (*sock).readFromSocketn(data, l, 0, timeout); // read in the [P=
OST] data
=20
if (rc < 0) {
- throw exception(); // danger, danger Will Robinson
+ throw std::exception(); // danger, danger Will Robinson
}
=20
// The above should be all that's needed - but wait there's more!
@@ -152,13 +152,13 @@
=20
}
=20
-void DataBuffer::out(Socket *sock) throw(exception) {
+void DataBuffer::out(Socket *sock) throw(std::exception) {
=20
(*sock).readyForOutput(timeout); // exceptions on timeout or error
=20
// need exception or something for a bad write
if (!(*sock).writeToSocket(data, buffer_length, 0, timeout)) {
- throw exception();
+ throw std::exception();
} // write the data block out to the stream
}
=20
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/FatController.cpp
+++ dansguardian-2.8.0.4/FatController.cpp
@@ -550,7 +550,7 @@
if (pids[i + 1].fd !=3D -1) {
try {
close(pids[i + 1].fd);
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
}
}
if (numchildren > 0) {
@@ -802,11 +802,11 @@
int rc =3D handleConnections(sv[1]);
try {
close(sv[1]); // connection to parent
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
try {
serversock.close(); // listening connection
}
- catch (exception& e) {}
+ catch (std::exception& e) {}
_exit(rc); // baby go bye bye
}
else { // must be parent
@@ -856,7 +856,7 @@
if (pids[i + 1].fd !=3D -1) {
try {
close(pids[i + 1].fd);
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
}
}
delete[] childrenpids;
@@ -944,7 +944,7 @@
numchildren--;
try {
close(pids[i + 1].fd);
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
pids[i + 1].fd =3D -1;
if (count >=3D num) {
break;
@@ -1000,7 +1000,7 @@
try {
rc =3D getLineFromFD(pids[f].fd, buf, 4, 100);
}
- catch (exception& e) {
+ catch (std::exception& e) {
kill(childrenpids[f - 1], SIGTERM);
deleteChild(childrenpids[f - 1], -1);
tofind--;
@@ -1048,7 +1048,7 @@
numchildren--; // so no need to duplicate
try {
close(pids[i + 1].fd); // closing etc
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
pids[i + 1].fd =3D -1;
}
childrenstates[i] =3D -1; // unused
@@ -1079,7 +1079,7 @@
return -1;
}
}
- catch (exception& e) {
+ catch (std::exception& e) {
return -1;
}
return 0;
@@ -1091,7 +1091,7 @@
String message =3D "G\n";
try {
writeToFd(fd, message.toCharArray(), message.length(), 5);
- } catch (exception& e) {
+ } catch (std::exception& e) {
kill(childrenpids[num], SIGTERM);
deleteChild(childrenpids[num], -1);
return;
@@ -1099,7 +1099,7 @@
char* buf =3D new char[5];
try {
getLineFromFD(fd, buf, 4, 5);
- } catch (exception& e) {
+ } catch (std::exception& e) {
kill(childrenpids[num], SIGTERM);
deleteChild(childrenpids[num], -1);
delete[] buf;
@@ -1122,7 +1122,7 @@
try {
rc =3D getLineFromFD(fd, buf, 4, 360); // blocks for a few mins
}
- catch (exception& e) {
+ catch (std::exception& e) {
delete[] buf;
=20
reloadconfig =3D true;
@@ -1164,11 +1164,11 @@
writeToFd(fd, "K\n", 2, 10); // need to make parent wait for OK
// so effectively providing a lock
}
- catch (exception& e) {
+ catch (std::exception& e) {
try {
close(peersockfd);
}
- catch (exception& e) {
+ catch (std::exception& e) {
}
return false;
}
@@ -1320,7 +1320,7 @@
int rc, ipcsockfd;
char* logline =3D new char[4096];
=20
- ofstream logfile(log_location.c_str(), ios::app);
+ std::ofstream logfile(log_location.c_str(), ios::app);
if (logfile.fail()) {
syslog(LOG_ERR, "%s","Error opening/creating log file.");
#ifdef DGDEBUG
@@ -1371,7 +1371,7 @@
}
try {
rc =3D ipcpeersock.getline(logline, 4096, 3); // throws o=
n err
- } catch (exception& e) {
+ } catch (std::exception& e) {
ipcpeersock.close();
if (logconerror =3D=3D 1) {
syslog(LOG_ERR, "%s","Error reading ipc. (Ignorable)");
@@ -1495,7 +1495,7 @@
}
try {
rc =3D ipcpeersock.getline(logline, 4096, 3); // throws o=
n err
- } catch (exception& e) {
+ } catch (std::exception& e) {
ipcpeersock.close(); // close the connection
if (logconerror =3D=3D 1) {
#ifdef DGDEBUG
@@ -1534,7 +1534,7 @@
}
try {
ipcpeersock.writeString(reply.toCharArray());
- } catch (exception& e) {
+ } catch (std::exception& e) {
ipcpeersock.close(); // close the connection
if (logconerror =3D=3D 1) {
syslog(LOG_ERR, "%s","Error writing url ipc. (Ignorabl=
e)");
@@ -1601,7 +1601,7 @@
try {
fipcsock.writeString(request.toCharArray()); // throws on err
}
- catch (exception& e) {
+ catch (std::exception& e) {
#ifdef DGDEBUG
std::cerr << "Exception flushing url cache" << std::endl;
std::cerr << e.what() << std::endl;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/FOptionContainer.cpp
+++ dansguardian-2.8.0.4/FOptionContainer.cpp
@@ -75,7 +75,7 @@
std::string linebuffer;
String temp; // for tempory conversion and storage
int j; // counter
- ifstream conffiles(filename.c_str(), ios::in); // dansguardianfN.=
conf
+ std::ifstream conffiles(filename.c_str(), std::ios::in); // dansg=
uardianfN.conf
if (!conffiles.good()) {
if (!isDaemonised) {
std::cerr << "error reading: " << filename << std::endl;
@@ -111,7 +111,7 @@
// deque. They are only seperate files for clarity.
=20
linebuffer =3D findoptionS("picsfile");
- ifstream picsfiles(linebuffer.c_str(), ios::in); // pics file
+ std::ifstream picsfiles(linebuffer.c_str(), std::ios::in); // pics=
file
if (!picsfiles.good()) {
if (!isDaemonised) {
std::cerr << "error reading: " << linebuffer << std::endl;
@@ -323,7 +323,7 @@
else {
blanket_ip_block =3D 0;
}
- } catch (exception& e) {
+ } catch (std::exception& e) {
if (!isDaemonised) {
std::cerr << e.what() << std::endl; // when called the daemon=
has not
// detached so we can do this
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/HTMLTemplate.cpp
+++ dansguardian-2.8.0.4/HTMLTemplate.cpp
@@ -44,7 +44,7 @@
unsigned int offset;
String result;
String line;
- std::ifstream templatefile(filename, ios::in); // dansguardian.conf
+ std::ifstream templatefile(filename, std::ios::in); // dansguardian.c=
onf
if (!templatefile.good()) {
if (!isDaemonised) {
std::cerr << "error reading: " << filename << std::endl;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/HTTPHeader.cpp
+++ dansguardian-2.8.0.4/HTTPHeader.cpp
@@ -523,7 +523,7 @@
}
=20
=20
-void HTTPHeader::out(Socket *sock) throw(exception) {
+void HTTPHeader::out(Socket *sock) throw(std::exception) {
String l; // for amalgamating to avoid conflict with the Nagel algori=
thm
for(int i =3D 0; i < (signed)header.size(); i++) {
l +=3D header[i] + "\n";
@@ -535,7 +535,7 @@
// need exception for bad write
=20
if (!(*sock).writeToSocket(l.toCharArray(), l.length(), 0, timeout)) {
- throw exception();
+ throw std::exception();
}
=20
if (postdata.buffer_length > 0) {
@@ -794,9 +794,9 @@
if (res !=3D postdatablockend) {
answer =3D true;
}
- } catch (exception& e) {};
+ } catch (std::exception& e) {};
delete[] p;
- } catch (exception& e) {};
+ } catch (std::exception& e) {};
delete[] postdatablock;
return answer;
}
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/Ident.cpp
+++ dansguardian-2.8.0.4/Ident.cpp
@@ -30,7 +30,7 @@
:username("") {}
=20
=20
-std::string Ident::getUsername(HTTPHeader* h, string* s, int port) {
+std::string Ident::getUsername(HTTPHeader* h, std::string* s, int port) {
#ifdef DGDEBUG
std::cout << "getting username..." << std::endl;
#endif
@@ -70,7 +70,7 @@
}
=20
=20
-bool Ident::getUsernameIdent(string* s, int port, int serverport, int time=
out) {
+bool Ident::getUsernameIdent(std::string* s, int port, int serverport, int=
timeout) {
#ifdef DGDEBUG
std::cout << "Connecting to:" << (*s) << std::endl;
std::cout << "to ask about:" << port << std::endl;
@@ -101,7 +101,7 @@
#endif
try {
iq.close(); // close conection to client
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
return false;
}
#ifdef DGDEBUG
@@ -110,7 +110,7 @@
char buff[8192];
try {
iq.getline(buff, 8192, timeout);
- } catch (exception& e) {return false;}
+ } catch (std::exception& e) {return false;}
String temp;
temp =3D buff; // convert to String
#ifdef DGDEBUG
@@ -118,7 +118,7 @@
#endif
try {
iq.close(); // close conection to client
- } catch (exception& e) {}
+ } catch (std::exception& e) {}
temp =3D temp.after(":");
if (!temp.before(":").contains("USERID")) {
return false;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/ImageContainer.cpp
+++ dansguardian-2.8.0.4/ImageContainer.cpp
@@ -57,11 +57,11 @@
mimetype =3D "image/gif";
}
=20
- ifstream imagefile;
- imagefile.open(filename, ifstream::binary);
- imagefile.seekg(0, ios::end);
+ std::ifstream imagefile;
+ imagefile.open(filename, std::ifstream::binary);
+ imagefile.seekg(0, std::ios::end);
imagelength =3D imagefile.tellg();
- imagefile.seekg(0, ios::beg);
+ imagefile.seekg(0, std::ios::beg);
=20
if (imagelength) {
image =3D new char[imagelength+1];
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/LanguageContainer.cpp
+++ dansguardian-2.8.0.4/LanguageContainer.cpp
@@ -44,7 +44,7 @@
String v;
String line;
unsigned int k;
- ifstream Languagefile(filename, ios::in); // open the file for reading
+ std::ifstream Languagefile(filename, std::ios::in); // open the file =
for reading
if (!Languagefile.good()) {
if (!isDaemonised) {
std::cerr << "Error opening messages file (does it exist?): " =
<< filename << std::endl;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/ListContainer.cpp
+++ dansguardian-2.8.0.4/ListContainer.cpp
@@ -116,7 +116,7 @@
}
filedate =3D getFileDate(filename);
increaseMemoryBy(len + 1); // Allocate some memory to hold file
- ifstream listfile(filename, ios::in); // open the file for reading
+ std::ifstream listfile(filename, std::ios::in); // open the file for =
reading
if (!listfile.good()) {
if (!isDaemonised) {
std::cerr << "Error opening file (does it exist?): " << filena=
me << std::endl;
@@ -289,7 +289,7 @@
}
increaseMemoryBy(len + 1); // Allocate some memory to hold file
// The plus one is to cope with files not ending in a new line
- ifstream listfile(filename, ios::in);
+ std::ifstream listfile(filename, std::ios::in);
if (!listfile.good()) {
if (!isDaemonised) {
std::cerr << "Error opening :"<< filename << std::endl;
@@ -550,7 +550,7 @@
#ifdef DGDEBUG
std::cout << "creating processed file:" << f << std::endl;
#endif
- ofstream listfile(f.toCharArray(), ios::out);
+ std::ofstream listfile(f.toCharArray(), std::ios::out);
if (listfile.fail()) {
if (!isDaemonised) {
std::cerr << "Error creating cache file." << std::endl;
@@ -986,7 +986,7 @@
return false;
}
increaseMemoryBy(len + 2);
- ifstream listfile(filename, ios::in);
+ std::ifstream listfile(filename, std::ios::in);
if (!listfile.good()) {
if (!isDaemonised) {
std::cerr << "Error opening: "<< filename << std::endl;
@@ -1204,7 +1204,7 @@
syslog(LOG_ERR, "%s", filename);
return false;
}
- ifstream listfile(filename, ios::in);
+ std::ifstream listfile(filename, std::ios::in);
if (!listfile.good()) {
if (!isDaemonised) {
std::cerr << "Error opening: "<< filename << std::endl;
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/OptionContainer.cpp
+++ dansguardian-2.8.0.4/OptionContainer.cpp
@@ -72,7 +72,7 @@
std::string linebuffer;
String temp; // for tempory conversion and storage
int j; // counter
- ifstream conffiles(filename, ios::in); // dansguardian.conf
+ std::ifstream conffiles(filename, std::ios::in); // dansguardian.=
conf
if (!conffiles.good()) {
if (!isDaemonised) {
std::cerr << "error reading: " << filename << std::endl;
@@ -358,7 +358,7 @@
if (reporting_level =3D=3D 1 || reporting_level =3D=3D 2) {
if (ada.length() < 4) {
if (!isDaemonised) {
- cerr << "accessdeniedaddress setting appears to be wro=
ng." << endl;
+ std::cerr << "accessdeniedaddress setting appears to b=
e wrong." << std::endl;
}
syslog(LOG_ERR, "%s", "accessdeniedaddress setting appears=
to be wrong.");
return false;
@@ -405,7 +405,7 @@
=20
}
=20
- } catch (exception& e) {
+ } catch (std::exception& e) {
if (!isDaemonised) {
std::cerr << e.what() << std::endl; // when called the daemon=
has not
// detached so we can do this
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/Socket.cpp
+++ dansguardian-2.8.0.4/Socket.cpp
@@ -174,7 +174,7 @@
}
=20
=20
-void Socket::checkForInput(int timeout) throw (exception) {
+void Socket::checkForInput(int timeout) throw (std::exception) {
// blocks if socket blocking
// until timeout
fd_set fdSet;
@@ -184,8 +184,8 @@
t.tv_sec =3D timeout;
t.tv_usec =3D 0;
if (Socket::selectEINTR(sck_inet + 1, &fdSet, NULL, NULL, &t) < 1) {
- string err("select() on input: ");
- throw runtime_error(err + (errno? strerror(errno) : "timeout"));
+ std::string err("select() on input: ");
+ throw std::runtime_error(err + (errno? strerror(errno) : "timeout"=
));
}
}
=20
@@ -204,7 +204,7 @@
}
=20
=20
-void Socket::readyForOutput(int timeout) throw(exception) {
+void Socket::readyForOutput(int timeout) throw(std::exception) {
// blocks if socket blocking
// until timeout
fd_set fdSet;
@@ -214,12 +214,12 @@
t.tv_sec =3D timeout;
t.tv_usec =3D 0;
if (Socket::selectEINTR(sck_inet + 1, NULL, &fdSet, NULL, &t) < 1) {
- string err("select() on output: ");
- throw runtime_error(err + (errno? strerror(errno) : "timeout"));
+ std::string err("select() on output: ");
+ throw std::runtime_error(err + (errno? strerror(errno) : "timeout"=
));
}
}
=20
-int Socket::getline(char* buff, int size, int timeout) throw(exception) {
+int Socket::getline(char* buff, int size, int timeout) throw(std::exceptio=
n) {
=20
char b[1];
int rc;
@@ -228,7 +228,7 @@
while(i < (size - 1)) {
rc =3D readFromSocket(b, 1, 0, timeout);
if (rc < 0) {
- throw runtime_error(string("Can't read from socket: ") + strer=
ror(errno)); // on error
+ throw std::runtime_error(std::string("Can't read from socket: =
") + strerror(errno)); // on error
}
if (rc =3D=3D 0) { // eof, other end closed so
b[0] =3D '\n'; // force it to return what read
@@ -245,16 +245,16 @@
}
=20
=20
-void Socket::writeString(const char* line) throw(exception) {
+void Socket::writeString(const char* line) throw(std::exception) {
int l =3D strlen(line);
if (!writeToSocket((char*)line, l, 0, timeout)) {
- throw runtime_error(string("Can't write to socket: ") + strerror(e=
rrno));
+ throw std::runtime_error(std::string("Can't write to socket: ") + =
strerror(errno));
}
}
=20
-void Socket::writeToSockete(char* buff, int len, unsigned int flags, int t=
imeout) throw(exception) {
+void Socket::writeToSockete(char* buff, int len, unsigned int flags, int t=
imeout) throw(std::exception) {
if (!Socket::writeToSocket(buff, len, flags, timeout)) {
- throw runtime_error(string("Can't write to socket: ") + strerror(err=
no));
+ throw std::runtime_error(std::string("Can't write to socket: ") + st=
rerror(errno));
}
}
=20
@@ -264,7 +264,7 @@
while (actuallysent < len) {
try {
readyForOutput(timeout); // throws exception on error or time=
out
- } catch (exception& e) {
+ } catch (std::exception& e) {
return false;
}
sent =3D send(sck_inet, buff + actuallysent, len - actuallysent, 0=
);
@@ -289,7 +289,7 @@
while (cnt > 0) {
try {
checkForInput(timeout); // throws exception on error or timeo=
ut
- } catch (exception& e) {
+ } catch (std::exception& e) {
return -1;
}
rc =3D recv(sck_inet, buff, len, flags);
@@ -313,7 +313,7 @@
int rc;
try {
checkForInput(timeout);
- } catch (exception& e) {
+ } catch (std::exception& e) {
return -1;
}
while (true) {
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/String.cpp
+++ dansguardian-2.8.0.4/String.cpp
@@ -116,7 +116,7 @@
data[sl] =3D '\0';
}
=20
-ostream& operator << (ostream& out, const String& s) {
+std::ostream& operator << (std::ostream& out, const String& s) {
out.write(s.data, s.sl);
return out;
}
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/DataBuffer.hpp
+++ dansguardian-2.8.0.4/DataBuffer.hpp
@@ -33,11 +33,11 @@
int compressed_buffer_length;
DataBuffer();
~DataBuffer();
- void read(Socket *sock, int length) throw(exception);
+ void read(Socket *sock, int length) throw(std::exception);
int length() {return buffer_length;}
void copytomemory(char* location);
bool in(Socket *sock); // gives true if it pauses due to too much data
- void out(Socket *sock) throw(exception);
+ void out(Socket *sock) throw(std::exception);
void setTimeout(int t);
void setDecompress(String d);
bool contentRegExp(int filtergroup);
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/HTTPHeader.hpp
+++ dansguardian-2.8.0.4/HTTPHeader.hpp
@@ -31,7 +31,7 @@
DataBuffer postdata;
unsigned int port;
void in(Socket *sock);
- void out(Socket *sock) throw(exception);
+ void out(Socket *sock) throw(std::exception);
int contentlength();
bool iscontenttype(String t);
bool malformedURL(String url);
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/Ident.hpp
+++ dansguardian-2.8.0.4/Ident.hpp
@@ -28,12 +28,12 @@
=20
public:
Ident();
- std::string getUsername(HTTPHeader* h, string* s, int port);
+ std::string getUsername(HTTPHeader* h, std::string* s, int port);
=20
private:
bool getUsernameProxyAuth(HTTPHeader* h);
bool getUsernameNTLM(HTTPHeader* h);
- bool getUsernameIdent(string* s, int port, int serverport, int tim=
eout);
+ bool getUsernameIdent(std::string* s, int port, int serverport, in=
t timeout);
std::string username;
};
=20
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/Socket.hpp
+++ dansguardian-2.8.0.4/Socket.hpp
@@ -54,15 +54,15 @@
int getTimeout();
=20
bool checkForInput();
- void checkForInput(int timeout) throw(exception);
+ void checkForInput(int timeout) throw(std::exception);
bool readyForOutput();
- void readyForOutput(int timeout) throw(exception);
- int getline(char* buff, int size, int timeout) throw(exception);
- void writeString(const char* line) throw(exception);
+ void readyForOutput(int timeout) throw(std::exception);
+ int getline(char* buff, int size, int timeout) throw(std::exceptio=
n);
+ void writeString(const char* line) throw(std::exception);
bool writeToSocket(char* buff, int len, unsigned int flags, int ti=
meout);
int readFromSocketn(char* buff, int len, unsigned int flags, int t=
imeout);
int readFromSocket(char* buff, int len, unsigned int flags, int ti=
meout);
- void writeToSockete(char* buff, int len, unsigned int flags, int t=
imeout) throw(exception);
+ void writeToSockete(char* buff, int len, unsigned int flags, int t=
imeout) throw(std::exception);
=20
=20
private:
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/String.hpp
+++ dansguardian-2.8.0.4/String.hpp
@@ -40,7 +40,7 @@
String(const long num);
String(const char bs[], int len);
String(const char bs[], int start, int len);
- friend ostream & operator << (ostream & out, const String& s);
+ friend std::ostream & operator << (std::ostream & out, const String& =
s);
friend String operator+ (const String & lhs, const String & s);
String& operator =3D (const String & s);
bool operator !=3D (const String & s);
only in patch2:
unchanged:
--- dansguardian-2.8.0.4.orig/UDSocket.hpp
+++ dansguardian-2.8.0.4/UDSocket.hpp
@@ -52,15 +52,15 @@
int getTimeout();
=20
bool checkForInput();
- void checkForInput(int timeout) throw(exception);
+ void checkForInput(int timeout) throw(std::exception);
bool readyForOutput();
- void readyForOutput(int timeout) throw(exception);
- int getline(char* buff, int size, int timeout) throw(exception);
- void writeString(const char* line) throw(exception);
+ void readyForOutput(int timeout) throw(std::exception);
+ int getline(char* buff, int size, int timeout) throw(std::exceptio=
n);
+ void writeString(const char* line) throw(std::exception);
bool writeToSocket(char* buff, int len, unsigned int flags, int ti=
meout);
int readFromSocketn(char* buff, int len, unsigned int flags, int t=
imeout);
int readFromSocket(char* buff, int len, unsigned int flags, int ti=
meout);
- void writeToSockete(char* buff, int len, unsigned int flags, int t=
imeout) throw(exception);
+ void writeToSockete(char* buff, int len, unsigned int flags, int t=
imeout) throw(std::exception);
=20
=20
private:
--bg08WKrSYDhXBjb5--
--RASg3xLB4tUQ4RcS
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC4XLAfNdgYxVXvBARAnC9AJwM9id9lBDTkvaGaXlRliFLdkdmfACdElBu
zR5bNKf0BMSxVAVMahkvhcw=
=Lm9/
-----END PGP SIGNATURE-----
--RASg3xLB4tUQ4RcS--
---------------------------------------
Received: (at 319568-close) by bugs.debian.org; 18 Aug 2005 20:51:44 +0000
>From [EMAIL PROTECTED] Thu Aug 18 13:51:44 2005
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
id 1E5r3e-0002OH-00; Thu, 18 Aug 2005 13:32:14 -0700
From: Alexander Wirt <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.56 $
Subject: Bug#319568: fixed in dansguardian 2.8.0.6-antivirus-6.3.8-1-1
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Thu, 18 Aug 2005 13:32:14 -0700
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 2
Source: dansguardian
Source-Version: 2.8.0.6-antivirus-6.3.8-1-1
We believe that the bug you reported is fixed in the latest version of
dansguardian, which is due to be installed in the Debian FTP archive:
dansguardian_2.8.0.6-antivirus-6.3.8-1-1.diff.gz
to pool/main/d/dansguardian/dansguardian_2.8.0.6-antivirus-6.3.8-1-1.diff.gz
dansguardian_2.8.0.6-antivirus-6.3.8-1-1.dsc
to pool/main/d/dansguardian/dansguardian_2.8.0.6-antivirus-6.3.8-1-1.dsc
dansguardian_2.8.0.6-antivirus-6.3.8-1-1_i386.deb
to pool/main/d/dansguardian/dansguardian_2.8.0.6-antivirus-6.3.8-1-1_i386.deb
dansguardian_2.8.0.6-antivirus-6.3.8-1.orig.tar.gz
to pool/main/d/dansguardian/dansguardian_2.8.0.6-antivirus-6.3.8-1.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Alexander Wirt <[EMAIL PROTECTED]> (supplier of updated dansguardian package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 17 Aug 2005 14:30:31 +0200
Source: dansguardian
Binary: dansguardian
Architecture: source i386
Version: 2.8.0.6-antivirus-6.3.8-1-1
Distribution: unstable
Urgency: low
Maintainer: Alexander Wirt <[EMAIL PROTECTED]>
Changed-By: Alexander Wirt <[EMAIL PROTECTED]>
Description:
dansguardian - Web content filtering
Closes: 263890 319568
Changes:
dansguardian (2.8.0.6-antivirus-6.3.8-1-1) unstable; urgency=low
.
* New upstream release
* Integreated Aecio F. Netos Antiviruspatch (Closes: #263890)
* Acknowledge the gcc4 nmu (Closes: #319568)
Files:
d28801ca7abd59ecbaabb7329dcae5a1 709 web optional
dansguardian_2.8.0.6-antivirus-6.3.8-1-1.dsc
71827991a1e99c5a2f068fcfe9f6fe01 232593 web optional
dansguardian_2.8.0.6-antivirus-6.3.8-1.orig.tar.gz
b82a1cdedcc9580e5ddb2d1ce8478d88 17438 web optional
dansguardian_2.8.0.6-antivirus-6.3.8-1-1.diff.gz
a8e6681465d14d005a26f3fb8f13675a 271860 web optional
dansguardian_2.8.0.6-antivirus-6.3.8-1-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFDBN8V01u8mbx9AgoRAj2SAJ9drZmqvdiGyIOQsJ81OWsxgr7yuQCgkCmd
LKJW17UUxFD88qpOQU01fMA=
=0r9p
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
