Control: tag -1 patch
Here's a fix. Feel free to pass it on upstream as necessary (I couldn't
track down a current location for upstream revision control).
* Test for old curl by version rather than with #ifndef, which breaks as
of curl 7.37.1 (closes: #755327).
diff -Nru gridsite-2.0.4/debian/patches/curl-defines.patch
gridsite-2.0.4/debian/patches/curl-defines.patch
--- gridsite-2.0.4/debian/patches/curl-defines.patch 1970-01-01
01:00:00.000000000 +0100
+++ gridsite-2.0.4/debian/patches/curl-defines.patch 2014-07-31
08:44:23.000000000 +0100
@@ -0,0 +1,44 @@
+Description: Test for old curl by version rather than with #ifndef
+ As of curl 7.37.1, CURLOPT_READDATA and CURLOPT_WRITEDATA are enums rather
+ than #defines and the old names are #defines instead; testing for them with
+ #ifndef results in #define loops. Use a version test instead to find out
+ whether we need compatibility definitions.
+Author: Colin Watson <cjwat...@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/755327
+Forwarded: no
+Last-Update: 2014-07-31
+
+Index: b/src/htcp.c
+===================================================================
+--- a/src/htcp.c
++++ b/src/htcp.c
+@@ -61,11 +61,8 @@
+
+ /* deal with older versions of libcurl and curl.h */
+
+-#ifndef CURLOPT_WRITEDATA
++#if (LIBCURL_VERSION_NUM < 0x070907)
+ #define CURLOPT_WRITEDATA CURLOPT_FILE
+-#endif
+-
+-#ifndef CURLOPT_READDATA
+ #define CURLOPT_READDATA CURLOPT_FILE
+ #endif
+
+Index: b/src/slashgrid.c
+===================================================================
+--- a/src/slashgrid.c
++++ b/src/slashgrid.c
+@@ -89,11 +89,8 @@
+
+ #define GRST_SLASH_HTCP_PORT 777
+
+-#ifndef CURLOPT_WRITEDATA
++#if (LIBCURL_VERSION_NUM < 0x070907)
+ #define CURLOPT_WRITEDATA CURLOPT_FILE
+-#endif
+-
+-#ifndef CURLOPT_READDATA
+ #define CURLOPT_READDATA CURLOPT_INFILE
+ #endif
+
diff -Nru gridsite-2.0.4/debian/patches/series
gridsite-2.0.4/debian/patches/series
--- gridsite-2.0.4/debian/patches/series 2014-05-12 14:46:46.000000000
+0100
+++ gridsite-2.0.4/debian/patches/series 2014-07-31 08:38:37.000000000
+0100
@@ -3,3 +3,4 @@
gridsite-httpd24.patch
gridsite-fprintf.patch
gridsite-return-type.patch
+curl-defines.patch
Thanks,
--
Colin Watson [cjwat...@ubuntu.com]
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
