Dear maintainer, I've prepared an NMU for gridsite (versioned as 2.0.4-3.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer.
Regards, Vincent diff -Nru gridsite-2.0.4/debian/changelog gridsite-2.0.4/debian/changelog --- gridsite-2.0.4/debian/changelog 2014-05-12 06:51:28.000000000 -0700 +++ gridsite-2.0.4/debian/changelog 2014-08-02 19:03:01.000000000 -0700 @@ -1,3 +1,13 @@ +gridsite (2.0.4-3.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Colin Watson ] + * Test for old curl by version rather than with #ifndef, which breaks as + of curl 7.37.1 (closes: #755327). + + -- Vincent Cheng <vch...@debian.org> Sat, 02 Aug 2014 19:02:02 -0700 + 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 1969-12-31 16:00:00.000000000 -0800 +++ gridsite-2.0.4/debian/patches/curl-defines.patch 2014-08-02 19:01:36.000000000 -0700 @@ -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 06:46:46.000000000 -0700 +++ gridsite-2.0.4/debian/patches/series 2014-08-02 19:01:36.000000000 -0700 @@ -3,3 +3,4 @@ gridsite-httpd24.patch gridsite-fprintf.patch gridsite-return-type.patch +curl-defines.patch -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
