* [gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/
@ 2016-08-19 10:07 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-08-19 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 80ac5fd077f9784904755baa7a20ea38bce5bd38
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 10:01:38 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 10:01:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ac5fd0
app-crypt/efitools: Cleanup due to bug #42273
Package-Manager: portage-2.3.0
app-crypt/efitools/Manifest | 2 -
app-crypt/efitools/efitools-1.4.1-r1.ebuild | 23 ------
app-crypt/efitools/efitools-1.4.1-r2.ebuild | 29 --------
app-crypt/efitools/efitools-1.4.1.ebuild | 21 ------
app-crypt/efitools/efitools-1.4.2-r1.ebuild | 25 -------
app-crypt/efitools/efitools-1.4.2.ebuild | 22 ------
app-crypt/efitools/files/xxdi.patch | 110 ----------------------------
app-crypt/efitools/metadata.xml | 4 -
8 files changed, 236 deletions(-)
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 199a3d1..2f220cc 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,3 +1 @@
-DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd
-DIST efitools-1.4.2.tar.gz 97303 SHA256 df7b9d7570b2fb85ee060e14b1952233d28e277f5b2f839c225f093890e5d843 SHA512 19433b6ccc95a18649b05376c0090f4325345d1a9ccf2601e9b4818a7a888379ab1bb620022f393498e520073f06e10962f5322632219fc21da390e4e5cd4c9f WHIRLPOOL 43000942f99fdf888bf2d2447eb28ca5eba9440194f5de71fd4532ad61a3735b23a08e4fdef4f89a9fd06e30537e9f6305e5f320e1c27ab60a6c4cb91762d74d
DIST efitools-1.7.0.tar.bz2 96042 SHA256 6221323665359ded31aefd2979853203cc08509d35bed09b05a28a9c060866ea SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb WHIRLPOOL fc1762b5a35111f5f103273615b03318a4c319147e1e66898ceb748fd767cd977d8cf4d466e2cd7289fea66a755a4b13f44d9f7498a6a2216213045439726bf7
diff --git a/app-crypt/efitools/efitools-1.4.1-r1.ebuild b/app-crypt/efitools/efitools-1.4.1-r1.ebuild
deleted file mode 100644
index c6dd05a..0000000
--- a/app-crypt/efitools/efitools-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- sys-boot/gnu-efi
- app-editors/vim-core
- app-crypt/sbsigntool
- virtual/pkgconfig"
diff --git a/app-crypt/efitools/efitools-1.4.1-r2.ebuild b/app-crypt/efitools/efitools-1.4.1-r2.ebuild
deleted file mode 100644
index 952a8ec..0000000
--- a/app-crypt/efitools/efitools-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- sys-boot/gnu-efi
- dev-perl/File-Slurp
- app-crypt/sbsigntool
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/xxdi.patch
- chmod 755 "${WORKDIR}/${P}/xxdi.pl"
-}
diff --git a/app-crypt/efitools/efitools-1.4.1.ebuild b/app-crypt/efitools/efitools-1.4.1.ebuild
deleted file mode 100644
index 0e95ec1..0000000
--- a/app-crypt/efitools/efitools-1.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- sys-boot/gnu-efi
- virtual/pkgconfig"
diff --git a/app-crypt/efitools/efitools-1.4.2-r1.ebuild b/app-crypt/efitools/efitools-1.4.2-r1.ebuild
deleted file mode 100644
index f231f2c..0000000
--- a/app-crypt/efitools/efitools-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- >=sys-boot/gnu-efi-3.0u
- app-crypt/sbsigntool
- virtual/pkgconfig
- dev-perl/File-Slurp"
diff --git a/app-crypt/efitools/efitools-1.4.2.ebuild b/app-crypt/efitools/efitools-1.4.2.ebuild
deleted file mode 100644
index 9d061cc..0000000
--- a/app-crypt/efitools/efitools-1.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- sys-boot/gnu-efi
- app-crypt/sbsigntool
- virtual/pkgconfig"
diff --git a/app-crypt/efitools/files/xxdi.patch b/app-crypt/efitools/files/xxdi.patch
deleted file mode 100644
index ec62125..0000000
--- a/app-crypt/efitools/files/xxdi.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From gregkh@linuxfoundation.org Sun Sep 1 14:55:47 2013
-Date: Sun, 1 Sep 2013 14:58:15 -0700
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-To: James Bottomley <James.Bottomley@HansenPartnership.com>
-Cc: JBottomley@Parallels.com, greg@kroah.com
-Subject: [efitools PATCH] Makefile/Make.rules: don't rely on vim-core
-Message-ID: <20130901215815.GA8749@kroah.com>
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-Subject: Makefile/Make.rules: don't rely on vim-core
-
-This adds the xxdi.pl script to replace the call to 'xxd -i', removing a
-build dependancy on vim-core, which some distros don't really want to
-have (i.e. Gentoo and its build derivatives like ChromeOS and CoreOS.)
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Make.rules | 2 +-
- Makefile | 2 +-
- xxdi.pl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 52 insertions(+), 2 deletions(-)
- create mode 100755 xxdi.pl
-
-diff --git a/Make.rules b/Make.rules
-index 419b3b9..309b231 100644
---- a/Make.rules
-+++ b/Make.rules
-@@ -38,7 +38,7 @@ endif
- nm -D $@ | grep ' U ' && exit 1 || exit 0
-
- %.h: %.auth
-- xxd -i $< > $@
-+ ./xxdi.pl $< > $@
-
- %.hash: %.efi hash-to-efi-sig-list
- ./hash-to-efi-sig-list $< $@
-diff --git a/Makefile b/Makefile
-index 52f4551..a39cafe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,7 +62,7 @@ DB.auth: DB.esl KEK.crt sign-efi-sig-list
-
- hashlist.h: HashTool.hash
- cat $^ > /tmp/tmp.hash
-- xxd -i /tmp/tmp.hash > $@
-+ ./xxdi.pl /tmp/tmp.hash > $@
- rm -f /tmp/tmp.hash
-
-
-diff --git a/xxdi.pl b/xxdi.pl
-new file mode 100755
-index 0000000..acc974c
---- /dev/null
-+++ b/xxdi.pl
-@@ -0,0 +1,50 @@
-+#!/usr/bin/env perl
-+#
-+# xxdi.pl - perl implementation of 'xxd -i' mode
-+#
-+# Copyright 2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-+# Copyright 2013 Linux Foundation
-+#
-+# Released under the GPLv2.
-+#
-+# Implements the "basic" functionality of 'xxd -i' in perl to keep build
-+# systems from having to build/install/rely on vim-core, which not all
-+# distros want to do. But everyone has perl, so use it instead.
-+#
-+
-+use strict;
-+use warnings;
-+use File::Slurp qw(slurp);
-+
-+my $indata = slurp(@ARGV ? $ARGV[0] : \*STDIN);
-+my $len_data = length($indata);
-+my $num_digits_per_line = 12;
-+my $var_name;
-+my $outdata;
-+
-+# Use the variable name of the file we read from, converting '/' and '.
-+# to '_', or, if this is stdin, just use "stdin" as the name.
-+if (@ARGV) {
-+ $var_name = $ARGV[0];
-+ $var_name =~ s/\//_/g;
-+ $var_name =~ s/\./_/g;
-+} else {
-+ $var_name = "stdin";
-+}
-+
-+$outdata .= "unsigned char $var_name\[] = {";
-+
-+# trailing ',' is acceptable, so instead of duplicating the logic for
-+# just the last character, live with the extra ','.
-+for (my $key= 0; $key < $len_data; $key++) {
-+ if ($key % $num_digits_per_line == 0) {
-+ $outdata .= "\n\t";
-+ }
-+ $outdata .= sprintf("0x%.2x, ", ord(substr($indata, $key, 1)));
-+}
-+
-+$outdata .= "\n};\nunsigned int $var_name\_len = $len_data;\n";
-+
-+binmode STDOUT;
-+print {*STDOUT} $outdata;
-+
---
-1.8.4.6.g82e253f.dirty
-
-
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index a07164c..097975e 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>gregkh@gentoo.org</email>
- <description>do whatever</description>
-</maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/
@ 2019-05-09 17:11 Matthew Thode
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Thode @ 2019-05-09 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 4da74a6e48c28eb482c792143e39d50cc933fd9a
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 17:10:30 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu May 9 17:11:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da74a6e
app-crypt/efitools: 1.9.2 bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
app-crypt/efitools/Manifest | 1 +
app-crypt/efitools/efitools-1.9.2.ebuild | 52 ++++++++++++++++++++++
.../efitools-1.9.2-libressl-compatibility.patch | 11 +++++
3 files changed, 64 insertions(+)
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 5ec4d217cb4..810a8ecac0c 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,2 +1,3 @@
DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
+DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
new file mode 100644
index 00000000000..d7fc14afab8
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl static"
+
+LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ sys-apps/util-linux"
+
+DEPEND="${RDEPEND}
+ app-crypt/sbsigntools
+ dev-perl/File-Slurp
+ static? ( ${LIB_DEPEND} )
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/1.7.0-Make.rules.patch"
+ "${FILESDIR}/${P}-libressl-compatibility.patch"
+)
+
+src_prepare() {
+ if use static; then
+ append-ldflags -static
+ sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+ Makefile || die
+ fi
+
+ # Respect users CFLAGS
+ sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
+
+ # Respect users LDFLAGS
+ sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
+ sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
+
+ # Run 'default', to apply user patches
+ default
+}
diff --git a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
new file mode 100644
index 00000000000..876baae16f8
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/cert-to-efi-hash-list.c 2018-04-21 20:59:24.814748503 +0200
++++ b/cert-to-efi-hash-list.c 2018-04-21 20:59:51.868581307 +0200
+@@ -135,7 +135,7 @@
+ X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+ unsigned char *cert_buf = NULL;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
+ #else
+ int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/
@ 2021-10-06 3:36 Matthias Maier
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Maier @ 2021-10-06 3:36 UTC (permalink / raw
To: gentoo-commits
commit: 915705ee5db3fff848c1af34db5aa4a68320619b
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 6 03:35:27 2021 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Oct 6 03:36:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915705ee
app-crypt/efitools: do not call ar directly
Closes: https://bugs.gentoo.org/744919
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-crypt/efitools/efitools-1.8.1.ebuild | 1 +
app-crypt/efitools/efitools-1.9.2.ebuild | 1 +
app-crypt/efitools/files/1.8.1-respect-ar.patch | 25 +++++++++++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 3d0ff6e70f2..ebac350dbca 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/1.7.0-Make.rules.patch"
+ "${FILESDIR}/1.8.1-respect-ar.patch"
)
src_prepare() {
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
index 2f10592f3b1..ac731ef3bd0 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/1.7.0-Make.rules.patch"
+ "${FILESDIR}/1.8.1-respect-ar.patch"
)
src_prepare() {
diff --git a/app-crypt/efitools/files/1.8.1-respect-ar.patch b/app-crypt/efitools/files/1.8.1-respect-ar.patch
new file mode 100644
index 00000000000..36e6620119f
--- /dev/null
+++ b/app-crypt/efitools/files/1.8.1-respect-ar.patch
@@ -0,0 +1,25 @@
+From 81503d7a43b99c036758d05c1794502c09189fa4 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Tue, 5 Oct 2021 22:27:52 -0500
+Subject: [PATCH] Do not use ar directly
+
+---
+ Make.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.rules b/Make.rules
+index e46d407..767070d 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -129,7 +129,7 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else ec
+ # sbsign --key KEK.key --cert KEK.crt --output $@ $<
+
+ %.a:
+- ar rcv $@ $^
++ $(AR) rcv $@ $^
+
+ doc/%.1: doc/%.1.in %
+ $(HELP2MAN) --no-info -i $< -o $@ ./$*
+--
+2.32.0
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/
@ 2022-10-24 21:02 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-10-24 21:02 UTC (permalink / raw
To: gentoo-commits
commit: ddd706d317284d5120b833e1185d64708961ba7d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 21:02:27 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 21:02:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd706d3
app-crypt/efitools: update EAPI 6 -> 8
Bug: https://bugs.gentoo.org/794766
Bug: https://bugs.gentoo.org/816555
Bug: https://bugs.gentoo.org/816558
Bug: https://bugs.gentoo.org/876379
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-crypt/efitools/efitools-1.9.2-r1.ebuild | 52 +++++++++++
app-crypt/efitools/files/1.9.2-Makefile.patch | 121 ++++++++++++++++++++++++++
app-crypt/efitools/files/1.9.2-clang16.patch | 108 +++++++++++++++++++++++
3 files changed, 281 insertions(+)
diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..ae06bba83d82
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="dev-libs/openssl:=[static-libs(+)]"
+
+RDEPEND="
+ !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ sys-apps/util-linux"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ sys-boot/gnu-efi"
+BDEPEND="
+ app-crypt/sbsigntools
+ dev-perl/File-Slurp
+ sys-apps/help2man
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/1.9.2-clang16.patch
+ "${FILESDIR}"/1.9.2-Makefile.patch
+)
+
+src_prepare() {
+ default
+
+ # Let it build with clang
+ if tc-is-clang; then
+ sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
+ fi
+
+ if use static; then
+ append-ldflags -static
+ export STATIC_FLAG=--static
+ fi
+}
+
+src_configure() {
+ tc-export AR CC LD NM OBJCOPY PKG_CONFIG
+}
diff --git a/app-crypt/efitools/files/1.9.2-Makefile.patch b/app-crypt/efitools/files/1.9.2-Makefile.patch
new file mode 100644
index 000000000000..e8e99b1858a5
--- /dev/null
+++ b/app-crypt/efitools/files/1.9.2-Makefile.patch
@@ -0,0 +1,121 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,6 +21,8 @@
+ KEYBLACKLISTAUTH = $(ALLKEYS:=-blacklist.auth)
+ KEYHASHBLACKLISTAUTH = $(ALLKEYS:=-hash-blacklist.auth)
+
++SSL_LIBS = $(shell $(PKG_CONFIG) $(STATIC_FLAG) --libs libcrypto)
++
+ export TOPDIR := $(shell pwd)/
+
+ include Make.rules
+@@ -88,31 +90,31 @@
+ ShimReplace.so: lib/lib-efi.a
+
+ cert-to-efi-sig-list: cert-to-efi-sig-list.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+
+ sig-list-to-certs: sig-list-to-certs.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+
+ sign-efi-sig-list: sign-efi-sig-list.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+
+ hash-to-efi-sig-list: hash-to-efi-sig-list.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+
+ cert-to-efi-hash-list: cert-to-efi-hash-list.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+
+ efi-keytool: efi-keytool.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+
+ efi-readvar: efi-readvar.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+
+ efi-updatevar: efi-updatevar.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+
+ flash-var: flash-var.o lib/lib.a
+- $(CC) $(ARCH3264) -o $@ $< lib/lib.a
++ $(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+
+ clean:
+ rm -f PK.* KEK.* DB.* $(EFIFILES) $(EFISIGNED) $(BINARIES) *.o *.so
+--- a/Make.rules
++++ b/Make.rules
+@@ -15,8 +15,7 @@
+ endif
+ INCDIR = -I$(TOPDIR)include/ -I/usr/include/efi -I/usr/include/efi/$(ARCH) -I/usr/include/efi/protocol
+ CPPFLAGS = -DCONFIG_$(ARCH)
+-CFLAGS = -O2 -g $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
+-LDFLAGS = -nostdlib
++CFLAGS += $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
+ CRTOBJ = crt0-efi-$(ARCH).o
+ CRTPATHS = /lib /lib64 /lib/efi /lib64/efi /usr/lib /usr/lib64 /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi
+ CRTPATH = $(shell for f in $(CRTPATHS); do if [ -e $$f/$(CRTOBJ) ]; then echo $$f; break; fi; done)
+@@ -24,10 +23,9 @@
+ # there's a bug in the gnu tools ... the .reloc section has to be
+ # aligned otherwise the file alignment gets screwed up
+ LDSCRIPT = elf_$(ARCH)_efi.lds
+-LDFLAGS += -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -L /usr/lib -L /usr/lib64 -T $(LDSCRIPT)
++LIBS += -nostdlib -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT)
+ LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
+ FORMAT = --target=efi-app-$(ARCH)
+-OBJCOPY = objcopy
+ MYGUID = 11111111-2222-3333-4444-123456789abc
+ INSTALL = install
+ BINDIR = $(DESTDIR)/usr/bin
+@@ -47,12 +45,12 @@
+ endif
+
+ ifeq ($(ARCH),arm)
+- LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++ LIBS += --defsym=EFI_SUBSYSTEM=0x0a
+ FORMAT = -O binary
+ endif
+
+ ifeq ($(ARCH),aarch64)
+- LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++ LIBS += --defsym=EFI_SUBSYSTEM=0x0a
+ FORMAT = -O binary
+ endif
+
+@@ -61,9 +59,9 @@
+ -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
+ -j .reloc $(FORMAT) $*.so $@
+ %.so: %.o
+- $(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES)
++ $(LD) $(LIBS) $^ -o $@ $(LOADLIBES)
+ # check we have no undefined symbols
+- nm -D $@ | grep ' U ' && exit 1 || exit 0
++ $(NM) -D $@ | grep ' U ' && exit 1 || exit 0
+
+ %.h: %.auth
+ ./xxdi.pl $< > $@
+@@ -71,7 +69,7 @@
+ %.hash: %.efi hash-to-efi-sig-list
+ ./hash-to-efi-sig-list $< $@
+
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ ./cert-to-efi-sig-list $< $@
+
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list
+@@ -129,7 +127,7 @@
+ # sbsign --key KEK.key --cert KEK.crt --output $@ $<
+
+ %.a:
+- ar rcv $@ $^
++ $(AR) rcv $@ $^
+
+ doc/%.1: doc/%.1.in %
+ $(HELP2MAN) --no-info -i $< -o $@ ./$*
diff --git a/app-crypt/efitools/files/1.9.2-clang16.patch b/app-crypt/efitools/files/1.9.2-clang16.patch
new file mode 100644
index 000000000000..944a731bcde8
--- /dev/null
+++ b/app-crypt/efitools/files/1.9.2-clang16.patch
@@ -0,0 +1,108 @@
+--- a/cert-to-efi-sig-list.c
++++ b/cert-to-efi-sig-list.c
+@@ -6,7 +6,6 @@
+
+
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/efi-keytool.c
++++ b/efi-keytool.c
+@@ -15,7 +15,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+
+ #include <kernel_efivars.h>
+--- a/efi-readvar.c
++++ b/efi-readvar.c
+@@ -17,7 +17,6 @@
+
+ #include <openssl/x509.h>
+
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+
+ #include <kernel_efivars.h>
+--- a/efi-updatevar.c
++++ b/efi-updatevar.c
+@@ -20,7 +20,6 @@
+ #include <openssl/err.h>
+ #include <openssl/pem.h>
+
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+
+ #include <kernel_efivars.h>
+--- a/flash-var.c
++++ b/flash-var.c
+@@ -1,3 +1,5 @@
++#define _XOPEN_SOURCE 700
++
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+@@ -10,7 +12,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+
+ #include <version.h>
+--- a/hash-to-efi-sig-list.c
++++ b/hash-to-efi-sig-list.c
+@@ -4,7 +4,6 @@
+ * see COPYING file
+ */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/include/variableformat.h
++++ b/include/variableformat.h
+@@ -109,7 +109,7 @@
+
+ #pragma pack()
+
+-inline BOOLEAN
++static inline BOOLEAN
+ IsValidVariableHeader (VARIABLE_HEADER *vh) {
+ if (vh == NULL || vh->StartId != VARIABLE_DATA)
+ return FALSE;
+--- a/lib/kernel_efivars.c
++++ b/lib/kernel_efivars.c
+@@ -16,7 +16,6 @@
+ #include <unistd.h>
+ #include <time.h>
+
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+
+ #include <kernel_efivars.h>
+--- a/sig-list-to-certs.c
++++ b/sig-list-to-certs.c
+@@ -4,7 +4,6 @@
+ * see COPYING file
+ */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/sign-efi-sig-list.c
++++ b/sign-efi-sig-list.c
+@@ -4,7 +4,7 @@
+ * see COPYING file
+ */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
++#define _XOPEN_SOURCE 700
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-24 21:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-09 17:11 [gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/ Matthew Thode
-- strict thread matches above, loose matches on Subject: below --
2022-10-24 21:02 David Seifert
2021-10-06 3:36 Matthias Maier
2016-08-19 10:07 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox