# --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_grep.patch # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. A copy of the GNU General Public # License can be found at Documentation/COPYING. # # Many people helped and are helping developing ROCK Linux. Please # have a look at http://www.rocklinux.org/ and the Documentation/TEAM # file for details. # # --- ROCK-COPYRIGHT-NOTE-END --- --- ./src/grep.c.orig Wed May 1 13:26:08 2002 +++ ./src/grep.c Wed May 1 13:26:40 2002 @@ -377,10 +377,10 @@ } if (mmapsize - && (mmap ((caddr_t) readbuf, mmapsize, + && (mmap ((void *) readbuf, mmapsize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, bufdesc, bufoffset) - != (caddr_t) -1)) + != (void *) -1)) { /* Do not bother to use madvise with MADV_SEQUENTIAL or MADV_WILLNEED on the mmapped memory. One might think it --- ./src/dfa.c.orig Wed May 1 13:46:24 2002 +++ ./src/dfa.c Wed May 1 13:46:33 2002 @@ -18,6 +18,10 @@ /* Written June, 1988 by Mike Haertel Modified July, 1988 by Arthur David Olson to assist BMG speedups */ +/* Uh! What a hack .. */ +#define _LIBINTL_H +#define _(Str) (Str) + #ifdef HAVE_CONFIG_H #include #endif --- ./configure.orig Wed May 1 13:20:49 2002 +++ ./configure Wed May 1 13:39:50 2002 @@ -7,6 +7,18 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +# disable some headers +# +ac_cv_header_wchar_h=no +ac_cv_header_wctype_h=no +ac_cv_header_utmpx_h=no +ac_cv_header_sys_statfs_h=no +ac_cv_header_libintl_h=no + +# disable some functions +# +ac_cv_func_dcgettext=no + if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else --- grep-2.5.1/Makefile.in~ Tue Mar 26 17:09:34 2002 +++ grep-2.5.1/Makefile.in Thu Aug 21 00:57:55 2003 @@ -97,7 +97,7 @@ AUTOMAKE_OPTIONS = no-dependencies -SUBDIRS = intl po lib doc src tests m4 vms bootstrap +SUBDIRS = intl po lib src tests m4 vms bootstrap EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM