Update to version 1.10.

Include patch to add missing declarations to header file.

3 files changed, 77 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c83cc013e64..3c5223f24baa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Apr 29 23:15:48 UTC 2016
 pkgbase = sedutil
 	pkgdesc = TCG OPAL 2.00 SED Management Program
-	pkgver = 1.10
-	pkgrel = 3
+	pkgver = 1.12
+	pkgrel = 1
 	url = https://github.com/Drive-Trust-Alliance/sedutil
 	install = sedutil.install
 	arch = i686
@@ -11,7 +13,7 @@ pkgbase = sedutil
 	optdepends = intel-ucode: microcode update files for Intel CPUs
 	optdepends = yubikey-personalization: for yubikey support
 	backup = etc/linuxpba/linuxpba.conf
-	source = sedutil-1.10.tar.gz::https://github.com/Drive-Trust-Alliance/sedutil/archive/1.10.tar.gz
+	source = sedutil-1.12.tar.gz::https://github.com/Drive-Trust-Alliance/sedutil/archive/1.12.tar.gz
 	source = extlinux.conf
 	source = mklinuxpba-initramfs
 	source = mklinuxpba-bios
@@ -21,7 +23,8 @@ pkgbase = sedutil
 	source = linuxpba.hook
 	source = linuxpba.install
 	source = getpasswd.c
-	sha256sums = 31b1006a1f65b83fb419635f21a02bfb99bed8d4d6b351f566831af3682165dd
+	source = add_missing_declarations.patch
+	sha256sums = 5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1
 	sha256sums = 5ab7ef67fea0f4e370d8f0a4da87636a1df18e0edb0152d08f906f38280cc0e8
 	sha256sums = 77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7
 	sha256sums = c599c6066f23aa403cd7c4c43b9b9900079cdbb7bc0b97c79e70a2383864646f
@@ -31,6 +34,7 @@ pkgbase = sedutil
 	sha256sums = d9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447
 	sha256sums = f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7
 	sha256sums = e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484
+	sha256sums = 74f41f3dde1d4291757f74e3bc1ab33ae832ee63b6b8879869705baa054ef2d9
 
 pkgname = sedutil
 
diff --git a/PKGBUILD b/PKGBUILD
index efd0f8083a76..c8321a8b655c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Mauro Santos <registo.mailling@gmail.com>
 
 pkgname=sedutil
-pkgver=1.10
-pkgrel=3
+pkgver=1.12
+pkgrel=1
 pkgdesc="TCG OPAL 2.00 SED Management Program"
 arch=('i686' 'x86_64')
 url="https://github.com/Drive-Trust-Alliance/sedutil"
@@ -21,8 +21,9 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${
         'linuxpba.conf.lib'
         'linuxpba.hook'
         'linuxpba.install'
-        'getpasswd.c')
-sha256sums=('31b1006a1f65b83fb419635f21a02bfb99bed8d4d6b351f566831af3682165dd'
+        'getpasswd.c'
+        'add_missing_declarations.patch')
+sha256sums=('5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1'
             '5ab7ef67fea0f4e370d8f0a4da87636a1df18e0edb0152d08f906f38280cc0e8'
             '77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7'
             'c599c6066f23aa403cd7c4c43b9b9900079cdbb7bc0b97c79e70a2383864646f'
@@ -31,10 +32,16 @@ sha256sums=('31b1006a1f65b83fb419635f21a02bfb99bed8d4d6b351f566831af3682165dd'
             'a110e6d6da0fd658412d8c79f7f2cbc58a9b0067c34c34c94c8f623801eecc78'
             'd9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447'
             'f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7'
-            'e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484')
+            'e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484'
+            '74f41f3dde1d4291757f74e3bc1ab33ae832ee63b6b8879869705baa054ef2d9')
 PKGEXT='.pkg.tar'
 CPPFLAGS="$CPPFLAGS -O2"
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}/"
+    patch -p1 < "${srcdir}/add_missing_declarations.patch"
+}
+
 build() {
     cd "${srcdir}/"
     gcc -Wall -o getpasswd getpasswd.c
@@ -46,9 +53,9 @@ build() {
 
 package() {
     cd "${srcdir}/${pkgname}-${pkgver}/"
-    install -Dm755 "linux/CLI/dist/Release_$CARCH/GNU-Linux-x86/sedutil-cli" "${pkgdir}/usr/bin/sedutil-cli"
+    install -Dm755 "linux/CLI/dist/Release_$CARCH/GNU-Linux/sedutil-cli" "${pkgdir}/usr/bin/sedutil-cli"
     install -Dm644 "linux/PSIDRevert_LINUX.txt" "${pkgdir}/usr/share/doc/${pkgname}/PSIDRevert.txt"
-    install -Dm755 "LinuxPBA/dist/Release_$CARCH/GNU-Linux-x86/linuxpba" "${pkgdir}/usr/bin/linuxpba"
+    install -Dm755 "LinuxPBA/dist/Release_$CARCH/GNU-Linux/linuxpba" "${pkgdir}/usr/bin/linuxpba"
     install -Dm755 "${srcdir}/mklinuxpba-initramfs" "${pkgdir}/usr/bin/mklinuxpba-initramfs"
     install -Dm755 "${srcdir}/mklinuxpba-bios" "${pkgdir}/usr/bin/mklinuxpba-bios"
     install -Dm755 "${srcdir}/linuxpba-arch" "${pkgdir}/usr/bin/linuxpba-arch"
diff --git a/add_missing_declarations.patch b/add_missing_declarations.patch
new file mode 100644
index 000000000000..b363771bdc20
--- /dev/null
+++ b/add_missing_declarations.patch
@@ -0,0 +1,55 @@
+diff -ur a/linux/DtaDevLinuxNvme.h b/linux/DtaDevLinuxNvme.h
+--- a/linux/DtaDevLinuxNvme.h	2016-02-18 00:09:02.000000000 +0000
++++ b/linux/DtaDevLinuxNvme.h	2016-04-30 00:03:24.275330994 +0100
+@@ -22,6 +22,51 @@
+ #include "DtaStructures.h"
+ #include "DtaDevLinuxDrive.h"
+ 
++struct nvme_user_io {
++	__u8	opcode;
++	__u8	flags;
++	__u16	control;
++	__u16	nblocks;
++	__u16	rsvd;
++	__u64	metadata;
++	__u64	addr;
++	__u64	slba;
++	__u32	dsmgmt;
++	__u32	reftag;
++	__u16	apptag;
++	__u16	appmask;
++};
++
++struct nvme_passthru_cmd {
++	__u8	opcode;
++	__u8	flags;
++	__u16	rsvd1;
++	__u32	nsid;
++	__u32	cdw2;
++	__u32	cdw3;
++	__u64	metadata;
++	__u64	addr;
++	__u32	metadata_len;
++	__u32	data_len;
++	__u32	cdw10;
++	__u32	cdw11;
++	__u32	cdw12;
++	__u32	cdw13;
++	__u32	cdw14;
++	__u32	cdw15;
++	__u32	timeout_ms;
++	__u32	result;
++};
++
++#define nvme_admin_cmd nvme_passthru_cmd
++
++#define NVME_IOCTL_ID		_IO('N', 0x40)
++#define NVME_IOCTL_ADMIN_CMD	_IOWR('N', 0x41, struct nvme_admin_cmd)
++#define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
++#define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct nvme_passthru_cmd)
++#define NVME_IOCTL_RESET	_IO('N', 0x44)
++#define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)
++
+ /** Linux specific implementation of DtaDevOS.
+  * Uses the NVMe to send commands to the 
+  * device