public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
To: git-commits@fedoraproject.org
Subject: [rpms/apptainer] migrate-spdx: update to 1.2.0-rc.1
Date: Mon, 03 Aug 2026 17:53:09 GMT	[thread overview]
Message-ID: <178577958905.1.5984673503501746756.rpms-apptainer-2245fc793233@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : 2245fc793233ede7139d6274b528c553f18933ba
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2023-06-08T08:08:59-05:00
Stats  : +158/-95 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/2245fc793233ede7139d6274b528c553f18933ba?branch=migrate-spdx

Log:
update to 1.2.0-rc.1

---
diff --git a/.gitignore b/.gitignore
index 653ad6b..628706c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /apptainer-*.tar.gz
-/squashfuse-0.1.105.tar.gz
-/apptainer-1.1.2-1.x86_64.rpm
+/squashfuse-*.tar.gz
+/gocryptfs-*.tar.gz

diff --git a/apptainer.spec b/apptainer.spec
index 14c5963..838a227 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -31,8 +31,10 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.1.9
+%global package_version 1.2.0-rc.1
 
+# Uncomment this to include gocryptfs
+%global gocryptfs_version 2.3.2
 # Uncomment this to include a multithreaded version of squashfuse_ll
 %global squashfuse_version 0.1.105
 
@@ -41,7 +43,7 @@
 
 Summary: Application and environment virtualization formerly known as Singularity
 Name: apptainer
-Version: 1.1.9
+Version: 1.2.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)
@@ -51,8 +53,15 @@ License: BSD and LBNL BSD and ASL 2.0
 URL: https://apptainer.org
 Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz
 
+%if "%{?gocryptfs_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.
+Source10: https://github.com/rfjakob/gocryptfs/archive/v%{gocryptfs_version}/gocryptfs-%{gocryptfs_version}.tar.gz
+%endif
 %if "%{?squashfuse_version}" != ""
-Source10: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
+Source11: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
 Patch10: https://github.com/vasi/squashfuse/pull/70.patch
 Patch11: https://github.com/vasi/squashfuse/pull/77.patch
 Patch12: https://github.com/vasi/squashfuse/pull/81.patch
@@ -81,153 +90,173 @@ Conflicts: sif-runtime
 
 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.2.0
-Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.5.2
-Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.9.4
+Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.3.0
+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_20220824120805_4b6e5c587895
+Provides: bundled(golang(github.com/ProtonMail/go_crypto)) = v0.0.0_20230217124315_7d5c6f04bbb8
 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.1.0
+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.3.4
-Provides: bundled(golang(github.com/apptainer/sif/v2)) = v2.8.1
+Provides: bundled(golang(github.com/apptainer/container_library_client)) = v1.4.2
+Provides: bundled(golang(github.com/apptainer/sif/v2)) = v2.11.4
+Provides: bundled(golang(github.com/asaskevich/govalidator)) = v0.0.0_20230301143203_a9d515a09cc2
 Provides: bundled(golang(github.com/beorn7/perks)) = v1.0.1
 Provides: bundled(golang(github.com/blang/semver)) = v3.5.1+incompatible
 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.1.3
-Provides: bundled(golang(github.com/cespare/xxhash/v2)) = v2.1.2
+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.7.0
-Provides: bundled(golang(github.com/cloudflare/circl)) = v1.1.0
-Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.3
-Provides: bundled(golang(github.com/containerd/containerd)) = v1.6.8
+Provides: bundled(golang(github.com/cloudflare/circl)) = v1.3.3
+Provides: bundled(golang(github.com/containerd/containerd)) = v1.6.19
 Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.2
-Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.1.1
-Provides: bundled(golang(github.com/containers/image/v5)) = v5.22.0
-Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20200511145503_9c3a6c22cd9a
-Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.5
-Provides: bundled(golang(github.com/containers/storage)) = v1.42.0
+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/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/coreos/go_systemd/v22)) = v22.3.2
+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/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
 Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
-Provides: bundled(golang(github.com/docker/cli)) = v20.10.17+incompatible
-Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible
-Provides: bundled(golang(github.com/docker/docker)) = v20.10.17+incompatible
-Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.6.4
+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/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.4.0
+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/fatih/color)) = v1.13.0
-Provides: bundled(golang(github.com/felixge/httpsnoop)) = v1.0.1
-Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.5.1
+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/felixge/httpsnoop)) = v1.0.3
 Provides: bundled(golang(github.com/garyburd/redigo)) = v0.0.0_20150301180006_535138d7bcd7
-Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0
 Provides: bundled(golang(github.com/go_log/log)) = v0.2.0
-Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.6
+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/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/strfmt)) = v0.21.7
+Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.3
+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/groupcache)) = v0.0.0_20210331224755_41bb18bfe9da
-Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.2
-Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.8
-Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.10.0
+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/gorilla/handlers)) = v1.5.1
 Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0
-Provides: bundled(golang(github.com/gosimple/slug)) = v1.12.0
+Provides: bundled(golang(github.com/gosimple/slug)) = v1.13.1
 Provides: bundled(golang(github.com/gosimple/unidecode)) = v1.0.1
 Provides: bundled(golang(github.com/hashicorp/errwrap)) = v1.1.0
 Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1
-Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.0
+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.15.9
-Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.5
-Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20220331220046_b23ab962616e
-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.13
+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/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_shellwords)) = v1.0.12
-Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.2_0.20181231171920_c182affec369
+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/mapstructure)) = v1.5.0
 Provides: bundled(golang(github.com/moby/locker)) = v1.0.1
-Provides: bundled(golang(github.com/moby/sys/mount)) = v0.3.0
+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/term)) = v0.0.0_20210610120745_9d4ed1856297
+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.2.0
+Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.3.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.0.3_0.20220114050600_8b9d41f48198
-Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.4
-Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20210326190908_1c3f411f0417
+Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc3
+Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.7
+Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.1.0_rc.2
 Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20210326182921_59cdde06764b
-Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.1
+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)) = v1.9.5
+Provides: bundled(golang(github.com/pelletier/go_toml/v2)) = v2.0.8
 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.12.1
-Provides: bundled(golang(github.com/prometheus/client_model)) = v0.2.0
-Provides: bundled(golang(github.com/prometheus/common)) = v0.32.1
-Provides: bundled(golang(github.com/prometheus/procfs)) = v0.7.3
-Provides: bundled(golang(github.com/rivo/uniseg)) = v0.2.0
+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/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.0.0_20210803160452_9aa261dae9b1
+Provides: bundled(golang(github.com/safchain/ethtool)) = v0.3.0
 Provides: bundled(golang(github.com/seccomp/containers_golang)) = v0.6.0
-Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.9.2_0.20220502022130_f33da4d89646
+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/sergi/go_diff)) = v1.2.0
 Provides: bundled(golang(github.com/shopspring/decimal)) = v1.3.1
-Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.3.1_0.20220629021053_b95fc0d626c1
-Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.0
-Provides: bundled(golang(github.com/spf13/cobra)) = v1.5.0
+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.6.5
+Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.2
+Provides: bundled(golang(github.com/spf13/cobra)) = v1.7.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.8.1
+Provides: bundled(golang(github.com/sylabs/json_resp)) = v0.8.2
 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
