public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/
@ 2016-08-29  1:24 Jason Zaman
  0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2016-08-29  1:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d42fc0f78159ee0896a37e73f5e5c86e67836f78
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 03:38:34 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 01:23:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d42fc0f7

sys-boot/tboot: drop old

Package-Manager: portage-2.2.28

 sys-boot/tboot/Manifest                            |  1 -
 .../tboot/files/tboot-1.8.2-disable-pcid.patch     | 26 --------
 .../tboot/files/tboot-1.8.2-genkernel_arch.patch   | 57 -----------------
 .../tboot/files/tboot-1.8.2-stack-check-no.patch   | 11 ----
 sys-boot/tboot/tboot-1.8.3.ebuild                  | 73 ----------------------
 5 files changed, 168 deletions(-)

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index 5f5644cd..2d382a5 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,2 +1 @@
-DIST tboot-1.8.3.tar.gz 554084 SHA256 2f2e0c3865b45691f76b31730c5aaea2f076e7949ee6309e78ed7f80d8c53d39 SHA512 cde961af07c64a7d8b77f64d48e6d9230048135420e78efc6277f32e4df78012b5bbd73e4f2ce1cd6194091ec306cc84c65356865815a7311e140fd2b94f6443 WHIRLPOOL 030ab29ee710c6201e894abfd693944490c157b2607425dd6d476f836a635ee7f82c29180ad13fc80508596dc62148aa1c108bd7aba1c9ca7329f99197d97db6
 DIST tboot-1.9.4.tar.gz 2107175 SHA256 7167e5615def4ac0f25b2f9139b3d361a0a20d91386d80b1d865107b3f552f39 SHA512 93db95be54a1286dffe87cf6f5d1e31ac0c4a452b11a11789fec66255c847a9e14251579de0f6ba4c5c122423b45e83751a8287d37e27ea3acba608774d7ac0b WHIRLPOOL 2bf9220317dc5bbc927fb10d07a1d7f5cef2d5351fbf81e45f276b5f317785c1cfc1f1e4b78ac426bceb66641339d7179bff8fbbb867b67aa215544193a5baa1

diff --git a/sys-boot/tboot/files/tboot-1.8.2-disable-pcid.patch b/sys-boot/tboot/files/tboot-1.8.2-disable-pcid.patch
deleted file mode 100644
index 383338e..00000000
--- a/sys-boot/tboot/files/tboot-1.8.2-disable-pcid.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur tboot-1.8.2.orig/tboot/common/shutdown.S tboot-1.8.2/tboot/common/shutdown.S
---- tboot-1.8.2.orig/tboot/common/shutdown.S	2014-07-28 12:24:22.000000000 +0400
-+++ tboot-1.8.2/tboot/common/shutdown.S	2015-05-07 03:05:47.300985413 +0400
-@@ -34,6 +34,11 @@
-  */
- 
- compat_mode_entry:
-+	/* Disable PCID */
-+        movl %cr4, %eax
-+        andl $~CR4_PCIDE, %eax
-+        movl %eax, %cr4
-+
- 	/* Disable paging and therefore leave 64 bit mode. */
-         movl %cr0, %eax
-         andl $~CR0_PG, %eax
-diff -ur tboot-1.8.2.orig/tboot/include/processor.h tboot-1.8.2/tboot/include/processor.h
---- tboot-1.8.2.orig/tboot/include/processor.h	2014-07-28 12:24:22.000000000 +0400
-+++ tboot-1.8.2/tboot/include/processor.h	2015-05-07 03:04:58.721244858 +0400
-@@ -92,6 +92,7 @@
- #define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */
- #define CR4_VMXE 0x00002000/* enable VMX */
- #define CR4_SMXE 0x00004000/* enable SMX */
-+#define CR4_PCIDE 0x00020000/* enable PCID */
- 
- #ifndef __ASSEMBLY__
- 

