rpms/patch/devel patch-allow-spaces.patch, NONE, 1.1 patch.spec, 1.30, 1.31
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Feb 8 13:40:14 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/patch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21663
Modified Files:
patch.spec
Added Files:
patch-allow-spaces.patch
Log Message:
* Fri Feb 8 2008 Tim Waugh <twaugh at redhat.com> 2.5.4-32
- Applied patch from 2.5.9 to allow spaces in filenames (bug #431887).
patch-allow-spaces.patch:
--- NEW FILE patch-allow-spaces.patch ---
--- patch-2.5.4/util.c 1999-08-30 07:20:08.000000000 +0100
+++ patch-2.5.9/util.c 2003-05-20 15:04:53.000000000 +0100
@@ -939,7 +939,13 @@ fetchname (char *at, int strip_leading,
}
else if (ISSPACE ((unsigned char) *t))
{
+ /* Allow file names with internal spaces,
+ but only if a tab separates the file name from the date. */
char const *u = t;
+ while (*u != '\t' && ISSPACE ((unsigned char) u[1]))
+ u++;
+ if (*u != '\t' && strchr (u + 1, '\t'))
+ continue;
if (set_time | set_utc)
stamp = str2time (&u, initial_time,
Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- patch.spec 3 Dec 2007 12:03:11 -0000 1.30
+++ patch.spec 8 Feb 2008 13:39:40 -0000 1.31
@@ -1,7 +1,7 @@
Summary: The GNU patch command, for modifying/upgrading files
Name: patch
Version: 2.5.4
-Release: 31%{?dist}
+Release: 32%{?dist}
License: GPLv2+
URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools
@@ -13,7 +13,8 @@
Patch5: patch-2.5.4-program_name.patch
Patch6: patch-stripcr.patch
Patch7: patch-parse.patch
-Patch8: patch-selinux.patch
+Patch8: patch-allow-spaces.patch
+Patch9: patch-selinux.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -35,7 +36,8 @@
%patch5 -p1 -b .program_name
%patch6 -p1 -b .stripcr
%patch7 -p1 -b .parse
-#%patch8 -p1 -b .selinux
+%patch8 -p1 -b .allow-spaces
+#%patch9 -p1 -b .selinux
%build
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -62,6 +64,9 @@
%{_mandir}/*/*
%changelog
+* Fri Feb 8 2008 Tim Waugh <twaugh at redhat.com> 2.5.4-32
+- Applied patch from 2.5.9 to allow spaces in filenames (bug #431887).
+
* Mon Dec 3 2007 Tim Waugh <twaugh at redhat.com> 2.5.4-31
- Convert spec file to UTF-8 (bug #226233).
- Use _bindir macro in %%files (bug #226233).
More information about the fedora-extras-commits
mailing list