@@ -1,18 +1,19 @@

 Name:          crash

-Version:       7.1.5

-Release:       2%{?dist}

+Version:       7.1.8

+Release:       1%{?dist}

 Summary:       kernel crash analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles

 Group:         Development/Tools

 Vendor:	       VMware, Inc.

 Distribution:  Photon

 URL:           http://people.redhat.com/anderson/

 Source0:       http://people.redhat.com/anderson/crash-%{version}.tar.gz

-%define sha1 crash=dd6b6f9e6aed648bdac4550d9d81442896dc98fd

-%define CRASH_GCORE_VERSION	1.3.1

-Source1:       http://people.redhat.com/anderson/extensions/crash-gcore-command-1.3.1.tar.gz

-%define sha1 crash-gcore=9f1a889ad7b3f01c88866dac44cabddd7d35f99c

+%define sha1 crash=bcacab6bdabb4c53cc8b0171011ed50ccaf5310d

+%define CRASH_GCORE_VERSION	1.4.0

+Source1:       http://people.redhat.com/anderson/extensions/crash-gcore-command-1.4.0.tar.gz

+%define sha1 crash-gcore=1434f787d7210516b12c2f28e5b9e5917c5b3eca

+Source2:       gdb-7.6-extra-patch.patch

 License:       GPL

-Patch0:        gcore-support-linux-4.4.patch

+#Patch0:        gcore-support-linux-4.4.patch

 BuildRequires: binutils

 BuildRequires: glibc-devel

 BuildRequires: ncurses-devel

@@ -36,10 +37,11 @@ This package contains libraries and header files need for development.

 %prep

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

 %setup -a 1

-cd crash-gcore-command-%{CRASH_GCORE_VERSION}

-%patch0 -p1

+#cd crash-gcore-command-%{CRASH_GCORE_VERSION}

+#%patch0 -p1

 %build

+cat %{SOURCE2} >> gdb-7.6.patch

 make RPMPKG=%{version}-%{release}

 cd crash-gcore-command-%{CRASH_GCORE_VERSION}

 make -f gcore.mk ARCH=SUPPORTED TARGET=X86_64

@@ -72,6 +74,9 @@ install -pm 755 crash-gcore-command-%{CRASH_GCORE_VERSION}/gcore.so %{buildroot}

 %{_includedir}/crash/*.h

 %changelog

+*   Wed Mar 22 2017 Alexey Makhalov <amakhalov@vmware.com> 7.1.8-1

+-   Update version to 7.1.8 (it supports linux-4.9)

+-   Disable a patch - it requires a verification.

 *   Fri Oct 07 2016 Alexey Makhalov <amakhalov@vmware.com> 7.1.5-2

 -   gcore-support-linux-4.4.patch

 *   Fri Sep 30 2016 Alexey Makhalov <amakhalov@vmware.com> 7.1.5-1

new file mode 100644

@@ -0,0 +1,22 @@

+--- gdb-7.6/gdb/amd64-linux-nat.c.orig

+@@ -482,7 +482,7 @@

+    a request for a thread's local storage address.  */

+ 

+ ps_err_e

+-ps_get_thread_area (const struct ps_prochandle *ph,

++ps_get_thread_area (struct ps_prochandle *ph,

+                     lwpid_t lwpid, int idx, void **base)

+ {

+   if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)

+--- gdb-7.6/gdb/gdb_proc_service.h.orig

+@@ -115,7 +115,7 @@

+ /* Fetch the special per-thread address associated with the given LWP.

+    This call is only used on a few platforms (most use a normal register).

+    The meaning of the `int' parameter is machine-dependent.  */

+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,

++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,

+ 				    lwpid_t, int, psaddr_t *);

+ 

+ 

new file mode 100644

@@ -0,0 +1,10 @@

+--- a/fatrace.c

+@@ -33,6 +33,7 @@

+ #include <signal.h>

+ #include <time.h>

+ #include <sys/stat.h>

++#include <sys/sysmacros.h>

+ #include <sys/fanotify.h>

+ #include <sys/time.h>

+ #include <sys/types.h>

@@ -1,11 +1,12 @@

 Summary:	fatrace reports file access events from all running processes.

 Name:		fatrace

 Version:	0.12

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GNU GPLv3

 URL:		https://launchpad.net/fatrace

 Source0:	https://launchpad.net/fatrace/trunk/0.12/+download/%{name}-%{version}.tar.bz2

 %define sha1 fatrace=af7d1249307c2d24083a7d9395464e72601ad358

