Removed older version because of security issues. Closes bugs #386319 and #425854

(Portage version: 2.2.0_alpha138/cvs/Linux i686, signed Manifest commit with key 748B2C601F6F0683)

8 files changed, 10 insertions, 344 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 0c4d4592914a..ebefef509229 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.107 2012/12/04 04:50:43 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.108 2012/12/04 05:00:55 neurogeek Exp $
+
+  03 Dec 2012; Jesus Rivero <neurogeek@gentoo.org> -festival-1.96_beta.ebuild,
+  -files/festival-1.96_beta-gcc43.patch,
+  -files/festival-1.96_beta-hts-voices.patch,
+  -files/festival-1.96_beta-init-scm.patch, -files/festival.rc,
+  -files/server.scm, metadata.xml:
+  Removed older version because of security issues. Closes bugs #386319 and
+  #425854
 
 *festival-2.1-r1 (03 Dec 2012)
 
diff --git a/app-accessibility/festival/festival-1.96_beta.ebuild b/app-accessibility/festival/festival-1.96_beta.ebuild
deleted file mode 100644
index a4c922374dc9..000000000000
--- a/app-accessibility/festival/festival-1.96_beta.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild,v 1.18 2012/05/31 02:14:16 zmedico Exp $
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
-SITE="http://www.festvox.org/packed/festival/latest"
-MY_P=${PN}-1.96-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	mbrola? (
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa mbrola"
-
-SP_DEPEND="~app-accessibility/speech-tools-1.2.96_beta"
-
-DEPEND="${SP_DEPEND}
-	alsa? ( media-sound/alsa-utils )"
-RDEPEND="${SP_DEPEND}
-	mbrola? ( <=app-accessibility/mbrola-3.0.1h-r5 )"
-
-S=${WORKDIR}/festival
-
-pkg_setup() {
-	enewuser festival -1 -1 -1 audio
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# tell festival to use the speech-tools we have installed.
-	sed -i -e "s:\(EST=\).*:\1/usr/share/speech-tools:" "${S}"/config/config.in
-	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
-
-	# disable the multisyn modules
-	#sed -i -e "s:\(ALSO_INCLUDE.*=.*MultiSyn\):# \1:" "${S}"/config/config.in
-	sed -i -e 's/clunits hts_engine MultiSyn/clunits hts_engine/g' "${S}"/config/config.in
-
-	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
-
-	# Fix path for examples in festival.scm
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
-
-	# patch init.scm to look for siteinit.scm and sitevars.scm in /etc/festival
-	epatch "${FILESDIR}"/${P}-init-scm.patch
-
-	# Apply a patch for gcc4.3.
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	if use alsa; then
-		echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> ${S}/lib/siteinit.scm
-		echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> ${S}/lib/siteinit.scm
-	fi
-}
-
-src_compile() {
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin src/main/festival
-	dobin lib/etc/*Linux*/audsp
-	dolib.a src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-
-	# Need to fix saytime, etc. to look for festival in the correct spot
-	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
-		exnoext=${ex%%.sh}
-		chmod a+x "${exnoext}"
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins src/include/*.h
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins "${FILESDIR}"/server.scm
-	doins lib/site*
-
-	# Install the init script
-	newinitd "${FILESDIR}"/festival.rc festival
-
-	# Install the docs
-	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
-	doman "${S}"/doc/{festival.1,festival_client.1}
-
-	# create the directory where our log file will go.
-	diropts -m 0755 -o festival -g audio
-	keepdir /var/log/festival
-
-	use mbrola && mbrola_voices
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	elog
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# This assumes all mbrola voices are named after the voices defined
-	# in MBROLA, i.e. if MBROLA contains a voice fr1, then the Festival
-	# counterpart should be named fr1_mbrola.
-	for language in "${S}"/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/files/festival-1.96_beta-gcc43.patch b/app-accessibility/festival/files/festival-1.96_beta-gcc43.patch
deleted file mode 100644
index d4f01200dc63..000000000000
--- a/app-accessibility/festival/files/festival-1.96_beta-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur festival-orig/src/modules/Text/text_modes.cc festival/src/modules/Text/text_modes.cc
---- festival-orig/src/modules/Text/text_modes.cc	2004-09-30 07:04:18.000000000 -0600
-+++ festival/src/modules/Text/text_modes.cc	2008-01-07 22:32:44.000000000 -0600
-@@ -60,7 +60,7 @@
- {
- 
-     volatile EST_String tmpname = make_tmp_filename();
--    volatile EST_String inname = get_c_string(filename);
-+    volatile EST_String inname(get_c_string(filename));
-     volatile EST_String filter;
-     volatile EST_TokenStream ts;
-     volatile LISP func;
diff --git a/app-accessibility/festival/files/festival-1.96_beta-hts-voices.patch b/app-accessibility/festival/files/festival-1.96_beta-hts-voices.patch
deleted file mode 100644
index 9ed1ac38711d..000000000000
--- a/app-accessibility/festival/files/festival-1.96_beta-hts-voices.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur festival.orig/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_f0model.scm festival/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_f0model.scm
---- festival.orig/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_f0model.scm	2003-08-01 15:12:59.000000000 +0100
-+++ festival/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_f0model.scm	2009-01-28 21:34:30.000000000 +0000
-@@ -35,7 +35,7 @@
- ;;;
- 
- ;;; Load any necessary files here
--;(require 'f2bf0lr)
-+(require 'f2bf0lr)
- (require 'cmu_us_awb_arctic_f0clunits)
- 
- (set! cmu_us_awb_arctic_int_lr_params
-diff -Naur festival.orig/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_hts.scm festival/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_hts.scm
---- festival.orig/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_hts.scm	2004-06-07 08:50:56.000000000 +0100
-+++ festival/lib/voices/us/cmu_us_awb_arctic_hts/festvox/cmu_us_awb_arctic_hts.scm	2009-01-28 21:33:58.000000000 +0000
-@@ -115,12 +115,12 @@
-        (list "-md" (path-append hts_data_dir "duration.pdf"))
-        (list "-mm" (path-append hts_data_dir "mcep.pdf"))
-        (list "-mf" (path-append hts_data_dir "lf0.pdf"))
--       '("-a" " 0.420000")                 
--       '("-r" " 0.000000")                 
--       '("-fs" "1.000000")             
--       '("-fm" "0.000000")            
--       '("-u" " 0.500000")                 
--       '("-l" " 0.000000") 
-+       '("-a"  0.420000)                 
-+       '("-r"  0.000000)                 
-+       '("-fs" 1.000000)             
-+       '("-fm" 0.000000)            
-+       '("-u"  0.500000)                 
-+       '("-l"  0.000000) 
-        ))
- 
- ;; This function is called to setup a voice.  It will typically
-diff -Naur festival.orig/lib/voices/us/cmu_us_bdl_arctic_hts/festvox/cmu_us_bdl_arctic_hts.scm festival/lib/voices/us/cmu_us_bdl_arctic_hts/festvox/cmu_us_bdl_arctic_hts.scm
---- festival.orig/lib/voices/us/cmu_us_bdl_arctic_hts/festvox/cmu_us_bdl_arctic_hts.scm	2004-06-07 07:29:03.000000000 +0100
-+++ festival/lib/voices/us/cmu_us_bdl_arctic_hts/festvox/cmu_us_bdl_arctic_hts.scm	2009-01-28 21:33:58.000000000 +0000
-@@ -115,12 +115,12 @@
-        (list "-md" (path-append hts_data_dir "duration.pdf"))
-        (list "-mm" (path-append hts_data_dir "mcep.pdf"))
-        (list "-mf" (path-append hts_data_dir "lf0.pdf"))
--       '("-a" " 0.420000")                 
--       '("-r" " 0.000000")                 
--       '("-fs" "1.000000")             
--       '("-fm" "0.000000")            
--       '("-u" " 0.500000")                 
--       '("-l" " 0.000000") 
-+       '("-a"  0.420000)                 
-+       '("-r"  0.000000)                 
-+       '("-fs" 1.000000)             
-+       '("-fm" 0.000000)            
-+       '("-u"  0.500000)                 
-+       '("-l"  0.000000) 
-        ))
- 
- ;; This function is called to setup a voice.  It will typically
-diff -Naur festival.orig/lib/voices/us/cmu_us_jmk_arctic_hts/festvox/cmu_us_jmk_arctic_hts.scm festival/lib/voices/us/cmu_us_jmk_arctic_hts/festvox/cmu_us_jmk_arctic_hts.scm
---- festival.orig/lib/voices/us/cmu_us_jmk_arctic_hts/festvox/cmu_us_jmk_arctic_hts.scm	2004-06-07 06:59:22.000000000 +0100
-+++ festival/lib/voices/us/cmu_us_jmk_arctic_hts/festvox/cmu_us_jmk_arctic_hts.scm	2009-01-28 21:33:58.000000000 +0000
-@@ -115,12 +115,12 @@
-        (list "-md" (path-append hts_data_dir "duration.pdf"))
-        (list "-mm" (path-append hts_data_dir "mcep.pdf"))
-        (list "-mf" (path-append hts_data_dir "lf0.pdf"))
--       '("-a" " 0.420000")                 
--       '("-r" " 0.000000")                 
--       '("-fs" "1.000000")             
--       '("-fm" "0.000000")            
--       '("-u" " 0.500000")                 
--       '("-l" " 0.000000") 
-+       '("-a"  0.420000)                 
-+       '("-r"  0.000000)                 
-+       '("-fs" 1.000000)             
-+       '("-fm" 0.000000)            
-+       '("-u"  0.500000)                 
-+       '("-l"  0.000000) 
-        ))
- 
- ;; This function is called to setup a voice.  It will typically
-diff -Naur festival.orig/lib/voices/us/cmu_us_slt_arctic_hts/festvox/cmu_us_slt_arctic_hts.scm festival/lib/voices/us/cmu_us_slt_arctic_hts/festvox/cmu_us_slt_arctic_hts.scm
---- festival.orig/lib/voices/us/cmu_us_slt_arctic_hts/festvox/cmu_us_slt_arctic_hts.scm	2004-06-07 04:54:46.000000000 +0100
-+++ festival/lib/voices/us/cmu_us_slt_arctic_hts/festvox/cmu_us_slt_arctic_hts.scm	2009-01-28 21:33:58.000000000 +0000
-@@ -115,12 +115,12 @@
-        (list "-md" (path-append hts_data_dir "duration.pdf"))
-        (list "-mm" (path-append hts_data_dir "mcep.pdf"))
-        (list "-mf" (path-append hts_data_dir "lf0.pdf"))
--       '("-a" " 0.420000")                 
--       '("-r" " 0.000000")                 
--       '("-fs" "1.000000")             
--       '("-fm" "0.000000")            
--       '("-u" " 0.500000")                 
--       '("-l" " 0.000000") 
-+       '("-a"  0.420000)                 
-+       '("-r"  0.000000)                 
-+       '("-fs" 1.000000)             
-+       '("-fm" 0.000000)            
-+       '("-u"  0.500000)                 
-+       '("-l"  0.000000) 
-        ))
- 
- ;; This function is called to setup a voice.  It will typically
diff --git a/app-accessibility/festival/files/festival-1.96_beta-init-scm.patch b/app-accessibility/festival/files/festival-1.96_beta-init-scm.patch
deleted file mode 100644
index efe575b0c2b7..000000000000
--- a/app-accessibility/festival/files/festival-1.96_beta-init-scm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- festival/lib/init.scm	2006-09-15 01:34:32.000000000 -0500
-+++ festival/lib/init.scm	2006-09-15 01:50:30.000000000 -0500
-@@ -52,8 +52,8 @@
- 
- ;;;  A chance to set various variables to a local setting e.g.
- ;;;  lexdir, voices_dir audio etc etc.
--(if (probe_file (path-append libdir "sitevars.scm"))
--    (load (path-append libdir "sitevars.scm")))
-+(if (probe_file "/etc/festival/sitevars.scm")
-+    (load "/etc/festival/sitevars.scm"))
- 
- ;;; CSTR siod extensions
- (require 'cstr)
-@@ -133,8 +133,8 @@
- ;;;
- ;;;  Local site initialization, if the file exists load it
- ;;;
--(if (probe_file (path-append libdir "siteinit.scm"))
--    (load (path-append libdir "siteinit.scm")))
-+(if (probe_file "/etc/festival/siteinit.scm")
-+    (load "/etc/festival/siteinit.scm"))
- 
- ;;;  User initialization, if a user has a personal customization
- ;;;  file loaded it
diff --git a/app-accessibility/festival/files/festival.rc b/app-accessibility/festival/files/festival.rc
deleted file mode 100644
index dbfe77810de3..000000000000
--- a/app-accessibility/festival/files/festival.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/files/festival.rc,v 1.5 2009/11/01 18:52:39 eva Exp $
-
-depend() {
-	need net
-	use alsasound esound
-}
-
-start() {
-	ebegin "Starting festival"
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/festival.pid \
-		--chuid festival --exec /usr/bin/festival -- --server -b /etc/festival/server.scm
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping festival"
-	start-stop-daemon --stop --quiet --pidfile /var/run/festival.pid
-	eend $?
-}
diff --git a/app-accessibility/festival/files/server.scm b/app-accessibility/festival/files/server.scm
deleted file mode 100644
index 7af03fa4da31..000000000000
--- a/app-accessibility/festival/files/server.scm
+++ /dev/null
@@ -1,20 +0,0 @@
-; Maximum number of clients on the server
-(set! server_max_clients 10)
-
-; Server port
-(set! server_port 1314)
-
-; Log file location
-(set! server_log_file "/var/log/festival/festival.log")
-
-; Set the server password
-(set! server_passwd nil)
-
-; Server access list (hosts)
-; (set! server_access_list '("[^.]+" "127.0.0.1" "localhost.*" "192.168.*"))
-(set! server_access_list '("[^.]+" "127.0.0.1" "localhost" ))
-
-
-; Server deny list (hosts)
-(set! server_deny_list nil)
-
diff --git a/app-accessibility/festival/metadata.xml b/app-accessibility/festival/metadata.xml
index ba6c525ebb95..0c64cf5a25f9 100644
--- a/app-accessibility/festival/metadata.xml
+++ b/app-accessibility/festival/metadata.xml
@@ -3,10 +3,8 @@
 <pkgmetadata>
 <maintainer>
 	<email>neurogeek@gentoo.org</email>
+	<name>Jesus Rivero</name>
 </maintainer>
 <herd>accessibility</herd>
 <herd>sound</herd>
-<use>
-	<flag name='mbrola'>Adds support for mbrola voices</flag>
-</use>
 </pkgmetadata>