Bug#749511: netcdf: wrong quote characters
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Control: tags -1 - moreinfo Control: tags -1 + pending Hi Michael, On 09-11-15 01:59, Michael Tautschnig wrote: > On Mon, Nov 09, 2015 at 0:11:23 +, Michael Tautschnig wrote: > [...] >> Yes, I do confirm that this problem has been addressed. There is, >> however, another inconsistency that now crops up: ocrc_process is >> declared with inconsistent return types. The attached patch fixes >> this problem. > > There are actually two more cases of the same kind -- patches > attached. Thanks for the confirmation and the patches for the inconsistent return types. I've combined them into a single patch and forwarded it upstream, the patch will be included in the next upload. I'd like to wait for the previous upload to migrate to testing first, but some leftovers from the netcdf transition a few months ago are preventing that at the moment (see also: #804325). Kind Regards, Bas - -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCgAGBQJWQSx1AAoJEGdQ8QrojUrx7usQAIGhPUpH1r089q2Y5/DnZQzm o1n39B0/5zbV18NXcL7xIANQruXislG+iBqPFN2mQwPxjKQ850U24e0fZyGFSegH pF4CN/CEIfU5FFVVdtngWjVyNIny6dptYulodkG41ucbPjjXVOxulXSoXNLAAWYx JXP7F/ohh+IYgAcMAGzAViJz9jyL1xdNq2X5v5c3z2D8na5ojkSmhTO3iobA/Z3n XhKjhM7bGdOQVE+JF0fpmPmQqyLNPC+l6ZGSPT0mRv126XXel7ISgWmtmzUwO6hM VNPzhBk2ZKQia7VjLDuPigWVu1lQMPF38pG6Av0s/RUwnhQ1h9SSUL1oUeaI3Ibc LujFy8QKsGAro8P4vufeXdDb5ViEUfaXqla7zMYYAte7HG45xlPZYXbTl7jsEdNq eK6iB6Nf7XUWOXvjDFupNBUwQSiVsZfRPRdWrjjVTIFYEuJ9UWRL80mVPwjjoWDV HYF/DakaqC8PopgxSu3+RoaZV7our1ZHjKXe9vZqOJwXetrjf0cgiwuyd16AvVkA 4thxJNhNr/lXsEeBeUNKK3maxJOMUvvWi214zvh7AL2s0LuIaVUdWGrN46K6C/0S 1zGVgf+3zjGAiooeue/dgJ2ozFypMfSk0S5qAZIZPjjOAgeQma7QZiyKXJLoUX47 emoPkdJTfOuSlez6IQrO =2k9Y -END PGP SIGNATURE-
Bug#749511: netcdf: wrong quote characters
On Mon, Nov 09, 2015 at 0:11:23 +, Michael Tautschnig wrote:
[...]
> Yes, I do confirm that this problem has been addressed. There is, however,
> another inconsistency that now crops up: ocrc_process is declared with
> inconsistent return types. The attached patch fixes this problem.
>
There are actually two more cases of the same kind -- patches attached.
Best,
Michael
Index: sources-netcdf/1:4.4.0~rc3-1/oc2/oc.h
===
--- sources-netcdf/1:4.4.0~rc3-1/oc2/oc.h
+++ sources-netcdf/1:4.4.0~rc3-1/oc2/oc.h
@@ -536,9 +536,9 @@
/* Get the HTTP return code from the last call;
note that this may or may not be the same as returned
by oc_svcerrordata.
*/
-extern int oc_httpcode(OClink);
+extern OCerror oc_httpcode(OClink);
/*
(Re-)initialize the oc library as if nothing had been called.
This is primarily for debugging of rc files.
Index: sources-netcdf/1:4.4.0~rc3-1/oc2/ochttp.c
===
--- sources-netcdf/1:4.4.0~rc3-1/oc2/ochttp.c
+++ sources-netcdf/1:4.4.0~rc3-1/oc2/ochttp.c
@@ -87,13 +87,13 @@
oclog(OCLOGERR, "curl error: %s", curl_easy_strerror(cstat));
return OCTHROW(OC_ECURL);
}
-int
+OCerror
ocfetchurl(CURL* curl, const char* url, OCbytes* buf, long* filetime,
struct OCcredentials* creds)
{
- int stat = OC_NOERR;
+ OCerror stat = OC_NOERR;
CURLcode cstat = CURLE_OK;
size_t len;
long httpcode = 0;
pgpAXdCtCVxe1.pgp
Description: PGP signature
Bug#749511: netcdf: wrong quote characters
Hi,
On Sun, Nov 08, 2015 at 23:03:19 +0100, Sebastiaan Couwenberg wrote:
> We migrated away from NetCDF 4.1.3 to 4.4.0 in unstable, and I cannot
> reproduce the issue with the current netcdf packages any more.
>
[...]
> It looks like this fixed the issue.
>
> Can you confirm that this is now fixed, or can you still reproduce the
> issue with netcdf (1:4.4.0~rc3-1)?
>
Yes, I do confirm that this problem has been addressed. There is, however,
another inconsistency that now crops up: ocrc_process is declared with
inconsistent return types. The attached patch fixes this problem.
Best,
Michael
Index: sources-netcdf/1:4.4.0~rc3-1/oc2/ocrc.c
===
--- sources-netcdf/1:4.4.0~rc3-1/oc2/ocrc.c
+++ sources-netcdf/1:4.4.0~rc3-1/oc2/ocrc.c
@@ -407,12 +407,12 @@
free(path);
return stat;
}
-int
+OCerror
ocrc_process(OCstate* state)
{
-int stat = 0;
+OCerror stat = OC_NOERR;
char* value = NULL;
OCURI* uri = state->uri;
char* url_userpwd = NULL;
char* url_hostport = NULL;
pgpu_UMR9aum_.pgp
Description: PGP signature
Bug#749511: netcdf: wrong quote characters
Control: tags -1 upstream unreproducible moreinfo
Hi Michael,
We migrated away from NetCDF 4.1.3 to 4.4.0 in unstable, and I cannot
reproduce the issue with the current netcdf packages any more.
On Tue, 27 May 2014 15:58:24 +0100 Michael Tautschnig wrote:
> During a rebuild of all packages in a clean sid chroot (and
> cowbuilder+pbuilder)
> the build failed with the following error. Please note that we use our
> research
> compiler tool-chain (using tools from the cbmc package), which permits
> extended
> reporting on type inconsistencies at link time.
>
> [...]
> libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I../fortran -I.. -I../libsrc
> -DgFortran -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
> -Werror=format-security -Wall -c curlfunctions.c -fPIC -DPIC -o
> .libs/liboc_la-curlfunctions.o
> curlfunctions.c: In function 'ocset_curl_flags':
> curlfunctions.c:30:66: warning: character constant too long for its type
> [enabled by default]
> cstat = curl_easy_setopt(curl, CURLOPT_ENCODING, 'deflate, gzip');
> ^
> literals with 13 characters are not supported
> Makefile:388: recipe for target 'liboc_la-curlfunctions.lo' failed
> make[3]: *** [liboc_la-curlfunctions.lo] Error 1
> make[3]: Leaving directory
> '/srv/jenkins-slave/workspace/sid-goto-cc-netcdf/netcdf-4.1.3/oc'
> Makefile:551: recipe for target 'all-recursive' failed
> make[2]: *** [all-recursive] Error 1
>
> Likely this should be double quotes here in order to set the accepted encoding
> to the desired value (the current code will set it to a value other than the
> desired one!) - and curl's documentation also suggests that the option has
> actually be renamed to CURLOPT_ACCEPT_ENCODING.
Double quotes are now used in oc2/occurlfunctions.c:
146 case CURLOPT_ENCODING:
147 #ifdef CURLOPT_ENCODING
148 if(state->curlflags.compress) {
149 CHECK(state, CURLOPT_ENCODING,"deflate, gzip");
150 }
151 #endif
It looks like this fixed the issue.
Can you confirm that this is now fixed, or can you still reproduce the
issue with netcdf (1:4.4.0~rc3-1)?
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
Bug#749511: netcdf: wrong quote characters - build warning with goto-cc
Hi, We are just working on uploading a new version of netcdf (1:4.3.3), and I can see in ~rc3 that the curl functions have been re-written and moved to oc2/occurlfunctions.c, so there is a chance that this has been fixed. I just need to workout how to substitute goto-cc for gcc in the Debian build process to confirm it. Regards, Ross signature.asc Description: OpenPGP digital signature
Bug#749511: netcdf: wrong quote characters
Package: netcdf Version: 1:4.1.3-7 Usertags: goto-cc During a rebuild of all packages in a clean sid chroot (and cowbuilder+pbuilder) the build failed with the following error. Please note that we use our research compiler tool-chain (using tools from the cbmc package), which permits extended reporting on type inconsistencies at link time. [...] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I../fortran -I.. -I../libsrc -DgFortran -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -c curlfunctions.c -fPIC -DPIC -o .libs/liboc_la-curlfunctions.o curlfunctions.c: In function 'ocset_curl_flags': curlfunctions.c:30:66: warning: character constant too long for its type [enabled by default] cstat = curl_easy_setopt(curl, CURLOPT_ENCODING, 'deflate, gzip'); ^ literals with 13 characters are not supported Makefile:388: recipe for target 'liboc_la-curlfunctions.lo' failed make[3]: *** [liboc_la-curlfunctions.lo] Error 1 make[3]: Leaving directory '/srv/jenkins-slave/workspace/sid-goto-cc-netcdf/netcdf-4.1.3/oc' Makefile:551: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 Likely this should be double quotes here in order to set the accepted encoding to the desired value (the current code will set it to a value other than the desired one!) - and curl's documentation also suggests that the option has actually be renamed to CURLOPT_ACCEPT_ENCODING. Best, Michael pgp21DKF8UnV_.pgp Description: PGP signature
