gentoo resync : 29.12.2022

5 files changed, 275 insertions, 51 deletions

diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index b2aa803b0ef1..d2ff8bcd0dc6 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,5 @@
-DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
-EBUILD fwts-20.11.00.ebuild 1160 BLAKE2B 3babb19a62e51f008dffbeec21350e6549a3857bc370e26252dcf6b9fe835723f17fd0e8cddd46b33c5ac37cfce584cc03aef2d7ab32615496a861e1d8f9152c SHA512 fb2e7c94ca9b19f36e329b7ffb9b6a4955b7eb8581cffec849e10797851e598ababfaf4dc05b3adb8ae01413cc97b66cdcc42b175a960c7595e5c4c1ad5851ba
+AUX fwts-22.03.00-slibtool.patch 4856 BLAKE2B 176ceb416d622a771e932e4178479e85d27ce26d4619c9477f0115abcb03b1ea86469ec773d97fab7e2bdfaee1b20b7e9e680e96646fc664cdccec7d51a67d7e SHA512 54fccce717a542da9dcc4ea397b9ab11e3cd4aaeec72b7d0ad988633ba7e5dde8f84dfd483d438f2eaaf0d8b74b03d9faa1214aedf7d654c3496a59d3b7fc3f2
+AUX fwts-22.03.00-werror.patch 2107 BLAKE2B 799c72604de68ea08e1aef40796dc32c6f92f6de96f4b1ef9692bcb723f94bf1c320e2eec15568c52968aa7a049e7291947ec707c53370ccc48c9c59b0f8acb3 SHA512 2143d762ccdb8b54c6f223d2666b1d829f60e0e2fe88ea665f187f2e070d058bc9be707a4dc550f3de922b0abca84923ad2766c21022b6f2d86f3a8e9d2ca362
+DIST fwts_22.03.00.orig.tar.gz 3900335 BLAKE2B 2e36392f69140b1a2d3b77cc8d57740f66ea016063644916e69bb738e20191a780a9d2ed275cfd8b871ad8c3455f96c8ae26ab7c1574c0cc8efdbbb20f4cc785 SHA512 88f183293da4f6ebc1cefc382c9b5e1b378ac7d03e0c577937db89be9e8417e0ffdf0952cdffda57ac21787c3fe02c5254ec7ce61e100e78555ffa92d6a30dc2
+EBUILD fwts-22.03.00.ebuild 1032 BLAKE2B 8a0c33304fae94974da85b1f5495db0c47ee885d0c02d80043acbdcd2bd7d570cb0c3c422404a87080ebbf4fd4db0f789d57c32506a156c0646dec3d04c0c44e SHA512 52e8cc6397a1ae80f6e4954f10ac9a62a40cde404df223fa10f8683b81d20a1ce13ea436b5bd9a3090c9ebd3cd6f8cc4993a0ab435434a346dc5b50f4ba3077a
 MISC metadata.xml 242 BLAKE2B e47c432f681d2e25891ad2d50e4de125c926a8050308d1eda963e3c0e1dcc903c07104aa53e7694d617dc371d6129641230f8389a89899a3cea15ef99ad2c038 SHA512 5bf1b619b84d91ad35a836bcba1ee422b1961c9d0ad56bbe7369e752741f5aa27e48df48142835f313547772c2453fe174a586b01f1c4e74b692986a96d7a5d7
