diff --git a/.gitignore b/.gitignore index 597c2c3..2d860cd 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /ignition-db4d30d.tar.gz /ignition-c733d23.tar.gz /ignition-1d56dc8.tar.gz +/ignition-2.9.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 583be97..6e768a6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,8 +49,6 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 1d56dc8e717a10c1a8b392050bcb3d269cd42154 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these # for consistency @@ -61,17 +59,17 @@ Name: ignition Version: 2.9.0 -Release: 3.git%{shortcommit}%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz # Fix AWS probing by using the IMDS token URL to ensure that networking is up # https://github.com/coreos/ignition/pull/1161 Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch %define gopath %{_datadir}/gocode -ExcludeArch: ppc64 +ExclusiveArch: %{go_arches} BuildRequires: golang >= 1.10 # add non golang BuildRequires that weren't detected BuildRequires: libblkid-devel @@ -269,10 +267,10 @@ Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 %description Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files -(regular files, systemd units, networkd units, etc.), and configuring -users. On first boot, Ignition reads its configuration from a source -of truth (remote URL, network metadata service, hypervisor bridge, etc.) -and applies the configuration. +(regular files, systemd units, etc.), and configuring users. On first +boot, Ignition reads its configuration from a source of truth (remote +URL, network metadata service, hypervisor bridge, etc.) and applies +the configuration. ############## devel subpackage ############## @@ -422,10 +420,10 @@ Conflicts: ignition < 0.31.0-3 %description validate Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files -(regular files, systemd units, networkd units, etc.), and configuring -users. On first boot, Ignition reads its configuration from a source -of truth (remote URL, network metadata service, hypervisor bridge, etc.) -and applies the configuration. +(regular files, systemd units, etc.), and configuring users. On first +boot, Ignition reads its configuration from a source of truth (remote +URL, network metadata service, hypervisor bridge, etc.) and applies +the configuration. This package contains a tool for validating Ignition configurations. @@ -445,9 +443,7 @@ building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. %prep -# setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html -# unpack source0 and apply patches -%setup -T -b 0 -q -n %{repo}-%{commit} +%autosetup -p1 %build # Set up PWD as a proper import path for go @@ -609,6 +605,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4 +- Drop Git commit hash from Release +- Correctly enable IMDS patch +- Switch to %%autosetup +- Set ExclusiveArch from %%go_arches +- Drop mention of networkd in package description + * Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-3.git1d56dc8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/ignition.spec.orig b/ignition.spec.orig deleted file mode 100644 index aced5ef..0000000 --- a/ignition.spec.orig +++ /dev/null @@ -1,348 +0,0 @@ -# Original spec file as generated by: -# gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f -# With: -# gofed/gofed:v1.0.1 docker image - - -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 1 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif - -%global provider github -%global provider_tld com -%global project coreos -%global repo ignition -# https://github.com/coreos/ignition -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit f7079129b8651ac51dba14c3af65692bb413c1dd -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.1.git%{shortcommit}%{?dist} -Summary: !!!!FILL!!!! -# Detected licences -# - Unknown at 'LICENSE' -License: !!!!FILL!!!! -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - -%if ! 0%{?with_bundled} -# validate/main.go -BuildRequires: golang(github.com/spf13/cobra) - -# Remaining dependencies not included in main packages -BuildRequires: golang(github.com/vmware/vmw-ovflib) -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) -BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/ajeddeloh/go-json) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/pborman/uuid) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -%endif - -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/ajeddeloh/go-json) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/pborman/uuid) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/vmware/vmw-ovflib) -%endif - -Requires: golang(github.com/ajeddeloh/go-json) -Requires: golang(github.com/aws/aws-sdk-go/aws) -Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) -Requires: golang(github.com/aws/aws-sdk-go/aws/credentials) -Requires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -Requires: golang(github.com/aws/aws-sdk-go/aws/session) -Requires: golang(github.com/aws/aws-sdk-go/service/s3) -Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -Requires: golang(github.com/coreos/go-semver/semver) -Requires: golang(github.com/coreos/go-systemd/dbus) -Requires: golang(github.com/coreos/go-systemd/unit) -Requires: golang(github.com/pborman/uuid) -Requires: golang(github.com/pin/tftp) -Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -Requires: golang(github.com/vincent-petithory/dataurl) -Requires: golang(github.com/vmware/vmw-ovflib) - -Provides: golang(%{import_path}/config/shared) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} -Provides: golang(%{import_path}/config/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} -Provides: golang(%{import_path}/tests) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/networkd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/files) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/networkd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/oem) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/security) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{release} -Provides: golang(%{import_path}/tests/register) = %{version}-%{release} -Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} -Provides: golang(%{import_path}/tests/types) = %{version}-%{release} - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/stretchr/testify/assert) -%endif - -Requires: golang(github.com/stretchr/testify/assert) - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - -%prep -%setup -q -n %{repo}-%{commit} - -%build -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../ src/%{import_path} - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -# No dependency directories so far -export GOPATH=$(pwd):%{gopath} -%endif - -#%gobuild -o bin/internal %{import_path}/internal -#%gobuild -o bin/internal/util/tools/docs %{import_path}/internal/util/tools/docs -#%gobuild -o bin/tests/stubs/id-stub %{import_path}/tests/stubs/id-stub -#%gobuild -o bin/tests/stubs/useradd-stub %{import_path}/tests/stubs/useradd-stub -#%gobuild -o bin/tests/stubs/usermod-stub %{import_path}/tests/stubs/usermod-stub -#%gobuild -o bin/validate %{import_path}/validate - -%install -install -d -p %{buildroot}%{_bindir} -#install -p -m 0755 bin/internal %{buildroot}%{_bindir} -#install -p -m 0755 bin/internal/util/tools/docs %{buildroot}%{_bindir} -#install -p -m 0755 bin/tests/stubs/id-stub %{buildroot}%{_bindir} -#install -p -m 0755 bin/tests/stubs/useradd-stub %{buildroot}%{_bindir} -#install -p -m 0755 bin/tests/stubs/usermod-stub %{buildroot}%{_bindir} -#install -p -m 0755 bin/validate %{buildroot}%{_bindir} - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# Since we aren't packaging up the vendor directory we need to link -# back to it somehow. Hack it up so that we can add the vendor -# directory from BUILD dir as a gopath to be searched when executing -# tests from the BUILDROOT dir. -ln -s ./ ./vendor/src # ./vendor/src -> ./vendor - -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path}/config/v1 -%gotest %{import_path}/config/v1/types -%gotest %{import_path}/config/v2_0 -%gotest %{import_path}/config/v2_0/types -%gotest %{import_path}/config/v2_1 -%gotest %{import_path}/config/v2_1/types -%gotest %{import_path}/config/v2_2 -%gotest %{import_path}/config/v2_2/types -%gotest %{import_path}/config/v2_3_experimental -%gotest %{import_path}/config/v2_3_experimental/types -%gotest %{import_path}/config/validate -%gotest %{import_path}/internal/config -%gotest %{import_path}/internal/exec/stages/files -%gotest %{import_path}/internal/exec/util -%gotest %{import_path}/internal/registry -%gotest %{import_path}/internal/util -%gotest %{import_path}/tests -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -#%{_bindir}/internal -#%{_bindir}/internal/util/tools/docs -#%{_bindir}/tests/stubs/id-stub -#%{_bindir}/tests/stubs/useradd-stub -#%{_bindir}/tests/stubs/usermod-stub -#%{_bindir}/validate - -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -%endif - -%changelog* Thu Aug 30 2018 root - 0-0.1.gitf707912 -- First package for Fedora - diff --git a/notes.txt b/notes.txt deleted file mode 100644 index d97e49e..0000000 --- a/notes.txt +++ /dev/null @@ -1,61 +0,0 @@ -#grab gofed from https://github.com/gofed/gofed -#follow instructions for install - -#choose which version of the repo you want to build. For ignition it was 0.2.6 and the commit was 76107251acd117c6d3e5b4dae2b47f82f944984b - -[vagrant@vanilla-f28 ~]$ gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f -Repo URL: github.com/coreos/ignition -Commit: 76107251acd117c6d3e5b4dae2b47f82f944984b -Name: golang-github-coreos-ignition - -(1/4) Checking if the package already exists in PkgDB -(2/4) Collecting data -(3/4) Generating spec file -(4/4) Discovering golang dependencies -Discovering package dependencies - Class: github.com/ajeddeloh/go-json (golang-github-ajeddeloh-go-json) PkgDB=False - Class: github.com/aws/aws-sdk-go (golang-github-aws-aws-sdk-go) PkgDB=True - Class: github.com/coreos/go-semver (golang-github-coreos-go-semver) PkgDB=True - Class: github.com/coreos/go-systemd (golang-github-coreos-go-systemd) PkgDB=True - Class: github.com/pin/tftp (golang-github-pin-tftp) PkgDB=False - Class: github.com/sigma/vmw-guestinfo (golang-github-sigma-vmw-guestinfo) PkgDB=False - Class: github.com/vincent-petithory/dataurl (golang-github-vincent-petithory-dataurl) PkgDB=False - Class: github.com/vmware/vmw-ovflib (golang-github-vmware-vmw-ovflib) PkgDB=False - -Discovering test dependencies - Class: github.com/stretchr/testify (golang-github-stretchr-testify) PkgDB=True - -Spec file golang-github-coreos-ignition.spec at /home/vagrant/golang-github-coreos-ignition - -# spec file now at /home/vagrant/golang-github-coreos-ignition/golang-github-coreos-ignition.spec - -# go through and fix things up - see diff - -# generate bundled provides by copying/using go-mods-to-bundled-provides.py to -# the ignition source folder and then running it. copy into spec file -# should be done by gofed at some point - https://github.com/gofed/gofed/issues/42 - -# grab source tarball -# rpmspec -P ignition.spec | grep Source0 -# pushd $HOME/rpmbuild/SOURCES/ -# curl -L -O $URL -# popd - - -# build RPM -$ rpmbuild -ba ignition.spec - -# find a srpm in `$HOME/rpmbuild/SRPMS` -# find a RPM in `$HOME/rpmbuild/RPM/arch/` -# see if the dependencies are proper - -$ rpm -qpR $HOME/rpmbuild/RPMS/x86_64/ignition-0.26.0-0.1.git7610725.fc28.x86_64.rpm - - -# setup to run koji, ref: https://fedoraproject.org/wiki/Using_the_Koji_build_system -$ fedora-packager-setup -$ kinit @FEDORAPROJECT.ORG - - -# to build it on koji run: -$ koji build --scratch rawhide /path/to/srpm/ignition-0.26.0-0.1.git7610725.fc28.src.rpm diff --git a/sources b/sources index 2ef8e73..8a36460 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-1d56dc8.tar.gz) = 44e334128443f79f7b814a27df80288a204f2f24cb449fe43836bcb5e0c5e27f8065193d4a934cafc04221b2237f9a55695a1a7bd22158317fad1050321717c8 +SHA512 (ignition-2.9.0.tar.gz) = 714ae90fb32a45e1b21e0b0671e7933ce302cdd943cd02cfc221e8bf88269fb464ff5f740d54b444e5c341a3877bf2943ca6f2c2f1374df904386400d73ebe97