tags 356323 + pending
thanks
I've uploaded the following NMU to delayed-2.
diff -u nepenthes-0.1.6/debian/changelog nepenthes-0.1.6/debian/changelog
--- nepenthes-0.1.6/debian/changelog
+++ nepenthes-0.1.6/debian/changelog
@@ -1,3 +1,12 @@
+nepenthes (0.1.6-1.1) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * Apply patch from upstream to remove extra qualifications and fix the
+ "type-punned pointer will break strict-aliasing rules" error (closes:
+ #356323).
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]> Fri, 26 May 2006 22:26:18 +0200
+
nepenthes (0.1.6-1) unstable; urgency=low
* New upstream release
--- nepenthes-0.1.6.orig/nepenthes-core/include/DownloadHandler.hpp
+++ nepenthes-0.1.6/nepenthes-core/include/DownloadHandler.hpp
@@ -64,7 +64,7 @@
return m_DownloadHandlerName;
}
- virtual string DownloadHandler::getDownloadHandlerDescription()
+ virtual string getDownloadHandlerDescription()
{
return m_DownloadHandlerDescription;
}
only in patch2:
unchanged:
--- nepenthes-0.1.6.orig/nepenthes-core/include/UploadHandler.hpp
+++ nepenthes-0.1.6/nepenthes-core/include/UploadHandler.hpp
@@ -57,7 +57,7 @@
return m_UploadHandlerName;
}
- virtual string UploadHandler::getUploadHandlerDescription()
+ virtual string getUploadHandlerDescription()
{
return m_UploadHandlerDescription;
}
only in patch2:
unchanged:
--- nepenthes-0.1.6.orig/modules/download-curl/download-curl.cpp
+++ nepenthes-0.1.6/modules/download-curl/download-curl.cpp
@@ -147,9 +147,11 @@
if ( pMessage->msg == CURLMSG_DONE )
{
Download *pDown;
+ char *cDown;
char * szUrl;
- curl_easy_getinfo(pMessage->easy_handle, CURLINFO_PRIVATE,
(char * *) &pDown);
+ curl_easy_getinfo(pMessage->easy_handle, CURLINFO_PRIVATE,
(char * *) &cDown);
+ pDown = (Download *)cDown;
if ( pMessage->data.result )
{
logWarn("Download error %s on getting file %s \n",
curl_easy_strerror(pMessage->data.result), pDown->getUrl().c_str());
only in patch2:
unchanged:
--- nepenthes-0.1.6.orig/modules/submit-norman/submit-norman.cpp
+++ nepenthes-0.1.6/modules/submit-norman/submit-norman.cpp
@@ -225,9 +225,12 @@
if ( pMessage->msg == CURLMSG_DONE )
{
NormanContext *norm;
+ char *cnorm;
char * szUrl;
- curl_easy_getinfo(pMessage->easy_handle, CURLINFO_PRIVATE,
(char * *) &norm);
+ curl_easy_getinfo(pMessage->easy_handle, CURLINFO_PRIVATE,
(char * *) &cnorm);
+ norm = (NormanContext *)cnorm;
+
if ( pMessage->data.result )
{
logInfo("Upload Error %s on getting file %s \n",
curl_easy_strerror(pMessage->data.result), norm->getMD5Sum());
only in patch2:
unchanged:
--- nepenthes-0.1.6.orig/modules/dnsresolve-adns/dnsresolve-adns.cpp
+++ nepenthes-0.1.6/modules/dnsresolve-adns/dnsresolve-adns.cpp
@@ -161,17 +161,25 @@
void DNSResolverADNS::callBack()
{
adns_query q, r;
+ void *vr;
+
adns_answer *answer;
DNSQuery *query;
+
ADNSContext *ctx;
+ void *vctx;
logSpam("%i DNS Resolves in Queue\n", m_Queue);
adns_forallqueries_begin(m_aDNSState);
- while ( (q = adns_forallqueries_next(m_aDNSState, (void **)&r)) != NULL
)
+ while ( (q = adns_forallqueries_next(m_aDNSState, (void **)&vr)) !=
NULL )
{
-
- switch ( adns_check(m_aDNSState, &q, &answer, (void **)&ctx) )
+ r = (adns_query)vr;
+
+ int adns_ret = adns_check(m_aDNSState, &q, &answer, (void
**)&vctx);
+ ctx = (ADNSContext *)vctx;
+
+ switch ( adns_ret )
{
case 0:
{
only in patch2:
unchanged:
--- nepenthes-0.1.6.orig/modules/x-7/x-7.cpp
+++ nepenthes-0.1.6/modules/x-7/x-7.cpp
@@ -175,7 +175,7 @@
*/
ConsumeLevel X7Dialogue::incomingData(Message *msg)
{
- if(!(msg->getSocket()->getType() & ST_RAW_UDP))
+/* if(!(msg->getSocket()->getType() & ST_RAW_UDP))
{
logCrit("GOT NON UDP Packet %i \n",msg->getSize());
return CL_DROP;
@@ -264,7 +264,7 @@
break;
}
-/*
+
int32_t j=0;
for (int32_t i=0;i<dns->number_questions;i++)
{
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