diff --git a/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch b/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch
new file mode 100644
index 000000000000..bc66006bf674
--- /dev/null
+++ b/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch
@@ -0,0 +1,155 @@
+Upstream-ML: https://lists.ubuntu.com/archives/fwts-devel/2022-May/013515.html
+
+From 47bc82375865e2548edcb1607ca52ec60d632123 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 20:35:01 -0700
+Subject: [PATCH 1/2] build: Improve linking
+
+This improves the linking enough to get the build to complete
+with slibtool and GNU libtool.
+---
+ configure.ac                  |  2 ++
+ src/Makefile.am               | 20 ++++++++++----------
+ src/lib/src/Makefile.am       | 18 ++++++++++--------
+ src/libfwtsacpica/Makefile.am |  7 ++-----
+ src/libfwtsiasl/Makefile.am   |  4 ++--
+ 5 files changed, 26 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f40c367..7ee5604 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,6 +64,8 @@
+ 	  AC_CHECK_HEADERS([asm/opal-prd.h])
+ 	  AC_CHECK_HEADERS([mtd/mtd-abi.h])
+ 	  AC_CHECK_HEADERS([pci/pci.h])
++	  PKG_CHECK_MODULES([GIO], [gio-2.0])
++	  PKG_CHECK_MODULES([GLIB], [glib-2.0])
+ 	  AM_CONDITIONAL([HAVE_ASM_OPAL_PRD_H],
+ 	    [test "x$ac_cv_header_asm_opal_prd_h" = "xyes"])
+ 	  AM_CONDITIONAL([HAVE_MTD_ABI_H],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9a26af8..e2180e7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/acpica/source/compiler	\
+ 	-I$(top_srcdir)/efi_runtime			\
+ 	-I$(top_srcdir)/smccc_test			\
+-	-pthread `pkg-config --cflags glib-2.0 gio-2.0` \
++	-pthread					\
+ 	-Wall -Werror -Wextra				\
+ 	-Wno-address-of-packed-member			\
+ 	-Wfloat-equal -Wmissing-declarations		\
+@@ -23,7 +23,11 @@ AM_CPPFLAGS = \
+ 
+ bin_PROGRAMS = fwts
+ 
+-fwts_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT
++fwts_CPPFLAGS = 					\
++	$(AM_CPPFLAGS)					\
++	@GIO_CFLAGS@					\
++	@GLIB_CFLAGS@					\
++	-DACPI_DEBUG_OUTPUT
+ 
+ if HAVE_LIBFDT
+ dt_tests = \
+@@ -207,16 +211,12 @@ fwts_SOURCES = main.c 				\
+ 	$(power_mgmt_tests)			\
+ 	$(dt_tests)
+ 
+-fwts_LDFLAGS = -lm -lbsd `pkg-config --libs glib-2.0 gio-2.0`
++fwts_LDFLAGS = -no-undefined
+ 
+ fwts_LDADD = \
+-	-lfwts					\
+-	-L$(top_builddir)/src			\
+-	-L$(top_builddir)/src/acpica		\
+-	-L$(top_builddir)/src/libfwtsiasl	\
+-	-L$(top_builddir)/src/libfwtsacpica	\
+-	-L$(top_builddir)/src/lib/src		\
+-	-lfwtsacpica
++	$(top_builddir)/src/lib/src/libfwts.la \
++	$(top_builddir)/src/libfwtsiasl/libfwtsiasl.la \
++	$(top_builddir)/src/libfwtsacpica/libfwtsacpica.la
+ 
+ man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1
+ 
+diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
+index 0a39882..94bfcdf 100644
+--- a/src/lib/src/Makefile.am
++++ b/src/lib/src/Makefile.am
+@@ -21,22 +21,24 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/libfwtsiasl			\
+ 	-I$(top_srcdir)/src/acpica/source/include	\
+ 	-I$(top_srcdir)/src/acpica/source/compiler	\
+-	`pkg-config --silence-errors --cflags json`	\
+-	`pkg-config --silence-errors --cflags json-c`	\
+-	`pkg-config --cflags glib-2.0 gio-2.0` 		\
+ 	-DDATAROOTDIR=\"$(datarootdir)\"		\
+ 	-Wall -Werror -Wextra				\
+ 	-Wno-address-of-packed-member
+ 
+ pkglib_LTLIBRARIES = libfwts.la
+ 
+-libfwts_la_LDFLAGS = 					\
++libfwts_la_LDFLAGS = -version-info 1:0:0
++
++libfwts_la_LIBADD = 					\
+ 	-lm -lpthread -lbsd				\
+-	-version-info 1:0:0 				\
+-	-L$(top_builddir)/src/libfwtsiasl		\
+-	-lfwtsiasl `pkg-config --libs glib-2.0 gio-2.0`
++	@GIO_LIBS@					\
++	@GLIB_LIBS@
+ 
+-libfwts_la_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT
++libfwts_la_CPPFLAGS =					\
++	$(AM_CPPFLAGS)					\
++	@GIO_CFLAGS@					\
++	@GLIB_CFLAGS@					\
++	-DACPI_DEBUG_OUTPUT
+ 
+ if HAVE_LIBFDT
+ dt_sources = \
+diff --git a/src/libfwtsacpica/Makefile.am b/src/libfwtsacpica/Makefile.am
+index f37f585..62f0d8c 100644
+--- a/src/libfwtsacpica/Makefile.am
++++ b/src/libfwtsacpica/Makefile.am
+@@ -74,7 +74,8 @@ CLEANFILES = osunixxf_munged.c					\
+ 
+ pkglib_LTLIBRARIES = libfwtsacpica.la
+ 
+-libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
++libfwtsacpica_la_LDFLAGS = -version-info 1:0:0
++libfwtsacpica_la_LIBADD = -lpthread
+ libfwtsacpica_la_CPPFLAGS = $(AM_CPPFLAGS)
+ 
+ #
+@@ -280,8 +281,4 @@ libfwtsacpica_la_SOURCES =						\
+ 	../../src/acpica/source/tools/acpiexec/aeinstall.c		\
+ 	../../src/acpica/source/os_specific/service_layers/osgendbg.c
+ 
+-libfwtsacpica_la_LIBADD = \
+-	-L../../src/lib/src -lfwts -lrt
+-
+-
+ -include ../../git.mk
+diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am
+index 328134c..2728780 100644
+--- a/src/libfwtsiasl/Makefile.am
++++ b/src/libfwtsiasl/Makefile.am
+@@ -104,8 +104,8 @@ BUILT_SOURCES = aslcompiler.y		\
+ #
+ # Just export fwts specific API so we don't clash with core ACPICA library
+ #
+-libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0
+-
++libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -version-info 1:0:0
++libfwtsiasl_la_LIBADD = -lpthread
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+ libfwtsiasl_la_CPPFLAGS = $(AM_CPPFLAGS)
+-- 
+2.35.1
+
diff --git a/sys-apps/fwts/files/fwts-22.03.00-werror.patch b/sys-apps/fwts/files/fwts-22.03.00-werror.patch
new file mode 100644
index 000000000000..6502c75b7413
--- /dev/null
+++ b/sys-apps/fwts/files/fwts-22.03.00-werror.patch
@@ -0,0 +1,65 @@
+From 85f27bc6dcd8c7f1479dce259713540f1d1a888c Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 21:11:29 -0700
+Subject: [PATCH 2/2] build: Remove -Werror
+
+---
+ configure.ac              | 2 +-
+ src/Makefile.am           | 2 +-
+ src/lib/src/Makefile.am   | 2 +-
+ src/utilities/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ee5604..4d2960e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ 	  AC_INIT([fwts],[0.1],[fwts-devel@lists.ubuntu.com])
+-          AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++          AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+           m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ 	  AC_CANONICAL_HOST
+ 	  AC_CONFIG_MACRO_DIR([m4])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e2180e7..eee8b49 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/efi_runtime			\
+ 	-I$(top_srcdir)/smccc_test			\
+ 	-pthread					\
+-	-Wall -Werror -Wextra				\
++	-Wall -Wextra					\
+ 	-Wno-address-of-packed-member			\
+ 	-Wfloat-equal -Wmissing-declarations		\
+ 	-Wno-long-long -Wredundant-decls -Wshadow	\
+diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
+index 94bfcdf..390326a 100644
+--- a/src/lib/src/Makefile.am
++++ b/src/lib/src/Makefile.am
+@@ -22,7 +22,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/acpica/source/include	\
+ 	-I$(top_srcdir)/src/acpica/source/compiler	\
+ 	-DDATAROOTDIR=\"$(datarootdir)\"		\
+-	-Wall -Werror -Wextra				\
++	-Wall -Wextra					\
+ 	-Wno-address-of-packed-member
+ 
+ pkglib_LTLIBRARIES = libfwts.la
+diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
+index a7d9b9c..2356af3 100644
+--- a/src/utilities/Makefile.am
++++ b/src/utilities/Makefile.am
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ 
+-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" 	\
++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
+ 	-I$(srcdir)/../lib/include
+ 
+ bin_PROGRAMS = kernelscan
+-- 
+2.35.1
+
diff --git a/sys-apps/fwts/fwts-20.11.00.ebuild b/sys-apps/fwts/fwts-20.11.00.ebuild
deleted file mode 100644
index 0d5da91d7a1c..000000000000
--- a/sys-apps/fwts/fwts-20.11.00.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/json-c-0.10-r1
-	dev-libs/libbsd
-	dev-libs/libpcre
-	sys-apps/dmidecode
-	sys-apps/dtc
-	sys-apps/pciutils
-	sys-power/iasl
-	sys-power/pmtools
-	"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
-	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
-	# Fix json-c includes
-	sed -e 's/^#include <json\//#include <json-c\//g' -i \
-		configure.ac || die
-	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
-		-i src/lib/include/fwts_json.h \
-		src/utilities/kernelscan.c || die
-	sed -e 's/-ljson/-ljson-c/'\
-		-i src/Makefile.am\
-		src/lib/src/Makefile.am\
-		src/utilities/Makefile.am || die
-
-	eautoreconf
-}
diff --git a/sys-apps/fwts/fwts-22.03.00.ebuild b/sys-apps/fwts/fwts-22.03.00.ebuild
new file mode 100644
index 000000000000..093cc1bcb881
--- /dev/null
+++ b/sys-apps/fwts/fwts-22.03.00.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Firmware Test Suite"
+HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts https://kernel.ubuntu.com/git/hwe/fwts.git"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/glib:2
+	>=dev-libs/json-c-0.10-r1
+	dev-libs/libbsd
+	dev-libs/libpcre
+	sys-apps/dmidecode
+	sys-apps/dtc
+	sys-apps/pciutils
+	sys-power/iasl
+	sys-power/pmtools
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}
+
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 780372
+	"${FILESDIR}/${P}-werror.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -e 's:/usr/bin/lspci:'$(type -p lspci)':' \
+		-e 's:/usr/sbin/dmidecode:'$(type -p dmidecode)':' \
+		-e 's:/usr/bin/iasl:'$(type -p iasl)':' \
+		-i src/lib/include/fwts_binpaths.h || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}