@@ -12,17 +12,20 @@

 # common

 #################################################################################

 Name:       ceph

-Version:    11.2.0

-Release:    11%{?dist}

+Version:    11.2.1

+Release:    1%{?dist}

 Epoch:      1

 Summary:    User space components of the Ceph file system

 License:    LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT

 Group:      System/Filesystems

 URL:        http://ceph.com/

 Source0:    http://ceph.com/download/%{name}-%{version}.tar.gz

-%define sha1 ceph=8bb87494c9b47b2ef02bfe51bb981a8cd94fa9fb

+%define sha1 ceph=7b273e0edf7901e838238a88cdb70976c908ecff

 Vendor:     VMware, Inc.

 Distribution:   Photon

+

+Patch0:         fix-build-warnings-errors-gcc-7.3.patch

+

 #################################################################################

 # dependencies that apply across all distro families

 #################################################################################

@@ -443,6 +446,7 @@ python-rbd, python-rgw or python-cephfs instead.

 #################################################################################

 %prep

 %setup -n ceph-%{version}

+%patch0 -p1

 %build

 %if %{with lowmem_builder}

@@ -1000,6 +1004,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1

 # actually build this meta package.

 %changelog

+*   Thu Aug 30 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 11.2.1-1

+-   Update to version 11.2.1 and fix build issues with gcc 7.3

 *   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  11.2.0-11

 -   Fixed the log file directory structure

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 11.2.0-10

new file mode 100644

@@ -0,0 +1,446 @@

+

+commit 9b4f0a49f7fa723db9b5e11893173172f85b749c

+Author: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

+Date:   Tue Aug 14 11:36:04 2018 -0700

+

+    Fix build warnings/errors with gcc 7.3

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/statistics.h:17:0,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/stop_watch.h:8,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/perf_step_timer.h:9,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/iostats_context_imp.h:8,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/posix_logger.h:27,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/port/util_logger.h:18,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/db/auto_roll_logger.h:15,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/db/auto_roll_logger.cc:6:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_local.h:205:5: error: this use of "defined" may not be portable [-Werror=expansion-to-defined]

+     #if ROCKSDB_SUPPORT_THREAD_LOCAL

+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_local.h:205:5: error: this use of "defined" may not be portable [-Werror=expansion-to-defined]

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_local.h:205:5: error: this use of "defined" may not be portable [-Werror=expansion-to-defined]

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_local.h:66:16: error: 'function' in namespace 'std' does not name a template type

+       typedef std::function<void(void*, void*)> FoldFunc;

+                    ^~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_local.h:71:13: error: 'FoldFunc' has not been declared

+       void Fold(FoldFunc func, void* res);

+                 ^~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_local.h:142:28: error: 'FoldFunc' has not been declared

+         void Fold(uint32_t id, FoldFunc func, void* res);

+                                ^~~~~~~~

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_status_updater.h:42:0,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_status_util.h:13,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/db/builder.cc:34:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/thread_operation.h:22:5: error: this use of "defined" may not be portable [-Werror=expansion-to-defined]

+     #if ROCKSDB_USING_THREAD_STATUS

+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/db/memtable.cc: In member function 'void rocksdb::MemTable::Update(rocksdb::SequenceNumber, const rocksdb::Slice&, const rocksdb::Slice&)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/db/memtable.cc:734:11: error: this statement may fall through [-Werror=implicit-fallthrough=]

+               }

+               ^

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/db/memtable.cc:736:9: note: here

+             default:

+             ^~~~~~~

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/librbd/WatchNotifyTypes.cc:5:0:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/librbd/WatchNotifyTypes.h: In member function 'void librbd::watch_notify::NotifyMessage::decode(ceph::buffer::list::iterator&)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/librbd/WatchNotifyTypes.h:246:8: warning: '<anonymous>.librbd::watch_notify::SnapRenamePayload::snap_id' may be used uninitialized in this function [-Wmaybe-uninitialized]

