|
|
|
@ -1,28 +1,40 @@ |
|
|
|
|
|
|
|
Index: 3rdparty/libprocess/Makefile.in
|
|
|
|
|
|
|
|
--- 3rdparty/libprocess/Makefile.in.orig 2018-02-02 02:12:28.000000000 +0100
|
|
|
|
|
|
|
|
+++ 3rdparty/libprocess/Makefile.in 2018-02-09 15:49:41.252321000 +0100
|
|
|
|
|
|
|
|
@@ -130,7 +130,7 @@
|
|
|
|
|
|
|
|
# Protect many of the functions with stack guards
|
|
|
|
|
|
|
|
# (either -fstack-protector-strong or -fstack-protector depending on compiler support).
|
|
|
|
|
|
|
|
# Produce position independent code when appropriate.
|
|
|
|
|
|
|
|
-@ENABLE_HARDENING_TRUE@am__append_1 = @STACK_PROTECTOR@ -fPIC -fPIE
|
|
|
|
|
|
|
|
+@ENABLE_HARDENING_TRUE@am__append_1 = -fPIC
|
|
|
|
|
|
|
|
@WITH_BUNDLED_BOOST_TRUE@am__append_2 = $(BOOST)-stamp
|
|
|
|
|
|
|
|
@WITH_BUNDLED_CONCURRENTQUEUE_TRUE@am__append_3 = $(CONCURRENTQUEUE)-stamp
|
|
|
|
|
|
|
|
@WITH_BUNDLED_ELFIO_TRUE@am__append_4 = $(ELFIO)-stamp
|
|
|
|
Index: src/Makefile.in
|
|
|
|
Index: src/Makefile.in
|
|
|
|
--- src/Makefile.in.orig 2016-07-23 07:24:12.000000000 +0200
|
|
|
|
--- src/Makefile.in.orig 2018-02-02 02:12:31.000000000 +0100
|
|
|
|
+++ src/Makefile.in 2016-07-27 20:49:02.932128878 +0200
|
|
|
|
+++ src/Makefile.in 2018-02-09 12:45:22.173317000 +0100
|
|
|
|
@@ -1988,7 +1988,7 @@
|
|
|
|
@@ -2421,7 +2421,7 @@
|
|
|
|
# of libmesos will still take a hard dependency on SASL, while Windows builds
|
|
|
|
# Enable common (and some language specific) warnings.
|
|
|
|
# won't. Currently, the dependency is still assumed throughout the tests,
|
|
|
|
# Warn when a comparison is made between signed and unsigned values.
|
|
|
|
# though the plan is to remove this hard dependency as well. See MESOS-5450.
|
|
|
|
# Warn about use of format functions that can produce security issues.
|
|
|
|
-MESOS_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -DLIBDIR=\"$(libdir)\" \
|
|
|
|
-AM_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -Wsign-compare -Wformat-security \
|
|
|
|
+MESOS_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR=\"$(libdir)\" \
|
|
|
|
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) \
|
|
|
|
-DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
|
|
|
|
$(am__append_4)
|
|
|
|
-DPKGDATADIR=\"$(pkgdatadir)\" \
|
|
|
|
AM_LIBS = $(PTHREAD_LIBS)
|
|
|
|
-DPKGMODULEDIR=\"$(pkgmoduledir)\" -I$(top_srcdir)/include \
|
|
|
|
|
|
|
|
@@ -2744,7 +2744,7 @@
|
|
|
|
@@ -3381,7 +3381,7 @@
|
|
|
|
# Add the convenience library.
|
|
|
|
# Add the convenience library.
|
|
|
|
libmesos_la_LIBADD = libmesos_no_3rdparty.la $(LIB_GLOG) \
|
|
|
|
libmesos_la_LIBADD = libmesos_no_3rdparty.la $(LIB_GLOG) $(LIB_GRPC) \
|
|
|
|
$(LIB_LEVELDB) $(LIB_PROCESS) $(LIB_PROTOBUF) $(LIB_ZOOKEEPER) \
|
|
|
|
$(LIB_LEVELDB) $(LIB_PROCESS) $(LIB_PROTOBUF) $(LIB_ZOOKEEPER) \
|
|
|
|
- -lsvn_subr-1 -lsvn_delta-1 -lapr-1 $(am__append_23)
|
|
|
|
- -lsvn_subr-1 -lsvn_delta-1 -lapr-1 $(am__append_44)
|
|
|
|
+ -lsvn_subr-1 -lsvn_delta-1 -lapr $(am__append_23)
|
|
|
|
+ -lsvn_subr-1 -lsvn_delta-1 -lapr $(am__append_44)
|
|
|
|
mesos_agent_SOURCES = slave/main.cpp
|
|
|
|
mesos_agent_SOURCES = slave/main.cpp
|
|
|
|
mesos_agent_CPPFLAGS = $(MESOS_CPPFLAGS)
|
|
|
|
mesos_agent_CPPFLAGS = $(MESOS_CPPFLAGS)
|
|
|
|
mesos_agent_LDADD = libmesos.la $(LDADD)
|
|
|
|
mesos_agent_LDADD = libmesos.la $(LDADD)
|
|
|
|
Index: src/common/values.cpp
|
|
|
|
Index: src/common/values.cpp
|
|
|
|
--- src/common/values.cpp.orig 2016-07-23 07:23:58.000000000 +0200
|
|
|
|
--- src/common/values.cpp.orig 2018-02-02 02:12:17.000000000 +0100
|
|
|
|
+++ src/common/values.cpp 2016-07-27 20:49:02.932128878 +0200
|
|
|
|
+++ src/common/values.cpp 2018-02-09 12:45:22.173521000 +0100
|
|
|
|
@@ -52,7 +52,7 @@
|
|
|
|
@@ -54,7 +54,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
static long long convertToFixed(double floatValue)
|
|
|
|
static long long convertToFixed(double floatValue)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -32,8 +44,8 @@ Index: src/common/values.cpp |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Index: src/slave/containerizer/mesos/provisioner/provisioner.cpp
|
|
|
|
Index: src/slave/containerizer/mesos/provisioner/provisioner.cpp
|
|
|
|
--- src/slave/containerizer/mesos/provisioner/provisioner.cpp.orig 2016-07-23 07:23:58.000000000 +0200
|
|
|
|
--- src/slave/containerizer/mesos/provisioner/provisioner.cpp.orig 2018-02-02 02:12:17.000000000 +0100
|
|
|
|
+++ src/slave/containerizer/mesos/provisioner/provisioner.cpp 2016-07-27 23:32:18.574793448 +0200
|
|
|
|
+++ src/slave/containerizer/mesos/provisioner/provisioner.cpp 2018-02-09 12:45:22.173733000 +0100
|
|
|
|
@@ -15,6 +15,7 @@
|
|
|
|
@@ -15,6 +15,7 @@
|
|
|
|
// limitations under the License.
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
|
|
|
|
@ -43,8 +55,8 @@ Index: src/slave/containerizer/mesos/provisioner/provisioner.cpp |
|
|
|
#endif // __WINDOWS__
|
|
|
|
#endif // __WINDOWS__
|
|
|
|
|
|
|
|
|
|
|
|
Index: src/v1/values.cpp
|
|
|
|
Index: src/v1/values.cpp
|
|
|
|
--- src/v1/values.cpp.orig 2016-07-23 07:23:58.000000000 +0200
|
|
|
|
--- src/v1/values.cpp.orig 2018-02-02 02:12:17.000000000 +0100
|
|
|
|
+++ src/v1/values.cpp 2016-07-27 20:49:02.942087755 +0200
|
|
|
|
+++ src/v1/values.cpp 2018-02-09 12:45:22.173913000 +0100
|
|
|
|
@@ -53,7 +53,7 @@
|
|
|
|
@@ -53,7 +53,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
static long long convertToFixed(double floatValue)
|
|
|
|
static long long convertToFixed(double floatValue)
|
|
|
|
|