From a12dfc397798b7f15141ee2ee9117ece2aadb83c Mon Sep 17 00:00:00 2001 From: Al Stone Date: Jun 01 2020 00:06:28 +0000 Subject: Merge branch 'debian' --- diff --git a/debian/changelog b/debian/changelog index d29814c..571a313 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +acpica-unix (20200528-1) UNRELEASED; urgency=medium + + * Upgrade to 20200528 upstream + * Refresh patches as needed + + -- Al Stone Sun, 31 May 2020 18:00:27 -0600 + acpica-unix (20200430-1) unstable; urgency=medium * Upgrade to 20200430 upstream diff --git a/debian/patches/OPT_LDFLAGS.patch b/debian/patches/OPT_LDFLAGS.patch index 7e9d02d..f1469f2 100644 --- a/debian/patches/OPT_LDFLAGS.patch +++ b/debian/patches/OPT_LDFLAGS.patch @@ -1,7 +1,7 @@ -Index: acpica-unix-20191213/generate/unix/Makefile.config +Index: acpica-unix-20200528/generate/unix/Makefile.config =================================================================== ---- acpica-unix-20191213.orig/generate/unix/Makefile.config -+++ acpica-unix-20191213/generate/unix/Makefile.config +--- acpica-unix-20200528.orig/generate/unix/Makefile.config ++++ acpica-unix-20200528/generate/unix/Makefile.config @@ -23,6 +23,9 @@ # OPT_CFLAGS can be overridden on the make command line by # adding OPT_CFLAGS="..." to the invocation. @@ -12,7 +12,7 @@ Index: acpica-unix-20191213/generate/unix/Makefile.config # Notes: # gcc should be version 4 or greater, otherwise some of the options # used will not be recognized. -@@ -165,6 +168,11 @@ LDFLAGS +=-m32 +@@ -164,6 +167,11 @@ LDFLAGS +=-m32 endif # diff --git a/debian/patches/add-testing.patch b/debian/patches/add-testing.patch index 334fd38..6785c55 100644 --- a/debian/patches/add-testing.patch +++ b/debian/patches/add-testing.patch @@ -12,5 +12,5 @@ Index: acpica-unix-20191213/Makefile + $(CURDIR)/tests/aslts.sh $(CURDIR)/tests/aslts $(CURDIR)/generate/unix + + # misc tests -+ $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20200430 ++ $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20200528 + diff --git a/debian/patches/f23-harden.patch b/debian/patches/f23-harden.patch index eacb454..b5f2912 100644 --- a/debian/patches/f23-harden.patch +++ b/debian/patches/f23-harden.patch @@ -8,11 +8,11 @@ From: Al Stone generate/unix/iasl/Makefile | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) -Index: acpica-unix-20200214/generate/unix/Makefile.config +Index: acpica-unix-20200528/generate/unix/Makefile.config =================================================================== ---- acpica-unix-20200214.orig/generate/unix/Makefile.config -+++ acpica-unix-20200214/generate/unix/Makefile.config -@@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE) +--- acpica-unix-20200528.orig/generate/unix/Makefile.config ++++ acpica-unix-20200528/generate/unix/Makefile.config +@@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE) OPT_CFLAGS += -D_FORTIFY_SOURCE=2 endif @@ -21,10 +21,10 @@ Index: acpica-unix-20200214/generate/unix/Makefile.config CFLAGS += \ -D$(ACPI_HOST)\ -D_GNU_SOURCE\ -Index: acpica-unix-20200214/generate/unix/iasl/Makefile +Index: acpica-unix-20200528/generate/unix/iasl/Makefile =================================================================== ---- acpica-unix-20200214.orig/generate/unix/iasl/Makefile -+++ acpica-unix-20200214/generate/unix/iasl/Makefile +--- acpica-unix-20200528.orig/generate/unix/iasl/Makefile ++++ acpica-unix-20200528/generate/unix/iasl/Makefile @@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa # 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. diff --git a/debian/rules b/debian/rules index 70f3cd1..c4cab41 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPP DESTDIR ?= debian/acpica-tools -VERSION = 20200430 +VERSION = 20200528 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)