[rpms/apptainer] migrate-spdx: update to 1.3.0-rc.1

[Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : 41b96b822f3c44a84c49ae413fb8ffe38d68daf9
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2024-01-10T11:12:33-06:00
Stats  : +128/-143 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/41b96b822f3c44a84c49ae413fb8ffe38d68daf9?branch=migrate-spdx

Log:
update to 1.3.0-rc.1

---
diff --git a/.gitignore b/.gitignore
index 628706c..54e5c88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /apptainer-*.tar.gz
-/squashfuse-*.tar.gz
-/gocryptfs-*.tar.gz
+/e2fsprogs-*
+/fuse2fs-*
+/gocryptfs-*
+/squashfuse-*
+/fuse-overlayfs-1.13.tar.gz

diff --git a/apptainer.spec b/apptainer.spec
index da0e884..1e7910b 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -31,19 +31,19 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.2.5
+%global package_version 1.3.0-rc.1
 
-# Uncomment this to include gocryptfs
 %global gocryptfs_version 2.4.0
-# Uncomment this to include a multithreaded version of squashfuse_ll
-%global squashfuse_version 0.2.0
+%global squashfuse_version 0.5.0
+%global e2fsprogs_version 1.47.0
+%global fuse_overlayfs_version 1.13
 
 # The last singularity version number in EPEL/Fedora
 %global last_singularity_version 3.8.7-3
 
 Summary: Application and environment virtualization formerly known as Singularity
 Name: apptainer
-Version: 1.2.5
+Version: 1.3.0~rc.1
 Release: 1%{?dist}
 # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD)
 # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0)
@@ -57,12 +57,23 @@ Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}
 # In order to build offline, this source tarball needs to have the "vendor"
 # directory added, which can be done by unpacking it, doing the command
 #   go mod vendor
-# and then recreating the tarball.
+# and then recreating the tarball.  Use scripts/download-dependencies.
 Source10: https://github.com/rfjakob/gocryptfs/archive/v%{gocryptfs_version}/gocryptfs-%{gocryptfs_version}.tar.gz
 %endif
 %if "%{?squashfuse_version}" != ""
 Source11: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
 %endif
+%if "%{?e2fsprogs_version}" != ""
+# URL: https://github.com/tytso/e2fsprogs/archive/refs/tags/v%{e2fsprogs_version}.tar.gz
+Source12: e2fsprogs-%{e2fsprogs_version}.tar.gz
+# URL: https://github.com/tytso/e2fsprogs/commit/5598a96.patch
+Patch121: e2fsprogs-1.patch
+# URL: https://github.com/tytso/e2fsprogs/commit/1ac0061.patch
+Patch122: e2fsprogs-2.patch
+# URL: https://github.com/tytso/e2fsprogs/commit/448a3f8.patch
+Patch123: e2fsprogs-3.patch
+%endif
+Source13: https://github.com/containers/fuse-overlayfs/archive/v%{fuse_overlayfs_version}/fuse-overlayfs-%{fuse_overlayfs_version}.tar.gz
 
 # This Conflicts is in case someone tries to install the main apptainer
 # package when an old singularity package is installed.  An Obsoletes is on
@@ -85,79 +96,75 @@ Obsoletes: singularity-runtime < 3.0
 Provides: sif-runtime
 Conflicts: sif-runtime
 
-Provides: bundled(golang(github.com/AdaLogics/go_fuzz_headers)) = v0.0.0_20230106234847_43070de90fa1
 Provides: bundled(golang(github.com/AdamKorcz/go_fuzz_headers)) = v0.0.0_20210319161527_f761c2329661
-Provides: bundled(golang(github.com/Azure/go_ansiterm)) = v0.0.0_20210617225240_d185dfc1b5a1
 Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.3.2
 Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.6.1
 Provides: bundled(golang(github.com/Netflix/go_expect)) = v0.0.0_20220104043353_73e0943537d2
-Provides: bundled(golang(github.com/ProtonMail/go_crypto)) = v0.0.0_20230217124315_7d5c6f04bbb8
+Provides: bundled(golang(github.com/ProtonMail/go_crypto)) = v0.0.0_20230923063757_afb1ddc0824c
 Provides: bundled(golang(github.com/VividCortex/ewma)) = v1.2.0
 Provides: bundled(golang(github.com/acarl005/stripansi)) = v0.0.0_20180116102854_5a71ef0e047d
 Provides: bundled(golang(github.com/adigunhammedolalekan/registry_auth)) = v0.0.0_20200730122110_8cde180a3a60
 Provides: bundled(golang(github.com/alexflint/go_filemutex)) = v1.2.0
 Provides: bundled(golang(github.com/apex/log)) = v1.9.0
 Provides: bundled(golang(github.com/apptainer/container_key_client)) = v0.8.0
-Provides: bundled(golang(github.com/apptainer/container_library_client)) = v1.4.2
-Provides: bundled(golang(github.com/apptainer/sif/v2)) = v2.11.5
+Provides: bundled(golang(github.com/apptainer/container_library_client)) = v1.4.6
+Provides: bundled(golang(github.com/apptainer/sif/v2)) = v2.15.1
 Provides: bundled(golang(github.com/asaskevich/govalidator)) = v0.0.0_20230301143203_a9d515a09cc2
+Provides: bundled(golang(github.com/astromechza/etcpwdparse)) = v0.0.0_20170319193008_f0e5f0779716
 Provides: bundled(golang(github.com/beorn7/perks)) = v1.0.1
 Provides: bundled(golang(github.com/blang/semver/v4)) = v4.0.0
 Provides: bundled(golang(github.com/buger/goterm)) = v1.0.4
 Provides: bundled(golang(github.com/buger/jsonparser)) = v1.1.1
-Provides: bundled(golang(github.com/bugsnag/bugsnag_go)) = v1.5.1
-Provides: bundled(golang(github.com/bugsnag/panicwrap)) = v1.2.0
 Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = v4.2.1
 Provides: bundled(golang(github.com/cespare/xxhash/v2)) = v2.2.0
 Provides: bundled(golang(github.com/cilium/ebpf)) = v0.9.1
 Provides: bundled(golang(github.com/cloudflare/circl)) = v1.3.3
-Provides: bundled(golang(github.com/containerd/containerd)) = v1.7.2
+Provides: bundled(golang(github.com/containerd/containerd)) = v1.7.11
+Provides: bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.15.1
 Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.2
-Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.3.0
-Provides: bundled(golang(github.com/containers/image/v5)) = v5.25.0
+Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.4.0
+Provides: bundled(golang(github.com/containers/image/v5)) = v5.29.0
 Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20230121012942_c1716e8a8d01
-Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.7
-Provides: bundled(golang(github.com/containers/storage)) = v1.46.0
-Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.6.0
+Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.9
+Provides: bundled(golang(github.com/containers/storage)) = v1.51.0
+Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.7.0
 Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.5.0
-Provides: bundled(golang(github.com/cpuguy83/go_md2man/v2)) = v2.0.2
-Provides: bundled(golang(github.com/creack/pty)) = v1.1.18
-Provides: bundled(golang(github.com/cyberphone/json_canonicalization)) = v0.0.0_20220623050100_57a0ce2678a7
-Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.3
+Provides: bundled(golang(github.com/cpuguy83/go_md2man/v2)) = v2.0.3
+Provides: bundled(golang(github.com/creack/pty)) = v1.1.21
+Provides: bundled(golang(github.com/cyberphone/json_canonicalization)) = v0.0.0_20231011164504_785e29786b46
+Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.4
 Provides: bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
 Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
-Provides: bundled(golang(github.com/docker/cli)) = v23.0.5+incompatible
-Provides: bundled(golang(github.com/docker/distribution)) = v2.8.2+incompatible
-Provides: bundled(golang(github.com/docker/docker)) = v23.0.6+incompatible
-Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.7.0
+Provides: bundled(golang(github.com/distribution/reference)) = v0.5.0
+Provides: bundled(golang(github.com/docker/cli)) = v24.0.7+incompatible
+Provides: bundled(golang(github.com/docker/distribution)) = v2.8.3+incompatible
+Provides: bundled(golang(github.com/docker/docker)) = v24.0.7+incompatible
+Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.8.0
 Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.0
 Provides: bundled(golang(github.com/docker/go_metrics)) = v0.0.1
 Provides: bundled(golang(github.com/docker/go_units)) = v0.5.0
 Provides: bundled(golang(github.com/docker/libtrust)) = v0.0.0_20160708172513_aabc10ec26b7
