tags 521964 + pending
thanks
Dear maintainer,
I've prepared an NMU for libapache2-mod-lisp (versioned as 1.3.1-1.1)
and uploaded it to DELAYED/2, according to devref §5.11.1. The patch is
by Antonio Radici, as posted to this bug log: it removes the obsolete
test on APR version, which made cpp believes that Debian had an _older_
version of APR than 1.2.2, while in fact it has a newer one.
Hope this helps.
Cheers.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u libapache2-mod-lisp-1.3.1/debian/changelog libapache2-mod-lisp-1.3.1/debian/changelog
--- libapache2-mod-lisp-1.3.1/debian/changelog
+++ libapache2-mod-lisp-1.3.1/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-lisp (1.3.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove bogus test on APR version: we have more recent version than
+ 1.2.2; fix FTBFS, patch by Antonio Radici. (Closes: #521964)
+
+ -- Stefano Zacchiroli <[email protected]> Fri, 27 Nov 2009 09:35:30 +0100
+
libapache2-mod-lisp (1.3.1-1) unstable; urgency=low
* New package. (closes: Bug#432053)
only in patch2:
unchanged:
--- libapache2-mod-lisp-1.3.1.orig/mod_lisp.c
+++ libapache2-mod-lisp-1.3.1/mod_lisp.c
@@ -154,12 +154,6 @@
#include <string.h>
module AP_MODULE_DECLARE_DATA lisp_module;
-/* Work out the version of the apache portable runtime (APR) we're
- * compiling against... with version 1.2.2 some of the interfaces
- * changed a bit. */
-#if (APR_MAJOR_VERSION==1 && APR_MINOR_VERSION==2 && APR_PATCH_VERSION>=2)
-#define HAVE_APR_1_2_2 1
-#endif
#define RELAY_ERROR(expr) do \
@@ -382,17 +376,9 @@
(apr_sockaddr_info_get ((&addr), (cfg->server_address), APR_UNSPEC,
(cfg->server_port), 0, socket_pool));
-#if (HAVE_APR_1_2_2)
RELAY_ERROR (apr_socket_create ((&socket), AF_INET, SOCK_STREAM, APR_PROTO_TCP, socket_pool));
-#else
- RELAY_ERROR (apr_socket_create ((&socket), AF_INET, SOCK_STREAM, socket_pool));
-#endif
-#if (HAVE_APR_1_2_2)
RELAY_ERROR (apr_socket_connect (socket, addr));
-#else
- RELAY_ERROR (apr_connect (socket, addr));
-#endif
{
input_buffer_t * buffer
= (apr_palloc (socket_pool, (sizeof (input_buffer_t))));
@@ -425,11 +411,7 @@
while (1)
{
apr_size_t n2 = n1;
-#if (HAVE_APR_1_2_2)
RELAY_ERROR (apr_socket_send (socket, p, (&n2)));
-#else
- RELAY_ERROR (apr_send (socket, p, &n2));
-#endif
if (n2 == n1)
return (APR_SUCCESS);
p += n2;
@@ -487,15 +469,9 @@
apr_size_t length;
RELAY_ERROR (get_input_buffer (socket, (&buffer)));
-#if (HAVE_APR_1_2_2)
RELAY_ERROR
(((length = (sizeof (buffer->data))),
(apr_socket_recv (socket, (buffer->data), (&length)))));
-#else
- RELAY_ERROR
- (((length = (sizeof (buffer->data))),
- (apr_recv (socket, (buffer->data), (&length)))));
-#endif
(buffer->start) = (buffer->data);
(buffer->end) = ((buffer->data) + length);
if (length == 0)
