diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
commit | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch) | |
tree | 852c90a4bf354c30ea66504f70bfab5401fba18d /app-crypt/efitools | |
parent | 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff) |
gentoo resync : 28.04.2018
Diffstat (limited to 'app-crypt/efitools')
-rw-r--r-- | app-crypt/efitools/Manifest | 5 | ||||
-rw-r--r-- | app-crypt/efitools/efitools-1.8.1.ebuild | 4 | ||||
-rw-r--r-- | app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch | 11 | ||||
-rw-r--r-- | app-crypt/efitools/metadata.xml | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest index 06e54df0080b..1ec70041d790 100644 --- a/app-crypt/efitools/Manifest +++ b/app-crypt/efitools/Manifest @@ -1,6 +1,7 @@ AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d +AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18 -EBUILD efitools-1.8.1.ebuild 977 BLAKE2B 8dd613c9eee261644ced732913ddb18dc36b08efc1f2fea24e5ae70405fd655acbb4c89b79f0ede1fe96011194d17f50a989cb31d6576e080766d2cb9b3624dc SHA512 69a1034fe522bb43914fe52320547a3f1aa70e3739deeb628f16cc7d395f803dd47e72efe2409a060bd790c7e7cd1e2a532dba9fc971be338382c455964e9055 -MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be +EBUILD efitools-1.8.1.ebuild 1030 BLAKE2B 869a7a8a299dac60eeedd0ccb990f96cb151cab36ca68cec602f5f5424609be59fc5c4bfb4b90e42a045bc552ae47f0a0ac8cab326ba5d15fed0460ebe1fb2a5 SHA512 0df50584ba254e4f8f18f852b7c43c461ea10f0dc4be8d597979a657011c3485a0410e2bc746ec46dc9449578adccd692d8530c76d66267e3f3c55d7ed213a45 +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild index 093ce11c7611..f18e8b8ea271 100644 --- a/app-crypt/efitools/efitools-1.8.1.ebuild +++ b/app-crypt/efitools/efitools-1.8.1.ebuild @@ -20,11 +20,13 @@ 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" +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 000000000000..876baae16f81 --- /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 < 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); diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml index 097975e3adc2..7a38bb900964 100644 --- a/app-crypt/efitools/metadata.xml +++ b/app-crypt/efitools/metadata.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <!-- maintainer-needed --> </pkgmetadata> |