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.

82 lines
2.6 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_grep.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. --- ./src/grep.c.orig Wed May 1 13:26:08 2002
  23. +++ ./src/grep.c Wed May 1 13:26:40 2002
  24. @@ -377,10 +377,10 @@
  25. }
  26. if (mmapsize
  27. - && (mmap ((caddr_t) readbuf, mmapsize,
  28. + && (mmap ((void *) readbuf, mmapsize,
  29. PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED,
  30. bufdesc, bufoffset)
  31. - != (caddr_t) -1))
  32. + != (void *) -1))
  33. {
  34. /* Do not bother to use madvise with MADV_SEQUENTIAL or
  35. MADV_WILLNEED on the mmapped memory. One might think it
  36. --- ./src/dfa.c.orig Wed May 1 13:46:24 2002
  37. +++ ./src/dfa.c Wed May 1 13:46:33 2002
  38. @@ -18,6 +18,10 @@
  39. /* Written June, 1988 by Mike Haertel
  40. Modified July, 1988 by Arthur David Olson to assist BMG speedups */
  41. +/* Uh! What a hack .. */
  42. +#define _LIBINTL_H
  43. +#define _(Str) (Str)
  44. +
  45. #ifdef HAVE_CONFIG_H
  46. #include <config.h>
  47. #endif
  48. --- ./configure.orig Wed May 1 13:20:49 2002
  49. +++ ./configure Wed May 1 13:39:50 2002
  50. @@ -7,6 +7,18 @@
  51. # This configure script is free software; the Free Software Foundation
  52. # gives unlimited permission to copy, distribute and modify it.
  53. +# disable some headers
  54. +#
  55. +ac_cv_header_wchar_h=no
  56. +ac_cv_header_wctype_h=no
  57. +ac_cv_header_utmpx_h=no
  58. +ac_cv_header_sys_statfs_h=no
  59. +ac_cv_header_libintl_h=no
  60. +
  61. +# disable some functions
  62. +#
  63. +ac_cv_func_dcgettext=no
  64. +
  65. if expr a : '\(a\)' >/dev/null 2>&1; then
  66. as_expr=expr
  67. else
  68. --- grep-2.5.1/Makefile.in~ Tue Mar 26 17:09:34 2002
  69. +++ grep-2.5.1/Makefile.in Thu Aug 21 00:57:55 2003
  70. @@ -97,7 +97,7 @@
  71. AUTOMAKE_OPTIONS = no-dependencies
  72. -SUBDIRS = intl po lib doc src tests m4 vms bootstrap
  73. +SUBDIRS = intl po lib src tests m4 vms bootstrap
  74. EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM