diff options
Diffstat (limited to 'sys-boot/tboot')
| -rw-r--r-- | sys-boot/tboot/Manifest | 6 | ||||
| -rw-r--r-- | sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch (renamed from sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch) | 24 | ||||
| -rw-r--r-- | sys-boot/tboot/tboot-1.9.11.ebuild (renamed from sys-boot/tboot/tboot-1.9.6_p20171118.ebuild) | 17 |
3 files changed, 25 insertions, 22 deletions
diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index 1215bec2bef4..bb7a29f5d597 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1,4 +1,4 @@ -AUX tboot-1.9.5-genkernel-path.patch 2366 BLAKE2B c9b6690bbed6c1c611bb8d77503882240dcf26c9d5895be086997c605f3ad1bc253aa5ed5658aa084e89562c52de6c6c39d26559eb56b3f53fdf95c164238a37 SHA512 1b2e5d3a3c1af62e7f88143b1b7e7c1bfc8e222889f4ac63e648da348b030c757173700ba419f53c31c57bc0ba91d47afa0c2998f982a376bf33b0f8cd968f98 -DIST tboot-1.9.6_p20171118.tar.gz 691068 BLAKE2B c269f9b14cb07139983bd3b1c99511458d5ab5bbd74b097d0aa3b32e0c3e9054d0a67ff18ce7b8090389727acdf47b8c48af6599ecb3148a68786083fe8ded73 SHA512 6476b783516909bf9cf10915fc23e71dca03d521dcc7bf71fbd19684c996c2c588955bb8f896f02afe56feddf9c639b6349635651c852a90319429b2943ec950 -EBUILD tboot-1.9.6_p20171118.ebuild 1541 BLAKE2B 05123bc0e966c8af4c2782842c31214944ecb0a8450840299572f28529ba3d9ccbe02e26e856b40c2d36018d787db79abe6b6b041b2ab498442f1f1f20cb0a41 SHA512 364558e1328e6a87cb7dd0cae2be8503443d2aaa406d08ec17fb3179f7431f6cfc260322ad277da656a8dcd2e45bfaee5b53dea9753853560d96aa10b1e4aa9f +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.ebuild 1606 BLAKE2B 2cd3dfb50579354f38783edfdda2cbb538011268b9af229ff22c42b555054924e5318ddd295c98207fe42d9eb6d465d5cc96b3c76f8080ad8f0321d195f5e764 SHA512 45ae785f5806959ff484b21922160bf8b97e8cb5bf6dd9fad46cf36ef295e08d928846d2c50009020921eae294507eada7473f6462e61c17ce06468f5ae943bd MISC metadata.xml 507 BLAKE2B fa938d9d6b94d3eed356f9e75f39e41f955f87d23abf02973d1ad7c2fdf379b88c9d12418e5ee08ca0b5bbd5a730144f9c9a724b5255ccad196c02e74f3289f0 SHA512 d32632b8a672121164071b95f681213874f9ff0b47fabddc96eb3a60cfa4491c01dd5334af55dd1964c72cd437eb146ee7a0c4a3c0e99fb96c556db5de4d9e36 diff --git a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch index 4914be6e4e7d..b2459816068b 100644 --- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch +++ b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch @@ -1,10 +1,11 @@ -diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot ---- tboot-1.9.5.orig/tboot/20_linux_tboot 2016-12-21 06:29:15.000000000 +0800 -+++ tboot-1.9.5/tboot/20_linux_tboot 2017-08-02 23:33:52.732748172 +0800 -@@ -171,6 +171,15 @@ +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" ;; @@ -14,10 +15,11 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot + *) GENKERNEL_ARCH="$machine" ;; +esac + - linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do ++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") -@@ -217,7 +226,9 @@ + 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}" \ @@ -28,10 +30,10 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot if test -e "${dirname}/${i}" ; then initrd="$i" break -diff -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xen_tboot ---- tboot-1.9.5.orig/tboot/20_linux_xen_tboot 2016-12-21 06:29:54.000000000 +0800 -+++ tboot-1.9.5/tboot/20_linux_xen_tboot 2017-08-02 23:34:01.347685520 +0800 -@@ -165,6 +165,15 @@ +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 } @@ -47,7 +49,7 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xe linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do if grub_file_is_not_garbage "$i"; then basename=$(basename $i) -@@ -232,7 +241,9 @@ +@@ -234,7 +243,9 @@ "initrd-${version}" "initrd.img-${alt_version}" \ "initrd-${alt_version}.img" "initrd-${alt_version}" \ "initramfs-genkernel-${version}" \ diff --git a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild b/sys-boot/tboot/tboot-1.9.11.ebuild index 1b591eb5a46f..4778e6215bb4 100644 --- a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild +++ b/sys-boot/tboot/tboot-1.9.11.ebuild @@ -1,32 +1,33 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +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="https://dev.gentoo.org/~perfinion/distfiles/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="custom-cflags selinux" +IUSE="custom-cflags libressl selinux" # requires patching the kernel src RESTRICT="test" DEPEND="app-crypt/trousers app-crypt/tpm-tools -dev-libs/openssl:0=[-bindist]" +!libressl? ( dev-libs/openssl:0=[-bindist] ) +libressl? ( dev-libs/libressl:0= )" RDEPEND="${DEPEND} sys-boot/grub:2 selinux? ( sec-policy/selinux-tboot )" DOCS=( README COPYING CHANGELOG ) -PATCHES=( "${FILESDIR}/${PN}-1.9.5-genkernel-path.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.9.11-genkernel-path.patch" ) src_prepare() { sed -i 's/ -Werror//g' Config.mk || die @@ -51,7 +52,7 @@ src_install() { emake DISTDIR="${D}" install dodoc "${DOCS[@]}" - dodoc docs/*.txt lcptools/*.{txt,pdf} + dodoc docs/*.txt lcptools/*.pdf || die "docs failed" cd "${D}" mkdir -p usr/lib/tboot/ || die @@ -59,7 +60,7 @@ src_install() { } pkg_postinst() { - cp ${ROOT%/}/usr/lib/tboot/boot/* ${ROOT%/}/boot/ + cp "${ROOT}/usr/lib/tboot/boot/*" "${ROOT}/boot/" || die ewarn "Please remember to download the SINIT AC Module relevant" ewarn "for your platform from:" |