From 173bfcc9ac52bbb2b50ce85c582a3cb6b0d2f527 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Apr 16 2010 06:54:03 +0000
Subject: fix wrong usage of strcpy (closes #579610).


---

diff --git a/eblook-strcpy.patch b/eblook-strcpy.patch
new file mode 100644
index 0000000..fb1ac91
--- /dev/null
+++ b/eblook-strcpy.patch
@@ -0,0 +1,22 @@
+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~
diff --git a/eblook.spec b/eblook.spec
index 63603da..5558fd5 100644
--- a/eblook.spec
+++ b/eblook.spec
@@ -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 search program.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -60,6 +62,9 @@ fi
 
 
 %changelog
+* Fri Apr 16 2010 Daiki Ueno <dueno@redhat.com> - 1.6.1-7
+- Fix wrong usage of strcpy (closes #579610).
+
 * Mon Aug 31 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.6.1-6
 - F-12: Rebuild against new eb
 
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..9bf3c66
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+eblook-1_6_1-7_fc13:HEAD:eblook-1.6.1-7.fc13.src.rpm:1271400754