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.

84 lines
3.1 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 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./lib/hostip.c.orig Wed May 1 14:11:50 2002
  20. +++ ./lib/hostip.c Wed May 1 14:12:26 2002
  21. @@ -405,7 +405,7 @@
  22. in.s_addr = htonl(num);
  23. #if defined(HAVE_INET_NTOA_R)
  24. - inet_ntoa_r(in,addr,addr_len);
  25. + inet_ntoa_r(in,addr);
  26. #else
  27. strncpy(addr,inet_ntoa(in),addr_len);
  28. #endif
  29. --- ./lib/ftp.c.orig Wed May 1 14:12:49 2002
  30. +++ ./lib/ftp.c Wed May 1 14:13:06 2002
  31. @@ -939,7 +939,7 @@
  32. infof(conn->data, "Connecting to %s (%s) port %u\n",
  33. answer?answer->h_name:newhost,
  34. #if defined(HAVE_INET_NTOA_R)
  35. - inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
  36. + inet_ntoa_r(in, ntoa_buf),
  37. #else
  38. inet_ntoa(in),
  39. #endif
  40. @@ -1283,7 +1283,7 @@
  41. #ifdef HAVE_INET_NTOA_R
  42. /* ignore the return code from inet_ntoa_r() as it is int or
  43. char * depending on system */
  44. - inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf));
  45. + inet_ntoa_r(in, ntoa_buf);
  46. sscanf( ntoa_buf, "%hu.%hu.%hu.%hu",
  47. &ip[0], &ip[1], &ip[2], &ip[3]);
  48. #else
  49. --- ./lib/url.c.orig Wed May 1 14:13:24 2002
  50. +++ ./lib/url.c Wed May 1 14:13:33 2002
  51. @@ -1307,7 +1307,7 @@
  52. (void) memcpy(&in.s_addr, &conn->serv_addr.sin_addr, sizeof (in.s_addr));
  53. infof(data, "Connected to %s (%s) port %d\n", conn->hostaddr->h_name,
  54. #if defined(HAVE_INET_NTOA_R)
  55. - inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
  56. + inet_ntoa_r(in, ntoa_buf),
  57. #else
  58. inet_ntoa(in),
  59. #endif
  60. --- ./lib/if2ip.c.orig Wed May 1 14:13:47 2002
  61. +++ ./lib/if2ip.c Wed May 1 14:13:54 2002
  62. @@ -109,7 +109,7 @@
  63. struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_dstaddr;
  64. memcpy(&in, &(s->sin_addr.s_addr), sizeof(in));
  65. #if defined(HAVE_INET_NTOA_R)
  66. - ip = inet_ntoa_r(in,buf,buf_size);
  67. + ip = inet_ntoa_r(in,buf);
  68. #else
  69. ip = strncpy(buf,inet_ntoa(in),buf_size);
  70. ip[buf_size - 1] = 0;
  71. diff -Nur curl-7.10.7.orig/configure curl-7.10.7/configure
  72. --- curl-7.10.7.orig/configure Thu Aug 14 22:44:54 2003
  73. +++ curl-7.10.7/configure Fri Sep 5 10:56:52 2003
  74. @@ -6404,7 +6404,7 @@
  75. done
  76. # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  77. rm -f conftest.err conftest.$ac_ext
  78. -if $ac_preproc_ok; then
  79. +if true; then
  80. :
  81. else
  82. { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check