!30 [sync] PR-28: Add PIE flags

From: @openeuler-sync-bot 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge

CVE-2010-3996-festival-no-LD_LIBRARY_PATH-extension.patch

@@ -0,0 +1,83 @@
+From aad72cc9d7d9788daef801ad95d4ce5e873d2b76 Mon Sep 17 00:00:00 2001
+From: starlet-dx <15929766099@163.com>
+Date: Mon, 14 Mar 2022 15:01:27 +0800
+Subject: [PATCH 1/1] festival-no-LD_LIBRARY_PATH-extension
+
+---
+ src/scripts/shared_script    | 19 -------------------
+ src/scripts/shared_setup_prl |  8 --------
+ src/scripts/shared_setup_sh  | 18 ------------------
+ 3 files changed, 45 deletions(-)
+
+diff --git a/src/scripts/shared_script b/src/scripts/shared_script
+index 736034d..5c17b7e 100644
+--- a/src/scripts/shared_script
++++ b/src/scripts/shared_script
+@@ -1,24 +1,5 @@
+ #!/bin/sh
+ 
+-# Festival shared script
+-
+-extend() {
+-	var="$1"
+-	extra="$2"
+-	eval "val=\$$var"
+-	
+-	if [ -n "$val" ]
+-		then
+-		val="$extra:$val"
+-	else
+-		val="$extra"
+-	fi
+-	eval "$var='$val'"
+-	eval "export $var"
+-	}
+-
+-extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__"
+-
+ exec __MAIN__/__PROGRAM__ "$@"
+ 
+ exit 0
+diff --git a/src/scripts/shared_setup_prl b/src/scripts/shared_setup_prl
+index eba11ff..139597f 100644
+--- a/src/scripts/shared_setup_prl
++++ b/src/scripts/shared_setup_prl
+@@ -1,10 +1,2 @@
+ 
+-if (defined($ENV{LD_LIBRARY_PATH}))
+-	{
+-	$ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}";
+-	}
+-else
+-	{
+-	$ENV{LD_LIBRARY_PATH} = "__TOP__/lib";
+-	} 
+ 
+diff --git a/src/scripts/shared_setup_sh b/src/scripts/shared_setup_sh
+index ae45097..139597f 100644
+--- a/src/scripts/shared_setup_sh
++++ b/src/scripts/shared_setup_sh
+@@ -1,20 +1,2 @@
+ 
+-# festival shared setup 
+-
+-extend() {
+-	var="$1"
+-	extra="$2"
+-	eval "val=\$$var"
+-	
+-	if [ -n "$val" ]
+-		then
+-		val="$extra:$val"
+-	else
+-		val="$extra"
+-	fi
+-	eval "$var='$val'"
+-	eval "export $var"
+-	}
+-
+-extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__"
+ 
+-- 
+2.30.0
+

CVE-2010-3996-festival-safe-temp-file.patch

@@ -0,0 +1,27 @@
+Index: festival/src/scripts/festival_server.sh
+===================================================================
+--- festival.orig/src/scripts/festival_server.sh
++++ festival/src/scripts/festival_server.sh
+@@ -210,14 +210,19 @@ trap "handle_term" 0
+ 
+ if $show
+     then
+-    create_server_startup $port $server_log /tmp/$$ 3>/dev/null
++    tmpfile=`mktemp -q`
++    if test $? -ne 0; then
++        echo "Error while getting configuration."
++        exit 1
++    fi
++    create_server_startup $port $server_log "$tmpfile" 3>/dev/null
+     fl=false
+     while read l
+ 	do
+ 	if $fl ; then echo $l ; fi
+ 	if [ "$l" = ";---" ] ; then fl=true ; fi
+-    done </tmp/$$ 
+-    /bin/rm -f /tmp/$$
++    done < "$tmpfile"
++    /bin/rm -f "$tmpfile"
+     exit 0
+ fi
+ 

CVE-2010-3996-speech_tools-no-LD_LIBRARY_PATH-extension.patch

@@ -0,0 +1,83 @@
+From 940c9fa430199725a750f500b32d656c3a91e3cf Mon Sep 17 00:00:00 2001
+From: starlet-dx <15929766099@163.com>
+Date: Mon, 14 Mar 2022 15:18:45 +0800
+Subject: [PATCH 1/1] speech_tools-no-LD_LIBRARY_PATH-extension
+
+---
+ speech_tools/scripts/shared_script    | 19 -------------------
+ speech_tools/scripts/shared_setup_prl |  8 --------
+ speech_tools/scripts/shared_setup_sh  | 18 ------------------
+ 3 files changed, 45 deletions(-)
+
+diff --git a/speech_tools/scripts/shared_script b/speech_tools/scripts/shared_script
+index ca3e1b5..5c17b7e 100644
+--- a/speech_tools/scripts/shared_script
++++ b/speech_tools/scripts/shared_script
+@@ -1,24 +1,5 @@
+ #!/bin/sh
+ 
+-# EST shared script
+-
+-extend() {
+-	var="$1"
+-	extra="$2"
+-	eval "val=\$$var"
+-	
+-	if [ -n "$val" ]
+-		then
+-		val="$extra:$val"
+-	else
+-		val="$extra"
+-	fi
+-	eval "$var='$val'"
+-	eval "export $var"
+-	}
+-
+-extend LD_LIBRARY_PATH "__LIB__:__LDPATH__"
+-
+ exec __MAIN__/__PROGRAM__ "$@"
+ 
+ exit 0
+diff --git a/speech_tools/scripts/shared_setup_prl b/speech_tools/scripts/shared_setup_prl
+index eba11ff..139597f 100644
+--- a/speech_tools/scripts/shared_setup_prl
++++ b/speech_tools/scripts/shared_setup_prl
+@@ -1,10 +1,2 @@
+ 
+-if (defined($ENV{LD_LIBRARY_PATH}))
+-	{
+-	$ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}";
+-	}
+-else
+-	{
+-	$ENV{LD_LIBRARY_PATH} = "__TOP__/lib";
+-	} 
+ 
+diff --git a/speech_tools/scripts/shared_setup_sh b/speech_tools/scripts/shared_setup_sh
+index 64f0ba9..139597f 100644
+--- a/speech_tools/scripts/shared_setup_sh
++++ b/speech_tools/scripts/shared_setup_sh
+@@ -1,20 +1,2 @@
+ 
+-# EST shared setup 
+-
+-extend() {
+-	var="$1"
+-	extra="$2"
+-	eval "val=\$$var"
+-	
+-	if [ -n "$val" ]
+-		then
+-		val="$extra:$val"
+-	else
+-		val="$extra"
+-	fi
+-	eval "$var='$val'"
+-	eval "export $var"
+-	}
+-
+-extend LD_LIBRARY_PATH "__TOP__/lib:__LDPATH__"
+ 
+-- 
+2.30.0
+

Fix-festival-gcc10.patch

@@ -0,0 +1,13 @@
+diff --git a/speech_tools/siod/editline.c b/speech_tools/siod/editline.c
+index df043be..394d767 100644
+--- a/speech_tools/siod/editline.c
++++ b/speech_tools/siod/editline.c
+@@ -73,7 +73,7 @@
+ /* modified by awb to allow specifcation of history size at run time  */
+ /* (though only once)                                                 */
+ int editline_histsize=256;
+-char *editline_history_file;
++extern char *editline_history_file;
+ /* If this is defined it'll be called for completion first, before the */
+ /* internal file name completion will be                               */
+ EL_USER_COMPLETION_FUNCTION_TYPE*el_user_completion_function = NULL;

festival.spec

@@ -1,6 +1,6 @@
 Name:           festival
 Version:        1.96
-Release:        41
+Release:        46
 Summary:        Festival Speech Synthesis System
 License:        MIT and GPL+ and TCL
 URL:            http://www.cstr.ed.ac.uk/projects/festival/
@@ -53,6 +53,12 @@ Patch96:        festival.gcc47.patch
 Patch97:        no-shared-data.patch
 Patch98:        festival-1.96-server-script-typo.patch
 Patch99:        festival-gcc7.patch
+Patch100:       Fix-festival-gcc10.patch
+#https://build.opensuse.org/package/show/openSUSE:Factory/festival
+Patch101:       CVE-2010-3996-festival-no-LD_LIBRARY_PATH-extension.patch
+Patch102:       CVE-2010-3996-festival-safe-temp-file.patch
+Patch103:       CVE-2010-3996-speech_tools-no-LD_LIBRARY_PATH-extension.patch
+Patch104:       fix-add-the-compilation-option-pie.patch
 
 BuildRequires:  gcc gcc-c++ pulseaudio-libs-devel texi2html ncurses-devel
 Requires(post): /sbin/ldconfig
@@ -164,6 +170,11 @@ done
 %patch97 -p1
 %patch98
 %patch99 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
 
 rm festdoc-%{docversion}/speech_tools/doc/index_html.jade
 rm festdoc-%{docversion}/speech_tools/doc/tex_stuff.jade
@@ -304,7 +315,7 @@ cp -p festdoc-%{docversion}/festival/info/* %{buildroot}%{_infodir}
 %post help
 /sbin/install-info %{_infodir}/festival.info.gz %{_infodir}/dir --section "Accessibility" > /dev/null 2>&1
 
-%postun help
+%preun help
 if [ "$1" = 0 ]; then
     /sbin/install-info --delete %{_infodir}/festival.info.gz %{_infodir}/dir --section "Accessibility" > /dev/null 2>&1
 fi
@@ -347,6 +358,21 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jun 06 2023 wu lei <wu_lei@hoperun.com> - 1.96-46
+- Add PIE flags
+
+* Tue Mar 15 2022 yaoxin <yaoxin30@huawei.com> - 1.96-45
+- Fix CVE-2010-3996
+
+* Tue Aug 03 2021 wangyong <wangyong187@huawei.com> - 1.96-44
+- Fix build error caused by GCC upgrade to GCC-10
+
+* Thu Nov 26 2020 Guoshuai Sun <sunguoshuai@huawei.com> - 1.96-43
+- install-info should be executed before the help package is uninstalled
+
+* Mon May 25 2020 Captain Wei <captain.a.wei@gmail.com> - 1.96-42
+- add -fpermissive compile option
+
 * Fri Apr 3 2020 chenli <chenli147@huawei.com> - 1.96-41
 - modify spec
 

fix-add-the-compilation-option-pie.patch

@@ -0,0 +1,32 @@
+diff -Nur a/speech_tools/main/Makefile b/speech_tools/main/Makefile
+--- a/speech_tools/main/Makefile	2023-06-06 14:34:57.288951580 +0800
++++ b/speech_tools/main/Makefile	2023-06-06 15:17:39.448951580 +0800
+@@ -94,7 +94,7 @@
+ 	$(CXX_COMMAND) -o $@ -DESTLIBDIR=\"$(EST_HOME)/lib\" $($*_SRC)
+ 
+ $(ALL_EXECS) : % : $(LIBDEPS) %_main.o 
+-	$(strip $(LINK_COMMAND) -o $@ $@_main.o $(LIBS) $($(@:=_LIBS)))
++	$(strip $(LINK_COMMAND) -fPIE -Wl,-pie -o $@ $@_main.o $(LIBS) $($(@:=_LIBS)))
+ 
+ .make_execs : $(ALL_EXECS) 
+ 
+diff -Nur a/src/main/Makefile b/src/main/Makefile
+--- a/src/main/Makefile	2023-06-06 14:34:57.216951580 +0800
++++ b/src/main/Makefile	2023-06-06 15:14:54.948951580 +0800
+@@ -50,13 +50,13 @@
+ ETCDIR=$(TOP)/lib/etc/$(SYSTEM_TYPE)
+ 
+ festival: festival_main.o $(LIBDEPS)
+-	$(LINK_COMMAND) -o festival festival_main.o $(LIBS)
++	$(LINK_COMMAND) -fPIE -Wl,-pie -o festival festival_main.o $(LIBS)
+ 
+ festival_client: festival_client.o $(REQUIRED_LIBDEPS)
+-	$(LINK_COMMAND) -o festival_client festival_client.o $(LIBS)
++	$(LINK_COMMAND) -fPIE -Wl,-pie -o festival_client festival_client.o $(LIBS)
+ 
+ $(ETCDIR)/audsp: $(ETCDIR)/.made audsp.o $(LIBDEPS)
+-	$(LINK_COMMAND) -o $(ETCDIR)/audsp audsp.o $(LIBS)
++	$(LINK_COMMAND) -fPIE -Wl,-pie -o $(ETCDIR)/audsp audsp.o $(LIBS)
+ 
+ # Can't just rely on the dir as it gets updated with new files
+ # check for the data of a file created in etcdir