packages/festival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PIE flags

Browse Source 
(cherry picked from commit be8f735cb41d5730517cd0c4007ec4d0a857565d)
This commit is contained in:
wu-leilei 2023-06-06 16:55:59 +08:00 committed by openeuler-sync-bot
parent e04e4abfd6
commit cdb0574e66
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
festival.spec
View File

@ -1,6 +1,6 @@
Name: festival Name: festival
Version: 1.96 Version: 1.96
Release: 45 Release: 46
Summary: Festival Speech Synthesis System Summary: Festival Speech Synthesis System
License: MIT and GPL+ and TCL License: MIT and GPL+ and TCL
URL: http://www.cstr.ed.ac.uk/projects/festival/ URL: http://www.cstr.ed.ac.uk/projects/festival/
@ -58,6 +58,7 @@ Patch100: Fix-festival-gcc10.patch
Patch101: CVE-2010-3996-festival-no-LD_LIBRARY_PATH-extension.patch Patch101: CVE-2010-3996-festival-no-LD_LIBRARY_PATH-extension.patch
Patch102: CVE-2010-3996-festival-safe-temp-file.patch Patch102: CVE-2010-3996-festival-safe-temp-file.patch
Patch103: CVE-2010-3996-speech_tools-no-LD_LIBRARY_PATH-extension.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 BuildRequires: gcc gcc-c++ pulseaudio-libs-devel texi2html ncurses-devel
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
@ -173,6 +174,7 @@ done
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%patch104 -p1
rm festdoc-%{docversion}/speech_tools/doc/index_html.jade rm festdoc-%{docversion}/speech_tools/doc/index_html.jade
rm festdoc-%{docversion}/speech_tools/doc/tex_stuff.jade rm festdoc-%{docversion}/speech_tools/doc/tex_stuff.jade
@ -356,6 +358,9 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %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 * Tue Mar 15 2022 yaoxin <yaoxin30@huawei.com> - 1.96-45
- Fix CVE-2010-3996 - Fix CVE-2010-3996

32
fix-add-the-compilation-option-pie.patch Normal file
View File

@ -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