rpms/patch
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Applied patch from Ulrich Drepper to fix string overread (bug #118536).

Browse Source
This commit is contained in:
Tim Waugh 2005-09-07 08:06:48 +00:00
parent 04c1afe88e
commit 156d8816e0
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patch-parse.patch Normal file
View File

@ -0,0 +1,12 @@
--- patch-2.5.4/partime.c.parse 1998-03-15 15:48:53.000000000 +0000
+++ patch-2.5.4/partime.c 2005-09-07 08:04:41.000000000 +0000
@@ -792,7 +792,8 @@
if (negative)
n = -n;
while (!ISALNUM ((unsigned char) *s))
- s++;
+ if (*s++ == '\0')
+ return 0;
i = lookup (s, relative_units);
if (!TM_DEFINED (i))
return 0;

7
patch.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU patch command, for modifying/upgrading files. Summary: The GNU patch command, for modifying/upgrading files.
Name: patch Name: patch
Version: 2.5.4 Version: 2.5.4
Release: 26 Release: 27
License: GPL License: GPL
URL: http://www.gnu.org/software/patch/patch.html URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools Group: Development/Tools
@ -13,6 +13,7 @@ Patch4: patch-2.5.4-ifdef.patch
Patch5: patch-2.5.4-program_name.patch Patch5: patch-2.5.4-program_name.patch
Patch6: patch-stripcr.patch Patch6: patch-stripcr.patch
Patch7: patch-selinux.patch Patch7: patch-selinux.patch
Patch8: patch-parse.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
%description %description
@ -34,6 +35,7 @@ applications.
%patch5 -p1 -b .program_name %patch5 -p1 -b .program_name
%patch6 -p1 -b .stripcr %patch6 -p1 -b .stripcr
%patch7 -p1 -b .selinux %patch7 -p1 -b .selinux
%patch8 -p1 -b .parse
%build %build
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Wed Sep 7 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-27
- Applied patch from Ulrich Drepper to fix string overread (bug #118536).
* Tue Sep 6 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-26 * Tue Sep 6 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-26
- Preserve SELinux file contexts (bug #165799). - Preserve SELinux file contexts (bug #165799).