diff --git a/sys-boot/tboot/files/tboot-1.8.2-genkernel_arch.patch b/sys-boot/tboot/files/tboot-1.8.2-genkernel_arch.patch
deleted file mode 100644
index 7fdcad6..00000000
--- a/sys-boot/tboot/files/tboot-1.8.2-genkernel_arch.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru tboot-1.8.2.orig/tboot/20_linux_tboot tboot-1.8.2/tboot/20_linux_tboot
---- tboot-1.8.2.orig/tboot/20_linux_tboot	2014-08-02 00:18:58.397147454 +0400
-+++ tboot-1.8.2/tboot/20_linux_tboot	2014-08-02 00:20:09.766700748 +0400
-@@ -121,6 +121,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")
-@@ -159,6 +168,8 @@
- 		 "initrd-${version}" "initramfs-${version}.img" \
- 		 "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- 		 "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-+		 "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-+		 "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
- 		 "initramfs-genkernel-${version}" \
- 		 "initramfs-genkernel-${alt_version}"; do
- 	    if test -e "${dirname}/${i}" ; then
-diff -ru tboot-1.8.2.orig/tboot/20_linux_xen_tboot tboot-1.8.2/tboot/20_linux_xen_tboot
---- tboot-1.8.2.orig/tboot/20_linux_xen_tboot	2014-08-02 00:18:58.397147454 +0400
-+++ tboot-1.8.2/tboot/20_linux_xen_tboot	2014-08-02 00:21:12.840438230 +0400
-@@ -147,6 +147,16 @@
- if [ "x${linux_list}" = "x" ] ; then
-     exit 0
- fi
-+
-+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
-+
- xen_list=`for i in /boot/xen*; do
-         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-       done`
-@@ -188,6 +198,8 @@
-             for i in "initrd.img-${version}" "initrd-${version}.img" \
-                 "initrd-${version}" "initrd.img-${alt_version}" \
-                 "initrd-${alt_version}.img" "initrd-${alt_version}" \
-+                "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-+                "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
-                 "initramfs-genkernel-${version}" \
-                 "initramfs-genkernel-${alt_version}" ; do
-                 if test -e "${dirname}/${i}" ; then

diff --git a/sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch b/sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch
deleted file mode 100644
index 5d2ea62..00000000
--- a/sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur tboot-1.8.2.orig/tboot/Config.mk tboot-1.8.2/tboot/Config.mk
---- tboot-1.8.2.orig/tboot/Config.mk	2014-07-28 12:24:21.000000000 +0400
-+++ tboot-1.8.2/tboot/Config.mk	2015-05-05 02:14:26.333222301 +0400
-@@ -30,6 +30,7 @@
- CFLAGS		+= $(call cc-option,$(CC),-nopie,)
- CFLAGS		+= $(call cc-option,$(CC),-fno-stack-protector,)
- CFLAGS		+= $(call cc-option,$(CC),-fno-stack-protector-all,)
-+CFLAGS		+= $(call cc-option,$(CC),-fstack-check=no,)
- 
- # changeset variable for banner
- CFLAGS		+= -DTBOOT_CHANGESET=\""$(shell ((hg parents --template "{isodate|isodate} {rev}:{node|short}" >/dev/null && hg parents --template "{isodate|isodate} {rev}:{node|short}") || echo "2014-07-28 12:00 +0800 1.8.2") 2>/dev/null)"\"

