libxml.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. Index: configure
  2. --- configure.orig 2010-11-04 18:28:14.000000000 +0100
  3. +++ configure 2010-11-05 22:46:47.000000000 +0100
  4. @@ -4087,10 +4087,7 @@
  5. if $ac_preproc_ok; then :
  6. else
  7. - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  8. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  9. -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  10. -See \`config.log' for more details" "$LINENO" 5; }
  11. + :
  12. fi
  13. ac_ext=c
  14. Index: nanoftp.c
  15. --- nanoftp.c.orig 2010-11-04 11:36:31.000000000 +0100
  16. +++ nanoftp.c 2010-11-05 22:40:32.000000000 +0100
  17. @@ -1382,7 +1382,7 @@
  18. memset (&dataAddr, 0, sizeof(dataAddr));
  19. #ifdef SUPPORT_IP6
  20. - if ((ctxt->ftpAddr).ss_family == AF_INET6) {
  21. + if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6) {
  22. ctxt->dataFd = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
  23. ((struct sockaddr_in6 *)&dataAddr)->sin6_family = AF_INET6;
  24. dataAddrLen = sizeof(struct sockaddr_in6);
  25. @@ -1401,7 +1401,7 @@
  26. if (ctxt->passive) {
  27. #ifdef SUPPORT_IP6
  28. - if ((ctxt->ftpAddr).ss_family == AF_INET6)
  29. + if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6)
  30. snprintf (buf, sizeof(buf), "EPSV\r\n");
  31. else
  32. #endif
  33. @@ -1432,7 +1432,7 @@
  34. cur = &ctxt->controlBuf[ctxt->controlBufAnswer];
  35. while (((*cur < '0') || (*cur > '9')) && *cur != '\0') cur++;
  36. #ifdef SUPPORT_IP6
  37. - if ((ctxt->ftpAddr).ss_family == AF_INET6) {
  38. + if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6) {
  39. if (sscanf (cur, "%u", &temp[0]) != 1) {
  40. __xmlIOErr(XML_FROM_FTP, XML_FTP_EPSV_ANSWER,
  41. "Invalid answer to EPSV\n");
  42. @@ -1469,7 +1469,7 @@
  43. } else {
  44. getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen);
  45. #ifdef SUPPORT_IP6
  46. - if ((ctxt->ftpAddr).ss_family == AF_INET6)
  47. + if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6)
  48. ((struct sockaddr_in6 *)&dataAddr)->sin6_port = 0;
  49. else
  50. #endif
  51. @@ -1488,7 +1488,7 @@
  52. return INVALID_SOCKET;
  53. }
  54. #ifdef SUPPORT_IP6
  55. - if ((ctxt->ftpAddr).ss_family == AF_INET6) {
  56. + if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6) {
  57. char buf6[INET6_ADDRSTRLEN];
  58. inet_ntop (AF_INET6, &((struct sockaddr_in6 *)&dataAddr)->sin6_addr,
  59. buf6, INET6_ADDRSTRLEN);