summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2023-01-06 09:06:36 -0500
committerGitHub <noreply@github.com>2023-01-06 15:06:36 +0100
commit968749156887117982922153e7165f5cf4efee84 (patch)
treef1adcb6bba66d8f6a5945a4e08d692b44ab6c1f6 /var
parent9c56b97aa995375d73b0f643f796d6cd0090369e (diff)
downloadspack-968749156887117982922153e7165f5cf4efee84.tar.gz
spack-968749156887117982922153e7165f5cf4efee84.tar.bz2
spack-968749156887117982922153e7165f5cf4efee84.tar.xz
spack-968749156887117982922153e7165f5cf4efee84.zip
podman: New version 4.3.1 (#34817)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/podman/markdown-utf8.diff20
-rw-r--r--var/spack/repos/builtin/packages/podman/package.py5
2 files changed, 25 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/podman/markdown-utf8.diff b/var/spack/repos/builtin/packages/podman/markdown-utf8.diff
new file mode 100644
index 0000000000..8c7c5f881f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/podman/markdown-utf8.diff
@@ -0,0 +1,20 @@
+--- a/hack/markdown-preprocess
++++ b/hack/markdown-preprocess
+@@ -36,7 +36,7 @@
+ outfile = os.path.splitext(infile)[0]
+ outfile_tmp = outfile + '.tmp.' + str(os.getpid())
+
+- with open(infile, 'r') as fh_in, open(outfile_tmp, 'w') as fh_out:
++ with open(infile, 'r', encoding='utf-8') as fh_in, open(outfile_tmp, 'w', encoding='utf-8') as fh_out:
+ for line in fh_in:
+ # '@@option foo' -> include file options/foo.md
+ if line.startswith('@@option '):
+@@ -63,7 +63,7 @@
+ # treats them as one line and will unwantedly render the
+ # comment in its output.
+ fh_out.write("\n[//]: # (BEGIN included file " + path + ")\n")
+- with open(path, 'r') as fh_included:
++ with open(path, 'r', encoding='utf-8') as fh_included:
+ for opt_line in fh_included:
+ opt_line = self.replace_type(opt_line)
+ opt_line = opt_line.replace('<<subcommand>>', self.podman_subcommand())
diff --git a/var/spack/repos/builtin/packages/podman/package.py b/var/spack/repos/builtin/packages/podman/package.py
index 555dabb354..d4609853df 100644
--- a/var/spack/repos/builtin/packages/podman/package.py
+++ b/var/spack/repos/builtin/packages/podman/package.py
@@ -13,8 +13,13 @@ class Podman(Package):
url = "https://github.com/containers/podman/archive/v3.4.2.tar.gz"
maintainers = ["bernhardkaindl"]
+ version("4.3.1", sha256="455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813")
version("3.4.2", sha256="b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31")
+ # See <https://github.com/containers/podman/issues/16996> for the
+ # respective issue and the suggested patch
+ patch("markdown-utf8.diff", when="@4:")
+
depends_on("go", type="build")
depends_on("go-md2man", type="build")
depends_on("pkgconfig", type="build")