rpms/eblook/devel eblook-strcpy.patch, NONE, 1.1 import.log, NONE, 1.1 eblook.spec, 1.6, 1.7
Daiki Ueno
ueno at fedoraproject.org
Fri Apr 16 06:54:03 UTC 2010
Author: ueno
Update of /cvs/pkgs/rpms/eblook/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12078/devel
Modified Files:
eblook.spec
Added Files:
eblook-strcpy.patch import.log
Log Message:
fix wrong usage of strcpy (closes #579610).
eblook-strcpy.patch:
eblook.c | 4 ++--
eblook.c~ |only
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE eblook-strcpy.patch ---
diff -ru eblook-1.6.1.orig/eblook.c eblook-1.6.1/eblook.c
--- eblook-1.6.1.orig/eblook.c 2004-06-18 01:09:01.000000000 +0900
+++ eblook-1.6.1/eblook.c 2010-04-06 11:59:31.234479094 +0900
@@ -765,7 +765,7 @@
argv[num++] = p;
reserved = 1;
}
- strcpy (p, p + 1);
+ memmove (p, p + 1, strlen (p));
p--;
in_quote = !in_quote;
break;
@@ -779,7 +779,7 @@
break;
case '\\':
- strcpy (p, p + 1);
+ memmove (p, p + 1, strlen (p));
default:
if (!reserved) {
argv[num++] = p;
Only in eblook-1.6.1: eblook.c~
--- NEW FILE import.log ---
eblook-1_6_1-7_fc13:HEAD:eblook-1.6.1-7.fc13.src.rpm:1271400754
Index: eblook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eblook/devel/eblook.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eblook.spec 31 Aug 2009 13:23:17 -0000 1.6
+++ eblook.spec 16 Apr 2010 06:54:03 -0000 1.7
@@ -1,12 +1,13 @@
Name: eblook
Version: 1.6.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Command-line EB and EPWING dictionary search program
Group: Applications/Text
License: GPLv2+
URL: http://openlab.ring.gr.jp/edict/eblook/
Source0: http://openlab.ring.gr.jp/edict/eblook/dist/%{name}-%{version}.tar.gz
+Patch0: eblook-strcpy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: eb-devel
@@ -17,6 +18,7 @@ Command-line EB and EPWING dictionary se
%prep
%setup -q
+%patch0 -p1
%build
@@ -60,6 +62,9 @@ fi
%changelog
+* Fri Apr 16 2010 Daiki Ueno <dueno at redhat.com> - 1.6.1-7
+- Fix wrong usage of strcpy (closes #579610).
+
* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1-6
- F-12: Rebuild against new eb
More information about the scm-commits
mailing list