[gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/files/, sys-boot/tboot/
commit: ee8a0086987e0e5c279290f8e95020930cb89b40 Author: Christopher Byrne gmail com> AuthorDate: Wed Mar 9 16:39:18 2022 + Commit: Sam James gentoo org> CommitDate: Mon Mar 21 23:52:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8a0086 sys-boot/tboot: Bump to 1.10.5 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Christopher Byrne gmail.com> Signed-off-by: Sam James gentoo.org> sys-boot/tboot/Manifest| 1 + .../files/tboot-1.10.5-fix-pconf-element.patch | 21 ++ sys-boot/tboot/tboot-1.10.5.ebuild | 77 ++ 3 files changed, 99 insertions(+) diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index 249d776b4c9c..2c3e426d33d3 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1 +1,2 @@ DIST tboot-1.10.4.tar.gz 908050 BLAKE2B 8c793e2ec29cc3c3aa8199ac5058e9b3521eb0a72609c8b5ae21e0843571ae765be74bb48184178e2641ff8eec05680f81e45b12b80fd7d2727c82f9c8702411 SHA512 6fe93cabd5fc10cba7797048cad2cce4c490e0112c5c877f3367d78873cb55ba3d84eb703f2fcdba807eb21f1bef6a838d315b32d6418fb88b2589ff66e99491 +DIST tboot-1.10.5.tar.gz 907657 BLAKE2B f9e33c512fac304eba6cbf87b497c48ff52c5efdb47103f247e04c95f8e44230671c58811d7d58753cd9c49c53d9ad77a0c5c7fb7fcce5c94d48f8fcaa9ad1f7 SHA512 01a039e5612b6cca6f7558e93673ba50edfcfbf3f65e390ac64f4aa6ae0859a314676b20d722dcd41a7a3c940473fe7982e823c800a75bd26a5e8f956528f223 diff --git a/sys-boot/tboot/files/tboot-1.10.5-fix-pconf-element.patch b/sys-boot/tboot/files/tboot-1.10.5-fix-pconf-element.patch new file mode 100644 index ..a3b5138c5de0 --- /dev/null +++ b/sys-boot/tboot/files/tboot-1.10.5-fix-pconf-element.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Christopher Byrne +# Date 1645847383 21600 +# Fri Feb 25 21:49:43 2022 -0600 +# Node ID bbf8373779e4653be2e2cfbaf14e1abb1ae42af4 +# Parent 5941842afb661f0e78085cb1317781d362583a38 +lcptools-v2/pconf_legacy.c: Add missing BE size_of_pcrs to hash buffer + +Signed-of-by: Christopher Byrne + +diff --git a/lcptools-v2/pconf_legacy.c b/lcptools-v2/pconf_legacy.c +--- a/lcptools-v2/pconf_legacy.c b/lcptools-v2/pconf_legacy.c +@@ -241,6 +241,7 @@ + ERROR("Error: failed to allocate buffer for composite digest.\n"); + return false; + } ++buff->size_of_pcrs = htonl(no_of_pcrs * SHA1_DIGEST_SIZE); + memcpy_s( + >pcr_selection, + sizeof buff->pcr_selection, diff --git a/sys-boot/tboot/tboot-1.10.5.ebuild b/sys-boot/tboot/tboot-1.10.5.ebuild new file mode 100644 index ..c36283eeb34a --- /dev/null +++ b/sys-boot/tboot/tboot-1.10.5.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 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-toolchain-directly.patch" + "${FILESDIR}/${PN}-1.10.5-fix-pconf-element.patch" ) + +pkg_setup() { + if tc-is-clang; then + eerror "tboot is a freestanding application that uses gcc" + eerror "extensions in fundemental ways, include VLAIS" + eerror "(Variable Length Arrays in Structs) and will not" + eerror "compile with clang witout upstream action" + die "Cannot compile with clang. See bug #832020" + fi +} + +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/; +}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/files/, sys-boot/tboot/
commit: b41c080c3595a1cd80bad7887866b8372f0c Author: Christopher Byrne gmail com> AuthorDate: Tue Dec 21 18:49:28 2021 + Commit: John Helmert III gentoo org> CommitDate: Wed Dec 22 19:55:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41c080c sys-boot/tboot: Don't call ar directly Closes: https://bugs.gentoo.org/829745 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Christopher Byrne gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23456 Signed-off-by: John Helmert III gentoo.org> .../tboot-1.10.3-dont-call-strip-directly.patch| 12 --- ...tboot-1.10.3-dont-call-toolchain-directly.patch | 24 ++ sys-boot/tboot/tboot-1.10.3.ebuild | 2 +- 3 files changed, 25 insertions(+), 13 deletions(-) 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 deleted file mode 100644 index 83adeda6d5ac.. --- a/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.10.3-dont-call-toolchain-directly.patch b/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch new file mode 100644 index ..29840e9113e4 --- /dev/null +++ b/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch @@ -0,0 +1,24 @@ +diff -r 5a30b6b09e77 safestringlib/makefile +--- a/safestringlib/makefile Fri Dec 10 15:35:42 2021 +0100 b/safestringlib/makefile Tue Dec 21 12:40:01 2021 -0600 +@@ -29,7 +29,7 @@ + $(CC) $(LDFLAGS) -c -o $@ $< $(CFLAGS) + + libsafestring.a: $(OBJ) +- ar rcs $@ $^ ++ $(AR) rcs $@ $^ + + + _TESTFUNCS = Safe_String_UnitTestMain.c test_strcmp_s.c test_strnlen_s.c test_memcmp16_s.c test_strcpyfldin_s.c test_strnterminate_s.c test_memcmp32_s.c test_strcpyfldout_s.c test_strpbrk_s.c test_memcmp_s.c test_strcpyfld_s.c test_strprefix_s.c test_memcpy16_s.c test_strcpy_s.c test_strremovews_s.c test_memcpy32_s.c test_strcspn_s.c test_strspn_s.c test_memcpy_s.c test_strfirstchar_s.c test_strstr_s.c test_memmove16_s.c test_strfirstdiff_s.c test_strtok_s.c test_memmove32_s.c test_strfirstsame_s.c test_strtolowercase_s.c test_memmove_s.c test_strisalphanumeric_s.c test_strtouppercase_s.c test_memset16_s.c test_strisascii_s.c test_strzero_s.c test_memset32_s.c test_strisdigit_s.c test_wcpcpy_s.c test_memset_s.c test_strishex_s.c test_wcscat_s.c test_memzero16_s.c test_strislowercase_s.c test_wcscpy_s.c test_memzero32_s.c test_strismixed_s.c test_wcsncat_s.c test_memzero_s.c test_strispassword_s.c test_wcsncpy_s.c test_strisuppercase_s.c test_wcsnlen_s.c test_stpcpy_s.c test_strl astchar_s.c test_wmemcmp_s.c test_stpncpy_s.c test_strlastdiff_s.c test_wmemcpy_s.c test_strcasecmp_s.c test_strlastsame_s.c test_wmemmove_s.c test_strcasestr_s.c test_strljustify_s.c test_wmemset_s.c test_strcat_s.c test_strncat_s.c test_strcmpfld_s.c test_strncpy_s.c +diff -r 5a30b6b09e77 tboot/Makefile +--- a/tboot/Makefile Fri Dec 10 15:35:42 2021 +0100 b/tboot/Makefile Tue Dec 21 12:40:01 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/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild index 1c4693a6e37b..cdb682a949ff 100644 --- a/sys-boot/tboot/tboot-1.10.3.ebuild +++ b/sys-boot/tboot/tboot-1.10.3.ebuild @@ -26,7 +26,7 @@ RDEPEND="${DEPEND} 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" ) + "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" ) src_configure() { tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP
[gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/files/, sys-boot/tboot/
commit: bac218f11370414dac6378451dddc478e8c0eea7 Author: Christopher Byrne gmail com> AuthorDate: Thu Dec 19 03:32:02 2019 + Commit: Jason Zaman gentoo org> CommitDate: Sun Feb 16 13:34:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac218f1 sys-boot/tboot: remove old 1.9.6_p20171118 Closes: https://github.com/gentoo/gentoo/pull/12528 Package-Manager: Portage-2.3.66, Repoman-2.3.11 Signed-off-by: Salah Coronya gmail.com> Signed-off-by: Jason Zaman gentoo.org> sys-boot/tboot/Manifest| 1 - .../tboot/files/tboot-1.9.5-genkernel-path.patch | 60 --- sys-boot/tboot/tboot-1.9.6_p20171118.ebuild| 67 -- 3 files changed, 128 deletions(-) diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index 558f4ee8baa..e82f629d1eb 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1,2 +1 @@ DIST tboot-1.9.11.tar.gz 709092 BLAKE2B 97b6ea5a09e1adbf1fbdc36516e0e80d3acc67469f297603125542aed8235e6533afb96e6c38885b87e4584392da40d9f65d00eced2b8a87a2ecf61a17c3a985 SHA512 5c2466438ad3ab95ca66fe4d460f4e6b31ccd3c6ac79221b129883df4180fce4878dd07a5f180bb79fae13b59fa90c05aeda7339159d1d950011a59645024b8a -DIST tboot-1.9.6_p20171118.tar.gz 691068 BLAKE2B c269f9b14cb07139983bd3b1c99511458d5ab5bbd74b097d0aa3b32e0c3e9054d0a67ff18ce7b8090389727acdf47b8c48af6599ecb3148a68786083fe8ded73 SHA512 6476b783516909bf9cf10915fc23e71dca03d521dcc7bf71fbd19684c996c2c588955bb8f896f02afe56feddf9c639b6349635651c852a90319429b2943ec950 diff --git a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch deleted file mode 100644 index 4914be6e4e7..000 --- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch +++ /dev/null @@ -1,60 +0,0 @@ -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.0 +0800 -+++ tboot-1.9.5/tboot/20_linux_tboot 2017-08-02 23:33:52.732748172 +0800 -@@ -171,6 +171,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]-* ; do - basename=$(basename $i) - version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") -@@ -217,7 +226,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 -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.0 +0800 -+++ tboot-1.9.5/tboot/20_linux_xen_tboot 2017-08-02 23:34:01.347685520 +0800 -@@ -165,6 +165,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) -@@ -232,7 +241,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.9.6_p20171118.ebuild b/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild deleted file mode 100644 index 1b591eb5a46..000 --- a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic mount-boot - -DESCRIPTION="Performs a measured and verified boot using Intel Trusted Execution Technology" -HOMEPAGE="https://sourceforge.net/projects/tboot/;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/files/, sys-boot/tboot/
commit: 7fac5fc88b4e188d8e6922fc723805ca9e75636d Author: Jason Zaman gentoo org> AuthorDate: Wed Aug 2 15:37:57 2017 + Commit: Jason Zaman gentoo org> CommitDate: Wed Aug 2 15:37:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fac5fc8 sys-boot/tboot: fix grub scripts to find initrd Package-Manager: Portage-2.3.6, Repoman-2.3.1 sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch | 18 ++ .../{tboot-1.9.5.ebuild => tboot-1.9.5-r1.ebuild} | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch index 63e67f119ce..4914be6e4e7 100644 --- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch +++ b/sys-boot/tboot/files/tboot-1.9.5-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-30 17:37:08.625535208 +0800 -+++ tboot-1.9.5/tboot/20_linux_tboot 2016-12-30 17:42:38.405714435 +0800 -@@ -171,6 +171,14 @@ +--- tboot-1.9.5.orig/tboot/20_linux_tboot 2016-12-21 06:29:15.0 +0800 tboot-1.9.5/tboot/20_linux_tboot 2017-08-02 23:33:52.732748172 +0800 +@@ -171,6 +171,15 @@ EOF } ++machine=`uname -m` +case "$machine" in +i?86) GENKERNEL_ARCH="x86" ;; +mips|mips64) GENKERNEL_ARCH="mips" ;; @@ -16,7 +17,7 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do basename=$(basename $i) version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") -@@ -217,7 +225,9 @@ +@@ -217,7 +226,9 @@ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ "initramfs-genkernel-${version}" \ @@ -28,12 +29,13 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot 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-30 17:37:08.628535191 +0800 -+++ tboot-1.9.5/tboot/20_linux_xen_tboot 2016-12-30 17:43:39.112379262 +0800 -@@ -165,6 +165,14 @@ +--- tboot-1.9.5.orig/tboot/20_linux_xen_tboot 2016-12-21 06:29:54.0 +0800 tboot-1.9.5/tboot/20_linux_xen_tboot 2017-08-02 23:34:01.347685520 +0800 +@@ -165,6 +165,15 @@ EOF } ++machine=`uname -m` +case "$machine" in +i?86) GENKERNEL_ARCH="x86" ;; +mips|mips64) GENKERNEL_ARCH="mips" ;; @@ -45,7 +47,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 +240,9 @@ +@@ -232,7 +241,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.5.ebuild b/sys-boot/tboot/tboot-1.9.5-r1.ebuild similarity index 97% rename from sys-boot/tboot/tboot-1.9.5.ebuild rename to sys-boot/tboot/tboot-1.9.5-r1.ebuild index fc626a1cd83..9e6d141c268 100644 --- a/sys-boot/tboot/tboot-1.9.5.ebuild +++ b/sys-boot/tboot/tboot-1.9.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6