+Patch0:		fatrace-sysmacros.patch

 Requires:	python2

 Group:		Utilities

 Vendor:		VMware, Inc.

@@ -17,6 +18,7 @@ Its main purpose is to find processes which keep waking up the disk unnecessaril

 %prep

 %setup -q

+%patch0 -p1

 %build

 make %{?_smp_mflags}

@@ -34,5 +36,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_mandir}/*

 %changelog

-*	Mon Feb 6 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.12-1

--	initial version

+*   Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 0.12-2

+-   Added fatrace-sysmacros.patch to fix build issue with glibc-2.25

+*   Mon Feb 6 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.12-1

+-   initial version

@@ -1,11 +1,11 @@

 Summary:	C debugger

 Name:		gdb

-Version:	7.8.2	

-Release:	3%{?dist}

+Version:	7.12.1

+Release:	1%{?dist}

 License:	GPLv2+

 URL:		http://www.gnu.org/software/%{name}

-Source0:	http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.gz

-%define sha1 gdb=67cfbc6efcff674aaac3af83d281cf9df0839ff9

+Source0:	http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.xz

+%define sha1 gdb=ef77c5345d6f9fdcdf7a5d8503301242b701936e

 Source1:        http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl8.5.14-src.tar.gz

 %define sha1 tcl=9bc452eec453c2ed37625874b9011563db687b07

 Source2:        http://prdownloads.sourceforge.net/expect/expect5.45.tar.gz

@@ -78,7 +78,8 @@ make %{?_smp_mflags} check

 %files -f %{name}.lang

 %defattr(-,root,root)

-%{_includedir}/*.h

+%exclude %{_datadir}/locale

+%exclude %{_includedir}/*.h

 %{_includedir}/gdb/*.h

 %{_libdir}/*.so

 %{_infodir}/*.gz

@@ -89,9 +90,11 @@ make %{?_smp_mflags} check

 %{_mandir}/*/*

 %changelog

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

--	GA - Bump release of all rpms

-*	Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 7.8.2-2

--	Handled locale files with macro find_lang

-*	Wed Apr 08 2015 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.8.2-1

--	Initial build. First version

+*   Wed Mar 22 2017 Alexey Makhalov <amakhalov@vmware.com> 7.12.1-1

+-   Version update

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

+-   GA - Bump release of all rpms

+*   Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 7.8.2-2

+-   Handled locale files with macro find_lang

+*   Wed Apr 08 2015 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.8.2-1

+-   Initial build. First version

deleted file mode 100644

@@ -1,72 +0,0 @@

-Submitted By:            Armin K. <krejzi at email dot com>

-Date:                    2013-02-11

-Initial Package Version: 2.17

-Upstream Status:         Not Applicable

-Origin:                  Self

-Description:             This patch removes references to /var/db directory which is not part

-                         of FHS and replaces them with more suitable directories in /var

-                         hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.

-

-+++ b/Makeconfig	2013-02-11 01:32:32.500667439 +0100

-@@ -250,7 +250,7 @@

- 

- # Directory for the database files and Makefile for nss_db.

- ifndef vardbdir

--vardbdir = $(localstatedir)/db

-+vardbdir = $(localstatedir)/lib/nss_db

- endif

- inst_vardbdir = $(install_root)$(vardbdir)

- 

-+++ b/nscd/nscd.h	2013-02-11 01:32:32.500667439 +0100

-@@ -112,11 +112,11 @@

- 

- 

- /* Paths of the file for the persistent storage.  */

--#define _PATH_NSCD_PASSWD_DB	"/var/db/nscd/passwd"

--#define _PATH_NSCD_GROUP_DB	"/var/db/nscd/group"

--#define _PATH_NSCD_HOSTS_DB	"/var/db/nscd/hosts"

--#define _PATH_NSCD_SERVICES_DB	"/var/db/nscd/services"

--#define _PATH_NSCD_NETGROUP_DB	"/var/db/nscd/netgroup"

-+#define _PATH_NSCD_PASSWD_DB	"/var/cache/nscd/passwd"

-+#define _PATH_NSCD_GROUP_DB	"/var/cache/nscd/group"

-+#define _PATH_NSCD_HOSTS_DB	"/var/cache/nscd/hosts"

-+#define _PATH_NSCD_SERVICES_DB	"/var/cache/nscd/services"

-+#define _PATH_NSCD_NETGROUP_DB	"/var/cache/nscd/netgroup"

- 

- /* Path used when not using persistent storage.  */

