Add babeltrace2 and lttng-consume packages

SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md

@@ -2,7 +2,7 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic
 
 | Origin    | License                           |   SPECS    |
 |-----------|-----------------------------------|------------|
-| Fedora    | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files)  |  attr <br> autoconf213 <br> brotli <br> calamares <br> catch <br> cpprest <br> cryptsetup <br> dnf <br> dos2unix <br> ebtables <br> extra-cmake-modules <br> gnu-efi <br> hardening-check <br> ipmitool <br> kde-settings <br> kexec-tools <br> kf5 <br> kf5-kconfig <br> kf5-kcoreaddons <br> kf5-ki18n <br> kf5-kwidgetsaddons <br> kpmcore-3.3.0 <br> libatasmart <br> libburn <br> libcgroup <br> libcomps <br> libdnf <br> libisoburn <br> libisofs <br> libpwquality <br> mokutil <br> mozjs60 <br> open-vm-tools <br> openssl <br> p11-kit <br> qt5-qtbase <br> qt5-qtdeclarative <br> qt5-qtsvg <br> qt5-qttools <br> qt5-rpm-macros <br> squashfs-tools <br> websocketpp <br> words <br> yaml-cpp <br> zipper <br> |
-| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md)    |  azure-iot-sdk-c <br> azure-iotedge <br> cloud-hypervisor <br> dtc <br> freefont <br> gflags <br> go-md2man <br> GSL <br> jsonbuilder <br> libiothsm-std <br> libuv <br> libxml++ <br> mariner-release <br> mariner-repos <br> mariner-rpm-macros <br> mm-common <br> msgpack <br> nlohmann-json <br> pcre2 <br> perl-Test-Warnings <br> rocksdb <br> shim-unsigned-x64 <br> span-lite <br> swupdate <br> tinyxml2 <br> toml11 <br> tracelogging <br> vala <br> zstd  |
+| Fedora    | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files)  |  attr <br> autoconf213 <br> babeltrace2 <br> brotli <br> calamares <br> catch <br> cpprest <br> cryptsetup <br> dnf <br> dos2unix <br> ebtables <br> extra-cmake-modules <br> gnu-efi <br> hardening-check <br> ipmitool <br> kde-settings <br> kexec-tools <br> kf5 <br> kf5-kconfig <br> kf5-kcoreaddons <br> kf5-ki18n <br> kf5-kwidgetsaddons <br> kpmcore-3.3.0 <br> libatasmart <br> libburn <br> libcgroup <br> libcomps <br> libdnf <br> libisoburn <br> libisofs <br> libpwquality <br> mokutil <br> mozjs60 <br> open-vm-tools <br> openssl <br> p11-kit <br> qt5-qtbase <br> qt5-qtdeclarative <br> qt5-qtsvg <br> qt5-qttools <br> qt5-rpm-macros <br> squashfs-tools <br> websocketpp <br> words <br> yaml-cpp <br> zipper <br> |
+| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md)    |  azure-iot-sdk-c <br> azure-iotedge <br> cloud-hypervisor <br> dtc <br> freefont <br> gflags <br> go-md2man <br> GSL <br> jsonbuilder <br> libiothsm-std <br> libuv <br> libxml++ <br> lttng-consume <br> mariner-release <br> mariner-repos <br> mariner-rpm-macros <br> mm-common <br> msgpack <br> nlohmann-json <br> pcre2 <br> perl-Test-Warnings <br> rocksdb <br> shim-unsigned-x64 <br> span-lite <br> swupdate <br> tinyxml2 <br> toml11 <br> tracelogging <br> vala <br> zstd  |
 | Photon    | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2). <br>  Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). |  acl <br> alsa-lib <br> alsa-utils <br> ansible <br> ant <br> ant-contrib <br> apparmor <br> apr <br> apr-util <br> asciidoc <br> atftp <br> audit <br> autoconf <br> autoconf-archive <br> autofs <br> autogen <br> automake <br> babel <br> bash <br> bc <br> bcc <br> bind <br> binutils <br> bison <br> blktrace <br> boost <br> bridge-utils <br> btrfs-progs <br> bubblewrap <br> build-essential <br> bzip2 <br> c-ares <br> ca-certificates <br> cairo <br> cdrkit <br> check <br> chkconfig <br> chrpath <br> cifs-utils <br> clang <br> cloud-init <br> cloud-utils-growpart <br> cmake <br> cni <br> core-packages <br> coreutils <br> cpio <br> cppunit <br> cracklib <br> crash <br> crash-gcore-command <br> createrepo_c <br> cri-tools <br> cronie <br> ctags <br> curl <br> cyrus-sasl <br> cython <br> dbus <br> dbus-glib <br> dejagnu <br> device-mapper-multipath <br> dhcp <br> dialog <br> diffutils <br> dkms <br> dmidecode <br> dnsmasq <br> docbook-dtd-xml <br> docbook-style-xsl <br> dosfstools <br> dotnet-runtime-3.1 <br> dotnet-sdk-3.1 <br> dracut <br> dstat <br> e2fsprogs <br> ed <br> efibootmgr <br> efivar <br> elfutils <br> erlang <br> etcd <br> ethtool <br> expat <br> expect <br> fcgi <br> file <br> filesystem <br> findutils <br> finger <br> flex <br> fontconfig <br> fping <br> freetype <br> fuse <br> gawk <br> gc <br> gcc <br> gdb <br> gdbm <br> gettext <br> git <br> glib <br> glib-networking <br> glibc <br> glibmm24 <br> gmp <br> gnome-common <br> gnupg2 <br> gnuplot <br> gnutls <br> gobject-introspection <br> golang <br> golang <br> gperf <br> gperftools <br> gpgme <br> gptfdisk <br> grep <br> groff <br> grub2 <br> grub2-efi-binary-signed-aarch64 <br> grub2-efi-binary-signed-x64 <br> gtest <br> gtk-doc <br> guile <br> gzip <br> haproxy <br> harfbuzz <br> haveged <br> hdparm <br> http-parser <br> httpd <br> i2c-tools <br> iana-etc <br> icu <br> initramfs <br> initscripts <br> inotify-tools <br> intltool <br> iotop <br> iperf3 <br> ipmitool <br> iproute <br> ipset <br> iptables <br> iputils <br> ipvsadm <br> ipxe <br> irqbalance <br> itstool <br> jansson <br> jna <br> jq <br> json-c <br> json-glib <br> kbd <br> keepalived <br> kernel <br> kernel-headers <br> kernel-hyperv <br> kernel-signed-aarch64 <br> kernel-signed-x64 <br> kexec-tools <br> keyutils <br> kmod <br> krb5 <br> kubernetes <br> lapack <br> less <br> libaio <br> libarchive <br> libassuan <br> libatomic_ops <br> libcap <br> libcap-ng <br> libconfig <br> libdb <br> libdnet <br> libedit <br> libestr <br> libev <br> libevent <br> libfastjson <br> libffi <br> libgcrypt <br> libgpg-error <br> libgssglue <br> libgsystem <br> libgudev <br> libjpeg-turbo <br> libksba <br> liblogging <br> libmbim <br> libmnl <br> libmodulemd <br> libmpc <br> libmspack <br> libndp <br> libnetfilter_conntrack <br> libnetfilter_cthelper <br> libnetfilter_cttimeout <br> libnetfilter_queue <br> libnfnetlink <br> libnftnl <br> libnl3 <br> libnsl2 <br> libpcap <br> libpipeline <br> libpng <br> libpsl <br> libqmi <br> librelp <br> librepo <br> librsync <br> libseccomp <br> libselinux <br> libsepol <br> libserf <br> libsigc++20 <br> libsolv <br> libsoup <br> libssh2 <br> libtalloc <br> libtar <br> libtasn1 <br> libtiff <br> libtirpc <br> libtool <br> libunistring <br> libunwind <br> libusb <br> libvirt <br> libwebp <br> libxml2 <br> libxslt <br> libyaml <br> linux-firmware <br> lldb <br> lldpad <br> llvm <br> lm-sensors <br> lmdb <br> log4cpp <br> logrotate <br> lshw <br> lsof <br> lsscsi <br> ltrace <br> lttng-tools <br> lttng-ust <br> lua <br> lvm2 <br> lz4 <br> lzo <br> m2crypto <br> m4 <br> make <br> man-db <br> man-pages <br> mariadb <br> maven <br> mc <br> mercurial <br> meson <br> mlocate <br> ModemManager <br> mpfr <br> msr-tools <br> mysql <br> nano <br> nasm <br> ncurses <br> ndctl <br> net-snmp <br> net-tools <br> nettle <br> newt <br> nfs-utils <br> nghttp2 <br> nginx <br> ninja-build <br> nodejs <br> nodejs <br> npth <br> nspr <br> nss <br> nss-altfiles <br> ntp <br> numactl <br> numpy <br> nvme-cli <br> oniguruma <br> openipmi <br> openjdk8 <br> openjdk8 <br> openldap <br> openscap <br> openssh <br> openvswitch <br> ostree <br> pam <br> pango <br> parted <br> patch <br> pciutils <br> pcre <br> perl <br> perl-Canary-Stability <br> perl-CGI <br> perl-common-sense <br> perl-Crypt-SSLeay <br> perl-DBD-SQLite <br> perl-DBI <br> perl-DBIx-Simple <br> perl-Exporter-Tiny <br> perl-File-HomeDir <br> perl-File-Which <br> perl-IO-Socket-SSL <br> perl-JSON-Any <br> perl-JSON-XS <br> perl-libintl-perl <br> perl-List-MoreUtils <br> perl-Module-Build <br> perl-Module-Install <br> perl-Module-ScanDeps <br> perl-Net-SSLeay <br> perl-NetAddr-IP <br> perl-Object-Accessor <br> perl-Path-Class <br> perl-Try-Tiny <br> perl-Types-Serialiser <br> perl-WWW-Curl <br> perl-XML-Parser <br> perl-YAML <br> perl-YAML-Tiny <br> pgbouncer <br> pinentry <br> pixman <br> pkg-config <br> polkit <br> popt <br> postgresql <br> powershell <br> procps-ng <br> protobuf <br> protobuf-c <br> psmisc <br> pth <br> pyasn1-modules <br> pygobject3 <br> pyOpenSSL <br> PyPAM <br> pyparsing <br> pytest <br> python-appdirs <br> python-asn1crypto <br> python-atomicwrites <br> python-attrs <br> python-backports-ssl_match_hostname <br> python-bcrypt <br> python-boto3 <br> python-botocore <br> python-certifi <br> python-cffi <br> python-chardet <br> python-configobj <br> python-constantly <br> python-coverage <br> python-cryptography <br> python-daemon <br> python-dateutil <br> python-defusedxml <br> python-distro <br> python-docopt <br> python-docutils <br> python-ecdsa <br> python-enum34 <br> python-futures <br> python-gevent <br> python-greenlet <br> python-hyperlink <br> python-hypothesis <br> python-idna <br> python-imagesize <br> python-incremental <br> python-iniparse <br> python-ipaddr <br> python-ipaddress <br> python-jinja2 <br> python-jmespath <br> python-jsonpatch <br> python-jsonpointer <br> python-jsonschema <br> python-lockfile <br> python-lxml <br> python-m2r <br> python-mako <br> python-markupsafe <br> python-mistune <br> python-msgpack <br> python-netaddr <br> python-netifaces <br> python-ntplib <br> python-oauthlib <br> python-packaging <br> python-pam <br> python-pbr <br> python-pip <br> python-ply <br> python-prettytable <br> python-psutil <br> python-psycopg2 <br> python-py <br> python-pyasn1 <br> python-pycodestyle <br> python-pycparser <br> python-pycurl <br> python-Pygments <br> python-PyNaCl <br> python-pyvmomi <br> python-requests <br> python-setuptools <br> python-setuptools_scm <br> python-simplejson <br> python-six <br> python-snowballstemmer <br> python-sphinx <br> python-sphinx-theme-alabaster <br> python-sqlalchemy <br> python-Twisted <br> python-typing <br> python-urllib3 <br> python-vcversioner <br> python-virtualenv <br> python-wcwidth <br> python-webob <br> python-websocket-client <br> python-werkzeug <br> python-zope-interface <br> python2 <br> python3 <br> pytz <br> PyYAML <br> readline <br> redis <br> rng-tools <br> rpcbind <br> rpcsvc-proto <br> rpm <br> rpm-ostree <br> rrdtool <br> rsync <br> rsyslog <br> ruby <br> rubygem-bundler <br> runc <br> rust <br> scons <br> sed <br> sg3_utils <br> shadow-utils <br> slang <br> snappy <br> socat <br> sqlite <br> sshpass <br> strace <br> strongswan <br> subversion <br> sudo <br> swig <br> syslinux <br> syslog-ng <br> sysstat <br> systemd <br> systemtap <br> tar <br> tboot <br> tcl <br> tcpdump <br> tcp_wrappers <br> tcsh <br> tdnf <br> telegraf <br> texinfo <br> tmux <br> tpm2-abrmd <br> tpm2-tools <br> tpm2-tss <br> traceroute <br> tree <br> trousers <br> tzdata <br> unbound <br> unixODBC <br> unzip <br> usbutils <br> userspace-rcu <br> utf8proc <br> util-linux <br> valgrind <br> vim <br> vsftpd <br> WALinuxAgent <br> wget <br> which <br> wpa_supplicant <br> xerces-c <br> xfsprogs <br> xinetd <br> xmlsec1 <br> xmlto <br> xz <br> zchunk <br> zeromq <br> zip <br> zlib <br> zsh <br>  |
 | OpenMamba | [Openmamba](https://openmamba.org/en/) | bash-completion <br> |

SPECS/babeltrace2/00-fix-lttng-live-array-access.patch

@@ -0,0 +1,23 @@
+diff -Naur babeltrace2-2.0.1/src/plugins/ctf/common/msg-iter/msg-iter.c babeltrace2-2.0.1-copy/src/plugins/ctf/common/msg-iter/msg-iter.c
+--- babeltrace2-2.0.1/src/plugins/ctf/common/msg-iter/msg-iter.c	2020-02-28 22:26:47.194726018 -0800
++++ babeltrace2-2.0.1-copy/src/plugins/ctf/common/msg-iter/msg-iter.c	2020-02-28 22:29:36.318373106 -0800
+@@ -2001,6 +2001,9 @@
+ 	}
+
+ 	if (G_UNLIKELY(int_fc->storing_index >= 0)) {
++		if ((uint64_t) int_fc->storing_index >= msg_it->stored_values->len) {
++			g_array_set_size(msg_it->stored_values, (uint64_t) int_fc->storing_index + 1);
++		}
+ 		g_array_index(msg_it->stored_values, uint64_t,
+ 			(uint64_t) int_fc->storing_index) = value;
+ 	}
+@@ -2090,6 +2093,9 @@
+ 	BT_ASSERT_DBG(int_fc->meaning == CTF_FIELD_CLASS_MEANING_NONE);
+
+ 	if (G_UNLIKELY(int_fc->storing_index >= 0)) {
++		if ((uint64_t) int_fc->storing_index >= msg_it->stored_values->len) {
++			g_array_set_size(msg_it->stored_values, (uint64_t) int_fc->storing_index + 1);
++		}
+ 		g_array_index(msg_it->stored_values, uint64_t,
+ 			(uint64_t) int_fc->storing_index) = (uint64_t) value;
+ 	}

