@@ -2,15 +2,15 @@ diff -Naur gcc-5.3.0.orig/gcc/c/c-typeck.c gcc-5.3.0/gcc/c/c-typeck.c

 --- gcc-5.3.0.orig/gcc/c/c-typeck.c	2015-10-05 05:35:20.000000000 -0700

 +++ gcc-5.3.0/gcc/c/c-typeck.c	2017-02-22 01:11:51.672617711 -0800

 @@ -69,6 +69,8 @@

+ #include "c-family/c-ubsan.h"

  #include "cilk.h"

- #include "wide-int.h"

  #include "gomp-constants.h"

 +#include "plugin-api.h"

 +#include "plugin.h"

+ #include "spellcheck.h"

+ #include "gcc-rich-location.h"

- /* Possible cases of implicit bad conversions.  Used to select

-    diagnostic messages in convert_for_assignment.  */

-@@ -5029,6 +5031,12 @@

+@@ -5277,6 +5279,12 @@

  	return error_mark_node;

      }

@@ -22,7 +22,7 @@ diff -Naur gcc-5.3.0.orig/gcc/c/c-typeck.c gcc-5.3.0/gcc/c/c-typeck.c

 +

    if (type == TYPE_MAIN_VARIANT (TREE_TYPE (value)))

      {

-       if (TREE_CODE (type) == RECORD_TYPE

+       if (RECORD_OR_UNION_TYPE_P (type))

 diff -Naur gcc-5.3.0.orig/gcc/plugin.c gcc-5.3.0/gcc/plugin.c

 --- gcc-5.3.0.orig/gcc/plugin.c	2015-01-30 08:15:00.000000000 -0800

 +++ gcc-5.3.0/gcc/plugin.c	2017-02-22 01:04:55.642416671 -0800

@@ -1,15 +1,15 @@

 %define _use_internal_dependency_generator 0

 Summary:        Contains the GNU compiler collection

 Name:           gcc

-Version:        5.3.0

-Release:        6%{?dist}

+Version:        6.3.0

+Release:        1%{?dist}

 License:        GPLv2+

 URL:            http://gcc.gnu.org

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://ftp.gnu.org/gnu/gcc/%{name}-%{version}/%{name}-%{version}.tar.bz2

-%define sha1 gcc=0612270b103941da08376df4d0ef4e5662a2e9eb

+%define sha1 gcc=928ab552666ee08eed645ff20ceb49d139205dea

 Patch0:         PLUGIN_TYPE_CAST.patch

 Requires:       libstdc++-devel = %{version}-%{release}

 Requires:       libgcc-devel = %{version}-%{release}

@@ -79,8 +79,12 @@ This package contains development headers and static library for libgomp

 %prep

 %setup -q

 %patch0 -p1

+

+# disable FORTIFY_SOURCE=2 from hardening

 sed -i '/*cpp:/s/^/# /' `dirname $(gcc --print-libgcc-file-name)`/../specs

 sed -i '/Ofast:-D_FORTIFY_SOURCE=2/s/^/# /' `dirname $(gcc --print-libgcc-file-name)`/../specs

+# disable no-pie for gcc binaries

+sed -i '/^NO_PIE_CFLAGS = /s/@NO_PIE_CFLAGS@//' gcc/Makefile.in

 install -vdm 755 ../gcc-build

 %build

@@ -129,7 +133,7 @@ make %{?_smp_mflags} check

 %{_lib}/cpp

 #   Executables

 %exclude %{_bindir}/*gfortran

-%exclude %{_libexecdir}/gcc/x86_64-unknown-linux-gnu/5.3.0/f951

+%exclude %{_libexecdir}/gcc/x86_64-pc-linux-gnu/%{version}/f951

 %{_bindir}/*

 #   Libraries

 %ifarch x86_64

@@ -160,7 +164,7 @@ make %{?_smp_mflags} check

 %defattr(-,root,root)

 %{_bindir}/*gfortran

 %{_mandir}/man1/gfortran.1.gz

-%{_libexecdir}/gcc/x86_64-unknown-linux-gnu/5.3.0/f951

+%{_libexecdir}/gcc/x86_64-pc-linux-gnu/%{version}/f951

 %files -n libgcc

 %defattr(-,root,root)

@@ -232,7 +236,9 @@ make %{?_smp_mflags} check

 %endif

 %changelog

-*   Fri Mar 02 2017 Xiaolin Li <xiaolinl@vmware.com> 5.3.0-6

+*   Thu Mar 9 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-1

+-   Update version to 6.3

+*   Thu Mar 02 2017 Xiaolin Li <xiaolinl@vmware.com> 5.3.0-6

 -   Enabled fortran.

 *   Wed Feb 22 2017 Alexey Makhalov <amakhalov@vmware.com> 5.3.0-5

 -   Added new plugin entry point: PLUGIN_TYPE_CAST (.patch)

@@ -1,20 +1,18 @@

 %global security_hardening none

-%global commit          ed0d7c4f6f8db7bda1e74567693a0c525b9cf159

-%global shortcommit	%(c=%{commit}; echo ${c:0:7})

+%global commit          553f4857346faa8c5f6ddf9eced4180924890bfc.tar.bz2

 Summary:        iPXE open source boot firmware

 Name:           ipxe

-Version:        ed0d7c4

-Release:        2%{?dist}

+Version:        553f485

+Release:        1%{?dist}

 License:        GPLv2

 URL:            http://ipxe.org

 Group:          System Environment/Daemons

 Vendor:         VMware, Inc.

 Distribution:   Photon

-#Download URL:  https://git.ipxe.org/ipxe.git/snapshot/ed0d7c4f6f8db7bda1e74567693a0c525b9cf159.tar.gz

-Source0:        %{name}-%{version}.tar.gz

-%define sha1 ipxe=16db273987f525176d9ca6d97c40eb2076a1b47f

-

+#Download URL:  https://git.ipxe.org/ipxe.git/snapshot/%{commit}.tar.bz2

+Source0:        %{name}-%{version}.tar.bz2

+%define sha1 ipxe=723e1e46b00a7de870065b74f053941f46748062

 BuildRequires:  binutils

 BuildRequires:  binutils-devel

 BuildRequires:  cdrkit

@@ -22,8 +20,6 @@ BuildRequires:  gcc

 BuildRequires:  libgcc

 BuildRequires:  libgcc-devel

 BuildRequires:  make

-BuildRequires:  linux

-BuildRequires:  linux-devel

 BuildRequires:  perl

 BuildRequires:  xz

 BuildRequires:  xz-devel

@@ -35,7 +31,7 @@ iPXE is the leading open source network boot firmware. It provides a full

 PXE implementation enhanced with additional features.

 %prep

-%setup -q -n %{name}-%{shortcommit}

+%setup -q -n %{name}-%{version}

 %build

 cd src

@@ -65,7 +61,10 @@ install -vDm 644 src/bin/*.{rom,mrom} %{buildroot}/usr/share/ipxe/

 /usr/share/ipxe/rtl8139.rom

 %changelog

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

--	GA - Bump release of all rpms

-*       Thu Nov 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> ed0d7c4-1

--       Initial build. First version

+*   Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 553f485-1

+-   Version update to build with gcc-6.3

+-   Removed linux/linux-devel build-time dependency

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

+-   GA - Bump release of all rpms

+*   Thu Nov 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> ed0d7c4-1

+-   Initial build. First version

@@ -1,7 +1,7 @@

 Summary:	Logrotate

 Name:		logrotate

 Version:	3.9.1

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPL+

 URL:		https://fedorahosted.org/logrotate

 Source0:	https://fedorahosted.org/releases/l/o/logrotate/%{name}-%{version}.tar.gz

@@ -19,7 +19,9 @@ The logrotate utility is designed to simplify the administration of log files on

 ./autogen.sh

 ./configure \

 	--prefix=%{_prefix}

-make %{?_smp_mflags}

+# logrotate code has misleading identation and GCC 6.3 does not like it.

+make %{?_smp_mflags} CFLAGS="-Wno-error=misleading-indentation -g -O2"

+

 %install

 make DESTDIR=%{buildroot} install

 install -vd %{buildroot}%{_sysconfdir}/logrotate.d

@@ -40,6 +42,8 @@ touch %{buildroot}%{_localstatedir}/lib/logrotate/logrotate.status

 %{_mandir}/man8/logrotate.8.gz

 /var/lib/logrotate/logrotate.status

 %changelog

+*	Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 3.9.1-3

+-	Compilation for gcc 6.3

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

 -	GA - Bump release of all rpms

 *	Wed Jun 24 2015 Divya Thaluru <dthaluru@vmware.com> 3.9.1-1

new file mode 100644

@@ -0,0 +1,116 @@

+diff -Naur thin-provisioning-tools-0.6.1.orig/base/progress_monitor.cc thin-provisioning-tools-0.6.1/base/progress_monitor.cc

+--- thin-provisioning-tools-0.6.1.orig/base/progress_monitor.cc	2016-02-10 06:28:49.000000000 -0800

+@@ -63,16 +63,16 @@

+ 

+ //----------------------------------------------------------------

+ 

+-std::auto_ptr<base::progress_monitor>

++std::unique_ptr<base::progress_monitor>

+ base::create_progress_bar(std::string const &title)

+ {

+-	return auto_ptr<progress_monitor>(new progress_bar(title));

++	return unique_ptr<progress_monitor>(new progress_bar(title));

+ }

+ 

+-std::auto_ptr<base::progress_monitor>

++std::unique_ptr<base::progress_monitor>

+ base::create_quiet_progress_monitor()

+ {

+-	return auto_ptr<progress_monitor>(new quiet_progress());

++	return unique_ptr<progress_monitor>(new quiet_progress());

+ }

+ 

+ //----------------------------------------------------------------

+diff -Naur thin-provisioning-tools-0.6.1.orig/base/progress_monitor.h thin-provisioning-tools-0.6.1/base/progress_monitor.h

+--- thin-provisioning-tools-0.6.1.orig/base/progress_monitor.h	2016-02-10 06:28:49.000000000 -0800

+@@ -15,8 +15,8 @@

+ 		virtual void update_percent(unsigned) = 0;

+ 	};

+ 

+-	std::auto_ptr<progress_monitor> create_progress_bar(std::string const &title);

+-	std::auto_ptr<progress_monitor> create_quiet_progress_monitor();

++	std::unique_ptr<progress_monitor> create_progress_bar(std::string const &title);

++	std::unique_ptr<progress_monitor> create_quiet_progress_monitor();

+ }

+ 

+ //----------------------------------------------------------------

+diff -Naur thin-provisioning-tools-0.6.1.orig/base/xml_utils.cc thin-provisioning-tools-0.6.1/base/xml_utils.cc

+--- thin-provisioning-tools-0.6.1.orig/base/xml_utils.cc	2016-02-10 06:28:49.000000000 -0800

+@@ -14,7 +14,7 @@

+ 	persistent_data::check_file_exists(backup_file);

+ 	ifstream in(backup_file.c_str(), ifstream::in);

+ 

+-	std::auto_ptr<base::progress_monitor> monitor = create_monitor(quiet);

++	std::unique_ptr<base::progress_monitor> monitor = create_monitor(quiet);

+ 

+ 	size_t total = 0;

+ 	size_t input_length = get_file_length(backup_file);

+@@ -53,7 +53,7 @@

+ 	return info.st_size;

+ }

+ 

+-auto_ptr<base::progress_monitor>

++unique_ptr<base::progress_monitor>

+ xml_parser::create_monitor(bool quiet)

+ {

+ 	if (!quiet && isatty(fileno(stdout)))

+diff -Naur thin-provisioning-tools-0.6.1.orig/base/xml_utils.h thin-provisioning-tools-0.6.1/base/xml_utils.h

+--- thin-provisioning-tools-0.6.1.orig/base/xml_utils.h	2016-02-10 06:28:49.000000000 -0800

+@@ -37,7 +37,7 @@

+ 

+ 	private:

+ 		size_t get_file_length(string const &file) const;

+-		auto_ptr<base::progress_monitor> create_monitor(bool quiet);

++		unique_ptr<base::progress_monitor> create_monitor(bool quiet);

+ 

+ 		XML_Parser parser_;

+         };

+diff -Naur thin-provisioning-tools-0.6.1.orig/caching/cache_restore.cc thin-provisioning-tools-0.6.1/caching/cache_restore.cc

+--- thin-provisioning-tools-0.6.1.orig/caching/cache_restore.cc	2016-02-10 06:28:49.000000000 -0800

+@@ -32,7 +32,7 @@

+ 		return info.st_size;

+ 	}

+ 

+-	auto_ptr<progress_monitor> create_monitor(bool quiet) {

++	unique_ptr<progress_monitor> create_monitor(bool quiet) {

+ 		if (!quiet && isatty(fileno(stdout)))

+ 			return create_progress_bar("Restoring");

+ 		else

+@@ -70,7 +70,7 @@

+ 			check_file_exists(*fs.input);

+ 			ifstream in(fs.input->c_str(), ifstream::in);

+ 

+-			auto_ptr<progress_monitor> monitor = create_monitor(fs.quiet);

++			unique_ptr<progress_monitor> monitor = create_monitor(fs.quiet);

+ 			parse_xml(in, restorer, get_file_length(*fs.input), *monitor);

+ 

+ 		} catch (std::exception &e) {

+diff -Naur thin-provisioning-tools-0.6.1.orig/thin-provisioning/restore_emitter.cc thin-provisioning-tools-0.6.1/thin-provisioning/restore_emitter.cc

+--- thin-provisioning-tools-0.6.1.orig/thin-provisioning/restore_emitter.cc	2016-02-10 06:28:49.000000000 -0800

+@@ -142,7 +142,7 @@

+ 		bool device_exists(thin_dev_t dev) const {

+ 			uint64_t key[1] = {dev};

+ 			device_tree::maybe_value v = md_->details_->lookup(key);

+-			return v;

++			return !!v;

+ 		}

+ 

+ 		metadata::ptr md_;

+diff -Naur thin-provisioning-tools-0.6.1.orig/thin-provisioning/thin_pool.cc thin-provisioning-tools-0.6.1/thin-provisioning/thin_pool.cc

+--- thin-provisioning-tools-0.6.1.orig/thin-provisioning/thin_pool.cc	2016-02-10 06:28:49.000000000 -0800

+@@ -232,7 +232,7 @@

+ thin_pool::device_exists(thin_dev_t dev) const

+ {

+ 	uint64_t key[1] = {dev};

+-	return md_->details_->lookup(key);

++	return !!md_->details_->lookup(key);

+ }

+ 

+ //----------------------------------------------------------------

@@ -1,12 +1,13 @@

 Summary: 	Thin provisioning tools

 Name:		thin-provisioning-tools

 Version:	0.6.1

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv3+

 Group:		System Environment/Base

 URL:		https://github.com/jthornber/thin-provisioning-tools

 Source0:	https://github.com/jthornber/thin-provisioning-tools/releases/thin-provisioning-tools-%{version}.tar.gz

 %define sha1 thin-provisioning-tools=387096be52b2f846b8b83f3d8da8e2cc6775465f

+Patch0:		thin-provisioning-tools-fix-for-gcc-6.3.patch

 BuildRequires:	expat , libaio-devel, boost-devel

 Requires:	expat, libaio

 Vendor:		VMware, Inc.

@@ -21,8 +22,8 @@ are included and era check, dump, restore and invalidate to manage

 snapshot eras

 %prep

-#%setup -q -n thin-provisioning-tools-thin-provisioning-tools-%{version}

 %setup -q

+%patch0 -p1

 %build

 autoconf

@@ -73,8 +74,10 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install

 %{_sbindir}/thin_trim

 %changelog

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

--	GA - Bump release of all rpms

+* Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.1-3

+- Fix gcc-6.3 compilation errors

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

+- GA - Bump release of all rpms

 * Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 0.6.1-1

 - Updating version

 * Tue Mar 3 2015 Divya Thaluru <dthaluru@vmware.com> 0.4.1-1

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur xml-security-c-1.7.3.orig/xsec/tools/checksig/InteropResolver.cpp xml-security-c-1.7.3/xsec/tools/checksig/InteropResolver.cpp

+--- xml-security-c-1.7.3.orig/xsec/tools/checksig/InteropResolver.cpp	2012-07-23 09:56:10.000000000 -0700

+@@ -645,7 +645,7 @@

+ 

+ 	}

+ 

+-	return false;

++	return NULL;

+ 

+ }

+ 

@@ -1,7 +1,7 @@

 Summary:	C++ XML Signature and Encryption library.

 Name:		xml-security-c

 Version:	1.7.3

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	Apache Software License

 URL:		http://santuario.apache.org/index.html

 Group:		Applications/System

@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://apache.mirrors.lucidnetworks.net/santuario/c-library/%{name}-%{version}.tar.gz

 %define sha1 xml-security-c=bcbe98e0bd3695a0b961a223cce53e2f35c4681b

+Patch0:		xml-security-c-fix-for-gcc-6.3.patch

 Requires:	openssl

 Requires:	xerces-c

 BuildRequires:	openssl-devel

@@ -23,6 +24,7 @@ Requires:       %{name} = %{version}-%{release}

 This package contains development headers and static library for xml security.

 %prep

 %setup -q

+%patch0 -p1

 %build

 ./configure --prefix=/usr

 make %{?_smp_mflags}

@@ -40,9 +42,11 @@ make DESTDIR=%{buildroot} install

 %{_libdir}/*.a

 %{_includedir}/*

 %changelog

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

--	GA - Bump release of all rpms

-*   	Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 1.7.3-1

--   	Upgrade version.

-*	Thu Nov 06 2014 Sharath George <sharathg@vmware.com> 1.5.1-1

-	Initial version

+*   Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.3-3

+-   Patch for gcc-6.3

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

+-   GA - Bump release of all rpms

+*   Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 1.7.3-1

+-   Upgrade version.

+*   Thu Nov 06 2014 Sharath George <sharathg@vmware.com> 1.5.1-1

+-   Initial version