rpms/findutils/devel findutils-4.2.33-arg-max.patch, NONE, 1.1 findutils.spec, 1.56, 1.57

Vitezslav Crhonek (vcrhonek) fedora-extras-commits at redhat.com
Fri Mar 28 13:31:23 UTC 2008


Author: vcrhonek

Update of /cvs/extras/rpms/findutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14165

Modified Files:
	findutils.spec 
Added Files:
	findutils-4.2.33-arg-max.patch 
Log Message:
Fix xargs ARG_MAX assert

findutils-4.2.33-arg-max.patch:

--- NEW FILE findutils-4.2.33-arg-max.patch ---
diff -up findutils-4.2.33/xargs/xargs.c_old findutils-4.2.33/xargs/xargs.c
--- findutils-4.2.33/xargs/xargs.c_old	2008-03-28 14:04:57.000000000 +0100
+++ findutils-4.2.33/xargs/xargs.c	2008-03-28 14:06:54.000000000 +0100
@@ -440,7 +440,7 @@ main (int argc, char **argv)
        * specifies that it shall be at least LINE_MAX.
        */
 #if defined(ARG_MAX)
-      assert(bc_ctl.arg_max <= (ARG_MAX-2048));
+      assert(bc_ctl.arg_max <= bc_ctl.posix_arg_size_max);
 #endif
 #ifdef LINE_MAX
       assert(bc_ctl.arg_max >= LINE_MAX);


Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- findutils.spec	15 Feb 2008 10:15:32 -0000	1.56
+++ findutils.spec	28 Mar 2008 13:30:45 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.2.33
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv3+
 Group: Applications/File
@@ -10,7 +10,7 @@
 #Source1: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz.sig
 Patch1: findutils-4.2.31-no-locate.patch
 Patch2: findutils-selinux.patch
-
+Patch3: findutils-4.2.33-arg-max.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +33,7 @@
 %setup -q
 %patch1 -p1 -b .no-locate
 %patch2 -p1 -b .selinux
+%patch3 -p1 -b .arg-max
 
 autoreconf
 
@@ -75,6 +76,10 @@
 %{_infodir}/find.info*
 
 %changelog
+* Fri Mar 28 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1:4.2.33-2
+- Fix xargs ARG_MAX assert
+  Resolves: #439168
+
 * Fri Feb 15 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1:4.2.33-1
 - Update to findutils-4.2.33
 - Fix License




More information about the fedora-extras-commits mailing list