-Provides: bundled(golang(github.com/theupdateframework/go_tuf)) = v0.3.1
+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.10
-Provides: bundled(golang(github.com/urfave/cli)) = v1.22.5
+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/vbatts/go_mtree)) = v0.5.0
-Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.2
-Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.4.2
-Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5
-Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
+Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.3
+Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = v8.4.0
+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(github.com/yvasiyarov/gorelic)) = v0.0.6
-Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = v0.0.0_20160601141957_9c099fbc30e9
-Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.6
-Provides: bundled(golang(go.mozilla.org/pkcs7)) = v0.0.0_20200128120323_432b2356ecb1
-Provides: bundled(golang(golang.org/x/crypto)) = v0.0.0_20220525230936_793ad666bf5e
-Provides: bundled(golang(golang.org/x/net)) = v0.0.0_20220624214902_1bab6f366d9e
-Provides: bundled(golang(golang.org/x/sync)) = v0.0.0_20220601150217_0de741cfad7f
-Provides: bundled(golang(golang.org/x/sys)) = v0.0.0_20220715151400_c0bba94af5f8
-Provides: bundled(golang(golang.org/x/term)) = v0.0.0_20210927222741_03fcf44c2211
-Provides: bundled(golang(golang.org/x/text)) = v0.3.7
-Provides: bundled(golang(google.golang.org/genproto)) = v0.0.0_20220624142145_8cd45d7dbd1f
-Provides: bundled(golang(google.golang.org/grpc)) = v1.47.0
-Provides: bundled(golang(google.golang.org/protobuf)) = v1.28.0
+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(golang.org/x/crypto)) = v0.9.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.10.0
+Provides: bundled(golang(golang.org/x/sync)) = v0.1.0
+Provides: bundled(golang(golang.org/x/sys)) = v0.8.0
+Provides: bundled(golang(golang.org/x/term)) = v0.8.0
+Provides: bundled(golang(golang.org/x/text)) = v0.9.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(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.3.0
-Provides: bundled(golang(mvdan.cc/sh/v3)) = v3.5.1
-Provides: bundled(golang(oras.land/oras_go)) = v1.2.0
+Provides: bundled(golang(gotest.tools/v3)) = v3.4.0
+Provides: bundled(golang(mvdan.cc/sh/v3)) = v3.6.1_0.20221221181323_d3feb15bed3a
+Provides: bundled(golang(oras.land/oras_go)) = v1.2.3_0.20230221065300_6cd929aff421
 
 %if "%{_target_vendor}" == "suse"
 BuildRequires: binutils-gold
@@ -237,11 +266,6 @@ BuildRequires: git
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: libseccomp-devel
-%if "%{_target_vendor}" == "suse"
-Requires: squashfs
-%else
-Requires: squashfs-tools
-%endif
 BuildRequires: cryptsetup
 %if "%{?squashfuse_version}" != ""
 BuildRequires: autoconf
@@ -251,10 +275,17 @@ BuildRequires: pkgconfig
 BuildRequires: fuse3-devel
 BuildRequires: zlib-devel
 %endif
+%if "%{_target_vendor}" == "suse"
+Requires: squashfs
+%else
+Requires: squashfs-tools
+%endif
 Requires: squashfuse
 Requires: fakeroot
 Requires: fuse-overlayfs
 Requires: e2fsprogs
+# only gocryptfs requires fuse
+Requires: fuse
 # 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}
@@ -279,10 +310,14 @@ 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 10 -n squashfuse-%{squashfuse_version}
+%setup -b 11 -n squashfuse-%{squashfuse_version}
 %patch -P 10 -p1
 %patch -P 11 -p1
 %patch -P 12 -p1
@@ -292,6 +327,22 @@ Provides the optional setuid-root portion of Apptainer.
 %endif
 
 %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
@@ -339,6 +390,11 @@ export PATH=$PWD/go/bin:$PATH
 %endif
 
 %make_install -C builddir V=
+
+%if "%{?gocryptfs_version}" != ""
+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
 %endif
@@ -409,6 +465,9 @@ fi
 %dir %{_libexecdir}/%{name}
 %dir %{_libexecdir}/%{name}/bin
 %{_libexecdir}/%{name}/bin/starter
+%if "%{?gocryptfs_version}" != ""
+%{_libexecdir}/%{name}/bin/gocryptfs
+%endif
 %if "%{?squashfuse_version}" != ""
 %{_libexecdir}/%{name}/bin/squashfuse_ll
 %endif
@@ -432,6 +491,9 @@ fi
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Thu Jun  8 2023 Dave Dykstra <dwd@fnal.gov> - 1.2.0~rc.1-1
+- Update to upstream 1.2.0-rc.1
+
 * Wed Jun  7 2023 Dave Dykstra <dwd@fnal.gov> - 1.1.9-1
 - Update to upstream 1.1.9.
 

diff --git a/sources b/sources
index 74b91db..4a36690 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (squashfuse-0.1.105.tar.gz) = 6bf18575fd4732f3b0e4530902f2556859c2efbbd781a31bdbf97fe6601412dc750a80354a8ab08a3132d4f8680ea5ff0dd04440f29243906f1017aa6c70bede
-SHA512 (apptainer-1.1.9.tar.gz) = 52ca2ac7b6763ca3817bf68fffc6e477e5699eae1368b5deb9458d1a88ff6c607e6c6abd796a686e9c0208f48831f747a4b2c57cedf6b226845dde1b589a5158
+SHA512 (gocryptfs-2.3.2.tar.gz) = 43101ffa30e16e1d4d12d758856e7bcdd80d42121eba292ec2019ceb3a0d81262fe7bc3ea14f5d8b35efca3f8db337374417792bb0f233c00df5e6009f45366b
+SHA512 (apptainer-1.2.0-rc.1.tar.gz) = 95c1415ba80518ab76ffafa1c30e3d126d58c2a9707207982ab8691b7b4a796a8423ff4ae6dd60910d4f4d583e60d0e6e0f858f5d37928440ef9efcb78b54b61

                 reply	other threads:[~2026-08-03 17:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178577958905.1.5984673503501746756.rpms-apptainer-2245fc793233@fedoraproject.org \
    --to=2129743+drdaved@users.noreply.github.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox