From bd75b3dc7f5c02ba79b86aeaa67f9fcbed1b0b50 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:45:07 +0000 Subject: [PATCH] auto-import changelog data from findutils-4.1.7-25.src.rpm Sun Mar 14 2004 Tim Waugh 4.1.7-25 - Apply Jakub Jelinek's patch for xargs -E/-I/-L options. Thu Mar 11 2004 Tim Waugh 4.1.7-24 - Apply selinux patch last so that it can be turned off (bug #118025). Tue Mar 09 2004 Tim Waugh - Jakub Jelinek's d_type patch improvement. Sun Mar 07 2004 Tim Waugh 4.1.7-23 - Run 'make check'. - Apply Ulrich Drepper's improvement on the d_type patch. Fri Mar 05 2004 Tim Waugh 4.1.7-22 - Apply Jakub Jelinek's d_type patch for improved efficiency with many common expressions. Fri Feb 13 2004 Elliot Lee - rebuilt --- findutils-selinux.patch | 4 ++-- findutils.spec | 32 +++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/findutils-selinux.patch b/findutils-selinux.patch index 62cbbc9..0401600 100644 --- a/findutils-selinux.patch +++ b/findutils-selinux.patch @@ -181,7 +181,7 @@ + return( false ); + + our_pred = insert_primary(pred_scontext); -+ our_pred->need_stat = false; ++ our_pred->need_stat = 0; +#ifdef DEBUG + our_pred->p_name = find_pred_name (pred_scontext); +#endif /*DEBUG*/ @@ -331,7 +331,7 @@ +++ findutils-4.1.7/find/util.c 2003-10-10 13:19:10.869534272 -0400 @@ -65,6 +65,9 @@ last_pred->no_default_print = false; - last_pred->need_stat = true; + last_pred->need_stat = PRED_NEED_STAT; last_pred->args.str = NULL; +#ifdef WITH_SELINUX + last_pred->args.scontext = NULL; diff --git a/findutils.spec b/findutils.spec index 660f603..39c2bda 100644 --- a/findutils.spec +++ b/findutils.spec @@ -4,7 +4,7 @@ Summary: The GNU versions of find utilities (find and xargs). Name: findutils Version: 4.1.7 -Release: 20 +Release: 25 Epoch: 1 License: GPL Group: Applications/File @@ -12,13 +12,16 @@ Source0: ftp://alpha.gnu.org/gnu/%{name}-%{version}.tar.gz Patch0: findutils-53857.patch Patch1: findutils-4.1.7-usage.patch Patch2: findutils-4.1.7-i.patch +Patch3: findutils-4.1.7-d_type.patch +Patch4: findutils-4.1.7-xargs-EIL.patch %if %{WITH_SELINUX} BuildRequires: libselinux -Patch3: findutils-selinux.patch +Patch5: findutils-selinux.patch %endif Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libtool +BuildRequires: dejagnu %description The findutils package contains programs which will help you locate @@ -36,9 +39,11 @@ useful for finding things on your system. %patch0 -p1 -b .53857 %patch1 -p1 -b .usage %patch2 -p1 -b .i +%patch3 -p1 -b .d_type +%patch4 -p1 -b .xargs-EIL %if %{WITH_SELINUX} #SELinux -%patch3 -p1 -b .selinux +%patch5 -p1 -b .selinux %endif rm -f config.guess config.sub @@ -50,6 +55,7 @@ libtoolize --force %undefine optflags make +make check %install rm -rf %{buildroot} @@ -93,6 +99,26 @@ rm -rf %{buildroot} %{_infodir}/find.info* %changelog +* Sun Mar 14 2004 Tim Waugh 4.1.7-25 +- Apply Jakub Jelinek's patch for xargs -E/-I/-L options. + +* Thu Mar 11 2004 Tim Waugh 4.1.7-24 +- Apply selinux patch last so that it can be turned off (bug #118025). + +* Tue Mar 9 2004 Tim Waugh +- Jakub Jelinek's d_type patch improvement. + +* Sun Mar 7 2004 Tim Waugh 4.1.7-23 +- Run 'make check'. +- Apply Ulrich Drepper's improvement on the d_type patch. + +* Fri Mar 5 2004 Tim Waugh 4.1.7-22 +- Apply Jakub Jelinek's d_type patch for improved efficiency with + many common expressions. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + * Tue Jan 27 2004 Dan Walsh 4.1.7-20 - fix call to is_selinux_enabled