Browse code

Envoy dependencies - backward-cpp, http-parser, lightstep-tracer, spdlog, protobuf3. Update mesos.

Change-Id: Ia8fc7f0e36402b9011762d18feb00cb83c3fba59
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3077
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

Vinay Kulkarni authored on 2017/06/27 06:17:19
Showing 7 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,42 @@
0
+Summary:        Pretty stack trace printer for C++.
1
+Name:           backward-cpp
2
+Version:        1.3
3
+Release:        1%{?dist}
4
+License:        MIT
5
+URL:            https://github.com/bombela/backward-cpp
6
+Source0:        %{name}-v%{version}.tar.gz
7
+%define sha1    backward-cpp=c5e2672604bbe231bf489ce20369af095fe13fdf
8
+Group:          Development/Tools
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+BuildRequires:  automake
12
+BuildRequires:  autoconf
13
+BuildRequires:  cmake
14
+BuildRequires:  gcc
15
+
16
+%description
17
+Backward is a beautiful stack trace pretty printer for C++.
18
+
19
+%prep
20
+%setup -q
21
+
22
+%build
23
+mkdir -p build
24
+cd build
25
+cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DBUILD_SHARED_LIBS=ON ..
26
+make %{?_smp_mflags}
27
+
28
+%install
29
+cd build
30
+make DESTDIR=%{buildroot} install
31
+install -vm644 libbackward.so %{buildroot}%{_libdir}/
32
+
33
+%files
34
+%defattr(-,root,root)
35
+%{_includedir}/backward.hpp
36
+%{_libdir}/backward/BackwardConfig.cmake
37
+%{_libdir}/libbackward.so
38
+
39
+%changelog
40
+*    Tue Jun 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.3-1
41
+-    Initial version of backward-cpp package for Photon.
0 42
new file mode 100644
... ...
@@ -0,0 +1,45 @@
0
+Summary:	C based http parser for high performance applications.
1
+Name:		http-parser
2
+Version:	2.7.1
3
+Release:	1%{?dist}
4
+License:	MIT
5
+URL:		https://github.com/nodejs/http-parser
6
+Source0:	%{name}-v%{version}.tar.gz
7
+%define sha1    http-parser=e122b1178ec5c9920186cc8293aca9eca7584b12
8
+Group:		Development/Tools
9
+Vendor:		VMware, Inc.
10
+Distribution: 	Photon
11
+BuildRequires:  gcc
12
+
13
+%description
14
+This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in performance HTTP applications. It does not make any syscalls nor allocations, it does not buffer data, it can be interrupted at anytime.
15
+
16
+%package devel
17
+Summary:        http-parser devel
18
+Group:          Development/Tools
19
+Requires:       %{name} = %{version}
20
+%description devel
21
+This contains development tools and libraries for http-parser.
22
+
23
+%prep
24
+%setup -q
25
+sed -i 's/ln -s \$(LIBDIR)\/\$(SONAME) \$(LIBDIR)\/libhttp_parser.\$(SOEXT)/pushd \$(LIBDIR) \&\& ln -s  \$(SONAME)  libhttp_parser.\$(SOEXT) \&\& popd/g' Makefile
26
+
27
+%build
28
+make PREFIX=%{_prefix} %{?_smp_mflags}
29
+
30
+%install
31
+make PREFIX="%{buildroot}%{_prefix}" DESTDIR="%{buildroot}" install
32
+
33
+%files
34
+%defattr(-,root,root)
35
+%{_libdir}/libhttp_parser.so.*
36
+
37
+%files devel
38
+%defattr(-,root,root)
39
+%{_includedir}/http_parser.h
40
+%{_libdir}/libhttp_parser.so
41
+
42
+%changelog
43
+*    Fri Jun 09 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.1-1
44
+-    Initial version of http-parser package for Photon.
0 45
new file mode 100644
... ...
@@ -0,0 +1,48 @@
0
+Summary:        LightStep distributed tracing library for C++
1
+Name:           lightstep-tracer-cpp
2
+Version:        0.19
3
+Release:        1%{?dist}
4
+License:        MIT
5
+URL:            https://github.com/lightstep/lightstep-tracer-cpp
6
+Source0:        https://github.com/lightstep/lightstep-tracer-cpp/releases/download/v0_19/%{name}-%{version}.tar.gz
7
+%define sha1    lightstep-tracer-cpp=ed536c8954ad7a47d9023b9bff8070361b44d06d
8
+Group:          Development/Tools
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+BuildRequires:  autoconf
12
+BuildRequires:  automake
13
+BuildRequires:  clang
14
+BuildRequires:  c-ares
15
+BuildRequires:  c-ares-devel
16
+BuildRequires:  gcc
17
+BuildRequires:  protobuf
18
+BuildRequires:  protobuf-devel
19
+Requires:       protobuf
20
+
21
+%description
22
+LightStep distributed tracing library for C++.
23
+
24
+%prep
25
+%setup -q
26
+
27
+%build
28
+./configure                     \
29
+        --disable-silent-rules  \
30
+        --prefix=%{_prefix}     \
31
+        --disable-static        \
32
+        --enable-shared         \
33
+        --disable-grpc
34
+
35
+%install
36
+make DESTDIR=%{buildroot} install
37
+find %{buildroot} -name '*.la' -delete
38
+
39
+%files
40
+%defattr(-,root,root)
41
+%{_includedir}/lightstep/*.h
42
+%{_includedir}/mapbox_variant/*.hpp
43
+%{_libdir}/liblightstep_*
44
+
45
+%changelog
46
+*    Wed Jun 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.19-1
47
+-    Initial version of lightstep-tracer-cpp package for Photon.
0 48
new file mode 100644
... ...
@@ -0,0 +1,22 @@
0
+diff -Naur mesos-1.1.0.orig/src/linux/fs.cpp mesos-1.1.0/src/linux/fs.cpp
1
+--- mesos-1.1.0.orig/src/linux/fs.cpp	2016-11-04 05:46:21.000000000 -0700
2
+@@ -17,6 +17,7 @@
3
+ #include <errno.h>
4
+ #include <stdio.h>
5
+ #include <string.h>
6
++#include <sys/sysmacros.h>
7
+ 
8
+ #include <linux/limits.h>
9
+ #include <linux/unistd.h>
10
+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
11
+--- mesos-1.1.0.orig/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp	2016-11-04 05:46:21.000000000 -0700
12
+@@ -15,6 +15,7 @@
13
+ // limitations under the License.
14
+ 
15
+ #include <stdint.h>
16
++#include <sys/sysmacros.h>
17
+ 
18
+ #include <algorithm>
19
+ #include <list>
... ...
@@ -1,14 +1,17 @@
1
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
1 3
 Summary:	Mesos
2 4
 Name:		mesos
3
-Version:	0.28.2
4
-Release:	3%{?dist}
5
+Version:	1.2.0
6
+Release:	1%{?dist}
5 7
 License:	Apache
6 8
 URL:		http://mesos.apache.org
7 9
 Group:		Applications/System
8 10
 Vendor:		VMware, Inc.
9 11
 Distribution: 	Photon
10 12
 Source0:	http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
11
-%define sha1 mesos=a8675ef59b4c34d4337553215a5295eebf2e4265
13
+%define sha1 mesos=1d570504498c90697b690e3b221feba63d0a800b
14
+Patch0:         mesos-sysmacros.patch
12 15
 BuildRequires:	openjre >= %{JAVA_VERSION}
13 16
 BuildRequires:  openjdk >= %{JAVA_VERSION}
14 17
 BuildRequires:	curl
... ...
@@ -53,10 +56,11 @@ Requires:	%{name} = %{version}
53 53
 
54 54
 %prep
55 55
 %setup -q
56
+%patch0 -p1
56 57
 
57 58
 %build
58
-sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.in
59
-sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.in
59
+sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.am
60
+sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.am
60 61
 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
61 62
 ./configure \
62 63
 	CFLAGS="%{optflags} -Wno-deprecated-declarations"  \
... ...
@@ -65,7 +69,7 @@ export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
65 65
 	--prefix=%{_prefix} \
66 66
 	--bindir=%{_bindir} \
67 67
 	--libdir=%{_libdir}
68
-make
68
+make %{?_smp_mflags}
69 69
 
70 70
 %check
71 71
 make check
... ...
@@ -84,26 +88,30 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
84 84
 %{_libexecdir}/mesos/mesos-*
85 85
 %{_prefix}/etc/mesos/*
86 86
 %{_prefix}/share/mesos/*
87
-%{_libdir}/libload_qos_controller-0.28.2.so
87
+%{_libdir}/libload_qos_controller-*.so
88 88
 %{_libdir}/libload_qos_controller.so
89
-%{_libdir}/liblogrotate_container_logger-0.28.2.so
89
+%{_libdir}/liblogrotate_container_logger-*.so
90 90
 %{_libdir}/liblogrotate_container_logger.so
91
-%{_libdir}/mesos/modules/libfixed_resource_estimator-0.28.2.so
91
+%{_libdir}/mesos/modules/libfixed_resource_estimator-*.so
92 92
 %{_libdir}/mesos/modules/libfixed_resource_estimator.so
93
-%{_libdir}/mesos/modules/libload_qos_controller-0.28.2.so
93
+%{_libdir}/mesos/modules/libload_qos_controller-*.so
94 94
 %{_libdir}/mesos/modules/libload_qos_controller.so
95
-%{_libdir}/mesos/modules/liblogrotate_container_logger-0.28.2.so
95
+%{_libdir}/mesos/modules/liblogrotate_container_logger-*.so
96 96
 %{_libdir}/mesos/modules/liblogrotate_container_logger.so
97
+%exclude %{_bindir}/easy_install
98
+%exclude %{_bindir}/easy_install-2.7
97 99
 
98 100
 %files devel
99 101
 %{_includedir}/*
100 102
 %{_libdir}/libfixed_resource_estimator*
101 103
 %{_libdir}/pkgconfig/mesos.pc
102
-%{_libdir}/python2.7/site-packages/*
103 104
 %{_prefix}/etc/mesos/*
105
+%{python2_sitelib}/*
104 106
 %exclude %{_libdir}/debug/
105 107
 
106 108
 %changelog
109
+*	Mon Jun 26 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.2.0-1
110
+-	Upgrade to mesos 1.2.0
107 111
 *	Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.28.2-3
108 112
 -	Use JAVA_VERSION macro instead of hard coding version.
109 113
 *	Mon Apr 24 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.28.2-2
... ...
@@ -1,16 +1,17 @@
1 1
 Summary:        Google's data interchange format
2 2
 Name:           protobuf
3
-Version:        2.6.1
4
-Release:        4%{?dist}
3
+Version:        3.0.0
4
+Release:        1%{?dist}
5 5
 License:        BSD-3-Clause
6 6
 Group:          Development/Libraries
7 7
 Vendor:         VMware, Inc.
8 8
 Distribution:   Photon
9 9
 URL:            https://github.com/google/protobuf/
10 10
 Source0:        protobuf-%{version}.tar.gz
11
-%define         sha1 protobuf=a8f11eced7352edfefa814996ebf086ab3cfbaa0
11
+%define         sha1 protobuf=cffdb9bd6eed66b7c3322197740510fd103bb6df
12 12
 BuildRequires:  autoconf
13 13
 BuildRequires:  automake
14
+BuildRequires:  cmake
14 15
 BuildRequires:  libtool
15 16
 BuildRequires:	which
16 17
 BuildRequires:  libstdc++
... ...
@@ -69,6 +70,7 @@ This contains protobuf python3 libraries.
69 69
 %package        java
70 70
 Summary:        protobuf java
71 71
 Group:          Development/Libraries
72
+BuildRequires:  chkconfig
72 73
 BuildRequires:  openjre >= %{JAVA_VERSION}
73 74
 BuildRequires:  openjdk >= %{JAVA_VERSION}
74 75
 BuildRequires:  apache-maven >= 3.3.3
... ...
@@ -84,7 +86,6 @@ autoreconf -iv
84 84
 %build
85 85
 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
86 86
 %configure --disable-silent-rules
87
-
88 87
 make %{?_smp_mflags}
89 88
 pushd python
90 89
 python setup.py build
... ...
@@ -103,7 +104,8 @@ popd
103 103
 pushd java
104 104
 mvn install
105 105
 install -vdm755 %{buildroot}%{_libdir}/java/protobuf
106
-install -vm644 target/protobuf-java-2.6.1.jar %{buildroot}%{_libdir}/java/protobuf
106
+install -vm644 core/target/%{name}-java-%{version}.jar %{buildroot}%{_libdir}/java/protobuf
107
+install -vm644 util/target/%{name}-java-util-%{version}.jar %{buildroot}%{_libdir}/java/protobuf
107 108
 popd
108 109
 
109 110
 %check
... ...
@@ -146,6 +148,8 @@ make check
146 146
 %{_libdir}/java/protobuf/*.jar
147 147
 
148 148
 %changelog
149
+*   Wed Jun 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.0.0-1
150
+-   Update to protobuf v3.0.0
149 151
 *   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.6.1-4
150 152
 -   Use JAVA_VERSION macro instead of hard coded version.
151 153
 *   Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-3
152 154
new file mode 100644
... ...
@@ -0,0 +1,40 @@
0
+Summary:	Very fast, header only, C++ logging library.
1
+Name:		spdlog
2
+Version:	0.13.0
3
+Release:	1%{?dist}
4
+License:	MIT
5
+URL:		https://github.com/gabime/spdlog
6
+Source0:	%{name}-v%{version}.tar.gz
7
+%define sha1    spdlog=e9968ab555f9f7bb86d6257e98d7a92313a91297
8
+Group:		Development/Tools
9
+Vendor:		VMware, Inc.
10
+Distribution: 	Photon
11
+BuildRequires:  automake
12
+BuildRequires:  cmake
13
+BuildRequires:  gcc
14
+
15
+%description
16
+Very fast, header only, C++ logging library.
17
+
18
+%prep
19
+%setup -q
20
+
21
+%build
22
+mkdir -p build
23
+cd build
24
+cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DBUILD_SHARED_LIBS=ON ..
25
+make %{?_smp_mflags}
26
+
27
+%install
28
+cd build
29
+make DESTDIR=%{buildroot} install
30
+
31
+%files
32
+%defattr(-,root,root)
33
+%{_includedir}/%{name}/*
34
+%{_libdir}/cmake/%{name}/*.cmake
35
+%{_libdir}/pkgconfig/spdlog.pc
36
+
37
+%changelog
38
+*    Fri Jun 09 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.13.0-1
39
+-    Initial version of spdlog package for Photon.