From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- sys-boot/tboot/Manifest | 8 ++- .../tboot/files/tboot-1.10.3-disable-Werror.patch | 12 ++++ .../tboot/files/tboot-1.10.3-disable-strip.patch | 14 +++++ .../tboot-1.10.3-dont-call-strip-directly.patch | 12 ++++ .../tboot/files/tboot-1.9.11-genkernel-path.patch | 62 -------------------- sys-boot/tboot/tboot-1.10.3.ebuild | 66 +++++++++++++++++++++ sys-boot/tboot/tboot-1.9.11-r1.ebuild | 68 ---------------------- 7 files changed, 109 insertions(+), 133 deletions(-) create mode 100644 sys-boot/tboot/files/tboot-1.10.3-disable-Werror.patch create mode 100644 sys-boot/tboot/files/tboot-1.10.3-disable-strip.patch create mode 100644 sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch delete mode 100644 sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch create mode 100644 sys-boot/tboot/tboot-1.10.3.ebuild delete mode 100644 sys-boot/tboot/tboot-1.9.11-r1.ebuild (limited to 'sys-boot/tboot') diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index 51157f0ed317..395e75ee11a9 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1,4 +1,6 @@ -AUX tboot-1.9.11-genkernel-path.patch 2428 BLAKE2B cff351e880811d1bb48bd57d59a768ab96fa2da9a8ea3ba7ddf1845e6fc5ec80bce92dace05d39d0c92962ebbdb6a80e46d6cc39d8f0e1cdbf28e20c86e2d09d SHA512 dfe335ac25c9565a90cb8513128c4e4c6b994ce79cc665367f1c39a833d6586a80ab32be64fc02f44df80a6511910f1a31a8465deb5aa1fb872bfd872edb1f95 -DIST tboot-1.9.11.tar.gz 709092 BLAKE2B 97b6ea5a09e1adbf1fbdc36516e0e80d3acc67469f297603125542aed8235e6533afb96e6c38885b87e4584392da40d9f65d00eced2b8a87a2ecf61a17c3a985 SHA512 5c2466438ad3ab95ca66fe4d460f4e6b31ccd3c6ac79221b129883df4180fce4878dd07a5f180bb79fae13b59fa90c05aeda7339159d1d950011a59645024b8a -EBUILD tboot-1.9.11-r1.ebuild 1531 BLAKE2B 2e66eac6137dc5c77d1706317b4dcf2e4bee58491f4cc18c234bb98b2516bcacc7301bcb8516f90e56cd9f34d48a1890e8634e159c3a38b3fd24e4278d1f7552 SHA512 04aeb336f45e992e311b9c06171ce930a92908070f85ac8a4cd28596759b133b78438550e40f3c0397e0b112221f9cce3ec852d11b8c81a247881834c4d32261 +AUX tboot-1.10.3-disable-Werror.patch 522 BLAKE2B e25832b544ffc81d83d963061c35432f454590b02f3c9d10ceff60f977b9b022e39193a41ded7f96c71681f7219204809dd4156bcf7ad37ea8738155b6c0469e SHA512 a219e4f1dd637fb93cd05e827ab7d1a9bbcc99b87a3f6e9e8b902d0ab08f150ad87d8804f0d506c5ac721be4d1a85a14466e036c09643601a705be0fb07e4ed4 +AUX tboot-1.10.3-disable-strip.patch 343 BLAKE2B 65d5e7f4e97504ace2d42123701de8f6e27e3ffc196b69a0afc8057ed8fe75c8274c427d858cb316d5712505381a5a109ddc5301eedc0f93c34d3ed0551deaff SHA512 f86f595d8883d433327eb906ee5fbe0c277180c7a993ae47e26c23ea8b406e59cbad28509ca399286ba306949b0d5de5dc9420242706c7affcba12d86e3f183b +AUX tboot-1.10.3-dont-call-strip-directly.patch 328 BLAKE2B f1fe38f44a9d207034ec471b98fe81e92d9b9068e3a1ab05034aa21b83d87df6a6d0f53eee3436d440b8f8514d09bdde4155061b1979aaa304f9974d5eddba32 SHA512 cb2c1bc37368cad9448142393c84da5327d3b4a976ae73d0116b20d1eca7ca0dba399f3fb419e4fb02d41ede8aabb3f3b12af10bb734627975087c352ff4d29b +DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77 +EBUILD tboot-1.10.3.ebuild 1563 BLAKE2B 92fa20a13f07fc0ebc25348f7e9126973990b2cdffc57f0e50a4f82798409d46b12c66d06aff4078b09a1eb9650c8edf788f9e01b949b8f9700ce811b7bb6b4c SHA512 b81ab541974649a8df4d577062cf937b258b1f2ed21749827122d110a6622eca05c34e0f1dc80e5308d4a4ce49833cdbda47452461247f3611b8a7c98d6f86b5 MISC metadata.xml 508 BLAKE2B c28a3b0e46c57c91011bbee5ff6769ace24ab4e7b3355536b8e8c3bdb33b0be4ee1fedd60f00e2bfe8957570f763e8e85f3a1786f7a470bc5b4c855e57f7b8a2 SHA512 e45960df2560d82cb914db1f661d739b5d6747b7fb433152fef849d36d6bb4cc812def3cbafa4b362056c4d96e37980e65f8bc163b2021d5827ffd6ee9afca4d diff --git a/sys-boot/tboot/files/tboot-1.10.3-disable-Werror.patch b/sys-boot/tboot/files/tboot-1.10.3-disable-Werror.patch new file mode 100644 index 000000000000..5285227713ad --- /dev/null +++ b/sys-boot/tboot/files/tboot-1.10.3-disable-Werror.patch @@ -0,0 +1,12 @@ +diff -r 5a30b6b09e77 Config.mk +--- a/Config.mk Fri Dec 10 15:35:42 2021 +0100 ++++ b/Config.mk Sun Dec 12 14:53:57 2021 -0600 +@@ -39,7 +39,7 @@ + /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;) + + +-CFLAGS_WARN = -Wall -Wformat-security -Werror -Wstrict-prototypes \ ++CFLAGS_WARN = -Wall -Wformat-security -Wstrict-prototypes \ + -Wextra -Winit-self -Wswitch-default -Wunused-parameter \ + -Wwrite-strings \ + $(call cc-option,$(CC),-Wlogical-op,) \ diff --git a/sys-boot/tboot/files/tboot-1.10.3-disable-strip.patch b/sys-boot/tboot/files/tboot-1.10.3-disable-strip.patch new file mode 100644 index 000000000000..c7a7fd04c7b5 --- /dev/null +++ b/sys-boot/tboot/files/tboot-1.10.3-disable-strip.patch @@ -0,0 +1,14 @@ +diff -r 5a30b6b09e77 Config.mk +--- a/Config.mk Fri Dec 10 15:35:42 2021 +0100 ++++ b/Config.mk Sun Dec 12 14:52:19 2021 -0600 +@@ -56,10 +56,6 @@ + OBJCOPY ?= objcopy + OBJDUMP ?= objdump + +-ifeq ($(debug),n) +-INSTALL_STRIP ?= -s +-endif +- + INSTALL ?= install + INSTALL_DIR = $(INSTALL) -d -m0755 -p + INSTALL_DATA = $(INSTALL) -m0644 -p diff --git a/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch b/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch new file mode 100644 index 000000000000..83adeda6d5ac --- /dev/null +++ b/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch @@ -0,0 +1,12 @@ +diff -r 5a30b6b09e77 tboot/Makefile +--- a/tboot/Makefile Fri Dec 10 15:35:42 2021 +0100 ++++ b/tboot/Makefile Mon Dec 20 13:06:09 2021 -0600 +@@ -34,7 +34,7 @@ + TARGET_LDS := $(CURDIR)/common/tboot.lds + + $(TARGET).strip : $(TARGET) +- strip $< -o $@ ++ $(STRIP) $< -o $@ + + $(TARGET).gz : $(TARGET).strip + gzip -n -f -9 < $< > $@ diff --git a/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch deleted file mode 100644 index b2459816068b..000000000000 --- a/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -r 9998b2fb83fd tboot/20_linux_tboot ---- a/tboot/20_linux_tboot Wed Apr 10 11:47:06 2019 +0200 -+++ b/tboot/20_linux_tboot Tue Jul 23 22:42:00 2019 -0500 -@@ -173,7 +173,16 @@ - EOF - } - --linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do -+machine=`uname -m` -+case "$machine" in -+ i?86) GENKERNEL_ARCH="x86" ;; -+ mips|mips64) GENKERNEL_ARCH="mips" ;; -+ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; -+ arm*) GENKERNEL_ARCH="arm" ;; -+ *) GENKERNEL_ARCH="$machine" ;; -+esac -+ -+linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do - basename=$(basename $i) - version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") - if grub_file_is_not_garbage "$i" && grep -qx "CONFIG_INTEL_TXT=y" /boot/config-${version} 2> /dev/null ; then echo -n "$i " ; fi -@@ -219,7 +228,9 @@ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -diff -r 9998b2fb83fd tboot/20_linux_xen_tboot ---- a/tboot/20_linux_xen_tboot Wed Apr 10 11:47:06 2019 +0200 -+++ b/tboot/20_linux_xen_tboot Tue Jul 23 22:42:00 2019 -0500 -@@ -167,6 +167,15 @@ - EOF - } - -+machine=`uname -m` -+case "$machine" in -+ i?86) GENKERNEL_ARCH="x86" ;; -+ mips|mips64) GENKERNEL_ARCH="mips" ;; -+ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; -+ arm*) GENKERNEL_ARCH="arm" ;; -+ *) GENKERNEL_ARCH="$machine" ;; -+esac -+ - linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do - if grub_file_is_not_garbage "$i"; then - basename=$(basename $i) -@@ -234,7 +243,9 @@ - "initrd-${version}" "initrd.img-${alt_version}" \ - "initrd-${alt_version}.img" "initrd-${alt_version}" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}" ; do -+ "initramfs-genkernel-${alt_version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break diff --git a/sys-boot/tboot/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild new file mode 100644 index 000000000000..1c4693a6e37b --- /dev/null +++ b/sys-boot/tboot/tboot-1.10.3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit mount-boot toolchain-funcs + +DESCRIPTION="Performs a measured and verified boot using Intel Trusted Execution Technology" +HOMEPAGE="https://sourceforge.net/projects/tboot/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="custom-cflags selinux" + +# requires patching the kernel src +RESTRICT="test" + +DEPEND="dev-libs/openssl:0=[-bindist(-)]" + +RDEPEND="${DEPEND} + sys-boot/grub:2 + selinux? ( sec-policy/selinux-tboot )" + +DOCS=( README.md COPYING CHANGELOG ) +PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch" + "${FILESDIR}/${PN}-1.10.3-disable-strip.patch" + "${FILESDIR}/${PN}-1.10.3-dont-call-strip-directly.patch" ) + +src_configure() { + tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP + + default +} + +src_compile() { + use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS + + if use amd64; then + export MAKEARGS="TARGET_ARCH=x86_64" + else + export MAKEARGS="TARGET_ARCH=i686" + fi + + default +} + +src_install() { + emake DISTDIR="${D}" install + + dodoc "${DOCS[@]}" + dodoc docs/*.{txt,md} + + cd "${ED}" || die + mkdir -p usr/lib/tboot/ || die + mv boot usr/lib/tboot/ || die +} + +pkg_postinst() { + cp "${ROOT}/usr/lib/tboot/boot/"* "${ROOT}/boot/" || die + + ewarn "Please remember to download the SINIT AC Module relevant" + ewarn "for your platform from:" + ewarn "http://software.intel.com/en-us/articles/intel-trusted-execution-technology/" +} diff --git a/sys-boot/tboot/tboot-1.9.11-r1.ebuild b/sys-boot/tboot/tboot-1.9.11-r1.ebuild deleted file mode 100644 index 64a972787d85..000000000000 --- a/sys-boot/tboot/tboot-1.9.11-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic mount-boot - -DESCRIPTION="Performs a measured and verified boot using Intel Trusted Execution Technology" -HOMEPAGE="https://sourceforge.net/projects/tboot/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="custom-cflags selinux" - -# requires patching the kernel src -RESTRICT="test" - -DEPEND="app-crypt/trousers -app-crypt/tpm-tools -dev-libs/openssl:0=[-bindist(-)] -" - -RDEPEND="${DEPEND} -sys-boot/grub:2 -selinux? ( sec-policy/selinux-tboot )" - -DOCS=( README COPYING CHANGELOG ) -PATCHES=( "${FILESDIR}/${PN}-1.9.11-genkernel-path.patch" ) - -src_prepare() { - sed -i 's/ -Werror//g' Config.mk || die - sed -i 's/^INSTALL_STRIP = -s$//' Config.mk || die # QA Errors - - default -} - -src_compile() { - use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - if use amd64; then - export MAKEARGS="TARGET_ARCH=x86_64" - else - export MAKEARGS="TARGET_ARCH=i686" - fi - - default -} - -src_install() { - emake DISTDIR="${D}" install - - dodoc "${DOCS[@]}" - dodoc docs/*.txt lcptools/*.pdf - - cd "${ED}" - mkdir -p usr/lib/tboot/ || die - mv boot usr/lib/tboot/ || die -} - -pkg_postinst() { - cp "${ROOT}/usr/lib/tboot/boot/*" "${ROOT}/boot/" || die - - ewarn "Please remember to download the SINIT AC Module relevant" - ewarn "for your platform from:" - ewarn "http://software.intel.com/en-us/articles/intel-trusted-execution-technology/" -} -- cgit v1.2.3