From 5a4afdd72c0dac72f515267db33dd9520b60b5b5 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Fri, 9 Feb 2018 16:34:40 +0100
Subject: [PATCH] upgrading package: mesos 1.0.1 -> 1.5.0

---
 mesos/mesos.patch | 56 ++++++++++++++++++++++++++++-------------------
 mesos/mesos.spec  |  6 ++---
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/mesos/mesos.patch b/mesos/mesos.patch
index f3ab96a099..8a34b7f4f4 100644
--- a/mesos/mesos.patch
+++ b/mesos/mesos.patch
@@ -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
---- src/Makefile.in.orig	2016-07-23 07:24:12.000000000 +0200
-+++ src/Makefile.in	2016-07-27 20:49:02.932128878 +0200
-@@ -1988,7 +1988,7 @@
- # of libmesos will still take a hard dependency on SASL, while Windows builds
- # won't. Currently, the dependency is still assumed throughout the tests,
- # though the plan is to remove this hard dependency as well. See MESOS-5450.
--MESOS_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -DLIBDIR=\"$(libdir)\" \
-+MESOS_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR=\"$(libdir)\" \
- 	-DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
- 	-DPKGDATADIR=\"$(pkgdatadir)\" \
- 	-DPKGMODULEDIR=\"$(pkgmoduledir)\" -I$(top_srcdir)/include \
-@@ -2744,7 +2744,7 @@
+--- src/Makefile.in.orig	2018-02-02 02:12:31.000000000 +0100
++++ src/Makefile.in	2018-02-09 12:45:22.173317000 +0100
+@@ -2421,7 +2421,7 @@
+ # Enable common (and some language specific) warnings.
+ # Warn when a comparison is made between signed and unsigned values.
+ # Warn about use of format functions that can produce security issues.
+-AM_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -Wsign-compare -Wformat-security \
++AM_CXXFLAGS = $(PTHREAD_CFLAGS) \
+ 	$(am__append_4)
+ AM_LIBS = $(PTHREAD_LIBS)
+ 
+@@ -3381,7 +3381,7 @@
  # 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) \
--	-lsvn_subr-1 -lsvn_delta-1 -lapr-1 $(am__append_23)
-+	-lsvn_subr-1 -lsvn_delta-1 -lapr $(am__append_23)
+-	-lsvn_subr-1 -lsvn_delta-1 -lapr-1 $(am__append_44)
++	-lsvn_subr-1 -lsvn_delta-1 -lapr $(am__append_44)
  mesos_agent_SOURCES = slave/main.cpp
  mesos_agent_CPPFLAGS = $(MESOS_CPPFLAGS)
  mesos_agent_LDADD = libmesos.la $(LDADD)
 Index: src/common/values.cpp
---- src/common/values.cpp.orig	2016-07-23 07:23:58.000000000 +0200
-+++ src/common/values.cpp	2016-07-27 20:49:02.932128878 +0200
-@@ -52,7 +52,7 @@
+--- src/common/values.cpp.orig	2018-02-02 02:12:17.000000000 +0100
++++ src/common/values.cpp	2018-02-09 12:45:22.173521000 +0100
+@@ -54,7 +54,7 @@
  
  static long long convertToFixed(double floatValue)
  {
@@ -32,8 +44,8 @@ Index: src/common/values.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	2016-07-27 23:32:18.574793448 +0200
+--- src/slave/containerizer/mesos/provisioner/provisioner.cpp.orig	2018-02-02 02:12:17.000000000 +0100
++++ src/slave/containerizer/mesos/provisioner/provisioner.cpp	2018-02-09 12:45:22.173733000 +0100
 @@ -15,6 +15,7 @@
  // limitations under the License.
  
@@ -43,8 +55,8 @@ Index: src/slave/containerizer/mesos/provisioner/provisioner.cpp
  #endif // __WINDOWS__
  
 Index: src/v1/values.cpp
---- src/v1/values.cpp.orig	2016-07-23 07:23:58.000000000 +0200
-+++ src/v1/values.cpp	2016-07-27 20:49:02.942087755 +0200
+--- src/v1/values.cpp.orig	2018-02-02 02:12:17.000000000 +0100
++++ src/v1/values.cpp	2018-02-09 12:45:22.173913000 +0100
 @@ -53,7 +53,7 @@
  
  static long long convertToFixed(double floatValue)
diff --git a/mesos/mesos.spec b/mesos/mesos.spec
index 9fb803f7cf..a5dc82c456 100644
--- a/mesos/mesos.spec
+++ b/mesos/mesos.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Networking
 License:      Apache
-Version:      1.0.1
-Release:      20160903
+Version:      1.5.0
+Release:      20180209
 
 #   list of sources
 Source0:      http://archive.apache.org/dist/mesos/%{version}/mesos-%{version}.tar.gz
@@ -72,7 +72,7 @@ PreReq:       leveldb, zlib, openssl, libexecinfo, curl, sasl, subversion-libs,
     CXXFLAGS="%{l_cxxflags -O}" \
     CPPFLAGS="%{l_cppflags apr subversion .}" \
     LDFLAGS="%{l_ldflags}" \
-    LIBS="-lssl -lcrypto -lsnappy" \
+    LIBS="-lssl -lcrypto -lsnappy `curl-config --libs`" \
     ./configure \
         --prefix=%{l_prefix} \
         --disable-java \