diff options
Diffstat (limited to 'app-accessibility/flite/files')
| -rw-r--r-- | app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch | 95 | ||||
| -rw-r--r-- | app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch (renamed from app-accessibility/flite/files/flite-1.4-tempfile.patch) | 31 | ||||
| -rw-r--r-- | app-accessibility/flite/files/flite-2.1-prototype.patch | 13 |
3 files changed, 128 insertions, 11 deletions
diff --git a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch new file mode 100644 index 000000000000..4b377e80c331 --- /dev/null +++ b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch @@ -0,0 +1,95 @@ +From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001 +From: Paul Gevers <elbrus@debian.org> +Date: Tue, 2 Jan 2018 19:58:18 +0100 +Subject: [PATCH] Improve internal linking + +Building packages in Debian uses a tool to link libraries together at the +package level. It emits warnings when unknonw symbols are found. E.g: + +dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries +--- + config/common_make_rules | 2 +- + main/Makefile | 16 ++++++++++++++-- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/config/common_make_rules b/config/common_make_rules +index 7a03785..34434fd 100644 +--- a/config/common_make_rules ++++ b/config/common_make_rules +@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a + @ rm -rf shared_os && mkdir shared_os + @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} + @ (cd shared_os && ar x ../$<) +- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) ++ @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)) + @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) + @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) + @ rm -rf shared_os +diff --git a/main/Makefile b/main/Makefile +index ff422e0..47b6344 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -54,7 +54,8 @@ ALL = shared_libs \ + VOICES=$(VOXES) + VOICELIBS=$(VOICES:%=flite_%) + +-flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite ++flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) ++flite_LIBS = flite $(flite_MODS) + + flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) + flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) +@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules + # so make clean can remove them + SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a) + SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) ++SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so) ++SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so ++SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lex.so ++SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so + VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ + $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) + +@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \ + flite_voice_list.c + + ifdef SHFLAGS +-flite_LIBS_flags += -Wl,-rpath $(LIBDIR) ++$(SHAREDMODS): $(LIBDIR)/libflite.so ++$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite ++$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so ++$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish ++$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so ++$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex ++$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so ++$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang + shared_libs: $(SHAREDLIBS) + else + shared_libs: nothing +-- +2.24.1 + +From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001 +From: Alan W Black <awb@cs.cmu.edu> +Date: Sun, 4 Mar 2018 08:55:40 -0500 +Subject: [PATCH] get libs in the right order + +--- + main/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/Makefile b/main/Makefile +index 47b6344..1da18a8 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -55,7 +55,7 @@ VOICES=$(VOXES) + VOICELIBS=$(VOICES:%=flite_%) + + flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) +-flite_LIBS = flite $(flite_MODS) ++flite_LIBS = $(flite_MODS) flite + + flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) + flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) +-- +2.24.1 diff --git a/app-accessibility/flite/files/flite-1.4-tempfile.patch b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch index 09b54f64ea2e..5ddaecd65903 100644 --- a/app-accessibility/flite/files/flite-1.4-tempfile.patch +++ b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch @@ -1,19 +1,28 @@ -From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001 -From: Rui Matos <tiagomatos@gmail.com> -Date: Mon, 6 Jan 2014 13:45:00 +0000 -Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds +From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001 +From: Paul Gevers <elbrus@debian.org> +Date: Tue, 2 Jan 2018 06:20:03 +0100 +Subject: [PATCH] Only write audio data to a temporariy file in debug builds + +This isn't useful in regular builds and is actually a security concern, +although it seems (see discussion in [Bug-Debian]) that this is most likely +only reached during testsuite calls. -This isn't useful in regular builds and is actually a security -concern. +CVE-2014-0027 + +Original patch from Rui Matos <tiagomatos@gmail.com> +Date: Mon, 6 Jan 2014 13:45:00 +0000 +Bug-Debian: http://bugs.debian.org/734746 +Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678 +Source: https://bugzilla.redhat.com/attachment.cgi?id=846118 --- src/audio/auserver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/audio/auserver.c b/src/audio/auserver.c -index 29716d3..3e838d0 100644 +index 800c27d..cfcad7d 100644 --- a/src/audio/auserver.c +++ b/src/audio/auserver.c -@@ -58,9 +58,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream) +@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream) int q,i,n,r; unsigned char bytes[CST_AUDIOBUFFSIZE]; short shorts[CST_AUDIOBUFFSIZE]; @@ -25,7 +34,7 @@ index 29716d3..3e838d0 100644 if ((audio_device = audio_open(header->sample_rate,1, (header->encoding == CST_SND_SHORT) ? -@@ -107,7 +109,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) +@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) for (q=r; q > 0; q-=n) { n = audio_write(audio_device,shorts,q); @@ -35,7 +44,7 @@ index 29716d3..3e838d0 100644 if (n <= 0) { audio_close(audio_device); -@@ -116,7 +120,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) +@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) } } audio_close(audio_device); @@ -46,5 +55,5 @@ index 29716d3..3e838d0 100644 return CST_OK_FORMAT; -- -1.8.3.1 +2.24.1 diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch new file mode 100644 index 000000000000..2fe301774d0c --- /dev/null +++ b/app-accessibility/flite/files/flite-2.1-prototype.patch @@ -0,0 +1,13 @@ +diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c +index e0ae73f..f48ffe6 100644 +--- a/lang/cmu_indic_lex/cmu_indic_lex.c ++++ b/lang/cmu_indic_lex/cmu_indic_lex.c +@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char) + return cmu_indic_offset_char[c].type; + } + ++int indic_digit_to_offset(const char *ind_digit); ++ + static int indic_text_splitable(const char *s,int i,int len1) + { + /* Returns true only if this and next chars are not both digits */ |