diff --git a/sys-boot/tboot/tboot-1.8.3.ebuild b/sys-boot/tboot/tboot-1.8.3.ebuild
deleted file mode 100644
index 7a23f65..00000000
--- a/sys-boot/tboot/tboot-1.8.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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"
-
-RESTRICT="test" # test is restricted because it requires patching the kernel src
-
-DEPEND="app-crypt/trousers
-app-crypt/tpm-tools"
-
-RDEPEND="${DEPEND}
-sys-boot/grub:2
-selinux? ( sec-policy/selinux-tboot )"
-
-DOCS=(README COPYING CHANGELOG)
-
-src_prepare() {
-	epatch "${FILESDIR}/tboot-1.8.2-genkernel_arch.patch"
-	epatch "${FILESDIR}/tboot-1.8.2-stack-check-no.patch" # breaks with ssp
-	epatch "${FILESDIR}/tboot-1.8.2-disable-pcid.patch" # PaX enables pcid
-
-	sed -i 's/ -Werror//g' Config.mk || die
-	sed -i 's/^INSTALL_STRIP = -s$//' Config.mk || die # QA Errors
-
-	epatch_user
-}
-
-src_compile() {
-	use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-	if use amd64; then
-		MAKEARGS="TARGET_ARCH=x86_64"
-	else
-		MAKEARGS="TARGET_ARCH=i686"
-	fi
-
-	emake debug=y ${MAKEARGS} build
-}
-
-src_install() {
-	emake DISTDIR="${D}" install
-
-	dodoc "${DOCS[@]}"
-	dodoc docs/*.txt lcptools/*.{txt,pdf} || die "docs failed"
-
-	cd "${D}"
-	mkdir -p usr/lib/tboot/ || die
-	mv boot usr/lib/tboot/ || die
-}
-
-pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	cp ${ROOT%/}/usr/lib/tboot/boot/* ${ROOT%/}/boot/
-
-	mount-boot_pkg_postinst
-
-	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/"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/
@ 2016-12-30  9:54 Jason Zaman
  0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2016-12-30  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b46b07e906bce2e6697c2c42ba2c446c2e7734b2
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 09:52:08 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 09:54:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46b07e9

sys-boot/tboot: bump to 1.9.5

Package-Manager: portage-2.3.0

 sys-boot/tboot/Manifest                            |  1 +
 .../tboot/files/tboot-1.9.5-genkernel-path.patch   | 58 +++++++++++++++++
 sys-boot/tboot/tboot-1.9.5.ebuild                  | 72 ++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index a627cac..6d9c045 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,2 +1,3 @@
 DIST tboot-1.9.4.tar.gz 2107175 SHA256 7167e5615def4ac0f25b2f9139b3d361a0a20d91386d80b1d865107b3f552f39 SHA512 93db95be54a1286dffe87cf6f5d1e31ac0c4a452b11a11789fec66255c847a9e14251579de0f6ba4c5c122423b45e83751a8287d37e27ea3acba608774d7ac0b WHIRLPOOL 2bf9220317dc5bbc927fb10d07a1d7f5cef2d5351fbf81e45f276b5f317785c1cfc1f1e4b78ac426bceb66641339d7179bff8fbbb867b67aa215544193a5baa1
 DIST tboot-1.9.4_p20161101.tar.gz 578097 SHA256 d6a399488fde1d0993a65bcb283cec218c7c8572972d2fdda8422fc2a1b5513f SHA512 6a38148d7be4faf8ec86f2f8e3c342321b7d8d4920a631b0e1b74bd27578039f4ae20faffae877ed8db5dd14500c059a3efd3eed24f22099820e87a67d3ecc17 WHIRLPOOL 316e3ac4965108a63ebf6075b50fb24b5c0a0c1527cb43309b95c64e60a0b6e5b3287e4b19faa8405ab10cf268b975cfd93d6348253a2d3fa07e78f38ef1eac8
+DIST tboot-1.9.5.tar.gz 685460 SHA256 c7032e367ac0129493c9bb1fcd1437f400ff5533c970119ddce281ff4d58a13f SHA512 d806b692d3d57d0aaf4095ef514a2859b2b054ec695cb5589b3a6133eec7f7a9a0e76544e4b557df02add5ed67c3c15fb3ee5f17d6438252b659d6e5c7d17fe9 WHIRLPOOL 04843854b1a646d6126079a3b46bacf0c8191d5b5c322f8bc04ea39c0d5470bba2f7f2499761d42aa258552c1dfbeb626275e7473628b21719a6fe59bc05029c

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
new file mode 100644
index 00000000..63e67f1
--- /dev/null
+++ b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch
@@ -0,0 +1,58 @@
+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 @@
+ EOF
+ }
+ 
++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 +225,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-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 @@
+ EOF
+ }
+ 
++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 +240,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.5.ebuild b/sys-boot/tboot/tboot-1.9.5.ebuild
new file mode 100644
index 00000000..6e926b8
--- /dev/null
+++ b/sys-boot/tboot/tboot-1.9.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/"
+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.5-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/*.{txt,pdf} || die "docs failed"
+
+	cd "${D}"
+	mkdir -p usr/lib/tboot/ || die
+	mv boot usr/lib/tboot/ || die
+}
+
+pkg_postinst() {
+	mount-boot_mount_boot_partition
+
+	cp ${ROOT%/}/usr/lib/tboot/boot/* ${ROOT%/}/boot/
+
+	mount-boot_pkg_postinst
+
+	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/"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/
@ 2020-02-16 13:35 Jason Zaman
  0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2020-02-16 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b9f76a244f44802ad1d193ad1f3072a10908b02b
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu Dec 19 03:32:02 2019 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:34:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f76a24

sys-boot/tboot: Bump to 1.9.11 and add libressl support

Closes: https://bugs.gentoo.org/590262
Closes: https://bugs.gentoo.org/677952
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sys-boot/tboot/Manifest                            |  1 +
 .../tboot/files/tboot-1.9.11-genkernel-path.patch  | 62 ++++++++++++++++++++
 sys-boot/tboot/tboot-1.9.11.ebuild                 | 68 ++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index 107717df656..558f4ee8baa 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1 +1,2 @@
+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.11-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch
new file mode 100644
index 00000000000..b2459816068
--- /dev/null
+++ b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch
@@ -0,0 +1,62 @@
+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.9.11.ebuild b/sys-boot/tboot/tboot-1.9.11.ebuild
new file mode 100644
index 00000000000..4778e6215bb
--- /dev/null
+++ b/sys-boot/tboot/tboot-1.9.11.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 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 libressl selinux"
+
+# requires patching the kernel src
+RESTRICT="test"
+
+DEPEND="app-crypt/trousers
+app-crypt/tpm-tools
+!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.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 || die "docs failed"
+
+	cd "${D}"
+	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/"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/
@ 2021-12-20  0:55 John Helmert III
  0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2021-12-20  0:55 UTC (permalink / raw
  To: gentoo-commits

commit:     61d9c34970e78d9afc98ce07f9e5360be7690b13
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sun Dec 19 22:44:09 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 00:54:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d9c349

sys-boot/tboot: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17607
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-boot/tboot/Manifest                            |  1 -
 .../tboot/files/tboot-1.9.11-genkernel-path.patch  | 62 --------------------
 sys-boot/tboot/tboot-1.9.11-r1.ebuild              | 68 ----------------------
 3 files changed, 131 deletions(-)

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index 377ec022f4d8..af909f3a1a02 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,2 +1 @@
 DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77
-DIST tboot-1.9.11.tar.gz 709092 BLAKE2B 97b6ea5a09e1adbf1fbdc36516e0e80d3acc67469f297603125542aed8235e6533afb96e6c38885b87e4584392da40d9f65d00eced2b8a87a2ecf61a17c3a985 SHA512 5c2466438ad3ab95ca66fe4d460f4e6b31ccd3c6ac79221b129883df4180fce4878dd07a5f180bb79fae13b59fa90c05aeda7339159d1d950011a59645024b8a

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.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/"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/
@ 2021-12-20  0:55 John Helmert III
  0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2021-12-20  0:55 UTC (permalink / raw
  To: gentoo-commits

commit:     302e8ab6fca4bb824c4b9b657fa454ad163ff10e
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sun Dec 19 22:44:08 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 00:54:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302e8ab6

sys-boot/tboot: Bump to 1.10.3

Closes: https://bugs.gentoo.org/709990
Closes: https://bugs.gentoo.org/725714
Closes: https://bugs.gentoo.org/743439
Closes: https://bugs.gentoo.org/783198
Closes: https://bugs.gentoo.org/815370
Closes: https://github.com/gentoo/gentoo/pull/15053
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-boot/tboot/Manifest                            |  1 +
 .../tboot/files/tboot-1.10.3-disable-Werror.patch  | 12 ++++
 .../tboot/files/tboot-1.10.3-disable-strip.patch   | 14 +++++
 sys-boot/tboot/tboot-1.10.3.ebuild                 | 65 ++++++++++++++++++++++
 4 files changed, 92 insertions(+)

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index e82f629d1eb6..377ec022f4d8 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1 +1,2 @@
+DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77
 DIST tboot-1.9.11.tar.gz 709092 BLAKE2B 97b6ea5a09e1adbf1fbdc36516e0e80d3acc67469f297603125542aed8235e6533afb96e6c38885b87e4584392da40d9f65d00eced2b8a87a2ecf61a17c3a985 SHA512 5c2466438ad3ab95ca66fe4d460f4e6b31ccd3c6ac79221b129883df4180fce4878dd07a5f180bb79fae13b59fa90c05aeda7339159d1d950011a59645024b8a

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/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild
new file mode 100644
index 000000000000..82f0b645458c
--- /dev/null
+++ b/sys-boot/tboot/tboot-1.10.3.ebuild
@@ -0,0 +1,65 @@
+# 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" )
+
+src_configure() {
+	tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP
+
+	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/"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/
@ 2021-12-21  1:56 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-12-21  1:56 UTC (permalink / raw
  To: gentoo-commits

commit:     a347efebb631f7cda18364295afe2858c11a36b1
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Mon Dec 20 17:31:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 01:39:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a347efeb

sys-boot/tboot: Don't call strip directly

Closes: https://bugs.gentoo.org/829696
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23439
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../tboot/files/tboot-1.10.3-dont-call-strip-directly.patch  | 12 ++++++++++++
 sys-boot/tboot/tboot-1.10.3.ebuild                           |  5 +++--
 2 files changed, 15 insertions(+), 2 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
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/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild
index 82f0b645458c..1c4693a6e37b 100644
--- a/sys-boot/tboot/tboot-1.10.3.ebuild
+++ b/sys-boot/tboot/tboot-1.10.3.ebuild
@@ -25,10 +25,11 @@ 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-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
+	tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP
 
 	default
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-21  1:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-20  0:55 [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/, sys-boot/tboot/files/ John Helmert III
  -- strict thread matches above, loose matches on Subject: below --
2021-12-21  1:56 Sam James
2021-12-20  0:55 John Helmert III
2020-02-16 13:35 Jason Zaman
2016-12-30  9:54 Jason Zaman
2016-08-29  1:24 Jason Zaman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox