devel/efivar: Remove obsolete patches

Differential Revision:		https://reviews.freebsd.org/D29332

11 files changed, 0 insertions, 296 deletions

diff --git a/devel/efivar/files/patch-Make.rules b/devel/efivar/files/patch-Make.rules
deleted file mode 100644
index 24d302516477..000000000000
--- a/devel/efivar/files/patch-Make.rules
+++ /dev/null
@@ -1,15 +0,0 @@
---- Make.rules.orig	2014-10-15 13:48:49 UTC
-+++ Make.rules
-@@ -2,10 +2,10 @@
- 	$(AR) -cvqs $@ $^
- 
- % : %.o
--	$(CCLD) $(ccldflags) -o $@ $^ $(foreach lib,$(LIBS),-l$(lib))
-+	$(CCLD) $(ccldflags) -o $@ $^ $(LIBS)
- 
- %.so.$(SONAME_VERSION) : 
--	$(CCLD) $(cflags) -Wl,-soname,$(SONAME) $(ccldflags) $(LIBFLAGS) $^ -o $@ $(foreach lib,$(LIBS),-l$(lib))
-+	$(CCLD) $(cflags) -Wl,-soname,$(SONAME) $(ccldflags) $(LIBFLAGS) $^ -o $@ $(LIBS)
- 
- %.so : %.so.$(SONAME_VERSION)
- 	ln -sf $^ $@
diff --git a/devel/efivar/files/patch-src-Makefile b/devel/efivar/files/patch-src-Makefile
deleted file mode 100644
index f0fdf02e6ac4..000000000000
--- a/devel/efivar/files/patch-src-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.orig	2014-10-15 13:48:49 UTC
-+++ src/Makefile
-@@ -15,14 +15,13 @@ all : $(LIBTARGETS) $(PCTARGETS) $(BINTA
- OBJECTS = lib.o vars.o efivarfs.o guid.o guidlist.o guid-symbols.o
- DEPS = .lib.c.P .efivar.c.P .efivar.h.P .vars.c.P .lib.h.P \
- 	.generics.h.P .guid.h.P .guid.c.P
--LIBS = dl
- 
- libefivar.a :: $(OBJECTS)
- 
- libefivar.so.$(SONAME_VERSION) :: $(OBJECTS)
- 
- efivar : efivar.o libefivar.so
--	$(CCLD) $(ccldflags) -L. -lefivar -o $@ $^ -lpopt $(foreach lib,$(LIBS),-l$(lib))
-+	$(CCLD) $(ccldflags) -L. -lefivar -o $@ $^ -lpopt $(LIBS)
- 
- efivar.pc : efivar.pc.in
- 	sed -e "s,@@VERSION@@,$(VERSION),g" \
diff --git a/devel/efivar/files/patch-src-efivar.c b/devel/efivar/files/patch-src-efivar.c
deleted file mode 100644
index a06dddab8713..000000000000
--- a/devel/efivar/files/patch-src-efivar.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/efivar.c.orig	2014-10-15 15:48:49.000000000 +0200
-+++ src/efivar.c	2015-01-19 15:41:34.000000000 +0100
-@@ -16,11 +16,11 @@
-  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <ctype.h>
- #include <fcntl.h>
- #include <popt.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/endian.h>
- #include <sys/mman.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -53,7 +53,7 @@ list_all_variables(void)
- 	int rc;
- 	while ((rc = efi_get_next_variable_name(&guid, &name)) > 0)
- 		 printf(GUID_FORMAT "-%s\n",
--			guid->a, guid->b, guid->c, bswap_16(guid->d),
-+			guid->a, guid->b, guid->c, bswap16(guid->d),
- 			guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 			guid->e[4], guid->e[5], name);
- 
-@@ -142,7 +142,7 @@ show_variable(char *guid_name)
- 	}
- 
- 	printf("GUID: "GUID_FORMAT "\n",
--			guid.a, guid.b, guid.c, bswap_16(guid.d),
-+			guid.a, guid.b, guid.c, bswap16(guid.d),
- 			guid.e[0], guid.e[1], guid.e[2], guid.e[3],
- 			guid.e[4], guid.e[5]);
- 	printf("Name: \"%s\"\n", name);
-@@ -240,7 +240,7 @@ prepare_data(const char *filename, void 
- 		goto err;
- 
- 	buflen = statbuf.st_size;
--	buf = mmap(NULL, buflen, PROT_READ, MAP_PRIVATE|MAP_POPULATE, fd, 0);
-+	buf = mmap(NULL, buflen, PROT_READ, MAP_PRIVATE, fd, 0);
- 	if (!buf)
- 		goto err;
- 
-@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
- 			{
- 				printf("{"GUID_FORMAT"} {%s} %s %s\n",
- 					guid->guid.a, guid->guid.b,
--					guid->guid.c, bswap_16(guid->guid.d),
-+					guid->guid.c, bswap16(guid->guid.d),
- 					guid->guid.e[0], guid->guid.e[1],
- 					guid->guid.e[2], guid->guid.e[3],
- 					guid->guid.e[4], guid->guid.e[5],
diff --git a/devel/efivar/files/patch-src-efivar.h b/devel/efivar/files/patch-src-efivar.h
deleted file mode 100644
index 80c6a8ccbd57..000000000000
--- a/devel/efivar/files/patch-src-efivar.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/efivar.h.orig	2014-10-15 15:48:49.000000000 +0200
-+++ src/efivar.h	2015-01-19 15:32:22.000000000 +0100
-@@ -25,7 +25,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <byteswap.h>
- 
- typedef struct {
- 	uint32_t	a;
-@@ -40,7 +39,7 @@ typedef struct {
- #endif
- 
- #define EFI_GUID(a,b,c,d,e0,e1,e2,e3,e4,e5) \
--((efi_guid_t) {(a), (b), (c), bswap_16(d), { (e0), (e1), (e2), (e3), (e4), (e5) }})
-+((efi_guid_t) {(a), (b), (c), bswap16(d), { (e0), (e1), (e2), (e3), (e4), (e5) }})
- 
- #define EFI_GLOBAL_GUID EFI_GUID(0x8be4df61,0x93ca,0x11d2,0xaa0d,0x00,0xe0,0x98,0x03,0x2b,0x8c)
- 
-@@ -85,7 +84,7 @@ efi_set_variable(efi_guid_t guid, const 
- 		return -1;
- 	}
- 
--	if (__va_arg_pack_len() == 0)
-+	if (__builtin_va_arg_pack_len() == 0)
- 		return _efi_set_variable(guid, name, data, data_size,
- 					 attributes, 0644);
- 
diff --git a/devel/efivar/files/patch-src-efivar.pc.in b/devel/efivar/files/patch-src-efivar.pc.in
deleted file mode 100644
index 1220e37ce7df..000000000000
--- a/devel/efivar/files/patch-src-efivar.pc.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/efivar.pc.in.orig	2014-10-15 15:48:49.000000000 +0200
-+++ src/efivar.pc.in	2015-01-19 16:23:12.000000000 +0100
-@@ -1,10 +1,11 @@
--prefix=/usr
--exec_prefix=/usr
--libdir=@@LIBDIR@@
--includedir=/usr/include
-+prefix=%%PREFIX%%
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
- 
- Name: efivar
- Description: UEFI Variable Management
- Version: @@VERSION@@
- Requires:
--Libs: -L${libdir} -lefivar -ldl
-+Libs: -L${libdir} -lefivar
-+Cflags: -I${includedir}
diff --git a/devel/efivar/files/patch-src-efivarfs.c b/devel/efivar/files/patch-src-efivarfs.c
deleted file mode 100644
index f28f06f61598..000000000000
--- a/devel/efivar/files/patch-src-efivarfs.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/efivarfs.c.orig	2015-01-19 15:38:34.000000000 +0100
-+++ src/efivarfs.c	2015-01-19 15:40:15.000000000 +0100
-@@ -18,15 +18,15 @@
- 
- #include <errno.h>
- #include <fcntl.h>
--#include <linux/magic.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mman.h>
-+#include <sys/mount.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/uio.h>
--#include <sys/vfs.h>
- #include <unistd.h>
- 
- #include "lib.h"
-@@ -66,7 +66,7 @@ efivarfs_probe(void)
- #define make_efivarfs_path(str, guid, name) ({				\
- 		asprintf(str, EFIVARS_PATH "%s-" GUID_FORMAT,		\
- 			name, (guid).a, (guid).b, (guid).c,		\
--			bswap_16((guid).d),				\
-+			bswap16((guid).d),				\
- 			(guid).e[0], (guid).e[1], (guid).e[2],		\
- 			(guid).e[3], (guid).e[4], (guid).e[5]);		\
- 	})
diff --git a/devel/efivar/files/patch-src-guid.c b/devel/efivar/files/patch-src-guid.c
deleted file mode 100644
index 314601d34995..000000000000
--- a/devel/efivar/files/patch-src-guid.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/guid.c.orig	2015-01-19 15:37:01.000000000 +0100
-+++ src/guid.c	2015-01-19 15:37:10.000000000 +0100
-@@ -41,17 +41,17 @@ efi_guid_to_str(const efi_guid_t *guid, 
- 
- 	if (!sp) {
- 		return snprintf(NULL, 0, GUID_FORMAT,
--				guid->a, guid->b, guid->c, bswap_16(guid->d),
-+				guid->a, guid->b, guid->c, bswap16(guid->d),
- 				guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 				guid->e[4], guid->e[5]);
- 	} else if (sp && *sp) {
- 		return snprintf(*sp, GUID_LENGTH_WITH_NUL, GUID_FORMAT,
--				guid->a, guid->b, guid->c, bswap_16(guid->d),
-+				guid->a, guid->b, guid->c, bswap16(guid->d),
- 				guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 				guid->e[4], guid->e[5]);
- 	} else {
- 		rc = asprintf(&ret, GUID_FORMAT,
--				guid->a, guid->b, guid->c, bswap_16(guid->d),
-+				guid->a, guid->b, guid->c, bswap16(guid->d),
- 				guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 				guid->e[4], guid->e[5]);
- 		if (rc >= 0)
-@@ -161,17 +161,17 @@ efi_guid_to_id_guid(const efi_guid_t *gu
- 	}
- 	if (!sp) {
- 		return snprintf(NULL, 0, "{"GUID_FORMAT"}",
--				guid->a, guid->b, guid->c, bswap_16(guid->d),
-+				guid->a, guid->b, guid->c, bswap16(guid->d),
- 				guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 				guid->e[4], guid->e[5]);
- 	} else if (sp && *sp) {
- 		return snprintf(*sp, GUID_LENGTH_WITH_NUL+2, "{"GUID_FORMAT"}",
--				guid->a, guid->b, guid->c, bswap_16(guid->d),
-+				guid->a, guid->b, guid->c, bswap16(guid->d),
- 				guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 				guid->e[4], guid->e[5]);
- 	}
- 	rc = asprintf(&ret, "{"GUID_FORMAT"}",
--			guid->a, guid->b, guid->c, bswap_16(guid->d),
-+			guid->a, guid->b, guid->c, bswap16(guid->d),
- 			guid->e[0], guid->e[1], guid->e[2], guid->e[3],
- 			guid->e[4], guid->e[5]);
- 	if (rc >= 0)
diff --git a/devel/efivar/files/patch-src-guid.h b/devel/efivar/files/patch-src-guid.h
deleted file mode 100644
index 006318f755f9..000000000000
--- a/devel/efivar/files/patch-src-guid.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/guid.h.orig	2014-10-15 15:48:49.000000000 +0200
-+++ src/guid.h	2015-01-19 15:34:12.000000000 +0100
-@@ -19,7 +19,7 @@
- #ifndef LIBEFIVAR_GUID_H
- #define LIBEFIVAR_GUID_H 1
- 
--#include <endian.h>
-+#include <sys/endian.h>
- #include <errno.h>
- #include <limits.h>
- #include <stdlib.h>
-@@ -111,7 +111,7 @@ text_to_guid(const char *text, efi_guid_
- 	strncpy(fourbytes, text+19, 4);
- 	if (check_segment_sanity(fourbytes, 4) < 0)
- 		return -1;
--	guid->d = bswap_16((uint16_t)strtoul(fourbytes, NULL, 16));
-+	guid->d = bswap16((uint16_t)strtoul(fourbytes, NULL, 16));
- 
- 	/* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- 	 *                         ^ */
diff --git a/devel/efivar/files/patch-src-test-Makefile b/devel/efivar/files/patch-src-test-Makefile
deleted file mode 100644
index 22c70f7c9a73..000000000000
--- a/devel/efivar/files/patch-src-test-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/test/Makefile.orig	2014-10-15 13:48:49 UTC
-+++ src/test/Makefile
-@@ -4,7 +4,7 @@ TOPDIR = $(realpath $(SRCDIR)/../..)
- include $(TOPDIR)/Make.defaults
- 
- ccldflags += -L$(TOPDIR)/src/ -Wl,-rpath=$(TOPDIR)/src/
--LIBS=efivar
-+LIBS = -lefivar
- 
- all : tester
- 
diff --git a/devel/efivar/files/patch-src-test-tester.c b/devel/efivar/files/patch-src-test-tester.c
deleted file mode 100644
index fabd2c8bf30c..000000000000
--- a/devel/efivar/files/patch-src-test-tester.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/test/tester.c.orig	2015-01-19 15:43:11.000000000 +0100
-+++ src/test/tester.c	2015-01-19 15:43:31.000000000 +0100
-@@ -1,10 +1,10 @@
--#include <alloca.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/endian.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/devel/efivar/files/patch-src-vars.c b/devel/efivar/files/patch-src-vars.c
deleted file mode 100644
index fd9a2c6593f3..000000000000
--- a/devel/efivar/files/patch-src-vars.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/vars.c.orig	2015-01-19 15:36:23.000000000 +0100
-+++ src/vars.c	2015-01-19 15:36:36.000000000 +0100
-@@ -94,7 +94,7 @@ vars_get_variable_size(efi_guid_t guid, 
- 
- 	char *path = NULL;
- 	int rc = asprintf(&path, VARS_PATH "%s-"GUID_FORMAT"/size",
--			  name, guid.a, guid.b, guid.c, bswap_16(guid.d),
-+			  name, guid.a, guid.b, guid.c, bswap16(guid.d),
- 			  guid.e[0], guid.e[1], guid.e[2], guid.e[3],
- 			  guid.e[4], guid.e[5]);
- 	if (rc < 0)
-@@ -146,7 +146,7 @@ vars_get_variable(efi_guid_t guid, const
- 	size_t bufsize = -1;
- 	char *path;
- 	int rc = asprintf(&path, VARS_PATH "%s-" GUID_FORMAT "/raw_var",
--			  name, guid.a, guid.b, guid.c, bswap_16(guid.d),
-+			  name, guid.a, guid.b, guid.c, bswap16(guid.d),
- 			  guid.e[0], guid.e[1], guid.e[2],
- 			  guid.e[3], guid.e[4], guid.e[5]);
- 	if (rc < 0)
-@@ -193,7 +193,7 @@ vars_del_variable(efi_guid_t guid, const
- 	int ret = -1;
- 	char *path;
- 	int rc = asprintf(&path, VARS_PATH "%s-" GUID_FORMAT "/raw_var",
--			  name, guid.a, guid.b, guid.c, bswap_16(guid.d),
-+			  name, guid.a, guid.b, guid.c, bswap16(guid.d),
- 			  guid.e[0], guid.e[1], guid.e[2],
- 			  guid.e[3], guid.e[4], guid.e[5]);
- 	if (rc < 0)
-@@ -280,7 +280,7 @@ vars_chmod_variable(efi_guid_t guid, con
- 
- 	char *path;
- 	int rc = asprintf(&path, VARS_PATH "%s-" GUID_FORMAT,
--			  name, guid.a, guid.b, guid.c, bswap_16(guid.d),
-+			  name, guid.a, guid.b, guid.c, bswap16(guid.d),
- 			  guid.e[0], guid.e[1], guid.e[2], guid.e[3],
- 			  guid.e[4], guid.e[5]);
- 	if (rc < 0)
-@@ -312,7 +312,7 @@ vars_set_variable(efi_guid_t guid, const
- 
- 	char *path;
- 	int rc = asprintf(&path, VARS_PATH "%s-" GUID_FORMAT "/data",
--			  name, guid.a, guid.b, guid.c, bswap_16(guid.d),
-+			  name, guid.a, guid.b, guid.c, bswap16(guid.d),
- 			  guid.e[0], guid.e[1], guid.e[2], guid.e[3],
- 			  guid.e[4], guid.e[5]);
- 	if (rc < 0)