-Provides: bundled(golang(github.com/emirpasic/gods)) = v1.18.1
-Provides: bundled(golang(github.com/fatih/color)) = v1.15.0
+Provides: bundled(golang(github.com/fatih/color)) = v1.16.0
 Provides: bundled(golang(github.com/felixge/httpsnoop)) = v1.0.3
 Provides: bundled(golang(github.com/garyburd/redigo)) = v0.0.0_20150301180006_535138d7bcd7
+Provides: bundled(golang(github.com/go_jose/go_jose/v3)) = v3.0.1
 Provides: bundled(golang(github.com/go_log/log)) = v0.2.0
-Provides: bundled(golang(github.com/go_logr/logr)) = v1.2.4
-Provides: bundled(golang(github.com/go_logr/stdr)) = v1.2.2
 Provides: bundled(golang(github.com/go_openapi/analysis)) = v0.21.4
-Provides: bundled(golang(github.com/go_openapi/errors)) = v0.20.3
-Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.5
-Provides: bundled(golang(github.com/go_openapi/jsonreference)) = v0.20.0
+Provides: bundled(golang(github.com/go_openapi/errors)) = v0.20.4
+Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.6
+Provides: bundled(golang(github.com/go_openapi/jsonreference)) = v0.20.2
 Provides: bundled(golang(github.com/go_openapi/loads)) = v0.21.2
-Provides: bundled(golang(github.com/go_openapi/runtime)) = v0.25.0
-Provides: bundled(golang(github.com/go_openapi/spec)) = v0.20.8
+Provides: bundled(golang(github.com/go_openapi/runtime)) = v0.26.0
+Provides: bundled(golang(github.com/go_openapi/spec)) = v0.20.9
 Provides: bundled(golang(github.com/go_openapi/strfmt)) = v0.21.7
-Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.3
+Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.4
 Provides: bundled(golang(github.com/go_openapi/validate)) = v0.22.1
 Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.1.0
-Provides: bundled(golang(github.com/gofrs/uuid)) = v4.0.0+incompatible
 Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
 Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.3
-Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.9
-Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.15.2
-Provides: bundled(golang(github.com/google/uuid)) = v1.3.0
+Provides: bundled(golang(github.com/google/go_cmp)) = v0.6.0
+Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.17.0
+Provides: bundled(golang(github.com/google/uuid)) = v1.5.0
 Provides: bundled(golang(github.com/gorilla/handlers)) = v1.5.1
 Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0
 Provides: bundled(golang(github.com/gosimple/slug)) = v1.13.1
@@ -167,97 +174,89 @@ Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1
 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.1.0
 Provides: bundled(golang(github.com/josharian/intern)) = v1.0.0
 Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12
-Provides: bundled(golang(github.com/kardianos/osext)) = v0.0.0_20190222173326_2bc1f35cddc0
-Provides: bundled(golang(github.com/klauspost/compress)) = v1.16.5
-Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.6_0.20220930104621_17e8dac29df8
-Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20230213213521_fdfea0d469b6
+Provides: bundled(golang(github.com/klauspost/compress)) = v1.17.3
+Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.6
+Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20230907030200_6d76a0f91e1e
 Provides: bundled(golang(github.com/mailru/easyjson)) = v0.7.7
 Provides: bundled(golang(github.com/mattn/go_colorable)) = v0.1.13
-Provides: bundled(golang(github.com/mattn/go_isatty)) = v0.0.17
-Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.14
+Provides: bundled(golang(github.com/mattn/go_isatty)) = v0.0.20
+Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.15
 Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
+Provides: bundled(golang(github.com/mattn/go_sqlite3)) = v1.14.19
 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.4
 Provides: bundled(golang(github.com/miekg/pkcs11)) = v1.1.1
+Provides: bundled(golang(github.com/mitchellh/go_homedir)) = v1.1.0
 Provides: bundled(golang(github.com/mitchellh/mapstructure)) = v1.5.0
-Provides: bundled(golang(github.com/moby/locker)) = v1.0.1
 Provides: bundled(golang(github.com/moby/patternmatcher)) = v0.5.0
-Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2
+Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.7.1
 Provides: bundled(golang(github.com/moby/sys/sequential)) = v0.5.0
-Provides: bundled(golang(github.com/moby/term)) = v0.0.0_20221205130635_1aeaba878587
 Provides: bundled(golang(github.com/modern_go/concurrent)) = v0.0.0_20180306012644_bacd9c7ef1dd
 Provides: bundled(golang(github.com/modern_go/reflect2)) = v1.0.2
-Provides: bundled(golang(github.com/morikuni/aec)) = v1.0.0
-Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.3.0
+Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.4.0
 Provides: bundled(golang(github.com/oklog/ulid)) = v1.3.1
 Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
-Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc4
-Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.7
+Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc5
+Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.11
 Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.1.0
 Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20221107090550_2e043c6bd626
 Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.11.0
 Provides: bundled(golang(github.com/opencontainers/umoci)) = v0.4.7
-Provides: bundled(golang(github.com/pelletier/go_toml/v2)) = v2.0.9
+Provides: bundled(golang(github.com/pelletier/go_toml/v2)) = v2.1.1
 Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
 Provides: bundled(golang(github.com/proglottis/gpgme)) = v0.1.3
-Provides: bundled(golang(github.com/prometheus/client_golang)) = v1.14.0
-Provides: bundled(golang(github.com/prometheus/client_model)) = v0.3.0
-Provides: bundled(golang(github.com/prometheus/common)) = v0.42.0
-Provides: bundled(golang(github.com/prometheus/procfs)) = v0.9.0
+Provides: bundled(golang(github.com/prometheus/client_golang)) = v1.17.0
+Provides: bundled(golang(github.com/prometheus/client_model)) = v0.5.0
+Provides: bundled(golang(github.com/prometheus/common)) = v0.44.0
+Provides: bundled(golang(github.com/prometheus/procfs)) = v0.11.1
 Provides: bundled(golang(github.com/rivo/uniseg)) = v0.4.4
 Provides: bundled(golang(github.com/rootless_containers/proto)) = v0.1.0
 Provides: bundled(golang(github.com/russross/blackfriday/v2)) = v2.1.0
 Provides: bundled(golang(github.com/safchain/ethtool)) = v0.3.0
+Provides: bundled(golang(github.com/samber/lo)) = v1.39.0
 Provides: bundled(golang(github.com/seccomp/containers_golang)) = v0.6.0
 Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.10.0
-Provides: bundled(golang(github.com/secure_systems_lab/go_securesystemslib)) = v0.6.0
+Provides: bundled(golang(github.com/secure_systems_lab/go_securesystemslib)) = v0.8.0
 Provides: bundled(golang(github.com/sergi/go_diff)) = v1.2.0
 Provides: bundled(golang(github.com/shopspring/decimal)) = v1.3.1
-Provides: bundled(golang(github.com/sigstore/fulcio)) = v1.2.0
-Provides: bundled(golang(github.com/sigstore/rekor)) = v1.1.0
-Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.7.1
+Provides: bundled(golang(github.com/sigstore/fulcio)) = v1.4.3
+Provides: bundled(golang(github.com/sigstore/rekor)) = v1.2.2
+Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.8.0
 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.3
-Provides: bundled(golang(github.com/spf13/cobra)) = v1.7.0
+Provides: bundled(golang(github.com/spf13/cobra)) = v1.8.0
 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
 Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_20201008174630_78d3cae3a980
 Provides: bundled(golang(github.com/sylabs/json_resp)) = v0.9.0
 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
-Provides: bundled(golang(github.com/theupdateframework/go_tuf)) = v0.5.2
 Provides: bundled(golang(github.com/titanous/rocacheck)) = v0.0.0_20171023193734_afe73141d399
 Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.11
-Provides: bundled(golang(github.com/urfave/cli)) = v1.22.12
+Provides: bundled(golang(github.com/urfave/cli)) = v1.22.14
 Provides: bundled(golang(github.com/vbatts/go_mtree)) = v0.5.0
-Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.3
-Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = v8.5.2
+Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.5
+Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = v8.7.2
 Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.2.1_beta.2
 Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.4
 Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = v0.0.0_20190905194746_02993c407bfb
 Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = v0.0.0_20180127040603_bd5ef7bd5415
 Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = v1.2.0
-Provides: bundled(golang(github.com/yvasiyarov/go_metrics)) = v0.0.0_20150112132944_c25f46c4b940
-Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.7
 Provides: bundled(golang(go.mongodb.org/mongo_driver)) = v1.11.3
 Provides: bundled(golang(go.mozilla.org/pkcs7)) = v0.0.0_20210826202110_33d05740a352
-Provides: bundled(golang(go.opentelemetry.io/otel)) = v1.14.0
-Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = v1.14.0
-Provides: bundled(golang(golang.org/x/crypto)) = v0.11.0
-Provides: bundled(golang(golang.org/x/exp)) = v0.0.0_20230321023759_10a507213a29
-Provides: bundled(golang(golang.org/x/mod)) = v0.10.0
-Provides: bundled(golang(golang.org/x/net)) = v0.11.0
-Provides: bundled(golang(golang.org/x/sync)) = v0.1.0
-Provides: bundled(golang(golang.org/x/sys)) = v0.10.0
-Provides: bundled(golang(golang.org/x/term)) = v0.10.0
-Provides: bundled(golang(golang.org/x/text)) = v0.11.0
-Provides: bundled(golang(golang.org/x/tools)) = v0.8.0
-Provides: bundled(golang(google.golang.org/genproto)) = v0.0.0_20230410155749_daa745c078e1
-Provides: bundled(golang(google.golang.org/grpc)) = v1.55.0
-Provides: bundled(golang(google.golang.org/protobuf)) = v1.30.0
+Provides: bundled(golang(golang.org/x/crypto)) = v0.18.0
+Provides: bundled(golang(golang.org/x/exp)) = v0.0.0_20231006140011_7918f672742d
+Provides: bundled(golang(golang.org/x/mod)) = v0.13.0
+Provides: bundled(golang(golang.org/x/net)) = v0.18.0
+Provides: bundled(golang(golang.org/x/sync)) = v0.5.0
+Provides: bundled(golang(golang.org/x/sys)) = v0.16.0
+Provides: bundled(golang(golang.org/x/term)) = v0.16.0
+Provides: bundled(golang(golang.org/x/text)) = v0.14.0
+Provides: bundled(golang(golang.org/x/tools)) = v0.14.0
+Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = v0.0.0_20230920204549_e6e6cdab5c13
+Provides: bundled(golang(google.golang.org/grpc)) = v1.58.3
+Provides: bundled(golang(google.golang.org/protobuf)) = v1.31.0
 Provides: bundled(golang(gopkg.in/go_jose/go_jose.v2)) = v2.6.1
-Provides: bundled(golang(gopkg.in/square/go_jose.v2)) = v2.6.0
 Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.4.0
 Provides: bundled(golang(gopkg.in/yaml.v3)) = v3.0.1
-Provides: bundled(golang(gotest.tools/v3)) = v3.5.0
-Provides: bundled(golang(mvdan.cc/sh/v3)) = v3.6.1_0.20221221181323_d3feb15bed3a
-Provides: bundled(golang(oras.land/oras_go)) = v1.2.3
+Provides: bundled(golang(gotest.tools/v3)) = v3.5.1
+Provides: bundled(golang(mvdan.cc/sh/v3)) = v3.7.1_0.20231014181306_8b673862efc6
 
 %if "%{_target_vendor}" == "suse"
 BuildRequires: binutils-gold
@@ -268,12 +267,12 @@ BuildRequires: gcc
 BuildRequires: make
 BuildRequires: libseccomp-devel
 BuildRequires: cryptsetup
-%if "%{?squashfuse_version}" != ""
+BuildRequires: fuse3-devel
+%if ("%{?squashfuse_version}" != "") || ("%{e2fsprogs_version}" != "") || ("%{fuse_overlayfs_version}" != "")
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: fuse3-devel
 BuildRequires: zlib-devel
 %endif
 %if "%{_target_vendor}" == "suse"
@@ -281,15 +280,7 @@ Requires: squashfs
 %else
 Requires: squashfs-tools
 %endif
-Requires: squashfuse
 Requires: fakeroot
-Requires: fuse-overlayfs
-Requires: e2fsprogs
-# Uncomment this for the epel build, but we don't want it for the Apptainer
-#  release build because there the same rpm is shared across OS versions
-%if 0%{?el7}
-Requires: fuse2fs
-%endif
 
 %description
 Apptainer provides functionality to make portable
@@ -309,44 +300,11 @@ Provides: alternative-for(singularity)
 Provides the optional setuid-root portion of Apptainer.
 
 %prep
-%if "%{?gocryptfs_version}" != ""
-%setup -b 10 -n gocryptfs-%{gocryptfs_version}
-%endif
-
-%if "%{?squashfuse_version}" != ""
-# the default directory for other steps is where the %%prep section ends
-# so do main package last
-%setup -b 11 -n squashfuse-%{squashfuse_version}
 %setup -n %{name}-%{package_version}
-%else
-%autosetup -n %{name}-%{package_version}
-%endif
+# don't need to setup dependent source packages and patches because
+# that is done by the compile-dependencies script
 
 %build
-%if "%{?gocryptfs_version}" != ""
-pushd ../gocryptfs-%{gocryptfs_version}
-if [ ! -d vendor ]; then
-    (
-    export GOPATH="`pwd`/gopath"
-    go mod vendor
-    go clean -modcache
-    )
-fi
-# GOPROXY=off makes sure we fail instead of making network requests
-# the -B ldflags prevent rpm complaints about "No build ID note found"
-CGO_ENABLED=0 GOPROXY=off ./build.bash -mod=vendor -tags without_openssl \
-    -ldflags="-X main.GitVersion=%{gocryptfs_version} -B 0x`head -c20 /dev/urandom|od -An -tx1|tr -d ' \n'`" 
-popd
-%endif
-
-%if "%{?squashfuse_version}" != ""
-pushd ../squashfuse-%{squashfuse_version}
-./autogen.sh
-FLAGS=-std=c99 ./configure --enable-multithreading
-%make_build squashfuse_ll
-popd
-%endif
-
 %if "%{?SOURCE1}" != ""
 GOVERSION="$(echo %SOURCE1|sed 's,.*/,,;s/go//;s/\.src.*//')"
 if ! ./mlocal/scripts/check-min-go-version go $GOVERSION; then
@@ -361,6 +319,8 @@ if ! ./mlocal/scripts/check-min-go-version go $GOVERSION; then
 fi
 %endif
 
+./scripts/compile-dependencies $(dirname %{SOURCE10})
+
 # Not all of these parameters currently have an effect, but they might be
 #  used someday.  They are the same parameters as in the configure macro.
 ./mconfig %{?mconfig_opts} -V %{version}-%{release} --with-suid \
@@ -373,7 +333,7 @@ fi
         --includedir=%{_includedir} \
         --libdir=%{_libdir} \
         --libexecdir=%{_libexecdir} \
-        --localstatedir=%{_localstatedir} \
+        --localstatedir=%{_sharedstatedir} \
         --sharedstatedir=%{_sharedstatedir} \
         --mandir=%{_mandir} \
         --infodir=%{_infodir}
@@ -388,11 +348,19 @@ export PATH=$PWD/go/bin:$PATH
 %make_install -C builddir V=
 
 %if "%{?gocryptfs_version}" != ""
-install -m 755 ../gocryptfs-%{gocryptfs_version}/gocryptfs %{buildroot}%{_libexecdir}/%{name}/bin/gocryptfs
+install -m 755 gocryptfs-%{gocryptfs_version}/gocryptfs %{buildroot}%{_libexecdir}/%{name}/bin/gocryptfs
 %endif
 
 %if "%{?squashfuse_version}" != ""
-install -m 755 ../squashfuse-%{squashfuse_version}/squashfuse_ll %{buildroot}%{_libexecdir}/%{name}/bin/squashfuse_ll
+install -m 755 squashfuse-%{squashfuse_version}/squashfuse_ll %{buildroot}%{_libexecdir}/%{name}/bin/squashfuse_ll
+%endif
+
+%if "%{?e2fsprogs_version}" != ""
+install -m 755 e2fsprogs-%{e2fsprogs_version}/fuse2fs %{buildroot}%{_libexecdir}/%{name}/bin/fuse2fs
+%endif
+
+%if "%{?fuse_overlayfs_version}" != ""
+install -m 755 fuse-overlayfs-%{fuse_overlayfs_version}/fuse-overlayfs %{buildroot}%{_libexecdir}/%{name}/bin/fuse-overlayfs
 %endif
 
 %if 0%{?el7}
