Compare commits

..

No commits in common. "c8" and "c8s" have entirely different histories.
c8 ... c8s

52 changed files with 177 additions and 31 deletions

View File

@ -1,7 +0,0 @@
5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz
6816817f0b3b42a13dfdc38af8c61dca46b54c13 SOURCES/firefox-128.3.1esr.processed-source.tar.xz
4641ad07664f375780e20200322bd5b45cd60ee8 SOURCES/firefox-langpacks-128.3.1esr-20241009.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm
0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm

90
.gitignore vendored
View File

@ -1,7 +1,85 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-128.3.1esr.processed-source.tar.xz
SOURCES/firefox-langpacks-128.3.1esr-20241009.tar.xz
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.101.0-7.el8_2.src.rpm
SOURCES/nss-3.101.0-7.el9_2.src.rpm
SOURCES/firefox-102.8.0esr.b2.processed-source.tar.xz
SOURCES/firefox-langpacks-102.8.0esr-20230214.tar.xz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
SOURCES/nss-3.79.0-6.el8_1.src.rpm
/cbindgen-vendor.tar.xz
/nspr-4.34.0-3.el8_1.src.rpm
/nss-3.79.0-6.el8_1.src.rpm
/firefox-102.9.0esr.processed-source.tar.xz
/firefox-langpacks-102.9.0esr-20230307.tar.xz
/firefox-102.9.0esr.b2.processed-source.tar.xz
/firefox-langpacks-102.9.0esr-20230310.tar.xz
/nss-3.79.0-11.el8_1.src.rpm
/firefox-114.0b5.processed-source.tar.xz
/firefox-langpacks-114.0b5-20230504.tar.xz
/firefox-115.0b2.processed-source.tar.xz
/firefox-langpacks-115.0b2-20230504.tar.xz
/firefox-115.0b5.processed-source.tar.xz
/firefox-115.0b8.source.tar.xz
/firefox-langpacks-115.0b8-20230621.tar.xz
/firefox-115.0b8.processed-source.tar.xz
/firefox-115.0.2esr.source.tar.xz
/firefox-langpacks-115.0.2esr-20230717.tar.xz
/firefox-115.0.2esr.processed-source.tar.xz
/firefox-115.1.0esr.source.tar.xz
/firefox-langpacks-115.1.0esr-20230802.tar.xz
/nspr-4.35.0-1.el8_1.src.rpm
/nss-3.90.0-2.el8_1.src.rpm
/firefox-115.1.0esr.processed-source.tar.xz
/nss-3.90.0-2.fc38.src.rpm
/nss-3.90.0-3.el8_1.src.rpm
/firefox-115.2.0esr.source.tar.xz
/firefox-langpacks-115.2.0esr-20230904.tar.xz
/firefox-115.2.0esr.processed-source.tar.xz
/mochitest-python.tar.gz
/nss-3.90.0-3.el9_0.src.rpm
/firefox-115.3.0esr.source.tar.xz
/firefox-langpacks-115.3.0esr-20230921.tar.xz
/firefox-115.3.0esr.processed-source.tar.xz
/firefox-langpacks-115.3.1esr-20230929.tar.xz
/firefox-115.3.1esr.processed-source.tar.xz
/firefox-langpacks-115.4.0esr-20231017.tar.xz
/firefox-115.4.0esr.processed-source.tar.xz
/firefox-115.5.0esr.processed-source.tar.xz
/firefox-langpacks-115.5.0esr-20231114.tar.xz
/firefox-115.6.0esr.processed-source.tar.xz
/firefox-langpacks-115.6.0esr-20231212.tar.xz
/firefox-115.7.0esr.processed-source.tar.xz
/firefox-langpacks-115.7.0esr-20240116.tar.xz
/firefox-115.8.0esr.processed-source.tar.xz
/firefox-langpacks-115.8.0esr-20240213.tar.xz
/firefox-115.9.0esr.processed-source.tar.xz
/firefox-langpacks-115.9.0esr-20240312.tar.xz
/firefox-115.9.0esr.b2.processed-source.tar.xz
/firefox-langpacks-115.9.0esr-20240315.tar.xz
/firefox-115.9.1esr.processed-source.tar.xz
/firefox-langpacks-115.9.1esr-20240322.tar.xz
/firefox-115.10.0esr.processed-source.tar.xz
/firefox-langpacks-115.10.0esr-20240409.tar.xz
/firefox-128.0b2.source.tar.xz
/firefox-langpacks-128.0b2-20240613.tar.xz
/firefox-128.0b2.processed-source.tar.xz
/firefox-128.0b5.processed-source.tar.xz
/firefox-langpacks-128.0b5-20240620.tar.xz
/firefox-128.0esr.processed-source.tar.xz
/firefox-langpacks-128.0esr-20240709.tar.xz
/nss-3.101.0-6.el8_8.src.rpm
/nss-3.101.0-6.el9_2.src.rpm
/nss-3.101.0-6.fc40.src.rpm
/firefox-128.1.0esr.processed-source.tar.xz
/firefox-langpacks-128.1.0esr-20240820.tar.xz
/nss-3.101.0-6.el9_0.src.rpm
/firefox-128.1esr.processed-source.tar.xz
/firefox-langpacks-128.1esr-20240820.tar.xz
/firefox-128.1.0esr.source.tar.xz
/firefox-128.2.0esr.processed-source.tar.xz
/firefox-langpacks-128.2.0esr-20240827.tar.xz
/nss-3.101.0-6.el8_0.src.rpm
/nss-3.101.0-6.el8_2.src.rpm
/firefox-128.3.0esr.processed-source.tar.xz
/firefox-langpacks-128.3.0esr-20240924.tar.xz
/nss-3.101.0-7.el9_2.src.rpm
/nss-3.101.0-7.el8_2.src.rpm
/firefox-128.3.1esr.processed-source.tar.xz
/firefox-langpacks-128.3.1esr-20241009.tar.xz

