pool/espeakedit
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 513682 from home:MargueriteSu:branches:Education

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/513682
OBS-URL: https://build.opensuse.org/package/show/Education/espeakedit?expand=0&rev=7
This commit is contained in:
Marguerite Su
2017-08-01 10:39:56 +00:00
committed by Git OBS Bridge
parent 9859badc28
commit 858fdce49f
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
espeakedit-gcc7-destbufferoverflow.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: b/src/dictionary.cpp
===================================================================
--- a/src/dictionary.cpp
+++ b/src/dictionary.cpp
@@ -3599,7 +3599,7 @@ int Lookup(Translator *tr, const char *w
say_as = option_sayas;
option_sayas = 0; // don't speak replacement word as letter names
text[0] = 0;
- strncpy0(&text[1], word1, sizeof(text));
+ strncpy0(&text[1], word1, sizeof(text)-1);
found = TranslateWord(tr, &text[1], 0, NULL, NULL);
strcpy(ph_out, word_phonemes);
option_sayas = say_as;

9
espeakedit.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 1 10:13:06 UTC 2017 - i@marguerite.su
- FTBFS with GCC-7: espeakedit-gcc7-destbufferoverflow.patch
* in dictionary.cpp, it defines an array of 80 chars.
fill the 1st with zero and strncpy the following 79
chars with a max size of 80 chars. our fix re-defines
the max size to 79 chars.
-------------------------------------------------------------------
Thu Jun 30 11:12:38 UTC 2016 - jengelh@inai.de

5
espeakedit.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package espeakedit
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,8 @@ Patch1: espeakedit-1.48.03-next-line.patch
#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix narrowing conversion from int to char inside {}
Patch2: espeakedit-1.48.03-gcc6.patch
Patch3: espeakedit-wx3.diff
#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix destbufferoverflow bsp check at dictionary.cpp
Patch4: espeakedit-gcc7-destbufferoverflow.patch
BuildRequires: gcc-c++
BuildRequires: portaudio-devel
BuildRequires: pulseaudio-devel
@@ -48,6 +50,7 @@ eSpeakEdit provides a User Interface to edit the eSpeak voices.
%patch1 -p1
%patch2 -p1
%patch -P 3 -p1
%patch4 -p1
# Build against portaudio v19 (see ReadMe)
cp -f src/portaudio19.h src/portaudio.h