Various build fixes

SPECS/mozjs60/mozjs60.spec

@@ -3,7 +3,7 @@
 Summary:       SpiderMonkey JavaScript library
 Name:          mozjs%{major}
 Version:       60.9.0
-Release:       9%{?dist}
+Release:       10%{?dist}
 Group:         Applications/System
 Vendor:        Microsoft Corporation
 License:       MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
@@ -74,6 +74,12 @@ export CFLAGS="%{optflags}"
 export CXXFLAGS="$CFLAGS"
 export LINKFLAGS="%{?__global_ldflags}"
 
+# If the host underlying the worker chroot has /dev/shm as a symlink, build fails
+# due to Python2 multiprocessing failures
+if [ -h /dev/shm ]; then
+  mkdir -pv $(readlink $LFS/dev/shm)
+fi
+
 autoconf-2.13
 %configure \
   --without-system-icu \
@@ -128,6 +134,8 @@ python2 jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/
 %{_includedir}/mozjs-%{major}/
 
 %changelog
+* Tue May 04 2021 Thomas Crain <thcrain@microsoft.com> - 60.9.0-10
+- Ensure availability of underlying /dev/shm folder during build 
 *   Tue Jan 05 2021 Andrew Phelps <anphel@microsoft.com> 60.9.0-9
 -   Fix calls to python2 in check section
 *   Thu May 28 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 60.9.0-8

SPECS/perl-JSON/perl-JSON.spec

@@ -42,7 +42,6 @@ Summary:        Tests for %{name}
 Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       coreutils
 Requires:       perl-Test-Harness
-Requires:       perl(Tie::IxHash)
  
 %description tests
 Tests from %{name}. Execute them

SPECS/rpm-ostree/rpm-ostree.spec

@@ -56,7 +56,7 @@ BuildRequires:  systemd-devel
 BuildRequires:  which
 
 %if %{with_check}
-BuildRequires:  python3-pygobject
+BuildRequires:  python3-gobject
 %endif
 
 Requires:       bubblewrap

SPECS/ruby/ruby.spec

@@ -78,7 +78,7 @@ autoconf
         --with-vendorarchdir=%{_libdir}/ruby/vendor_ruby \
         --with-rubyhdrdir=%{_includedir} \
         --with-rubyarchhdrdir=%{_includedir} \
-        --with-sitearchhdrdir={_prefix}/local/%{_lib}/ruby/site_ruby/$(_arch) \
+        --with-sitearchhdrdir=%{_prefix}/local/%{_lib}/ruby/site_ruby/$(_arch) \
         --with-vendorarchhdrdir=%{_libdir}/ruby/vendor_ruby/$(_arch) \
         --with-rubygemsdir=%{rubygems_dir} \
         --enable-shared \

SPECS/rubygem-rdkafka/rubygem-rdkafka.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "rdkafka-0.7.0.gem": "1abf0cd9076ad0901f45db02be6b1ea74d96e621241b373bdc6d5b2de9b87cfa"
+  "rdkafka-0.8.0.gem": "d6233577afaa03704b2febe397209ba1fc9ec1f8f35f092a1742da8f4843278d"
  }
 }

SPECS/rubygem-rdkafka/rubygem-rdkafka.spec

@@ -3,7 +3,7 @@
 %global gem_name rdkafka
 Summary:        Modern Kafka client library for Ruby based on librdkafka
 Name:           rubygem-rdkafka
-Version:        0.7.0
+Version:        0.8.0
 Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -43,6 +43,9 @@ gem install -V --local --force --install-dir %{buildroot}/%{gemdir} ./%{gem_name
 %{gemdir}
 
 %changelog
+* Tue May 04 2021 Thomas Crain <thcrain@microsoft.com> - 0.8.0-1
+- Upgrade to 0.8.0 to match td-agent requirement
+
 * Tue Jan 05 2021 Henry Li <lihl@microsoft.com> - 0.7.0-1
 - License verified
 - Original version for CBL-Mariner

SPECS/rust/rust.spec

@@ -3,7 +3,7 @@
 Summary:        Rust Programming Language
 Name:           rust
 Version:        1.47.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0 AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -46,6 +46,11 @@ tar xf %{SOURCE1} --no-same-owner
 popd
 %autosetup -p1 -n rustc-%{version}-src
 
+# Rust doesn't recognize our .tar.gz bootstrap files when XZ support is enabled
+# This causes stage 0 bootstrap to look online for sources
+# So, we remove XZ support detection in the bootstrap program
+sed -i "s/tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz'/tarball_suffix = '.tar.gz'/g" src/bootstrap/bootstrap.py
+
 # Setup build/cache directory
 %define BUILD_CACHE_DIR build/cache/2020-08-27/
 mkdir -pv %{BUILD_CACHE_DIR}
@@ -65,6 +70,8 @@ mv %{SOURCE7} %{BUILD_CACHE_DIR}
 export CFLAGS="`echo " %{build_cflags} " | sed 's/ -g//'`"
 export CXXFLAGS="`echo " %{build_cxxflags} " | sed 's/ -g//'`"
 
+
+
 sh ./configure --prefix=%{_prefix} --enable-extended --tools="cargo"
 # Exporting SUDO_USER=root bypasses a check in the python bootstrap that
 # makes rust refuse to pull sources from the internet
@@ -110,6 +117,9 @@ rm %{buildroot}%{_docdir}/%{name}/*.old
 %{_sysconfdir}/bash_completion.d/cargo
 
 %changelog
+* Tue May 04 2021 Thomas Crain <thcrain@microsoft.com> - 1.47.0-4
+- Remove XZ support detection in bootstrap
+
 * Mon Apr 26 2021 Thomas Crain <thcrain@microsoft.com> - 1.47.0-3
 - Patch CVE-2020-36317, CVE-2021-28875, CVE-2021-28876, CVE-2021-28877, CVE-2021-28878
 - Redo patch for CVE-2021-28879 with regards to patches listed above