+     struct SnapRenamePayload : public SnapPayloadBase {

+            ^~~~~~~~~~~~~~~~~

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/cls/rbd/cls_rbd_types.cc:5:0:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/cls/rbd/cls_rbd_types.h: In member function 'void cls::rbd::SnapshotNamespaceOnDisk::decode(ceph::buffer::list::iterator&)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/cls/rbd/cls_rbd_types.h:244:8: warning: '<anonymous>.cls::rbd::GroupSnapshotNamespace::group_pool' may be used uninitialized in this function [-Wmaybe-uninitialized]

+     struct GroupSnapshotNamespace {

+            ^~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/cls/rbd/cls_rbd_types.h:244:8: warning: '<anonymous>.cls::rbd::GroupSnapshotNamespace::group_pool' may be used uninitialized in this function [-Wmaybe-uninitialized]

+     struct GroupSnapshotNamespace {

+            ^~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/cls/rbd/cls_rbd_types.h:244:8: warning: '*((void*)(& temp)+8).cls::rbd::GroupSnapshotNamespace::group_pool' may be used uninitialized in this function [-Wmaybe-uninitialized]

+     struct GroupSnapshotNamespace {

+            ^~~~~~~~~~~~~~~~~~~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/krbd.cc: In function 'int krbd_unmap_by_spec(krbd_ctx*, const char*, const char*, const char*, const char*)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/krbd.cc:610:65: warning: 'devno' may be used uninitialized in this function [-Wmaybe-uninitialized]

+       return do_unmap(ctx->udev, devno, build_unmap_buf(id, options));

+                                                                     ^

+    /usr/src/photon/BUILD/ceph-11.2.1/src/krbd.cc:593:9: note: 'devno' was declared here

+       dev_t devno;

+             ^~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/logging.cc: In function 'std::__cxx11::string rocksdb::NumberToHumanString(int64_t)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/logging.cc:100:13: error: '%li' directive output may be truncated writing between 1 and 17 bytes into a region of size 16 [-Werror=format-truncation=] 

+     std::string NumberToHumanString(int64_t num) {

+                 ^~~~~~~~~~~~~~~~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc: In function 'uint64_t MurmurHash64A(const void*, int, unsigned int)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:49:15: error: this statement may fall through [-Werror=implicit-fallthrough=]

+         case 7: h ^= ((uint64_t)data2[6]) << 48;

+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:50:5: note: here

+         case 6: h ^= ((uint64_t)data2[5]) << 40;

+         ^~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:50:15: error: this statement may fall through [-Werror=implicit-fallthrough=]

+         case 6: h ^= ((uint64_t)data2[5]) << 40;

+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:51:5: note: here

+         case 5: h ^= ((uint64_t)data2[4]) << 32;

+         ^~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:51:15: error: this statement may fall through [-Werror=implicit-fallthrough=]

+         case 5: h ^= ((uint64_t)data2[4]) << 32;

+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:52:5: note: here

+         case 4: h ^= ((uint64_t)data2[3]) << 24;

+         ^~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:52:15: error: this statement may fall through [-Werror=implicit-fallthrough=]

+         case 4: h ^= ((uint64_t)data2[3]) << 24;

+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:53:5: note: here

+         case 3: h ^= ((uint64_t)data2[2]) << 16;

+         ^~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:53:15: error: this statement may fall through [-Werror=implicit-fallthrough=]

+         case 3: h ^= ((uint64_t)data2[2]) << 16;

+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:54:5: note: here

+         case 2: h ^= ((uint64_t)data2[1]) << 8;

+         ^~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:54:15: error: this statement may fall through [-Werror=implicit-fallthrough=]

+         case 2: h ^= ((uint64_t)data2[1]) << 8;

+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/murmurhash.cc:55:5: note: here

+         case 1: h ^= ((uint64_t)data2[0]);

+         ^~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/transaction_test_util.cc: In static member function 'static rocksdb::Status rocksdb::RandomTransactionInserter::Verify(rocksdb::DB*, uint16_t)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/transaction_test_util.cc:188:8: error: '__builtin___snprintf_chk' output may be truncated before the last format character [-Werror=format-truncation=]

+     Status RandomTransactionInserter::Verify(DB* db, uint16_t num_sets) {

+            ^~~~~~~~~~~~~~~~~~~~~~~~~

+    In file included from /usr/include/stdio.h:862:0,

+                     from /usr/include/c++/7.3.0/cstdio:42,

+                     from /usr/include/c++/7.3.0/ext/string_conversions.h:43,

+                     from /usr/include/c++/7.3.0/bits/basic_string.h:6349,

+                     from /usr/include/c++/7.3.0/string:52,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/include/rocksdb/options.h:14,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/transaction_test_util.h:10,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/util/transaction_test_util.cc:11:

+    /usr/include/bits/stdio2.h:65:44: note: '__builtin___snprintf_chk' output between 5 and 6 bytes into a destination of size 5

+            __bos (__s), __fmt, __va_arg_pack ());

+                                                ^

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/persistent_cache/block_cache_tier.h:23:0,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/persistent_cache/block_cache_tier.cc:7:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h:80:33: error: 'function' in namespace 'std' does not name a template type

+                          const std::function<void()> callback) = 0;

+                                     ^~~~~~~~

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/persistent_cache/volatile_tier_impl.h:18:0,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/persistent_cache/volatile_tier_impl.cc:8:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/persistent_cache/hash_table_evictable.h:78:23: error: 'function' in namespace 'std' does not name a template type

+       T* Evict(const std::function<void(T*)>& fn = nullptr) {

+                           ^~~~~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/transactions/transaction_util.cc: In static member function 'static rocksdb::Status rocksdb::TransactionUtil::CheckKey(rocksdb::DBImpl*, rocksdb::SuperVersion*, rocksdb::SequenceNumber, rocksdb::SequenceNumber, const string&, bool)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/transactions/transaction_util.cc:53:8: error: '.  Increasing the value of the max_write_buffer_number_to_maintain option could reduce the frequency of this error.' directive output truncated writing 115 bytes into a region of size between 76 and 114 [-Werror=format-truncation=]

+     Status TransactionUtil::CheckKey(DBImpl* db_impl, SuperVersion* sv,

+            ^~~~~~~~~~~~~~~

+    In file included from /usr/include/stdio.h:862:0,

+                     from /usr/include/c++/7.3.0/cstdio:42,

+                     from /usr/include/c++/7.3.0/ext/string_conversions.h:43,

+                     from /usr/include/c++/7.3.0/bits/basic_string.h:6349,

+                     from /usr/include/c++/7.3.0/string:52,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/transactions/transaction_util.h:10,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rocksdb/utilities/transactions/transaction_util.cc:12:

+    /usr/include/bits/stdio2.h:65:44: note: '__builtin___snprintf_chk' output between 257 and 295 bytes into a destination of size 255

+            __bos (__s), __fmt, __va_arg_pack ());

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_formats.cc:20:0:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_formats.h: In constructor 'RGWFormatter_Plain::RGWFormatter_Plain(bool)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_formats.h:60:8: warning: 'RGWFormatter_Plain::wrote_something' will be initialized after [-Wreorder]

+       bool wrote_something;

+            ^~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_formats.h:58:10: warning:   'size_t RGWFormatter_Plain::min_stack_level' [-Wreorder]

+       size_t min_stack_level;

+              ^~~~~~~~~~~~~~~

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_formats.cc:27:1: warning:   when initialized here [-Wreorder]

+     RGWFormatter_Plain::RGWFormatter_Plain(const bool ukv)

+     ^~~~~~~~~~~~~~~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/client/SyntheticClient.cc: In member function 'int SyntheticClient::random_walk(int)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/client/SyntheticClient.cc:2678:11: warning: '*' in boolean context, suggest '&&' instead [-Wint-in-bool-context]

+         if (.9*roll_die(::pow((double).9,(double)cwd.depth())) && !subdirs.empty()) {

+             ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_rados.cc: In function 'void usage_log_hash(CephContext*, const string&, std::__cxx11::string&, uint32_t)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_rados.cc:4617:13: warning: '__builtin___snprintf_chk' output may be truncated before the last format character [-Wformat-truncation=]

+     static void usage_log_hash(CephContext *cct, const string& name, string& hash, uint32_t index)

+                 ^~~~~~~~~~~~~~

+    In file included from /usr/include/stdio.h:862:0,

+                     from /usr/include/c++/7.3.0/cstdio:42,

+                     from /usr/include/c++/7.3.0/ext/string_conversions.h:43,

+                     from /usr/include/c++/7.3.0/bits/basic_string.h:6349,

+                     from /usr/include/c++/7.3.0/string:52,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/build/boost/include/boost/algorithm/string/std/string_traits.hpp:15,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/build/boost/include/boost/algorithm/string/std_containers_traits.hpp:19,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/build/boost/include/boost/algorithm/string.hpp:18,

+                     from /usr/src/photon/BUILD/ceph-11.2.1/src/rgw/rgw_rados.cc:7:

+    /usr/include/bits/stdio2.h:65:44: note: '__builtin___snprintf_chk' output between 8 and 17 bytes into a destination of size 16

+            __bos (__s), __fmt, __va_arg_pack ());

+                                            ^

+    /usr/src/photon/BUILD/ceph-11.2.1/src/osdc/Journaler.cc: In member function 'void Journaler::_do_flush(unsigned int)':

+    /usr/src/photon/BUILD/ceph-11.2.1/src/osdc/Journaler.cc:638:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

+         if (newlen < len) {

+             ~~~~~~~^~~~~

+

+    In file included from /usr/src/photon/BUILD/ceph-11.2.1/src/os/FuseStore.cc:4:0:

+    /usr/src/photon/BUILD/ceph-11.2.1/src/os/FuseStore.h:32:8: error: 'std::function' has not been declared

+       std::function<int(bufferlist *bl)> f);

+            ^~~~~~~~

+

+    cc1plus: all warnings being treated as errors

+

+    Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

+

+diff -Naurp ceph-11.2.1/src/client/SyntheticClient.cc ceph-11.2.1-modified/src/client/SyntheticClient.cc

+--- ceph-11.2.1/src/client/SyntheticClient.cc	2017-08-08 12:07:05.000000000 -0700

+@@ -2675,7 +2675,7 @@ int SyntheticClient::random_walk(int num

+     }

+ 

+     // descend?

+-    if (.9*roll_die(::pow((double).9,(double)cwd.depth())) && !subdirs.empty()) {

++    if (roll_die(::pow((double).9,(double)cwd.depth())) && !subdirs.empty()) {

+       string s = get_random_subdir();

+       cwd.push_dentry( s );

+       dout(DBL) << "cd " << s << " -> " << cwd << dendl;

+diff -Naurp ceph-11.2.1/src/cls/rbd/cls_rbd_types.h ceph-11.2.1-modified/src/cls/rbd/cls_rbd_types.h

+--- ceph-11.2.1/src/cls/rbd/cls_rbd_types.h	2017-08-08 12:07:05.000000000 -0700

+@@ -248,12 +248,12 @@ struct GroupSnapshotNamespace {

+ 

+   GroupSnapshotNamespace(int64_t _group_pool,

+ 			 const string &_group_id,

+-			 const snapid_t &_snapshot_id) :group_pool(_group_pool),

+-							group_id(_group_id),

+-							snapshot_id(_snapshot_id) {}

++			 const snapid_t &_snapshot_id)

++    : group_id(_group_id), group_pool(_group_pool),

++      snapshot_id(_snapshot_id) {}

+ 

+-  int64_t group_pool;

+   string group_id;

++  int64_t group_pool = 0;

+   snapid_t snapshot_id;

+ 

+   void encode(bufferlist& bl) const;

+diff -Naurp ceph-11.2.1/src/krbd.cc ceph-11.2.1-modified/src/krbd.cc

+--- ceph-11.2.1/src/krbd.cc	2017-08-08 12:07:05.000000000 -0700

+@@ -590,7 +590,7 @@ static int unmap_image(struct krbd_ctx *

+                        const char *image, const char *snap,

+                        const char *options)

+ {

+-  dev_t devno;

++  dev_t devno = 0;

+   string id;

+   int r;

+ 

+diff -Naurp ceph-11.2.1/src/librbd/WatchNotifyTypes.h ceph-11.2.1-modified/src/librbd/WatchNotifyTypes.h

+--- ceph-11.2.1/src/librbd/WatchNotifyTypes.h	2017-08-08 12:07:05.000000000 -0700

+@@ -250,7 +250,7 @@ struct SnapRenamePayload : public SnapPa

+   SnapRenamePayload(const uint64_t &src_snap_id, const std::string &dst_name)

+     : SnapPayloadBase(dst_name), snap_id(src_snap_id) {}

+ 

+-  uint64_t snap_id;

++  uint64_t snap_id = 0;

+ 

+   void encode(bufferlist &bl) const;

+   void decode(__u8 version, bufferlist::iterator &iter);

+diff -Naurp ceph-11.2.1/src/os/FuseStore.h ceph-11.2.1-modified/src/os/FuseStore.h

+--- ceph-11.2.1/src/os/FuseStore.h	2017-08-08 12:07:05.000000000 -0700

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

+ #include <string>

+ #include <map>

+ #include <mutex>

++#include <functional>

+ 

+ #include "common/Thread.h"

+ #include "include/buffer.h"

+diff -Naurp ceph-11.2.1/src/osdc/Journaler.cc ceph-11.2.1-modified/src/osdc/Journaler.cc

+--- ceph-11.2.1/src/osdc/Journaler.cc	2017-08-08 12:07:05.000000000 -0700

+@@ -635,7 +635,7 @@ void Journaler::_do_flush(unsigned amoun

+       waiting_for_zero = true;

+       return;

+     }

+-    if (newlen < len) {

++    if (static_cast<uint64_t>(newlen) < len) {

+       ldout(cct, 10) << "_do_flush wanted to do " << flush_pos << "~" << len

+ 		     << " but hit prezero_pos " << prezero_pos

+ 		     << ", will do " << flush_pos << "~" << newlen << dendl;

+diff -Naurp ceph-11.2.1/src/rgw/rgw_formats.cc ceph-11.2.1-modified/src/rgw/rgw_formats.cc

+--- ceph-11.2.1/src/rgw/rgw_formats.cc	2017-08-08 12:07:05.000000000 -0700

+@@ -28,9 +28,9 @@ RGWFormatter_Plain::RGWFormatter_Plain(c

+   : buf(NULL),

+     len(0),

+     max_len(0),

+-    wrote_something(false),

+     min_stack_level(0),

+-    use_kv(ukv)

++    use_kv(ukv),

++    wrote_something(false)

+ {

+ }

+ 

+diff -Naurp ceph-11.2.1/src/rgw/rgw_rados.cc ceph-11.2.1-modified/src/rgw/rgw_rados.cc

+--- ceph-11.2.1/src/rgw/rgw_rados.cc	2017-08-08 12:07:05.000000000 -0700

+@@ -4623,7 +4623,7 @@ static void usage_log_hash(CephContext *

+     val %= max_user_shards;

+     val += ceph_str_hash_linux(name.c_str(), name.size());

+   }

+-  char buf[16];

++  char buf[17];

+   int max_shards = max(cct->_conf->rgw_usage_max_shards, 1);

+   snprintf(buf, sizeof(buf), RGW_USAGE_OBJ_PREFIX "%u", (unsigned)(val % max_shards));

+   hash = buf;

+diff -Naurp ceph-11.2.1/src/rocksdb/db/memtable.cc ceph-11.2.1-modified/src/rocksdb/db/memtable.cc

+--- ceph-11.2.1/src/rocksdb/db/memtable.cc	2016-11-20 18:24:12.000000000 -0800

+@@ -733,6 +733,7 @@ void MemTable::Update(SequenceNumber seq

+             return;

+           }

+         }

++        // fall through

+         default:

+           // If the latest value is kTypeDeletion, kTypeMerge or kTypeLogData

+           // we don't have enough space for update inplace

+diff -Naurp ceph-11.2.1/src/rocksdb/include/rocksdb/thread_status.h ceph-11.2.1-modified/src/rocksdb/include/rocksdb/thread_status.h

+--- ceph-11.2.1/src/rocksdb/include/rocksdb/thread_status.h	2016-11-20 18:24:12.000000000 -0800

+@@ -21,11 +21,14 @@

+ #include <vector>

+ 

+ #ifndef ROCKSDB_USING_THREAD_STATUS

+-#define ROCKSDB_USING_THREAD_STATUS \

+-    !defined(ROCKSDB_LITE) && \

+-    !defined(NROCKSDB_THREAD_STATUS) && \

+-    !defined(OS_MACOSX) && \

+-    !defined(IOS_CROSS_COMPILE)

++  #if !defined(ROCKSDB_LITE) && \

++      !defined(NROCKSDB_THREAD_STATUS) && \

++      !defined(OS_MACOSX) && \

++      !defined(IOS_CROSS_COMPILE)

++    #define ROCKSDB_USING_THREAD_STATUS 1

++  #else

++    #define ROCKSDB_USING_THREAD_STATUS 0

++  #endif

+ #endif

+ 

+ namespace rocksdb {

+diff -Naurp ceph-11.2.1/src/rocksdb/util/logging.cc ceph-11.2.1-modified/src/rocksdb/util/logging.cc

+--- ceph-11.2.1/src/rocksdb/util/logging.cc	2016-11-20 18:24:12.000000000 -0800

+@@ -98,7 +98,7 @@ std::string NumberToString(uint64_t num)

+ }

+ 

+ std::string NumberToHumanString(int64_t num) {

+-  char buf[16];

++  char buf[19];

+   int64_t absnum = num < 0 ? -num : num;

+   if (absnum < 10000) {

+     snprintf(buf, sizeof(buf), "%" PRIi64, num);

+diff -Naurp ceph-11.2.1/src/rocksdb/util/murmurhash.cc ceph-11.2.1-modified/src/rocksdb/util/murmurhash.cc

+--- ceph-11.2.1/src/rocksdb/util/murmurhash.cc	2016-11-20 18:24:12.000000000 -0800

+@@ -47,11 +47,17 @@ uint64_t MurmurHash64A ( const void * ke

+     switch(len & 7)

+     {

+     case 7: h ^= ((uint64_t)data2[6]) << 48;

++            // fall through

+     case 6: h ^= ((uint64_t)data2[5]) << 40;

++            // fall through

+     case 5: h ^= ((uint64_t)data2[4]) << 32;

++            // fall through

+     case 4: h ^= ((uint64_t)data2[3]) << 24;

++            // fall through

+     case 3: h ^= ((uint64_t)data2[2]) << 16;

++            // fall through

+     case 2: h ^= ((uint64_t)data2[1]) << 8;

++            // fall through

+     case 1: h ^= ((uint64_t)data2[0]);

+         h *= m;

+     };

+diff -Naurp ceph-11.2.1/src/rocksdb/util/thread_local.h ceph-11.2.1-modified/src/rocksdb/util/thread_local.h

+--- ceph-11.2.1/src/rocksdb/util/thread_local.h	2016-11-20 18:24:12.000000000 -0800

+@@ -13,13 +13,17 @@

+ #include <memory>

+ #include <unordered_map>

+ #include <vector>

++#include <functional>

+ 

+ #include "util/autovector.h"

+ #include "port/port.h"

+ 

+ #ifndef ROCKSDB_SUPPORT_THREAD_LOCAL

+-#define ROCKSDB_SUPPORT_THREAD_LOCAL \

+-  !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(IOS_CROSS_COMPILE)

++  #if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(IOS_CROSS_COMPILE)

++    #define ROCKSDB_SUPPORT_THREAD_LOCAL  1

++  #else

++    #define ROCKSDB_SUPPORT_THREAD_LOCAL  0

++  #endif

+ #endif

+ 

+ namespace rocksdb {

+diff -Naurp ceph-11.2.1/src/rocksdb/util/transaction_test_util.cc ceph-11.2.1-modified/src/rocksdb/util/transaction_test_util.cc

+--- ceph-11.2.1/src/rocksdb/util/transaction_test_util.cc	2016-11-20 18:24:12.000000000 -0800

+@@ -190,7 +190,7 @@ Status RandomTransactionInserter::Verify

+ 

+   // For each set of keys with the same prefix, sum all the values

+   for (uint32_t i = 0; i < num_sets; i++) {

+-    char prefix_buf[5];

++    char prefix_buf[6];

+     snprintf(prefix_buf, sizeof(prefix_buf), "%.4u", i + 1);

+     uint64_t total = 0;

+ 

+diff -Naurp ceph-11.2.1/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h ceph-11.2.1-modified/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h

+--- ceph-11.2.1/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h	2016-11-20 18:24:12.000000000 -0800

+@@ -10,6 +10,7 @@

+ #include <memory>

+ #include <string>

+ #include <vector>

++#include <functional>

+ 

+ #include "rocksdb/comparator.h"

+ #include "rocksdb/env.h"

+diff -Naurp ceph-11.2.1/src/rocksdb/utilities/persistent_cache/hash_table_evictable.h ceph-11.2.1-modified/src/rocksdb/utilities/persistent_cache/hash_table_evictable.h

+--- ceph-11.2.1/src/rocksdb/utilities/persistent_cache/hash_table_evictable.h	2016-11-20 18:24:12.000000000 -0800

+@@ -7,6 +7,8 @@

+ 

+ #ifndef ROCKSDB_LITE

+ 

++#include <functional>

++

+ #include "util/random.h"

+ #include "utilities/persistent_cache/hash_table.h"

+ #include "utilities/persistent_cache/lrulist.h"

+diff -Naurp ceph-11.2.1/src/rocksdb/utilities/transactions/transaction_util.cc ceph-11.2.1-modified/src/rocksdb/utilities/transactions/transaction_util.cc

+--- ceph-11.2.1/src/rocksdb/utilities/transactions/transaction_util.cc	2016-11-20 18:24:12.000000000 -0800

+@@ -81,7 +81,7 @@ Status TransactionUtil::CheckKey(DBImpl*

+     if (cache_only) {

+       // The age of this memtable is too new to use to check for recent

+       // writes.

+-      char msg[255];

++      char msg[295];

+       snprintf(msg, sizeof(msg),

+                "Transaction could not check for conflicts for operation at "

+                "SequenceNumber %" PRIu64

@@ -1,14 +1,14 @@

 Summary:        C, C++, Objective C and Objective C++ front-end for the LLVM compiler.

 Name:           clang

-Version:        4.0.0

-Release:        2%{?dist}

+Version:        6.0.1

+Release:        1%{?dist}

 License:        NCSA

 URL:            http://clang.llvm.org

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://releases.llvm.org/%{version}/cfe-%{version}.src.tar.xz

-%define sha1    cfe=e2762800c93d9335781ea6a45af3f80845542ef5

+%define sha1    cfe=d93d8f3e3d7eb549ac58507383f7fcbdd78804d7

 BuildRequires:  cmake

 BuildRequires:  llvm-devel = %{version}

 BuildRequires:  ncurses-devel

@@ -76,6 +76,8 @@ rm -rf %{buildroot}/*

 %{_includedir}/*

 %changelog

+*   Thu Aug 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 6.0.1-1

+-   Update to version 6.0.1 to get it to build with gcc 7.3

 *   Wed Jun 28 2017 Chang Lee <changlee@vmware.com> 4.0.0-2

 -   Updated %check

 *   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.0.0-1

@@ -1,6 +1,6 @@

 Summary:	Programs that show the differences between files or directories

 Name:		diffutils

-Version:	3.5

+Version:	3.6

 Release:	1%{?dist}

 License:	GPLv3+

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

@@ -8,7 +8,7 @@ Group:		System Environment/Base

 Vendor:		VMware, Inc.

 Distribution:	Photon

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

-%define sha1 diffutils=1169cce8eaaf7290dc087d65db7ed75de0dceb93

+%define sha1 diffutils=1287a553868b808ebfff3790a5cdc6fdf7cb2886

 BuildRequires:	coreutils

 %description

 The Diffutils package contains programs that show the

@@ -35,6 +35,8 @@ make %{?_smp_mflags} check

 %{_bindir}/*

 %{_mandir}/*/*

 %changelog

+*       Fri Aug 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 3.6-1

+-       Update to version 3.6 to get it to build with gcc 7.3

 *       Wed Apr 19 2017 Bo Gan <ganb@vmware.com> 3.5-1

 -       Update to 3.5

 *       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 3.3-4

@@ -1,16 +1,16 @@

-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/gcc/c/c-typeck.c	2017-02-22 01:11:51.672617711 -0800

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

+diff -Naurp gcc-7.3.0-orig/gcc/c/c-typeck.c gcc-7.3.0/gcc/c/c-typeck.c

+--- gcc-7.3.0-orig/gcc/c/c-typeck.c	2017-06-08 12:12:38.381833000 -0700

+@@ -48,6 +48,8 @@ along with GCC; see the file COPYING3.

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

  #include "cilk.h"

  #include "gomp-constants.h"

 +#include "plugin-api.h"

 +#include "plugin.h"

- #include "spellcheck.h"

+ #include "spellcheck-tree.h"

  #include "gcc-rich-location.h"

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

+@@ -5452,6 +5454,12 @@ build_c_cast (location_t loc, tree type,

  	return error_mark_node;

      }

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

 +    tree cast_info[] {type, TREE_TYPE(value)};

 +    invoke_plugin_callbacks (PLUGIN_TYPE_CAST, cast_info);

 +  }

-+   

++

 +

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

      {

        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/gcc/plugin.c	2017-02-22 01:04:55.642416671 -0800

-@@ -462,6 +462,7 @@

+diff -Naurp gcc-7.3.0-orig/gcc/plugin.c gcc-7.3.0/gcc/plugin.c

+--- gcc-7.3.0-orig/gcc/plugin.c	2017-03-21 04:50:18.693898000 -0700

+@@ -471,6 +471,7 @@ register_callback (const char *plugin_na

        case PLUGIN_EARLY_GIMPLE_PASSES_END:

        case PLUGIN_NEW_PASS:

        case PLUGIN_INCLUDE_FILE:

@@ -34,7 +34,7 @@ diff -Naur gcc-5.3.0.orig/gcc/plugin.c gcc-5.3.0/gcc/plugin.c

          {

            struct callback_info *new_callback;

            if (!callback)

-@@ -540,6 +541,7 @@

+@@ -551,6 +552,7 @@ invoke_plugin_callbacks_full (int event,

        case PLUGIN_EARLY_GIMPLE_PASSES_END:

        case PLUGIN_NEW_PASS:

        case PLUGIN_INCLUDE_FILE:

@@ -42,10 +42,10 @@ diff -Naur gcc-5.3.0.orig/gcc/plugin.c gcc-5.3.0/gcc/plugin.c

          {

            /* Iterate over every callback registered with this event and

               call it.  */

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

-+++ gcc-5.3.0/gcc/plugin.def	2017-02-22 00:35:02.986905569 -0800

-@@ -94,6 +94,9 @@

+diff -Naurp gcc-7.3.0-orig/gcc/plugin.def gcc-7.3.0/gcc/plugin.def

+--- gcc-7.3.0-orig/gcc/plugin.def	2017-01-01 04:07:43.905435000 -0800

+@@ -99,6 +99,9 @@ DEFEVENT (PLUGIN_NEW_PASS)

     as a const char* pointer.  */

  DEFEVENT (PLUGIN_INCLUDE_FILE)

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

 %define _use_internal_dependency_generator 0

 Summary:        Contains the GNU compiler collection

 Name:           gcc

-Version:        6.3.0

-Release:        7%{?dist}

+Version:        7.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=928ab552666ee08eed645ff20ceb49d139205dea

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

+%define sha1 gcc=9689b9cae7b2886fdaa08449a26701f095c04e48

 Patch0:         PLUGIN_TYPE_CAST.patch

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

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

@@ -94,20 +94,6 @@ sed -i '/^NO_PIE_CFLAGS = /s/@NO_PIE_CFLAGS@//' gcc/Makefile.in

 install -vdm 755 ../gcc-build

 %build

-# Fix compilation issue for glibc-2.26.

-# TODO: remove these lines after gcc update to 7.2+

-#

-# 1. "typedef struct ucontext ucontext_t" was renamed to

-#    "typedef struct ucontext_t ucontext_t"

-sed -i 's/struct ucontext/ucontext_t/g' libgcc/config/i386/linux-unwind.h

-sed -i 's/struct ucontext/ucontext_t/g' libgcc/config/aarch64/linux-unwind.h

-# 2. struct sigaltstack removed

-sed -i 's/struct sigaltstack/void/g' libsanitizer/sanitizer_common/sanitizer_linux.cc

-sed -i '/struct sigaltstack;/d' libsanitizer/sanitizer_common/sanitizer_linux.h

-sed -i 's/struct sigaltstack/void/g' libsanitizer/sanitizer_common/sanitizer_linux.h

-sed -i 's/struct sigaltstack/stack_t/g' libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc

-sed -i 's/__res_state/struct __res_state/g' libsanitizer/tsan/tsan_platform_linux.cc

-

 export glibcxx_cv_c99_math_cxx98=yes glibcxx_cv_c99_math_cxx11=yes

 cd ../gcc-build

@@ -174,6 +160,8 @@ make %{?_smp_mflags} check-gcc

 %{_libexecdir}/gcc/*

 #   Man pages

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

+%{_mandir}/man1/gcov-dump.1.gz

+%{_mandir}/man1/gcov-tool.1.gz

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

 %{_mandir}/man1/g++.1.gz

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

@@ -233,6 +221,8 @@ make %{?_smp_mflags} check-gcc

 %{_lib64dir}/libgomp.spec

 %changelog

+*   Wed Aug 01 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 7.3.0-1

+-   Update to version 7.3.0 to get retpoline support.

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-7

 -   Aarch64 support

 *   Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-6

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

 Summary:	C based http parser for high performance applications.

 Name:		http-parser

-Version:	2.7.1

+Version:	2.8.1

 Release:	1%{?dist}

 License:	MIT

 URL:		https://github.com/nodejs/http-parser

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

-%define sha1    http-parser=e122b1178ec5c9920186cc8293aca9eca7584b12

+%define sha1    http-parser=e980b680be6f31ea1f1a6d849d629248b5a9043e

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution: 	Photon

@@ -23,13 +23,12 @@ This contains development tools and libraries for http-parser.

 %prep

 %setup -q

-sed -i 's/ln -s \$(LIBDIR)\/\$(SONAME) \$(LIBDIR)\/libhttp_parser.\$(SOEXT)/pushd \$(LIBDIR) \&\& ln -s  \$(SONAME)  libhttp_parser.\$(SOEXT) \&\& popd/g' Makefile

 %build

 make PREFIX=%{_prefix} %{?_smp_mflags}

 %install

-make PREFIX="%{buildroot}%{_prefix}" DESTDIR="%{buildroot}" install

+make PREFIX="%{_prefix}" DESTDIR="%{buildroot}" install

 %files

 %defattr(-,root,root)

@@ -41,5 +40,7 @@ make PREFIX="%{buildroot}%{_prefix}" DESTDIR="%{buildroot}" install

 %{_libdir}/libhttp_parser.so

 %changelog

+*    Fri Aug 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.8.1-1

+-    Update to version 2.8.1 to get it to build with gcc 7.3

 *    Wed Jul 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.1-1

 -    Initial version of http-parser package for Photon.

@@ -4,8 +4,8 @@

 Summary:        iPXE open source boot firmware

 Name:           ipxe

-Version:        553f485

-Release:        2%{?dist}

+Version:        d2063b7

+Release:        1%{?dist}

 License:        GPLv2

 URL:            http://ipxe.org

 Group:          System Environment/Daemons

@@ -13,7 +13,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

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

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

-%define sha1 ipxe=723e1e46b00a7de870065b74f053941f46748062

+%define sha1 ipxe=1fe9e076528b0d39b828cec94c565fa9d58c8550

 BuildRequires:  binutils

 BuildRequires:  binutils-devel

 BuildRequires:  cdrkit

@@ -62,6 +62,8 @@ install -vDm 644 src/bin/*.{rom,mrom} %{buildroot}/usr/share/ipxe/

 /usr/share/ipxe/rtl8139.rom

 %changelog

+*   Wed Aug 08 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> d2063b7-1

+-   Update version to get it to build with gcc 7.3

 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  553f485-2

 -   disable debuginfo gen

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

@@ -2,12 +2,12 @@

 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

 Summary:        SELinux library and simple utilities

 Name:           libselinux

-Version:        2.6

-Release:        4%{?dist}

+Version:        2.8

+Release:        1%{?dist}

 License:        Public Domain

 Group:          System Environment/Libraries

 Source0:        https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/%{name}-%{version}.tar.gz

-%define sha1    libselinux=38213c5f3298c980a399ea73e47498e7a393e4f7

+%define sha1    libselinux=d45f2db91dbec82ef5a153aca247acc04234e8af

 Url:            https://github.com/SELinuxProject/selinux/wiki

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -85,9 +85,9 @@ make LIBDIR="%{_libdir}" %{?_smp_mflags} PYTHON=/usr/bin/python2 pywrap

 make LIBDIR="%{_libdir}" %{?_smp_mflags} PYTHON=/usr/bin/python3 pywrap

 %install

-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" PYTHON=/usr/bin/python2 install install-pywrap

+make DESTDIR="%{buildroot}" LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" BINDIR="%{_bindir}" SBINDIR="%{_sbindir}" PYTHON=/usr/bin/python2 install install-pywrap

-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" PYTHON=/usr/bin/python3 install install-pywrap

+make DESTDIR="%{buildroot}" LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" BINDIR="%{_bindir}" SBINDIR="%{_sbindir}" PYTHON=/usr/bin/python3 install install-pywrap

 mkdir -p %{buildroot}/%{_prefix}/lib/tmpfiles.d

 mkdir -p %{buildroot}/var/run/setrans

@@ -130,6 +130,8 @@ rm -rf %{buildroot}

 %{python3_sitelib}/*

 %changelog

+*   Fri Aug 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.8-1

+-   Update to version 2.8 to get it to build with gcc 7.3

 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 2.6-4

 -   Fix compilation issue for glibc-2.26

 *   Wed May 31 2017 Xiaolin Li <xiaolinl@vmware.com> 2.6-3

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

 Summary:	SELinux binary policy manipulation library 

 Name:		libsepol

-Version:	2.6

+Version:	2.8

 Release:	1%{?dist}

 License:	LGPLv2+

 Group:		System Environment/Libraries

 Source0:	https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/%{name}-%{version}.tar.gz

-%define sha1 libsepol=029a43e131bd1fd55d39bfc8d11da016454029b6

+%define sha1 libsepol=1014c828f5eff3a0aec727749c3de44e0e69aa88

 Source1:        https://sourceforge.net/projects/cunit/files/CUnit-2.1-2-src.tar.bz2

 %define sha1 CUnit=6c2d0627eb64c09c7140726d6bf814cf531a3ce0

 URL:		http://www.selinuxproject.org

@@ -55,7 +55,7 @@ mkdir -p %{buildroot}%{_includedir}

 mkdir -p %{buildroot}%{_bindir} 

 mkdir -p %{buildroot}%{_mandir}/man3

 mkdir -p %{buildroot}%{_mandir}/man8

-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" install

+make DESTDIR="%{buildroot}" LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" install

 rm -f %{buildroot}%{_bindir}/genpolbools

 rm -f %{buildroot}%{_bindir}/genpolusers

 rm -f %{buildroot}%{_bindir}/chkcon

@@ -95,6 +95,8 @@ exit 0

 %{_lib}/libsepol.so.1

 %changelog

+*       Fri Aug 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.8-1

+-       Update to version 2.8 to get it to build with gcc 7.3

 *       Tue Apr 04 2017 Kumar Kaushik <kaushikk@vmware.com> 2.6-1

 -       Updating version to 2.6

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

new file mode 100644

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

+From 6baf14372d7126285bf8b661731b69c400d2106c Mon Sep 17 00:00:00 2001

+From: "Srivatsa S. Bhat" <srivatsa@csail.mit.edu>

+Date: Fri, 31 Aug 2018 10:20:31 -0700

+Subject: [PATCH] lightstep-tracer-cpp: Fix build issues with gcc 7.3

+

+In file included from lightstep/impl.h:11:0,

+                 from span.cc:1:

+./lightstep/options.h:42:8: error: 'function' in namespace 'std' does not name a template type

+   std::function<uint64_t()> guid_generator;

+        ^~~~~~~~

+

+Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

+---

+diff -Naurp lightstep-tracer-cpp-0.19-orig/src/c++11/lightstep/impl.h lightstep-tracer-cpp-0.19-modified/src/c++11/lightstep/impl.h

+--- lightstep-tracer-cpp-0.19-orig/src/c++11/lightstep/impl.h	2016-11-30 14:51:38.000000000 -0800

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

+ #include <memory>

+ #include <mutex>

+ #include <random>

++#include <functional>

+ 

+ #include "lightstep/collector.pb.h"

+ #include "lightstep/options.h"

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

 Summary:        LightStep distributed tracing library for C++

 Name:           lightstep-tracer-cpp

 Version:        0.19

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 URL:            https://github.com/lightstep/lightstep-tracer-cpp

 Source0:        https://github.com/lightstep/lightstep-tracer-cpp/releases/download/v0_19/%{name}-%{version}.tar.gz

@@ -19,11 +19,14 @@ BuildRequires:  protobuf

 BuildRequires:  protobuf-devel

 Requires:       protobuf

+Patch0:         0001-lightstep-tracer-cpp-Fix-build-issues-with-gcc-7.3.patch

+

 %description

 LightStep distributed tracing library for C++.

 %prep

 %setup -q

+%patch0 -p1

 %build

 ./configure                     \

@@ -54,5 +57,7 @@ find %{buildroot} -name '*.la' -delete

 %{_libdir}/liblightstep_*

 %changelog

+*    Fri Aug 31 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 0.19-2

+-    Fix build issues with gcc 7.3

 *    Wed Jul 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.19-1

 -    Initial version of lightstep-tracer-cpp package for Photon.

new file mode 100644

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

+From c2ffeee34166f53334e5ad599e38e65397070bfb Mon Sep 17 00:00:00 2001

+From: "Srivatsa S. Bhat" <srivatsa@csail.mit.edu>

+Date: Mon, 13 Aug 2018 15:04:13 -0700

+Subject: [PATCH] likewise-open: Fix build warnings/errors with gcc 7.3

+

+           [compile] lwreg/utils/fileutils.c (host/x86_64)

+../lwreg/utils/fileutils.c: In function 'RegGetMatchingFilePathsInFolder':

+../lwreg/utils/fileutils.c:869:7: warning: typedef 'PATHNODE' locally defined but not used [-Wunused-local-typedefs]

+     } PATHNODE, *PPATHNODE;

+       ^~~~~~~~

+

+          [compile] lwreg/server/providers/sqlite/sqliteapi.c (host/x86_64)

+../lwreg/server/providers/sqlite/sqliteapi.c: In function 'SqliteDeleteTreeInternal_inlock_inDblock':

+../lwreg/server/providers/sqlite/sqliteapi.c:1654:9: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]

+         memset(psubKeyName, 0, MAX_KEY_LENGTH);

+         ^~~~~~

+

+           [compile] lwreg/shell/export.c (host/x86_64)

+../lwreg/shell/export.c: In function 'ProcessExportedKeyInfo':

+../lwreg/shell/export.c:349:9: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]

+         memset(pwszValueName, 0, MAX_KEY_LENGTH);

+         ^~~~~~

+

+           [compile] dcerpc/ncklib/cnxfer.c (host/x86_64)

+../dcerpc/ncklib/cnxfer.c: In function 'rpc__cn_add_new_iovector_elmt':

+../dcerpc/ncklib/cnxfer.c:367:73: error: ?: using integer constants in boolean context, the expression will always evaluate to 'true' [-Werror=int-in-bool-context]