mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

87 lines
3.2 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_curl.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. --- ./lib/hostip.c.orig Wed May 1 14:11:50 2002
  23. +++ ./lib/hostip.c Wed May 1 14:12:26 2002
  24. @@ -405,7 +405,7 @@
  25. in.s_addr = htonl(num);
  26. #if defined(HAVE_INET_NTOA_R)
  27. - inet_ntoa_r(in,addr,addr_len);
  28. + inet_ntoa_r(in,addr);
  29. #else
  30. strncpy(addr,inet_ntoa(in),addr_len);
  31. #endif
  32. --- ./lib/ftp.c.orig Wed May 1 14:12:49 2002
  33. +++ ./lib/ftp.c Wed May 1 14:13:06 2002
  34. @@ -939,7 +939,7 @@
  35. infof(conn->data, "Connecting to %s (%s) port %u\n",
  36. answer?answer->h_name:newhost,
  37. #if defined(HAVE_INET_NTOA_R)
  38. - inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
  39. + inet_ntoa_r(in, ntoa_buf),
  40. #else
  41. inet_ntoa(in),
  42. #endif
  43. @@ -1283,7 +1283,7 @@
  44. #ifdef HAVE_INET_NTOA_R
  45. /* ignore the return code from inet_ntoa_r() as it is int or
  46. char * depending on system */
  47. - inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf));
  48. + inet_ntoa_r(in, ntoa_buf);
  49. sscanf( ntoa_buf, "%hu.%hu.%hu.%hu",
  50. &ip[0], &ip[1], &ip[2], &ip[3]);
  51. #else
  52. --- ./lib/url.c.orig Wed May 1 14:13:24 2002
  53. +++ ./lib/url.c Wed May 1 14:13:33 2002
  54. @@ -1307,7 +1307,7 @@
  55. (void) memcpy(&in.s_addr, &conn->serv_addr.sin_addr, sizeof (in.s_addr));
  56. infof(data, "Connected to %s (%s) port %d\n", conn->hostaddr->h_name,
  57. #if defined(HAVE_INET_NTOA_R)
  58. - inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
  59. + inet_ntoa_r(in, ntoa_buf),
  60. #else
  61. inet_ntoa(in),
  62. #endif
  63. --- ./lib/if2ip.c.orig Wed May 1 14:13:47 2002
  64. +++ ./lib/if2ip.c Wed May 1 14:13:54 2002
  65. @@ -109,7 +109,7 @@
  66. struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_dstaddr;
  67. memcpy(&in, &(s->sin_addr.s_addr), sizeof(in));
  68. #if defined(HAVE_INET_NTOA_R)
  69. - ip = inet_ntoa_r(in,buf,buf_size);
  70. + ip = inet_ntoa_r(in,buf);
  71. #else
  72. ip = strncpy(buf,inet_ntoa(in),buf_size);
  73. ip[buf_size - 1] = 0;
  74. diff -Nur curl-7.10.7.orig/configure curl-7.10.7/configure
  75. --- curl-7.10.7.orig/configure Thu Aug 14 22:44:54 2003
  76. +++ curl-7.10.7/configure Fri Sep 5 10:56:52 2003
  77. @@ -6404,7 +6404,7 @@
  78. done
  79. # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  80. rm -f conftest.err conftest.$ac_ext
  81. -if $ac_preproc_ok; then
  82. +if true; then
  83. :
  84. else
  85. { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check