Merge branch '3.6' into 3.7

3 files changed, 23 insertions, 47 deletions

diff --git a/efivar/.footprint b/efivar/.footprint
index 91c4f1e27..114da5f69 100644
--- a/efivar/.footprint
+++ b/efivar/.footprint
@@ -1,55 +1,31 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/efisecdb
 -rwxr-xr-x	root/root	usr/bin/efivar
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/efivar/
 -rw-r--r--	root/root	usr/include/efivar/efiboot-creator.h
 -rw-r--r--	root/root	usr/include/efivar/efiboot-loadopt.h
 -rw-r--r--	root/root	usr/include/efivar/efiboot.h
+-rw-r--r--	root/root	usr/include/efivar/efisec-secdb.h
+-rw-r--r--	root/root	usr/include/efivar/efisec-types.h
+-rw-r--r--	root/root	usr/include/efivar/efisec.h
 -rw-r--r--	root/root	usr/include/efivar/efivar-dp.h
 -rw-r--r--	root/root	usr/include/efivar/efivar-guids.h
+-rw-r--r--	root/root	usr/include/efivar/efivar-time.h
+-rw-r--r--	root/root	usr/include/efivar/efivar-types.h
 -rw-r--r--	root/root	usr/include/efivar/efivar.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libefiboot.so -> libefiboot.so.1.37
-lrwxrwxrwx	root/root	usr/lib/libefiboot.so.1 -> libefiboot.so.1.37
--rwxr-xr-x	root/root	usr/lib/libefiboot.so.1.37
-lrwxrwxrwx	root/root	usr/lib/libefivar.so -> libefivar.so.1.37
-lrwxrwxrwx	root/root	usr/lib/libefivar.so.1 -> libefivar.so.1.37
--rwxr-xr-x	root/root	usr/lib/libefivar.so.1.37
+lrwxrwxrwx	root/root	usr/lib/libefiboot.so -> libefiboot.so.1.38
+lrwxrwxrwx	root/root	usr/lib/libefiboot.so.1 -> libefiboot.so.1.38
+-rwxr-xr-x	root/root	usr/lib/libefiboot.so.1.38
+lrwxrwxrwx	root/root	usr/lib/libefisec.so -> libefisec.so.1.38
+lrwxrwxrwx	root/root	usr/lib/libefisec.so.1 -> libefisec.so.1.38
+-rwxr-xr-x	root/root	usr/lib/libefisec.so.1.38
+lrwxrwxrwx	root/root	usr/lib/libefivar.so -> libefivar.so.1.38
+lrwxrwxrwx	root/root	usr/lib/libefivar.so.1 -> libefivar.so.1.38
+-rwxr-xr-x	root/root	usr/lib/libefivar.so.1.38
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/efiboot.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/efisec.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/efivar.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/efivar.1.gz
-drwxr-xr-x	root/root	usr/share/man/man3/
--rw-r--r--	root/root	usr/share/man/man3/efi_append_variable.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_del_variable.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_get_next_variable_name.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_get_variable.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_get_variable_attributes.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_get_variable_size.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_guid_to_id_guid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_guid_to_name.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_guid_to_str.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_guid_to_symbol.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_name_to_guid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_set_variable.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_str_to_guid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_symbol_to_guid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_alloc.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_export.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_free.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_get_attributes.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_get_data.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_get_guid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_get_name.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_import.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_realize.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_set_attributes.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_set_data.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_set_guid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_set_name.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variable_t.3.gz
--rw-r--r--	root/root	usr/share/man/man3/efi_variables_supported.3.gz
diff --git a/efivar/.signature b/efivar/.signature
index ec4682ecb..28fba967c 100644
--- a/efivar/.signature
+++ b/efivar/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/d54K1d8KWn0nAGrD08wgACNIAny8LAAdPnZLEZyK8koCgTU+8ovHRtUYf/rm61gbz1GrBVVxrYjmDkHZo1vSQ4=
-SHA256 (Pkgfile) = a21a545cf5ff9184fdfeca2efcf1859a75fa35e4f31f2dcd1757c3c0410c5806
-SHA256 (.footprint) = 0beee9873ebfae4200842542150c881fedea35a2932c7f26d51daf227b0a6a22
-SHA256 (efivar-37.tar.bz2) = 3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f
+RWSE3ohX2g5d/UaN4ZQADXmZpyvpvGRQDH9huB393jKj2Ufc/WFtxi4xC5RR+Cu/zMVlNyoHliquuBzD6dvchrIQQvpBbRpkrQQ=
+SHA256 (Pkgfile) = 5494e842fbe396ae66faf028abb9a48c488c05dd7a61004b0b81a9b13a897ee9
+SHA256 (.footprint) = 4d6084117a11231abe7ebb2948468cd50b96595968bdde40de52b65c8ad269e8
+SHA256 (efivar-38.tar.bz2) = f018ed6e49c5f1c16d336d9fd7687ce87023276591921db1e49a314ad6515349
diff --git a/efivar/Pkgfile b/efivar/Pkgfile
index 945162274..854c5eedc 100644
--- a/efivar/Pkgfile
+++ b/efivar/Pkgfile
@@ -4,13 +4,13 @@
 # Depends on: popt
 
 name=efivar
-version=37
-release=2
+version=38
+release=1
 source=(https://github.com/rhinstaller/$name/releases/download/$version/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	sed 's/-Werror//' -i gcc.specs
+	sed 's/docs//' -i Makefile
 	make -j1
 	make libdir=/usr/lib DESTDIR=$PKG install
 }