Hi Colin, David and Mattias.

I found the upstream repository, and the upstream commit that fixes this issue.


https://github.com/CESNET/gridsite/commit/2124d471f9fc1eed4bf5893ed2701350357c01af

 

Since the code was just too old to be useful they just dropped it, I tested in 
a clean trusty environment and everything still builds fine (curl 7.35.0), and 
in a clean sid pbuilder environment (curl 7.37.1)


This is the debdiff

diff -Nru gridsite-2.0.4/debian/changelog gridsite-2.0.4/debian/changelog
--- gridsite-2.0.4/debian/changelog     2014-05-12 15:51:28.000000000 +0200
+++ gridsite-2.0.4/debian/changelog     2014-07-31 11:11:23.000000000 +0200
@@ -1,3 +1,11 @@
+gridsite (2.0.4-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Cherry-pick upstream commit 2124d471f9fc
+    to fix a FTBFS with curl >= 7.37.1 (Closes: #755327)
+
+ -- Gianfranco Costamagna <costamagnagianfra...@yahoo.it>  Thu, 31 Jul 2014 
11:10:15 +0200
+
 gridsite (2.0.4-3) unstable; urgency=medium

   * Add missing Build-Requires on pkg-config (Closes: #747768)
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 
11:08:09.000000000 +0200
@@ -0,0 +1,38 @@
+From 2124d471f9fc1eed4bf5893ed2701350357c01af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <val...@civ.zcu.cz>
+Date: Mon, 21 Jul 2014 11:10:42 +0200
+Subject: [PATCH] Remove ancient curl compatibility stuff. This fixes build
+ with curl 7.37.1 on Fedora 22/rawhide.
+
+---
+ src/htcp.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/htcp.c b/src/htcp.c
+index 6d60720..3e1f5a4 100644
+--- a/src/htcp.c
++++ b/src/htcp.c
+@@ -59,20 +59,6 @@
+ 
+ #include "gridsite.h"
+ 
+-/* deal with older versions of libcurl and curl.h */
+-
+-#ifndef CURLOPT_WRITEDATA
+-#define CURLOPT_WRITEDATA CURLOPT_FILE
+-#endif
+- 
+-#ifndef CURLOPT_READDATA
+-#define CURLOPT_READDATA CURLOPT_FILE
+-#endif
+-
+-#ifndef CURLE_HTTP_RETURNED_ERROR
+-#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
+-#endif
+- 
+ #define HTCP_GET      1
+ #define HTCP_PUT      2
+ #define HTCP_DELETE   3
+-- 
+2.0.3
+
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 15:46:46.000000000 
+0200
+++ gridsite-2.0.4/debian/patches/series        2014-07-31 11:12:11.000000000 
+0200
@@ -3,3 +3,4 @@
 gridsite-httpd24.patch
 gridsite-fprintf.patch
 gridsite-return-type.patch
+curl-defines.patch


cheers,

Gianfranco


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to