From b27db16308770707e1d47529d6d6601b7c8c0e7b Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Tue, 20 Jun 2023 17:22:31 +0200
Subject: [PATCH] import sources

---
 .gitignore              |  1 +
 firefox.spec            |  2 +-
 gen_cbindgen-vendor.sh  | 32 --------------------------------
 mochitest-python.tar.gz |  0
 rpminspect.yaml         | 17 -----------------
 sources                 |  5 +++--
 6 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100755 gen_cbindgen-vendor.sh
 delete mode 100644 mochitest-python.tar.gz
 delete mode 100644 rpminspect.yaml

diff --git a/.gitignore b/.gitignore
index ba4f1ed..82a0622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ SOURCES/nss-3.79.0-6.el8_1.src.rpm
 /firefox-langpacks-102.11.0esr-20230504.tar.xz
 /firefox-102.12.0esr.processed-source.tar.xz
 /firefox-langpacks-102.12.0esr-20230531.tar.xz
+/mochitest-python.tar.gz
diff --git a/firefox.spec b/firefox.spec
index 354720e..b21671e 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -686,7 +686,7 @@ echo "use_rustts            %{?use_rustts}"
 %patch77 -p1 -b .mozilla-1775202
 
 %patch73 -p1 -b .build-ascii-decode-fail-rhel7
-%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel8_minor_version} >= 9)
+%if 0%{?rhel} == 7
 %patch78 -p1 -b .build-rhel7-lower-node-min-version
 %endif
 
diff --git a/gen_cbindgen-vendor.sh b/gen_cbindgen-vendor.sh
deleted file mode 100755
index c446a51..0000000
--- a/gen_cbindgen-vendor.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -x
-
-# Dummy Cargo.toml file with cbindgen dependency
-cat > Cargo.toml <<EOL
-[package]
-name = "dummy"
-version = "0.0.1"
-description = """
-This is a dummy package which contains dependency on cbindgen
-to be used with 'cargo vendor' commmand.
-"""
-
-[dependencies]
-cbindgen = "0.23.0"
-
-[[bin]]
-name = "dummy"
-path = "dummy.rs"
-doc = false
-EOL
-
-cargo install cargo-vendor
-cargo vendor
-
-cd vendor
-tar -cJf ../cbindgen-vendor.tar.xz *
-cd ..
-
-rm -f Cargo.toml
-rm -rf vendor
-
diff --git a/mochitest-python.tar.gz b/mochitest-python.tar.gz
deleted file mode 100644
index e69de29..0000000
diff --git a/rpminspect.yaml b/rpminspect.yaml
deleted file mode 100644
index e4c4e16..0000000
--- a/rpminspect.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-inspections:
-  # this inspection is taking way too long and causing timeouts
-  abidiff: off
-# the badfunc is triggered by inet_addr and inet_ntoa which is in the third party
-# libraries bundled to firefox sources.
-badfuncs:
-  ignore:
-    - /usr/lib*/firefox/libxul.so
-# We don't plan to build Firefox with the LTO because it brings more problems
-# than benefits to the package.
-annocheck:
-  - hardened: --ignore-unknown --verbose --skip-lto --skip-cf-protection --skip-property-note
-runpath:
-  # rpath to bundled content
-  allowed_paths:
-    - /usr/lib64/firefox/bundled/lib64
diff --git a/sources b/sources
index 445e5bc..4c06e11 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,6 @@
 SHA512 (cbindgen-vendor.tar.xz) = ba8967007c7545fcf62a392e745b19188d883428adb5e9abd102cc6ad5d50891e9d38a7a20ee7a91e99d6340e9490a6b8bcc4c7175f3bb3a698841b816966385
-SHA512 (nspr-4.34.0-3.el8_1.src.rpm) = fe4715694c297cd8cefa577946358a90103bde73e78a3fdf13d202a3791736e8a48fbece09ee3d15f6d81ae051e26d96400b03bb6bf8630715746c5e1a643543
-SHA512 (nss-3.79.0-11.el8_1.src.rpm) = c4516e7917a45ac2d401700b6a7e23d5942d62fe2307cf130c526eea5a924516f82c2d2426b919c89004c4466c78061ea050721c1889a01fcd436cb562d4b1bd
 SHA512 (firefox-102.12.0esr.processed-source.tar.xz) = 5d87977e171a4b38b8c4cdd1285ef700ca17b4b54272ed5f71cc1c9cb035493eeac3bd1b71c5463d2689ba2b6f331c557d3418a446566c3877992ff1409d79ac
 SHA512 (firefox-langpacks-102.12.0esr-20230531.tar.xz) = 90491a051b1da2ca4c66fe112463134a765045900b9943b36dd6470a6094c25c36fed6fe4f6d191b9756968c628c463fbe2f93efdfff41036b4ffdde254ac906
+SHA512 (mochitest-python.tar.gz) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+SHA512 (nspr-4.34.0-3.el8_1.src.rpm) = fe4715694c297cd8cefa577946358a90103bde73e78a3fdf13d202a3791736e8a48fbece09ee3d15f6d81ae051e26d96400b03bb6bf8630715746c5e1a643543
+SHA512 (nss-3.79.0-11.el8_1.src.rpm) = c4516e7917a45ac2d401700b6a7e23d5942d62fe2307cf130c526eea5a924516f82c2d2426b919c89004c4466c78061ea050721c1889a01fcd436cb562d4b1bd