diff --git a/srcpkgs/efivar/patches/fix-efivar_h-location.patch b/srcpkgs/efivar/patches/fix-efivar_h-location.patch deleted file mode 100644 index 05dc1c0a36a..00000000000 --- a/srcpkgs/efivar/patches/fix-efivar_h-location.patch +++ /dev/null @@ -1,15 +0,0 @@ -When other bits of the source got fixed to use a different include path -for efivars, the test directory did not. - ---- src/test/tester.c -+++ src/test/tester.c -@@ -26,7 +26,7 @@ - #include - #include - --#include -+#include - - #define TEST_GUID EFI_GUID(0x84be9c3e,0x8a32,0x42c0,0x891c,0x4c,0xd3,0xb0,0x72,0xbe,0xcc) - - diff --git a/srcpkgs/efivar/patches/musl-bswap.patch b/srcpkgs/efivar/patches/musl-bswap.patch deleted file mode 100644 index e8b66d5b628..00000000000 --- a/srcpkgs/efivar/patches/musl-bswap.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c9b54ee2cd504542cac4ed95fa7842bd14b39f9c Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Fri, 18 Aug 2017 20:36:03 -0500 -Subject: [PATCH] makeguids: Ensure compatibility with other libcs - -The musl libc does not provide __bswap_constant_XX. -If does not provide these macros, use our own. - -This fixes issue #84. ---- - src/makeguids.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- src/makeguids.c -+++ src/makeguids.c -@@ -152,6 +152,15 @@ main(int argc, char *argv[]) - fprintf(symout, "#include \n"); - fprintf(symout, "#include \n"); - fprintf(symout, """\n\ -+#ifndef __bswap_constant_16\n\ -+#define __bswap_constant_16(x)\\\n\ -+ ((unsigned short int) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))\n\ -+#endif\n\ -+#ifndef __bswap_constant_32\n\ -+#define __bswap_constant_32(x)\\\n\ -+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \\\n\ -+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))\n\ -+#endif\n\ - #if BYTE_ORDER == BIG_ENDIAN\n\ - #define cpu_to_be32(n) (n)\n\ - #define cpu_to_be16(n) (n)\n\ - diff --git a/srcpkgs/efivar/patches/musl-strndupa.patch b/srcpkgs/efivar/patches/musl-strndupa.patch deleted file mode 100644 index 11bf5e917c3..00000000000 --- a/srcpkgs/efivar/patches/musl-strndupa.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/linux.c 2017-02-13 17:52:14.000000000 +0100 -+++ src/linux.c 2017-02-18 04:42:13.893911649 +0100 -@@ -44,6 +44,10 @@ - #include - #include - -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - #include "dp.h" - #include "linux.h" - #include "util.h" diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template index 6800bc3a8fe..9880734fd0c 100644 --- a/srcpkgs/efivar/template +++ b/srcpkgs/efivar/template @@ -1,20 +1,19 @@ # Template file for 'efivar' pkgname=efivar -version=32 +version=34 revision=1 build_style=gnu-makefile make_build_args="libdir=/usr/lib" make_build_target="all test" make_install_args="libdir=/usr/lib" hostmakedepends="pkg-config" -makedepends="popt-devel" short_desc="Tools to manipulate EFI variables" maintainer="Juan RP " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="https://github.com/rhinstaller/efivar" only_for_archs="i686 i686-musl x86_64 x86_64-musl" -distfiles="https://github.com/rhinstaller/efivar/archive/${version}/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=44e3db4241c14dfc167dd5bf8c399ef41a7bf966cbc49519694d605f3c843420 +distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2" +checksum=1b7e34e728b4b4c294a10734e601212e4c31ce4cf409e27d1d630daa8d0f4325 CFLAGS="-D_GNU_SOURCE"