- #define _PATH_NSCD_XYZ_DB_TMP	"/var/run/nscd/dbXXXXXX"

-+++ b/nss/db-Makefile	2013-02-11 01:32:32.500667439 +0100

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

- 		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \

- 		       /etc/netgroup)

- 

--VAR_DB = /var/db

-+VAR_DB = /var/lib/nss_db

- 

- AWK = awk

- MAKEDB = makedb --quiet

-+++ b/sysdeps/generic/paths.h	2013-02-11 01:32:32.500667439 +0100

-@@ -68,7 +68,7 @@

- /* Provide trailing slash, since mostly used for building pathnames. */

- #define	_PATH_DEV	"/dev/"

- #define	_PATH_TMP	"/tmp/"

--#define	_PATH_VARDB	"/var/db/"

-+#define	_PATH_VARDB	"/var/lib/nss_db/"

- #define	_PATH_VARRUN	"/var/run/"

- #define	_PATH_VARTMP	"/var/tmp/"

- 

-+++ b/sysdeps/unix/sysv/linux/paths.h	2013-02-11 01:32:32.504000831 +0100

-@@ -68,7 +68,7 @@

- /* Provide trailing slash, since mostly used for building pathnames. */

- #define	_PATH_DEV	"/dev/"

- #define	_PATH_TMP	"/tmp/"

--#define	_PATH_VARDB	"/var/db/"

-+#define	_PATH_VARDB	"/var/lib/nss_db/"

- #define	_PATH_VARRUN	"/var/run/"

- #define	_PATH_VARTMP	"/var/tmp/"

- 

new file mode 100644

@@ -0,0 +1,72 @@

+Submitted By:            Armin K. <krejzi at email dot com>

+Date:                    2013-02-11

+Initial Package Version: 2.17

+Upstream Status:         Not Applicable

+Origin:                  Self

+Description:             This patch removes references to /var/db directory which is not part

+                         of FHS and replaces them with more suitable directories in /var

+                         hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.

+

+--- a/Makeconfig	2012-12-25 04:02:13.000000000 +0100

+@@ -250,7 +250,7 @@

+ 

+ # Directory for the database files and Makefile for nss_db.

+ ifndef vardbdir

+-vardbdir = $(localstatedir)/db

++vardbdir = $(localstatedir)/lib/nss_db

+ endif

+ inst_vardbdir = $(install_root)$(vardbdir)

+ 

+--- a/nscd/nscd.h	2012-12-25 04:02:13.000000000 +0100

+@@ -112,11 +112,11 @@

+ 

+ 

+ /* Paths of the file for the persistent storage.  */

+-#define _PATH_NSCD_PASSWD_DB	"/var/db/nscd/passwd"

+-#define _PATH_NSCD_GROUP_DB	"/var/db/nscd/group"

+-#define _PATH_NSCD_HOSTS_DB	"/var/db/nscd/hosts"

+-#define _PATH_NSCD_SERVICES_DB	"/var/db/nscd/services"

+-#define _PATH_NSCD_NETGROUP_DB	"/var/db/nscd/netgroup"

++#define _PATH_NSCD_PASSWD_DB	"/var/cache/nscd/passwd"

++#define _PATH_NSCD_GROUP_DB	"/var/cache/nscd/group"

++#define _PATH_NSCD_HOSTS_DB	"/var/cache/nscd/hosts"

++#define _PATH_NSCD_SERVICES_DB	"/var/cache/nscd/services"

++#define _PATH_NSCD_NETGROUP_DB	"/var/cache/nscd/netgroup"

+ 

+ /* Path used when not using persistent storage.  */

+ #define _PATH_NSCD_XYZ_DB_TMP	"/var/run/nscd/dbXXXXXX"

+--- a/nss/db-Makefile	2012-12-25 04:02:13.000000000 +0100

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

+ 		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \

+ 		       /etc/netgroup)

+ 

+-VAR_DB = /var/db

++VAR_DB = /var/lib/nss_db

+ 

+ AWK = awk

+ MAKEDB = makedb --quiet

+--- a/sysdeps/generic/paths.h	2012-12-25 04:02:13.000000000 +0100

+@@ -68,7 +68,7 @@

+ /* Provide trailing slash, since mostly used for building pathnames. */

+ #define	_PATH_DEV	"/dev/"

+ #define	_PATH_TMP	"/tmp/"

+-#define	_PATH_VARDB	"/var/db/"

++#define	_PATH_VARDB	"/var/lib/nss_db/"

+ #define	_PATH_VARRUN	"/var/run/"

