SHA256
1
0
forked from pool/patchutils
OBS User unknown 2007-03-18 05:52:38 +00:00 committed by Git OBS Bridge
parent 1a094d551a
commit a5fbf2be72
3 changed files with 39 additions and 14 deletions

16
overrun.diff Normal file
View File

@ -0,0 +1,16 @@
Author: Dirk Mueller <dmueller@suse.de>
Subject: forgets to copy trailing NULL, so execve() fails
--- src/rediff.c
+++ src/rediff.c
@@ -1042,8 +1042,8 @@ int main (int argc, char *argv[])
char *p = xmalloc (strlen (argv[0]) +
strlen ("recountdiff") + 1);
char *f;
- char **const new_argv = xmalloc (sizeof (char *) * argc);
- memcpy (new_argv, argv, sizeof (char *) * argc);
+ char **const new_argv = xmalloc (sizeof (char *) * (argc + 1));
+ memcpy (new_argv, argv, sizeof (char *) * (argc + 1) );
new_argv[0] = p;
strcpy (p, argv[0]);
f = strrchr (p, '/');

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 16 18:05:26 CET 2007 - dmueller@suse.de
- fix rediff to actually work
-------------------------------------------------------------------
Wed Jan 25 21:39:17 CET 2006 - mls@suse.de

View File

@ -1,26 +1,27 @@
#
# spec file for package patchutils (Version 0.2.31)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://www.suse.de/feedback/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: patchutils
URL: http://cyberelk.net/tim/patchutils/
License: GPL
Group: Productivity/File utilities
Autoreqprov: on
Version: 0.2.31
Release: 1
Summary: A Collection of Tools for Manipulating Patch Files
Source: %name-%version.tar.bz2
Patch: %name-0.2.30-tailsyntax.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Name: patchutils
URL: http://cyberelk.net/tim/patchutils/
License: GNU General Public License (GPL)
Group: Productivity/File utilities
Autoreqprov: on
Version: 0.2.31
Release: 38
Summary: A Collection of Tools for Manipulating Patch Files
Source: %name-%version.tar.bz2
Patch: %name-0.2.30-tailsyntax.diff
Patch1: overrun.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Patchutils contains a collection of tools for manipulating patch files:
@ -43,6 +44,7 @@ Authors:
%prep
%setup -q
%patch -p1
%patch1
%build
autoreconf -fi
@ -60,7 +62,9 @@ make DESTDIR=%buildroot install
/usr/bin/*
%_mandir/man1/*.1.gz
%changelog -n patchutils
%changelog
* Fri Mar 16 2007 - dmueller@suse.de
- fix rediff to actually work
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Oct 05 2005 - mmj@suse.de