View File

@ -1,9 +0,0 @@
[Global]
id=redhat
version=1.0
about=Mozilla Firefox for Red Hat Enterprise Linux
[Preferences]
app.distributor=redhat
app.distributor.channel=redhat
app.partner.redhat=redhat

9
distribution.ini.in Normal file
View File

@ -0,0 +1,9 @@
[Global]
id=__ID__
version=1.0
about=Mozilla Firefox for __NAME__
[Preferences]
app.distributor=__ID__
app.distributor.channel=__ID__
app.partner.__ID__=__ID__

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@ -179,7 +179,7 @@ Source21: firefox.sh.in
Source23: firefox.1
Source24: mozilla-api-key
Source25: firefox-symbolic.svg
Source26: distribution.ini
Source26: distribution.ini.in
Source27: google-api-key
Source30: firefox-x11.sh.in
Source31: firefox-x11.desktop
@ -1718,14 +1718,11 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries
# Add distribution.ini
%{__mkdir_p} %{buildroot}%{mozappdir}/distribution
%{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution
# CentOS
%if 0%{?centos}
%{__sed} -ie 's/redhat/centos/g' %{buildroot}%{mozappdir}/distribution
(source /etc/os-release; %{__sed} -ie 's/Red Hat Enterprise Linux/$NAME/' %{buildroot}%{mozappdir}/distribution)
cat %{buildroot}%{mozappdir}/distribution
%endif
%{__sed} -e "s/__NAME__/%(source /etc/os-release; echo ${NAME})/g" \
-e "s/__ID__/%(source /etc/os-release; echo ${ID})/g" \
-e "s/rhel/redhat/g" \
-e "s/Fedora.*/Fedora/g" \
%{SOURCE26} > %{buildroot}%{mozappdir}/distribution/distribution.ini
# Install appdata file
mkdir -p %{buildroot}%{_datadir}/metainfo

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

32
gen_cbindgen-vendor.sh Executable file
View File

@ -0,0 +1,32 @@
#!/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.26.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

14
get_rust_bundled_provides.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/bash
# Get the list of the compiled bundled rust crates.
# Usage: $0 build.log
if [ -z $1 ]; then
echo Get the list of the compiled bundled rust crates.
echo Usage: $0 build.log
exit
fi
while read LINE; do
name=`echo $LINE | cut -d\ -f1`
version=`echo $LINE | cut -d\ -f2|sed -e 's/^v//g'`
echo "Provides: bundled(crate($name)) = $version"
done < <(cat $1 |grep "[0-9]*[ ]*Compiling [a-z]"|sed -e 's/.*Compiling //'g| sort|uniq)

19
rpminspect.yaml Normal file
View File

@ -0,0 +1,19 @@
---
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:
allowed:
/usr/lib64/firefox/libxul.so:
- inet_addr
- inet_ntoa
# 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

7
sources Normal file
View File

@ -0,0 +1,7 @@
SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
SHA512 (firefox-128.3.1esr.processed-source.tar.xz) = 8f399021908275d2b07fc67c740465b44cec796c0370f4ab29aeccf39430067279d36fa6e3c0d15641ccf8d9587ab3d07508f4d13cbee7c08b2e1448f7cc14bf
SHA512 (firefox-langpacks-128.3.1esr-20241009.tar.xz) = 0439bf9df4ddad167927cf266e461ec3ebe29ed13dad2624ed9447aa1185d4fc65fa01146aad82fd4e30f90ed90b8421b781f0dd7087467cbf5f6411c9cb948d