+ #define	_PATH_VARTMP	"/var/tmp/"

+ 

+--- a/sysdeps/unix/sysv/linux/paths.h	2012-12-25 04:02:13.000000000 +0100

+@@ -68,7 +68,7 @@

+ /* Provide trailing slash, since mostly used for building pathnames. */

+ #define	_PATH_DEV	"/dev/"

+ #define	_PATH_TMP	"/tmp/"

+-#define	_PATH_VARDB	"/var/db/"

++#define	_PATH_VARDB	"/var/lib/nss_db/"

+ #define	_PATH_VARRUN	"/var/run/"

+ #define	_PATH_VARTMP	"/var/tmp/"

+ 

@@ -3,7 +3,7 @@

 Summary:	Main C library

 Name:		glibc

-Version:	2.24

+Version:	2.25

 Release:	1%{?dist}

 License:	LGPLv2+

 URL:		http://www.gnu.org/software/libc

@@ -11,12 +11,11 @@ Group:		Applications/System

 Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source0:	http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz

-%define sha1 glibc=e5d9725d94d59475d9a6869a4447a70c1bf3ef78

+%define sha1 glibc=5fff5a94ef4470bf48fe1b79093185f19f5c827a

 Source1:	locale-gen.sh

 Source2:	locale-gen.conf

-Patch0:   	http://http://www.linuxfromscratch.org/patches/downloads/glibc/glibc-2.24-fhs-1.patch

+Patch0:   	http://www.linuxfromscratch.org/patches/downloads/glibc/glibc-2.25-fhs-1.patch

 Patch1:		glibc-2.24-bindrsvport-blacklist.patch

-Patch2:		pthread_create-fix-use-after-free.patch

 Provides:	rtld(GNU_HASH)

 Requires:       filesystem

 %description

@@ -51,7 +50,6 @@ These are the additional internationalization files of glibc.

 sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile

 %patch0 -p1

 %patch1 -p1

-%patch2 -p1

 install -vdm 755 %{_builddir}/%{name}-build

 # do not try to explicitly provide GLIBC_PRIVATE versioned libraries

 %define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh

@@ -204,6 +202,8 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig

 %changelog

+*   Wed Mar 22 2017 Alexey Makhalov <amakhalov@vmware.com> 2.25-1

+-   Version update

 *   Wed Dec 14 2016 Alexey Makhalov <amakhalov@vmware.com> 2.24-1

 -   Version update

 *   Wed Nov 23 2016 Alexey Makhalov <amakhalov@vmware.com> 2.22-13

deleted file mode 100644

@@ -1,132 +0,0 @@

-diff -Naur glibc-2.22_orig/nptl/createthread.c glibc-2.22/nptl/createthread.c

-+++ glibc-2.22/nptl/createthread.c	2016-09-28 11:27:50.831206703 -0700

-@@ -25,13 +25,13 @@

- 

- static int

- create_thread (struct pthread *pd, const struct pthread_attr *attr,

--	       bool stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran)

-+	       bool *stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran)

