[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2023-06-21 Thread Sam James 
commit: ae1e332058fc483a5d8d7804d34f369f4566638e
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 22 01:52:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 22 01:52:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae1e3320

app-crypt/efitools: filter LTO

Calls LD directly and doesn't respect LDFLAGS. Low level tool with a history
of e.g. segfaulting with new openssl, so let's not risk anything anyway.

Closes: https://bugs.gentoo.org/908813
Signed-off-by: Sam James  gentoo.org>

 app-crypt/efitools/efitools-1.9.2-r1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild 
b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
index c10f01e423d3..0deba136bb4c 100644
--- a/app-crypt/efitools/efitools-1.9.2-r1.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -48,5 +48,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # Calls LD directly, doesn't respect LDFLAGS. Low level package anyway.
+   # See bug #908813.
+   filter-lto
+
tc-export AR CC LD NM OBJCOPY PKG_CONFIG
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/

2023-01-08 Thread Conrad Kostecki 
commit: 7a5d447c22e3b07b529d014df084a5af38803dee
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jan  8 15:10:43 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jan  8 22:09:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5d447c

app-crypt/efitools: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29016
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-crypt/efitools/files/1.7.0-Make.rules.patch | 11 ---
 app-crypt/efitools/files/1.8.1-respect-ar.patch | 25 -
 2 files changed, 36 deletions(-)

diff --git a/app-crypt/efitools/files/1.7.0-Make.rules.patch 
b/app-crypt/efitools/files/1.7.0-Make.rules.patch
deleted file mode 100644
index 89665ab3b690..
--- a/app-crypt/efitools/files/1.7.0-Make.rules.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/Make.rules
-+++ b/Make.rules
-@@ -71,7 +71,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

diff --git a/app-crypt/efitools/files/1.8.1-respect-ar.patch 
b/app-crypt/efitools/files/1.8.1-respect-ar.patch
deleted file mode 100644
index 36e6620119f3..
--- a/app-crypt/efitools/files/1.8.1-respect-ar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 81503d7a43b99c036758d05c1794502c09189fa4 Mon Sep 17 00:00:00 2001
-From: Matthias Maier 
-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
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2023-01-03 Thread Sam James 
commit: bcb662dd739c33566d234ad09a9624d3c4d1dc69
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  4 03:53:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 04:31:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb662dd

app-crypt/efitools: drop 1.9.2

Bug: https://bugs.gentoo.org/888457
Signed-off-by: Sam James  gentoo.org>

 app-crypt/efitools/efitools-1.9.2.ebuild | 56 
 1 file changed, 56 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
deleted file mode 100644
index ac731ef3bd03..
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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="static"
-
-LIB_DEPEND="dev-libs/openssl: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}/1.8.1-respect-ar.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
-
-   # Let it build with clang.
-   if tc-is-clang; then
-   sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || 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
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2022-12-25 Thread Sam James 
commit: 4580af671c4e0598e88cc418f795c4eb53f8e5df
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 25 21:23:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 25 21:24:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4580af67

app-crypt/efitools: Stabilize 1.9.2-r1 x86, #888457

Signed-off-by: Sam James  gentoo.org>

 app-crypt/efitools/efitools-1.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild 
b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
index ae06bba83d82..1a474b12e7fb 100644
--- a/app-crypt/efitools/efitools-1.9.2-r1.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="static"
 
 LIB_DEPEND="dev-libs/openssl:=[static-libs(+)]"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2022-12-25 Thread Sam James 
commit: abba3b8f881f8a0b87c1b1e946b4b9af518ac9a7
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 25 21:24:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 25 21:24:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abba3b8f

app-crypt/efitools: Stabilize 1.9.2-r1 amd64, #888457

Signed-off-by: Sam James  gentoo.org>

 app-crypt/efitools/efitools-1.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild 
b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
index 1a474b12e7fb..c10f01e423d3 100644
--- a/app-crypt/efitools/efitools-1.9.2-r1.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static"
 
 LIB_DEPEND="dev-libs/openssl:=[static-libs(+)]"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/

2022-10-24 Thread David Seifert 
commit: ddd706d317284d5120b833e1185d64708961ba7d
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 24 21:02:27 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 24 21:02:27 2022 +
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  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 ..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 ..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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2022-07-24 Thread David Seifert 
commit: 4d982d2995901365dae7c35ef8c87137db9738bd
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jul 24 08:37:23 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul 24 08:37:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d982d29

app-crypt/efitools: drop 1.8.1

Signed-off-by: David Seifert  gentoo.org>

 app-crypt/efitools/Manifest  |  1 -
 app-crypt/efitools/efitools-1.8.1.ebuild | 51 
 2 files changed, 52 deletions(-)

diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index f6d9e8258627..aced0dc8f91c 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,2 +1 @@
-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.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
deleted file mode 100644
index ebac350dbca7..
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 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="static"
-
-LIB_DEPEND="dev-libs/openssl: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}/1.8.1-respect-ar.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
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/

2021-10-05 Thread Matthias Maier 
commit: 915705ee5db3fff848c1af34db5aa4a68320619b
Author: Matthias Maier  gentoo  org>
AuthorDate: Wed Oct  6 03:35:27 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Wed Oct  6 03:36:27 2021 +
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  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 000..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 
+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
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2021-06-27 Thread Sam James 
commit: fd4a0dc9ce0f04f502c14abe27ef2b0ecbbe34dc
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 28 01:35:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 28 01:35:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd4a0dc9

app-crypt/efitools: Stabilize 1.9.2 x86, #691420

Signed-off-by: Sam James  gentoo.org>

 app-crypt/efitools/efitools-1.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
index 8a9b2350676..2f10592f3b1 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static"
 
 LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2021-06-27 Thread Matthias Maier 
commit: 8a34e13e64f60e6abe223bdf1dabe8fb96db3f0e
Author: Manoj Gupta  google  com>
AuthorDate: Thu May 20 22:05:14 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jun 27 18:25:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a34e13e

app-crypt/efitools: Fix building with clang

clang does not support -fno-toplevel-reorder. So remove
it for clang builds.

Signed-off-by: Manoj Gupta  google.com>
Signed-off-by: Matthias Maier  gentoo.org>

 app-crypt/efitools/efitools-1.9.2.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
index 5bdfdc91102..8a9b2350676 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -38,6 +38,11 @@ src_prepare() {
Makefile || die
fi
 
+   # Let it build with clang.
+   if tc-is-clang; then
+   sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
+   fi
+
# Respect users CFLAGS
sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/

2021-05-03 Thread Sam James 
commit: 3f4121e7e372c1009b984881906e0aa254124309
Author: Sam James  gentoo  org>
AuthorDate: Mon May  3 18:33:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  3 18:45:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4121e7

app-crypt/efitools: drop obsolete LibreSSL patch

Signed-off-by: Sam James  gentoo.org>

 .../files/efitools-1.8.1-libressl-compatibility.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git 
a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch 
b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
deleted file mode 100644
index 876baae16f8..000
--- a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 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 < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   int cert_len = i2d_X509_CINF(cert->cert_info, _buf);
- #else
-   int cert_len = i2d_re_X509_tbs(cert, _buf);

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2021-05-02 Thread Mikle Kolyada 
commit: 56dbead6c7b808a0d607928bc86e5166541536d4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 17:14:13 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 17:22:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56dbead6

app-crypt/efitools: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-crypt/efitools/efitools-1.8.1.ebuild | 8 +++-
 app-crypt/efitools/efitools-1.9.2.ebuild | 8 +++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 94d636eec26..3d0ff6e70f2 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,9 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl static"
+IUSE="static"
 
-LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
 
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
sys-apps/util-linux"
@@ -30,7 +29,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/1.7.0-Make.rules.patch"
-   "${FILESDIR}/${P}-libressl-compatibility.patch"
 )
 
 src_prepare() {

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
index 542f32ac091..5bdfdc91102 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,9 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="libressl static"
+IUSE="static"
 
-LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
 
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
sys-apps/util-linux"
@@ -30,7 +29,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/1.7.0-Make.rules.patch"
-   "${FILESDIR}/${PN}-1.8.1-libressl-compatibility.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2020-09-26 Thread Aaron Bauman 
commit: 0a33aa653f28d4b7c003f1b0721eb52daf1e2724
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Sep 26 13:43:40 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Sep 26 14:33:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a33aa65

app-crypt/efitools: drop old EAPI=5

Signed-off-by: Aaron Bauman  gentoo.org>

 app-crypt/efitools/Manifest  |  1 -
 app-crypt/efitools/efitools-1.7.0.ebuild | 33 
 2 files changed, 34 deletions(-)

diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 810a8ecac0c..f6d9e825862 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,3 +1,2 @@
-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.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
deleted file mode 100644
index c47c9b03a9e..000
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2
 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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/sbsigntools
-   virtual/pkgconfig
-   dev-perl/File-Slurp"
-
-S=${WORKDIR}/v${PV}
-
-src_prepare() {
-   epatch "${FILESDIR}/1.7.0-Make.rules.patch"
-   epatch_user
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

2019-08-05 Thread Matthias Maier 
commit: 234396453b10f86863b051573f12d184c737a8a2
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Aug  5 14:57:42 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Aug  5 15:02:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23439645

app-crypt/efitools: [QA] drop duplicate patches

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier  gentoo.org>

 app-crypt/efitools/efitools-1.9.2.ebuild  |  2 +-
 .../files/efitools-1.9.2-libressl-compatibility.patch | 11 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
index aaff36b5c9d..542f32ac091 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/1.7.0-Make.rules.patch"
-   "${FILESDIR}/${P}-libressl-compatibility.patch"
+   "${FILESDIR}/${PN}-1.8.1-libressl-compatibility.patch"
 )
 
 src_prepare() {

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
deleted file mode 100644
index 876baae16f8..000
--- a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 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 < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   int cert_len = i2d_X509_CINF(cert->cert_info, _buf);
- #else
-   int cert_len = i2d_re_X509_tbs(cert, _buf);

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2019-08-05 Thread Mikle Kolyada 
commit: 5fa45c1c0bbd82aaa93f3cf569f018939e34ee2d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Aug  5 11:43:44 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Aug  5 11:43:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa45c1c

app-crypt/efitools: amd64 stable wrt bug #691420

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-crypt/efitools/efitools-1.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
index d7fc14afab8..aaff36b5c9d 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="libressl static"
 
 LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/

2019-05-09 Thread Matthew Thode 
commit: 4da74a6e48c28eb482c792143e39d50cc933fd9a
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu May  9 17:10:30 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu May  9 17:11:03 2019 +
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  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 000..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 000..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 < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   int cert_len = i2d_X509_CINF(cert->cert_info, _buf);
+ #else
+   int cert_len = i2d_re_X509_tbs(cert, _buf);

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-07-23 Thread Matthias Maier 
commit: f0cb4e4b72bd2279a9686a93c2e5184674467983
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Jul 23 16:19:58 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jul 23 16:20:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cb4e4b

app-crypt/efitools: take over maintainership

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-crypt/efitools/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index 7a38bb90096..c1f7c0b4ef2 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,5 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   tam...@gentoo.org
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-06-08 Thread Aaron Bauman 
commit: 29f3f3ff28286ebb0c71a885769800a1155ea241
Author: Edward Hyunkoo Jee  google  com>
AuthorDate: Fri Jun  8 06:28:05 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Jun  8 13:06:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f3f3ff

app-crypt/efitools: fix dependency and use toolchain-funcs

This change fixes the issues addressed during the code review at
https://github.com/gentoo/gentoo/pull/8648 .

Fixes: ed1d845779b0 ("app-crypt/efitools: support "static" USE flag")
Closes: https://github.com/gentoo/gentoo/pull/8755

 app-crypt/efitools/efitools-1.8.1.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 0a1ca91df52..6ede95860eb 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic
+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;
@@ -23,10 +23,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 DEPEND="${RDEPEND}
app-crypt/sbsigntool
dev-perl/File-Slurp
-   static? (
-   ${LIB_DEPEND}
-   dev-util/pkgconfig
-   )
+   static? ( ${LIB_DEPEND} )
sys-apps/help2man
sys-boot/gnu-efi
virtual/pkgconfig"
@@ -39,7 +36,8 @@ PATCHES=(
 src_prepare() {
if use static; then
append-ldflags -static
-   sed -i 's/-lcrypto/`pkg-config --static --libs libcrypto`/g' 
Makefile || die
+   sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs 
libcrypto)/g" \
+   Makefile || die
fi
 
# Respect users CFLAGS

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-06-08 Thread Mikle Kolyada 
commit: 361b0bff65a03a3817fc5c0c7fe42c4805faa878
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jun  8 07:10:40 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jun  8 07:11:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361b0bff

app-crypt/efitools: using  in SRC_URI

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/efitools/efitools-1.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 3e25812bea2..0a1ca91df52 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic
 
 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/efitools-1.8.1.tar.gz;
+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"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-06-07 Thread Aaron Bauman 
commit: ed1d845779b056dd89930a60f0b522b512b60729
Author: Edward Hyunkoo Jee  google  com>
AuthorDate: Wed May 30 23:28:37 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Jun  8 01:28:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1d8457

app-crypt/efitools: support "static" USE flag

If "static" USE flag is set, it makes sense to do static link for
user-space executables.

 app-crypt/efitools/efitools-1.8.1.ebuild | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index d27b90b2cbc..3e25812bea2 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -12,15 +12,21 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl"
+IUSE="libressl static"
 
-RDEPEND="!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+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/sbsigntool
dev-perl/File-Slurp
+   static? (
+   ${LIB_DEPEND}
+   dev-util/pkgconfig
+   )
sys-apps/help2man
sys-boot/gnu-efi
virtual/pkgconfig"
@@ -31,6 +37,11 @@ PATCHES=(
 )
 
 src_prepare() {
+   if use static; then
+   append-ldflags -static
+   sed -i 's/-lcrypto/`pkg-config --static --libs libcrypto`/g' 
Makefile || die
+   fi
+
# Respect users CFLAGS
sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-06-07 Thread Aaron Bauman 
commit: feb7b9244f73af99ce94d5536b0a2b4a85f5dea3
Author: Edward Hyunkoo Jee  google  com>
AuthorDate: Wed May 30 23:27:17 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Jun  8 01:28:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb7b924

app-crypt/efitools: apply patch to fix make rules

The patch that fixes the make rules of 1.7.0 is still required for
1.8.1.
Closes: https://github.com/gentoo/gentoo/pull/8648

 app-crypt/efitools/efitools-1.8.1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index f18e8b8ea27..d27b90b2cbc 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -25,7 +25,10 @@ DEPEND="${RDEPEND}
sys-boot/gnu-efi
virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
+PATCHES=(
+   "${FILESDIR}/1.7.0-Make.rules.patch"
+   "${FILESDIR}/${P}-libressl-compatibility.patch"
+)
 
 src_prepare() {
# Respect users CFLAGS

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

2018-04-23 Thread Aaron Bauman 
commit: b34e70a62caf31299d173736f3297bb7e505dd5e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr 23 17:29:24 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 23 17:29:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34e70a6

app-crypt/efitools: add compatibility patch for LibreSSL

This patch fixes building with LibreSSL due to a conditional function
for API.

Closes: https://bugs.gentoo.org/653716
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-crypt/efitools/efitools-1.8.1.ebuild  |  2 ++
 .../files/efitools-1.8.1-libressl-compatibility.patch | 11 +++
 2 files changed, 13 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 073dcca2de8..f18e8b8ea27 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
sys-boot/gnu-efi
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
+
 src_prepare() {
# Respect users CFLAGS
sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die

diff --git 
a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch 
b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
new file mode 100644
index 000..876baae16f8
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.8.1-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 < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   int cert_len = i2d_X509_CINF(cert->cert_info, _buf);
+ #else
+   int cert_len = i2d_re_X509_tbs(cert, _buf);

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-04-23 Thread Aaron Bauman 
commit: 678f4d7a60c2a78f99cd2faec71498f46971c7da
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Fri Apr 20 16:22:40 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 23 15:16:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678f4d7a

app-crypt/efitools: Use dev-perl/File-Slurp

Package-Manager: Portage-2.3.30, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8086

 app-crypt/efitools/efitools-1.8.1.ebuild | 2 +-
 app-crypt/efitools/metadata.xml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 093ce11c761..073dcca2de8 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="!libressl? ( dev-libs/openssl:0= )
 
 DEPEND="${RDEPEND}
app-crypt/sbsigntool
-   dev-perl/File-Slurp-Unicode
+   dev-perl/File-Slurp
sys-apps/help2man
sys-boot/gnu-efi
virtual/pkgconfig"

diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index 097975e3adc..7a38bb90096 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,4 +1,5 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2018-04-20 Thread Michał Górny 
commit: 0c2672e554d79c6075e36447099567933a528037
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Fri Apr 20 13:58:33 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 20 14:29:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2672e5

app-crypt/efitools: Bump to version 1.8.1

Closes: https://bugs.gentoo.org/652090
Closes: https://bugs.gentoo.org/652066
Closes: https://github.com/gentoo/gentoo/pull/7747
Package-Manager: Portage-2.3.30, Repoman-2.3.9

 app-crypt/efitools/Manifest  |  1 +
 app-crypt/efitools/efitools-1.8.1.ebuild | 38 
 2 files changed, 39 insertions(+)

diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 4e6dfcf3254..5ec4d217cb4 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1 +1,2 @@
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B 
b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214
 SHA512 
1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
+DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 
3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0
 SHA512 
114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
new file mode 100644
index 000..093ce11c761
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+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/efitools-1.8.1.tar.gz;
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   sys-apps/util-linux"
+
+DEPEND="${RDEPEND}
+   app-crypt/sbsigntool
+   dev-perl/File-Slurp-Unicode
+   sys-apps/help2man
+   sys-boot/gnu-efi
+   virtual/pkgconfig"
+
+src_prepare() {
+   # 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

2017-12-18 Thread Mike Gilbert 
commit: ef467475348515b2583558594d101b25c254526e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Dec 18 19:06:22 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Dec 18 19:06:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef467475

app-crypt/efitools: fix makefile deps

Patch by Felix Janda.

Closes: https://bugs.gentoo.org/593656
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35

 app-crypt/efitools/efitools-1.7.0.ebuild|  7 +++
 app-crypt/efitools/files/1.7.0-Make.rules.patch | 11 +++
 2 files changed, 18 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
index 0baf83e20fc..63c9fbec051 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="5"
 
+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://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2
 -> ${P}.tar.bz2"
@@ -24,3 +26,8 @@ DEPEND="${RDEPEND}
dev-perl/File-Slurp"
 
 S=${WORKDIR}/v${PV}
+
+src_prepare() {
+   epatch "${FILESDIR}/1.7.0-Make.rules.patch"
+   epatch_user
+}

diff --git a/app-crypt/efitools/files/1.7.0-Make.rules.patch 
b/app-crypt/efitools/files/1.7.0-Make.rules.patch
new file mode 100644
index 000..89665ab3b69
--- /dev/null
+++ b/app-crypt/efitools/files/1.7.0-Make.rules.patch
@@ -0,0 +1,11 @@
+--- a/Make.rules
 b/Make.rules
+@@ -71,7 +71,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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2017-02-13 Thread Robin H. Johnson 
commit: 47bb6790944891d63ff666e65bb7e8cea01e79e7
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Feb 13 22:51:20 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Feb 13 22:51:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bb6790

app-crypt/efitools: add ~arm64.

Runtime testing performed on Lenovo CaviumX thanks to Packet.net.

Package-Manager: portage-2.3.2
Signed-off-by: Robin H. Johnson  gentoo.org>

 app-crypt/efitools/efitools-1.7.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
index 4075a6ee8c..f5357a38b8 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.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
 # $Id$
 
@@ -10,7 +10,7 @@ 
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libressl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/files/, app-crypt/efitools/

2016-08-19 Thread Pacho Ramos 
commit: 80ac5fd077f9784904755baa7a20ea38bce5bd38
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Aug 19 10:01:38 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Aug 19 10:01:38 2016 +
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..000
--- 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..000
--- 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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2016-06-26 Thread Michał Górny 
commit: efe7d05349ed954fb949850ac70af049da7bfd08
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jun 26 16:51:42 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jun 26 17:03:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe7d053

app-crypt/efitools: Use snapshot for building, #585714

 app-crypt/efitools/Manifest  | 1 +
 app-crypt/efitools/efitools-1.7.0.ebuild | 8 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 4648677..199a3d1 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,2 +1,3 @@
 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.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
index d54950b..4075a6e 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -3,14 +3,10 @@
 # $Id$
 
 EAPI="5"
-inherit git-r3
 
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
-SRC_URI=""
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
-EGIT_COMMIT="v1.7.0"
+SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2
 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,3 +23,5 @@ DEPEND="${RDEPEND}
app-crypt/sbsigntool
virtual/pkgconfig
dev-perl/File-Slurp"
+
+S=${WORKDIR}/v${PV}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2016-06-03 Thread Anthony G. Basile 
commit: 798e38393e0de024ff98007c1597e060c2876247
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Jun  3 09:05:17 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Jun  3 09:05:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798e3839

app-crypt/efitools: add libressl support

Package-Manager: portage-2.2.28

 app-crypt/efitools/efitools-1.4.2-r1.ebuild | 10 ++
 app-crypt/efitools/efitools-1.7.0.ebuild|  8 +---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.4.2-r1.ebuild 
b/app-crypt/efitools/efitools-1.4.2-r1.ebuild
index dabedc5..f231f2c 100644
--- a/app-crypt/efitools/efitools-1.4.2-r1.ebuild
+++ b/app-crypt/efitools/efitools-1.4.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
@@ -11,9 +11,11 @@ 
SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="libressl"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
sys-apps/util-linux"
 DEPEND="${RDEPEND}
sys-apps/help2man

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
index 4395a3d..d54950b 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 inherit git-r3
 
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
@@ -15,9 +15,11 @@ EGIT_COMMIT="v1.7.0"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="libressl"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
sys-apps/util-linux"
 DEPEND="${RDEPEND}
sys-apps/help2man

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/

2016-05-08 Thread Paweł Hajdan 
commit: 643faf81a2345c654e965a05fea01488e08974c4
Author: Pawel Hajdan, Jr  gentoo  org>
AuthorDate: Sun May  8 20:10:17 2016 +
Commit: Paweł Hajdan  gentoo  org>
CommitDate: Sun May  8 20:10:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643faf81

app-crypt/efitools: version bump (1.7.0) for bug #533572

Credits:
  Ben Sagal - bug reporter
  Gabriel Marcano - uploaded git-based ebuild

Package-Manager: portage-2.2.26

 app-crypt/efitools/efitools-1.7.0.ebuild | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
new file mode 100644
index 000..4395a3d
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit git-r3
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
+SRC_URI=""
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
+EGIT_COMMIT="v1.7.0"
+
+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-3.0u
+   app-crypt/sbsigntool
+   virtual/pkgconfig
+   dev-perl/File-Slurp"