The package rpms/pack.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pack.git/commit/?id=504e168c67ad4....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 836366216d5c0f17ded208f11cd20baff35a2d3f
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 6 20:53:33 2023 +0530
Resolves: #2161300 - set _fortify_level 3
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/pack.spec b/pack.spec
index 3fbd0c5..dba3be1 100644
--- a/pack.spec
+++ b/pack.spec
@@ -155,6 +155,7 @@ for Cloud Native Buildpacks.
%build
%set_build_flags
+%define _fortify_level 3
export CGO_CFLAGS=$CFLAGS
# These extra flags present in $CFLAGS have been skipped for now as they break the build
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
commit 58161943926c27a1a918bd3ed176a954523178ca
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 6 20:48:40 2023 +0530
bump to v0.28.0
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 70ffa21..2122fbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/v0.27.0-rc1-vendor.tar.gz
/v0.27.0-vendor.tar.gz
/v0.28.0-rc2-vendor.tar.gz
+/v0.28.0-vendor.tar.gz
diff --git a/pack.spec b/pack.spec
index 380baac..3fbd0c5 100644
--- a/pack.spec
+++ b/pack.spec
@@ -15,7 +15,7 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global git0 https://%{import_path}
-%global built_tag v0.28.0-rc2
+%global built_tag v0.28.0
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
@@ -45,71 +45,106 @@ Provides: %{name}cli = %{version}-%{release}
Provides: %{name}-cli = %{version}-%{release}
# vendored libraries
# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod
| sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e
'/bundled(golang(go\|module\|replace\|require))/d'
+Provides:
bundled(golang(github.com/Azure/azure_sdk_for_go)) = v67.0.0+incompatible
Provides:
bundled(golang(github.com/Azure/go_ansiterm)) =
v0.0.0_20210617225240_d185dfc1b5a1
-Provides:
bundled(golang(github.com/BurntSushi/toml)) = v1.0.0
+Provides:
bundled(golang(github.com/Azure/go_autorest)) = v14.2.0+incompatible
+Provides:
bundled(golang(github.com/Azure/go_autorest/autorest)) = v0.11.28
+Provides:
bundled(golang(github.com/Azure/go_autorest/autorest/adal)) = v0.9.21
+Provides:
bundled(golang(github.com/Azure/go_autorest/autorest/azure/auth)) = v0.5.11
+Provides:
bundled(golang(github.com/Azure/go_autorest/autorest/azure/cli)) = v0.4.6
+Provides:
bundled(golang(github.com/Azure/go_autorest/autorest/date)) = v0.3.0
+Provides:
bundled(golang(github.com/Azure/go_autorest/logger)) = v0.2.1
+Provides:
bundled(golang(github.com/Azure/go_autorest/tracing)) = v0.6.0
+Provides:
bundled(golang(github.com/BurntSushi/toml)) = v1.2.1
Provides:
bundled(golang(github.com/Masterminds/semver)) = v1.5.0
-Provides:
bundled(golang(github.com/Microsoft/go_winio)) = v0.5.1
-Provides:
bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.23
+Provides:
bundled(golang(github.com/Microsoft/go_winio)) = v0.6.0
+Provides:
bundled(golang(github.com/Microsoft/hcsshim)) = v0.9.5
+Provides:
bundled(golang(github.com/ProtonMail/go_crypto)) =
v0.0.0_20210428141323_04723f9f07d7
+Provides:
bundled(golang(github.com/acomagu/bufpipe)) = v1.0.3
Provides:
bundled(golang(github.com/apex/log)) = v1.9.0
-Provides:
bundled(golang(github.com/bits_and_blooms/bitset)) = v1.2.0
-Provides:
bundled(golang(github.com/buildpacks/imgutil)) =
v0.0.0_20211203200417_76206845baac
-Provides:
bundled(golang(github.com/buildpacks/lifecycle)) = v0.13.3
-Provides:
bundled(golang(github.com/containerd/cgroups)) = v1.0.1
-Provides:
bundled(golang(github.com/containerd/containerd)) = v1.5.8
-Provides:
bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.10.1
-Provides:
bundled(golang(github.com/docker/cli)) = v20.10.12+incompatible
-Provides:
bundled(golang(github.com/docker/distribution)) = v2.7.1+incompatible
-Provides:
bundled(golang(github.com/docker/docker)) = v20.10.12+incompatible
-Provides:
bundled(golang(github.com/docker/docker_credential_helpers)) = v0.6.4
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2)) = v1.17.1
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/config)) = v1.17.10
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/credentials)) = v1.12.23
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/feature/ec2/imds)) = v1.12.19
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/internal/configsources)) = v1.1.25
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/internal/endpoints/v2)) = v2.4.19
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/internal/ini)) = v1.3.26
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/service/ecr)) = v1.17.20
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/service/ecrpublic)) = v1.13.19
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/service/internal/presigned_url)) =
v1.9.19
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/service/sso)) = v1.11.25
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/service/ssooidc)) = v1.13.8
+Provides:
bundled(golang(github.com/aws/aws_sdk_go_v2/service/sts)) = v1.17.1
+Provides:
bundled(golang(github.com/aws/smithy_go)) = v1.13.4
+Provides:
bundled(golang(github.com/awslabs/amazon_ecr_credential_helper/ecr_login)) =
v0.0.0_20221027043306_dc425bc05c64
+Provides:
bundled(golang(github.com/buildpacks/imgutil)) =
v0.0.0_20221109161319_3252b1f13dfa
+Provides:
bundled(golang(github.com/buildpacks/lifecycle)) = v0.15.1
+Provides:
bundled(golang(github.com/chrismellard/docker_credential_acr_env)) =
v0.0.0_20221002210726_e883f69e0206
+Provides:
bundled(golang(github.com/containerd/cgroups)) = v1.0.4
+Provides:
bundled(golang(github.com/containerd/containerd)) = v1.6.9
+Provides:
bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.12.1
+Provides:
bundled(golang(github.com/containerd/typeurl)) = v1.0.2
+Provides:
bundled(golang(github.com/dimchansky/utfbom)) = v1.1.1
+Provides:
bundled(golang(github.com/docker/cli)) = v20.10.21+incompatible
+Provides:
bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible
+Provides:
bundled(golang(github.com/docker/docker)) = v20.10.21+incompatible
+Provides:
bundled(golang(github.com/docker/docker_credential_helpers)) = v0.7.0
Provides:
bundled(golang(github.com/docker/go_connections)) = v0.4.0
-Provides:
bundled(golang(github.com/docker/go_units)) = v0.4.0
+Provides:
bundled(golang(github.com/docker/go_units)) = v0.5.0
Provides:
bundled(golang(github.com/dustin/go_humanize)) = v1.0.0
-Provides:
bundled(golang(github.com/emirpasic/gods)) = v1.12.0
+Provides:
bundled(golang(github.com/emirpasic/gods)) = v1.18.1
Provides:
bundled(golang(github.com/gdamore/encoding)) = v1.0.0
-Provides:
bundled(golang(github.com/gdamore/tcell/v2)) = v2.4.0
+Provides:
bundled(golang(github.com/gdamore/tcell/v2)) = v2.5.3
Provides:
bundled(golang(github.com/ghodss/yaml)) = v1.0.0
+Provides:
bundled(golang(github.com/go_git/gcfg)) = v1.5.0
+Provides:
bundled(golang(github.com/go_git/go_billy/v5)) = v5.3.1
+Provides:
bundled(golang(github.com/go_git/go_git/v5)) = v5.4.2
Provides:
bundled(golang(github.com/gogo/protobuf)) = v1.3.2
+Provides:
bundled(golang(github.com/golang_jwt/jwt/v4)) = v4.4.2
Provides:
bundled(golang(github.com/golang/groupcache)) =
v0.0.0_20210331224755_41bb18bfe9da
Provides:
bundled(golang(github.com/golang/mock)) = v1.6.0
Provides:
bundled(golang(github.com/golang/protobuf)) = v1.5.2
-Provides:
bundled(golang(github.com/google/go_cmp)) = v0.5.7
-Provides:
bundled(golang(github.com/google/go_containerregistry)) = v0.8.0
+Provides:
bundled(golang(github.com/google/go_cmp)) = v0.5.9
+Provides:
bundled(golang(github.com/google/go_containerregistry)) = v0.12.1
Provides:
bundled(golang(github.com/google/go_github/v30)) = v30.1.0
Provides:
bundled(golang(github.com/google/go_querystring)) = v1.0.0
+Provides:
bundled(golang(github.com/google/uuid)) = v1.3.0
Provides:
bundled(golang(github.com/hectane/go_acl)) =
v0.0.0_20190604041725_da78bae5fc95
Provides:
bundled(golang(github.com/heroku/color)) = v0.0.6
-Provides:
bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.0
+Provides:
bundled(golang(github.com/imdario/mergo)) = v0.3.12
+Provides:
bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.1
Provides:
bundled(golang(github.com/jbenet/go_context)) =
v0.0.0_20150711004518_d14ea06fba99
-Provides:
bundled(golang(github.com/kevinburke/ssh_config)) =
v0.0.0_20190725054713_01f96b0aa0cd
-Provides:
bundled(golang(github.com/klauspost/compress)) = v1.13.6
+Provides:
bundled(golang(github.com/jmespath/go_jmespath)) = v0.4.0
+Provides:
bundled(golang(github.com/kevinburke/ssh_config)) = v1.2.0
+Provides:
bundled(golang(github.com/klauspost/compress)) = v1.15.12
Provides:
bundled(golang(github.com/lucasb_eyer/go_colorful)) = v1.2.0
-Provides:
bundled(golang(github.com/mattn/go_colorable)) = v0.1.12
-Provides:
bundled(golang(github.com/mattn/go_isatty)) = v0.0.14
-Provides:
bundled(golang(github.com/mattn/go_runewidth)) = v0.0.10
+Provides:
bundled(golang(github.com/mattn/go_colorable)) = v0.1.13
+Provides:
bundled(golang(github.com/mattn/go_isatty)) = v0.0.16
+Provides:
bundled(golang(github.com/mattn/go_runewidth)) = v0.0.13
Provides:
bundled(golang(github.com/mitchellh/go_homedir)) = v1.1.0
Provides:
bundled(golang(github.com/mitchellh/ioprogress)) =
v0.0.0_20180201004757_6a23b12fa88e
-Provides:
bundled(golang(github.com/moby/sys/mount)) = v0.2.0
-Provides:
bundled(golang(github.com/moby/sys/mountinfo)) = v0.4.1
-Provides:
bundled(golang(github.com/moby/term)) = v0.0.0_20210619224110_3f7ff695adc6
+Provides:
bundled(golang(github.com/moby/buildkit)) = v0.10.5
+Provides:
bundled(golang(github.com/moby/sys/mount)) = v0.3.3
+Provides:
bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2
+Provides:
bundled(golang(github.com/moby/term)) = v0.0.0_20221105221325_4eb28fa6025c
Provides:
bundled(golang(github.com/morikuni/aec)) = v1.0.0
-Provides:
bundled(golang(github.com/onsi/gomega)) = v1.18.1
+Provides:
bundled(golang(github.com/onsi/gomega)) = v1.20.2
Provides:
bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
-Provides:
bundled(golang(github.com/opencontainers/image_spec)) = v1.0.2
-Provides:
bundled(golang(github.com/opencontainers/runc)) = v1.0.2
-Provides:
bundled(golang(github.com/opencontainers/selinux)) = v1.8.2
-Provides:
bundled(golang(github.com/pelletier/go_toml)) = v1.9.4
+Provides:
bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc2
+Provides:
bundled(golang(github.com/opencontainers/runc)) = v1.1.4
+Provides:
bundled(golang(github.com/opencontainers/selinux)) = v1.10.2
+Provides:
bundled(golang(github.com/pelletier/go_toml)) = v1.9.5
Provides:
bundled(golang(github.com/pkg/errors)) = v0.9.1
-Provides:
bundled(golang(github.com/rivo/tview)) = v0.0.0_20210624165335_29d673af0ce2
+Provides:
bundled(golang(github.com/rivo/tview)) = v0.0.0_20220307222120_9994674d60a8
Provides:
bundled(golang(github.com/rivo/uniseg)) = v0.2.0
-Provides:
bundled(golang(github.com/sabhiram/go_gitignore)) =
v0.0.0_20201211074657_223ce5d391b0
+Provides:
bundled(golang(github.com/sabhiram/go_gitignore)) =
v0.0.0_20210923224102_525f6e181f06
Provides:
bundled(golang(github.com/sclevine/spec)) = v1.4.0
-Provides:
bundled(golang(github.com/sergi/go_diff)) = v1.1.0
-Provides:
bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
-Provides:
bundled(golang(github.com/spf13/cobra)) = v1.3.0
+Provides:
bundled(golang(github.com/sergi/go_diff)) = v1.2.0
+Provides:
bundled(golang(github.com/sirupsen/logrus)) = v1.9.0
+Provides:
bundled(golang(github.com/spf13/cobra)) = v1.6.1
Provides:
bundled(golang(github.com/spf13/pflag)) = v1.0.5
-Provides:
bundled(golang(github.com/src_d/gcfg)) = v1.4.0
Provides:
bundled(golang(github.com/vbatts/tar_split)) = v0.11.2
-Provides:
bundled(golang(github.com/xanzy/ssh_agent)) = v0.3.0
+Provides:
bundled(golang(github.com/xanzy/ssh_agent)) = v0.3.1
%description
%{name} is a CLI implementation of the Platform Interface Specification
diff --git a/sources b/sources
index 164ec80..d8d42f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.28.0-rc2-vendor.tar.gz) =
70ee3c837310fb43c26f06e42fbc8f8bd91598f9ed07e8cbdf444516b801da2f4eb144d5d6eb74f51e7a84740d1b577552d43d71ad2bb36d073f400b39de786a
+SHA512 (v0.28.0-vendor.tar.gz) =
81f1e5641922dd61ca4c15285d9e31201e2f09d7ece4bb39d8a1d0085060b4646240f1eeb7599ad9d8f05a34093498f13448c67467913b62f36ef522488e1e38
commit 504e168c67ad4b28f11d25b151458fd118979fae
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 6 20:41:04 2023 +0530
fix build flags specification
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/pack.spec b/pack.spec
index 519bc91..380baac 100644
--- a/pack.spec
+++ b/pack.spec
@@ -119,32 +119,36 @@ for Cloud Native Buildpacks.
%autosetup -Sgit -n %{name}-%{built_tag_strip}
%build
-export GOPATH=$(pwd)/_build:$(pwd)
+%set_build_flags
+export CGO_CFLAGS=$CFLAGS
+# These extra flags present in $CFLAGS have been skipped for now as they break the build
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed
's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g')
+export LDFLAGS=''
+
+%ifarch x86_64
+export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
+%endif
+
mkdir _build
+export GOPATH=$(pwd)/_build:$(pwd)
+
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path}
-
-#ln -s $(dirs +1 -l) src/%%{import_path}
popd
-#mv vendor src
ln -s vendor src
%if 0%{?rhel} <= 8
# handled automatically in %%gobuild for fedora and epel9
export GO111MODULE=off
%endif
-export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security
-Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects
-fexceptions -fasynchronous-unwind-tables -fstack-protector-strong
-fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64"
-%ifarch x86_64
-export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
-%endif
-# These extra flags present in %%{optflags} have been skipped for now as they break the
build
-#export CGO_CFLAGS+=" -flto=auto -Wp,D_GLIBCXX_ASSERTIONS
-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1"
%gobuild -o out/%{name} %{import_path}/cmd/%{name}
%install
-export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
#define license tag if not already defined
commit bffb308f083dc86e0c559458523c59eddc1fb9ff
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 6 17:10:51 2023 +0530
migrated to SPDX license
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/pack.spec b/pack.spec
index 1315b4f..519bc91 100644
--- a/pack.spec
+++ b/pack.spec
@@ -27,7 +27,7 @@ Release: %autorelease
Release: 1%{?dist}
%endif
Summary: Convert code into runnable images
-License: ASL 2.0 and BSD and ISC and MIT
+License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT
URL: %{git0}
## On the upstream repo, run:
# git checkout %%{built_tag} && go mod vendor && git add vendor/*
&& \
commit bc1715d6d9de8dbd4e8eea7ab3da2efaf3465f80
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 19 23:12:40 2023 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit e8d2d85bc900db88d9a4b29e28173674600982aa
Author: RH Container Bot <rhcontainerbot(a)fedoraproject.org>
Date: Mon Dec 12 00:36:21 2022 +0000
auto bump to v0.28.0-rc2
diff --git a/.gitignore b/.gitignore
index b4c9870..70ffa21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/v0.26.0-vendor.tar.gz
/v0.27.0-rc1-vendor.tar.gz
/v0.27.0-vendor.tar.gz
+/v0.28.0-rc2-vendor.tar.gz
diff --git a/pack.spec b/pack.spec
index 4a22c90..1315b4f 100644
--- a/pack.spec
+++ b/pack.spec
@@ -15,7 +15,7 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global git0 https://%{import_path}
-%global built_tag v0.27.0
+%global built_tag v0.28.0-rc2
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
diff --git a/sources b/sources
index 5255621..164ec80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.27.0-vendor.tar.gz) =
dd819737c1e5b761668a2e253ad534736c0b41ad3649a1836f3717ded8232c01126d995fd50ff4f63a8290c19ea3ffef2aafe5afbb0ab6d991350331dcd8698b
+SHA512 (v0.28.0-rc2-vendor.tar.gz) =
70ee3c837310fb43c26f06e42fbc8f8bd91598f9ed07e8cbdf444516b801da2f4eb144d5d6eb74f51e7a84740d1b577552d43d71ad2bb36d073f400b39de786a