diff --git a/efivar-0.21-gcc6.diff b/efivar-0.21-gcc6.diff deleted file mode 100644 index 7a8d180..0000000 --- a/efivar-0.21-gcc6.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- src/util.h.orig 2016-02-10 15:29:15.245050330 +0000 -+++ src/util.h 2016-02-10 15:29:18.957092775 +0000 -@@ -175,14 +175,14 @@ - } \ - } \ - if (_rc >= 0) { \ -- uint8_t *_buf2 = alloca(_bufsize); \ -+ void *_buf2 = alloca(_bufsize); \ - _saved_errno = errno; \ - if (_buf2) { \ - memcpy(_buf2, _buf, _bufsize); \ - _rc = _bufsize; \ - } \ - free(_buf); \ -- *((uint8_t **)buf) = _buf2; \ -+ *((void **)buf) = _buf2; \ - errno = _saved_errno; \ - } \ - _rc; \ diff --git a/efivar-0.23.tar.bz2 b/efivar-0.23.tar.bz2 deleted file mode 100644 index d2f1071..0000000 --- a/efivar-0.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ca81f56b0c9177b6536c8187c9cf5974723abcaf57cd34173500c80bff3caa4 -size 67558 diff --git a/efivar-0.24.tar.bz2 b/efivar-0.24.tar.bz2 new file mode 100644 index 0000000..78317a6 --- /dev/null +++ b/efivar-0.24.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be7e067cb6a6842d669eb36e66a15523b9463afa73d558abda6bf4e02cc69e4c +size 69183 diff --git a/efivar-nvme-no-kernel-header.patch b/efivar-nvme-no-kernel-header.patch deleted file mode 100644 index a1182d5..0000000 --- a/efivar-nvme-no-kernel-header.patch +++ /dev/null @@ -1,211 +0,0 @@ -From 8910f45c27fadba0904f707e7c40ad80bf828f7e Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Fri, 19 Feb 2016 18:53:00 -0500 -Subject: [PATCH] libefiboot: rework NVME so we get EUI right and don't need - kernel headers - -The headers are broken enough on various distros that it's better to -avoid them entirely. - -Signed-off-by: Peter Jones ---- - src/linux.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++-------------- - src/linux.h | 8 ++++ - 2 files changed, 106 insertions(+), 29 deletions(-) - -diff --git a/src/linux.c b/src/linux.c -index 0063476..084e9c2 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -23,11 +23,6 @@ - #include - #include - #include --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) --#include --#else --#include --#endif - #include - #include - #include -@@ -48,17 +43,6 @@ - - int - __attribute__((__visibility__ ("hidden"))) --eb_nvme_ns_id(int fd, uint32_t *ns_id) --{ -- uint64_t ret = ioctl(fd, NVME_IOCTL_ID, NULL); -- if ((int)ret < 0) -- return ret; -- *ns_id = (uint32_t)ret; -- return 0; --} -- --int --__attribute__((__visibility__ ("hidden"))) - set_disk_and_part_name(struct disk_info *info) - { - char *linkbuf; -@@ -168,6 +152,23 @@ get_partition_number(const char *devpath) - } - - static int -+sysfs_test_nvme(const char *buf, ssize_t size) -+{ -+ int rc; -+ -+ int32_t tosser0; -+ int32_t ctrl_id; -+ int32_t ns_id; -+ -+ errno = 0; -+ rc = sscanf(buf, "nvme/nvme%d/nvme%dn%d", &tosser0, &ctrl_id, &ns_id); -+ if (rc < 1) -+ return (errno == 0) ? 0 : -1; -+ -+ return 1; -+} -+ -+static int - sysfs_test_sata(const char *buf, ssize_t size) - { - if (!strncmp(buf, "ata", MIN(size,3))) -@@ -259,6 +260,69 @@ sysfs_sata_get_port_info(uint32_t print_id, struct disk_info *info) - } - - static ssize_t -+sysfs_parse_nvme(uint8_t *buf, ssize_t size, ssize_t *off, -+ const char *pbuf, ssize_t psize, ssize_t *poff, -+ struct disk_info *info) -+{ -+ int rc; -+ int psz = 0; -+ char *filebuf = NULL; -+ -+ *poff = 0; -+ *off = 0; -+ -+ int32_t tosser0; -+ int32_t ctrl_id; -+ int32_t ns_id; -+ -+ /* buf is: -+ * nvme/nvme0/nvme0n1 -+ */ -+ rc = sscanf(pbuf+*poff, "nvme/nvme%d/nvme%dn%d%n", &tosser0, -+ &ctrl_id, &ns_id, &psz); -+ if (rc != 3) -+ return -1; -+ *poff += psz; -+ -+ info->nvme_info.ctrl_id = ctrl_id; -+ info->nvme_info.ns_id = ns_id; -+ info->nvme_info.has_eui = 0; -+ info->interface_type = nvme; -+ -+ /* -+ * now fish the eui out of sysfs is there is one... -+ */ -+ rc = read_sysfs_file(&filebuf, -+ "/sys/class/block/nvme%dn%d/device/eui", -+ ctrl_id, ns_id); -+ if (rc >= 0) { -+ uint8_t eui[8]; -+ if (rc < 23) { -+ errno = EINVAL; -+ return -1; -+ } -+ rc = sscanf(filebuf, -+ "%02hhx-%02hhx-%02hhx-%02hhx-" -+ "%02hhx-%02hhx-%02hhx-%02hhx", -+ &eui[0], &eui[1], &eui[2], &eui[3], -+ &eui[4], &eui[5], &eui[6], &eui[7]); -+ if (rc < 8) { -+ errno = EINVAL; -+ return -1; -+ } -+ info->nvme_info.has_eui = 1; -+ memcpy(info->nvme_info.eui, eui, sizeof(eui)); -+ } -+ -+ *off = efidp_make_nvme(buf, size, -+ info->nvme_info.ns_id, -+ info->nvme_info.has_eui ? info->nvme_info.eui -+ : NULL); -+ return *off; -+} -+ -+ -+static ssize_t - sysfs_parse_sata(uint8_t *buf, ssize_t size, ssize_t *off, - const char *pbuf, ssize_t psize, ssize_t *poff, - struct disk_info *info) -@@ -665,20 +729,25 @@ make_blockdev_path(uint8_t *buf, ssize_t size, int fd, struct disk_info *info) - loff += tmpoff; - found = 1; - } -+ } - -- if (!found) { -- uint32_t ns_id=0; -- int rc = eb_nvme_ns_id(fd, &ns_id); -- if (rc >= 0) { -- sz = efidp_make_nvme(buf+off, size?size-off:0, -- ns_id, NULL); -- if (sz < 0) -- return -1; -- -- info->interface_type = nvme; -- off += sz; -- found = 1; -- } -+ /* /dev/nvme0n1 looks like: -+ * /sys/dev/block/259:0 -> ../../devices/pci0000:00/0000:00:1d.0/0000:05:00.0/nvme/nvme0/nvme0n1 -+ */ -+ if (!found) { -+ rc = sysfs_test_nvme(linkbuf+loff, PATH_MAX-off); -+ if (rc < 0) -+ return -1; -+ else if (rc > 0) { -+ ssize_t linksz; -+ rc = sysfs_parse_nvme(buf+off, size?size-off:0, &sz, -+ linkbuf+loff, PATH_MAX-off, -+ &linksz, info); -+ if (rc < 0) -+ return -1; -+ loff += linksz; -+ off += sz; -+ found = 1; - } - } - -diff --git a/src/linux.h b/src/linux.h -index 5e8d003..539fb23 100644 ---- a/src/linux.h -+++ b/src/linux.h -@@ -60,6 +60,13 @@ struct sata_info { - uint32_t ata_pmp; - }; - -+struct nvme_info { -+ int32_t ctrl_id; -+ int32_t ns_id; -+ int has_eui; -+ uint8_t eui[8]; -+}; -+ - struct disk_info { - int interface_type; - unsigned int controllernum; -@@ -76,6 +83,7 @@ struct disk_info { - struct scsi_info scsi_info; - struct sas_info sas_info; - struct sata_info sata_info; -+ struct nvme_info nvme_info; - }; - - char *disk_name; --- -2.7.2 - diff --git a/efivar-nvme-rename.patch b/efivar-nvme-rename.patch deleted file mode 100644 index 2777a86..0000000 --- a/efivar-nvme-rename.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3a0ae7189fe96355d64dc2daf91cf85282773c66 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 14 Jan 2016 17:02:31 -0500 -Subject: [PATCH] Workaround rename of linux/nvme.h - -Bug: https://bugs.gentoo.org/571548 ---- - src/linux.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/linux.c b/src/linux.c -index b618cfd..9388cd3 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -22,7 +22,12 @@ - #include - #include - #include -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) -+#include -+#else - #include -+#endif - #include - #include - #include --- -2.7.2 - diff --git a/efivar-relicensing.patch b/efivar-relicensing.patch deleted file mode 100644 index 36f9a29..0000000 --- a/efivar-relicensing.patch +++ /dev/null @@ -1,1147 +0,0 @@ -From 44bc375593c9d755ddf3eb5de99277404de4c0d4 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Tue, 12 Apr 2016 09:54:16 -0400 -Subject: [PATCH] Clean up some license confusion. - -Basically when some of this got relicensed as LGPL, some of the license -text didn't get changed correctly. But it's still all LGPL, because -that's what COPYING says. - -So fix the language in the individual files. - -Signed-off-by: Peter Jones ---- - src/crc32.h | 36 ++++++++++++++--------------- - src/creator.c | 19 ++++++++-------- - src/disk.c | 21 +++++++++-------- - src/disk.h | 20 ++++++++-------- - src/dp-acpi.c | 12 ++++++---- - src/dp-hw.c | 12 ++++++---- - src/dp-media.c | 12 ++++++---- - src/dp-message.c | 12 ++++++---- - src/dp.c | 12 ++++++---- - src/dp.h | 34 +++++++++++++++------------- - src/efivar.c | 12 ++++++---- - src/efivar_endian.h | 18 ++++++++------- - src/efivarfs.c | 12 ++++++---- - src/export.c | 16 +++++++------ - src/generics.h | 19 ++++++++++++++++ - src/gpt.c | 44 ++++++++++++++++++------------------ - src/gpt.h | 44 ++++++++++++++++++------------------ - src/guid.c | 12 ++++++---- - src/guid.h | 16 +++++++------ - src/include/efivar/efiboot-creator.h | 20 ++++++++-------- - src/include/efivar/efiboot-loadopt.h | 20 ++++++++-------- - src/include/efivar/efiboot.h | 20 ++++++++-------- - src/include/efivar/efivar-dp.h | 1 + - src/include/efivar/efivar.h | 12 ++++++---- - src/lib.c | 16 +++++++------ - src/lib.h | 16 +++++++------ - src/linux.c | 20 ++++++++-------- - src/linux.h | 20 ++++++++-------- - src/loadopt.c | 20 ++++++++-------- - src/makeguids.c | 16 +++++++------ - src/test/tester.c | 17 ++++++++++++++ - src/ucs2.h | 18 +++++++++++++++ - src/util.h | 11 +++++---- - src/vars.c | 12 ++++++---- - 34 files changed, 363 insertions(+), 259 deletions(-) - -Index: efivar-0.23/src/crc32.h -=================================================================== ---- efivar-0.23.orig/src/crc32.h -+++ efivar-0.23/src/crc32.h -@@ -1,23 +1,21 @@ - /* -- libparted - a library for manipulating disk partitions -- Copyright (C) 1998-2000 Free Software Foundation, Inc. -- -- crc32.h -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --*/ -+ * crc32.h - headers for crc32 -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ - - #ifndef _CRC32_H - #define _CRC32_H -Index: efivar-0.23/src/creator.c -=================================================================== ---- efivar-0.23.orig/src/creator.c -+++ efivar-0.23/src/creator.c -@@ -1,20 +1,21 @@ - /* - * libefiboot - library for the manipulation of EFI boot variables - * Copyright 2012-2015 Red Hat, Inc. -- * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/disk.c -=================================================================== ---- efivar-0.23.orig/src/disk.c -+++ efivar-0.23/src/disk.c -@@ -3,20 +3,21 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2000-2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ -- - #include - #include - #include -Index: efivar-0.23/src/disk.h -=================================================================== ---- efivar-0.23.orig/src/disk.h -+++ efivar-0.23/src/disk.h -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #ifndef _EFIBOOT_DISK_H - #define _EFIBOOT_DISK_H -Index: efivar-0.23/src/dp-acpi.c -=================================================================== ---- efivar-0.23.orig/src/dp-acpi.c -+++ efivar-0.23/src/dp-acpi.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2015 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/dp-hw.c -=================================================================== ---- efivar-0.23.orig/src/dp-hw.c -+++ efivar-0.23/src/dp-hw.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2015 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/dp-media.c -=================================================================== ---- efivar-0.23.orig/src/dp-media.c -+++ efivar-0.23/src/dp-media.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2015 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/dp-message.c -=================================================================== ---- efivar-0.23.orig/src/dp-message.c -+++ efivar-0.23/src/dp-message.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2015 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/dp.c -=================================================================== ---- efivar-0.23.orig/src/dp.c -+++ efivar-0.23/src/dp.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2015 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/dp.h -=================================================================== ---- efivar-0.23.orig/src/dp.h -+++ efivar-0.23/src/dp.h -@@ -1,20 +1,22 @@ - /* --* libefivar - library for the manipulation of EFI variables --* Copyright 2012-2015 Red Hat, Inc. --* --* This library is free software; you can redistribute it and/or --* modify it under the terms of the GNU Lesser General Public --* License as published by the Free Software Foundation; either --* version 2.1 of the License. --* --* This library is distributed in the hope that it will be useful, --* but WITHOUT ANY WARRANTY; without even the implied warranty of --* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --* Lesser General Public License for more details. --* --* You should have received a copy of the GNU Lesser General Public License --* along with this library. If not, see . --*/ -+ * libefivar - library for the manipulation of EFI variables -+ * Copyright 2012-2015 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ - #ifndef _EFIVAR_INTERNAL_DP_H - #define _EFIVAR_INTERNAL_DP_H - -Index: efivar-0.23/src/efivar.c -=================================================================== ---- efivar-0.23.orig/src/efivar.c -+++ efivar-0.23/src/efivar.c -@@ -3,17 +3,19 @@ - * Copyright 2012 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/efivar_endian.h -=================================================================== ---- efivar-0.23.orig/src/efivar_endian.h -+++ efivar-0.23/src/efivar_endian.h -@@ -1,17 +1,19 @@ - /* - * Copyright 2009-2015 Red Hat, Inc. - * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; version 2 of the License. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This program is distributed in the hope that it will be useful, -+ * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * - * Author: Peter Jones - */ -Index: efivar-0.23/src/efivarfs.c -=================================================================== ---- efivar-0.23.orig/src/efivarfs.c -+++ efivar-0.23/src/efivarfs.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/export.c -=================================================================== ---- efivar-0.23.orig/src/export.c -+++ efivar-0.23/src/export.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -- * -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/generics.h -=================================================================== ---- efivar-0.23.orig/src/generics.h -+++ efivar-0.23/src/generics.h -@@ -1,3 +1,22 @@ -+/* -+ * Copyright 2012-2016 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ -+ - #ifndef LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H - #define LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H 1 - -Index: efivar-0.23/src/gpt.c -=================================================================== ---- efivar-0.23.orig/src/gpt.c -+++ efivar-0.23/src/gpt.c -@@ -1,26 +1,26 @@ - /* -- gpt.[ch] -- -- Copyright (C) 2000-2001 Dell Computer Corporation -- -- EFI GUID Partition Table handling -- Per Intel EFI Specification v1.02 -- http://developer.intel.com/technology/efi/efi.htm -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --*/ -+ * gpt.[ch] -+ * Copyright (C) 2000-2001 Dell Computer Corporation -+ * -+ * EFI GUID Partition Table handling -+ * Per Intel EFI Specification v1.02 -+ * http://developer.intel.com/technology/efi/efi.htm -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ - - #include - #include -Index: efivar-0.23/src/gpt.h -=================================================================== ---- efivar-0.23.orig/src/gpt.h -+++ efivar-0.23/src/gpt.h -@@ -1,26 +1,26 @@ - /* -- gpt.[ch] -- -- Copyright (C) 2000-2001 Dell Computer Corporation -- -- EFI GUID Partition Table handling -- Per Intel EFI Specification v1.02 -- http://developer.intel.com/technology/efi/efi.htm -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --*/ -+ * gpt.[ch] -+ * Copyright (C) 2000-2001 Dell Computer Corporation -+ * -+ * EFI GUID Partition Table handling -+ * Per Intel EFI Specification v1.02 -+ * http://developer.intel.com/technology/efi/efi.htm -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ - - #ifndef _EFIBOOT_GPT_H - #define _EFIBOOT_GPT_H -Index: efivar-0.23/src/guid.c -=================================================================== ---- efivar-0.23.orig/src/guid.c -+++ efivar-0.23/src/guid.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2014 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/guid.h -=================================================================== ---- efivar-0.23.orig/src/guid.h -+++ efivar-0.23/src/guid.h -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -- * -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #ifndef LIBEFIVAR_GUID_H -Index: efivar-0.23/src/include/efivar/efiboot-creator.h -=================================================================== ---- efivar-0.23.orig/src/include/efivar/efiboot-creator.h -+++ efivar-0.23/src/include/efivar/efiboot-creator.h -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #ifndef _EFIBOOT_CREATOR_H - #define _EFIBOOT_CREATOR_H -Index: efivar-0.23/src/include/efivar/efiboot-loadopt.h -=================================================================== ---- efivar-0.23.orig/src/include/efivar/efiboot-loadopt.h -+++ efivar-0.23/src/include/efivar/efiboot-loadopt.h -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #ifndef _EFIBOOT_LOADOPT_H - #define _EFIBOOT_LOADOPT_H 1 -Index: efivar-0.23/src/include/efivar/efiboot.h -=================================================================== ---- efivar-0.23.orig/src/include/efivar/efiboot.h -+++ efivar-0.23/src/include/efivar/efiboot.h -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #ifndef EFIBOOT_H - #define EFIBOOT_H 1 -Index: efivar-0.23/src/include/efivar/efivar-dp.h -=================================================================== ---- efivar-0.23.orig/src/include/efivar/efivar-dp.h -+++ efivar-0.23/src/include/efivar/efivar-dp.h -@@ -14,6 +14,7 @@ - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . -+ * - */ - #ifndef _EFIVAR_DP_H - #define _EFIVAR_DP_H 1 -Index: efivar-0.23/src/include/efivar/efivar.h -=================================================================== ---- efivar-0.23.orig/src/include/efivar/efivar.h -+++ efivar-0.23/src/include/efivar/efivar.h -@@ -3,17 +3,19 @@ - * Copyright 2012-2014 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - #ifndef EFIVAR_H - #define EFIVAR_H 1 -Index: efivar-0.23/src/lib.c -=================================================================== ---- efivar-0.23.orig/src/lib.c -+++ efivar-0.23/src/lib.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -- * -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - #include - #include -Index: efivar-0.23/src/lib.h -=================================================================== ---- efivar-0.23.orig/src/lib.h -+++ efivar-0.23/src/lib.h -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -- * -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #ifndef LIBEFIVAR_LIB_H -Index: efivar-0.23/src/linux.c -=================================================================== ---- efivar-0.23.orig/src/linux.c -+++ efivar-0.23/src/linux.c -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #include - #include -Index: efivar-0.23/src/linux.h -=================================================================== ---- efivar-0.23.orig/src/linux.h -+++ efivar-0.23/src/linux.h -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #ifndef _EFIBOOT_LINUX_H - #define _EFIBOOT_LINUX_H -Index: efivar-0.23/src/loadopt.c -=================================================================== ---- efivar-0.23.orig/src/loadopt.c -+++ efivar-0.23/src/loadopt.c -@@ -3,18 +3,20 @@ - * Copyright 2012-2015 Red Hat, Inc. - * Copyright (C) 2001 Dell Computer Corporation - * -- * This library is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * -- * You should have received a copy of the GNU General Public License -- * along with this library. If not, see . - */ - #include - #include "dp.h" -Index: efivar-0.23/src/makeguids.c -=================================================================== ---- efivar-0.23.orig/src/makeguids.c -+++ efivar-0.23/src/makeguids.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -- * -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - - #include -Index: efivar-0.23/src/test/tester.c -=================================================================== ---- efivar-0.23.orig/src/test/tester.c -+++ efivar-0.23/src/test/tester.c -@@ -1,3 +1,20 @@ -+/* -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ -+ - #include - #include - #include -Index: efivar-0.23/src/ucs2.h -=================================================================== ---- efivar-0.23.orig/src/ucs2.h -+++ efivar-0.23/src/ucs2.h -@@ -1,3 +1,21 @@ -+/* -+ * Copyright 2012-2016 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * -+ */ - #ifndef _EFIVAR_UCS2_H - #define _EFIVAR_UCS2_H - -Index: efivar-0.23/src/util.h -=================================================================== ---- efivar-0.23.orig/src/util.h -+++ efivar-0.23/src/util.h -@@ -3,17 +3,18 @@ - * All rights reserved. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . - * - * Author(s): Peter Jones - */ -Index: efivar-0.23/src/vars.c -=================================================================== ---- efivar-0.23.orig/src/vars.c -+++ efivar-0.23/src/vars.c -@@ -3,17 +3,19 @@ - * Copyright 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License. -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of the -+ * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this library. If not, see . -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see -+ * . -+ * - */ - #include - #include diff --git a/efivar.changes b/efivar.changes index 5aa459b..2f5c051 100644 --- a/efivar.changes +++ b/efivar.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 13 03:54:20 UTC 2016 - glin@suse.com + +- Update to 0.24 +- Drop upstreamed patches + + efivar-0.21-gcc6.diff + + efivar-nvme-rename.patch + + efivar-nvme-no-kernel-header.patch + + efivar-relicensing.patch + ------------------------------------------------------------------- Tue Jul 12 09:00:02 UTC 2016 - schwab@suse.de diff --git a/efivar.spec b/efivar.spec index 5b4ea14..227abda 100644 --- a/efivar.spec +++ b/efivar.spec @@ -17,19 +17,15 @@ Name: efivar -Version: 0.23 +Version: 0.24 Release: 0 Summary: Tools to manage UEFI variables License: LGPL-2.1 Group: Development/Libraries/Other Url: https://github.com/rhinstaller/efivar Source0: https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2 -Patch1: efivar-0.21-gcc6.diff -Patch2: efivar-no-static.patch -Patch3: efivar-nvme-rename.patch -Patch4: efivar-nvme-no-kernel-header.patch -Patch5: efivar-relicensing.patch -Patch6: deprecated-readdir_r.patch +Patch1: efivar-no-static.patch +Patch2: deprecated-readdir_r.patch BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: popt-devel @@ -55,12 +51,8 @@ development headers required to use libefivar. %prep %setup -q -%patch1 +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build export CFLAGS="%{optflags} -Wno-nonnull"