Merge pull request #3706 from dtrudg/4.3-packaging-fuse

Merge fuse3 changes, Prepare 4.3.2 release.

Author: dtrudg

.circleci/config.yml

@@ -91,9 +91,10 @@ commands:
               build-essential \
               cryptsetup \
               fuse2fs \
+              fuse3 \
               fuse-overlayfs \
               git \
-              libfuse-dev \
+              libfuse3-dev \
               libseccomp-dev \
               libsubid-dev \
               libtool \
@@ -377,7 +378,7 @@ jobs:
               dh-golang \
               fakeroot \
               git \
-              libfuse-dev \
+              libfuse3-dev \
               libglib2.0-dev \
               libseccomp-dev \
               libtool \

CHANGELOG.md

@@ -1,5 +1,15 @@
 # SingularityCE Changelog
 
+## 4.3.2 \[2025-06-18\]
+
+## Requirements / Packaging
+
+- Ubuntu 20.04 packages dropped - end-of-life.
+- EL 10 (RHEL/AlmaLinux/Rocky Linux 10) packages introduced.
+- Build bundled squashfuse against FUSE3 for all packages.
+- Don't depend on `fuse` on Ubuntu - installing this package on 22.04 can
+  cause conflicts with the Ubuntu Desktop package set.
+
 ## 4.3.1 \[2025-04-11\]
 
 ### Bug Fixes

CONTRIBUTORS.md

@@ -100,6 +100,7 @@ The following have contributed code and/or documentation to this repository.
 - Rémy Dernat <[email protected]>
 - Richard Hattersley <[email protected]>
 - Richard Neuboeck <[email protected]>
+- Rowan Kelleher <[email protected]>
 - Sasha Yakovtseva <[email protected]>, <[email protected]>
 - Satish Chebrolu  <[email protected]>
 - Shane Loretz <[email protected]>, <[email protected]>

INSTALL.md

@@ -22,8 +22,8 @@ sudo apt-get install -y \
     cryptsetup \
     fuse2fs \
     git \
-    fuse \
-    libfuse-dev \
+    fuse3 \
+    libfuse3-dev \
     libseccomp-dev \
     libtool \
     pkg-config \
@@ -130,7 +130,7 @@ containers in an OCI lifecycle then `conmon` is required.
 `conmon` is available as a package for Ubuntu 24.10+ and Debian 12+
 
 ```sh
-sudo apt get install conmon
+sudo apt-get install conmon
 ```
 
 On older versions, use the latest binary from the [conmon GitHub
@@ -227,11 +227,11 @@ git submodule update --init
 By default your clone will be on the `main` branch which is where development
 of SingularityCE happens. To build a specific version of SingularityCE, check
 out a [release tag](https://github.com/sylabs/singularity/tags) before
-compiling. E.g. to build the 4.3.0 release, checkout the
-`v4.3.0` tag:
+compiling. E.g. to build the 4.3.2 release, checkout the
+`v4.3.2` tag:
 
 ```sh
-git checkout --recurse-submodules v4.3.0
+git checkout --recurse-submodules v4.3.2
 ```
 
 ## Compiling SingularityCE
@@ -334,7 +334,7 @@ build and install the RPM like this:
 <!-- markdownlint-disable MD013 -->
 
 ```sh
-export VERSION=4.3.0 # this is the singularity version, change as you need
+export VERSION=4.3.2 # this is the singularity version, change as you need
 
 # Fetch the source
 wget https://github.com/sylabs/singularity/releases/download/v${VERSION}/singularity-ce-${VERSION}.tar.gz

debian/control

@@ -9,7 +9,7 @@ Build-Depends:
  cryptsetup,
  dh-apparmor,
  git,
- libfuse-dev,
+ libfuse3-dev,
  libseccomp-dev,
  libtool,
  pkg-config,
@@ -25,8 +25,8 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
   crun (>= 1.5.0) | runc,
   cryptsetup-bin,
-  fuse,
   fuse2fs,
+  fuse3,
   libseccomp2,
   squashfs-tools,
   uidmap

examples/lima/singularity-ce.yml

@@ -24,7 +24,9 @@ provision:
   script: |
     #!/bin/bash
     set -eux -o pipefail
-    dnf -y install --enablerepo=epel singularity-ce squashfs-tools-ng
+
+    dnf install -y epel-release
+    dnf install -y singularity-ce squashfs-tools-ng
 
 probes:
 - script: |

pkg/sylog/sylog.go

@@ -159,6 +159,13 @@ func Writer() io.Writer {
 	return logWriter
 }
 
+// SetWriter accepts an io.Writer, to which sylog will then print messages.
+// This can be used to capture sylog messages for testing etc. By default log
+// messages are written to os.StdErr.
+func SetWriter(w io.Writer) {
+	logWriter = w
+}
+
 // DebugLogger is an implementation of the go-log/log Logger interface that will
 // output log messages via sylog.debug when required by external packages such
 // as the scs-library-client

pkg/sylog/sylog_dummy.go

@@ -55,6 +55,9 @@ func Writer() io.Writer {
 	return io.Discard
 }
 
+// SetWriter is a dummy function doing nothing
+func SetWriter(io.Writer) {}
+
 // DebugLogger is an implementation of the go-log/log Logger interface that will
 // output log messages via sylog.debug when required by external packages such
 // as the scs-library-client