- {

-   /* If the implementation needs to do some tweaks to the thread after

-      it has been created at the OS level, it can set STOPPED_START here.  */

- 

--  pd->stopped_start = stopped_start;

--  if (__glibc_unlikely (stopped_start))

-+  pd->stopped_start = *stopped_start;

-+  if (__glibc_unlikely (*stopped_start))

-     /* We make sure the thread does not run far by forcing it to get a

-        lock.  We lock it here too so that the new thread cannot continue

-        until we tell it to.  */

-diff -Naur glibc-2.22_orig/nptl/pthread_create.c glibc-2.22/nptl/pthread_create.c

-+++ glibc-2.22/nptl/pthread_create.c	2016-09-28 11:31:20.839209223 -0700

-@@ -72,7 +72,7 @@

-    case it is responsible for doing its own cleanup.  */

- 

- static int create_thread (struct pthread *pd, const struct pthread_attr *attr,

--			  bool stopped_start, STACK_VARIABLES_PARMS,

-+			  bool *stopped_start, STACK_VARIABLES_PARMS,

- 			  bool *thread_ran);

- 

- #include <createthread.c>

-@@ -633,14 +633,16 @@

-      that cares whether the thread count is correct.  */

-   atomic_increment (&__nptl_nthreads);

- 

-+  bool stopped_start = false;

-   bool thread_ran = false;

- 

-   /* Start the thread.  */

-   if (__glibc_unlikely (report_thread_creation (pd)))

-     {

-+      stopped_start = true;

-       /* Create the thread.  We always create the thread stopped

- 	 so that it does not get far before we tell the debugger.  */

--      retval = create_thread (pd, iattr, true, STACK_VARIABLES_ARGS,

-+      retval = create_thread (pd, iattr, &stopped_start, STACK_VARIABLES_ARGS,

- 			      &thread_ran);

-       if (retval == 0)

- 	{

-@@ -667,7 +669,7 @@

- 	}

-     }

-   else

--    retval = create_thread (pd, iattr, false, STACK_VARIABLES_ARGS,

-+    retval = create_thread (pd, iattr, &stopped_start, STACK_VARIABLES_ARGS,

- 			    &thread_ran);

- 

-   if (__glibc_unlikely (retval != 0))

-@@ -701,7 +703,8 @@

-     }

-   else

-     {

--      if (pd->stopped_start)

-+      /* do not use pd->stopped_start to avoid use after free */

-+      if (stopped_start)

- 	/* The thread blocked on this lock either because we're doing TD_CREATE

- 	   event reporting, or for some other reason that create_thread chose.

- 	   Now let it run free.  */

-diff -Naur glibc-2.22_orig/sysdeps/nacl/createthread.c glibc-2.22/sysdeps/nacl/createthread.c

-+++ glibc-2.22/sysdeps/nacl/createthread.c	2016-09-28 11:27:34.983206513 -0700

-@@ -32,12 +32,12 @@

- 

- static int

- create_thread (struct pthread *pd, const struct pthread_attr *attr,

--	       bool stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran)

-+	       bool *stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran)

- {

-   pd->tid = __nacl_get_tid (pd);

- 

--  pd->stopped_start = stopped_start;

--  if (__glibc_unlikely (stopped_start))

-+  pd->stopped_start = *stopped_start;

-+  if (__glibc_unlikely (*stopped_start))

-     /* We make sure the thread does not run far by forcing it to get a

-        lock.  We lock it here too so that the new thread cannot continue

-        until we tell it to.  */

-diff -Naur glibc-2.22_orig/sysdeps/unix/sysv/linux/createthread.c glibc-2.22/sysdeps/unix/sysv/linux/createthread.c

-+++ glibc-2.22/sysdeps/unix/sysv/linux/createthread.c	2016-09-28 11:27:18.275206312 -0700

-@@ -46,7 +46,7 @@

- 

- static int

- create_thread (struct pthread *pd, const struct pthread_attr *attr,

--	       bool stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran)

-+	       bool *stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran)

- {

-   /* Determine whether the newly created threads has to be started

-      stopped since we have to set the scheduling parameters or set the

-@@ -54,10 +54,10 @@

-   if (attr != NULL

-       && (__glibc_unlikely (attr->cpuset != NULL)

- 	  || __glibc_unlikely ((attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0)))

--    stopped_start = true;

-+    *stopped_start = true;

- 

--  pd->stopped_start = stopped_start;

--  if (__glibc_unlikely (stopped_start))

-+  pd->stopped_start = *stopped_start;

-+  if (__glibc_unlikely (*stopped_start))

-     /* We make sure the thread does not run far by forcing it to get a

-        lock.  We lock it here too so that the new thread cannot continue

-        until we tell it to.  */

-@@ -117,7 +117,7 @@

-       /* Set the affinity mask if necessary.  */

-       if (attr->cpuset != NULL)

- 	{

--	  assert (stopped_start);

-+	  assert (*stopped_start);

- 

- 	  res = INTERNAL_SYSCALL (sched_setaffinity, err, 3, pd->tid,

- 				  attr->cpusetsize, attr->cpuset);

-@@ -140,7 +140,7 @@

-       /* Set the scheduling parameters.  */

-       if ((attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0)

- 	{

--	  assert (stopped_start);

-+	  assert (*stopped_start);

- 

- 	  res = INTERNAL_SYSCALL (sched_setscheduler, err, 3, pd->tid,

- 				  pd->schedpolicy, &pd->schedparam);

new file mode 100644

@@ -0,0 +1,22 @@

+diff -Naur mesos-1.1.0.orig/src/linux/fs.cpp mesos-1.1.0/src/linux/fs.cpp

+--- mesos-1.1.0.orig/src/linux/fs.cpp	2016-11-04 05:46:21.000000000 -0700

+@@ -17,6 +17,7 @@

+ #include <errno.h>

+ #include <stdio.h>

+ #include <string.h>

++#include <sys/sysmacros.h>

+ 

+ #include <linux/limits.h>

+ #include <linux/unistd.h>

+diff -Naur mesos-1.1.0.orig/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp mesos-1.1.0/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

+--- mesos-1.1.0.orig/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp	2016-11-04 05:46:21.000000000 -0700

+@@ -15,6 +15,7 @@

+ // limitations under the License.

+ 

+ #include <stdint.h>

++#include <sys/sysmacros.h>

+ 

+ #include <algorithm>

+ #include <list>

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

 Summary:        Mesos

 Name:           mesos

 Version:        1.1.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Apache

 URL:            http://mesos.apache.org

 Group:          Applications/System

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

 Distribution:   Photon

 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz

 %define sha1    mesos=5ea8f46cdb5c1b96fdce19120655c8df15732a60

+Patch0:         mesos-sysmacros.patch

 BuildRequires:  openjre >= 1.8.0.45

 BuildRequires:  openjdk >= 1.8.0.45

 BuildRequires:  curl-devel

@@ -47,13 +48,14 @@ Requires:   %{name} = %{version}

 %prep

 %setup -q

+%patch0 -p1

 %build

 sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.am

 sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.am

 ./configure \

     CFLAGS="%{optflags} -Wno-deprecated-declarations"  \

-    CXXFLAGS="%{optflags} -Wno-deprecated-declarations" \

+    CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-strict-aliasing" \

     --disable-silent-rules \

     --prefix=%{_prefix} \

     --bindir=%{_bindir} \

@@ -98,6 +100,9 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %exclude %{_libdir}/debug/

 %changelog

+*   Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.0-3

+-   Added mesos-sysmacros.patch and -Wno-strict-aliasing CPPFLAGS

+    to fix build issues with glibc-2.25

 *   Thu Dec 15 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.0-2

 -   BuildRequires curl-devel.

 *   Tue Dec 13 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.0-1

deleted file mode 100644

@@ -1,24 +0,0 @@

-+++ open-vm-tools-9.10.0-2476743/configure.ac	2015-04-21 01:23:00.561586272 -0700

-@@ -1041,6 +1041,7 @@

-    CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"

-    CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE"

-    CPPFLAGS="$CPPFLAGS -D_SVID_SOURCE"

-+   CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"

- 

-    LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lrt"

- 

-+++ open-vm-tools-9.10.0-2476743/vgauth/common/VGAuthLog.c	2015-04-21 01:24:32.370582529 -0700

-@@ -25,6 +25,11 @@

- #ifdef _WIN32

- #include <windows.h>

- #else

-+/*

-+ * Need GNU definition of strerror_r for better compatibility

-+ * across different glibc versions.

-+ */

-+#define _GNU_SOURCE

- #include <errno.h>

- #include <unistd.h>

- #include <string.h>

new file mode 100644

@@ -0,0 +1,11 @@

+diff -Naur open-vm-tools.orig/lib/wiper/wiperPosix.c open-vm-tools/lib/wiper/wiperPosix.c

+--- open-vm-tools.orig/lib/wiper/wiperPosix.c	2016-09-29 03:07:52.000000000 -0700

+@@ -29,6 +29,7 @@

+ 

+ #include <stdio.h>

+ #include <sys/stat.h>

++#include <sys/sysmacros.h>

+ #if defined(__linux__) || defined(sun)

+ # include <sys/vfs.h>

+ #elif defined(__FreeBSD__) || defined(__APPLE__)

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

 Summary:        Usermode tools for VmWare virts

 Name:           open-vm-tools

 Version:        10.1.5

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/vmware/open-vm-tools

 Group:          Applications/System

@@ -17,6 +17,7 @@ Patch0:         GOSC-libDeploy.patch

 Patch1:         IPv6Support.patch

 Patch2:         hostnameReCustomizationFix.patch

 Patch3:         PureIPv6-hosts.patch

+Patch4:         open-vm-tools-sysmacros.patch

 BuildRequires:  glib-devel

 BuildRequires:  xerces-c-devel

 BuildRequires:  xml-security-c-devel

@@ -44,6 +45,7 @@ VmWare virtualization user mode tools

 %patch1 -p0

 %patch2 -p0

 %patch3 -p0

+%patch4 -p1

 %build

 touch ChangeLog

 autoreconf -i

@@ -101,6 +103,8 @@ fi

 %changelog

+*   Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 10.1.5-2

+-   Added *-sysmacros.patch to fix build issue with glibc-2.25

 *   Fri Mar 03 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-1

 -   Updating version to 10.1.5

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 10.1.0-2