tags 636559 +patch
thanks
oops sent this to the wrong bug report
Note that despite the bug title this issue is not alpha specific, it impacts
all architures.
I've attatched a patch that gets the package building again. Within the patch
are three fixes
1: improve debian/rules clean. It's not perfect but at least it avoids
"unrepresendable changes to source". This isn't strictly needed to fix
the FTBFS but working on packages without a usable clean target is a
PITA
2: remove includes of the obsolete curl/types.h from multiple places in
the source
3: fix several gcc 4.6 related failures
Given the lack of maintainer activity I have cc'd luk in case he is
interested in making another NMU (he uploaded the current version)
diff -urN nepenthes-0.2.2/debian/clean nepenthes-0.2.2.new/debian/clean
--- nepenthes-0.2.2/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ nepenthes-0.2.2.new/debian/clean 2011-11-07 02:47:32.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+rm -f nepenthes-core/src/*.o
+rm -f nepenthes-core/src/nepenthes
+for f in modules/*
+do
+ echo "cleaning up $f"
+ rm -f $f/*.o
+ rm -f $f/*.lo
+ rm -f $f/*.la
+ rm -f $f/Makefile
+ rm -rf $f/.libs
+done
+
+rm -rf nepenthes-core/src/.deps
diff -urN nepenthes-0.2.2/debian/patches/00list nepenthes-0.2.2.new/debian/patches/00list
--- nepenthes-0.2.2/debian/patches/00list 2011-11-07 01:32:51.000000000 +0000
+++ nepenthes-0.2.2.new/debian/patches/00list 2011-11-07 02:32:52.000000000 +0000
@@ -5,3 +5,5 @@
05_includes_for_gcc_4.4.dpatch
06_includes_for_eglibc_2.10.dpatch
08_ftbfs_gcc45.dpatch
+09_remove_curl_types_h.dpatch
+10_fix_gcc4.6.dpatch
diff -urN nepenthes-0.2.2/debian/patches/09_remove_curl_types_h.dpatch nepenthes-0.2.2.new/debian/patches/09_remove_curl_types_h.dpatch
--- nepenthes-0.2.2/debian/patches/09_remove_curl_types_h.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ nepenthes-0.2.2.new/debian/patches/09_remove_curl_types_h.dpatch 2011-11-07 03:02:42.000000000 +0000
@@ -0,0 +1,84 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_remove_curl_types_h.dpatch by <plugw...@p10link.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove curl/types.h which is no longer present in current curl packages
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/download-curl/download-curl.hpp nepenthes-0.2.2.new/modules/download-curl/download-curl.hpp
+--- nepenthes-0.2.2.new~/modules/download-curl/download-curl.hpp 2011-11-07 02:21:01.000000000 +0000
++++ nepenthes-0.2.2.new/modules/download-curl/download-curl.hpp 2011-11-07 02:21:09.000000000 +0000
+@@ -28,7 +28,6 @@
+ /* $Id: download-curl.hpp 1927 2005-08-27 21:56:59Z dp $ */
+
+ #include <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+
+ #include "Module.hpp"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/submit-http/HTTPSession.cpp nepenthes-0.2.2.new/modules/submit-http/HTTPSession.cpp
+--- nepenthes-0.2.2.new~/modules/submit-http/HTTPSession.cpp 2011-11-07 02:21:09.000000000 +0000
++++ nepenthes-0.2.2.new/modules/submit-http/HTTPSession.cpp 2011-11-07 02:22:53.000000000 +0000
+@@ -28,7 +28,6 @@
+
+
+ #include <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ #include <sstream>
+ #include <cstring>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/submit-http/HTTPSession.hpp nepenthes-0.2.2.new/modules/submit-http/HTTPSession.hpp
+--- nepenthes-0.2.2.new~/modules/submit-http/HTTPSession.hpp 2007-02-06 16:54:33.000000000 +0000
++++ nepenthes-0.2.2.new/modules/submit-http/HTTPSession.hpp 2011-11-07 02:21:31.000000000 +0000
+@@ -29,7 +29,6 @@
+ /* $Id: HTTPSession.hpp 839 2007-02-06 16:54:31Z common $ */
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+
+ #include "Download.hpp"
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/submit-http/submit-http.hpp nepenthes-0.2.2.new/modules/submit-http/submit-http.hpp
+--- nepenthes-0.2.2.new~/modules/submit-http/submit-http.hpp 2011-11-07 02:21:01.000000000 +0000
++++ nepenthes-0.2.2.new/modules/submit-http/submit-http.hpp 2011-11-07 02:21:09.000000000 +0000
+@@ -29,7 +29,6 @@
+ /* $Id: submit-http.hpp 839 2007-02-06 16:54:31Z common $ */
+
+ #include <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+
+ #include "Nepenthes.hpp"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/submit-mwserv/TransferSession.hpp nepenthes-0.2.2.new/modules/submit-mwserv/TransferSession.hpp
+--- nepenthes-0.2.2.new~/modules/submit-mwserv/TransferSession.hpp 2007-06-11 12:46:24.000000000 +0000
++++ nepenthes-0.2.2.new/modules/submit-mwserv/TransferSession.hpp 2011-11-07 02:23:39.000000000 +0000
+@@ -27,7 +27,6 @@
+ *******************************************************************************/
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <string>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/submit-mwserv/submit-mwserv.hpp nepenthes-0.2.2.new/modules/submit-mwserv/submit-mwserv.hpp
+--- nepenthes-0.2.2.new~/modules/submit-mwserv/submit-mwserv.hpp 2007-05-12 11:37:40.000000000 +0000
++++ nepenthes-0.2.2.new/modules/submit-mwserv/submit-mwserv.hpp 2011-11-07 02:23:14.000000000 +0000
+@@ -27,7 +27,6 @@
+ *******************************************************************************/
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include "Nepenthes.hpp"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/submit-norman/submit-norman.hpp nepenthes-0.2.2.new/modules/submit-norman/submit-norman.hpp
+--- nepenthes-0.2.2.new~/modules/submit-norman/submit-norman.hpp 2011-11-07 02:21:09.000000000 +0000
++++ nepenthes-0.2.2.new/modules/submit-norman/submit-norman.hpp 2011-11-07 02:21:09.000000000 +0000
+@@ -31,7 +31,6 @@
+ #include <cstring>
+
+ #include <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+
+ #include "Module.hpp"
diff -urN nepenthes-0.2.2/debian/patches/10_fix_gcc4.6.dpatch nepenthes-0.2.2.new/debian/patches/10_fix_gcc4.6.dpatch
--- nepenthes-0.2.2/debian/patches/10_fix_gcc4.6.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ nepenthes-0.2.2.new/debian/patches/10_fix_gcc4.6.dpatch 2011-11-07 03:08:56.000000000 +0000
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_gcc4.6.dpatch by <plugw...@p10link.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix failures with gcc 4.6
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/dnsresolve-adns/dnsresolve-adns.cpp nepenthes-0.2.2.new/modules/dnsresolve-adns/dnsresolve-adns.cpp
+--- nepenthes-0.2.2.new~/modules/dnsresolve-adns/dnsresolve-adns.cpp 2011-11-07 03:07:52.000000000 +0000
++++ nepenthes-0.2.2.new/modules/dnsresolve-adns/dnsresolve-adns.cpp 2011-11-07 03:07:52.000000000 +0000
+@@ -162,7 +162,7 @@
+
+ void DNSResolverADNS::callBack()
+ {
+- adns_query q, r;
++ adns_query q;
+ void *vr;
+
+ adns_answer *answer;
+@@ -176,7 +176,6 @@
+ adns_forallqueries_begin(m_aDNSState);
+ while ( (q = adns_forallqueries_next(m_aDNSState, (void **)&vr)) != NULL )
+ {
+- r = (adns_query)vr;
+
+ int adns_ret = adns_check(m_aDNSState, &q, &answer, (void **)&vctx);
+ ctx = (ADNSContext *)vctx;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/module-bridge/module-bridge.cpp nepenthes-0.2.2.new/modules/module-bridge/module-bridge.cpp
+--- nepenthes-0.2.2.new~/modules/module-bridge/module-bridge.cpp 2011-11-07 03:07:43.000000000 +0000
++++ nepenthes-0.2.2.new/modules/module-bridge/module-bridge.cpp 2011-11-07 03:07:52.000000000 +0000
+@@ -119,14 +119,13 @@
+ }
+
+ StringList sList;
+- int32_t timeout;
+
+ m_BridgeHost = inet_addr("192.168.53.204");
+
+ try
+ {
+ sList = *m_Config->getValStringList("module-bridge.ports");
+- timeout = m_Config->getValInt("module-bridge.accepttimeout");
++ m_Config->getValInt("module-bridge.accepttimeout");
+ } catch ( ... )
+ {
+ logCrit("Error setting needed vars, check your config\n");
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nepenthes-0.2.2.new~/modules/sqlhandler-postgres/sqlhandler-postgres.cpp nepenthes-0.2.2.new/modules/sqlhandler-postgres/sqlhandler-postgres.cpp
+--- nepenthes-0.2.2.new~/modules/sqlhandler-postgres/sqlhandler-postgres.cpp 2007-05-12 10:29:49.000000000 +0000
++++ nepenthes-0.2.2.new/modules/sqlhandler-postgres/sqlhandler-postgres.cpp 2011-11-07 03:08:48.000000000 +0000
+@@ -28,6 +28,7 @@
+ /* $Id: sqlhandler-postgres.cpp 1264 2007-05-12 10:29:49Z common $ */
+
+ #include <ctype.h>
++#include <stdlib.h>
+ //#include <openssl/ssl.h>
+
+ #include "sqlhandler-postgres.hpp"
diff -urN nepenthes-0.2.2/debian/rules nepenthes-0.2.2.new/debian/rules
--- nepenthes-0.2.2/debian/rules 2011-11-07 01:32:51.000000000 +0000
+++ nepenthes-0.2.2.new/debian/rules 2011-11-07 02:40:55.000000000 +0000
@@ -57,6 +57,9 @@
[ ! -f $(CURDIR)/config.guess.backup ] || \
mv $(CURDIR)/config.guess.backup $(CURDIR)/config.guess
dh_clean
+ #clean up more stuff
+ chmod 755 debian/clean
+ debian/clean
patch: patch-stamp