@@ -467,14 +435,20 @@ fi
 %if "%{?squashfuse_version}" != ""
 %{_libexecdir}/%{name}/bin/squashfuse_ll
 %endif
+%if "%{?e2fsprogs_version}" != ""
+%{_libexecdir}/%{name}/bin/fuse2fs
+%endif
+%if "%{?fuse_overlayfs_version}" != ""
+%{_libexecdir}/%{name}/bin/fuse-overlayfs
+%endif
 %{_libexecdir}/%{name}/cni
 %{_libexecdir}/%{name}/lib
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
 %{_datadir}/bash-completion/completions/*
-%dir %{_localstatedir}/%{name}
-%dir %{_localstatedir}/%{name}/mnt
-%dir %{_localstatedir}/%{name}/mnt/session
+%dir %{_sharedstatedir}/%{name}
+%dir %{_sharedstatedir}/%{name}/mnt
+%dir %{_sharedstatedir}/%{name}/mnt/session
 %{_mandir}/man1/%{name}*
 %{_mandir}/man1/singularity*
 %license LICENSE.md
@@ -487,6 +461,9 @@ fi
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Wed Jan 10 2024 Dave Dykstra <dwd@fnal.gov> - 1.3.0~rc.1
+- Update to upstream 1.3.0-rc.1
+
 * Wed Nov 22 2023 Dave Dykstra <dwd@fnal.gov> - 1.2.5
 - Update to upstream 1.2.5
 

diff --git a/sources b/sources
index c3faa9b..1314bca 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,8 @@
-SHA512 (squashfuse-0.2.0.tar.gz) = ad0f5c623d8c3b8a16a1a087439287d22de0cfc7a269924127a8ae64a4bb57c2086d48916988195cfa5cae318adb34381e5ab9a4eab3e4d650dd1e9e5db66736
 SHA512 (gocryptfs-2.4.0.tar.gz) = 5ee2fc1a417c57e54b2f224e9a5921a9c16168e57f381329fad9078a9b8e7c8f79731e880948c6a6c97a3c57b78278fdf1aebf1af26eaeec811be79482946efe
-SHA512 (apptainer-1.2.5.tar.gz) = 58b7e9947bfc2e2d267e126ae7f9766d04ffa943c72e9a00b649ba93fd66828ee55c8d93b114f542067b305822737516675cdca79ce0d8c1153c61fa88d058d7
+SHA512 (e2fsprogs-1.47.0.tar.gz) = 9cb895f7deed8ee513595b7c232db8345cb7e54e6cbb33e6eeab31c860c892cbc9d721756ac1429e6731e219e1c6aacc25075d517e979397c66bf764bc8bc9fa
+SHA512 (e2fsprogs-1.patch) = 3aad4412aea7aab338f08bad0138fb64d50b1ea0a2a3997d2fbd22f1d9cf23c4f21dcba3e943b0eea21eac32ea34a9c1f233752ee0ad7846b2688cd94b45778f
+SHA512 (e2fsprogs-2.patch) = 3c2412b895ccada5dc5940370a509437318e9627f61af3ea100dec2a031f7a2980186004b9875f31f90e60807720a8a57dc06d6a6eb36cac11ec83fdaaf8b2c0
+SHA512 (e2fsprogs-3.patch) = 005a27c46972e88e63b8d35132d9e041e481081bad3a05fd8be9aefdf285aa9a54961a1affc334049503e261095cbb5c1f85fc82eca9eb224f11341bdd5a1884
+SHA512 (fuse-overlayfs-1.13.tar.gz) = 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b
+SHA512 (squashfuse-0.5.0.tar.gz) = 7e081cf066ade784ced6bbd6edfee5714e2704c09cbfd46166388eb966d39cf4b792adc54c287546e50cef70e2728689e351933cc318add2cb1fc2ddd98e8f1a
+SHA512 (apptainer-1.3.0-rc.1.tar.gz) = 4712224faf83209582161fb9a4690f1d3873643840f23b52b1b8c774aa6ebdd67967aa629ac15a20032ce74eb3bdcaef8a43e3c7809689a5c285b31a754a9f4c