@@ -1,14 +1,14 @@

 Summary:        Linux Pluggable Authentication Modules

 Name:           Linux-PAM

-Version:        1.2.1

-Release:        5%{?dist}

+Version:        1.3.0

+Release:        1%{?dist}

 License:        BSD and GPLv2+

 URL:            https://www.kernel.org/pub/linux/libs/pam/

 Group:          System Environment/Security

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://linux-pam.org/library/%{name}-%{version}.tar.bz2

-%define sha1    Linux-PAM=3620ab5f5e02272825c426622761a19a1a2facca

+%define sha1    Linux-PAM=e956252e81d824c35a60c9b50919ca0767f8a8ec

 BuildRequires:  cracklib-devel

 Requires:       cracklib

 %description

@@ -18,7 +18,7 @@ enable the local system administrator to choose how applications authenticate us

 %package lang

 Summary: Additional language files for Linux-PAM

 Group: System Environment/Base

-Requires: Linux-PAM >= 1.2.1

+Requires:       %{name} = %{version}-%{release}

 %description lang

 These are the additional language files of Linux-PAM.

@@ -81,7 +81,6 @@ rm -rf %{buildroot}/*

 %{_libdir}/*.so*

 %{_mandir}/man5/*

 %{_mandir}/man8/*

-%{_docdir}/%{name}-%{version}/*

 %files lang -f Linux-PAM.lang

 %defattr(-,root,root)

@@ -90,8 +89,11 @@ rm -rf %{buildroot}/*

 %defattr(-,root,root)

 %{_includedir}/*

 %{_mandir}/man3/*

+%{_docdir}/%{name}-%{version}/*

 %changelog

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.0-1

+-   Version update.

 *   Fri Feb 10 2017 Xiaolin Li <xiaolinl@vmware.com> 1.2.1-5

 -   Added pam_unix_auth.so, pam_unix_acct.so, pam_unix_passwd.so,

 -   and pam_unix_session.so.

@@ -1,9 +1,9 @@

 Summary:        Kernel Audit Tool

 Name:           audit

-Version:        2.5

-Release:        7%{?dist}

+Version:        2.7.5

+Release:        1%{?dist}

 Source0:        http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz

-%define sha1    audit=b684a8dca31776a4184044733cd5fd4b1b652298

+%define sha1    audit=7aaae7ea80f2280b25f243916e8d18b7338b5f53

 License:        GPLv2+

 Group:          System Environment/Security

 URL:            http://people.redhat.com/sgrubb/audit/

@@ -57,7 +57,8 @@ The libraries and header files needed for audit development.

     --with-aarch64 \

         --enable-zos-remote \

     --with-golang \

-    --enable-systemd

+    --enable-systemd \

+    --disable-static

 make %{?_smp_mflags}

@@ -86,10 +87,7 @@ make %{?_smp_mflags} check

 %{_bindir}/*

 %{_sbindir}/*

 %{_libdir}/*.so.*

-%{_libdir}/*.a

-%{_libdir}/*.la

 %{_libdir}/python*/*

-%{_libdir}/golang/*

 %{_libdir}/systemd/system/auditd.service

 %{_libexecdir}/*

 %{_mandir}/man5/*

@@ -104,6 +102,7 @@ make %{?_smp_mflags} check

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/auditd.conf

 %ghost %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/rules.d/audit.rules

 %ghost %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/audit.rules

+%ghost %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/audit-stop.rules

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/audispd.conf

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/af_unix.conf

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/syslog.conf

@@ -112,16 +111,20 @@ make %{?_smp_mflags} check

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/audisp-remote.conf

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/au-remote.conf

 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/libaudit.conf

-/usr/share/aclocal/audit.m4

 %files devel

 %defattr(-,root,root)

 %{_libdir}/*.so

+%{_libdir}/*.la

 %{_libdir}/pkgconfig/*.pc

+%{_libdir}/golang/*

 %{_includedir}/*.h

 %{_mandir}/man3/*

+/usr/share/aclocal/audit.m4

 %changelog

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.7.5-1

+-   Version update.

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.5-7

 -   Moved man3 to devel subpackage.

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2.5-6

@@ -1,40 +1,43 @@

 Summary:	Tools and libraries to manipulate EFI variables

 Name:		efibootmgr

-Version:	0.12

-Release:	2%{?dist}

+Version:	15

+Release:	1%{?dist}

 License:	GPLv2

 URL:		https://github.com/rhinstaller/efibootmgr/

 Group:		System Environment/System Utilities

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:	https://github.com/rhinstaller/efibootmgr/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2

-%define sha1 efibootmgr=eecdacb6eca67bbc318dd03e496f1854214aa79c

-BuildRequires: efivar

+%define sha1 efibootmgr=9dc7ca7b14a47fc178a5bb7b9c0a79cc05e2b272

+BuildRequires: efivar-devel

 BuildRequires: pciutils

 BuildRequires: zlib

 %description

-efivar provides a simle CLI to the UEFI variable facility

+efibootmgr is a userspace application used to modify the Intel Extensible Firmware Interface (EFI) Boot Manager. This application can create and destroy boot entries, change the boot order, change the next running boot option, and more.

 %prep

 %setup -q

 %build

-make %{?_smp_mflags} PREFIX=%{_prefix} \

+make %{?_smp_mflags} PREFIX=%{_prefix} EFIDIR=BOOT EFI_LOADER=grubx64.efi \

     libdir=%{_libdir} \

     bindir=%{_bindir}

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

-mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man8

-install -p --mode 755 src/%{name}/%{name} %{buildroot}%{_sbindir}

-gzip -9 -c src/man/man8/%{name}.8 > src/man/man8/%{name}.8.gz

-touch -r src/man/man8/%{name}.8 src/man/man8/%{name}.8.gz

-install -p --mode 644 src/man/man8/%{name}.8.gz %{buildroot}%{_mandir}/man8

+make DESTDIR=%{buildroot} \

+    PREFIX=%{_prefix} EFIDIR=BOOT EFI_LOADER=grubx64.efi \

+    install

+gzip -9 %{buildroot}%{_mandir}/man8/%{name}.8

+gzip -9 %{buildroot}%{_mandir}/man8/efibootdump.8

+

 %clean

 rm -rf %{buildroot}/*

 %files 

 %defattr(-,root,root)

-%{_sbindir}/%{name}

-%{_mandir}/man8/%{name}.8.gz

+%{_sbindir}/*

+%{_mandir}/man8/*

 %changelog

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.12-2

--	GA - Bump release of all rpms

-*	Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.12-1

--	Initial build.	First version. Install steps from spec file in source.

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 15-1

+-   Version update.

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.12-2

+-   GA - Bump release of all rpms

+*   Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.12-1

+-   Initial build. First version. Install steps from spec file in source.

@@ -1,21 +1,26 @@

 Summary:	Tools and libraries to manipulate EFI variables

 Name:		efivar

-Version:	0.20

-Release:	3%{?dist}

+Version:	31

+Release:	1%{?dist}

 License:	GPLv2

 URL:		https://github.com/rhinstaller/efivar/

 Group:		System Environment/System Utilities

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:	https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2

-%define sha1 efivar=a66a6d00b59bffe07cbdfc98c727d749157d4140

-Patch0:     workaround-rename-of-linux-nvme.h.patch

+%define sha1 efivar=ae5b4c3aeb29fe0ef5212142b0a21d6f003dd266

 BuildRequires: popt-devel

 %description

 efivar provides a simle CLI to the UEFI variable facility

+

+%package    devel

+Summary:    Header and development files for efivar

+Requires:   %{name} = %{version}-%{release}

+%description    devel

+It contains the libraries and header files to create applications

+

 %prep

 %setup -q

-%patch0 -p1

 %build

 make %{?_smp_mflags} PREFIX=%{_prefix} \

     libdir=%{_libdir} \

@@ -31,16 +36,26 @@ make %{?_smp_mflags} test

 %clean

 rm -rf %{buildroot}/*

+

 %files 

 %defattr(-,root,root)

 %{_bindir}/*

-%{_lib64dir}/*

+%{_lib64dir}/*.so.*

+%{_mandir}/man1/*

+

+%files devel

+%defattr(-,root,root)

 %{_includedir}/*

-%{_datadir}/*

+%{_lib64dir}/*.so

+%{_lib64dir}/pkgconfig/*

+%{_mandir}/man3/*

+

 %changelog

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.20-3

--	GA - Bump release of all rpms

-*	Thu Apr 28 2016 Xiaolin Li <xiaolinl@vmware.com> 0.20-2

--	Fix build for linux 4.4.

-*	Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.20-1

--	Initial build.	First version

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 31-1

+-   Version update. Added -devel subpackage.

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.20-3

+-   GA - Bump release of all rpms

+*   Thu Apr 28 2016 Xiaolin Li <xiaolinl@vmware.com> 0.20-2

+-   Fix build for linux 4.4.

+*   Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.20-1

+-   Initial build.	First version

deleted file mode 100644

@@ -1,17 +0,0 @@

-diff --git a/src/a/linux.c b/src/b/linux.c

-index 1231ecf..eb63e22 100644

-+++ b/src/linux.c

-@@ -22,7 +22,12 @@

- #include <inttypes.h>

- #include <limits.h>

- #include <linux/ethtool.h>

-+#include <linux/version.h>

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)

-+#include <linux/nvme_ioctl.h>

-+#else

- #include <linux/nvme.h>

-+#endif

- #include <linux/sockios.h>

- #include <net/if.h>

- #include <scsi/scsi.h>