SPECS/babeltrace2/babeltrace2.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "babeltrace2-2.0.1.tar.bz2": "87f0acc134bac8e897f4eb0f5a02cbfffeb94d3bc0396ecb74a6667581988ecf"
+ }
+}

SPECS/babeltrace2/babeltrace2.spec

@@ -0,0 +1,99 @@
+Summary:        A trace manipulation toolkit
+Name:           babeltrace2
+Version:        2.0.1
+Release:        3%{?dist}
+License:        MIT AND GPLv2
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+Group:          System Environment
+URL:            https://www.efficios.com/babeltrace
+Source0:        https://www.efficios.com/files/babeltrace/%{name}-%{version}.tar.bz2
+Patch0:         00-fix-lttng-live-array-access.patch
+BuildRequires:  elfutils-devel >= 0.154
+BuildRequires:  gcc
+BuildRequires:  glib-devel >= 2.28.0
+Requires:       libbabeltrace2%{?_isa} = %{version}-%{release}
+
+%description
+The Babeltrace 2 project offers a library with a C API, Python 3 bindings, and
+a command-line tool which makes it very easy for mere mortals to view,
+convert, transform, and analyze traces.
+
+Babeltrace 2 is also the reference parser implementation of the Common Trace
+Format (CTF), a very versatile trace format followed by various tracers and
+tools such as LTTng and barectf.
+
+%package -n libbabeltrace2
+Summary:        A trace manipulation library
+Requires:       glib >= 2.28.0
+
+%description -n libbabeltrace2
+The libbabeltrace2 package contains a library and plugin system to view,
+convert, transform, and analyze traces.
+
+%package -n libbabeltrace2-devel
+Summary:        Development files for libbabeltrace2
+Requires:       glib >= 2.28.0
+Requires:       libbabeltrace2%{?_isa} = %{version}-%{release}
+
+%description -n libbabeltrace2-devel
+The libbabeltrace2-devel package contains the header files and libraries
+needed to develop programs that use the libbabeltrace2 trace manipulation
+library.
+
+%prep
+%autosetup -p1
+
+%build
+%configure --disable-static \
+        --enable-debug-info \
+        --disable-Werror
+
+%make_build
+
+%check
+make check
+
+%install
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
+# Clean installed doc
+rm -fv %{buildroot}%{_docdir}/babeltrace2/*
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%license LICENSE gpl-2.0.txt mit-license.txt
+%doc ChangeLog README.adoc
+%{_bindir}/babeltrace2
+%{_mandir}/man1/*.1*
+%{_mandir}/man7/*.7*
+
+%files -n libbabeltrace2
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+%{_libdir}/babeltrace2/plugins/*.so
+
+%files -n libbabeltrace2-devel
+%defattr(-,root,root)
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/babeltrace2.pc
+%{_libdir}/pkgconfig/babeltrace2-ctf-writer.pc
+
+%changelog
+* Wed Oct 14 2020 Thomas Crain <thcrain@microsoft.com> - 2.0.1-3
+- Update Source0
+- License verified
+
+* Tue Feb 11 2020 Nick Bopp <nichbop@microsoft.com> - 2.0.1-2
+- Initial import from Fedora 32 (license: MIT and GPLv2)
+- Added runtime dependency on glib2
+- Remove python requirements
+- Removed ldconfig_scriptlets
+- Fix installed file cleanup
+
+* Mon Feb 10 2020 Michael Jeanson <mjeanson@efficios.com> - 2.0.1-1
+- New upstream release

SPECS/lttng-consume/lttng-consume.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "lttng-consume-0.2.tar.gz": "c2d56990a28b59439e8bb14be2e342e285c1a3b66b20a21e96271ed886bdfeaa"
+ }
+}

SPECS/lttng-consume/lttng-consume.spec

@@ -0,0 +1,70 @@
+Summary:        Modern C++ library for realtime consumption of LTTNG events
+Name:           lttng-consume
+Version:        0.2
+Release:        3%{?dist}
+License:        MIT
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+Group:          System Environment
+URL:            https://github.com/microsoft/lttng-consume
+#Source0:       https://github.com/microsoft/%{name}/archive/v%{version}.tar.gz
+Source0:        lttng-consume-%{version}.tar.gz
+BuildRequires:  catch-devel
+BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  jsonbuilder-devel
+BuildRequires:  libbabeltrace2-devel
+# 'lttng' tool needed for tests to run
+BuildRequires:  lttng-tools
+BuildRequires:  lttng-ust-devel
+BuildRequires:  tracelogging-devel
+
+%description
+The lttng-consume project produces JsonBuilder structures from a realtime
+LTTNG session.
+
+%package        devel
+Summary:        Development files for lttng-consume
+Group:          System Environment/Libraries
+Requires:       lttng-consume = %{version}-%{release}
+
+%description    devel
+This package contains the headers and symlinks for applications and libraries to
+use lttng-consume.
+
+%prep
+%setup -q
+
+%build
+mkdir build && cd build
+%cmake ..
+%make_build
+
+%install
+%make_install -C build
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc README.md
+%license LICENSE
+%{_libdir}/liblttng-consume.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/liblttng-consume.so
+%{_libdir}/cmake/lttng-consume
+%{_includedir}/lttng-consume
+
+%changelog
+* Wed Oct 07 2020 Thomas Crain <thcrain@microsoft.com> - 0.2-3
+- Add #Source0 URL
+- Verified License field and %%license macro
+
+* Tue Apr 07 2020 Daniel McIlvaney <damcilva@microsoft.com> - 0.2-2
+- Require lttng-ust packages.
+
+* Wed Feb 12 2020 Nick Bopp <nichbop@microsoft.com> - 0.2-1
+- Original version for CBL-Mariner.

cgmanifest.json

@@ -220,6 +220,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "babeltrace2",
+          "version": "2.0.1",
+          "downloadUrl": "https://www.efficios.com/files/babeltrace/babeltrace2-2.0.1.tar.bz2"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -2831,6 +2841,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "lttng-consume",
+          "version": "0.2",
+          "downloadUrl": "https://github.com/microsoft/lttng-consume/archive/v0.2.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",