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.

156 lines
4.3 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_fileutils.patch-x
  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/getline.c.orig Wed May 1 12:11:46 2002
  23. +++ ./lib/getline.c Wed May 1 12:22:40 2002
  24. @@ -22,10 +22,8 @@
  25. # include <config.h>
  26. #endif
  27. -/* The `getdelim' function is only declared if the following symbol
  28. - is defined. */
  29. -#ifndef _GNU_SOURCE
  30. -# define _GNU_SOURCE 1
  31. +#ifdef _GNU_SOURCE
  32. +# undef _GNU_SOURCE
  33. #endif
  34. #include <stdio.h>
  35. --- ./lib/getline.h.orig Tue Oct 31 08:08:05 2000
  36. +++ ./lib/getline.h Wed May 1 12:22:40 2002
  37. @@ -17,6 +17,10 @@
  38. #ifndef GETLINE_H_
  39. # define GETLINE_H_ 1
  40. +#ifdef _GNU_SOURCE
  41. +# undef _GNU_SOURCE
  42. +#endif
  43. +
  44. # include <stdio.h>
  45. # ifndef PARAMS
  46. --- ./src/sys2.h.orig Wed May 1 12:27:35 2002
  47. +++ ./src/sys2.h Wed May 1 12:28:12 2002
  48. @@ -445,8 +445,8 @@
  49. CHAR_MIN - 1, as it may equal -1, the getopt end-of-options value. */
  50. enum
  51. {
  52. - GETOPT_HELP_CHAR = (CHAR_MIN - 2),
  53. - GETOPT_VERSION_CHAR = (CHAR_MIN - 3)
  54. + GETOPT_HELP_CHAR = (-2),
  55. + GETOPT_VERSION_CHAR = (-3)
  56. };
  57. #define GETOPT_HELP_OPTION_DECL \
  58. --- ./src/chown-core.c.orig Wed May 1 12:28:42 2002
  59. +++ ./src/chown-core.c Wed May 1 12:28:53 2002
  60. @@ -40,8 +40,6 @@
  61. struct group *getgrgid ();
  62. #endif
  63. -int lstat ();
  64. -
  65. void
  66. chopt_init (struct Chown_option *chopt)
  67. {
  68. --- ./src/copy.h.orig Wed May 1 12:29:13 2002
  69. +++ ./src/copy.h Wed May 1 12:29:18 2002
  70. @@ -131,7 +131,6 @@
  71. };
  72. int stat ();
  73. -int lstat ();
  74. /* Arrange to make lstat calls go through the wrapper function
  75. on systems with an lstat function that does not dereference symlinks
  76. --- ./src/du.c.orig Wed May 1 12:29:29 2002
  77. +++ ./src/du.c Wed May 1 12:29:32 2002
  78. @@ -108,7 +108,6 @@
  79. typedef struct String String;
  80. int stat ();
  81. -int lstat ();
  82. /* Name under which this program was invoked. */
  83. char *program_name;
  84. --- ./src/mv.c.orig Wed May 1 12:29:43 2002
  85. +++ ./src/mv.c Wed May 1 12:29:46 2002
  86. @@ -58,7 +58,6 @@
  87. int euidaccess ();
  88. int full_write ();
  89. int isdir ();
  90. -int lstat ();
  91. int yesno ();
  92. /* The name this program was run with. */
  93. --- ./src/shred.c.orig Wed May 1 12:30:24 2002
  94. +++ ./src/shred.c Wed May 1 12:30:35 2002
  95. @@ -889,7 +889,7 @@
  96. #else
  97. # if HAVE_CLOCK_GETTIME /* POSIX ns-resolution */
  98. struct timespec t;
  99. - clock_gettime (CLOCK_REALTIME, &t);
  100. + clock_gettime (0, &t);
  101. # else
  102. # if HAVE_GETTIMEOFDAY
  103. struct timeval t;
  104. --- ./configure.orig Wed May 1 12:19:36 2002
  105. +++ ./configure Wed May 1 12:24:49 2002
  106. @@ -1,4 +1,14 @@
  107. #! /bin/sh
  108. +
  109. +# disable some headers
  110. +#
  111. +ac_cv_header_wchar_h=no
  112. +ac_cv_header_wctype_h=no
  113. +ac_cv_header_utmpx_h=no
  114. +ac_cv_header_sys_statfs_h=no
  115. +ac_cv_header_sys_statvfs_h=no
  116. +ac_cv_header_stdbool_h=no
  117. +
  118. # Guess values for system-dependent variables and create Makefiles.
  119. # Generated by Autoconf 2.49e.
  120. #
  121. --- ./config.h.in.orig Sun Apr 22 12:19:08 2001
  122. +++ ./config.h.in Wed May 1 12:23:06 2002
  123. @@ -1050,10 +1050,6 @@
  124. /* Number of bits in a file offset, on hosts where this is settable. */
  125. #undef _FILE_OFFSET_BITS
  126. -#ifndef _GNU_SOURCE
  127. -# define _GNU_SOURCE
  128. -#endif
  129. -
  130. /* Define for large files, on AIX-style hosts. */
  131. #undef _LARGE_FILES
  132. --- ./src/rmdir.c.orig 2002-10-09 12:22:49.000000000 +0200
  133. +++ ./src/rmdir.c 2002-10-09 12:24:56.000000000 +0200
  134. @@ -87,7 +87,7 @@
  135. static int
  136. errno_rmdir_non_empty (int error_number)
  137. {
  138. - return (error_number == RMDIR_ERRNO_NOT_EMPTY);
  139. + return error_number == ENOTEMPTY;
  140. }
  141. /* Remove any empty parent directories of PATH.