diff --git a/acpica-tools.spec b/acpica-tools.spec index ca2a618..651e066 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20190509 -Release: 4 +Version: 20200528 +Release: 1 Summary: Tools for OS-independent reference implementation of ACPI License: GPLv2 @@ -85,5 +85,8 @@ fi %{_docdir}/* %changelog +* Wed Jul 22 2020 jinzhimin - 20200528-1 +- update to 20200528 + * Tue Dec 31 2019 daiqianwen - 20190509-4 - Package init diff --git a/acpica-unix2-20190509.tar.gz b/acpica-unix2-20190509.tar.gz deleted file mode 100644 index de20d85..0000000 Binary files a/acpica-unix2-20190509.tar.gz and /dev/null differ diff --git a/acpica-unix2-20200528.tar.gz b/acpica-unix2-20200528.tar.gz new file mode 100644 index 0000000..75410ab Binary files /dev/null and b/acpica-unix2-20200528.tar.gz differ diff --git a/acpitests-unix-20190509.tar.gz b/acpitests-unix-20190509.tar.gz deleted file mode 100644 index 6f0aa68..0000000 Binary files a/acpitests-unix-20190509.tar.gz and /dev/null differ diff --git a/acpitests-unix-20200528.tar.gz b/acpitests-unix-20200528.tar.gz new file mode 100644 index 0000000..6801011 Binary files /dev/null and b/acpitests-unix-20200528.tar.gz differ diff --git a/openEuler-harden.patch b/openEuler-harden.patch index dfe970a..bec5fc3 100644 --- a/openEuler-harden.patch +++ b/openEuler-harden.patch @@ -1,21 +1,7 @@ -Index: acpica-unix2-20180209/generate/unix/Makefile.config -=================================================================== ---- acpica-unix2-20180209.orig/generate/unix/Makefile.config -+++ acpica-unix2-20180209/generate/unix/Makefile.config -@@ -182,6 +182,8 @@ ifneq ($(NOFORTIFY),TRUE) - OPT_CFLAGS += -D_FORTIFY_SOURCE=2 - endif - -+OPT_CFLAGS += -fPIC -pie -+ - CFLAGS += \ - -D$(HOST)\ - -D_GNU_SOURCE\ -Index: acpica-unix2-20180209/generate/unix/iasl/Makefile -=================================================================== ---- acpica-unix2-20180209.orig/generate/unix/iasl/Makefile -+++ acpica-unix2-20180209/generate/unix/iasl/Makefile -@@ -344,26 +344,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa +diff -Naur a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile +--- a/generate/unix/iasl/Makefile 2020-07-23 06:45:14.064000000 +0000 ++++ b/generate/unix/iasl/Makefile 2020-07-23 06:57:32.080000000 +0000 +@@ -358,34 +358,35 @@ # Cannot use the common compile warning flags since the C files are created # by the utilities above and they are not necessarily ANSI C, etc. # @@ -28,6 +14,16 @@ Index: acpica-unix2-20180209/generate/unix/iasl/Makefile $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + + $(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + + $(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c @@ -49,3 +45,15 @@ Index: acpica-unix2-20180209/generate/unix/iasl/Makefile @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< +diff -Naur a/generate/unix/Makefile.config b/generate/unix/Makefile.config +--- a/generate/unix/Makefile.config 2020-07-23 06:45:14.065000000 +0000 ++++ b/generate/unix/Makefile.config 2020-07-23 06:47:00.436000000 +0000 +@@ -181,6 +181,8 @@ + OPT_CFLAGS += -D_FORTIFY_SOURCE=2 + endif + ++OPT_CFLAGS += -fPIC -pie ++ + CFLAGS += \ + -D$(ACPI_HOST)\ + -D_GNU_SOURCE\